packages: subversion/subversion.spec - BR: ruby-rubygems - fix build with n...

[pawelz]

Author: pawelz                       Date: Mon Jan 17 22:25:00 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- BR: ruby-rubygems
- fix build with net_client_only
- adapter: sorted BRs

---- Files affected:
packages/subversion:
   subversion.spec (1.296 -> 1.297) 

---- Diffs:

================================================================
Index: packages/subversion/subversion.spec
diff -u packages/subversion/subversion.spec:1.296 packages/subversion/subversion.spec:1.297
--- packages/subversion/subversion.spec:1.296	Sat Jan 15 23:03:08 2011
+++ packages/subversion/subversion.spec	Mon Jan 17 23:24:55 2011
@@ -75,6 +75,7 @@
 %endif
 %if %{with ruby}
 BuildRequires:	ruby-devel
+BuildRequires:	ruby-rubygems
 BuildRequires:	swig-ruby >= 1.3.24
 %endif
 %if %{with javahl}
@@ -88,8 +89,8 @@
 BuildRequires:	bison
 BuildRequires:	expat-devel
 BuildRequires:	gettext-devel
-%{?with_gnome:BuildRequires:	libgnome-keyring-devel}
 %{?with_kwallet:BuildRequires:	kde4-kdelibs-devel}
+%{?with_gnome:BuildRequires:	libgnome-keyring-devel}
 BuildRequires:	libtool >= 1.4-9
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
@@ -561,8 +562,10 @@
 install tools/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{?with_javahl:%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvnjavahl*.{la,a}}
+%if %{without net_client_only}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_swig*.{la,a}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*/svn/ext/*.la
+%endif
 %if %{with gnome} || %{with kwallet}
 # dlopened by soname (libsvn_auth_*-1.so.0)
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_auth_*-1.{so,la,a}
@@ -666,8 +669,10 @@
 %attr(755,root,root) %ghost %{_libdir}/libsvn_diff-1.so.0
 %attr(755,root,root) %{_libdir}/libsvn_fs-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_fs-1.so.0
+%if %{without net_client_only}
 %attr(755,root,root) %{_libdir}/libsvn_fs_base-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_fs_base-1.so.0
+%endif
 %attr(755,root,root) %{_libdir}/libsvn_fs_fs-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_fs_fs-1.so.0
 %attr(755,root,root) %{_libdir}/libsvn_fs_util-1.so.*.*.*
@@ -693,7 +698,9 @@
 %attr(755,root,root) %{_libdir}/libsvn_delta-1.so
 %attr(755,root,root) %{_libdir}/libsvn_diff-1.so
 %attr(755,root,root) %{_libdir}/libsvn_fs-1.so
+%if %{without net_client_only}
 %attr(755,root,root) %{_libdir}/libsvn_fs_base-1.so
+%endif
 %attr(755,root,root) %{_libdir}/libsvn_fs_fs-1.so
 %attr(755,root,root) %{_libdir}/libsvn_fs_util-1.so
 %attr(755,root,root) %{_libdir}/libsvn_ra-1.so
@@ -707,7 +714,9 @@
 %{_libdir}/libsvn_delta-1.la
 %{_libdir}/libsvn_diff-1.la
 %{_libdir}/libsvn_fs-1.la
+%if %{without net_client_only}
 %{_libdir}/libsvn_fs_base-1.la
+%endif
 %{_libdir}/libsvn_fs_fs-1.la
 %{_libdir}/libsvn_fs_util-1.la
 %{_libdir}/libsvn_ra-1.la
@@ -726,7 +735,9 @@
 %{_libdir}/libsvn_delta-1.a
 %{_libdir}/libsvn_diff-1.a
 %{_libdir}/libsvn_fs-1.a
+%if %{without net_client_only}
 %{_libdir}/libsvn_fs_base-1.a
+%endif
 %{_libdir}/libsvn_fs_fs-1.a
 %{_libdir}/libsvn_fs_util-1.a
 %{_libdir}/libsvn_ra-1.a
@@ -857,6 +868,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.297  2011/01/17 22:24:55  pawelz
+- BR: ruby-rubygems
+- fix build with net_client_only
+- adapter: sorted BRs
+
 Revision 1.296  2011/01/15 22:03:08  charles
 - updated BRs
 
================================================================

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