Author: glen Date: Wed Dec 26 18:01:32 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - use conf.d for apache config fragment; rel 2
---- Files affected: SPECS: subversion.spec (1.199 -> 1.200) ---- Diffs: ================================================================ Index: SPECS/subversion.spec diff -u SPECS/subversion.spec:1.199 SPECS/subversion.spec:1.200 --- SPECS/subversion.spec:1.199 Thu Dec 20 22:01:17 2007 +++ SPECS/subversion.spec Wed Dec 26 19:01:27 2007 @@ -18,7 +18,7 @@ Summary(pt_BR.UTF-8): Sistema de versionamento concorrente Name: subversion Version: 1.4.6 -Release: 1 +Release: 2 License: Apache/BSD Style Group: Development/Version Control Source0: http://subversion.tigris.org/downloads/%{name}-%{version}.tar.gz @@ -67,8 +67,9 @@ Requires: %{name}-libs = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _apachelibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) %define _libexecdir %{_libdir}/svn +%define pkgconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d +%define pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) %description The goal of the Subversion project is to build a version control @@ -336,7 +337,7 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,bash_completion.d} \ - $RPM_BUILD_ROOT{%{_sysconfdir}/httpd/httpd.conf,%{_apachelibdir},%{_infodir}} \ + $RPM_BUILD_ROOT{%{pkgconfdir},%{pkglibdir},%{_infodir}} \ $RPM_BUILD_ROOT%{_examplesdir}/{%{name}-%{version},python-%{name}-%{version}} \ $RPM_BUILD_ROOT/home/services/subversion{,/repos} @@ -362,8 +363,8 @@ %endif %if %{with apache} -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/65_mod_dav_svn.conf -install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/66_mod_authz_svn.conf +install %{SOURCE1} $RPM_BUILD_ROOT%{pkgconfdir}/65_mod_dav_svn.conf +install %{SOURCE2} $RPM_BUILD_ROOT%{pkgconfdir}/66_mod_authz_svn.conf install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/svnserve install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/svnserve %endif @@ -503,14 +504,14 @@ %if %{with apache} %files -n apache-mod_dav_svn %defattr(644,root,root,755) -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/httpd.conf/*_mod_dav_svn.conf -%attr(755,root,root) %{_apachelibdir}/mod_dav_svn.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{pkgconfdir}/*_mod_dav_svn.conf +%attr(755,root,root) %{pkglibdir}/mod_dav_svn.so %files -n apache-mod_authz_svn %defattr(644,root,root,755) %doc subversion/mod_authz_svn/INSTALL -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/httpd.conf/*_mod_authz_svn.conf -%attr(755,root,root) %{_apachelibdir}/mod_authz_svn.so +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{pkgconfdir}/*_mod_authz_svn.conf +%attr(755,root,root) %{pkglibdir}/mod_authz_svn.so %endif %endif # net_client_only @@ -521,6 +522,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.200 2007-12-26 18:01:27 glen +- use conf.d for apache config fragment; rel 2 + Revision 1.199 2007-12-20 21:01:17 arekm - up to 1.4.6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/subversion.spec?r1=1.199&r2=1.200&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
