Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2014-05-22 20:37:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpm"
Changes:
--------
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2014-03-13 20:44:06.000000000
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2014-05-22
20:37:52.000000000 +0200
@@ -1,0 +2,19 @@
+Fri May 9 13:33:09 CEST 2014 - m...@suse.de
+
+- fix macro adjusting in installplatform
+ the old code broke macos like GNUconfigure [bnc#874897]
+ new patch: gentlyadjustmacros.diff
+
+-------------------------------------------------------------------
+Fri Apr 25 15:41:57 CEST 2014 - m...@suse.de
+
+- make _rundir configurable
+ new patch: rundir.diff
+
+-------------------------------------------------------------------
+Tue Apr 22 09:53:19 UTC 2014 - co...@suse.com
+
+- offer a %_rundir to avoid hardcoding /run - and packages wanting
+ to support older distros, can have /var/run as fallback for the macro
+
+-------------------------------------------------------------------
New:
----
gentlyadjustmacros.diff
rundir.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
rpm-python.spec: same change
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.lhpITh/_old 2014-05-22 20:37:57.000000000 +0200
+++ /var/tmp/diff_new_pack.lhpITh/_new 2014-05-22 20:37:57.000000000 +0200
@@ -137,6 +137,8 @@
Patch93: weakdepscompat.diff
Patch94: checksepwarn.diff
Patch95: exportoldtags.diff
+Patch96: rundir.diff
+Patch97: gentlyadjustmacros.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
Patch68000: m68k.patch
Patch68001: debugedit-m68k.patch
@@ -226,7 +228,7 @@
%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
%patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
%patch -P 80 -P 82 -P 85
-%patch -P 92 -P 93 -P 94 -P 95
+%patch -P 92 -P 93 -P 94 -P 95 -P 96 -P 97
%ifarch aarch64 ppc64le
%patch6464
@@ -274,6 +276,7 @@
./configure --disable-dependency-tracking --prefix=%{_prefix}
--mandir=%{_mandir} --infodir=%{_infodir} \
--libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var --with-lua \
--with-vendor=suse \
+--with-rundir=/run \
--with-selinux --with-internal-beecrypt \
--with-acl --with-cap --enable-shared %{?with_python: --enable-python}
$BUILDTARGET
++++++ gentlyadjustmacros.diff ++++++
commit 46993cd3846a8c8935c980e30bbc3718338e2378
Author: Panu Matilainen <pmati...@redhat.com>
Date: Fri May 9 10:56:46 2014 +0300
Sometimes a smaller hammer is better (but only sometimes)
- The sed-munger added in commit ccd6281e699781e0b00edb16b6e9f4dec6878c15
causes bigger breakage than it fixes, perhaps because the hammer
applied was disproportionally large. The only thing needing adjustment
is ${prefix} in case when localstatedir is not explicitly set, so
we fixup just that instead of "everything".
- Discovered via RhBug:921973 testing
diff --git a/installplatform b/installplatform
index ffaef48..98b87f3 100755
--- installplatform.orig
+++ installplatform
@@ -154,5 +154,5 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`;
do
done
-# gently adjust autoconf variables to rpm macros...
-cat $MACROS | sed -e '/\${\w*:-/!s,\${,%{_,' > ${DESTDIR}/${pkglibdir}/macros
+# gently adjust undefined autoconf variables to rpm macros...
+cat $MACROS | sed -e 's,${prefix},%{_prefix},g' >
${DESTDIR}/${pkglibdir}/macros
++++++ rundir.diff ++++++
--- configure.ac.orig 2014-04-25 13:40:13.808532251 +0000
+++ configure.ac 2014-04-25 13:40:13.822532172 +0000
@@ -814,6 +814,13 @@ AC_SUBST(RPMCANONVENDOR)
AC_SUBST(RPMCANONOS)
AC_SUBST(RPMCANONGNU)
+RUNDIR="/run"
+AC_ARG_WITH([rundir],
+ AS_HELP_STRING([--with-rundir=RUNDIR], [specify run-time variable
directory]),
+ [RUNDIR=$withval])
+AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory])
+AC_SUBST(RUNDIR)
+
if test X"$prefix" = XNONE ; then
usrprefix="$ac_default_prefix"
else
--- platform.in.orig 2014-04-25 13:40:13.823532166 +0000
+++ platform.in 2014-04-25 13:41:13.034198906 +0000
@@ -44,6 +44,7 @@
%_initddir %{_sysconfdir}/init.d
# Deprecated misspelling, present for backwards compatibility.
%_initrddir %{_initddir}
+%_rundir @RUNDIR@
%_defaultdocdir %{_datadir}/doc
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
