From 5678cc99ce68f8157840040fbd1855efd15b331793de0c5dab334b559eb6084b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 20 Dec 2014 12:03:49 +0000 Subject: [PATCH 1/3] . OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/FastCGI?expand=0&rev=36 --- FastCGI.changes | 8 ++++++++ FastCGI.spec | 43 +++++++++++++++++++------------------------ 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/FastCGI.changes b/FastCGI.changes index 8cc65f6..c1c0293 100644 --- a/FastCGI.changes +++ b/FastCGI.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Dec 20 11:57:22 UTC 2014 - jengelh@inai.de + +- "libfcgi++-0" package name is wrong (should be "libfcgi++0"); + change to libfcgi0 (due to libfcgi.so.0 being present, which is + the main one). +- Remove pointless --with-pic (it is enabled by default anyway) + ------------------------------------------------------------------- Sat Dec 13 13:33:33 UTC 2014 - p.drouand@gmail.com diff --git a/FastCGI.spec b/FastCGI.spec index 1de2362..7cce724 100644 --- a/FastCGI.spec +++ b/FastCGI.spec @@ -15,18 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define so_ver 0 Name: FastCGI +%define lname libfcgi0 Version: 2.4.0 Release: 0 -# -# -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: perl -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# +Summary: A Scalable, Open Extension to CGI +License: OML +Group: Development/Languages/C and C++ Url: http://www.fastcgi.com Source: http://www.fastcgi.com/dist/fcgi.tar.bz2 Source1: README.supervise @@ -37,10 +33,10 @@ Patch3: fastcgi-2.4.0_missing_call_to_fclose.patch Patch4: FastCGI-gcc44.patch Patch5: FastCGI-perl514.patch Patch6: FastCGI-fix_deprecated_api.patch -# -Summary: A Scalable, Open Extension to CGI -License: OML -Group: Development/Languages/C and C++ +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: perl +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description FastCGI is a language-independent, scalable, open extension to CGI that @@ -50,7 +46,7 @@ APIs. %package devel Summary: A scalable, open extension to CGI Group: Development/Languages/C and C++ -Requires: libfcgi++-%{so_ver} = %{version} +Requires: %lname = %version Requires: glibc-devel %description devel @@ -58,11 +54,13 @@ FastCGI is a language independent, scalable, open extension to CGI that provides high performance without the limitations of server specific APIs. -%package -n libfcgi++-%{so_ver} +%package -n %lname Summary: A scalable, open extension to CGI - System library Group: System/Libraries +Obsoletes: libfcgi++-0 < %version-%release +Provides: libfcgi++-0 = %version-%release -%description -n libfcgi++-%{so_ver} +%description -n %lname FastCGI is a language independent, scalable, open extension to CGI that provides high performance without the limitations of server specific APIs. @@ -96,16 +94,16 @@ find doc/{fastcgi-prog-guide,fastcgi-whitepaper} -type f -print0 | xargs -r0 chm %build autoreconf -fi -%configure --disable-static --with-pic --includedir=%{_includedir}/fastcgi +%configure --disable-static --includedir=%{_includedir}/fastcgi make all pushd perl - %configure --disable-static --with-pic --includedir=%{_includedir}/fastcgi + %configure --disable-static --includedir=%{_includedir}/fastcgi %{__perl} Makefile.PL make %{?_smp_mflags} all popd %install -%makeinstall +%make_install pushd perl %perl_make_install %perl_process_packlist @@ -127,11 +125,8 @@ popd %{buildroot}%{_docdir}/%{name}/ rm -f %{buildroot}%{_libdir}/libfcgi*.la -%post -n libfcgi++-%{so_ver} -/sbin/ldconfig - -%postun -n libfcgi++-%{so_ver} -/sbin/ldconfig +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files %defattr(-,root,root) @@ -146,7 +141,7 @@ rm -f %{buildroot}%{_libdir}/libfcgi*.la %{_libdir}/libfcgi*.so %{_mandir}/man3/*.3.gz -%files -n libfcgi++-%{so_ver} +%files -n %lname %defattr(-,root,root) %{_libdir}/libfcgi*.so.* From c4e6faab1debff6cd5e0e791ea6c673e04756c22e7d5388f549a357ba920b135 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 20 Dec 2014 12:05:57 +0000 Subject: [PATCH 2/3] revert that unintended commit; making a branch with notification first OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/FastCGI?expand=0&rev=37 --- FastCGI.changes | 8 -------- FastCGI.spec | 44 +++++++++++++++++++++++++------------------- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/FastCGI.changes b/FastCGI.changes index c1c0293..8cc65f6 100644 --- a/FastCGI.changes +++ b/FastCGI.changes @@ -1,11 +1,3 @@ -------------------------------------------------------------------- -Sat Dec 20 11:57:22 UTC 2014 - jengelh@inai.de - -- "libfcgi++-0" package name is wrong (should be "libfcgi++0"); - change to libfcgi0 (due to libfcgi.so.0 being present, which is - the main one). -- Remove pointless --with-pic (it is enabled by default anyway) - ------------------------------------------------------------------- Sat Dec 13 13:33:33 UTC 2014 - p.drouand@gmail.com diff --git a/FastCGI.spec b/FastCGI.spec index 7cce724..d7ca08e 100644 --- a/FastCGI.spec +++ b/FastCGI.spec @@ -16,13 +16,18 @@ # +%define so_ver 0 + Name: FastCGI -%define lname libfcgi0 Version: 2.4.0 Release: 0 -Summary: A Scalable, Open Extension to CGI -License: OML -Group: Development/Languages/C and C++ +# +# +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: perl +BuildRoot: %{_tmppath}/%{name}-%{version}-build +# Url: http://www.fastcgi.com Source: http://www.fastcgi.com/dist/fcgi.tar.bz2 Source1: README.supervise @@ -33,10 +38,10 @@ Patch3: fastcgi-2.4.0_missing_call_to_fclose.patch Patch4: FastCGI-gcc44.patch Patch5: FastCGI-perl514.patch Patch6: FastCGI-fix_deprecated_api.patch -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: perl -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# +Summary: A Scalable, Open Extension to CGI +License: OML +Group: Development/Languages/C and C++ %description FastCGI is a language-independent, scalable, open extension to CGI that @@ -46,21 +51,19 @@ APIs. %package devel Summary: A scalable, open extension to CGI Group: Development/Languages/C and C++ -Requires: %lname = %version Requires: glibc-devel +Requires: libfcgi++-%{so_ver} = %{version} %description devel FastCGI is a language independent, scalable, open extension to CGI that provides high performance without the limitations of server specific APIs. -%package -n %lname +%package -n libfcgi++-%{so_ver} Summary: A scalable, open extension to CGI - System library Group: System/Libraries -Obsoletes: libfcgi++-0 < %version-%release -Provides: libfcgi++-0 = %version-%release -%description -n %lname +%description -n libfcgi++-%{so_ver} FastCGI is a language independent, scalable, open extension to CGI that provides high performance without the limitations of server specific APIs. @@ -94,16 +97,16 @@ find doc/{fastcgi-prog-guide,fastcgi-whitepaper} -type f -print0 | xargs -r0 chm %build autoreconf -fi -%configure --disable-static --includedir=%{_includedir}/fastcgi +%configure --disable-static --with-pic --includedir=%{_includedir}/fastcgi make all pushd perl - %configure --disable-static --includedir=%{_includedir}/fastcgi + %configure --disable-static --with-pic --includedir=%{_includedir}/fastcgi %{__perl} Makefile.PL make %{?_smp_mflags} all popd %install -%make_install +%makeinstall pushd perl %perl_make_install %perl_process_packlist @@ -125,8 +128,11 @@ popd %{buildroot}%{_docdir}/%{name}/ rm -f %{buildroot}%{_libdir}/libfcgi*.la -%post -n %lname -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%post -n libfcgi++-%{so_ver} +/sbin/ldconfig + +%postun -n libfcgi++-%{so_ver} +/sbin/ldconfig %files %defattr(-,root,root) @@ -141,7 +147,7 @@ rm -f %{buildroot}%{_libdir}/libfcgi*.la %{_libdir}/libfcgi*.so %{_mandir}/man3/*.3.gz -%files -n %lname +%files -n libfcgi++-%{so_ver} %defattr(-,root,root) %{_libdir}/libfcgi*.so.* From 6bb0867dd59a1a9c51d30e300c20c9fd3d1cb74aaf19f18dcbfea5ff9abfeab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 26 Dec 2014 11:18:24 +0000 Subject: [PATCH 3/3] Accepting request 266001 from home:jengelh:branches:devel:libraries:c_c++ - "libfcgi++-0" package name is wrong (should be "libfcgi++0"); change to libfcgi0 (due to libfcgi.so.0 being present, which is the main one). OBS-URL: https://build.opensuse.org/request/show/266001 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/FastCGI?expand=0&rev=38 --- FastCGI.changes | 8 ++++++++ FastCGI.spec | 44 +++++++++++++++++++------------------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/FastCGI.changes b/FastCGI.changes index 8cc65f6..c1c0293 100644 --- a/FastCGI.changes +++ b/FastCGI.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Dec 20 11:57:22 UTC 2014 - jengelh@inai.de + +- "libfcgi++-0" package name is wrong (should be "libfcgi++0"); + change to libfcgi0 (due to libfcgi.so.0 being present, which is + the main one). +- Remove pointless --with-pic (it is enabled by default anyway) + ------------------------------------------------------------------- Sat Dec 13 13:33:33 UTC 2014 - p.drouand@gmail.com diff --git a/FastCGI.spec b/FastCGI.spec index d7ca08e..7cce724 100644 --- a/FastCGI.spec +++ b/FastCGI.spec @@ -16,18 +16,13 @@ # -%define so_ver 0 - Name: FastCGI +%define lname libfcgi0 Version: 2.4.0 Release: 0 -# -# -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: perl -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# +Summary: A Scalable, Open Extension to CGI +License: OML +Group: Development/Languages/C and C++ Url: http://www.fastcgi.com Source: http://www.fastcgi.com/dist/fcgi.tar.bz2 Source1: README.supervise @@ -38,10 +33,10 @@ Patch3: fastcgi-2.4.0_missing_call_to_fclose.patch Patch4: FastCGI-gcc44.patch Patch5: FastCGI-perl514.patch Patch6: FastCGI-fix_deprecated_api.patch -# -Summary: A Scalable, Open Extension to CGI -License: OML -Group: Development/Languages/C and C++ +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: perl +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description FastCGI is a language-independent, scalable, open extension to CGI that @@ -51,19 +46,21 @@ APIs. %package devel Summary: A scalable, open extension to CGI Group: Development/Languages/C and C++ +Requires: %lname = %version Requires: glibc-devel -Requires: libfcgi++-%{so_ver} = %{version} %description devel FastCGI is a language independent, scalable, open extension to CGI that provides high performance without the limitations of server specific APIs. -%package -n libfcgi++-%{so_ver} +%package -n %lname Summary: A scalable, open extension to CGI - System library Group: System/Libraries +Obsoletes: libfcgi++-0 < %version-%release +Provides: libfcgi++-0 = %version-%release -%description -n libfcgi++-%{so_ver} +%description -n %lname FastCGI is a language independent, scalable, open extension to CGI that provides high performance without the limitations of server specific APIs. @@ -97,16 +94,16 @@ find doc/{fastcgi-prog-guide,fastcgi-whitepaper} -type f -print0 | xargs -r0 chm %build autoreconf -fi -%configure --disable-static --with-pic --includedir=%{_includedir}/fastcgi +%configure --disable-static --includedir=%{_includedir}/fastcgi make all pushd perl - %configure --disable-static --with-pic --includedir=%{_includedir}/fastcgi + %configure --disable-static --includedir=%{_includedir}/fastcgi %{__perl} Makefile.PL make %{?_smp_mflags} all popd %install -%makeinstall +%make_install pushd perl %perl_make_install %perl_process_packlist @@ -128,11 +125,8 @@ popd %{buildroot}%{_docdir}/%{name}/ rm -f %{buildroot}%{_libdir}/libfcgi*.la -%post -n libfcgi++-%{so_ver} -/sbin/ldconfig - -%postun -n libfcgi++-%{so_ver} -/sbin/ldconfig +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files %defattr(-,root,root) @@ -147,7 +141,7 @@ rm -f %{buildroot}%{_libdir}/libfcgi*.la %{_libdir}/libfcgi*.so %{_mandir}/man3/*.3.gz -%files -n libfcgi++-%{so_ver} +%files -n %lname %defattr(-,root,root) %{_libdir}/libfcgi*.so.*