Hello community,
here is the log from the commit of package rpm for openSUSE:Factory
checked in at Mon Jun 20 09:23:50 CEST 2011.
--------
--- rpm/rpm.changes 2011-06-08 12:04:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2011-06-17
13:17:06.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun 17 11:14:38 UTC 2011 - fcro...@suse.com
+
+- update brp.diff to not convert /sbin/init to absolute symlink
+ (needed for kiwi and systemd).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpm-python.spec ++++++
--- /var/tmp/diff_new_pack.arFyPj/_old 2011-06-20 08:52:17.000000000 +0200
+++ /var/tmp/diff_new_pack.arFyPj/_new 2011-06-20 08:52:17.000000000 +0200
@@ -26,7 +26,7 @@
Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages
Version: 4.9.0
-Release: 9
+Release: 10
Requires: rpm = %{version}
%py_requires
Source99: rpm.spec
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.arFyPj/_old 2011-06-20 08:52:17.000000000 +0200
+++ /var/tmp/diff_new_pack.arFyPj/_new 2011-06-20 08:52:17.000000000 +0200
@@ -29,7 +29,7 @@
AutoReqProv: on
Summary: The RPM Package Manager
Version: 4.9.0
-Release: 17
+Release: 19
Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2
++++++ brp.diff ++++++
--- /var/tmp/diff_new_pack.arFyPj/_old 2011-06-20 08:52:17.000000000 +0200
+++ /var/tmp/diff_new_pack.arFyPj/_new 2011-06-20 08:52:17.000000000 +0200
@@ -1,7 +1,9 @@
SUSE specific brp script patches
---- ./scripts/Makefile.am.orig 2010-12-03 12:11:57.000000000 +0000
-+++ ./scripts/Makefile.am 2011-05-11 14:31:45.000000000 +0000
+Index: scripts/Makefile.am
+===================================================================
+--- scripts/Makefile.am.orig
++++ scripts/Makefile.am
@@ -6,6 +6,7 @@ CLEANFILES =
EXTRA_DIST = \
@@ -18,8 +20,10 @@
brp-strip brp-strip-comment-note brp-python-hardlink \
brp-strip-shared brp-strip-static-archive \
check-files check-prereqs \
---- ./scripts/brp-lib64-linux.orig 2011-05-11 14:30:08.000000000 +0000
-+++ ./scripts/brp-lib64-linux 2011-05-11 14:30:08.000000000 +0000
+Index: scripts/brp-lib64-linux
+===================================================================
+--- /dev/null
++++ scripts/brp-lib64-linux
@@ -0,0 +1,42 @@
+#!/bin/bash
+# script checks wether package is 64-bit clean
@@ -63,8 +67,22 @@
+ fi
+done
+exit 0
---- ./scripts/brp-strip-comment-note.orig 2010-12-03 12:11:57.000000000
+0000
-+++ ./scripts/brp-strip-comment-note 2011-05-11 14:30:08.000000000 +0000
+Index: scripts/brp-strip
+===================================================================
+--- scripts/brp-strip.orig
++++ scripts/brp-strip
+@@ -15,6 +15,7 @@ esac
+ 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,' | \
++ grep -v '/lib/modules/' | \
+ 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
++++ scripts/brp-strip-comment-note
@@ -16,6 +16,8 @@ esac
# 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 {} \; | \
@@ -74,19 +92,11 @@
sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped/\1/p'`; do
note="-R .note"
if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1
| \
---- ./scripts/brp-strip.orig 2010-12-03 12:11:57.000000000 +0000
-+++ ./scripts/brp-strip 2011-05-11 14:30:08.000000000 +0000
-@@ -15,6 +15,7 @@ esac
- 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,' | \
-+ grep -v '/lib/modules/' | \
- sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do
- $STRIP -g "$f" || :
- done
---- ./scripts/brp-symlink.orig 2011-05-11 14:30:08.000000000 +0000
-+++ ./scripts/brp-symlink 2011-05-11 14:30:08.000000000 +0000
-@@ -0,0 +1,184 @@
+Index: scripts/brp-symlink
+===================================================================
+--- /dev/null
++++ scripts/brp-symlink
+@@ -0,0 +1,186 @@
+#!/bin/sh
+
+# Task: go through the files in $RPM_BUILD_ROOT and
@@ -176,6 +186,8 @@
+ continue;;
+ */share/texmf/*|/usr/share/terminfo/*)
+ continue;;
++ /sbin/init,*) # don't create absolute symlink for /sbin/init
++ continue;;
+ *share/automake-*)
+ echo "ERROR: link target $link points into automake directory"
+ echo " You might want to add a -c to the automake call (or just"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
