Hello community, here is the log from the commit of package jpackage-utils checked in at Mon Nov 20 19:05:32 CET 2006. -------- --- jpackage-utils/jpackage-utils.changes 2006-09-19 00:37:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/jpackage-utils/jpackage-utils.changes 2006-11-20 17:17:50.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 20 17:17:06 CET 2006 - dbornkessel@suse.de + +- re-add README.SUSE +- use variables from /usr/lib/rpm/macros instead of /etc/rpm/jpackage.macros + +------------------------------------------------------------------- New: ---- README.SUSE jpackage-utils-1.7.0-macros.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jpackage-utils.spec ++++++ --- /var/tmp/diff_new_pack.HH7cDv/_old 2006-11-20 19:05:09.000000000 +0100 +++ /var/tmp/diff_new_pack.HH7cDv/_new 2006-11-20 19:05:09.000000000 +0100 @@ -13,14 +13,15 @@ %define distver 1.7 %define section free Version: 1.7.0 -Release: 1 +Release: 17 Summary: JPackage Utilities -License: GPL +License: GNU General Public License (GPL) URL: http://www.jpackage.org/ Source0: %{name}-%{version}.tar.bz2 +Source1: README.SUSE +Patch0: %{name}-%{version}-macros.patch Group: Development/Languages/Java BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch AutoReqProv: no Requires: /bin/egrep, /bin/sed, /usr/bin/perl @@ -31,6 +32,8 @@ %prep %setup -q +%patch0 -p1 +cp %{SOURCE1} doc %build echo "JPackage release %{distver} (%{distribution}) for %{buildarch}" \ @@ -41,28 +44,27 @@ # Pull macros out of macros.jpackage and emulate them during install for # smooth bootstrapping experience. for dir in \ - jvmdir jvmjardir jvmprivdir \ - jvmlibdir jvmdatadir jvmsysconfdir \ + jvmdatadir jvmsysconfdir \ jvmcommonlibdir jvmcommondatadir jvmcommonsysconfdir \ - javadir jnidir javadocdir ; do - export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" misc/macros.jpackage | %{__awk} '{ print $2 }')) + ; do + export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" /usr/lib/rpm/macros | %{__awk} '{ print $2 }')) done install -dm 755 ${RPM_BUILD_ROOT}%{_bindir} install -dm 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/{java,rpm} -install -dm 755 ${RPM_BUILD_ROOT}${_jvmdir} -install -dm 755 ${RPM_BUILD_ROOT}${_jvmjardir} -install -dm 755 ${RPM_BUILD_ROOT}${_jvmprivdir} -install -dm 755 ${RPM_BUILD_ROOT}${_jvmlibdir} +install -dm 755 ${RPM_BUILD_ROOT}%{_jvmdir} +install -dm 755 ${RPM_BUILD_ROOT}%{_jvmjardir} +install -dm 755 ${RPM_BUILD_ROOT}%{_jvmprivdir} +install -dm 755 ${RPM_BUILD_ROOT}%{_jvmlibdir} install -dm 755 ${RPM_BUILD_ROOT}${_jvmdatadir} install -dm 755 ${RPM_BUILD_ROOT}${_jvmsysconfdir} install -dm 755 ${RPM_BUILD_ROOT}${_jvmcommonlibdir} install -dm 755 ${RPM_BUILD_ROOT}${_jvmcommondatadir} install -dm 755 ${RPM_BUILD_ROOT}${_jvmcommonsysconfdir} -install -dm 755 ${RPM_BUILD_ROOT}${_javadir} -install -dm 755 ${RPM_BUILD_ROOT}${_jnidir} -install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{utils,ext,1.4.0,1.4.1,1.4.2,1.5.0} -install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{ext,1.4.0,1.4.1,1.4.2,1.5.0} -install -dm 755 ${RPM_BUILD_ROOT}${_javadocdir} +install -dm 755 ${RPM_BUILD_ROOT}%{_javadir} +install -dm 755 ${RPM_BUILD_ROOT}%{_jnidir} +install -dm 755 ${RPM_BUILD_ROOT}%{_javadir}-{utils,ext,1.4.0,1.4.1,1.4.2,1.5.0} +install -dm 755 ${RPM_BUILD_ROOT}%{_jnidir}-{ext,1.4.0,1.4.1,1.4.2,1.5.0} +install -dm 755 ${RPM_BUILD_ROOT}%{_javadocdir} install -pm 755 bin/* ${RPM_BUILD_ROOT}%{_bindir} install -pm 644 etc/font.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/java cat > etc/java.conf << EOF @@ -70,11 +72,11 @@ # # JPackage Project http://www.jpackage.org/ # Location of jar files on the system -JAVA_LIBDIR=${_javadir} +JAVA_LIBDIR=%{_javadir} # Location of arch-specific jar files on the system -JNI_LIBDIR=${_jnidir} +JNI_LIBDIR=%{_jnidir} # Root of all JVM installations -JVM_ROOT=${_jvmdir} +JVM_ROOT=%{_jvmdir} # You can define a system-wide JVM root here if you're not using the default one #JAVA_HOME=\$JVM_ROOT/java # Options to pass to the java interpreter @@ -82,24 +84,24 @@ EOF install -pm 644 etc/java.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/java install -pm 644 etc/jpackage-release ${RPM_BUILD_ROOT}%{_sysconfdir}/java -install -pm 644 java-utils/* ${RPM_BUILD_ROOT}${_javadir}-utils +install -pm 644 java-utils/* ${RPM_BUILD_ROOT}%{_javadir}-utils install -pm 644 misc/macros.jpackage ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm cat <<EOF > %{name}-%{version}.files %{_bindir}/* -%dir ${_jvmdir} -%dir ${_jvmjardir} -%dir ${_jvmprivdir} +%dir %{_jvmdir} +%dir %{_jvmjardir} +%dir %{_jvmprivdir} # %dir ${_jvmlibdir} %dir ${_jvmdatadir} %dir ${_jvmsysconfdir} %dir ${_jvmcommonlibdir} %dir ${_jvmcommondatadir} %dir ${_jvmcommonsysconfdir} -%dir ${_javadir}-* -%dir ${_jnidir} -%dir ${_jnidir}-* -%dir ${_javadocdir} -${_javadir}-utils/* +%dir %{_javadir}-* +%dir %{_jnidir} +%dir %{_jnidir}-* +%dir %{_javadocdir} +%{_javadir}-utils/* %config %{_sysconfdir}/java/jpackage-release %config(noreplace) %{_sysconfdir}/java/java.conf %config(noreplace) %{_sysconfdir}/java/font.properties @@ -129,11 +131,13 @@ %files -f %{name}-%{version}.files %defattr(0755,root,root,-) -#%doc LICENSE.txt doc/* etc/httpd-javadoc.conf %doc doc/* etc/httpd-javadoc.conf %dir %{_sysconfdir}/rpm %changelog -n jpackage-utils +* Mon Nov 20 2006 - dbornkessel@suse.de +- re-add README.SUSE +- use variables from /usr/lib/rpm/macros instead of /etc/rpm/jpackage.macros * Tue Sep 19 2006 - dbornkessel@suse.de - updated to 2.7.0 cleanup release, no real changes ++++++ jpackage-utils-1.7.0-macros.patch ++++++ Index: jpackage-utils-1.7.0/misc/macros.jpackage =================================================================== --- jpackage-utils-1.7.0.orig/misc/macros.jpackage +++ jpackage-utils-1.7.0/misc/macros.jpackage @@ -14,17 +14,20 @@ # # Root directory where all Java VMs/SDK/JREs are installed. # -%_jvmdir %{_prefix}/lib/jvm +# already in /usr/lib/macros on SUSE: +# %_jvmdir %{_prefix}/lib/jvm # # Root directory where all Java VMs/SDK/JREs expose their jars # -%_jvmjardir %{_prefix}/lib/jvm-exports +# already in /usr/lib/macros on SUSE: +#%_jvmjardir %{_prefix}/lib/jvm-exports # # Root directory for all Java VM/SDK/JRE's private things. # -%_jvmprivdir %{_prefix}/lib/jvm-private +# already in /usr/lib/macros on SUSE: +#%_jvmprivdir %{_prefix}/lib/jvm-private # # Directory where arch and version independent jars are installed. @@ -40,7 +43,8 @@ # # To simplify things only %{_javadir} is defined. # -%_javadir %{_datadir}/java +# already in /usr/lib/macros on SUSE: +#%_javadir %{_datadir}/java # # Directory where arch-specific (JNI) version-independent jars are installed. @@ -52,26 +56,30 @@ # - jars for Java standard x.y.z (usually symlinks to %{_jnidir}-ext) # To simplify things only %{_jnidir} is defined. # -%_jnidir %{_prefix}/lib/java +# already in /usr/lib/macros on SUSE: +#%_jnidir %{_prefix}/lib/java # # Root directory where all javadoc is installed. Also already in RH macros. # -%_javadocdir %{_datadir}/javadoc +# already in /usr/lib/macros on SUSE: +#%_javadocdir %{_datadir}/javadoc # # Current default JVM home. # -%java_home %(. %{_javadir}-utils/java-functions; set_jvm; echo $JAVA_HOME) +# already in /usr/lib/macros on SUSE: +#%java_home %(. %{_javadir}-utils/java-functions; set_jvm; echo $JAVA_HOME) #============================================================================== # ---- default Java commands -%ant JAVA_HOME=%{java_home} ant -%jar %{java_home}/bin/jar -%java %(. %{_javadir}-utils/java-functions; set_javacmd; echo $JAVACMD) -%javac %{java_home}/bin/javac -%javadoc %{java_home}/bin/javadoc +# already in /usr/lib/macros on SUSE: +#%ant JAVA_HOME=%{java_home} ant +#%jar %{java_home}/bin/jar +#%java %(. %{_javadir}-utils/java-functions; set_javacmd; echo $JAVACMD) +#%javac %{java_home}/bin/javac +#%javadoc %{java_home}/bin/javadoc #============================================================================== # ---- Java extension handling macros @@ -91,7 +99,8 @@ # %{javadir}-ext/foo.jar # %{javadir}-*/bar.jar # -%add_jvm_extension JAVA_LIBDIR=%{buildroot}/%{_javadir} %{_bindir}/jvmjar -l +# already in /usr/lib/macros on SUSE: +#%add_jvm_extension JAVA_LIBDIR=%{buildroot}/%{_javadir} %{_bindir}/jvmjar -l #============================================================================== # ---- default icons directories as per the icon theme freedesktop spec @@ -221,38 +230,42 @@ EOF # %4 jars (separated by ':') # %5 the name of script you wish to create # -%jpackage_script() \ -install -d -m 755 $RPM_BUILD_ROOT%{_bindir}\ -cat > $RPM_BUILD_ROOT%{_bindir}/%5 << EOF \ +# already in /usr/lib/macros on SUSE: +#%jpackage_script() \ +#install -d -m 755 $RPM_BUILD_ROOT%{_bindir}\ +#cat > $RPM_BUILD_ROOT%{_bindir}/%5 << EOF \ #!/bin/sh\ #\ # %{name} script\ # JPackage Project http://www.jpackage.org/\ \ # Source functions library\ -. %{_javadir}-utils/java-functions\ -\ +# already in /usr/lib/macros on SUSE: +#. %{_javadir}-utils/java-functions\ +#\ # Source system prefs\ -if [ -f %{_sysconfdir}/java/%{name}.conf ] ; then\ - . %{_sysconfdir}/java/%{name}.conf\ -fi\ -\ +# already in /usr/lib/macros on SUSE: +#if [ -f %{_sysconfdir}/java/%{name}.conf ] ; then\ + #. %{_sysconfdir}/java/%{name}.conf\ +#fi\ +#\ # Source user prefs\ -if [ -f \\$HOME/.%{name}rc ] ; then\ - . \\$HOME/.%{name}rc\ -fi\ -\ +# already in /usr/lib/macros on SUSE: +#if [ -f \\$HOME/.%{name}rc ] ; then\ +# . \\$HOME/.%{name}rc\ +#fi\ +#\ # Configuration\ -MAIN_CLASS=%1\ -BASE_FLAGS=%2\ -BASE_OPTIONS=%3\ -BASE_JARS="%(echo %4 | sed -e 's,:, ,g')"\ +#MAIN_CLASS=%1\ +#BASE_FLAGS=%2\ +#BASE_OPTIONS=%3\ +#BASE_JARS="%(echo %4 | sed -e 's,:, ,g')"\ \ # Set parameters\ -set_jvm\ -set_classpath \\$BASE_JARS\ -set_flags \\$BASE_FLAGS\ -set_options \\$BASE_OPTIONS\ +#set_jvm\ +#set_classpath \\$BASE_JARS\ +#set_flags \\$BASE_FLAGS\ +#set_options \\$BASE_OPTIONS\ \ # Let's start\ run "\\$@"\ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org