Author: glen Date: Wed Dec 26 18:19:43 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - use conf.d for apache config fragment; rel 11
---- Files affected: SPECS: perl-CGI-SpeedyCGI.spec (1.61 -> 1.62) ---- Diffs: ================================================================ Index: SPECS/perl-CGI-SpeedyCGI.spec diff -u SPECS/perl-CGI-SpeedyCGI.spec:1.61 SPECS/perl-CGI-SpeedyCGI.spec:1.62 --- SPECS/perl-CGI-SpeedyCGI.spec:1.61 Tue Feb 13 08:16:53 2007 +++ SPECS/perl-CGI-SpeedyCGI.spec Wed Dec 26 19:19:37 2007 @@ -5,8 +5,8 @@ %bcond_without apache1 # don't build apache1 module %bcond_without apache2 # don't build apache2 module # -%define apxs /usr/sbin/apxs %define apxs1 /usr/sbin/apxs1 +%define apxs2 /usr/sbin/apxs %include /usr/lib/rpm/macros.perl %define pdir CGI %define pnam SpeedyCGI @@ -14,7 +14,7 @@ Summary(pl.UTF-8): Moduł przyspieszający perlowe skrypty CGI Name: perl-CGI-SpeedyCGI Version: 2.22 -Release: 10 +Release: 11 License: GPL v2+ Group: Networking/Daemons Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz @@ -32,15 +32,15 @@ Requires: perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION') BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%if %{with apache2} -%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) -%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null) -%define httpdir /home/services/httpd -%endif %if %{with apache1} -%define _pkglibdir1 %(%{apxs1} -q LIBEXECDIR 2>/dev/null) -%define _sysconfdir1 %(%{apxs1} -q SYSCONFDIR 2>/dev/null) -%define httpdir1 /home/services/apache +%define apache1confdir %(%{apxs1} -q SYSCONFDIR 2>/dev/null)/conf.d +%define apache1libdir %(%{apxs1} -q LIBEXECDIR 2>/dev/null) +%define apache1docdir /home/services/apache +%endif +%if %{with apache2} +%define apache2confdir %(%{apxs2} -q SYSCONFDIR 2>/dev/null)/conf.d +%define apache2libdir %(%{apxs2} -q LIBEXECDIR 2>/dev/null) +%define apache2docdir /home/services/httpd %endif %description @@ -107,7 +107,7 @@ OPTIMIZE="%{rpmcflags}" %endif %if %{with apache2} -%{__make} -C mod_speedycgi2 APXS="%{apxs}" \ +%{__make} -C mod_speedycgi2 APXS="%{apxs2}" \ OPTIMIZE="%{rpmcflags}" %endif @@ -121,14 +121,14 @@ DESTDIR=$RPM_BUILD_ROOT %if %{with apache1} -install -d $RPM_BUILD_ROOT{%{_pkglibdir1},%{httpdir1}/speedy,%{_sysconfdir1}/conf.d} -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir1}/conf.d/mod_speedycgi.conf -install mod_speedycgi/mod_speedycgi.so $RPM_BUILD_ROOT%{_pkglibdir1} +install -d $RPM_BUILD_ROOT{%{apache1libdir},%{apache1docdir}/speedy,%{apache1confdir}} +install %{SOURCE1} $RPM_BUILD_ROOT%{apache1confdir}/mod_speedycgi.conf +install mod_speedycgi/mod_speedycgi.so $RPM_BUILD_ROOT%{apache1libdir} %endif %if %{with apache2} -install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{httpdir}/speedy,%{_sysconfdir}/httpd.conf} -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_speedycgi.conf -install mod_speedycgi2/mod_speedycgi.so $RPM_BUILD_ROOT%{_pkglibdir} +install -d $RPM_BUILD_ROOT{%{apache2libdir},%{apache2docdir}/speedy,%{apache2confdir}} +install %{SOURCE1} $RPM_BUILD_ROOT%{apache2confdir}/90_mod_speedycgi.conf +install mod_speedycgi2/mod_speedycgi.so $RPM_BUILD_ROOT%{apache2libdir} %endif ln -s speedy $RPM_BUILD_ROOT%{_bindir}/speedycgi @@ -161,17 +161,17 @@ %if %{with apache1} %files -n apache1-mod_speedycgi %defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir1}/conf.d/*mod_speedycgi.conf -%attr(755,root,root) %{_pkglibdir1}/mod_speedycgi.so -%dir %{httpdir1}/* +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apache1confdir}/*mod_speedycgi.conf +%attr(755,root,root) %{apache1libdir}/mod_speedycgi.so +%dir %{apache1docdir}/* %endif %if %{with apache2} %files -n apache-mod_speedycgi %defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*mod_speedycgi.conf -%attr(755,root,root) %{_pkglibdir}/mod_speedycgi.so -%dir %{httpdir}/* +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apache2confdir}/*mod_speedycgi.conf +%attr(755,root,root) %{apache2libdir}/mod_speedycgi.so +%dir %{apache2docdir}/* %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -180,6 +180,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.62 2007-12-26 18:19:37 glen +- use conf.d for apache config fragment; rel 11 + Revision 1.61 2007-02-13 07:16:53 glen - tabs in preamble ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/perl-CGI-SpeedyCGI.spec?r1=1.61&r2=1.62&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
