Mailinglist Archive: opensuse-commit (1262 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package subversion
checked in at Thu Sep 28 01:03:42 CEST 2006.

--------
--- subversion/subversion.changes	2006-09-25 10:56:04.000000000 +0200
+++ /mounts/work_users/ro/STABLE/subversion/subversion.changes	2006-09-28 00:33:47.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Sep 28 00:33:39 CEST 2006 - ro@xxxxxxx
+
+- use source=1.4 for java compilation 
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ subversion.spec ++++++
--- /var/tmp/diff_new_pack.RtSJUJ/_old	2006-09-28 01:03:24.000000000 +0200
+++ /var/tmp/diff_new_pack.RtSJUJ/_new	2006-09-28 01:03:24.000000000 +0200
@@ -13,7 +13,7 @@
 Name:           subversion
 BuildRequires:  apache2-devel db-devel gcc-c++ java2-devel-packages neon-devel openldap2-devel python-devel swig
 Version:        1.4.0
-Release:        7
+Release:        8
 #
 %define	apxs	/usr/sbin/apxs2
 %define	apache_libexecdir	%(%{apxs} -q LIBEXECDIR)
@@ -132,7 +132,7 @@
 %define cvs2svn_dir cvs2svn-1.4.x
 %package -n cvs2svn
 Version:        1.4.0
-Release:        1
+Release:        2
 Provides:       subversion-cvs2svn
 Obsoletes:      subversion-cvs2svn
 Group:          Development/Tools/Version Control
@@ -152,7 +152,7 @@
 
 %package -n viewvc
 Version:        1.0.1
-Release:        3
+Release:        4
 Requires:       subversion-python
 Provides:       subversion-viewcvs viewcvs
 Obsoletes:      subversion-viewcvs viewcvs
@@ -232,7 +232,9 @@
 /usr/%{_lib}/SunJava2-1.4.2 \
 /usr/%{_lib}/jvm/java-1.4.2-sun \
 /usr/lib/jvm/java-1.4.2-sun \
+/usr/%{_lib}/jvm/java-1.5.0-ibm \
 /usr/%{_lib}/jvm/java-1.5.0-sun \
+/usr/lib/jvm/java-1.5.0-sun \
 /usr/%{_lib}/jvm/java-1.4.2-ibm \
 /usr/%{_lib}/jvm/IBMJava2-1.4.2 \
 /usr/lib/BEAJava2-1.4.2 \
@@ -489,6 +491,8 @@
 %config (noreplace) %{apache_sysconfdir}/conf.d/subversion.viewvc.conf
 
 %changelog -n subversion
+* Thu Sep 28 2006 - ro@xxxxxxx
+- use source=1.4 for java compilation
 * Mon Sep 25 2006 - olh@xxxxxxx
 - update cvs2svn to 1.4.0
   New features:



++++++ subversion.java14.patch ++++++
--- /var/tmp/diff_new_pack.RtSJUJ/_old	2006-09-28 01:03:25.000000000 +0200
+++ /var/tmp/diff_new_pack.RtSJUJ/_new	2006-09-28 01:03:25.000000000 +0200
@@ -1,24 +1,28 @@
----
- subversion/bindings/java/javahl/build/build.xml |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: subversion-1.4.x/subversion/bindings/java/javahl/build/build.xml
-===================================================================
---- subversion-1.4.x.orig/subversion/bindings/java/javahl/build/build.xml
+--- subversion-1.4.x/build/generator/gen_make.py
++++ subversion-1.4.x/build/generator/gen_make.py
+@@ -292,6 +292,6 @@
+           self.ofile.write(
+             '%s_SRC = %s\n'
+             '$(%s_OBJECTS): $(%s_SRC)\n'
+-            '\t%s -d %s -classpath %s:$(%s_CLASSPATH) $(%s_SRC)\n'
++            '\t%s -source 1.4 -target 1.4 -d %s -classpath %s:$(%s_CLASSPATH) $(%s_SRC)\n'
+             % (targ_varname, string.join(object_srcs),
+ 
+--- subversion-1.4.x/subversion/bindings/java/javahl/build/build.xml
 +++ subversion-1.4.x/subversion/bindings/java/javahl/build/build.xml
 @@ -17,13 +17,13 @@
          </javah>
      </target>
      <target name="javac" unless="junit.path">
 -        <javac compiler="modern" destdir="classes">
-+        <javac source="1.4" target="1.4" compiler="modern" destdir="classes">
++        <javac source="1.4" target="1.4" destdir="classes">
              <src path="src"/>
              <exclude name="org/tigris/subversion/javahl/tests/**"/>
          </javac>
      </target>
      <target name="javac-tests" if="junit.path">
 -        <javac compiler="modern" destdir="classes">
-+        <javac source="1.4" target="1.4" compiler="modern" destdir="classes">
++        <javac source="1.4" target="1.4" destdir="classes">
              <src path="src"/>
              <classpath path="${junit.path}"/>
          </javac>







++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx