rpms/fcgi/EL-5 fcgi-2.4.0-gcc44_fixes.patch, NONE, 1.1 fcgi.spec, 1.4, 1.5

[Chris Weyl]

Author: cweyl

Update of /cvs/extras/rpms/fcgi/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27832

Modified Files:
	fcgi.spec 
Added Files:
	fcgi-2.4.0-gcc44_fixes.patch 
Log Message:
* Mon Jan 18 2010 Chris Weyl <cweyl at alumni.drew.edu> - 2.4.0-12
- drop perl .so provides filtering, as it may have multiarch rpm implications


fcgi-2.4.0-gcc44_fixes.patch:
 fcgio.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE fcgi-2.4.0-gcc44_fixes.patch ---
diff -up fcgi-2.4.0/libfcgi/fcgio.cpp.gcc44_fixes fcgi-2.4.0/libfcgi/fcgio.cpp
--- fcgi-2.4.0/libfcgi/fcgio.cpp.gcc44_fixes	2002-02-24 21:12:22.000000000 +0100
+++ fcgi-2.4.0/libfcgi/fcgio.cpp	2009-02-15 11:35:18.000000000 +0100
@@ -23,6 +23,7 @@
 #endif
 
 #include <limits.h>
+#include <cstdio>
 #include "fcgio.h"
 
 using std::streambuf;


Index: fcgi.spec
===================================================================
RCS file: /cvs/extras/rpms/fcgi/EL-5/fcgi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- fcgi.spec	23 Aug 2007 08:36:34 -0000	1.4
+++ fcgi.spec	19 Jan 2010 06:42:08 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           fcgi
 Version:        2.4.0
-Release:        4%{?dist}
+Release:        11%{?dist}
 Summary:        FastCGI development kit
 
 Group:          Development/Languages
@@ -12,8 +12,11 @@ Patch0:         fcgi-2.4.0-autotools.pat
 # Patch0 created with Source1 after patching Patch1 and Patch2
 Patch1:         fcgi-2.4.0-configure.in.patch
 Patch2:         fcgi-2.4.0-Makefile.am-CPPFLAGS.patch
+Patch3:         fcgi-2.4.0-gcc44_fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# for -perl
+BuildRequires:  perl(ExtUtils::MakeMaker)
 
 %description
 FastCGI is a language independent, scalable, open extension to CGI that
@@ -31,9 +34,22 @@ The %{name}-devel package contains libra
 developing applications that use %{name}.
 
 
+%package perl
+Summary:        Perl bindings for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+
+%description    perl
+The %{name}-perl package contains the perl bindings for fcgi.
+
+
 %prep
 %setup -q
 %patch0 -p1
+%patch3 -p1 -b .gcc44_fixes
+
 # remove DOS End Of Line Encoding
 sed -i 's/\r//' doc/fastcgi-prog-guide/ch2c.htm
 # fix file permissions
@@ -45,6 +61,11 @@ chmod a-x include/fcgios.h libfcgi/os_un
 # does not build with parallel make flags
 make
 
+# build the perl bindings
+cd perl
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,10 +81,28 @@ done
 rm -f -- doc/*.1
 rm -f -- doc/*.3
 
+# install the perl bindings
+cd perl
+
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
+
+chmod -x *.fpl
+%{_fixperms} $RPM_BUILD_ROOT/%{perl_vendorarch}
+
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
+%check
+# perl tests -- none presently, but that may change
+cd perl && make test
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -84,11 +123,45 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libfcgi.so
 %{_libdir}/libfcgi++.so
 %{_mandir}/man3/*
+%exclude %{_mandir}/man3/*.3pm*
 %defattr(0644,root,root,0755)
 %doc doc/
 
 
+%files perl
+%defattr(-,root,root,-)
+%doc perl/ChangeLog perl/README perl/*.fpl 
+%{perl_vendorarch}/*
+%exclude %dir %{perl_vendorarch}/auto
+%{_mandir}/man3/*.3pm*
+%defattr(0644,root,root,0755)
+
+
 %changelog
+* Mon Jan 18 2010 Chris Weyl <cweyl at alumni.drew.edu> - 2.4.0-12
+- drop perl .so provides filtering, as it may have multiarch rpm implications
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.4.0-11
+- rebuild against perl 5.10.1
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Mar 01 2009 Chris Weyl <cweyl at alumni.drew.edu> - 2.4.0-9
+- Stripping bad provides of private Perl extension libs
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Feb 15 2009 Till Maas <opensource at till.name> - 2.4.0-7
+- Add missing #include <cstdio> to make it compile with gcc 4.4
+
+* Tue Oct 14 2008 Chris Weyl <cweyl at alumni.drew.edu> - 2.4.0-6
+- package up the perl bindings in their own subpackage
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.4.0-5
+- Autorebuild for GCC 4.3
+
 * Thu Aug 23 2007 Till Maas <opensource till name> - 2.4.0-4
 - bump release for rebuild