From 290ee0147e74c449c43d68e5070e7e32e4f954183a8d70f53de4f25e5a3d97ce Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 20 Jan 2012 10:58:48 +0000 Subject: [PATCH 1/2] - check exit code of suse brp scripts and abort if false OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=182 --- brp.diff | 51 ++++++++++++++++++++------------------------------- rpm.changes | 5 +++++ 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/brp.diff b/brp.diff index 5b41c86..bca3cad 100644 --- a/brp.diff +++ b/brp.diff @@ -1,22 +1,6 @@ -SUSE specific brp script patches - -Index: scripts/Makefile.am -=================================================================== ---- scripts/Makefile.am.orig 2011-12-11 09:38:35.000000000 +0100 -+++ scripts/Makefile.am 2011-12-11 10:30:24.786227246 +0100 -@@ -25,6 +25,7 @@ EXTRA_DIST = \ - rpmconfig_SCRIPTS = \ - brp-compress brp-python-bytecompile brp-java-gcjcompile \ - brp-strip brp-strip-comment-note brp-python-hardlink \ -+ brp-suse \ - brp-strip-shared brp-strip-static-archive \ - check-files check-prereqs \ - check-buildroot check-rpaths check-rpaths-worker \ -Index: scripts/brp-strip -=================================================================== ---- scripts/brp-strip.orig 2011-12-11 09:38:35.000000000 +0100 -+++ scripts/brp-strip 2011-12-11 10:30:16.464621084 +0100 -@@ -15,6 +15,7 @@ esac +--- scripts/brp-strip ++++ scripts/brp-strip +@@ -15,6 +15,7 @@ for f in `find $RPM_BUILD_ROOT -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \ grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ grep -v ' shared object,' | \ @@ -24,11 +8,9 @@ Index: scripts/brp-strip sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do $STRIP -g "$f" || : done -Index: scripts/brp-strip-comment-note -=================================================================== ---- scripts/brp-strip-comment-note.orig 2011-12-11 09:38:35.000000000 +0100 -+++ scripts/brp-strip-comment-note 2011-12-11 10:30:16.465621036 +0100 -@@ -16,6 +16,8 @@ esac +--- scripts/brp-strip-comment-note ++++ scripts/brp-strip-comment-note +@@ -16,6 +16,8 @@ # for already stripped elf files in the build root for f in `find $RPM_BUILD_ROOT -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \ grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ @@ -37,11 +19,9 @@ Index: scripts/brp-strip-comment-note sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped/\1/p'`; do note="-R .note" if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \ -Index: scripts/brp-suse -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ scripts/brp-suse 2011-12-11 10:31:29.117182578 +0100 -@@ -0,0 +1,14 @@ +--- scripts/brp-suse ++++ scripts/brp-suse +@@ -0,0 +1,13 @@ +#! /bin/sh + +# If using normal root, avoid changing anything: @@ -52,7 +32,16 @@ Index: scripts/brp-suse +ls -1 /usr/lib/rpm/brp-suse.d/brp* | sort | while read script; do + if test -x "$script"; then + echo "calling $script" -+ $script ++ $script || exit 1 + fi +done -+ +--- scripts/Makefile.am ++++ scripts/Makefile.am +@@ -25,6 +25,7 @@ + rpmconfig_SCRIPTS = \ + brp-compress brp-python-bytecompile brp-java-gcjcompile \ + brp-strip brp-strip-comment-note brp-python-hardlink \ ++ brp-suse \ + brp-strip-shared brp-strip-static-archive \ + check-files check-prereqs \ + check-buildroot check-rpaths check-rpaths-worker \ diff --git a/rpm.changes b/rpm.changes index 4fd283c..23430b9 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 20 11:58:23 CET 2012 - dmueller@suse.de + +- check exit code of suse brp scripts and abort if false + ------------------------------------------------------------------- Tue Jan 17 10:28:00 UTC 2012 - saschpe@suse.de From 8c6234c115465ed1baf1eaed68fa35dcb73bf0fe76d00d65bb6fa1593454495c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 26 Jan 2012 15:38:11 +0000 Subject: [PATCH 2/2] Accepting request 100887 from home:mvyskocil:branches:Base:System - push Stopgap fix for rhbz#461683 from to SUSE set_javacmd preffers JRE over JDK OBS-URL: https://build.opensuse.org/request/show/100887 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=185 --- macrosin.diff | 38 ++++++++++++++------------------------ python3-rpm.spec | 1 + rpm-python.spec | 1 + rpm.changes | 6 ++++++ rpm.spec | 1 + 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/macrosin.diff b/macrosin.diff index bc303b9..bd762d2 100644 --- a/macrosin.diff +++ b/macrosin.diff @@ -1,6 +1,6 @@ ---- ./macros.in.orig 2011-01-03 13:57:41.000000000 +0000 -+++ ./macros.in 2011-05-12 14:32:18.000000000 +0000 -@@ -178,22 +178,22 @@ +--- macros.in 2011-07-15 11:32:41.000000000 +0200 ++++ macros.in 2012-01-20 11:02:19.809126991 +0100 +@@ -180,22 +180,22 @@ # Template for debug information sub-package. %debug_package \ @@ -29,7 +29,7 @@ # The path to the gzip executable (legacy, use %{__gzip} instead). %_gzipbin %{__gzip} -@@ -230,7 +230,8 @@ package or when debugging this package.\ +@@ -232,7 +232,8 @@ %_tmppath %{_var}/tmp # Path to top of build area. @@ -39,7 +39,7 @@ # The path to the unzip executable (legacy, use %{__unzip} instead). %_unzipbin %{__unzip} -@@ -333,7 +333,7 @@ package or when debugging this package.\ +@@ -335,7 +336,7 @@ # "w7.lzdio" lzma-alone level 7, lzma's default # #%_source_payload w9.gzdio @@ -48,16 +48,7 @@ # Algorithm to use for generating file checksum digests on build. # If not specified or 0, MD5 is used. -@@ -417,7 +417,7 @@ package or when debugging this package.\ - - # - # Use internal dependency generator rather than external helpers? --%_use_internal_dependency_generator 1 -+%_use_internal_dependency_generator 1 - - # - # Filter GLIBC_PRIVATE Provides: and Requires: -@@ -463,16 +463,22 @@ print (t)\ +@@ -465,16 +466,22 @@ # Undefined, missing or %{nil} will use package content (if available). %_verify_file_context_path %{__file_context_path} @@ -82,12 +73,9 @@ # # Path to file attribute classifications for automatic dependency -@@ -533,12 +539,12 @@ print (t)\ - # - +@@ -537,10 +544,10 @@ # Misc BDB tuning options --%__dbi_other mp_mmapsize=128Mb mp_size=64Mb -+%__dbi_other mp_mmapsize=128Mb mp_size=64Mb + %__dbi_other mp_mmapsize=128Mb mp_size=64Mb -%_dbi_config %{?__dbi_other} +%_dbi_config %{?__dbi_other} nofsync @@ -98,7 +86,7 @@ #============================================================================== # ---- GPG/PGP/PGP5 signature macros. -@@ -857,7 +863,7 @@ print (t)\ +@@ -859,7 +866,7 @@ %_build_vendor %{_host_vendor} %_build_os %{_host_os} %_host @host@ @@ -107,7 +95,7 @@ %_host_cpu @host_cpu@ %_host_vendor @host_vendor@ %_host_os @host_os@ -@@ -1020,6 +1026,181 @@ done \ +@@ -1022,6 +1029,183 @@ %python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))") %python_version %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])") @@ -248,6 +236,7 @@ +# %3 options +# %4 jars (separated by ':') +# %5 the name of script you wish to create ++# %6 whether to prefer a jre over a sdk when finding a jvm +# +%jpackage_script() \ +install -d -m 755 $RPM_BUILD_ROOT%{_bindir}\ @@ -258,6 +247,7 @@ +# JPackage Project \ +\ +# Source functions library\ ++_prefer_jre="%{?6}"\ +. %{_javadir}-utils/java-functions\ +\ +# Source system prefs\ @@ -289,7 +279,7 @@ #------------------------------------------------------------------------------ # arch macro for all Intel i?86 compatibile processors # (Note: This macro (and it's analogues) will probably be obsoleted when -@@ -1030,7 +1211,9 @@ done \ +@@ -1032,7 +1216,9 @@ #------------------------------------------------------------------------------ # arch macro for all supported ARM processors @@ -300,7 +290,7 @@ #------------------------------------------------------------------------------ # arch macro for all supported Sparc processors -@@ -1070,3 +1253,26 @@ done \ +@@ -1072,3 +1258,26 @@ # \endverbatim #*/ diff --git a/python3-rpm.spec b/python3-rpm.spec index 5b826aa..6bd2afc 100644 --- a/python3-rpm.spec +++ b/python3-rpm.spec @@ -16,6 +16,7 @@ # + Name: python3-rpm Version: 4.9.1.2 Release: 0 diff --git a/rpm-python.spec b/rpm-python.spec index 5af67c9..fe0857e 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -16,6 +16,7 @@ # + Name: rpm-python Version: 4.9.1.2 Release: 0 diff --git a/rpm.changes b/rpm.changes index 23430b9..006a21f 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 20 11:43:05 UTC 2012 - mvyskocil@suse.cz + +- push Stopgap fix for rhbz#461683 from to SUSE + set_javacmd preffers JRE over JDK + ------------------------------------------------------------------- Fri Jan 20 11:58:23 CET 2012 - dmueller@suse.de diff --git a/rpm.spec b/rpm.spec index 7d0e027..9e70c08 100644 --- a/rpm.spec +++ b/rpm.spec @@ -16,6 +16,7 @@ # + Name: rpm BuildRequires: file-devel BuildRequires: libacl-devel