Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2014-08-20 10:50:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-06-18 22:04:40.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2014-08-20
10:50:43.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Aug 18 14:50:33 CEST 2014 - m...@suse.de
+
+- rename SuSE to SUSE [bnc#888990]
+- add correct self-provides to debuginfo subpackages
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
rpm-python.spec: same change
++++++ rpm.spec ++++++
--- /var/tmp/diff_new_pack.utnhNW/_old 2014-08-20 10:50:45.000000000 +0200
+++ /var/tmp/diff_new_pack.utnhNW/_new 2014-08-20 10:50:45.000000000 +0200
@@ -149,7 +149,7 @@
%description
RPM Package Manager is the main tool for managing the software packages
-of the SuSE Linux distribution.
+of the SUSE Linux distribution.
RPM can be used to install and remove software packages. With rpm, it
is easy to update packages. RPM keeps track of all these manipulations
++++++ debugsubpkg.diff ++++++
--- /var/tmp/diff_new_pack.utnhNW/_old 2014-08-20 10:50:45.000000000 +0200
+++ /var/tmp/diff_new_pack.utnhNW/_new 2014-08-20 10:50:45.000000000 +0200
@@ -1,9 +1,7 @@
Create a debuginfo package for each subpackage.
-Index: build/files.c
-===================================================================
---- build/files.c.orig
-+++ build/files.c
+--- ./build/files.c.orig 2014-08-18 12:59:00.491259331 +0000
++++ ./build/files.c 2014-08-18 13:02:12.918275693 +0000
@@ -21,6 +21,10 @@
#include <rpm/rpmlog.h>
#include <rpm/rpmbase64.h>
@@ -15,7 +13,7 @@
#include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */
#include "misc/fts.h"
#include "lib/cpio.h"
-@@ -2097,13 +2101,237 @@ exit:
+@@ -2084,13 +2088,241 @@ exit:
return rc;
}
@@ -234,6 +232,10 @@
+ /* Inherit other tags from parent. */
+ headerCopyTags (pkg->header, dbg->header, copyTagsForDebug);
+
++ /* Add self-provides */
++ dbg->ds = rpmdsThis(dbg->header, RPMTAG_REQUIRENAME,
RPMSENSE_EQUAL);
++ addPackageProvides(dbg);
++
+ /* Build up the files list. */
+ dbg->fileList = files;
+ }
@@ -253,7 +255,7 @@
genSourceRpmName(spec);
for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
-@@ -2119,8 +2347,12 @@ rpmRC processBinaryFiles(rpmSpec spec, r
+@@ -2108,8 +2340,12 @@ rpmRC processBinaryFiles(rpmSpec spec, r
rpmlog(RPMLOG_NOTICE, _("Processing files: %s\n"), nvr);
free(nvr);
@@ -268,11 +270,36 @@
goto exit;
a = headerGetString(pkg->header, RPMTAG_ARCH);
-Index: macros.in
-===================================================================
---- macros.in.orig
-+++ macros.in
-@@ -182,24 +182,10 @@
+--- ./build/parseSpec.c.orig 2014-08-18 13:00:49.767700174 +0000
++++ ./build/parseSpec.c 2014-08-18 13:00:59.917648619 +0000
+@@ -503,7 +503,7 @@ static void initSourceHeader(rpmSpec spe
+ }
+
+ /* Add extra provides to package. */
+-static void addPackageProvides(Package pkg)
++void addPackageProvides(Package pkg)
+ {
+ const char *arch, *name;
+ char *evr, *isaprov;
+--- ./build/rpmbuild_internal.h.orig 2014-08-18 13:00:42.455737908 +0000
++++ ./build/rpmbuild_internal.h 2014-08-18 13:01:40.838439511 +0000
+@@ -425,6 +425,13 @@ int addReqProv(Package pkg, rpmTagVal ta
+ uint32_t index);
+
+ /** \ingroup rpmbuild
++ * Add self-provides to package.
++ * @param pkg package
++ */
++RPM_GNUC_INTERNAL
++void addPackageProvides(Package pkg);
++
++/** \ingroup rpmbuild
+ * Add rpmlib feature dependency.
+ * @param pkg package
+ * @param feature rpm feature name (i.e. "rpmlib(Foo)" for feature Foo)
+--- ./macros.in.orig 2014-08-18 12:59:00.558258988 +0000
++++ ./macros.in 2014-08-18 12:59:21.194153431 +0000
+@@ -186,24 +186,10 @@
# Template for debug information sub-package.
%debug_package \
%global __debug_package 1\
@@ -297,10 +324,8 @@
%description debugsource\
This package provides debug sources for package %{name}.\
Debug sources are useful when developing applications that use this\
-Index: scripts/find-debuginfo.sh
-===================================================================
---- scripts/find-debuginfo.sh.orig
-+++ scripts/find-debuginfo.sh
+--- ./scripts/find-debuginfo.sh.orig 2014-08-18 12:59:00.552259019 +0000
++++ ./scripts/find-debuginfo.sh 2014-08-18 12:59:21.195153440 +0000
@@ -149,6 +149,11 @@ debug_link()
# Provide .2, .3, ... symlinks to all filename instances of this build-id.
make_id_dup_link()
++++++ rpmconfigcheck ++++++
--- /var/tmp/diff_new_pack.utnhNW/_old 2014-08-20 10:50:45.000000000 +0200
+++ /var/tmp/diff_new_pack.utnhNW/_new 2014-08-20 10:50:45.000000000 +0200
@@ -1,5 +1,5 @@
#! /bin/bash
-# Copyright (c) 2002 SuSE GmbH Nuernberg, Germany.
+# Copyright (c) 2002 SUSE GmbH Nuernberg, Germany.
#
# Author: Michael Schroeder <feedb...@suse.de>
#
++++++ rpmqpack.diff ++++++
--- /var/tmp/diff_new_pack.utnhNW/_old 2014-08-20 10:50:45.000000000 +0200
+++ /var/tmp/diff_new_pack.utnhNW/_new 2014-08-20 10:50:45.000000000 +0200
@@ -49,7 +49,7 @@
+.BR rpm (1)
+
+.SH COPYRIGHT
-+2002 SuSE Linux AG Nuernberg, Germany.
++2002 SUSE Linux AG Nuernberg, Germany.
+
+.SH AUTHOR
+Michael Schroeder <m...@suse.de>
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
