commit rpm for openSUSE:Factory

30 Nov 2013

Hello community,

here is the log from the commit of package rpm for openSUSE:Factory checked in at 2013-11-30 07:38:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
 and      /work/SRC/openSUSE:Factory/.rpm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "rpm"

Changes:
--------

--- /work/SRC/openSUSE:Factory/rpm/rpm-python.changes	2013-07-18 16:07:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm-python.changes	2013-11-30 07:38:19.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 20 14:41:34 CET 2013 - mls@suse.de
+
+- adapt to python-3.3, which no longer looks at XXXmodule.so
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes	2013-11-15 13:32:44.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes	2013-11-30 07:38:19.000000000 +0100
@@ -1,0 +2,19 @@
+Fri Nov 29 11:54:44 UTC 2013 - dvaleev@suse.com
+
+- Rename and extend auto-config-update-aarch64.diff to 
+  auto-config-update-aarch64-ppc64le.diff to apply same hack to
+  powerpc64le architecture
+
+-------------------------------------------------------------------
+Thu Nov 28 08:08:55 UTC 2013 - schwab@suse.de
+
+- Substitute current values of %suse_release, %sles_release, %ul_release
+  into suse_macros (bnc#851877)
+
+-------------------------------------------------------------------
+Mon Nov 11 10:02:43 UTC 2013 - speilicke@suse.com
+
+- Add find-lang-python.patch: Support for finding translations in
+  %python_sitelib/python_sitearch.
+
+-------------------------------------------------------------------

Old:
----
  auto-config-update-aarch64.diff

New:
----
  auto-config-update-aarch64-ppc64le.diff
  find-lang-python.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python3-rpm.spec ++++++
--- /var/tmp/diff_new_pack.rAL5f0/_old	2013-11-30 07:38:21.000000000 +0100
+++ /var/tmp/diff_new_pack.rAL5f0/_new	2013-11-30 07:38:21.000000000 +0100
@@ -59,7 +59,9 @@
 %make_install
 find %{buildroot} -not -type d -and -not -path %{buildroot}%{_libdir}/python3*/site-packages/rpm/\* -print0 | xargs -0 rm
 pushd %{buildroot}/%{_libdir}/python3*/site-packages/rpm
-rm -f _rpmmodule.a _rpmmodule.la
+rm -f _rpm*.la _rpm*.a
+# python3 no longer looks at "XXXmodule.so"
+for i in _rpm*module.so ; do mv $i ${i%module.so}.so; done
 python3 %{_libdir}/python3*/py_compile.py *.py
 python3 -O %{_libdir}/python3*/py_compile.py *.py
 popd

++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.rAL5f0/_old	2013-11-30 07:38:21.000000000 +0100
+++ /var/tmp/diff_new_pack.rAL5f0/_new	2013-11-30 07:38:21.000000000 +0100
@@ -145,7 +145,8 @@
 #upstream commit cf07feda05822377d62b973adc4010c0d7f9eaa0
 #upstream commit ef1497b1f81966fed56f008bc8ee8ba42102efd6
 Patch91:        ppc64le.diff
-Patch6464:      auto-config-update-aarch64.diff
+Patch92:        find-lang-python.patch
+Patch6464:      auto-config-update-aarch64-ppc64le.diff
 Patch68000:     m68k.patch
 Patch68001:     debugedit-m68k.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -234,7 +235,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 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88 -P 89
-%patch -P 90 -P 91
+%patch -P 90 -P 91 -P 92
 
 %ifarch aarch64
 %patch6464
@@ -249,10 +250,10 @@
 #chmod 755 scripts/debuginfo.prov
 tar -xjvf %{SOURCE1}
 tar -xjvf %{SOURCE2}
-if [ -s /etc/rpm/suse_macros ]; then
-	cp -a /etc/rpm/suse_macros %{SOURCE4}
-fi
-cp -a %{SOURCE4} suse_macros
+sed -e 's/@suse_version@/%{?suse_version}%{!?suse_version:0}/' \
+    -e 's/@sles_version@/%{?sles_version}%{!?sles_version:0}/' \
+    -e 's/@ul_version@/%{?ul_version}%{!?ul_version:0}/' \
+  < %{SOURCE4} > suse_macros
 rm -f m4/libtool.m4
 rm -f m4/lt*.m4
 

++++++ auto-config-update-aarch64-ppc64le.diff ++++++
Index: build/parseBuildInstallClean.c
===================================================================
--- build/parseBuildInstallClean.c.orig
+++ build/parseBuildInstallClean.c
@@ -46,7 +46,21 @@ int parseBuildInstallClean(rpmSpec spec,
     } else if (rc < 0) {
 	goto exit;
     }
-    
+
+    if (parsePart == PART_BUILD) {
+        char* buf = strdup(
+            "ref=/usr/lib/rpm\n"
+            "for s in guess sub; do\n"
+            "    for c in $(find -maxdepth 8 -name \"config.$s\"); do\n"
+            "         grep -q config-patches@ $c || continue\n"
+            "         grep -q aarch64 $c || install -m 755 $ref/config.$s $c\n"
+            "         grep -q ppc64le $c || install -m 755 $ref/config.$s $c\n"
+            "     done\n"
+            "done\n"
+        );
+        appendLineStringBuf(*sbp, buf);
+        free(buf);
+    }
+
     while (! (nextPart = isPart(spec->line))) {
 	appendStringBuf(*sbp, spec->line);
 	if ((rc = readLine(spec, STRIP_NOTHING)) > 0) {
++++++ find-lang-python.patch ++++++
Support for finding Python translation files in %python_sitelib
or %python_sitearch.

Sascha Peilicke <speilicke@suse.com>
--- scripts/find-lang.sh	2013-09-27 20:04:33.000000000 +0200
+++ scripts/find-lang.sh-new	2013-11-07 18:35:39.879014359 +0100
@@ -32,6 +32,7 @@
 Additional options:
   --without-gnome	do not find GNOME help files
   --without-kde		do not find KDE help files
+  --with-python         find Python translation files
   --with-qt		find Qt translation files
   --with-man		find localized man pages
   --all-name		match all package/domain names
@@ -56,6 +57,7 @@
 
 GNOME=
 KDE=
+PYTHON=#
 QT=#
 MAN=#
 MO=
@@ -83,6 +85,10 @@
 		KDE=#
 		shift
 		;;
+	--with-python )
+	        PYTHON=
+	        shift
+                ;;
 	--with-qt )
 		QT=
 		shift
@@ -122,21 +128,25 @@
 rm -f $MO_NAME_NEW
 
 # remove languages we do not yet support - but give out statistics
-find "$TOP_DIR/usr/share/locale/" -maxdepth 1 -type d | sed 's:'"$TOP_DIR"/usr/share/locale/'::; /^$/d' | while read dir; do
-  if ! rpm -ql filesystem | egrep -q "/usr/share/locale/$dir"$; then
-    find $TOP_DIR/usr/share/locale/$dir -name *.mo | sed 's:'"$TOP_DIR"'::' | while read file; do
-      echo -n "removing translation $file: "
-      msgunfmt "$TOP_DIR/$file" | msgfmt --statistics -o /dev/null -
+if [ -d "$TOP_DIR/usr/share/locale/" ] ; then
+    find "$TOP_DIR/usr/share/locale/" -maxdepth 1 -type d | sed 's:'"$TOP_DIR"/usr/share/locale/'::; /^$/d' | while read dir; do
+    if ! rpm -ql filesystem | egrep -q "/usr/share/locale/$dir"$; then
+        find $TOP_DIR/usr/share/locale/$dir -name *.mo | sed 's:'"$TOP_DIR"'::' | while read file; do
+        echo -n "removing translation $file: "
+        msgunfmt "$TOP_DIR/$file" | msgfmt --statistics -o /dev/null -
+        done
+        rm -rf $TOP_DIR/usr/share/locale/$dir
+    fi
     done
-    rm -rf $TOP_DIR/usr/share/locale/$dir
-  fi
-done
-find $TOP_DIR/usr/share/help/ -maxdepth 1 -type d | sed 's:'"$TOP_DIR"/usr/share/help/'::; /^$/d' | while read dir; do
-  if ! rpm -ql filesystem | egrep -q "/usr/share/help/$dir"$; then
-    echo "removing help translation /usr/share/help/$dir"
-    rm -rf $TOP_DIR/usr/share/help/$dir
-  fi
-done
+fi
+if [ -d "$TOP_DIR/usr/share/help/" ] ; then
+    find $TOP_DIR/usr/share/help/ -maxdepth 1 -type d | sed 's:'"$TOP_DIR"/usr/share/help/'::; /^$/d' | while read dir; do
+    if ! rpm -ql filesystem | egrep -q "/usr/share/help/$dir"$; then
+        echo "removing help translation /usr/share/help/$dir"
+        rm -rf $TOP_DIR/usr/share/help/$dir
+    fi
+    done
+fi
 
 find "$TOP_DIR" -type f -o -type l|sed '
 s:'"$TOP_DIR"'::
@@ -187,6 +197,16 @@
 s:^[^%].*::
 '"$ONLY_C"'/%lang(C)/!d
 '"$NO_C"'/%lang(C)/d
+s:%lang(C) ::
+/^$/d' >> $MO_NAME_NEW
+
+find "$TOP_DIR" -type f -o -type l|sed '
+s:'"$TOP_DIR"'::
+'"$NO_ALL_NAME$PYTHON"'s:\(/usr/lib.*/python.*/site-packages/'"$NAME"'$\):%dir \1:
+'"$ALL_NAME$PYTHON"'s:\(/usr/lib.*/python.*/site-packages/[a-zA-Z0-9.\_\-]\+$\):%dir \1:
+s:^[^%].*::
+'"$ONLY_C"'/%lang(C)/!d
+'"$NO_C"'/%lang(C)/d
 s:%lang(C) ::
 /^$/d' >> $MO_NAME_NEW
 
++++++ rpm-suse_macros ++++++
--- /var/tmp/diff_new_pack.rAL5f0/_old	2013-11-30 07:38:21.000000000 +0100
+++ /var/tmp/diff_new_pack.rAL5f0/_new	2013-11-30 07:38:21.000000000 +0100
@@ -259,9 +259,9 @@
 %supplements_kernel_module() \
     %{expand:%(if ! rpm -q kernel-syms > /dev/null; then echo "%fail Please add the kernel-syms package to BuildRequires"; fi)}
 
-%suse_version 1230
-%sles_version 0
-%ul_version 0
+%suse_version @suse_version@
+%sles_version @sles_version@
+%ul_version @ul_version@
 
 %do_profiling 1
 %cflags_profile_generate -fprofile-generate

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)