Hello community, here is the log from the commit of package subversion checked in at Wed Jun 14 13:28:01 CEST 2006. -------- --- subversion/subversion.changes 2006-06-11 00:09:21.000000000 +0200 +++ subversion/subversion.changes 2006-06-12 11:47:29.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 12 11:47:11 CEST 2006 - poeml@suse.de + +- fix build on SUSE Linux 9.3 to 10.1 and SLES9 +- remove X11 libs from BuildRequires -- they don't seem to be + required at all + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.vf3vpA/_old 2006-06-14 13:27:37.000000000 +0200 +++ /var/tmp/diff_new_pack.vf3vpA/_new 2006-06-14 13:27:37.000000000 +0200 @@ -11,9 +11,9 @@ # norootforbuild Name: subversion -BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages libapr-util1-devel neon-devel openldap2-devel pcre-devel python-devel swig xorg-x11-devel +BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages libapr-util1-devel neon-devel openldap2-devel pcre-devel python-devel swig Version: 1.3.1 -Release: 2 +Release: 3 # %define apxs /usr/sbin/apxs2 %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) @@ -126,7 +126,7 @@ %package -n cvs2svn Version: 1.3.0 -Release: 31 +Release: 32 Provides: subversion-cvs2svn Obsoletes: subversion-cvs2svn Group: Development/Tools/Version Control @@ -146,7 +146,7 @@ %package -n viewcvs Version: 1.0 -Release: 56 +Release: 57 Requires: subversion-python Provides: subversion-viewcvs Obsoletes: subversion-viewcvs @@ -193,7 +193,7 @@ # %patch20 -p1 %patch22 -p1 -%if %suse_version > 930 +%if 0%{?suse_version} > 930 %patch23 -p1 %endif %patch24 -p1 @@ -213,10 +213,12 @@ %build with_jdk=none for i in \ +/usr/%{_lib}/jvm/java-1.4.2-gcj \ /usr/%{_lib}/BEAJava2-1.4.2 \ /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-sun \ /usr/%{_lib}/jvm/java-1.4.2-ibm \ /usr/%{_lib}/jvm/IBMJava2-1.4.2 \ /usr/lib/BEAJava2-1.4.2 \ @@ -270,11 +272,11 @@ echo done >> build-outputs.mk export CFLAGS="$(%{apxs} -q CFLAGS) -Wall -g" -%if %suse_version > 930 +%if 0%{?suse_version} > 930 CFLAGS="$CFLAGS -fpie" export LDFLAGS=-pie %endif -%if %suse_version > 1000 +%if 0%{?suse_version} > 1000 CFLAGS="$CFLAGS -fstack-protector" %endif ./configure \ @@ -473,6 +475,10 @@ %config (noreplace) %{apache_sysconfdir}/conf.d/subversion.viewcvs.conf %changelog -n subversion +* Mon Jun 12 2006 - poeml@suse.de +- fix build on SUSE Linux 9.3 to 10.1 and SLES9 +- remove X11 libs from BuildRequires -- they don't seem to be + required at all * Sun Jun 11 2006 - olh@suse.de - update subversion.viewcvs.conf viewcvs was renamed to viewvc, all files were renamed ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org