packages: subversion/subversion.spec - added kde bcond (alias for kwallet) ...

[qboosh]

Author: qboosh                       Date: Sat Jan 15 16:00:09 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added kde bcond (alias for kwallet)
- updated python cleaning

---- Files affected:
packages/subversion:
   subversion.spec (1.294 -> 1.295) 

---- Diffs:

================================================================
Index: packages/subversion/subversion.spec
diff -u packages/subversion/subversion.spec:1.294 packages/subversion/subversion.spec:1.295
--- packages/subversion/subversion.spec:1.294	Sat Jan 15 00:07:33 2011
+++ packages/subversion/subversion.spec	Sat Jan 15 17:00:04 2011
@@ -15,6 +15,7 @@
 %bcond_without	javahl			# build without javahl support (Java high-level bindings)
 %bcond_without	tests			# don't perform "make check"
 %bcond_without	kwallet			# build without kde4 wallet support
+%bcond_without	kde			# build without kde4 support (alias for kwallet)
 %bcond_without	gnome			# build without gnome keyring support
 
 %{!?with_net_client_only:%include	/usr/lib/rpm/macros.perl}
@@ -22,6 +23,9 @@
 %define	pdir	SVN
 %define	pnam	_Core
 
+%if !%{with kde}
+%undefine	with_kwallet
+%endif
 %if %{with neon}
 %define	webdavlib	neon
 %else
@@ -548,7 +552,8 @@
 %if %{with python}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
-find $RPM_BUILD_ROOT%{py_sitedir} -name "*.py" -o -name "*.a" -o -name "*.la" | xargs rm -f
+%py_postclean
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/libsvn/*.la
 install tools/examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{version}
 %endif
 %endif
@@ -785,10 +790,10 @@
 %attr(755,root,root) %ghost %{_libdir}/libsvn_swig_py-1.so.0
 %attr(755,root,root) %{_libdir}/libsvn_swig_py-1.so
 %dir %{py_sitedir}/libsvn
+%attr(755,root,root) %{py_sitedir}/libsvn/_*.so
 %{py_sitedir}/libsvn/*.py[co]
 %dir %{py_sitedir}/svn
 %{py_sitedir}/svn/*.py[co]
-%attr(755,root,root) %{py_sitedir}/libsvn/*.so
 %{_examplesdir}/python-%{name}-%{version}
 
 %files -n python-csvn
@@ -801,7 +806,7 @@
 %{py_sitescriptdir}/csvn/core/*.py[co]
 %dir %{py_sitescriptdir}/csvn/ext
 %{py_sitescriptdir}/csvn/ext/*.py[co]
-%{py_sitescriptdir}/*.egg-info
+%{py_sitescriptdir}/svn_ctypes_python_bindings-0.1-py*.egg-info
 %endif
 
 %if %{with perl}
@@ -853,6 +858,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.295  2011/01/15 16:00:04  qboosh
+- added kde bcond (alias for kwallet)
+- updated python cleaning
+
 Revision 1.294  2011/01/14 23:07:33  zbyniu
 - up to 1.6.15 [fixes CVE-2010-4539 CVE-2010-4644]
 
================================================================

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