Author: glen Date: Tue Oct 14 14:33:45 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - apr1 patch uneeded - unify with apache 1.3 package
---- Files affected: SPECS: apache-mod_fastcgi.spec (1.59 -> 1.60) ---- Diffs: ================================================================ Index: SPECS/apache-mod_fastcgi.spec diff -u SPECS/apache-mod_fastcgi.spec:1.59 SPECS/apache-mod_fastcgi.spec:1.60 --- SPECS/apache-mod_fastcgi.spec:1.59 Tue Oct 14 13:33:56 2008 +++ SPECS/apache-mod_fastcgi.spec Tue Oct 14 16:33:39 2008 @@ -11,15 +11,15 @@ Release: 5 License: distributable Group: Networking/Daemons -Source0: http://www.FastCGI.com/dist/mod_%{mod_name}-%{version}.tar.gz +Source0: http://www.fastcgi.com/dist/mod_%{mod_name}-%{version}.tar.gz # Source0-md5: a21a613dd5dacf4c8ad88c8550294fed Patch0: %{name}-allow-uid-gid.patch Patch1: %{name}-socketdir.patch +Patch2: %{name}-stderr-buf.patch Patch3: %{name}-segv-onload.patch -Patch4: %{name}-apr1.patch -Patch5: %{name}-apache22.patch +Patch4: %{name}-apache22.patch Source1: %{name}.conf -URL: http://www.FastCGI.com/ +URL: http://www.fastcgi.com/ BuildRequires: %{apxs} BuildRequires: apache-devel >= 2.2 BuildRequires: libtool @@ -27,8 +27,8 @@ Requires: apache(modules-api) = %apache_modules_api BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define apacheconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d -%define apachelibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) +%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d +%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) %define _socketdir /var/run/httpd/fastcgi %description @@ -60,22 +60,22 @@ %setup -q -n mod_%{mod_name}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %build %{__make} -f Makefile.AP2 \ - top_dir=%{apachelibdir} \ + top_dir=%{_pkglibdir} \ INCLUDES="-I%(%{apxs} -q INCLUDEDIR)" \ EXTRA_CFLAGS='-DAPACHE22' %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir},%{_socketdir}/dynamic} +install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir},%{_socketdir}/dynamic} -install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{apachelibdir} -install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/90_mod_%{mod_name}.conf +install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir} +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf %clean rm -rf $RPM_BUILD_ROOT @@ -91,8 +91,8 @@ %files %defattr(644,root,root,755) %doc docs/LICENSE.TERMS CHANGES docs/*.html -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf -%attr(755,root,root) %{apachelibdir}/*.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf +%attr(755,root,root) %{_pkglibdir}/*.so %dir %attr(770,root,http) %{_socketdir} %dir %attr(770,root,http) %{_socketdir}/dynamic @@ -102,6 +102,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.60 2008/10/14 14:33:39 glen +- apr1 patch uneeded +- unify with apache 1.3 package + Revision 1.59 2008/10/14 11:33:56 glen - sort patches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-mod_fastcgi.spec?r1=1.59&r2=1.60&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
