packages: subversion/subversion.spec - package /etc/subversion dir to -libs...

[glen]

Author: glen                         Date: Sun Mar 13 14:37:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- package /etc/subversion dir to -libs
- spec cosmetics

---- Files affected:
packages/subversion:
   subversion.spec (1.298 -> 1.299) 

---- Diffs:

================================================================
Index: packages/subversion/subversion.spec
diff -u packages/subversion/subversion.spec:1.298 packages/subversion/subversion.spec:1.299
--- packages/subversion/subversion.spec:1.298	Sat Mar  5 20:20:51 2011
+++ packages/subversion/subversion.spec	Sun Mar 13 15:37:50 2011
@@ -23,7 +23,7 @@
 %define	pdir	SVN
 %define	pnam	_Core
 
-%if !%{with kde}
+%if %{without kde}
 %undefine	with_kwallet
 %endif
 %if %{with neon}
@@ -435,7 +435,7 @@
 	--without-apache \
 	--without-apxs \
 %endif
-%if !%{with python} && !%{with perl} && !%{with ruby}
+%if %{without python} && %{without perl} && %{without ruby}
 	--without-swig \
 %endif
 	%{?with_python:--with-ctypesgen=%{_bindir}/ctypesgen.py} \
@@ -462,7 +462,7 @@
 
 %{__make} -j1
 
-%if !%{with net_client_only}
+%if %{without net_client_only}
 # python
 %if %{with python}
 # ctypes bindings
@@ -510,6 +510,7 @@
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,bash_completion.d} \
 	$RPM_BUILD_ROOT{%{apacheconfdir},%{apachelibdir},%{_infodir}} \
 	$RPM_BUILD_ROOT%{_examplesdir}/{%{name}-%{version},python-%{name}-%{version}} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
 	$RPM_BUILD_ROOT/home/services/subversion{,/repos}
 
 %{__make} install -j1 \
@@ -517,7 +518,7 @@
 	install-javahl \
 	javahl_javadir="%{_javadir}" \
 %endif
-%if !%{with net_client_only}
+%if %{without net_client_only}
 %if %{with python}
 	install-swig-py \
 	install-ctypes-python \
@@ -531,7 +532,7 @@
 	swig_pydir=%{py_sitedir}/libsvn \
 	swig_pydir_extra=%{py_sitedir}/svn
 
-%if !%{with net_client_only} && %{with perl}
+%if %{without net_client_only} && %{with perl}
 %{__make} install-swig-pl-lib \
 	DESTDIR=$RPM_BUILD_ROOT
 %{__make} -C subversion/bindings/swig/perl/native install \
@@ -541,14 +542,14 @@
 %endif
 
 %if %{with apache}
-install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/65_mod_dav_svn.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{apacheconfdir}/66_mod_authz_svn.conf
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/svnserve
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/svnserve
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/65_mod_dav_svn.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{apacheconfdir}/66_mod_authz_svn.conf
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/svnserve
+install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/svnserve
 %endif
 
-%if !%{with net_client_only}
-install tools/backup/hot-backup.py $RPM_BUILD_ROOT%{_bindir}/svn-hot-backup
+%if %{without net_client_only}
+install -p tools/backup/hot-backup.py $RPM_BUILD_ROOT%{_bindir}/svn-hot-backup
 %if %{with python}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
@@ -558,8 +559,8 @@
 %endif
 %endif
 
-install tools/client-side/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/%{name}
-install tools/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -p tools/client-side/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/%{name}
+cp -p tools/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{?with_javahl:%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvnjavahl*.{la,a}}
 %if %{without net_client_only}
@@ -661,6 +662,7 @@
 
 %files libs -f %{name}.lang
 %defattr(644,root,root,755)
+%dir %{_sysconfdir}/%{name}
 %attr(755,root,root) %{_libdir}/libsvn_client-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_client-1.so.0
 %attr(755,root,root) %{_libdir}/libsvn_delta-1.so.*.*.*
@@ -868,6 +870,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.299  2011/03/13 14:37:50  glen
+- package /etc/subversion dir to -libs
+- spec cosmetics
+
 Revision 1.298  2011/03/05 19:20:51  arekm
 - up to 1.6.16
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/subversion/subversion.spec?r1=1.298&r2=1.299&f=u