Author: glen Date: Sun Mar 29 14:44:50 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - unify (template-apache_module.spec)
---- Files affected: SPECS: scgi.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/scgi.spec diff -u SPECS/scgi.spec:1.17 SPECS/scgi.spec:1.18 --- SPECS/scgi.spec:1.17 Sat Mar 28 23:50:33 2009 +++ SPECS/scgi.spec Sun Mar 29 16:44:45 2009 @@ -30,6 +30,9 @@ BuildRequires: rpmbuild(macros) >= 1.268 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) +%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d + %description The SCGI protocol is a replacement for the Common Gateway Interface (CGI) protocol. It is a standard for applications to interface with @@ -105,11 +108,9 @@ %install rm -rf $RPM_BUILD_ROOT %if %{with apache} -install -d $RPM_BUILD_ROOT%{_libdir}/apache -install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d - -install apache2/.libs/mod_scgi.so $RPM_BUILD_ROOT%{_libdir}/apache -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/60_mod_scgi.conf +install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}} +install apache2/.libs/mod_scgi.so $RPM_BUILD_ROOT%{_pkglibdir} +install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/60_mod_scgi.conf %endif %{__python} setup.py install \ @@ -133,8 +134,8 @@ %files -n apache-mod_scgi %defattr(644,root,root,755) %doc CHANGES.txt apache2/README.txt LICENSE.txt doc/LICENSE_110.txt -%attr(755,root,root) %{_libdir}/apache/mod_%{name}.so -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/conf.d/*.conf +%attr(755,root,root) %{_pkglibdir}/mod_%{name}.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf %endif %files -n python-%{name} @@ -151,6 +152,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2009/03/29 14:44:45 glen +- unify (template-apache_module.spec) + Revision 1.17 2009/03/28 22:50:33 areq - install conf in /etc/httpd/conf.d/ - rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/scgi.spec?r1=1.17&r2=1.18&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit