packages: subversion/subversion.spec - without_gnome bcond added
jajcus
jajcus at pld-linux.org
Fri Oct 23 15:46:41 CEST 2009
Author: jajcus Date: Fri Oct 23 13:46:41 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- without_gnome bcond added
---- Files affected:
packages/subversion:
subversion.spec (1.267 -> 1.268)
---- Diffs:
================================================================
Index: packages/subversion/subversion.spec
diff -u packages/subversion/subversion.spec:1.267 packages/subversion/subversion.spec:1.268
--- packages/subversion/subversion.spec:1.267 Thu Oct 22 21:30:35 2009
+++ packages/subversion/subversion.spec Fri Oct 23 15:46:35 2009
@@ -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 gnome # build without gnome keyring support
#
%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
%undefine with_javahl
@@ -86,7 +87,7 @@
BuildRequires: bison
BuildRequires: expat-devel
BuildRequires: gettext-devel
-BuildRequires: gnome-keyring-devel
+%{?with_gnome:BuildRequires: gnome-keyring-devel}
%{?with_kwallet:BuildRequires: kde4-kdelibs-devel}
BuildRequires: libtool >= 1.4-9
BuildRequires: sed >= 4.0
@@ -445,7 +446,9 @@
%if %{with kwallet}
--with-kwallet \
%endif
+%if %{with gnome}
--with-gnome-keyring
+%endif
%{__make} -j1
@@ -700,10 +703,12 @@
%{_libdir}/libsvn_subr-1.a
%{_libdir}/libsvn_wc-1.a
+%if %{with gnome}
%files -n gnome-keyring-subversion
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libsvn_auth_gnome_keyring-1.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libsvn_auth_gnome_keyring-1.so.0
+%endif
%if %{with kwallet}
%files -n kde4-kwallet-subversion
@@ -825,6 +830,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.268 2009/10/23 13:46:35 jajcus
+- without_gnome bcond added
+
Revision 1.267 2009/10/22 19:30:35 arekm
- up to 1.6.6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/subversion/subversion.spec?r1=1.267&r2=1.268&f=u
More information about the pld-cvs-commit
mailing list