diff --git a/.cvsignore b/.cvsignore index 082bca0..d340986 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Judy-1.0.4.tar.gz +Judy-1.0.5.tar.gz diff --git a/Judy.spec b/Judy.spec index a38f9f8..6fcc0f2 100644 --- a/Judy.spec +++ b/Judy.spec @@ -1,29 +1,18 @@ -Name: Judy -Version: 1.0.4 -Release: 6%{?dist} -Summary: General purpose dynamic array - -Group: System Environment/Libraries -# The source code itself says: -# "GNU Lesser General Public License as published by the -# Free Software Foundation; either version 2 of the License, -# or (at your option) any later version." -# This will probably change to LGPLv2 in a future upstream release, -# but until then, LGPLv2+ is the proper license. Confirmed -# with upstream on 2008/11/28. -License: LGPLv2+ -URL: http://sourceforge.net/projects/judy/ -Source0: http://downloads.sourceforge.net/judy/Judy-%{version}.tar.gz +Name: Judy +Version: 1.0.5 +Release: 1%{?dist} +Summary: General purpose dynamic array +Group: System Environment/Libraries +License: LGPLv2+ +URL: http://sourceforge.net/projects/judy/ +Source0: http://downloads.sf.net/judy/Judy-%{version}.tar.gz Source1: README.Fedora -# Make tests use shared instead of static libJudy. +# Make tests use shared instead of static libJudy Patch0: Judy-1.0.4-test-shared.patch -# The J1* man pages were incorrectly being symlinked to Judy, rather -# than Judy1. This patch corrects that. Submitted upstream 2008/11/27. +# The J1* man pages were incorrectly being symlinked to Judy, rather than Judy1 +# This patch corrects that; submitted upstream 2008/11/27 Patch1: Judy-1.0.4-fix-Judy1-mans.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -#BuildRequires: -#Requires: +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Judy is a C library that provides a state-of-the-art core technology @@ -37,7 +26,6 @@ Judy is designed as an unbounded array, the size of a Judy array is not pre-allocated but grows and shrinks dynamically with the array population. - %package devel Summary: Development libraries and headers for Judy Group: Development/Libraries @@ -47,14 +35,12 @@ Requires: %{name} = %{version}-%{release} This package contains the development libraries and header files for developing applications that use the Judy library. - %prep -%setup -q +%setup -q -n judy-%{version} %patch0 -p1 -b .test-shared %patch1 -p1 -b .fix-Judy1-mans cp -p %{SOURCE1} . - %build %configure --disable-static make @@ -62,58 +48,60 @@ make # fails to compile properly with parallel make: # http://sourceforge.net/tracker/index.php?func=detail&aid=2129019&group_id=55753&atid=478138 - %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL="install -p" # get rid of static libs and libtool archives -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la} +rm -f %{buildroot}%{_libdir}/*.{a,la} # clean out zero length and generated files from doc tree rm -rf doc/man rm -f doc/Makefile* doc/ext/README_deliver [ -s doc/ext/COPYRIGHT ] || rm -f doc/ext/COPYRIGHT [ -s doc/ext/LICENSE ] || rm -f doc/ext/LICENSE - %check cd test ./Checkit - +cd - %clean -rm -rf $RPM_BUILD_ROOT - +rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README README.Fedora -%{_libdir}/*.so.* - +%doc AUTHORS ChangeLog COPYING README README.Fedora examples/ +%{_libdir}/libJudy.so.* %files devel %defattr(-,root,root,-) %doc doc -%{_libdir}/*.so -%{_includedir}/* -%{_mandir}/man3/* - +%{_includedir}/Judy.h +%{_libdir}/libJudy.so +%{_mandir}/man3/J*.3* %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %changelog -* Fri Jul 24 2009 Fedora Release Engineering - 1.0.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Sun Jul 18 2010 Paul Howarth 1.0.5-1 +- update to 1.0.5 + - added proper clean targets to enable multiple builds + - added examples directory + - correctly detects 32/64-bit build environment + - allow explicit configure for 32/64-bit environment +- cosmetic spec file clean-ups -* Mon Feb 23 2009 Fedora Release Engineering - 1.0.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Fri Jul 24 2009 Fedora Release Engineering 1.0.4-6 +- rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering 1.0.4-5 +- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Sat Dec 13 2008 Charles R. Anderson 1.0.4-4 - for Judy1 man page fix, patch Makefile.{am,in} instead of - relying on autotools to regenerate the latter. -- Add README.Fedora with upstream's license explanation. + relying on autotools to regenerate the latter +- add README.Fedora with upstream's license explanation * Thu Nov 30 2008 Charles R. Anderson 1.0.4-3 - fix Judy1 man page symlinks @@ -126,4 +114,4 @@ rm -rf $RPM_BUILD_ROOT - run tests in check section * Sun Oct 05 2008 Charles R. Anderson 1.0.4-1 -- Initial package for Fedora +- initial package for Fedora diff --git a/sources b/sources index 63b7b73..0114463 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b03d4b016115ca15a5a96368a76cd10 Judy-1.0.4.tar.gz +115a0d26302676e962ae2f70ec484a54 Judy-1.0.5.tar.gz