Hello community, here is the log from the commit of package java-1_5_0-gcj-compat checked in at Thu Jan 17 23:15:10 CET 2008. -------- --- java-1_5_0-gcj-compat/java-1_5_0-gcj-compat.changes 2007-12-14 15:48:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/java-1_5_0-gcj-compat/java-1_5_0-gcj-compat.changes 2008-01-17 14:33:57.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 17 14:32:53 CET 2008 - skh@suse.de + +- provide a symlink to libgcj-tools-*.jar in -devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_5_0-gcj-compat.spec ++++++ --- /var/tmp/diff_new_pack.Um2430/_old 2008-01-17 23:14:17.000000000 +0100 +++ /var/tmp/diff_new_pack.Um2430/_new 2008-01-17 23:14:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package java-1_5_0-gcj-compat (Version 1.5.0.0) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -9,6 +9,7 @@ # # norootforbuild +# icecream 0 Name: java-1_5_0-gcj-compat BuildRequires: gcc-gij gcc-java gjdoc python-devel unzip @@ -28,7 +29,7 @@ %define _jvmjardir %{_libdir}/jvm-exports %endif Version: 1.5.0.0 -Release: 8 +Release: 18 %define section free %define gccsuffix %{nil} %define gccbinsuffix -4.3 @@ -48,6 +49,7 @@ %define jvmjardir %{_jvmjardir}/%{cname}-%{version} # FIXME: this is not a good fix of name issue %define jvmdir %{_jvmdir}/%{sdklnk}%{gccbinsuffix}-%{version} +%define sdkjardir %{_jvmdir}/%{sdkdir}/lib Summary: JPackage Runtime Scripts for GCJ Group: Development/Languages/Java License: GPL v2 or later @@ -183,6 +185,7 @@ ln -s %{sdkdir} %{jrelnk} ln -s %{sdkdir} %{sdklnk} popd +mkdir -p $RPM_BUILD_ROOT/%{sdkjardir}|| : mkdir -p $RPM_BUILD_ROOT/%_bindir mkdir -p $RPM_BUILD_ROOT/%_libdir mv $RPM_BUILD_ROOT/usr/local/%_lib/* $RPM_BUILD_ROOT/%_libdir || : @@ -221,25 +224,24 @@ # %{_javadir}/libgcj-`gcj%{gccsuffix} --version | head -n 1 | awk '{ print $3 }'`.jar \ # %{_jvmdir}/%{cname}-%{version}/jre/lib/rt.jar # little work-around if no version-less link to libgcj-x.y.z.jar does not exist -if [ ! -e %{_javadir}/libgcj.jar ] && ls %{_javadir}/libgcj-*.jar 2>/dev/null >&2 +if [ ! -e %{_javadir}/libgcj.jar ] && ls %{_javadir}/libgcj-[0-9]*.jar 2>/dev/null >&2 then pushd %{_javadir}/ 1>/dev/null - for file in `ls libgcj-*.jar` + for file in `ls libgcj-[0-9]*.jar` do - GLIBJ_NAME=$file + LIBGCJ_NAME=$file done popd 1>/dev/null else - GLIBJ_NAME=glibcj.jar + LIBGCJ_NAME=libgcj.jar fi -GLIBJ_NAME=glibj.jar pushd %{jvmjardir} 1>/dev/null - ln -sf %{_javadir}/$GLIBJ_NAME jndi-%{version}.jar - ln -sf %{_javadir}/$GLIBJ_NAME jndi-ldap-%{version}.jar - ln -sf %{_javadir}/$GLIBJ_NAME jndi-cos-%{version}.jar - ln -sf %{_javadir}/$GLIBJ_NAME jndi-rmi-%{version}.jar - ln -sf %{_javadir}/$GLIBJ_NAME jaas-%{version}.jar - ln -sf %{_javadir}/$GLIBJ_NAME jdbc-stdext-%{version}.jar + ln -sf %{_javadir}/$LIBGCJ_NAME jndi-%{version}.jar + ln -sf %{_javadir}/$LIBGCJ_NAME jndi-ldap-%{version}.jar + ln -sf %{_javadir}/$LIBGCJ_NAME jndi-cos-%{version}.jar + ln -sf %{_javadir}/$LIBGCJ_NAME jndi-rmi-%{version}.jar + ln -sf %{_javadir}/$LIBGCJ_NAME jaas-%{version}.jar + ln -sf %{_javadir}/$LIBGCJ_NAME jdbc-stdext-%{version}.jar ln -sf jdbc-stdext-%{version}.jar jdbc-stdext-3.0.jar for jar in *-%{version}.jar ; do ln -fs ${jar} $(echo $jar | sed "s|-%{version}.jar|-%{javaver}.jar|g") @@ -270,6 +272,21 @@ #ln -sf \ # `gcj%{gccsuffix} -print-file-name=include/jni.h` \ # %{_jvmdir}/%{cname}-%{version}/include/jni.h +# little work-around if no version-less link to libgcj-x.y.z.jar does not exist +if [ ! -e %{_javadir}/libgcj-tools.jar ] && ls %{_javadir}/libgcj-tools-*.jar 2>/dev/null >&2 +then + pushd %{_javadir}/ 1>/dev/null + for file in `ls libgcj-tools-*.jar` + do + LIBGCJTOOLS_NAME=$file + done + popd 1>/dev/null +else + LIBGCJTOOLS_NAME=libgcj-tools.jar +fi +pushd %{sdkjardir} 1>/dev/null + ln -sf %{_javadir}/$LIBGCJTOOLS_NAME tools.jar +popd 1>/dev/null %postun if [ $1 -eq 0 ] ; then @@ -334,121 +351,123 @@ %exclude %{jvmdir}/jre %changelog -* Fri Dec 14 2007 - ro@suse.de +* Thu Jan 17 2008 skh@suse.de +- provide a symlink to libgcj-tools-*.jar in -devel +* Fri Dec 14 2007 ro@suse.de - also provide jta there -* Mon Dec 03 2007 - ro@suse.de +* Mon Dec 03 2007 ro@suse.de - also provide classpath in the main package for now -* Mon Dec 03 2007 - ro@suse.de +* Mon Dec 03 2007 ro@suse.de - fix typo in specfile -* Mon Dec 03 2007 - ro@suse.de +* Mon Dec 03 2007 ro@suse.de - provide/obsolete also for the devel package -* Fri Nov 30 2007 - ro@suse.de +* Fri Nov 30 2007 ro@suse.de - added baselibs.conf -* Fri Nov 30 2007 - mvyskocil@suse.cz +* Fri Nov 30 2007 mvyskocil@suse.cz - update to java-gcj-compat-1.0.76 [#341578] - necessary to solve the conflicts and drop some unecessary java related packages -* Fri Sep 14 2007 - bk@suse.de +* Fri Sep 14 2007 bk@suse.de - fix bash syntax error in %%post: "line 21: [: too many arguments" -* Mon Sep 03 2007 - coolo@suse.de +* Mon Sep 03 2007 coolo@suse.de - resolve the cycle for real -* Wed Jun 27 2007 - rguenther@suse.de +* Wed Jun 27 2007 rguenther@suse.de - do not require libgcj at all. The proper one is required by gcc-gij. -* Mon Jun 25 2007 - adrian@suse.de +* Mon Jun 25 2007 adrian@suse.de - fix last change (gccsuffix is undefined) and require libgcj42 directly -* Mon Jun 25 2007 - adrian@suse.de +* Mon Jun 25 2007 adrian@suse.de - make requires to libgcj version dependend and use libgcj42 now -* Thu Jun 21 2007 - lrupp@suse.de +* Thu Jun 21 2007 lrupp@suse.de - use gccver 4.2 -* Wed May 30 2007 - dbornkessel@suse.de +* Wed May 30 2007 dbornkessel@suse.de - deleted versionless j2sdk provide - requirement for classpath-devel in devel package -* Mon Apr 30 2007 - ro@suse.de +* Mon Apr 30 2007 ro@suse.de - added unzip to buildreq -* Sun Apr 29 2007 - ro@suse.de +* Sun Apr 29 2007 ro@suse.de - added unzip to Requires for devel package to be able to check the generated bytecode version in a brp script -* Wed Apr 25 2007 - dbornkessel@suse.de +* Wed Apr 25 2007 dbornkessel@suse.de - patch correct gjdoc version number into Makefile -* Fri Apr 20 2007 - dbornkessel@suse.de +* Fri Apr 20 2007 dbornkessel@suse.de - replaced %%{nil} by blank -* Thu Mar 08 2007 - dbornkessel@suse.de +* Thu Mar 08 2007 dbornkessel@suse.de - removed jta link .... will be provided by an extra package -* Wed Nov 15 2006 - dbornkessel@suse.de +* Wed Nov 15 2006 dbornkessel@suse.de - added missing Requires: classpath - Changed PreReq: /usr/sbin/update-alternatives to PreReq: update-alternatives -* Mon Nov 13 2006 - dbornkessel@suse.de +* Mon Nov 13 2006 dbornkessel@suse.de - added link and Provides of 'jta' -* Thu Nov 02 2006 - ro@suse.de +* Thu Nov 02 2006 ro@suse.de - fix build on x86_64 (create libdir first) -* Thu Oct 05 2006 - dbornkessel@suse.de +* Thu Oct 05 2006 dbornkessel@suse.de - make sure glibj is used when compiling -* Mon Oct 02 2006 - dbornkessel@suse.de +* Mon Oct 02 2006 dbornkessel@suse.de - added fastjar Require to devel package -* Mon Oct 02 2006 - dbornkessel@suse.de +* Mon Oct 02 2006 dbornkessel@suse.de - added gcc-gij to Requires -* Thu Sep 28 2006 - ro@suse.de +* Thu Sep 28 2006 ro@suse.de - added gcc-gij to BuildRequires -* Tue Sep 19 2006 - dbornkessel@suse.de +* Tue Sep 19 2006 dbornkessel@suse.de - update to version 1.0.61 -* Wed Jun 07 2006 - dbornkessel@suse.de +* Wed Jun 07 2006 dbornkessel@suse.de - set JAR variable as package building fails ultimately -* Thu Apr 20 2006 - jsmeix@suse.de +* Thu Apr 20 2006 jsmeix@suse.de - Add Debian wrapper scripts for javac and javah and use their wrapper for javac by default (see Suse Bugzilla bug #163746). -* Wed Apr 19 2006 - jsmeix@suse.de +* Wed Apr 19 2006 jsmeix@suse.de - Do 'rm -rf %%{jvmjardir}/*' only when the package is removed (see Suse Bugzilla bug #148502). -* Mon Mar 27 2006 - jsmeix@suse.de +* Mon Mar 27 2006 jsmeix@suse.de - Added and fixed Provides according to Suse Bugzilla bug #160828. - Added Requirement for gcj-java to the -devel sub-package (see Suse Bugzilla bug #151732). -* Tue Mar 21 2006 - jsmeix@suse.de +* Tue Mar 21 2006 jsmeix@suse.de - Added "Provides: jre1.1.x jre1.2.x jre1.3.x jre1.4.x jre1.5.x" (see Suse Bugzilla bug #148186). -* Fri Mar 17 2006 - jsmeix@suse.de +* Fri Mar 17 2006 jsmeix@suse.de - Call gij instead of gcj in java wrapper script (see Suse Bugzilla bug #155729 and bug #157655). -* Mon Mar 13 2006 - dbornkessel@suse.de +* Mon Mar 13 2006 dbornkessel@suse.de - lowered update-alternatives priority to make bea/sun/ibm the default if both are installed -* Thu Mar 09 2006 - jsmeix@suse.de +* Thu Mar 09 2006 jsmeix@suse.de - Added "1>/dev/null" to pushd and popd in postinstall script to get it quiet (Suse bug #154105). -* Wed Mar 01 2006 - jsmeix@suse.de +* Wed Mar 01 2006 jsmeix@suse.de - Move the post install stuff regarding gcc-java to triggerin scripts (Suse bug #154105). - Pre-require libgcj to make sure it is actually installed before the post install script runs. -* Fri Feb 17 2006 - jsmeix@suse.de +* Fri Feb 17 2006 jsmeix@suse.de - Do no longer require gcc-java (Suse bug #151732). -* Thu Feb 09 2006 - jsmeix@suse.de +* Thu Feb 09 2006 jsmeix@suse.de - Fixed Suse Bugzilla bug #148502 (many thanks to dbornkessel@suse.de who actually did most of it). -* Fri Jan 27 2006 - mls@suse.de +* Fri Jan 27 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Thu Jan 26 2006 - dbornkessel@suse.de +* Thu Jan 26 2006 dbornkessel@suse.de - added provides with -32 / -64 suffix for OOo guys Bug #144113 -* Sat Aug 13 2005 - ro@suse.de +* Sat Aug 13 2005 ro@suse.de - remove noarch for now -* Wed Aug 03 2005 - ro@suse.de +* Wed Aug 03 2005 ro@suse.de - cleanup name/version/release -* Fri Jul 29 2005 - jsmeix@suse.de +* Fri Jul 29 2005 jsmeix@suse.de - Fix for build on x86_64: Add this options to configure: with-jvm-root-dir=%%{_jvmdir} with-java-home=%%{_jvmdir} -* Wed Jul 27 2005 - jsmeix@suse.de +* Wed Jul 27 2005 jsmeix@suse.de - Adjustments in the spec file. -* Wed Jul 20 2005 - jsmeix@suse.de +* Wed Jul 20 2005 jsmeix@suse.de - Current version 1.4.2.0 from JPackage.org -* Mon Jul 18 2005 - jsmeix@suse.de +* Mon Jul 18 2005 jsmeix@suse.de - Current version 1.4.2.0 from JPackage.org -* Wed May 11 2005 - skh@suse.de +* Wed May 11 2005 skh@suse.de - fix requires -* Thu Apr 28 2005 - skh@suse.de +* Thu Apr 28 2005 skh@suse.de - initial package (JPackage 1.6) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org