rename to judy1phpHEADmaster

bump soname to 101

4 files changed, 70 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..01f0400
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+clog
+package-*.xml
+*.tgz
+*.tar.bz2
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..91b0fd5
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../../common/Makefile
+
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 <dougbaskins@yahoo.com>
+To: Chuck Anderson <cra@WPI.EDU>
+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 <dougbaskins@yahoo.com>
+
+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 <cra@wpi.edu>
diff --git a/judy1php.spec b/judy1php.spec
index f0e1b5a..0681805 100644
--- a/judy1php.spec
+++ b/judy1php.spec
@@ -1,6 +1,20 @@
-Name:		Judy
+# remirepo spec file for judy1php
+# renamed for parallel installation, from:
+#
+# Fedora spec file for Judy
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve changelog entries
+#
+%global libname Judy
+%global oldsoname  1
+%global newsoname  1
+
+Name:		judy%{oldsoname}php
 Version:	1.0.5
-Release:	18%{?dist}
+Release:	20%{?dist}
 Summary:	General purpose dynamic array
 License:	LGPLv2+
 URL:		http://sourceforge.net/projects/judy/
@@ -31,10 +45,16 @@ 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.
 
+%{name} is designed to be installed beside %{libname}
+and only used by PHP extensions (memprof...).
+
 %package devel
 Summary:	Development libraries and headers for Judy
 Requires:	%{name} = %{version}-%{release}
 
+Conflicts: %{libname}-devel          <  %{version}-%{release}
+Provides:  %{libname}-devel          =  %{version}-%{release}
+
 %description devel
 This package contains the development libraries and header files
 for developing applications that use the Judy library.
@@ -46,6 +66,11 @@ for developing applications that use the Judy library.
 %patch2 -p1 -b .behavior
 cp -p %{SOURCE1} .
 
+: bump soname
+grep     'VERSION_INFO' configure.ac
+sed -e '/^VERSION_INFO/s/1:3:0/101:3:0/' -i configure
+
+
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing -fno-tree-ccp -fno-tree-dominator-opts -fno-tree-copy-prop -fno-tree-vrp"
 %configure --disable-static
@@ -76,13 +101,10 @@ cd -
 %endif
 
 %files
-%if 0%{?_licensedir:1}
+%{!?_licensedir:%global license %%doc}
 %license COPYING README.Fedora
-%else
-%doc COPYING README.Fedora
-%endif
 %doc AUTHORS ChangeLog README examples/
-%{_libdir}/libJudy.so.*
+%{_libdir}/libJudy.so.%{newsoname}*
 
 %files devel
 %doc doc
@@ -90,7 +112,12 @@ cd -
 %{_libdir}/libJudy.so
 %{_mandir}/man3/J*.3*
 
+
 %changelog
+* Mon Jul  6 2020 Remi Collet <remi@remirepo.net> - 1.0.5-1
+- rename to judy1php
+- bump soname to 101
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild