From 9ccc5fc834164eaa714a5f1667d81198fb4e0bbd Mon Sep 17 00:00:00 2001 From: "Charles R. Anderson" Date: Sun, 21 Dec 2008 19:27:35 +0000 Subject: [PATCH] initial import --- .cvsignore | 1 + Judy-1.0.4-fix-Judy1-mans.patch | 80 +++++++++++++++++++++ Judy-1.0.4-test-shared.patch | 14 ++++ Judy.spec | 123 ++++++++++++++++++++++++++++++++ README.Fedora | 23 ++++++ import.log | 1 + sources | 1 + 7 files changed, 243 insertions(+) create mode 100644 Judy-1.0.4-fix-Judy1-mans.patch create mode 100644 Judy-1.0.4-test-shared.patch create mode 100644 Judy.spec create mode 100644 README.Fedora create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..082bca0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +Judy-1.0.4.tar.gz diff --git a/Judy-1.0.4-fix-Judy1-mans.patch b/Judy-1.0.4-fix-Judy1-mans.patch new file mode 100644 index 0000000..06ab742 --- /dev/null +++ b/Judy-1.0.4-fix-Judy1-mans.patch @@ -0,0 +1,80 @@ +diff -up Judy-1.0.4/doc/Makefile.am.fix-Judy1-mans Judy-1.0.4/doc/Makefile.am +--- Judy-1.0.4/doc/Makefile.am.fix-Judy1-mans 2006-01-18 16:56:43.000000000 -0500 ++++ Judy-1.0.4/doc/Makefile.am 2008-11-27 14:08:53.000000000 -0500 +@@ -100,21 +100,21 @@ man/man3/Judy: + + man/man3/Judy1: + ../tool/jhton ext/Judy1_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/Judy1 +- cd man/man3; ln -s Judy J1T +- cd man/man3; ln -s Judy J1S +- cd man/man3; ln -s Judy J1U +- cd man/man3; ln -s Judy J1F +- cd man/man3; ln -s Judy J1N +- cd man/man3; ln -s Judy J1L +- cd man/man3; ln -s Judy J1P +- cd man/man3; ln -s Judy J1FE +- cd man/man3; ln -s Judy J1NE +- cd man/man3; ln -s Judy J1LE +- cd man/man3; ln -s Judy J1PE +- cd man/man3; ln -s Judy J1C +- cd man/man3; ln -s Judy J1BC +- cd man/man3; ln -s Judy J1FA +- cd man/man3; ln -s Judy J1MU ++ cd man/man3; ln -s Judy1 J1T ++ cd man/man3; ln -s Judy1 J1S ++ cd man/man3; ln -s Judy1 J1U ++ cd man/man3; ln -s Judy1 J1F ++ cd man/man3; ln -s Judy1 J1N ++ cd man/man3; ln -s Judy1 J1L ++ cd man/man3; ln -s Judy1 J1P ++ cd man/man3; ln -s Judy1 J1FE ++ cd man/man3; ln -s Judy1 J1NE ++ cd man/man3; ln -s Judy1 J1LE ++ cd man/man3; ln -s Judy1 J1PE ++ cd man/man3; ln -s Judy1 J1C ++ cd man/man3; ln -s Judy1 J1BC ++ cd man/man3; ln -s Judy1 J1FA ++ cd man/man3; ln -s Judy1 J1MU + + man/man3/Judy1_funcs: + ../tool/jhton ext/Judy1_funcs_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/Judy1_funcs +diff -up Judy-1.0.4/doc/Makefile.in.fix-Judy1-mans Judy-1.0.4/doc/Makefile.in +--- Judy-1.0.4/doc/Makefile.in.fix-Judy1-mans 2007-05-14 17:10:55.000000000 -0400 ++++ Judy-1.0.4/doc/Makefile.in 2008-12-13 12:55:14.000000000 -0500 +@@ -471,21 +479,21 @@ man/man3/Judy: + + man/man3/Judy1: + ../tool/jhton ext/Judy1_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/Judy1 +- cd man/man3; ln -s Judy J1T +- cd man/man3; ln -s Judy J1S +- cd man/man3; ln -s Judy J1U +- cd man/man3; ln -s Judy J1F +- cd man/man3; ln -s Judy J1N +- cd man/man3; ln -s Judy J1L +- cd man/man3; ln -s Judy J1P +- cd man/man3; ln -s Judy J1FE +- cd man/man3; ln -s Judy J1NE +- cd man/man3; ln -s Judy J1LE +- cd man/man3; ln -s Judy J1PE +- cd man/man3; ln -s Judy J1C +- cd man/man3; ln -s Judy J1BC +- cd man/man3; ln -s Judy J1FA +- cd man/man3; ln -s Judy J1MU ++ cd man/man3; ln -s Judy1 J1T ++ cd man/man3; ln -s Judy1 J1S ++ cd man/man3; ln -s Judy1 J1U ++ cd man/man3; ln -s Judy1 J1F ++ cd man/man3; ln -s Judy1 J1N ++ cd man/man3; ln -s Judy1 J1L ++ cd man/man3; ln -s Judy1 J1P ++ cd man/man3; ln -s Judy1 J1FE ++ cd man/man3; ln -s Judy1 J1NE ++ cd man/man3; ln -s Judy1 J1LE ++ cd man/man3; ln -s Judy1 J1PE ++ cd man/man3; ln -s Judy1 J1C ++ cd man/man3; ln -s Judy1 J1BC ++ cd man/man3; ln -s Judy1 J1FA ++ cd man/man3; ln -s Judy1 J1MU + + man/man3/Judy1_funcs: + ../tool/jhton ext/Judy1_funcs_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/Judy1_funcs diff --git a/Judy-1.0.4-test-shared.patch b/Judy-1.0.4-test-shared.patch new file mode 100644 index 0000000..28d8a59 --- /dev/null +++ b/Judy-1.0.4-test-shared.patch @@ -0,0 +1,14 @@ +diff -up Judy-1.0.4/test/Checkit.test-shared Judy-1.0.4/test/Checkit +--- Judy-1.0.4/test/Checkit.test-shared 2007-05-14 13:02:16.000000000 -0400 ++++ Judy-1.0.4/test/Checkit 2008-11-27 12:56:28.000000000 -0500 +@@ -4,8 +4,9 @@ CC=${CC:-cc} + echo + echo "=== +++++++++ This test runs in 15 seconds on a PIII 750Mhz +++++++" + +-LIBJUDY=`find ../ -name libJudy.a` ++LIBJUDY=`find ../ -name libJudy.so` + JUDY_H=`find ../ -name Judy.h` ++export LD_LIBRARY_PATH=`dirname $LIBJUDY` + + echo "$CC -O SLcompare.c -DHASHMETHOD -o SL_Hash" + $CC -O SLcompare.c -DHASHMETHOD -o SL_Hash diff --git a/Judy.spec b/Judy.spec new file mode 100644 index 0000000..e6f0fee --- /dev/null +++ b/Judy.spec @@ -0,0 +1,123 @@ +Name: Judy +Version: 1.0.4 +Release: 4%{?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 +Source1: README.Fedora +# 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. +Patch1: Judy-1.0.4-fix-Judy1-mans.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +#BuildRequires: +#Requires: + +%description +Judy is a C library that provides a state-of-the-art core technology +that implements a sparse dynamic array. Judy arrays are declared +simply with a null pointer. A Judy array consumes memory only when it +is populated, yet can grow to take advantage of all available memory +if desired. Judy's key benefits are scalability, high performance, and +memory efficiency. A Judy array is extensible and can scale up to a +very large number of elements, bounded only by machine memory. Since +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 +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains the development libraries and header files +for developing applications that use the Judy library. + + +%prep +%setup -q +%patch0 -p1 -b .test-shared +%patch1 -p1 -b .fix-Judy1-mans +cp -p %{SOURCE1} . + + +%build +%configure --disable-static +make +#%{?_smp_mflags} +# 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 +# get rid of static libs and libtool archives +rm -f $RPM_BUILD_ROOT/%{_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 + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README README.Fedora +%{_libdir}/*.so.* + + +%files devel +%defattr(-,root,root,-) +%doc doc +%{_libdir}/*.so +%{_includedir}/* +%{_mandir}/man3/* + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%changelog +* 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. + +* Thu Nov 30 2008 Charles R. Anderson 1.0.4-3 +- fix Judy1 man page symlinks +- use valid tag License: LGPLv2+ confirmed with upstream +- use version macro in Source0 +- remove Makefiles from installed doc tree + +* Thu Nov 27 2008 Charles R. Anderson 1.0.4-2 +- patch tests to run with shared library +- run tests in check section + +* Sun Oct 05 2008 Charles R. Anderson 1.0.4-1 +- Initial package for Fedora diff --git a/README.Fedora b/README.Fedora new file mode 100644 index 0000000..1397bfb --- /dev/null +++ b/README.Fedora @@ -0,0 +1,23 @@ +Regarding the license, upstream has confirmed that the current license is LGPL +v2.1 or later. Also, the source code is really the final say on this, and it +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." Either way, Fedora spec files don't distinguish between v2.1 and v2, +so this is specified as LGPLv2+ for the spec file. + +"From dougbaskins@yahoo.com Thu Nov 27 21:45:54 2008 +From: Doug Baskins +To: Chuck Anderson +Cc: judy-devel@lists.sourceforge.net +Date: Thu, 27 Nov 2008 18:45:47 -0800 (PST) +Subject: Re: Judy license confusion - (LGPL v2.1 or later applies) +Reply-To: Doug Baskins + +Chuck: + +I did not know a new version of LGPL existed. You are correct, +the COPYING file is correct (LGPL v2.1 or later applies). I will +change the README file to reflect that in the next release of Judy. +..." + +- Chuck Anderson diff --git a/import.log b/import.log new file mode 100644 index 0000000..9dcc47e --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +Judy-1_0_4-4_fc10:HEAD:Judy-1.0.4-4.fc10.src.rpm:1229887468 diff --git a/sources b/sources index e69de29..63b7b73 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +7b03d4b016115ca15a5a96368a76cd10 Judy-1.0.4.tar.gz