rpms/subversion/FC-5 subversion.spec,1.73,1.74

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/subversion/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv2291

Modified Files:
	subversion.spec 
Log Message:
* Tue Apr  4 2006 Joe Orton <jorton at redhat.com> 1.3.1-2.1
- move libsvn_swig_ruby back to -ruby subpackage
- build -java subpackage on s390 again



Index: subversion.spec
===================================================================
RCS file: /cvs/dist/rpms/subversion/FC-5/subversion.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- subversion.spec	4 Apr 2006 09:09:48 -0000	1.73
+++ subversion.spec	4 Apr 2006 10:34:23 -0000	1.74
@@ -1,12 +1,7 @@
 # set to zero to avoid running test suite
 %define make_check 1
 
-%ifarch s390
-# weird gjnih error on s390 
-%define with_java 0
-%else
 %define with_java 1
-%endif
 
 # set JDK path to build javahl; default for JPackage
 %define jdk_path /usr/lib/jvm/java
@@ -16,7 +11,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.3.1
-Release: 2
+Release: 2.1
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -211,6 +206,7 @@
 %{_datadir}/emacs/site-lisp
 %{_datadir}/xemacs/site-packages/lisp
 %exclude %{_libdir}/libsvn_swig_perl*
+%exclude %{_libdir}/libsvn_swig_ruby*
 %exclude %{_mandir}/man*/*::*
 
 %files devel
@@ -238,8 +234,7 @@
 
 %files ruby
 %defattr(-,root,root,-)
-# This is already in the main package and that is also required:
-#%{_libdir}/libsvn_swig_ruby*
+%{_libdir}/libsvn_swig_ruby*
 %{_libdir}/site_ruby/*/svn
 %{_libdir}/site_ruby/*/*-linux/svn
 
@@ -251,6 +246,10 @@
 %endif
 
 %changelog
+* Tue Apr  4 2006 Joe Orton <jorton at redhat.com> 1.3.1-2.1
+- move libsvn_swig_ruby back to -ruby subpackage
+- build -java subpackage on s390 again
+
 * Tue Apr  4 2006 Joe Orton <jorton at redhat.com> 1.3.1-2
 - update to 1.3.1