packages: subversion/subversion.spec - added kwallet bcond.

pawelz pawelz at pld-linux.org
Fri May 15 18:00:15 CEST 2009


Author: pawelz                       Date: Fri May 15 16:00:15 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added kwallet bcond.

---- Files affected:
packages/subversion:
   subversion.spec (1.259 -> 1.260) 

---- Diffs:

================================================================
Index: packages/subversion/subversion.spec
diff -u packages/subversion/subversion.spec:1.259 packages/subversion/subversion.spec:1.260
--- packages/subversion/subversion.spec:1.259	Wed May 13 20:19:26 2009
+++ packages/subversion/subversion.spec	Fri May 15 18:00:09 2009
@@ -14,6 +14,7 @@
 %bcond_without	apache			# build without apache support (webdav, etc)
 %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
 #
 %ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
 %undefine	with_javahl
@@ -83,7 +84,7 @@
 BuildRequires:	expat-devel
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-keyring-devel
-BuildRequires:	kde4-kdelibs-devel
+%{?with_kwallet:BuildRequires:	kde4-kdelibs-devel}
 BuildRequires:	libtool >= 1.4-9
 BuildRequires:	sed >= 4.0
 BuildRequires:	sqlite3-devel >= 3.6.11
@@ -438,7 +439,9 @@
 %endif
 	--with-apr=%{_bindir}/apr-1-config \
 	--with-apr-util=%{_bindir}/apu-1-config \
+%if %{with kwallet}
 	--with-kwallet \
+%endif
 	--with-gnome-keyring
 
 %{__make} -j1
@@ -699,10 +702,12 @@
 %attr(755,root,root) %{_libdir}/libsvn_auth_gnome_keyring-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_auth_gnome_keyring-1.so.0
 
+%if %{with kwallet}
 %files -n kde4-kwallet-subversion
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsvn_auth_kwallet-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_auth_kwallet-1.so.0
+%endif
 
 %if !%{with net_client_only}
 %files svnserve
@@ -817,6 +822,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.260  2009/05/15 16:00:09  pawelz
+- added kwallet bcond.
+
 Revision 1.259  2009/05/13 18:19:26  witekfl
 - up to 1.6.2 (build fails on tests)
 - rm -f instead of a bare rm
================================================================

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



More information about the pld-cvs-commit mailing list