commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2020-10-22 14:19:52
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.3463 (New)
Package is "rpm"
Thu Oct 22 14:19:52 2020 rev:283 rq:842515 version:4.15.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2020-08-25 09:31:31.343957486
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new.3463/rpm.changes2020-10-22
14:19:55.178622969 +0200
@@ -1,0 +2,12 @@
+Mon Oct 19 11:53:00 CEST 2020 - m...@suse.de
+
+- Backport FA_TOUCH fixes from upsteam [bnc#1175025] [bnc#1177428]
+ * new patch: touch_backport.diff
+
+---
+Fri Oct 9 13:28:33 UTC 2020 - Guillaume GARDET
+
+- Add patch to fix finddebuginfo when no res.* file are found:
+ * finddebuginfo-check-res-file.patch
+
+---
New:
finddebuginfo-check-res-file.patch
touch_backport.diff
Other differences:
--
++ rpm.spec ++
--- /var/tmp/diff_new_pack.nyaFGm/_old 2020-10-22 14:19:57.782625307 +0200
+++ /var/tmp/diff_new_pack.nyaFGm/_new 2020-10-22 14:19:57.786625311 +0200
@@ -134,6 +134,8 @@
Patch123: initgcrypt.diff
Patch124: gcryptdsa2.diff
Patch125: ndb_backport2.diff
+Patch126: touch_backport.diff
+Patch127: finddebuginfo-check-res-file.patch
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -259,6 +261,7 @@
%patch -P 100-P 102 -P 103
%patch -P 109 -P 117
%patch -P 118 -P 119 -P 120 -P 121 -P 122 -P 123 -P 124 -P 125
+%patch -P 126 -P 127
%ifarch aarch64 ppc64le riscv64
%patch6464
++ finddebuginfo-check-res-file.patch ++
>From a20edbb561f74ba608c0aa36be637e7245e596b5 Mon Sep 17 00:00:00 2001
From: ggardet
Date: Fri, 9 Oct 2020 13:10:09 +0200
Subject: [PATCH] Do not fail if there is no "$temp"/res.* file
find-debuginfo is multi-threaded and rpm runs
scripts usually with "-e" to abort on error.
If the debug-splitting tool fails, that job will abort.
But if you have X files that are problematic in the tree,
and you have X or less jobs, find-debuginfo will abort
as no single res.$number has been written.
But if you have more than X jobs, the build will succeed,
which makes the whole process random.
This commit remove this randomness.
--- scripts/find-debuginfo.sh.orig
+++ scripts/find-debuginfo.sh
@@ -498,6 +498,7 @@ else
wait
)
for f in "$temp"/res.*; do
+test -f "$f" || continue
res=$(< "$f")
if [ "$res" != "0" ]; then
exit 1
++ touch_backport.diff ++
--- ./lib/fsm.c.orig2019-06-26 14:17:31.407985702 +
+++ ./lib/fsm.c 2020-10-19 09:49:02.709129763 +
@@ -926,10 +926,6 @@ int rpmPackageFilesInstall(rpmts ts, rpm
if (!skip) {
int setmeta = 1;
- /* When touching we don't need any of this... */
- if (action == FA_TOUCH)
- goto touch;
-
/* Directories replacing something need early backup */
if (!suffix) {
rc = fsmBackup(fi, action);
@@ -941,6 +937,17 @@ int rpmPackageFilesInstall(rpmts ts, rpm
rc = RPMERR_ENOENT;
}
+ /* See if the file was removed while our attention was elsewhere */
+ if (rc == RPMERR_ENOENT && action == FA_TOUCH) {
+ rpmlog(RPMLOG_DEBUG, "file %s vanished unexpectedly\n", fpath);
+ action = FA_CREATE;
+ fsmDebug(fpath, action, );
+ }
+
+ /* When touching we don't need any of this... */
+ if (action == FA_TOUCH)
+ goto touch;
+
if (S_ISREG(sb.st_mode)) {
if (rc == RPMERR_ENOENT) {
rc = fsmMkfile(fi, fpath, files, psm, nodigest,
--- ./lib/transaction.c.orig2020-10-19 09:47:25.761418056 +
+++ ./lib/transaction.c 2020-10-19 09:48:20.837254277 +
@@ -483,13 +483,6 @@ static void handleInstInstalledFile(cons
rpmfsSetAction(fs, fx, action);
}
-/* Skip already existing files - if 'minimize_writes' is set. */
-if ((!isCfgFile) && (rpmfsGetAction(fs, fx) == FA_UNKNOWN) &&
ts->min_writes) {
- if (rpmfileContentsEqual(otherFi, ofx, fi, fx)) {
- rpmfsSetAction(fs, fx, FA_TOUCH);
- }
-}
-
otherFileSize = rpmfilesFSize(otherFi, ofx);
/* Only account for the last file of a hardlink set */
@@ -499,6 +492,16 @@ static void handleInstInstalledFile(cons
/* Add one to make sure the size is not zero */
rpmfilesSetFReplacedSize(fi, fx, otherFileSize +
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2020-08-25 09:31:16
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.3399 (New)
Package is "rpm"
Tue Aug 25 09:31:16 2020 rev:282 rq:819007 version:4.15.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2020-06-29 21:14:18.641031243
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new.3399/rpm.changes2020-08-25
09:31:31.343957486 +0200
@@ -1,0 +2,12 @@
+Mon Jul 6 16:35:40 CEST 2020 - Martin Liška
+
+- Default to zstd compression (level 19).
+ * modified patch: macrosin.diff
+
+---
+Mon Jul 6 15:49:28 CEST 2020 - Neal Gompa
+
+- Set %_libexecdir to /usr/libexec
+ * modified patch: platformin.diff
+
+---
Other differences:
--
rpm.spec: same change
++ macrosin.diff ++
--- /var/tmp/diff_new_pack.mDehpv/_old 2020-08-25 09:31:33.239958592 +0200
+++ /var/tmp/diff_new_pack.mDehpv/_new 2020-08-25 09:31:33.239958592 +0200
@@ -34,7 +34,7 @@
#
#%_source_payload w9.gzdio
-#%_binary_payload w9.gzdio
-+%_binary_payload w5.xzdio
++%_binary_payload w19.zstdio
# Algorithm to use for generating file checksum digests on build.
# If not specified or 0, MD5 is used.
++ platformin.diff ++
--- /var/tmp/diff_new_pack.mDehpv/_old 2020-08-25 09:31:33.259958603 +0200
+++ /var/tmp/diff_new_pack.mDehpv/_new 2020-08-25 09:31:33.259958603 +0200
@@ -1,14 +1,5 @@
--- ./platform.in.orig 2014-06-26 06:51:54.822818260 +
+++ ./platform.in 2014-08-04 12:38:55.389245494 +
-@@ -29,7 +29,7 @@
- %_exec_prefix @exec_prefix@
- %_bindir @bindir@
- %_sbindir @sbindir@
--%_libexecdir @libexecdir@
-+%_libexecdir %{_exec_prefix}/lib
- %_datarootdir @datarootdir@
- %_datadir @datadir@
- %_sysconfdir @sysconfdir@
@@ -41,7 +41,7 @@
%_oldincludedir @oldincludedir@
%_infodir @infodir@
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2020-06-29 21:14:17
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.3060 (New)
Package is "rpm"
Mon Jun 29 21:14:17 2020 rev:281 rq:817222 version:4.15.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2020-04-19 21:35:00.066334677
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new.3060/rpm.changes2020-06-29
21:14:18.641031243 +0200
@@ -1,0 +2,17 @@
+Thu Jun 18 18:32:16 UTC 2020 - Dirk Mueller
+
+- temporarily back out change of %_libexecdir to /usr/libexec
+
+---
+Mon May 4 13:11:34 UTC 2020 - Dominique Leuenberger
+
+- Update rpmconfigcheck: Remove bashism and use /bin/sh instead of
+ /bin/bash.
+
+---
+Thu Apr 30 12:16:46 UTC 2020 - Dirk Mueller
+
+- update auto-config-update-aarch64-ppc64le.diff (bsc#1170849):
+ * only update if hostarch isn't there
+
+---
@@ -44,0 +62,6 @@
+
+---
+Thu Feb 20 20:20:20 UTC 2020 - oher...@suse.de
+
+- Remove ocaml-find-provides.sh, ocaml-find-requires.sh, fileattrs/ocaml.attr
+ ocaml(NAME) = HASH is now handled in ocaml-rpm-macros (bsc#1154874)
Other differences:
--
++ rpm.spec ++
--- /var/tmp/diff_new_pack.D8MSVq/_old 2020-06-29 21:14:20.345036516 +0200
+++ /var/tmp/diff_new_pack.D8MSVq/_new 2020-06-29 21:14:20.349036528 +0200
@@ -356,6 +356,7 @@
# remove some nonsense or non-working scripts
pushd %{buildroot}/usr/lib/rpm/
for f in rpm2cpio.sh rpm.daily rpmdiff* rpm.log rpm.xinetd freshen.sh u_pkg.sh
\
+ ocaml-find-provides.sh ocaml-find-requires.sh fileattrs/ocaml.attr \
magic magic.mgc magic.mime* rpmfile *.pl javadeps brp-redhat \
brp-strip-static-archive vpkg-provides*.sh http.req sql.req tcl.req \
brp-sparc64-linux brp-strip-comment-note brp-java-gcjcompile
++ auto-config-update-aarch64-ppc64le.diff ++
--- /var/tmp/diff_new_pack.D8MSVq/_old 2020-06-29 21:14:20.381036627 +0200
+++ /var/tmp/diff_new_pack.D8MSVq/_new 2020-06-29 21:14:20.381036627 +0200
@@ -1,6 +1,6 @@
--- ./build/parseSpec.c.orig 2019-10-02 12:38:51.836127743 +
+++ ./build/parseSpec.c2019-10-02 12:52:33.818447657 +
-@@ -926,7 +926,24 @@ static rpmSpec parseSpec(const char *spe
+@@ -926,7 +926,22 @@ static rpmSpec parseSpec(const char *spe
&(spec->buildrequires));
break;
case PART_BUILD:
@@ -12,13 +12,11 @@
+ }
+ spec->build = newStringBuf();
+ appendLineStringBuf(spec->build,
-+ "ref=/usr/lib/rpm\n"
++ "ref=/usr/lib/rpm; testarch=$(uname -m)\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"
-+ " grep -q 'riscv64[-:]' $c || install -m 755
$ref/config.$s $c\n"
++ " grep -q $testarch\\[-:\\] $c || install -m 755
$ref/config.$s $c\n"
+ " done\n"
+ "done\n"
+ );
++ rpmconfigcheck ++
--- /var/tmp/diff_new_pack.D8MSVq/_old 2020-06-29 21:14:20.545037135 +0200
+++ /var/tmp/diff_new_pack.D8MSVq/_new 2020-06-29 21:14:20.545037135 +0200
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
# Copyright (c) 2002 SUSE GmbH Nuernberg, Germany.
#
# Author: Michael Schroeder
@@ -15,7 +15,7 @@
test -e $configcheckfile && mv -f $configcheckfile $configcheckfile.old
rpm -qalc | sort | while read line; do
for suffix in new orig save; do
-[[ -e "${line}.rpm${suffix}" ]] && echo "${line}.rpm${suffix}"
+[ -e "${line}.rpm${suffix}" ] && echo "${line}.rpm${suffix}"
done
done > $configcheckfile
else
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2020-04-19 21:34:58
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.2738 (New)
Package is "rpm"
Sun Apr 19 21:34:58 2020 rev:280 rq:793802 version:4.15.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2020-04-08 19:54:08.601012048
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new.2738/rpm.changes2020-04-19
21:35:00.066334677 +0200
@@ -1,0 +2,13 @@
+Tue Apr 14 11:50:49 CEST 2020 - m...@suse.de
+
+- Fix verification of DSA2 signatures with libgrcypt [bnc#1165731]
+ * new patch: gcryptdsa2.diff
+- Do not map the index database read-write all the time
+ * new patch: ndb_backport2.diff
+
+---
+Tue Apr 14 08:16:30 UTC 2020 - Fabian Vogt
+
+- Fix name of Packages DB file in rpmconfigcheck
+
+---
New:
gcryptdsa2.diff
ndb_backport2.diff
Other differences:
--
++ python-rpm.spec ++
--- /var/tmp/diff_new_pack.Rj5kHG/_old 2020-04-19 21:35:02.542339784 +0200
+++ /var/tmp/diff_new_pack.Rj5kHG/_new 2020-04-19 21:35:02.546339791 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-rpm
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2017 Neal Gompa .
#
# All modifications and additions to the file contributed by third parties
@@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
++ rpm.spec ++
--- /var/tmp/diff_new_pack.Rj5kHG/_old 2020-04-19 21:35:02.578339858 +0200
+++ /var/tmp/diff_new_pack.Rj5kHG/_new 2020-04-19 21:35:02.582339866 +0200
@@ -1,7 +1,7 @@
#
# spec file for package rpm
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -132,6 +132,8 @@
Patch121: ndb_backport.diff
Patch122: db_conversion.diff
Patch123: initgcrypt.diff
+Patch124: gcryptdsa2.diff
+Patch125: ndb_backport2.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -256,7 +258,7 @@
%patch -P 93 -P 94 -P 99
%patch -P 100-P 102 -P 103
%patch -P 109 -P 117
-%patch -P 118 -P 119 -P 120 -P 121 -P 122 -P 123
+%patch -P 118 -P 119 -P 120 -P 121 -P 122 -P 123 -P 124 -P 125
%ifarch aarch64 ppc64le riscv64
%patch6464
++ gcryptdsa2.diff ++
--- ./rpmio/digest_libgcrypt.c.orig
+++ ./rpmio/digest_libgcrypt.c
@@ -302,10 +302,16 @@ static int pgpVerifySigDSA(pgpDigAlg pgpkey, pgpDigAlg
pgpsig, uint8_t *hash, si
struct pgpDigSigDSA_s *sig = pgpsig->data;
gcry_sexp_t sexp_sig = NULL, sexp_data = NULL, sexp_pkey = NULL;
int rc = 1;
+size_t qlen;
if (!sig || !key)
return rc;
+qlen = (mpi_get_nbits(key->q) + 7) / 8;
+if (qlen < 20)
+ qlen = 20; /* sanity */
+if (hashlen > qlen)
+ hashlen = qlen; /* dsa2: truncate hash to qlen */
gcry_sexp_build(_sig, NULL, "(sig-val (dsa (r %M) (s %M)))", sig->r,
sig->s);
gcry_sexp_build(_data, NULL, "(data (flags raw) (value %b))",
(int)hashlen, (const char *)hash);
gcry_sexp_build(_pkey, NULL, "(public-key (dsa (p %M) (q %M) (g %M)
(y %M)))", key->p, key->q, key->g, key->y);
++ ndb_backport2.diff ++
--- ./lib/backend/ndb/glue.c.orig 2020-04-03 10:24:27.954135180 +
+++ ./lib/backend/ndb/glue.c2020-04-14 09:48:23.304231127 +
@@ -143,9 +143,6 @@ static int ndb_Open(rpmdb rdb, rpmDbiTag
free(path);
dbi->dbi_db = ndbenv->pkgdb = pkgdb;
rpmpkgSetFsync(pkgdb, ndbenv->dofsync);
-
- if ((oflags & (O_RDWR | O_RDONLY)) == O_RDONLY)
- dbi->dbi_flags |= DBI_RDONLY;
} else {
unsigned int id;
rpmidxdb idxdb = 0;
@@ -184,20 +181,20 @@ static int ndb_Open(rpmdb rdb, rpmDbiTag
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2020-04-08 19:54:07
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.3248 (New)
Package is "rpm"
Wed Apr 8 19:54:07 2020 rev:279 rq:791720 version:4.15.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2020-03-24 23:07:25.737849696
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new.3248/rpm.changes2020-04-08
19:54:08.601012048 +0200
@@ -1,0 +2,6 @@
+Fri Apr 3 12:34:42 CEST 2020 - m...@suse.de
+
+- Initialize the libgcrypt library [bnc#1167343]
+ * new patch: initgcrypt.diff
+
+---
@@ -11,0 +18,14 @@
+
+---
+Fri Mar 13 08:26:58 UTC 2020 - Fabian Vogt
+
+- Replace rpmsort with rewrite using Lua (boo#1164553)
+
+---
+Wed Feb 26 09:08:19 UTC 2020 - Fabian Vogt
+
+- Split out perl and python dep generators from rpm-build to avoid
+ pulling in perl and python in all RPM builds
+- Port rpmconfigcheck to pure shell
+- Refactor %files list of main package to not require %excludes
+ as those might lead to missing files in the package
New:
initgcrypt.diff
Other differences:
--
++ rpm.spec ++
--- /var/tmp/diff_new_pack.eVVl1C/_old 2020-04-08 19:54:10.809013661 +0200
+++ /var/tmp/diff_new_pack.eVVl1C/_new 2020-04-08 19:54:10.813013664 +0200
@@ -131,6 +131,7 @@
Patch120: disable_bdb.diff
Patch121: ndb_backport.diff
Patch122: db_conversion.diff
+Patch123: initgcrypt.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -194,7 +195,6 @@
Requires: gzip
Requires: make
Requires: patch
-Requires: perl-base
Requires: sed
Requires: systemd-rpm-macros
Requires: tar
@@ -204,8 +204,9 @@
# drop candidates
Requires: cpio
Requires: file
-# for pythondistdeps generator
-Requires: python3-base
+# Mandatory generators
+Requires: (%{name}-build-perl if perl-base)
+Requires: (%{name}-build-python if python3-base)
# The point of the split
Conflicts: rpm < 4.15.0
@@ -213,6 +214,22 @@
If you want to build a rpm, you need this package. It provides rpmbuild
and requires some packages that are usually required.
+%package build-python
+Summary:RPM dependency generator for Python
+Group: Development/Languages/Python
+Requires: python3-base
+
+%description build-python
+Provides and requires generator for .py files and modules.
+
+%package build-perl
+Summary:RPM dependency generator for Perl
+Group: Development/Languages/Perl
+Requires: perl-base
+
+%description build-perl
+Provides and requires generator for .pl files and modules.
+
%prep
%setup -q -n rpm-%{version}
rm -rf sqlite
@@ -239,7 +256,7 @@
%patch -P 93 -P 94 -P 99
%patch -P 100-P 102 -P 103
%patch -P 109 -P 117
-%patch -P 118 -P 119 -P 120 -P 121 -P 122
+%patch -P 118 -P 119 -P 120 -P 121 -P 122 -P 123
%ifarch aarch64 ppc64le riscv64
%patch6464
@@ -412,24 +429,29 @@
%docRPM-HOWTO
/etc/rpm
/bin/rpm
- /usr/bin/*
- %exclude /usr/bin/rpmbuild
- %exclude %{_libdir}/librpmbuild.so.*
- %exclude /usr/lib/rpm/elfdeps
- %exclude /usr/lib/rpm/rpmdeps
- %exclude /usr/lib/rpm/debugedit
- %exclude /usr/lib/rpm/sepdebugcrcfix
- %exclude /usr/bin/rpmspec
- %exclude /usr/lib/rpm/*.prov
- %exclude /usr/lib/rpm/*.req
- %exclude /usr/lib/rpm/brp-*
- %exclude /usr/lib/rpm/check-*
- %exclude /usr/lib/rpm/*find*
- %exclude /usr/lib/rpm/fileattrs/pythondist.attr
- %exclude /usr/lib/rpm/pythondistdeps.py
+ %{_bindir}/gendiff
+ %{_bindir}/rpm
+ %{_bindir}/rpm2cpio
+ %{_bindir}/rpmdb
+ %{_bindir}/rpmgraph
+ %{_bindir}/rpmkeys
+ %{_bindir}/rpmqpack
+ %{_bindir}/rpmquery
+ %{_bindir}/rpmsign
+ %{_bindir}/rpmverify
/usr/sbin/rpmconfigcheck
/usr/lib/systemd/system/rpmconfigcheck.service
- /usr/lib/rpm
+ %dir /usr/lib/rpm
+ /usr/lib/rpm/macros
+ /usr/lib/rpm/macros.d/
+ /usr/lib/rpm/platform/
+ /usr/lib/rpm/rpm.supp
+ /usr/lib/rpm/rpmdb_*
+ /usr/lib/rpm/rpmpopt-*
+ /usr/lib/rpm/rpmrc
+ /usr/lib/rpm/rpmsort
+ /usr/lib/rpm/suse
+ /usr/lib/rpm/tgpg
%{_libdir}/rpm-plugins
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2020-03-24 23:07:22
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.3160 (New)
Package is "rpm"
Tue Mar 24 23:07:22 2020 rev:278 rq:787932 version:4.15.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2020-03-19 19:40:08.619842344
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new.3160/rpm.changes2020-03-24
23:07:25.737849696 +0100
@@ -1,0 +2,12 @@
+Tue Mar 24 22:16:22 CET 2020 - m...@suse.de
+
+- Follow one level of symlink indirection when converting the rpm
+ database [bnc#1167537]
+ * modified patch: db_conversion.diff
+
+---
+Mon Mar 23 16:11:34 UTC 2020 - Sergio Lindo Mansilla
+
+- Add macro for supported ARM 64bit processors
+
+---
Other differences:
--
rpm.spec: same change
++ db_conversion.diff ++
--- /var/tmp/diff_new_pack.A91yBq/_old 2020-03-24 23:07:27.757850444 +0100
+++ /var/tmp/diff_new_pack.A91yBq/_new 2020-03-24 23:07:27.761850446 +0100
@@ -1,5 +1,5 @@
./lib/backend/bdb_ro.c.orig2020-01-17 15:48:50.622349363 +
-+++ ./lib/backend/bdb_ro.c 2020-01-17 15:49:20.514287856 +
+--- ./lib/backend/bdb_ro.c.orig2020-03-24 20:45:19.121907476 +
./lib/backend/bdb_ro.c 2020-03-24 20:46:17.141727988 +
@@ -795,6 +795,7 @@ static unsigned int bdbro_pkgdbKey(dbiIn
struct rpmdbOps_s bdbro_dbops = {
.name = "bdb_ro",
@@ -8,8 +8,8 @@
.open = bdbro_Open,
.close = bdbro_Close,
./lib/backend/dbi.c.orig 2020-01-17 15:48:50.622349363 +
-+++ ./lib/backend/dbi.c2020-01-17 15:49:20.514287856 +
+--- ./lib/backend/dbi.c.orig 2020-03-24 20:45:19.121907476 +
./lib/backend/dbi.c2020-03-24 20:46:17.141727988 +
@@ -105,11 +105,20 @@ dbDetectBackend(rpmdb rdb)
}
@@ -31,8 +31,8 @@
const char * dbiName(dbiIndex dbi)
{
return dbi->dbi_file;
./lib/backend/dbi.h.orig 2020-01-17 15:48:50.622349363 +
-+++ ./lib/backend/dbi.h2020-01-17 15:49:49.886227415 +
+--- ./lib/backend/dbi.h.orig 2020-03-24 20:45:19.121907476 +
./lib/backend/dbi.h2020-03-24 20:46:17.141727988 +
@@ -10,6 +10,7 @@ enum rpmdbFlags {
RPMDB_FLAG_JUSTCHECK = (1 << 0),
RPMDB_FLAG_REBUILD= (1 << 1),
@@ -72,8 +72,8 @@
int (*open)(rpmdb rdb, rpmDbiTagVal rpmtag, dbiIndex * dbip, int flags);
int (*close)(dbiIndex dbi, unsigned int flags);
./lib/rpmdb.c.orig 2020-01-17 15:48:50.622349363 +
-+++ ./lib/rpmdb.c 2020-01-17 15:53:52.241669094 +
+--- ./lib/rpmdb.c.orig 2020-03-24 20:45:19.117907488 +
./lib/rpmdb.c 2020-03-24 21:01:54.870821518 +
@@ -513,8 +513,16 @@ static int openDatabase(const char * pre
rpmsqActivate(1);
}
@@ -128,7 +128,31 @@
{
rpmdb olddb;
char * dbpath = NULL;
-@@ -2536,7 +2555,7 @@ int rpmdbRebuild(const char * prefix, rp
+@@ -2512,7 +2531,22 @@ int rpmdbRebuild(const char * prefix, rp
+ }
+ rootdbpath = rpmGetPath(prefix, dbpath, NULL);
+
+-newdbpath = rpmGetPath("%{?_dbpath_rebuild}", NULL);
++if ((newdbflags & RPMDB_FLAG_CONVERT) != 0) {
++ char lbuf[PATH_MAX];
++ ssize_t s = readlink(rootdbpath, lbuf, PATH_MAX);
++ if (s > 0 && s < PATH_MAX) {
++ lbuf[s] = 0;
++ free(dbpath);
++ if (lbuf[0] == '/')
++ dbpath = strdup(lbuf);
++ else
++ dbpath = rpmGetPath("%{?_dbpath}", "/../", lbuf, NULL);
++ free(rootdbpath);
++ rootdbpath = rpmGetPath(prefix, dbpath, NULL);
++ }
++ newdbpath = strdup("");
++} else
++ newdbpath = rpmGetPath("%{?_dbpath_rebuild}", NULL);
+ if (rstreq(newdbpath, "") || rstreq(newdbpath, dbpath)) {
+ newdbpath = _free(newdbpath);
+ rasprintf(, "%srebuilddb.%d", dbpath, (int) getpid());
+@@ -2536,7 +2570,7 @@ int rpmdbRebuild(const char * prefix, rp
goto exit;
}
if (openDatabase(prefix, newdbpath, ,
@@ -137,8 +161,8 @@
rc = 1;
goto exit;
}
./lib/rpmdb_internal.h.orig2020-01-17 15:51:16.134030103 +
-+++ ./lib/rpmdb_internal.h 2020-01-17 15:50:27.050144956 +
+--- ./lib/rpmdb_internal.h.orig2019-06-26 14:17:31.412985694 +
./lib/rpmdb_internal.h 2020-03-24 20:46:17.141727988 +
@@ -63,11 +63,13 @@ int rpmdbClose (rpmdb db);
* @param prefix path to top of install tree
* @param ts transaction set (or NULL)
@@ -154,8 +178,8 @@
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2020-03-19 19:40:05
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.3160 (New)
Package is "rpm"
Thu Mar 19 19:40:05 2020 rev:277 rq:769573 version:4.15.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2020-01-10 17:47:33.810156179
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new.3160/rpm.changes2020-03-19
19:40:08.619842344 +0100
@@ -1,0 +2,21 @@
+Fri Jan 17 11:27:17 CET 2020 - m...@suse.de
+
+- Use libgcrypt as crypto library instead of beecrypt
+ * dropped patch: beecrypt-4.1.2-build.diff
+ * dropped patch: beecrypt-4.1.2.diff
+- Rewrite rpmqpack to use rpm's database interface
+ modified patch: rpmqpack.diff
+- Backport database detection code from upstream
+ new patch: db_ops_name.diff
+- Backport read-only BerkeleyDB code
+ new patch: bdb_ro.diff
+- Enable ndb backend
+- Backport bdb disabling fix
+ new patch: disable_bdb.diff
+- Backport ndb improvements
+ new patch: ndb_backport.diff
+- Backport automatic db conversion
+ new patch: db_conversion.diff
+- Disable the BerkeleyDB backend and switch over to 'ndb'
+
+---
Old:
beecrypt-4.1.2-build.diff
beecrypt-4.1.2.diff
beecrypt-4.1.2.tar.bz2
New:
bdb_ro.diff
db_conversion.diff
db_ops_name.diff
disable_bdb.diff
ndb_backport.diff
Other differences:
--
++ python-rpm.spec ++
--- /var/tmp/diff_new_pack.ikm4Ev/_old 2020-03-19 19:40:12.331844500 +0100
+++ /var/tmp/diff_new_pack.ikm4Ev/_new 2020-03-19 19:40:12.331844500 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-rpm
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 Neal Gompa .
#
# All modifications and additions to the file contributed by third parties
@@ -34,6 +34,7 @@
BuildRequires: libbz2-devel
BuildRequires: libcap-devel
BuildRequires: libelf-devel
+BuildRequires: libgcrypt-devel
BuildRequires: libselinux-devel
BuildRequires: libsemanage-devel
BuildRequires: libtool
++ rpm.spec ++
--- /var/tmp/diff_new_pack.ikm4Ev/_old 2020-03-19 19:40:12.351844511 +0100
+++ /var/tmp/diff_new_pack.ikm4Ev/_new 2020-03-19 19:40:12.351844511 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rpm
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@
%{?!_fillupdir:%define _fillupdir /var/adm/fillup-templates}
%global librpmsover 9
+%global without_bdb 1
Name: rpm
BuildRequires: binutils
@@ -35,6 +36,7 @@
BuildRequires: libcap-devel
BuildRequires: libdw-devel
BuildRequires: libelf-devel
+BuildRequires: libgcrypt-devel
BuildRequires: libselinux-devel
BuildRequires: libsemanage-devel
BuildRequires: libtool
@@ -66,14 +68,11 @@
Source5:rpmsort
Source8:rpmconfigcheck
Source9:sysconfig.services-rpm
-Source10: beecrypt-4.1.2.tar.bz2
Source11: db-4.8.30.tar.bz2
Source12: baselibs.conf
Source13: rpmconfigcheck.service
-Patch1: beecrypt-4.1.2.diff
Patch2: db.diff
Patch3: rpm-4.12.0.1-fix-bashisms.patch
-Patch4: beecrypt-4.1.2-build.diff
Patch5: usr-lib-sysimage-rpm.patch
# quilt patches start here
Patch11:debugedit.diff
@@ -127,6 +126,11 @@
Patch103: find-lang-qt-qm.patch
Patch109: pythondistdeps.diff
Patch117: findsupplements.diff
+Patch118: db_ops_name.diff
+Patch119: bdb_ro.diff
+Patch120: disable_bdb.diff
+Patch121: ndb_backport.diff
+Patch122: db_conversion.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -212,19 +216,17 @@
%prep
%setup -q -n rpm-%{version}
rm -rf sqlite
-rm -rf beecrypt
-tar xjf %{SOURCE10}
+%if 0%{?!without_bdb:1}
tar xjf %{SOURCE11}
ln -s db-4.8.30 db
cd db
%patch2 -p1
cd ..
-ln -s beecrypt-4.1.2 beecrypt
chmod -R u+w db/*
rm -f rpmdb/db.h
-%patch -P 1
+cp config.guess config.sub db/dist/
+%endif
%patch3 -p1
-%patch -P 4
%patch5 -p1
%patch -P 11 -P 12 -P 13 -P 15 -P 16 -P 18
%patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 29
@@ -237,13 +239,12 @@
%patch -P 93 -P 94 -P 99
%patch -P 100-P 102 -P 103
%patch -P 109
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2020-01-10 17:47:23
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.6675 (New)
Package is "rpm"
Fri Jan 10 17:47:23 2020 rev:276 rq:755878 version:4.15.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/python-rpm.changes 2018-12-10
12:22:12.838893618 +0100
+++ /work/SRC/openSUSE:Factory/.rpm.new.6675/python-rpm.changes 2020-01-10
17:47:28.150157189 +0100
@@ -1,0 +2,10 @@
+Tue Nov 19 11:09:08 CET 2019 - m...@suse.de
+
+- update to rpm-4.15.1
+
+---
+Wed Oct 2 14:53:19 CEST 2019 - m...@suse.de
+
+- update to rpm-4.15.0
+
+---
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2019-10-21 12:24:42.307709338
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new.6675/rpm.changes2020-01-10
17:47:33.810156179 +0100
@@ -1,0 +2,60 @@
+Fri Dec 6 15:30:48 CET 2019 - m...@suse.de
+
+- disable pythondist requires generator for now
+ * modified patch: fileattrs.diff
+
+---
+Wed Nov 20 11:56:20 CET 2019 - m...@suse.de
+
+- drop python3-setuptools dependency from rpm-build, the package
+ is not part of ring-0
+
+---
+Tue Nov 19 11:09:08 CET 2019 - m...@suse.de
+
+- update to rpm-4.15.1
+ * bugfix release
+- dropped patches:
+ * fix_lua_cflags.diff
+
+---
+Tue Nov 5 16:25:53 UTC 2019 - Neal Gompa
+
+- Fix shebang for pythondistdeps.py to use Python 3
+ + Modify patch: pythondistdeps.diff
+- Move pythondistdeps dependency generator to rpm-build
+- Add python3-setuptools and python3 dependencies to rpm-build for
pythondistdeps
+
+---
+Tue Oct 29 14:42:26 UTC 2019 - Ignaz Forster
+
+- Declare /var/lib/rpm as a ghost file (it is a link to /usr/lib/sysimage/rpm
+ generated in post script for quite some time now) [boo#1132796]
+
+---
+Wed Oct 2 14:53:19 CEST 2019 - m...@suse.de
+
+- update to rpm-4.15.0
+ * dynamic build dependencies
+ * support for %elif, %elifos and %elifarch statements in spec
+ * caret version operator (the opposite of tilde)
+ * new %patchlist and %sourcelist spec sections
+ * new %{expr:#} built-in macro for evaluating expressions
+ * new %dnl macro primitive for comments
+- dropped patches:
+ * 0001-Stop-papering-over-the-security-disaster-known-as-pr.patch
+ * 0002-Fix-use-after-free-introduced-in-0f21bdd0d7b2c45564d.patch
+ * adopt-language-specific-build_fooflags-macros-from-F.patch
+ * auto-config-update-riscv64.diff
+ * debugedit-macro.diff
+ * dwz-compression.patch
+ * getncpus.diff
+ * nameversioncompare.diff
+ * mono-find-requires.diff
+ * rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch
+ * set-flto=auto-by-default.patch
+ * source_date_epoch_buildtime.diff
+- new patches:
+ * fix_lua_cflags.diff
+
+---
Old:
0001-Stop-papering-over-the-security-disaster-known-as-pr.patch
0002-Fix-use-after-free-introduced-in-0f21bdd0d7b2c45564d.patch
adopt-language-specific-build_fooflags-macros-from-F.patch
auto-config-update-riscv64.diff
debugedit-macro.diff
dwz-compression.patch
getncpus.diff
mono-find-requires.diff
nameversioncompare.diff
rpm-4.14.2.1.tar.bz2
rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch
set-flto=auto-by-default.patch
source_date_epoch_buildtime.diff
New:
rpm-4.15.1.tar.bz2
Other differences:
--
++ python-rpm.spec ++
--- /var/tmp/diff_new_pack.Ba2uKp/_old 2020-01-10 17:47:36.550155691 +0100
+++ /var/tmp/diff_new_pack.Ba2uKp/_new 2020-01-10 17:47:36.550155691 +0100
@@ -21,14 +21,13 @@
%global with_python 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-rpm
-Version:4.14.2.1
+Version:4.15.1
Release:0
Summary:Python Bindings for Manipulating RPM Packages
License:GPL-2.0-or-later
Group: Development/Libraries/Python
URL:https://rpm.org/
#Git-Clone: https://github.com/rpm-software-management/rpm
-Source99: rpm.spec
BuildRequires: %{python_module devel}
BuildRequires: file-devel
BuildRequires: libacl-devel
@@ -47,6 +46,7 @@
BuildRequires: pkgconfig(libzstd)
Requires: rpm = %{version}
%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p'
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2019-10-21 12:24:40
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.2352 (New)
Package is "rpm"
Mon Oct 21 12:24:40 2019 rev:275 rq:732635 version:4.14.2.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2019-08-28 15:41:17.594956840
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new.2352/rpm.changes2019-10-21
12:24:42.307709338 +0200
@@ -1,0 +2,23 @@
+Wed Aug 28 11:17:12 UTC 2019 - Fabian Vogt
+
+- Split librpmbuild into a separate subpackage, it's pulled in by
+ python-rpm
+
+---
+Fri Aug 23 07:19:03 UTC 2019 - Martin Liška
+
+- Add set-flto=auto-by-default.patch in order to utilize -flto=auto.
+
+---
+Tue Aug 6 08:49:50 UTC 2019 - Fabian Vogt
+
+- Move more into rpm-build subpackage:
+ * brp- and -check scripts
+ * .prov and .req files, with *find* scripts
+ * elfdeps, debugedit and sepdebugcrcfix
+ * librpmbuild and dependents
+- Add upstream patches which remove libelf dep from librpmio and plugins:
+ * 0001-Stop-papering-over-the-security-disaster-known-as-pr.patch
+ * 0002-Fix-use-after-free-introduced-in-0f21bdd0d7b2c45564d.patch
+
+---
New:
0001-Stop-papering-over-the-security-disaster-known-as-pr.patch
0002-Fix-use-after-free-introduced-in-0f21bdd0d7b2c45564d.patch
set-flto=auto-by-default.patch
Other differences:
--
++ rpm.spec ++
--- /var/tmp/diff_new_pack.k3CbB1/_old 2019-10-21 12:24:44.351711655 +0200
+++ /var/tmp/diff_new_pack.k3CbB1/_new 2019-10-21 12:24:44.355711660 +0200
@@ -19,6 +19,8 @@
#Compat macro for new _fillupdir macro introduced in Nov 2017
%{?!_fillupdir:%define _fillupdir /var/adm/fillup-templates}
+%global librpmsover 8
+
Name: rpm
BuildRequires: binutils
BuildRequires: bzip2
@@ -133,6 +135,9 @@
Patch119: getncpus.diff
Patch120:
rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch
Patch121: adopt-language-specific-build_fooflags-macros-from-F.patch
+Patch122: 0001-Stop-papering-over-the-security-disaster-known-as-pr.patch
+Patch123: 0002-Fix-use-after-free-introduced-in-0f21bdd0d7b2c45564d.patch
+Patch124: set-flto=auto-by-default.patch
Patch6464: auto-config-update-aarch64-ppc64le.diff
Patch6465: auto-config-update-riscv64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -149,6 +154,15 @@
in a central database. This way it is possible to get an overview of
all installed packages. RPM also supports database queries.
+%package -n librpmbuild%{librpmsover}
+Summary:Library for building RPM packages
+# Was part of rpm before
+Group: System/Libraries
+Conflicts: rpm < %{version}
+
+%description -n librpmbuild%{librpmsover}
+Thie package contains a library with functions for building RPM packages.
+
%package devel
Summary:Development files for librpm
Group: Development/Libraries/C and C++
@@ -233,6 +247,9 @@
%patch -P 109 -P 114 -P 117 -P 118
%patch -P 119 -P 120
%patch121 -p1
+%patch122 -p1
+%patch123 -p1
+%patch124 -p1
%ifarch aarch64 ppc64le riscv64
%patch6464
@@ -400,12 +417,22 @@
/bin/rpm
/usr/bin/*
%exclude /usr/bin/rpmbuild
+ %exclude %{_libdir}/librpmbuild.so.*
+ %exclude /usr/lib/rpm/elfdeps
+ %exclude /usr/lib/rpm/rpmdeps
+ %exclude /usr/lib/rpm/debugedit
+ %exclude /usr/lib/rpm/sepdebugcrcfix
+ %exclude /usr/bin/rpmspec
+ %exclude /usr/lib/rpm/*.prov
+ %exclude /usr/lib/rpm/*.req
+ %exclude /usr/lib/rpm/brp-*
+ %exclude /usr/lib/rpm/check-*
+ %exclude /usr/lib/rpm/*find*
/usr/sbin/rpmconfigcheck
/usr/lib/systemd/system/rpmconfigcheck.service
/usr/lib/rpm
%{_libdir}/rpm-plugins
%{_libdir}/librpm.so.*
- %{_libdir}/librpmbuild.so.*
%{_libdir}/librpmio.so.*
%{_libdir}/librpmsign.so.*
%doc %{_mandir}/man[18]/*.[18]*
@@ -421,9 +448,23 @@
%dir %attr(755,root,root) /usr/src/packages/RPMS/*
%{_fillupdir}/sysconfig.services-rpm
+%files -n librpmbuild%{librpmsover}
+%{_libdir}/librpmbuild.so.%{librpmsover}
+%{_libdir}/librpmbuild.so.%{librpmsover}.*
+
%files build
%defattr(-,root,root)
/usr/bin/rpmbuild
+/usr/lib/rpm/elfdeps
+/usr/lib/rpm/rpmdeps
+/usr/lib/rpm/debugedit
+/usr/lib/rpm/sepdebugcrcfix
+/usr/bin/rpmspec
+/usr/lib/rpm/*.prov
+/usr/lib/rpm/*.req
+/usr/lib/rpm/brp-*
+/usr/lib/rpm/check-*
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2019-08-28 15:41:11
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.7948 (New)
Package is "rpm"
Wed Aug 28 15:41:11 2019 rev:274 rq: version:4.14.2.1
Changes:
rpm.changes: same change
Old:
0001-Stop-papering-over-the-security-disaster-known-as-pr.patch
0002-Fix-use-after-free-introduced-in-0f21bdd0d7b2c45564d.patch
set-flto=auto-by-default.patch
Other differences:
--
++ python-rpm.spec ++
--- /var/tmp/diff_new_pack.D5qphi/_old 2019-08-28 15:41:19.290957100 +0200
+++ /var/tmp/diff_new_pack.D5qphi/_new 2019-08-28 15:41:19.294957100 +0200
@@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
++ rpm.spec ++
--- /var/tmp/diff_new_pack.D5qphi/_old 2019-08-28 15:41:19.318957105 +0200
+++ /var/tmp/diff_new_pack.D5qphi/_new 2019-08-28 15:41:19.322957105 +0200
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -133,9 +133,6 @@
Patch119: getncpus.diff
Patch120:
rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch
Patch121: adopt-language-specific-build_fooflags-macros-from-F.patch
-Patch122: 0001-Stop-papering-over-the-security-disaster-known-as-pr.patch
-Patch123: 0002-Fix-use-after-free-introduced-in-0f21bdd0d7b2c45564d.patch
-Patch124: set-flto=auto-by-default.patch
Patch6464: auto-config-update-aarch64-ppc64le.diff
Patch6465: auto-config-update-riscv64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -236,9 +233,6 @@
%patch -P 109 -P 114 -P 117 -P 118
%patch -P 119 -P 120
%patch121 -p1
-%patch122 -p1
-%patch123 -p1
-%patch124 -p1
%ifarch aarch64 ppc64le riscv64
%patch6464
@@ -406,22 +400,12 @@
/bin/rpm
/usr/bin/*
%exclude /usr/bin/rpmbuild
- %exclude %{_libdir}/librpmbuild.so.*
- %exclude /usr/lib/rpm/elfdeps
- %exclude /usr/lib/rpm/rpmdeps
- %exclude /usr/lib/rpm/debugedit
- %exclude /usr/lib/rpm/sepdebugcrcfix
- %exclude /usr/bin/rpmspec
- %exclude /usr/lib/rpm/*.prov
- %exclude /usr/lib/rpm/*.req
- %exclude /usr/lib/rpm/brp-*
- %exclude /usr/lib/rpm/check-*
- %exclude /usr/lib/rpm/*find*
/usr/sbin/rpmconfigcheck
/usr/lib/systemd/system/rpmconfigcheck.service
/usr/lib/rpm
%{_libdir}/rpm-plugins
%{_libdir}/librpm.so.*
+ %{_libdir}/librpmbuild.so.*
%{_libdir}/librpmio.so.*
%{_libdir}/librpmsign.so.*
%doc %{_mandir}/man[18]/*.[18]*
@@ -440,17 +424,6 @@
%files build
%defattr(-,root,root)
/usr/bin/rpmbuild
-%{_libdir}/librpmbuild.so.*
-/usr/lib/rpm/elfdeps
-/usr/lib/rpm/rpmdeps
-/usr/lib/rpm/debugedit
-/usr/lib/rpm/sepdebugcrcfix
-/usr/bin/rpmspec
-/usr/lib/rpm/*.prov
-/usr/lib/rpm/*.req
-/usr/lib/rpm/brp-*
-/usr/lib/rpm/check-*
-/usr/lib/rpm/*find*
%files devel
%defattr(644,root,root,755)
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2019-08-27 12:00:33
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.7948 (New)
Package is "rpm"
Tue Aug 27 12:00:33 2019 rev:273 rq:725503 version:4.14.2.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2019-07-13 13:33:19.883352766
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new.7948/rpm.changes2019-08-27
12:00:39.159657098 +0200
@@ -1,0 +2,17 @@
+Fri Aug 23 07:19:03 UTC 2019 - Martin Liška
+
+- Add set-flto=auto-by-default.patch in order to utilize -flto=auto.
+
+---
+Tue Aug 6 08:49:50 UTC 2019 - Fabian Vogt
+
+- Move more into rpm-build subpackage:
+ * brp- and -check scripts
+ * .prov and .req files, with *find* scripts
+ * elfdeps, debugedit and sepdebugcrcfix
+ * librpmbuild and dependents
+- Add upstream patches which remove libelf dep from librpmio and plugins:
+ * 0001-Stop-papering-over-the-security-disaster-known-as-pr.patch
+ * 0002-Fix-use-after-free-introduced-in-0f21bdd0d7b2c45564d.patch
+
+---
New:
0001-Stop-papering-over-the-security-disaster-known-as-pr.patch
0002-Fix-use-after-free-introduced-in-0f21bdd0d7b2c45564d.patch
set-flto=auto-by-default.patch
Other differences:
--
++ python-rpm.spec ++
--- /var/tmp/diff_new_pack.qA7aDY/_old 2019-08-27 12:00:41.247656810 +0200
+++ /var/tmp/diff_new_pack.qA7aDY/_new 2019-08-27 12:00:41.251656809 +0200
@@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
++ rpm.spec ++
--- /var/tmp/diff_new_pack.qA7aDY/_old 2019-08-27 12:00:41.271656806 +0200
+++ /var/tmp/diff_new_pack.qA7aDY/_new 2019-08-27 12:00:41.275656806 +0200
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -133,6 +133,9 @@
Patch119: getncpus.diff
Patch120:
rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch
Patch121: adopt-language-specific-build_fooflags-macros-from-F.patch
+Patch122: 0001-Stop-papering-over-the-security-disaster-known-as-pr.patch
+Patch123: 0002-Fix-use-after-free-introduced-in-0f21bdd0d7b2c45564d.patch
+Patch124: set-flto=auto-by-default.patch
Patch6464: auto-config-update-aarch64-ppc64le.diff
Patch6465: auto-config-update-riscv64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -233,6 +236,9 @@
%patch -P 109 -P 114 -P 117 -P 118
%patch -P 119 -P 120
%patch121 -p1
+%patch122 -p1
+%patch123 -p1
+%patch124 -p1
%ifarch aarch64 ppc64le riscv64
%patch6464
@@ -400,12 +406,22 @@
/bin/rpm
/usr/bin/*
%exclude /usr/bin/rpmbuild
+ %exclude %{_libdir}/librpmbuild.so.*
+ %exclude /usr/lib/rpm/elfdeps
+ %exclude /usr/lib/rpm/rpmdeps
+ %exclude /usr/lib/rpm/debugedit
+ %exclude /usr/lib/rpm/sepdebugcrcfix
+ %exclude /usr/bin/rpmspec
+ %exclude /usr/lib/rpm/*.prov
+ %exclude /usr/lib/rpm/*.req
+ %exclude /usr/lib/rpm/brp-*
+ %exclude /usr/lib/rpm/check-*
+ %exclude /usr/lib/rpm/*find*
/usr/sbin/rpmconfigcheck
/usr/lib/systemd/system/rpmconfigcheck.service
/usr/lib/rpm
%{_libdir}/rpm-plugins
%{_libdir}/librpm.so.*
- %{_libdir}/librpmbuild.so.*
%{_libdir}/librpmio.so.*
%{_libdir}/librpmsign.so.*
%doc %{_mandir}/man[18]/*.[18]*
@@ -424,6 +440,17 @@
%files build
%defattr(-,root,root)
/usr/bin/rpmbuild
+%{_libdir}/librpmbuild.so.*
+/usr/lib/rpm/elfdeps
+/usr/lib/rpm/rpmdeps
+/usr/lib/rpm/debugedit
+/usr/lib/rpm/sepdebugcrcfix
+/usr/bin/rpmspec
+/usr/lib/rpm/*.prov
+/usr/lib/rpm/*.req
+/usr/lib/rpm/brp-*
+/usr/lib/rpm/check-*
+/usr/lib/rpm/*find*
%files devel
%defattr(644,root,root,755)
++ 0001-Stop-papering-over-the-security-disaster-known-as-pr.patch ++
>From 5bc138a7663e471edad24cc662366bc743d3d3e0 Mon Sep 17 00:00:00 2001
From: Panu Matilainen
Date: Fri, 10 May 2019 13:10:00 +0300
Subject: [PATCH 1/2] Stop papering over the security disaster known as prelink
Back in the turn of the century somebody thought it was a neat idea
to completely compromise system security to
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2019-07-13 13:33:16
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.4615 (New)
Package is "rpm"
Sat Jul 13 13:33:16 2019 rev:272 rq:709948 version:4.14.2.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2019-05-03 22:06:29.910811904
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new.4615/rpm.changes2019-07-13
13:33:19.883352766 +0200
@@ -1,0 +2,12 @@
+Fri Jun 7 15:03:15 UTC 2019 - Jan Engelhardt
+
+- Enable decompression and creation of zstd-based payloads.
+- Add homepage and repo URL.
+
+---
+Tue May 14 10:11:34 UTC 2019 - Martin Liška
+
+- Add adopt-language-specific-build_fooflags-macros-from-F.patch
+ (9a50846ceeef2add2344dd463c5562bd69496a23) from master.
+
+---
New:
adopt-language-specific-build_fooflags-macros-from-F.patch
Other differences:
--
++ python-rpm.spec ++
--- /var/tmp/diff_new_pack.2bWn59/_old 2019-07-13 13:33:21.579352339 +0200
+++ /var/tmp/diff_new_pack.2bWn59/_new 2019-07-13 13:33:21.583352338 +0200
@@ -26,6 +26,8 @@
Summary:Python Bindings for Manipulating RPM Packages
License:GPL-2.0-or-later
Group: Development/Libraries/Python
+URL:https://rpm.org/
+#Git-Clone: https://github.com/rpm-software-management/rpm
Source99: rpm.spec
BuildRequires: %{python_module devel}
BuildRequires: file-devel
@@ -42,6 +44,7 @@
BuildRequires: python-rpm-macros
BuildRequires: xz-devel
BuildRequires: zlib-devel
+BuildRequires: pkgconfig(libzstd)
Requires: rpm = %{version}
%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%{_sourcedir}/rpm.spec)}
%if "%{python_flavor}" == "python2"
++ rpm.spec ++
--- /var/tmp/diff_new_pack.2bWn59/_old 2019-07-13 13:33:21.615352330 +0200
+++ /var/tmp/diff_new_pack.2bWn59/_new 2019-07-13 13:33:21.615352330 +0200
@@ -45,6 +45,7 @@
BuildRequires: rpm-build
BuildRequires: xz-devel
BuildRequires: zlib-devel
+BuildRequires: pkgconfig(libzstd)
#!BuildIgnore: rpmlint-Factory
Provides: rpminst
Requires(post): %fillup_prereq
@@ -56,6 +57,8 @@
Group: System/Packages
Version:4.14.2.1
Release:0
+URL:https://rpm.org/
+#Git-Clone: https://github.com/rpm-software-management/rpm
Source: http://ftp.rpm.org/releases/rpm-4.14.x/rpm-%{version}.tar.bz2
Source1:RPM-HOWTO.tar.bz2
Source5:rpmsort
@@ -129,6 +132,7 @@
Patch118: dwz-compression.patch
Patch119: getncpus.diff
Patch120:
rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch
+Patch121: adopt-language-specific-build_fooflags-macros-from-F.patch
Patch6464: auto-config-update-aarch64-ppc64le.diff
Patch6465: auto-config-update-riscv64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -228,6 +232,7 @@
%patch -P 100-P 102 -P 103 -P 108
%patch -P 109 -P 114 -P 117 -P 118
%patch -P 119 -P 120
+%patch121 -p1
%ifarch aarch64 ppc64le riscv64
%patch6464
++ adopt-language-specific-build_fooflags-macros-from-F.patch ++
>From 9a50846ceeef2add2344dd463c5562bd69496a23 Mon Sep 17 00:00:00 2001
From: Panu Matilainen
Date: Mon, 6 May 2019 14:44:30 +0300
Subject: [PATCH] Adopt language-specific %build_fooflags macros from Fedora
%{optflags} has been the catchall for all compiler options but this
is quite limiting as there's no way to add for example C++ specific
options distro-wide. This adds separate %build_cflags, %build_cxxflags,
%build_fflags for the gcc-supported languages, and additionally
%build_ldflags for distro-wide LDFLAGS setting.
Based on Florian Weimer's work in Fedoras redhat-rpm-config macros.
---
macros.in | 26 +++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/macros.in b/macros.in
index 2ab108776..b6cb52951 100644
--- a/macros.in
+++ b/macros.in
@@ -999,6 +999,24 @@ package or when debugging this package.\
%_target_vendor%{_host_vendor}
%_target_os%{_host_os}
+#==
+# compiler flags.
+
+# C compiler flags. This is traditionally called CFLAGS in makefiles.
+# Historically also available as %%{optflags}, and %%build sets the
+# environment variable RPM_OPT_FLAGS to this value.
+%build_cflags %{optflags}
+
+# C++ compiler flags. This is traditionally called CXXFLAGS in makefiles.
+%build_cxxflags %{optflags}
+
+#
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2019-05-03 22:06:27
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.5148 (New)
Package is "rpm"
Fri May 3 22:06:27 2019 rev:271 rq:697576 version:4.14.2.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2019-02-14 14:10:43.220300261
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new.5148/rpm.changes2019-05-03
22:06:29.910811904 +0200
@@ -1,0 +2,7 @@
+Tue Apr 16 08:40:11 UTC 2019 - Stasiek Michalski
+
+- backport "push name/epoch/version/release macro before invoking depgens"
+ change for correct generation of dependencies by other dep generators
+ * new patch:
rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch
+
+---
New:
rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch
Other differences:
--
++ rpm.spec ++
--- /var/tmp/diff_new_pack.YwkPZJ/_old 2019-05-03 22:06:33.430818151 +0200
+++ /var/tmp/diff_new_pack.YwkPZJ/_new 2019-05-03 22:06:33.434818158 +0200
@@ -128,6 +128,7 @@
Patch117: findsupplements.diff
Patch118: dwz-compression.patch
Patch119: getncpus.diff
+Patch120:
rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch
Patch6464: auto-config-update-aarch64-ppc64le.diff
Patch6465: auto-config-update-riscv64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -226,7 +227,7 @@
%patch -P 93 -P 94 -P 99
%patch -P 100-P 102 -P 103 -P 108
%patch -P 109 -P 114 -P 117 -P 118
-%patch -P 119
+%patch -P 119 -P 120
%ifarch aarch64 ppc64le riscv64
%patch6464
++
rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch ++
>From 0d2176c9a3ae44fd0a67c9983b1a5ba0a00388fd Mon Sep 17 00:00:00 2001
From: Igor Gnatenko
Date: Mon, 15 Oct 2018 19:49:57 +0200
Subject: [PATCH] rpmfc: push name/epoch/version/release macro before invoking
depgens
Fixes: https://github.com/rpm-software-management/rpm/issues/502
Signed-off-by: Igor Gnatenko
---
build/rpmfc.c | 25 +
1 file changed, 25 insertions(+)
diff --git build/rpmfc.c build/rpmfc.c
index 2fbfc69ab..eccd6582a 100644
--- build/rpmfc.c
+++ build/rpmfc.c
@@ -1334,9 +1334,31 @@ static rpmRC rpmfcApplyExternal(rpmfc fc)
return rc;
}
+typedef const struct macroExport_s {
+const char * name;
+rpmTagVal tag;
+} * macroExport;
+
+static struct macroExport_s const macroExportList[] = {
+{ "name", RPMTAG_NAME },
+{ "epoch", RPMTAG_EPOCH },
+{ "version", RPMTAG_VERSION },
+{ "release", RPMTAG_RELEASE },
+{ NULL,0 }
+};
+
rpmRC rpmfcApply(rpmfc fc)
{
rpmRC rc;
+Package pkg = fc->pkg;
+macroExport me;
+for (me = macroExportList; me->name; me++) {
+ char *val = headerGetAsString(pkg->header, me->tag);
+ if (val) {
+ rpmPushMacro(NULL, me->name, NULL, val, RMIL_SPEC);
+ free(val);
+ }
+}
/* If new-fangled dependency generation is disabled ... */
if (!rpmExpandNumeric("%{?_use_internal_dependency_generator}")) {
/* ... then generate dependencies using %{__find_requires} et al. */
@@ -1347,6 +1369,9 @@ rpmRC rpmfcApply(rpmfc fc)
/* ... otherwise generate per-file dependencies */
rc = rpmfcApplyInternal(fc);
}
+for (me = macroExportList; me->name; me++)
+ if (headerIsEntry(pkg->header, me->tag))
+ rpmPopMacro(NULL, me->name);
return rc;
}
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2019-02-14 14:10:37
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.28833 (New)
Package is "rpm"
Thu Feb 14 14:10:37 2019 rev:270 rq:672489 version:4.14.2.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2019-01-29 14:38:30.491544741
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new.28833/rpm.changes 2019-02-14
14:10:43.220300261 +0100
@@ -1,0 +2,9 @@
+Thu Feb 7 15:42:17 CET 2019 - m...@suse.de
+
+- backport getncpus macro and related changes from upstream
+ * make make_build macro use verbose output
+ * add _smp_build_ncpus macro
+ * add _lto_cflags macro
+ * new patch: getncpus.diff
+
+---
New:
getncpus.diff
Other differences:
--
++ python-rpm.spec ++
--- /var/tmp/diff_new_pack.CAN6de/_old 2019-02-14 14:10:45.784298978 +0100
+++ /var/tmp/diff_new_pack.CAN6de/_new 2019-02-14 14:10:45.788298976 +0100
@@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
++ rpm.spec ++
--- /var/tmp/diff_new_pack.CAN6de/_old 2019-02-14 14:10:45.812298964 +0100
+++ /var/tmp/diff_new_pack.CAN6de/_new 2019-02-14 14:10:45.820298960 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -127,6 +127,7 @@
Patch114: source_date_epoch_buildtime.diff
Patch117: findsupplements.diff
Patch118: dwz-compression.patch
+Patch119: getncpus.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
Patch6465: auto-config-update-riscv64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -225,6 +226,7 @@
%patch -P 93 -P 94 -P 99
%patch -P 100-P 102 -P 103 -P 108
%patch -P 109 -P 114 -P 117 -P 118
+%patch -P 119
%ifarch aarch64 ppc64le riscv64
%patch6464
++ getncpus.diff ++
--- ./configure.ac.orig 2019-02-07 14:26:10.800566817 +
+++ ./configure.ac 2019-02-07 14:26:30.944514306 +
@@ -770,6 +770,7 @@ AC_CHECK_FUNCS(lutimes)
AC_CHECK_FUNCS(mergesort)
AC_CHECK_FUNCS(getauxval)
AC_CHECK_FUNCS(setprogname, [], [], [#include ])
+AC_CHECK_FUNCS(sched_getaffinity, [], [], [#include ])
AC_MSG_CHECKING([whether __progname is defined])
AC_LINK_IFELSE([AC_LANG_PROGRAM([extern const char *__progname;],
--- ./macros.in.orig2019-02-07 14:20:03.257524913 +
+++ ./macros.in 2019-02-07 14:22:46.105100409 +
@@ -1056,7 +1056,7 @@ package or when debugging this package.\
#--
# The "make" analogue, hiding the _smp_mflags magic from specs
-%make_build %{__make} %{_make_output_sync} %{?_smp_mflags}
+%make_build %{__make} %{_make_output_sync} %{?_smp_mflags} V=1 VERBOSE=1
#--
# The make install analogue of %configure for modern autotools:
--- ./platform.in.orig 2019-02-07 14:23:06.641046876 +
+++ ./platform.in 2019-02-07 14:41:12.462256547 +
@@ -50,11 +50,17 @@
# Maximum number of CPU's to use when building, 0 for unlimited.
#%_smp_ncpus_max 0
-%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
- && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
+
+%_smp_build_ncpus %([ -z "$RPM_BUILD_NCPUS" ] \\\
+ && RPM_BUILD_NCPUS="%{getncpus}"; \\\
ncpus_max=%{?_smp_ncpus_max}; \\\
if [ -n "$ncpus_max" ] && [ "$ncpus_max" -gt 0 ] && [
"$RPM_BUILD_NCPUS" -gt "$ncpus_max" ]; then RPM_BUILD_NCPUS="$ncpus_max"; fi;
\\\
-if [ "$RPM_BUILD_NCPUS" -gt 1 ]; then echo "-j$RPM_BUILD_NCPUS"; fi)
+echo "$RPM_BUILD_NCPUS";)
+
+%_smp_mflags -j%{_smp_build_ncpus}
+
+# Enable LTO optimization with a maximal parallelism
+%_lto_cflags -flto=%{_smp_build_ncpus}
#==
# Build policy macros.
--- ./rpmio/macro.c.orig2019-02-07 14:26:48.768468081 +
+++ ./rpmio/macro.c 2019-02-07 14:38:59.286597550 +
@@ -12,6 +12,9 @@
extern char *optarg;
extern int optind;
#endif
+#if HAVE_SCHED_GETAFFINITY
+#include
+#endif
#if
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2019-01-29 14:38:27
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.28833 (New)
Package is "rpm"
Tue Jan 29 14:38:27 2019 rev:269 rq:665319 version:4.14.2.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-10-29 14:26:49.235105952
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new.28833/rpm.changes 2019-01-29
14:38:30.491544741 +0100
@@ -1,0 +2,6 @@
+Sun Jan 13 16:08:32 UTC 2019 - Dirk Mueller
+
+- update macrosin.diff: Set cutoff date to SLE12 GA to remove
+ changelogs from 2009-2014 from the generated RPMs.
+
+---
Other differences:
--
++ python-rpm.spec ++
--- /var/tmp/diff_new_pack.owOKSs/_old 2019-01-29 14:38:32.363542481 +0100
+++ /var/tmp/diff_new_pack.owOKSs/_new 2019-01-29 14:38:32.367542476 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-rpm
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 Neal Gompa .
#
# All modifications and additions to the file contributed by third parties
@@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
++ rpm.spec ++
--- /var/tmp/diff_new_pack.owOKSs/_old 2019-01-29 14:38:32.399542438 +0100
+++ /var/tmp/diff_new_pack.owOKSs/_new 2019-01-29 14:38:32.403542433 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rpm
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
++ macrosin.diff ++
--- /var/tmp/diff_new_pack.owOKSs/_old 2019-01-29 14:38:32.527542283 +0100
+++ /var/tmp/diff_new_pack.owOKSs/_new 2019-01-29 14:38:32.527542283 +0100
@@ -85,8 +85,8 @@
%__docdir_path
%{_datadir}/doc:%{_datadir}/man:%{_datadir}/info:%{_datadir}/gtk-doc/html:%{?_docdir}:%{?_mandir}:%{?_infodir}:%{?_javadocdir}:/usr/doc:/usr/man:/usr/info:/usr/X11R6/man
+# maxnum,cuttime,minnum
-+# 2009/03/01 (SLES11 GA)
-+%_binarychangelogtrim 0,1235862000,10
++# 2014/10/13 (SLES12 GA)
++%_binarychangelogtrim 0,1413151200,10
+
#
# Path to scripts to autogenerate package dependencies,
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2018-12-10 12:22:05
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new.19453 (New)
Package is "rpm"
Mon Dec 10 12:22:05 2018 rev:268 rq:653626 version:4.14.2.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/python-rpm.changes 2018-04-10
09:52:40.271811262 +0200
+++ /work/SRC/openSUSE:Factory/.rpm.new.19453/python-rpm.changes
2018-12-10 12:22:12.838893618 +0100
@@ -1,0 +2,5 @@
+Thu Nov 22 09:50:36 UTC 2018 - asmorods...@suse.com
+
+- Fix python-module compatibility with older distros
+
+---
Other differences:
--
++ python-rpm.spec ++
--- /var/tmp/diff_new_pack.DlFGab/_old 2018-12-10 12:22:14.538891925 +0100
+++ /var/tmp/diff_new_pack.DlFGab/_new 2018-12-10 12:22:14.542891920 +0100
@@ -19,6 +19,7 @@
# Enable Python build sourced from rpm spec
%global with_python 1
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-rpm
Version:4.14.2.1
Release:0
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2018-10-29 14:13:42
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Mon Oct 29 14:13:42 2018 rev:267 rq:643707 version:4.14.2.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-10-11 11:39:51.687213792
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2018-10-29
14:26:49.235105952 +0100
@@ -1,0 +2,23 @@
+Mon Oct 22 13:26:55 CEST 2018 - m...@suse.de
+
+- update to rpm-4.14.2.1
+ * fix regression in --setperms and --setugids
+
+---
+Tue Oct 16 11:27:36 CEST 2018 - m...@suse.de
+
+- update to rpm-4.14.2
+ * new configurable, mandatory package verification level
+ * new package verification phase in rpmtsRun()
+ * new --setcaps and --restore options
+ * new --whatobsoletes and --whatconflicts query options
+- dropped patches:
+ * disttag-macro.diff
+ * reproducible-debuginfo.patch
+ * debugedit-bnc1076819.diff
+ * hardlinks.diff
+ * debugedit-riscv.patch
+ * safesymlinks.diff
+ * verifynodup.diff
+
+---
Old:
debugedit-bnc1076819.diff
debugedit-riscv.patch
disttag-macro.diff
hardlinks.diff
reproducible-debuginfo.patch
rpm-4.14.1.tar.bz2
safesymlinks.diff
verifynodup.diff
New:
rpm-4.14.2.1.tar.bz2
Other differences:
--
++ python-rpm.spec ++
--- /var/tmp/diff_new_pack.GulB7m/_old 2018-10-29 14:26:50.667056214 +0100
+++ /var/tmp/diff_new_pack.GulB7m/_new 2018-10-29 14:26:50.671056075 +0100
@@ -20,7 +20,7 @@
# Enable Python build sourced from rpm spec
%global with_python 1
Name: python-rpm
-Version:4.14.1
+Version:4.14.2.1
Release:0
Summary:Python Bindings for Manipulating RPM Packages
License:GPL-2.0-or-later
++ rpm.spec ++
--- /var/tmp/diff_new_pack.GulB7m/_old 2018-10-29 14:26:50.699055104 +0100
+++ /var/tmp/diff_new_pack.GulB7m/_new 2018-10-29 14:26:50.707054827 +0100
@@ -54,7 +54,7 @@
Summary:The RPM Package Manager
License:GPL-2.0-or-later
Group: System/Packages
-Version:4.14.1
+Version:4.14.2.1
Release:0
Source: http://ftp.rpm.org/releases/rpm-4.14.x/rpm-%{version}.tar.bz2
Source1:RPM-HOWTO.tar.bz2
@@ -98,7 +98,6 @@
Patch47:requires-ge-macro.diff
Patch49:finddebuginfo-absolute-links.diff
Patch51:specfilemacro.diff
-Patch53:disttag-macro.diff
Patch55:debugsubpkg.diff
Patch56:debuglink.diff
Patch57:debuginfo-mono.patch
@@ -121,18 +120,11 @@
Patch94:checksepwarn.diff
Patch99:enable-postin-scripts-error.diff
Patch100: rpm-findlang-inject-metainfo.patch
-# https://github.com/rpm-software-management/rpm/pull/485
-Patch101: reproducible-debuginfo.patch
Patch102: emptymanifest.diff
Patch103: find-lang-qt-qm.patch
Patch108: debugedit-macro.diff
Patch109: pythondistdeps.diff
-Patch111: debugedit-bnc1076819.diff
-Patch112: hardlinks.diff
-Patch113: debugedit-riscv.patch
Patch114: source_date_epoch_buildtime.diff
-Patch115: safesymlinks.diff
-Patch116: verifynodup.diff
Patch117: findsupplements.diff
Patch118: dwz-compression.patch
Patch6464: auto-config-update-aarch64-ppc64le.diff
@@ -226,13 +218,13 @@
%patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 29
%patch -P 30 -P 32 -P 33 -P 34 -P 35 -P 36 -P 38
%patch -P 43 -P 45 -P 46 -P 47 -P 49
-%patch -P 51 -P 53 -P 55 -P 56 -P 57 -P 58
+%patch -P 51 -P 55 -P 56 -P 57 -P 58
%patch -P 60 -P 61 -P 66 -P 67 -P 68 -P 69
%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 77 -P 78
%patch -P 85
%patch -P 93 -P 94 -P 99
-%patch -P 100 -P 101 -P 102 -P 103 -P 108
-%patch -P 109 -P 111 -P 112 -P 113 -P 114 -P 115 -P 116 -P 117 -P 118
+%patch -P 100-P 102 -P 103 -P 108
+%patch -P 109 -P 114 -P 117 -P 118
%ifarch aarch64 ppc64le riscv64
%patch6464
++ dbrointerruptable.diff ++
--- /var/tmp/diff_new_pack.GulB7m/_old 2018-10-29 14:26:50.775052469 +0100
+++ /var/tmp/diff_new_pack.GulB7m/_new 2018-10-29 14:26:50.775052469 +0100
@@ -1,5 +1,5 @@
./lib/rpmdb.c.orig 2017-10-05 10:05:27.459594162 +
-+++ ./lib/rpmdb.c 2017-12-01 14:19:12.361872712
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2018-10-11 11:39:40
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Thu Oct 11 11:39:40 2018 rev:266 rq:639654 version:4.14.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-10-01 09:02:00.988069570
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2018-10-11
11:39:51.687213792 +0200
@@ -1,0 +2,6 @@
+Mon Oct 1 12:08:32 UTC 2018 - Martin Liška
+
+- Update dwz-compression.patch to latest git trunk
+ (62d901a22b7eb6c86c15290032a41e11427ddf87).
+
+---
Other differences:
--
rpm.spec: same change
++ dwz-compression.patch ++
--- /var/tmp/diff_new_pack.AqY5y1/_old 2018-10-11 11:39:53.055212050 +0200
+++ /var/tmp/diff_new_pack.AqY5y1/_new 2018-10-11 11:39:53.059212045 +0200
@@ -1,25 +1,12 @@
-From 6169f437f24b2bfe85756c433c6e075c1ea3f3c2 Mon Sep 17 00:00:00 2001
-From: marxin
-Date: Tue, 28 Aug 2018 11:31:17 +0200
-Subject: [PATCH] Info how beneficial is dwz compression.
-
-Example output:
-...
-original debug info size: 120600, size after compression: 77604
-...
- scripts/find-debuginfo.sh | 3 +++
- 1 file changed, 3 insertions(+)
-
diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
-index 73275a11c..51cea8666 100755
+index 73275a11c..3dc438ce5 100755
--- scripts/find-debuginfo.sh
+++ scripts/find-debuginfo.sh
@@ -486,6 +486,7 @@ if $run_dwz \
&& [ -d "${RPM_BUILD_ROOT}/usr/lib/debug" ]; then
readarray dwz_files < <(cd "${RPM_BUILD_ROOT}/usr/lib/debug"; find -type f
-name \*.debug | LC_ALL=C sort)
if [ ${#dwz_files[@]} -gt 0 ]; then
-+size_before=$(du -s ${RPM_BUILD_ROOT}/usr/lib/debug | cut -f1)
++size_before=$(du -sk ${RPM_BUILD_ROOT}/usr/lib/debug | cut -f1)
dwz_multifile_name="${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE}.${RPM_ARCH}"
dwz_multifile_suffix=
dwz_multifile_idx=0
@@ -27,11 +14,8 @@
echo >&2 "*** ERROR: DWARF compression requested, but no dwz installed"
exit 2
fi
-+size_after=$(du -s ${RPM_BUILD_ROOT}/usr/lib/debug | cut -f1)
-+echo "original debug info size: ${size_before}, size after compression:
${size_after}"
++size_after=$(du -sk ${RPM_BUILD_ROOT}/usr/lib/debug | cut -f1)
++echo "original debug info size: ${size_before}kB, size after compression:
${size_after}kB"
# Remove .dwz directory if empty
rmdir "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz" 2>/dev/null
if [ -f "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" ];
then
---
-2.18.0
-
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2018-10-01 09:01:56
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Mon Oct 1 09:01:56 2018 rev:265 rq:636381 version:4.14.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-08-18 00:10:18.176190640
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2018-10-01
09:02:00.988069570 +0200
@@ -1,0 +2,6 @@
+Mon Sep 17 11:04:48 UTC 2018 - Martin Liška
+
+- Add upstream patch that prints dwz compression rate
+ new patch: dwz-compression.patch
+
+---
New:
dwz-compression.patch
Other differences:
--
++ rpm.spec ++
--- /var/tmp/diff_new_pack.OLSmtF/_old 2018-10-01 09:02:07.164064191 +0200
+++ /var/tmp/diff_new_pack.OLSmtF/_new 2018-10-01 09:02:07.196064163 +0200
@@ -134,6 +134,7 @@
Patch115: safesymlinks.diff
Patch116: verifynodup.diff
Patch117: findsupplements.diff
+Patch118: dwz-compression.patch
Patch6464: auto-config-update-aarch64-ppc64le.diff
Patch6465: auto-config-update-riscv64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -231,7 +232,7 @@
%patch -P 85
%patch -P 93 -P 94 -P 99
%patch -P 100 -P 101 -P 102 -P 103 -P 108
-%patch -P 109 -P 111 -P 112 -P 113 -P 114 -P 115 -P 116 -P 117
+%patch -P 109 -P 111 -P 112 -P 113 -P 114 -P 115 -P 116 -P 117 -P 118
%ifarch aarch64 ppc64le riscv64
%patch6464
++ dwz-compression.patch ++
>From 6169f437f24b2bfe85756c433c6e075c1ea3f3c2 Mon Sep 17 00:00:00 2001
From: marxin
Date: Tue, 28 Aug 2018 11:31:17 +0200
Subject: [PATCH] Info how beneficial is dwz compression.
Example output:
...
original debug info size: 120600, size after compression: 77604
...
---
scripts/find-debuginfo.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
index 73275a11c..51cea8666 100755
--- scripts/find-debuginfo.sh
+++ scripts/find-debuginfo.sh
@@ -486,6 +486,7 @@ if $run_dwz \
&& [ -d "${RPM_BUILD_ROOT}/usr/lib/debug" ]; then
readarray dwz_files < <(cd "${RPM_BUILD_ROOT}/usr/lib/debug"; find -type f
-name \*.debug | LC_ALL=C sort)
if [ ${#dwz_files[@]} -gt 0 ]; then
+size_before=$(du -s ${RPM_BUILD_ROOT}/usr/lib/debug | cut -f1)
dwz_multifile_name="${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE}.${RPM_ARCH}"
dwz_multifile_suffix=
dwz_multifile_idx=0
@@ -508,6 +509,8 @@ if $run_dwz \
echo >&2 "*** ERROR: DWARF compression requested, but no dwz installed"
exit 2
fi
+size_after=$(du -s ${RPM_BUILD_ROOT}/usr/lib/debug | cut -f1)
+echo "original debug info size: ${size_before}, size after compression:
${size_after}"
# Remove .dwz directory if empty
rmdir "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz" 2>/dev/null
if [ -f "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" ];
then
--
2.18.0
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2018-08-18 00:10:13
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Sat Aug 18 00:10:13 2018 rev:264 rq:629333 version:4.14.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-06-26 10:29:16.296764706
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2018-08-18
00:10:18.176190640 +0200
@@ -1,0 +2,21 @@
+Wed Aug 8 05:12:24 UTC 2018 - bwiedem...@suse.com
+
+- Add reproducible-debuginfo.patch to generate debuginfo
+ in a reproducible way
+
+---
+Fri Jul 20 13:15:28 CEST 2018 - m...@suse.de
+
+- Require /usr/bin/awk so that 'rpm --last' works [bnc#1101355]
+
+---
+Mon Jul 2 16:30:51 CEST 2018 - m...@suse.de
+
+- Split SUSE macros and some helpers into rpm-config-SUSE
+ package. This is based on the work of Neal Gompa, thanks!
+ new patch: findsupplements.diff
+ dropped files: rpm-suse_macros
+ dropped patches: findksyms.diff, modalias.diff, firmware.diff,
+ modalias-encode.diff, initscriptsprov.diff
+
+---
Old:
findksyms.diff
firmware.diff
initscriptsprov.diff
modalias-encode.diff
modalias.diff
rpm-suse_macros
New:
findsupplements.diff
reproducible-debuginfo.patch
Other differences:
--
++ rpm.spec ++
--- /var/tmp/diff_new_pack.ExlqUS/_old 2018-08-18 00:10:22.104202447 +0200
+++ /var/tmp/diff_new_pack.ExlqUS/_new 2018-08-18 00:10:22.108202460 +0200
@@ -48,6 +48,9 @@
#!BuildIgnore: rpmlint-Factory
Provides: rpminst
Requires(post): %fillup_prereq
+Requires: rpm-config-SUSE
+# awk is needed for rpm --last
+Requires: /usr/bin/awk
Summary:The RPM Package Manager
License:GPL-2.0-or-later
Group: System/Packages
@@ -55,7 +58,6 @@
Release:0
Source: http://ftp.rpm.org/releases/rpm-4.14.x/rpm-%{version}.tar.bz2
Source1:RPM-HOWTO.tar.bz2
-Source4:rpm-suse_macros
Source5:rpmsort
Source8:rpmconfigcheck
Source9:sysconfig.services-rpm
@@ -82,10 +84,8 @@
Patch25:brpcompress.diff
Patch26:checkfilesnoinfodir.diff
Patch27:finddebuginfo.diff
-Patch28:findksyms.diff
Patch29:findlang.diff
Patch30:macrosin.diff
-Patch31:modalias.diff
Patch32:platformin.diff
Patch33:rpmpopt.diff
Patch34:rpmrc.diff
@@ -97,9 +97,7 @@
Patch46:remove-brp-strips.diff
Patch47:requires-ge-macro.diff
Patch49:finddebuginfo-absolute-links.diff
-Patch50:firmware.diff
Patch51:specfilemacro.diff
-Patch52:modalias-encode.diff
Patch53:disttag-macro.diff
Patch55:debugsubpkg.diff
Patch56:debuglink.diff
@@ -107,7 +105,6 @@
Patch58:lazystatfs.diff
Patch60:safeugid.diff
Patch61:noprereqdeprec.diff
-Patch65:initscriptsprov.diff
Patch66:remove-translations.diff
Patch67:headeradddb.diff
Patch68:dbprivate.diff
@@ -124,6 +121,8 @@
Patch94:checksepwarn.diff
Patch99:enable-postin-scripts-error.diff
Patch100: rpm-findlang-inject-metainfo.patch
+# https://github.com/rpm-software-management/rpm/pull/485
+Patch101: reproducible-debuginfo.patch
Patch102: emptymanifest.diff
Patch103: find-lang-qt-qm.patch
Patch108: debugedit-macro.diff
@@ -134,6 +133,7 @@
Patch114: source_date_epoch_buildtime.diff
Patch115: safesymlinks.diff
Patch116: verifynodup.diff
+Patch117: findsupplements.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
Patch6465: auto-config-update-riscv64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -222,16 +222,16 @@
%patch -P 4
%patch5 -p1
%patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 18
-%patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
-%patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 38
+%patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 29
+%patch -P 30 -P 32 -P 33 -P 34 -P 35 -P 36 -P 38
%patch -P 43 -P 45 -P 46 -P 47 -P 49
-%patch -P 50 -P 51 -P 52 -P 53 -P 55 -P 56 -P 57 -P 58
-%patch -P 60 -P 61 -P 65 -P 66 -P 67 -P 68 -P 69
+%patch -P 51 -P 53 -P 55 -P 56 -P 57 -P 58
+%patch -P 60 -P 61 -P 66 -P 67 -P 68 -P 69
%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 77 -P 78
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2018-06-26 10:29:04
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Tue Jun 26 10:29:04 2018 rev:263 rq:617098 version:4.14.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-05-10 15:44:31.715975923
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2018-06-26
10:29:16.296764706 +0200
@@ -1,0 +2,24 @@
+Fri Jun 15 12:46:10 UTC 2018 - msucha...@suse.com
+
+- Add kernel export provides on openSUSE (boo#1095148).
+
+---
+Fri Jun 15 13:25:18 CEST 2018 - m...@suse.de
+
+- really fix symlink attacks on rpm install [bnc#943457]
+ [CVE-2017-7500]
+ new patch: safesymlinks.diff
+- backport removal of user/group duplicate detection in verify
+ new patch: verifynodup.diff
+
+---
+Mon Jun 11 11:43:36 CEST 2018 - m...@suse.de
+
+- Define sle_version in leap [bnc#1094735]
+
+---
+Wed May 30 10:48:49 UTC 2018 - msucha...@suse.com
+
+- openSUSE releases also preserve kabi (boo#1095148).
+
+---
New:
safesymlinks.diff
verifynodup.diff
Other differences:
--
++ rpm.spec ++
--- /var/tmp/diff_new_pack.nv99XU/_old 2018-06-26 10:29:19.284654964 +0200
+++ /var/tmp/diff_new_pack.nv99XU/_new 2018-06-26 10:29:19.288654817 +0200
@@ -132,6 +132,8 @@
Patch112: hardlinks.diff
Patch113: debugedit-riscv.patch
Patch114: source_date_epoch_buildtime.diff
+Patch115: safesymlinks.diff
+Patch116: verifynodup.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
Patch6465: auto-config-update-riscv64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -229,7 +231,7 @@
%patch -P 85
%patch -P 93 -P 94 -P 99
%patch -P 100-P 102 -P 103 -P 108
-%patch -P 109 -P 111 -P 112 -P 113 -P 114
+%patch -P 109 -P 111 -P 112 -P 113 -P 114 -P 115 -P 116
%ifarch aarch64 ppc64le riscv64
%patch6464
@@ -252,6 +254,12 @@
-e 's/@is_opensuse@/%{?is_opensuse}%{!?is_opensuse:0}/' \
-e '/@leap_version@%{?leap_version:nomatch}/d' \
-e 's/@leap_version@/%{?leap_version}%{!?leap_version:0}/' \
+%if 0%{?is_opensuse}
+-e '/@sle_version@%{?sle_version:nomatch}/d' \
+-e 's/@sle_version@/%{?sle_version}%{!?sle_version:0}/' \
+%else
+-e '/@sle_version@/d' \
+%endif
< %{SOURCE4} > suse_macros
rm -f m4/libtool.m4
rm -f m4/lt*.m4
++ fileattrs.diff ++
--- /var/tmp/diff_new_pack.nv99XU/_old 2018-06-26 10:29:19.400650704 +0200
+++ /var/tmp/diff_new_pack.nv99XU/_new 2018-06-26 10:29:19.400650704 +0200
@@ -32,13 +32,13 @@
--- ./fileattrs/kernel.attr.orig 2017-12-01 15:46:28.172720497 +
+++ ./fileattrs/kernel.attr2017-12-01 15:46:28.172720497 +
@@ -0,0 +1,2 @@
-+%__kernel_provides%{_rpmconfigdir}/find-provides.ksyms --opensuse
0%{?is_opensuse}
++%__kernel_provides%{_rpmconfigdir}/find-provides.ksyms --tumbleweed
%{?sle_version:0}%{!?sle_version:1}
+%__kernel_path
^(/lib/modules/[^/]*/kernel/.*\.ko(\.gz)?|/boot/vmlinu[xz].*)$
--- ./fileattrs/kmp.attr.orig 2017-12-01 15:46:28.172720497 +
+++ ./fileattrs/kmp.attr 2017-12-01 15:46:28.172720497 +
@@ -0,0 +1,4 @@
-+%__kmp_provides %{_rpmconfigdir}/find-provides.ksyms --opensuse
0%{?is_opensuse}
-+%__kmp_requires %{_rpmconfigdir}/find-requires.ksyms --opensuse
0%{?is_opensuse}
++%__kmp_provides %{_rpmconfigdir}/find-provides.ksyms
--tumbleweed %{?sle_version:0}%{!?sle_version:1}
++%__kmp_requires %{_rpmconfigdir}/find-requires.ksyms
--tumbleweed %{?sle_version:0}%{!?sle_version:1}
+%__kmp_supplements%{_rpmconfigdir}/find-supplements.ksyms
+%__kmp_path ^/lib/modules/[^/]*/(updates|extra)/.*\.ko(\.gz)?
--- ./fileattrs/perl.attr.orig 2017-08-10 08:08:07.113108701 +
++ findksyms.diff ++
--- /var/tmp/diff_new_pack.nv99XU/_old 2018-06-26 10:29:19.412650263 +0200
+++ /var/tmp/diff_new_pack.nv99XU/_new 2018-06-26 10:29:19.412650263 +0200
@@ -23,16 +23,16 @@
+
+IFS=$'\n'
+
-+is_opensuse=false
++is_tumbleweed=false
+
-+if test "$1" = "--opensuse"; then
++if test "$1" = "--tumbleweed"; then
+if test "$2" -gt 0; then
-+is_opensuse=true
++is_tumbleweed=true
+fi
+shift 2
+fi
+
-+if ! $is_opensuse; then
++if ! $is_tumbleweed; then
+trap 'rm -f
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2018-05-10 15:44:24
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Thu May 10 15:44:24 2018 rev:262 rq:605141 version:4.14.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-04-22 14:44:04.595335138
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2018-05-10
15:44:31.715975923 +0200
@@ -1,0 +2,6 @@
+Mon May 7 16:36:45 CEST 2018 - m...@suse.de
+
+- Disable debuginfo dwz compression for baselibs packages
+ [bnc#1092189]
+
+---
Other differences:
--
rpm.spec: same change
++ macrosin.diff ++
--- /var/tmp/diff_new_pack.oJwW5d/_old 2018-05-10 15:44:33.555908491 +0200
+++ /var/tmp/diff_new_pack.oJwW5d/_new 2018-05-10 15:44:33.559908344 +0200
@@ -1,5 +1,14 @@
./macros.in.orig 2017-12-07 16:01:58.933485867 +
-+++ ./macros.in2017-12-07 16:02:25.273409983 +
+--- ./macros.in.orig 2018-05-07 14:27:45.991050600 +
./macros.in2018-05-07 14:28:12.426978605 +
+@@ -184,7 +184,7 @@
+ %{?_unique_build_ids:--build-id-seed "%{VERSION}-%{RELEASE}"} \\\
+ %{?_unique_debug_names:--unique-debug-suffix
"-%{VERSION}-%{RELEASE}.%{_arch}"} \\\
+ %{?_unique_debug_srcs:--unique-debug-src-base
"%{name}-%{VERSION}-%{RELEASE}.%{_arch}"} \\\
+-%{?_find_debuginfo_dwz_opts} \\\
++%{lua:if not posix.access(rpm.expand("%_sourcedir/baselibs.conf"), "r")
then print(rpm.expand("%{?_find_debuginfo_dwz_opts}")) end} \\\
+ %{?_find_debuginfo_opts} \\\
+ %{?_debugsource_packages:-S debugsourcefiles.list} \\\
+ "%{_builddir}/%{?buildsubdir}"\
@@ -224,7 +224,8 @@ package or when debugging this package.\
%endif\
%{nil}
commit rpm for openSUSE:Factory
Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2018-04-22 14:43:12 Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) Package is "rpm" Sun Apr 22 14:43:12 2018 rev:261 rq:598478 version:4.14.1 Changes: --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-04-10 09:52:44.919642839 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2018-04-22 14:44:04.595335138 +0200 @@ -1,0 +2,10 @@ +Thu Apr 19 11:53:52 CEST 2018 - m...@suse.de + +- move -fprofile-update=atomic before -fprofile-generate + +--- +Wed Apr 18 11:50:11 UTC 2018 - mli...@suse.cz + +- Enable -fprofile-update=atomic for PGO (boo#1040589). + +--- Other differences: -- rpm.spec: same change ++ rpm-suse_macros ++ --- /var/tmp/diff_new_pack.ne2yIG/_old 2018-04-22 14:44:06.919251056 +0200 +++ /var/tmp/diff_new_pack.ne2yIG/_new 2018-04-22 14:44:06.923250912 +0200 @@ -246,7 +246,7 @@ %leap_version @leap_version@ %do_profiling 1 -%cflags_profile_generate -fprofile-generate +%cflags_profile_generate -fprofile-update=atomic -fprofile-generate %cflags_profile_feedback -fprofile-use %suse_install_update_message() \
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2018-04-10 09:52:29
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Tue Apr 10 09:52:29 2018 rev:260 rq:593983 version:4.14.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/python-rpm.changes 2018-04-03
12:11:04.125610923 +0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/python-rpm.changes 2018-04-10
09:52:40.271811262 +0200
@@ -1,0 +2,5 @@
+Fri Apr 6 14:11:01 CEST 2018 - m...@suse.de
+
+- remove rpmlint-Factory buildignore
+
+---
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-04-03 12:11:06.613521405
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2018-04-10
09:52:44.919642839 +0200
@@ -1,0 +2,6 @@
+Fri Apr 6 10:05:18 UTC 2018 - adam.ma...@suse.de
+
+- %install_info: if we are going to fail, at least fail on install
+ not on attempted upgrades or uninstall [bsc#1084997]
+
+---
Other differences:
--
++ python-rpm.spec ++
--- /var/tmp/diff_new_pack.cnWSs3/_old 2018-04-10 09:52:46.447587471 +0200
+++ /var/tmp/diff_new_pack.cnWSs3/_new 2018-04-10 09:52:46.447587471 +0200
@@ -41,7 +41,6 @@
BuildRequires: python-rpm-macros
BuildRequires: xz-devel
BuildRequires: zlib-devel
-#!BuildIgnore: rpmlint-Factory
Requires: rpm = %{version}
%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%{_sourcedir}/rpm.spec)}
%if "%{python_flavor}" == "python2"
++ rpm-suse_macros ++
--- /var/tmp/diff_new_pack.cnWSs3/_old 2018-04-10 09:52:46.719577614 +0200
+++ /var/tmp/diff_new_pack.cnWSs3/_new 2018-04-10 09:52:46.719577614 +0200
@@ -222,11 +222,8 @@
# for %post
%install_info(:-:) \
ALL_ARGS=(%{**}) \
-NUM_ARGS=${#ALL_ARGS[@]} \
if test -x /sbin/install-info ; then \
- if test -e "${ALL_ARGS[$((NUM_ARGS-1))]}" ; then \
- /sbin/install-info "${ALL_ARGS[@]}" \
- fi \
+ /sbin/install-info "${ALL_ARGS[@]}" || : \
fi ;
# for %preun
@@ -234,7 +231,7 @@
test -n "$FIRST_ARG" || FIRST_ARG=$1 \
if test -x /sbin/install-info ; then \
if [ "$FIRST_ARG" = 0 ]; then \
- /sbin/install-info --quiet --delete %{**} \
+ /sbin/install-info --quiet --delete %{**} || : \
fi ; \
fi ;
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2018-04-03 12:11:00
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Tue Apr 3 12:11:00 2018 rev:259 rq:591876 version:4.14.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/python-rpm.changes 2018-02-08
14:02:27.548198952 +0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/python-rpm.changes 2018-04-03
12:11:04.125610923 +0200
@@ -1,0 +2,6 @@
+Tue Mar 20 13:59:45 UTC 2018 - tchva...@suse.com
+
+- Switch really to singlespec thus allowing us to build without
+ python2-devel present in the distribution
+
+---
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-03-07 10:29:05.434570379
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2018-04-03
12:11:06.613521405 +0200
@@ -1,0 +2,13 @@
+Tue Mar 27 14:31:28 CEST 2018 - m...@suse.de
+
+- do not use the source date epoch as buildtime by default
+ [bnc#1087065]
+ new patch: source_date_epoch_buildtime.diff
+
+---
+Mon Mar 5 09:23:16 UTC 2018 - sch...@suse.de
+
+- handle RISC-V relocation in debugedit
+ new patch: debugedit-riscv.patch
+
+---
New:
debugedit-riscv.patch
source_date_epoch_buildtime.diff
Other differences:
--
++ python-rpm.spec ++
--- /var/tmp/diff_new_pack.tm9Pql/_old 2018-04-03 12:11:08.781443401 +0200
+++ /var/tmp/diff_new_pack.tm9Pql/_new 2018-04-03 12:11:08.785443256 +0200
@@ -17,14 +17,16 @@
#
+# Enable Python build sourced from rpm spec
+%global with_python 1
Name: python-rpm
Version:4.14.1
Release:0
-#!BuildIgnore: rpmlint-Factory
Summary:Python Bindings for Manipulating RPM Packages
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: Development/Libraries/Python
Source99: rpm.spec
+BuildRequires: %{python_module devel}
BuildRequires: file-devel
BuildRequires: libacl-devel
BuildRequires: libbz2-devel
@@ -37,22 +39,15 @@
BuildRequires: ncurses-devel
BuildRequires: popt-devel
BuildRequires: python-rpm-macros
-BuildRequires: python2-devel
-BuildRequires: python3-devel
BuildRequires: xz-devel
BuildRequires: zlib-devel
+#!BuildIgnore: rpmlint-Factory
Requires: rpm = %{version}
-
+%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%{_sourcedir}/rpm.spec)}
%if "%{python_flavor}" == "python2"
Obsoletes: rpm-python < %{version}-%{release}
Provides: rpm-python = %{version}-%{release}
%endif
-
-# Enable Python build sourced from rpm spec
-%global with_python 1
-
-%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%_sourcedir/rpm.spec)}
-
%python_subpackages
%description
@@ -64,7 +59,7 @@
that will manipulate RPM packages and databases.
%prep
-%{expand:%(sed -n -e '/^%%prep/,/^%%install/p' <%_sourcedir/rpm.spec | sed -e
'1d' -e '$d')}
+%{expand:%(sed -n -e '/^%%prep/,/^%%install/p' <%{_sourcedir}/rpm.spec | sed
-e '1d' -e '$d')}
# The build stage is already declared and pulled in from rpm.spec
pushd python
++ rpm.spec ++
--- /var/tmp/diff_new_pack.tm9Pql/_old 2018-04-03 12:11:08.817442106 +0200
+++ /var/tmp/diff_new_pack.tm9Pql/_new 2018-04-03 12:11:08.817442106 +0200
@@ -49,7 +49,7 @@
Provides: rpminst
Requires(post): %fillup_prereq
Summary:The RPM Package Manager
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: System/Packages
Version:4.14.1
Release:0
@@ -130,6 +130,8 @@
Patch109: pythondistdeps.diff
Patch111: debugedit-bnc1076819.diff
Patch112: hardlinks.diff
+Patch113: debugedit-riscv.patch
+Patch114: source_date_epoch_buildtime.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
Patch6465: auto-config-update-riscv64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -227,7 +229,7 @@
%patch -P 85
%patch -P 93 -P 94 -P 99
%patch -P 100-P 102 -P 103 -P 108
-%patch -P 109 -P 111 -P 112
+%patch -P 109 -P 111 -P 112 -P 113 -P 114
%ifarch aarch64 ppc64le riscv64
%patch6464
++ debugedit-riscv.patch ++
>From 86ec4c03de2b7cc6af6ba5b10dd686002e0b588c Mon Sep 17 00:00:00 2001
From: Andreas Schwab
Date: Mon, 26 Feb 2018 10:34:26 +0100
Subject: [PATCH] debugedit: handle RISC-V relocation
Resolves #407
---
tools/debugedit.c | 6 ++
1 file changed, 6 insertions(+)
Index: tools/debugedit.c
commit rpm for openSUSE:Factory
Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2018-03-07 10:29:01 Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) Package is "rpm" Wed Mar 7 10:29:01 2018 rev:258 rq:581945 version:4.14.1 Changes: --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-02-23 15:28:16.781813984 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2018-03-07 10:29:05.434570379 +0100 @@ -1,0 +2,12 @@ +Thu Mar 1 16:42:07 CET 2018 - m...@suse.de + +- remove no longer needed and now harmful extcond patch + [bnc#1083539] + dropped patch: extcond.diff + +--- +Thu Feb 22 15:14:49 UTC 2018 - fv...@suse.com + +- Use %license (boo#1082318) + +--- Old: extcond.diff Other differences: -- ++ rpm.spec ++ --- /var/tmp/diff_new_pack.vP0fol/_old 2018-03-07 10:29:08.370464479 +0100 +++ /var/tmp/diff_new_pack.vP0fol/_new 2018-03-07 10:29:08.370464479 +0100 @@ -75,7 +75,6 @@ Patch14:nameversioncompare.diff Patch15:dbfsync.diff Patch16:dbrointerruptable.diff -Patch17:extcond.diff Patch18:refreshtestarch.diff Patch20:waitlock.diff Patch21:suspendlock.diff @@ -218,7 +217,7 @@ %patch3 -p1 %patch -P 4 %patch5 -p1 -%patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 +%patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 18 %patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29 %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 38 %patch -P 43 -P 45 -P 46 -P 47 -P 49 @@ -405,7 +404,7 @@ %files -f rpm.lang %defattr(-,root,root) -%doc COPYING +%license COPYING %doc doc/manual %docRPM-HOWTO /etc/rpm
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2018-02-23 15:28:13
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Fri Feb 23 15:28:13 2018 rev:257 rq:579024 version:4.14.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-02-08 14:02:31.596009956
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2018-02-23
15:28:16.781813984 +0100
@@ -1,0 +2,25 @@
+Thu Feb 22 11:14:38 CET 2018 - m...@suse.de
+
+- split riscv64 part from auto-config-update-aarch64-ppc64le.diff
+ to make the change rust-proof.
+ new patch: auto-config-update-riscv64.diff
+
+---
+Thu Feb 15 11:11:21 UTC 2018 - sch...@suse.de
+
+- auto-config-update-aarch64-ppc64le.diff: Update for riscv64 and enable
+ it there
+
+---
+Wed Feb 14 10:45:25 CET 2018 - m...@suse.de
+
+- change disk usage handling to take hardlinks into account
+ [bnc#720150]
+ new patch: hardlinks.diff
+
+---
+Wed Feb 7 17:23:48 UTC 2018 - msucha...@suse.com
+
+- Use ksym-provides tool (bsc#1077692).
+
+---
New:
auto-config-update-riscv64.diff
hardlinks.diff
Other differences:
--
++ rpm.spec ++
--- /var/tmp/diff_new_pack.D3hTHg/_old 2018-02-23 15:28:19.721707772 +0100
+++ /var/tmp/diff_new_pack.D3hTHg/_new 2018-02-23 15:28:19.725707628 +0100
@@ -130,7 +130,9 @@
Patch108: debugedit-macro.diff
Patch109: pythondistdeps.diff
Patch111: debugedit-bnc1076819.diff
+Patch112: hardlinks.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
+Patch6465: auto-config-update-riscv64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# avoid bootstrapping problem
@@ -226,11 +228,14 @@
%patch -P 85
%patch -P 93 -P 94 -P 99
%patch -P 100-P 102 -P 103 -P 108
-%patch -P 109 -P 111
+%patch -P 109 -P 111 -P 112
-%ifarch aarch64 ppc64le
+%ifarch aarch64 ppc64le riscv64
%patch6464
%endif
+%ifarch riscv64
+%patch6465
+%endif
cp config.guess config.sub db/dist/
cp config.guess config.sub beecrypt/
@@ -351,7 +356,7 @@
fi
done
popd
-%ifarch aarch64 ppc64le
+%ifarch aarch64 ppc64le riscv64
install -m 755 config.guess %{buildroot}/usr/lib/rpm
install -m 755 config.sub %{buildroot}/usr/lib/rpm
%endif
++ auto-config-update-riscv64.diff ++
--- ./build/parseBuildInstallClean.c.orig 2018-02-22 10:11:50.088160024
+
+++ ./build/parseBuildInstallClean.c2018-02-22 10:11:37.592198130 +
@@ -55,6 +55,7 @@ int parseBuildInstallClean(rpmSpec spec,
" 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"
+" grep -q 'riscv64[-:]' $c || install -m 755
$ref/config.$s $c\n"
" done\n"
"done\n"
);
++ findksyms.diff ++
--- /var/tmp/diff_new_pack.D3hTHg/_old 2018-02-23 15:28:19.857702859 +0100
+++ /var/tmp/diff_new_pack.D3hTHg/_new 2018-02-23 15:28:19.857702859 +0100
@@ -1,5 +1,5 @@
./scripts/Makefile.am.orig 2018-01-31 13:08:32.644956731 +
-+++ ./scripts/Makefile.am 2018-01-31 13:09:24.081819852 +
+--- ./scripts/Makefile.am.orig 2018-02-14 09:42:12.958726157 +
./scripts/Makefile.am 2018-02-14 09:43:26.605515718 +
@@ -19,6 +19,7 @@ EXTRA_DIST = \
tgpg vpkg-provides.sh \
find-requires find-provides \
@@ -16,9 +16,9 @@
metainfo.prov \
mono-find-requires mono-find-provides \
pkgconfigdeps.sh libtooldeps.sh \
./scripts/find-provides.ksyms.orig 2018-01-31 13:08:40.820934977 +
-+++ ./scripts/find-provides.ksyms 2018-01-31 13:08:40.820934977 +
-@@ -0,0 +1,60 @@
+--- ./scripts/find-provides.ksyms.orig 2018-02-14 09:42:54.757606752 +
./scripts/find-provides.ksyms 2018-02-14 09:42:39.165651303 +
+@@ -0,0 +1,81 @@
+#! /bin/bash
+
+IFS=$'\n'
@@ -40,6 +40,7 @@
+
+while read f; do
+test -e "$f" || continue
++is_module=""
+case "$f" in
+*.debug)
+continue
@@ -48,9 +49,11 @@
+flavor=${f##*/vmlinu[xz]-}
+flavor=${flavor%.gz}
+echo "kernel-uname-r = $flavor"
++version=${flavor}
+flavor=${flavor##*-}
+;;
+*/lib/modules/*/*.ko |
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2018-02-08 14:02:25
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Thu Feb 8 14:02:25 2018 rev:256 rq:573718 version:4.14.1
Changes:
--- /work/SRC/openSUSE:Factory/rpm/python-rpm.changes 2018-01-13
21:33:15.166354674 +0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/python-rpm.changes 2018-02-08
14:02:27.548198952 +0100
@@ -1,0 +2,5 @@
+Wed Jan 31 14:45:33 CET 2018 - m...@suse.de
+
+- update to rpm-4.14.1
+
+---
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-01-26 13:34:17.371895160
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2018-02-08
14:02:31.596009956 +0100
@@ -1,0 +2,28 @@
+Wed Feb 7 09:13:41 UTC 2018 - dims...@opensuse.org
+
+- Update %remove_and_set: This macro needs no fallback to
+ /var/adm/fillup-templates, as it does not work on files provided
+ by the packages, but rather constructs temporary files inside
+ fillup_dir.
+
+---
+Mon Feb 5 11:08:12 CET 2018 - m...@suse.de
+
+- remove shebang from python-macro-helper
+
+---
+Wed Jan 31 14:45:33 CET 2018 - m...@suse.de
+
+- update to rpm-4.14.1
+ * Fix arbitrary code execution when evaluating common
+python-related macros
+ * new artifact file marker
+ * less strict signature header verification [bnc#1078284]
+- dropped patches:
+ * bigarchive.diff
+ * editdwarf.diff
+ * hardlink.diff
+ * rofs.diff
+ * transfiletriggerpostun.diff
+
+---
Old:
bigarchive.diff
editdwarf.diff
hardlink.diff
rofs.diff
rpm-4.14.0.tar.bz2
transfiletriggerpostun.diff
New:
rpm-4.14.1.tar.bz2
Other differences:
--
++ python-rpm.spec ++
--- /var/tmp/diff_new_pack.wLBLVV/_old 2018-02-08 14:02:34.007897343 +0100
+++ /var/tmp/diff_new_pack.wLBLVV/_new 2018-02-08 14:02:34.011897157 +0100
@@ -18,7 +18,7 @@
Name: python-rpm
-Version:4.14.0
+Version:4.14.1
Release:0
#!BuildIgnore: rpmlint-Factory
Summary:Python Bindings for Manipulating RPM Packages
++ rpm.spec ++
--- /var/tmp/diff_new_pack.wLBLVV/_old 2018-02-08 14:02:34.047895475 +0100
+++ /var/tmp/diff_new_pack.wLBLVV/_new 2018-02-08 14:02:34.047895475 +0100
@@ -51,7 +51,7 @@
Summary:The RPM Package Manager
License:GPL-2.0+
Group: System/Packages
-Version:4.14.0
+Version:4.14.1
Release:0
Source: http://ftp.rpm.org/releases/rpm-4.14.x/rpm-%{version}.tar.bz2
Source1:RPM-HOWTO.tar.bz2
@@ -127,13 +127,8 @@
Patch100: rpm-findlang-inject-metainfo.patch
Patch102: emptymanifest.diff
Patch103: find-lang-qt-qm.patch
-Patch104: editdwarf.diff
-Patch105: rofs.diff
-Patch106: transfiletriggerpostun.diff
-Patch107: hardlink.diff
Patch108: debugedit-macro.diff
Patch109: pythondistdeps.diff
-Patch110: bigarchive.diff
Patch111: debugedit-bnc1076819.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -230,8 +225,8 @@
%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 77 -P 78
%patch -P 85
%patch -P 93 -P 94 -P 99
-%patch -P 100-P 102 -P 103 -P 104 -P 105 -P 106 -P 107 -P 108
-%patch -P 109 -P 110 -P 111
+%patch -P 100-P 102 -P 103 -P 108
+%patch -P 109 -P 111
%ifarch aarch64 ppc64le
%patch6464
++ brpcompress.diff ++
--- /var/tmp/diff_new_pack.wLBLVV/_old 2018-02-08 14:02:34.119892114 +0100
+++ /var/tmp/diff_new_pack.wLBLVV/_new 2018-02-08 14:02:34.123891927 +0100
@@ -1,5 +1,5 @@
./scripts/brp-compress.orig2017-01-19 12:14:04.529812394 +
-+++ ./scripts/brp-compress 2017-01-19 12:18:22.488107819 +
+--- ./scripts/brp-compress.orig2018-01-31 13:07:37.130104408 +
./scripts/brp-compress 2018-01-31 13:07:16.234159981 +
@@ -5,51 +5,78 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD
exit 0
fi
@@ -40,7 +40,7 @@
for d in ./usr/man/man* ./usr/man/*/man* ./usr/info \
./usr/share/man/man* ./usr/share/man/*/man* ./usr/share/info \
./usr/kerberos/man ./usr/X11R6/man/man* ./usr/lib/perl5/man/man* \
- ./usr/share/doc/*/man/man* ./usr/lib/*/man/man*
+ ./usr/share/doc/*/man/man* ./usr/lib/*/man/man*
./usr/share/fish/man/man*
do
[
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2018-01-26 13:34:14
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Fri Jan 26 13:34:14 2018 rev:255 rq:568126 version:4.14.0
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2018-01-13 21:33:15.342346435
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2018-01-26
13:34:17.371895160 +0100
@@ -1,0 +2,6 @@
+Mon Jan 22 11:13:48 UTC 2018 - rguent...@suse.com
+
+- fix debugedit relocation offset computation (boo#1076819)
+ new patch: debugedit-bnc1076819.diff
+
+---
New:
debugedit-bnc1076819.diff
Other differences:
--
++ rpm.spec ++
--- /var/tmp/diff_new_pack.tp6bFU/_old 2018-01-26 13:34:19.963774096 +0100
+++ /var/tmp/diff_new_pack.tp6bFU/_new 2018-01-26 13:34:19.967773910 +0100
@@ -134,6 +134,7 @@
Patch108: debugedit-macro.diff
Patch109: pythondistdeps.diff
Patch110: bigarchive.diff
+Patch111: debugedit-bnc1076819.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -230,7 +231,7 @@
%patch -P 85
%patch -P 93 -P 94 -P 99
%patch -P 100-P 102 -P 103 -P 104 -P 105 -P 106 -P 107 -P 108
-%patch -P 109 -P 110
+%patch -P 109 -P 110 -P 111
%ifarch aarch64 ppc64le
%patch6464
++ debugedit-bnc1076819.diff ++
--- tools/debugedit.c.orig 2018-01-22 12:09:07.477955907 +0100
+++ tools/debugedit.c 2018-01-22 12:09:22.210197759 +0100
@@ -2154,9 +2154,9 @@
/* Offset (pointing into the line program) moves
from old to new index including the header
size diff. */
- r_offset += ((dso->lines.table[lndx].new_idx
- - dso->lines.table[lndx].old_idx)
- + dso->lines.table[lndx].size_diff);
+ r_offset += (ssize_t)((dso->lines.table[lndx].new_idx
+- dso->lines.table[lndx].old_idx)
+ + dso->lines.table[lndx].size_diff);
if (rtype == SHT_RELA)
{
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2018-01-13 21:33:10
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Sat Jan 13 21:33:10 2018 rev:254 rq:561871 version:4.14.0
Changes:
New Changes file:
--- /dev/null 2018-01-05 12:14:39.755488130 +0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/python-rpm.changes 2018-01-13
21:33:15.166354674 +0100
@@ -0,0 +1,150 @@
+---
+Tue Dec 19 09:39:25 UTC 2017 - jeng...@inai.de
+
+- Update RPM groups
+
+---
+Sat Oct 28 12:19:34 UTC 2017 - ngomp...@gmail.com
+
+- Add a comment to note that prep and build stages come from rpm.spec
+
+---
+Mon Oct 16 13:49:18 UTC 2017 - ngomp...@gmail.com
+
+- Properly quote the conditional for Obsoletes+Provides
+
+---
+Sun Oct 15 04:03:00 UTC 2017 - ngomp...@gmail.com
+
+- Unify rpm-python and python3-rpm into singlespec
+- Switch the build to use setuptools-based build, so that
+ the Python module is properly built with all its metadata
+
+---
+Wed Nov 20 14:41:34 CET 2013 - m...@suse.de
+
+- adapt to python-3.3, which no longer looks at XXXmodule.so
+
+---
+Fri Jul 12 15:36:43 CEST 2013 - m...@suse.de
+
+- update to rpm-4.11.1
+
+---
+Wed Jan 2 14:25:20 UTC 2013 - dmuel...@suse.com
+
+- Update to 4.10.2
+
+---
+Mon Apr 23 11:16:26 CEST 2012 - m...@suse.de
+
+- modified capsule api diff to match rpm upstream
+
+---
+Wed Apr 11 16:54:02 UTC 2012 - klaussfre...@gmail.com
+
+- Fix usage of deprecated AsVoidPtr Python/C API,
+ replaced by Capsule API
+
+---
+Tue Jan 17 10:28:42 UTC 2012 - sasc...@suse.de
+
+- Spec file cleanup:
+ * Don't rm -rf %{buildroot}
+ * Removed %clean section
+ * Removed authors from description
+
+---
+Sun Dec 11 09:28:28 UTC 2011 - co...@suse.com
+
+- add libtool as explicit buildrequire
+
+---
+Wed Feb 23 14:01:41 CET 2011 - m...@suse.de
+
+- drop standard python directories from filelist [bnc#229189]
+
+---
+Fri Oct 22 15:52:32 UTC 2010 - co...@novell.com
+
+- adapt second spec file to changes done to rpm.spec
+
+---
+Mon Oct 18 11:03:53 CEST 2010 - dmuel...@suse.de
+
+- adapt buildrequires
+
+---
+Thu Feb 12 16:52:26 CET 2009 - r...@suse.de
+
+- adapt buildrequires
+
+---
+Wed Oct 8 11:24:22 CEST 2008 - cth...@suse.de
+
+- added libelf-devel to BuildRequires to fix build
+
+---
+Thu Sep 11 15:33:52 CEST 2008 - m...@suse.de
+
+- update to 4.4.2.3 to get rid of >50 patches
+
+---
+Sat Aug 30 21:23:38 CEST 2008 - cth...@suse.de
+
+- add libselinux-devel to BuildRequires
+
+---
+Thu Aug 7 16:05:51 CEST 2008 - dmuel...@suse.de
+
+- fix build against python 2.6
+
+---
+Thu Mar 27 14:47:18 CET 2008 - co...@suse.de
+
+- fix buildrequires
+
+---
+Fri May 25 16:20:53 CEST 2007 - m...@suse.de
+
+- fix unicode queries
+
+---
+Fri Mar 30 15:06:28 CEST 2007 - rguent...@suse.de
+
+- add ncurses-devel and zlib-devel BuildRequires.
+
+---
+Wed Oct 18 22:59:02 CEST 2006 - m...@suse.de
+
+- use rpm.spec for building instead of duplication everything
+- delete superfluous .a and .la files [#202604]
+- create .pyc and .pyo files [#205711]
+
+---
+Sun Oct 15 23:41:37 CEST 2006 - sch...@suse.de
+
+- Make sure config.rpath is present.
+
+---
+Fri Sep 22 08:58:57 CEST 2006
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2017-11-30 12:31:50
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Thu Nov 30 12:31:50 2017 rev:253 rq:545077 version:4.13.0.1
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-11-22 11:21:06.196227962
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-11-30
12:31:52.935390609 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:41:13 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+ %_fillupdir macro (boo#1069468)
+
+---
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.kHA9NP/_old 2017-11-30 12:31:55.887283261 +0100
+++ /var/tmp/diff_new_pack.kHA9NP/_new 2017-11-30 12:31:55.891283116 +0100
@@ -16,6 +16,11 @@
#
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+ %define _fillupdir /var/adm/fillup-templates
+%endif
+
Name: rpm
BuildRequires: binutils
BuildRequires: bzip2
@@ -340,8 +345,8 @@
rm -f %{buildroot}/usr/lib/rpmpopt
rm -rf %{buildroot}%{_mandir}/{fr,ja,ko,pl,ru,sk}
rm -f %{buildroot}%{_prefix}/share/locale/de/LC_MESSAGES/rpm.mo
-mkdir -p %{buildroot}/var/adm/fillup-templates
-install -c -m0644 %{SOURCE9} %{buildroot}/var/adm/fillup-templates/
+mkdir -p %{buildroot}%{_fillupdir}
+install -c -m0644 %{SOURCE9} %{buildroot}%{_fillupdir}/
rm -f %{buildroot}/usr/lib/rpm/cpanflute %{buildroot}/usr/lib/rpm/cpanflute2
install -m 755 %{SOURCE5} %{buildroot}/usr/lib/rpm
install -m 755 scripts/find-supplements{,.ksyms} %{buildroot}/usr/lib/rpm
@@ -447,7 +452,7 @@
%dir %attr(755,root,root) /usr/src/packages/RPMS
%dir %attr(755,root,root) /usr/src/packages/BUILDROOT
%dir %attr(755,root,root) /usr/src/packages/RPMS/*
- /var/adm/fillup-templates/sysconfig.services-rpm
+ %{_fillupdir}/sysconfig.services-rpm
%files build
%defattr(-,root,root)
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2017-11-22 11:20:57
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Wed Nov 22 11:20:57 2017 rev:252 rq:543847 version:4.13.0.1
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-11-06 11:44:44.738988850
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-11-22
11:21:06.196227962 +0100
@@ -1,0 +2,13 @@
+Tue Nov 7 14:27:32 UTC 2017 - rbr...@suse.com
+
+- Introduce new %_fillupdir macro for fillup-templates location
+- Set %_fillupdir macro to /usr/share/fillup-templates
+- Change fillup macros to support new %_fillupdir in addition
+ to old /var/adm/fillup-templates location
+
+---
+Mon Nov 6 13:53:45 UTC 2017 - m...@suse.de
+
+- Make %post compatibility symlink creation more resiliant
+
+---
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.4MVOT6/_old 2017-11-22 11:21:09.108122153 +0100
+++ /var/tmp/diff_new_pack.4MVOT6/_new 2017-11-22 11:21:09.112122008 +0100
@@ -385,7 +385,7 @@
%{fillup_only -an services}
# var/lib/rpm migration: set forwards compatible symlink for
/usr/lib/sysimage/rpm so scriptlets in same transaction will still work
-if (test ! -L var/lib/rpm) && (test -f var/lib/rpm/Packages) ; then
+if test ! -L var/lib/rpm -a -f var/lib/rpm/Packages -a ! -f
usr/lib/sysimage/rpm/Packages ; then
rmdir usr/lib/sysimage/rpm
ln -s ../../../var/lib/rpm usr/lib/sysimage/rpm
fi
++ rpm-suse_macros ++
--- /var/tmp/diff_new_pack.4MVOT6/_old 2017-11-22 11:21:09.420110816 +0100
+++ /var/tmp/diff_new_pack.4MVOT6/_new 2017-11-22 11:21:09.420110816 +0100
@@ -7,6 +7,7 @@
%_sysconfdir/etc
%_localstatedir /var
%_defaultdocdir %{_usr}/share/doc/packages
+%_fillupdir %{_usr}/share/fillup-templates
# package build macros
%make_install make install DESTDIR=%{?buildroot}
@@ -65,7 +66,7 @@
# macro: fillup_and_insserv
# do the fillup and insserv calls for postinstall
-# options:
+# options:
# -n (use first argument as name for fillup template filenames
# instead of package name)
# -f (skip fillup parts)
@@ -82,7 +83,7 @@
#name of (old) START variable (unless -s is given)
#
# template for variables into /etc/sysconfig/package:
-# /var/adm/fillup-templates/sysconfig.package
+# /usr/share/fillup-templates/sysconfig.package
%fillup_and_insserv(finpsyY) \
%{-p:echo "-p option for fillup_and_insserv no longer supported (ever only
used on SL8.0)"; exit 1;} \
%{-s:echo "STARTVAR for fillup_and_insserv no longer supported (rc.config
is gone since SL8.0)"; exit 1;} \
@@ -110,8 +111,12 @@
# this part really calls fillup for the appropriate files
#
%do_real_fillup() \
-TEMPLATE_DIR=/var/adm/fillup-templates \
-SYSC_TEMPLATE=$TEMPLATE_DIR/sysconfig.$PNAME \
+SYSC_TEMPLATE=%{_fillupdir}/sysconfig.$PNAME \
+# If template not in new %{_fillupdir}, fallback to old TEMPLATE_DIR \
+if [ ! -f $SYSC_TEMPLATE ] ; then \
+TEMPLATE_DIR=/var/adm/fillup-templates \
+SYSC_TEMPLATE=$TEMPLATE_DIR/sysconfig.$PNAME \
+fi \
SD_NAME="" \
%{sysc_fillup}
@@ -128,7 +133,7 @@
elif test "$FIRST_ARG" = "1" -o "$FORCE_YES" = "1" ; then \
/sbin/insserv ${YAST_IS_RUNNING:+-f} /etc/init.d/$SCRIPTNAME \
fi \
-done
+done
# macro: insserv_cleanup
%insserv_cleanup() \
@@ -150,8 +155,12 @@
%fillup_only(dans) \
%{-n:PNAME=%{1}}%{!-n:PNAME=%{name}} \
%{-s:SUBPNAME=-%{2}}%{!-s:SUBPNAME=%{-a:-%{name}}} \
-TEMPLATE_DIR=/var/adm/fillup-templates \
-SYSC_TEMPLATE=$TEMPLATE_DIR/sysconfig.$PNAME$SUBPNAME \
+SYSC_TEMPLATE=%{_fillupdir}/sysconfig.$PNAME$SUBPNAME \
+# If template not in new %{_fillupdir}, fallback to old TEMPLATE_DIR \
+if [ ! -f $SYSC_TEMPLATE ] ; then \
+TEMPLATE_DIR=/var/adm/fillup-templates \
+SYSC_TEMPLATE=$TEMPLATE_DIR/sysconfig.$PNAME$SUBPNAME \
+fi \
SD_NAME="" \
%{-d:%{-s:SD_NAME=%{3}/}%{!-s:SD_NAME=%{2}/}} \
%{sysc_fillup} \
@@ -189,7 +198,11 @@
%remove_and_set(n:y) \
%{-n:PNAME=%{-n*}}%{!-n:PNAME=%{name}} \
DEF_VAL=%{-y:"yes"}%{!-y:"no"} \
-DEL_TEMPL=/var/adm/fillup-templates/$PNAME.del \
+DEL_TEMPL=%{_fillupdir}/$PNAME.del \
+# If template not in new location, fallback to old location \
+if [ ! -f $DEL_TEMPL ] ; then \
+
commit rpm for openSUSE:Factory
Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2017-11-06 11:44:41 Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) Package is "rpm" Mon Nov 6 11:44:41 2017 rev:251 rq:539253 version:4.13.0.1 Changes: rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-11-03 16:21:03.836478948 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-11-06 11:44:44.738988850 +0100 @@ -1,0 +2,5 @@ +Mon Nov 6 10:05:10 UTC 2017 - rbr...@suse.com + +- Correct %post compatibility symlink for /usr/lib/sysimage/rpm + +--- Other differences: -- rpm-python.spec: same change ++ rpm.spec ++ --- /var/tmp/diff_new_pack.0bJJHX/_old 2017-11-06 11:44:49.298824962 +0100 +++ /var/tmp/diff_new_pack.0bJJHX/_new 2017-11-06 11:44:49.302824818 +0100 @@ -387,7 +387,7 @@ # var/lib/rpm migration: set forwards compatible symlink for /usr/lib/sysimage/rpm so scriptlets in same transaction will still work if (test ! -L var/lib/rpm) && (test -f var/lib/rpm/Packages) ; then rmdir usr/lib/sysimage/rpm - ln -s ../../var/lib/rpm usr/lib/sysimage/rpm + ln -s ../../../var/lib/rpm usr/lib/sysimage/rpm fi test -f usr/lib/sysimage/rpm/Packages || rpmdb --initdb
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2017-11-03 16:20:58
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Fri Nov 3 16:20:58 2017 rev:250 rq:537210 version:4.13.0.1
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-10-18 10:43:26.424715578
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-11-03
16:21:03.836478948 +0100
@@ -1,0 +2,14 @@
+Thu Oct 26 12:10:16 UTC 2017 - rbr...@suse.com
+
+- Remove usr-lib-rpmdb.patch
+- Add usr-lib-sysimage-rpm.patch to locate rpmdb to
+ /usr/lib/sysimage/rpm after discussions with upstream
+- Migrates existing rpmdb in /var/lib/rpm to /usr/lib/sysimage/rpm
+
+---
+Thu Oct 5 13:28:53 UTC 2017 - rbr...@suse.com
+
+- Add usr-lib-rpmdb.patch to locate rpmdb to /usr/lib/rpmdb
+- Migrates existing rpmdb in /var/lib/rpm to /usr/lib/rpmdb
+
+---
New:
usr-lib-sysimage-rpm.patch
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.mZddlY/_old 2017-11-03 16:21:07.456347200 +0100
+++ /var/tmp/diff_new_pack.mZddlY/_new 2017-11-03 16:21:07.460347054 +0100
@@ -63,6 +63,7 @@
Patch2: db.diff
Patch3: rpm-4.12.0.1-fix-bashisms.patch
Patch4: beecrypt-4.1.2-build.diff
+Patch5: usr-lib-sysimage-rpm.patch
# quilt patches start here
Patch11:debugedit.diff
Patch13:ignore-auxv.diff
@@ -228,6 +229,7 @@
%patch -P 1
%patch3 -p1
%patch -P 4
+%patch5 -p1
%patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
%patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
%patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38
@@ -326,6 +328,7 @@
mkdir %{buildroot}/usr/src/packages/RPMS/$dd
chmod 755 %{buildroot}/usr/src/packages/RPMS/$dd
done
+mkdir -p %{buildroot}/usr/lib/sysimage/rpm
mkdir -p %{buildroot}/var/lib/rpm
gzip -9 %{buildroot}/%{_mandir}/man[18]/*.[18]
export RPM_BUILD_ROOT
@@ -380,15 +383,41 @@
%post
%{fillup_only -an services}
-test -f var/lib/rpm/Packages || rpmdb --initdb
-if test -s var/lib/rpm/packages.rpm ; then
+
+# var/lib/rpm migration: set forwards compatible symlink for
/usr/lib/sysimage/rpm so scriptlets in same transaction will still work
+if (test ! -L var/lib/rpm) && (test -f var/lib/rpm/Packages) ; then
+ rmdir usr/lib/sysimage/rpm
+ ln -s ../../var/lib/rpm usr/lib/sysimage/rpm
+fi
+
+test -f usr/lib/sysimage/rpm/Packages || rpmdb --initdb
+
+%posttrans
+# var/lib/rpm migration
+if test ! -L var/lib/rpm ; then
+ if test -s var/lib/rpm/packages.rpm ; then
echo "converting rpm-3 database to rpm-4 format..."
usr/lib/rpm/convertdb1 var/lib/rpm/packages.rpm
mv -f var/lib/rpm/packages.rpm var/lib/rpm/packages.rpm3
rm -f var/lib/rpm/conflictsindex.rpm var/lib/rpm/fileindex.rpm
var/lib/rpm/groupindex.rpm var/lib/rpm/nameindex.rpm
var/lib/rpm/providesindex.rpm var/lib/rpm/requiredby.rpm
var/lib/rpm/triggerindex.rpm
+ fi
+ # delete no longer maintained databases
+ rm -f var/lib/rpm/Filemd5s var/lib/rpm/Filedigests
var/lib/rpm/Requireversion var/lib/rpm/Provideversion
+
+ if test -f var/lib/rpm/Packages ; then
+echo "migrating rpmdb from /var/lib/rpm to /usr/lib/sysimage/rpm..."
+
+# remove forwards compatible symlink
+if test -L usr/lib/sysimage/rpm ; then
+ rm -f usr/lib/sysimage/rpm
+ mkdir -p usr/lib/sysimage/rpm
+fi
+
+mv -f var/lib/rpm/.[!.]* usr/lib/sysimage/rpm/
+mv -f var/lib/rpm/* usr/lib/sysimage/rpm/
+ fi
+ rmdir var/lib/rpm && ln -s ../../usr/lib/sysimage/rpm var/lib/rpm
fi
-# delete no longer maintained databases
-rm -f var/lib/rpm/Filemd5s var/lib/rpm/Filedigests var/lib/rpm/Requireversion
var/lib/rpm/Provideversion
%files -f rpm.lang
%defattr(-,root,root)
@@ -408,6 +437,8 @@
%{_libdir}/librpmio.so.*
%{_libdir}/librpmsign.so.*
%doc %{_mandir}/man[18]/*.[18]*
+%dir /usr/lib/sysimage
+%dir /usr/lib/sysimage/rpm
%dir /var/lib/rpm
%dir %attr(755,root,root) /usr/src/packages/BUILD
%dir %attr(755,root,root) /usr/src/packages/SPECS
++ usr-lib-sysimage-rpm.patch ++
--- rpm-4.13.0.1/macros.in.orig 2017-10-04 17:05:17.198681581 +0200
+++ rpm-4.13.0.1/macros.in 2017-10-04 17:07:37.122679969 +0200
@@ -165,7 +165,7 @@
%_bzip2bin %{__bzip2}
# The location of the rpm database file(s).
-%_dbpath %{_var}/lib/rpm
+%_dbpath %{_usr}/lib/sysimage/rpm
# The location of the rpm database file(s) after "rpm
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2017-10-18 10:43:22
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Wed Oct 18 10:43:22 2017 rev:249 rq:533089 version:4.13.0.1
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-09-13 21:33:06.502782185
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-10-18
10:43:26.424715578 +0200
@@ -1,0 +2,18 @@
+Fri Sep 8 15:37:36 UTC 2017 - mma...@suse.com
+
+- Generate ksym() dependencies for SLE if %is_opensuse is unset
+ (bsc#981083).
+
+---
+Tue Aug 29 14:21:31 UTC 2017 - mma...@suse.com
+
+- Drop %supplements_kernel_module, as it is broken, undocumented
+ and is not used by anybody (bsc#981083).
+ dropped: modalias-kernel_module.diff
+ refreshed: modalias-encode.diff
+- Split fileattrs for kernel and kmps, do not pass around %name and
+ simplify the helpers
+ refreshed: fileattrs.diff, modalias.diff
+ dropped: symset-table, helperenv.diff, modalias-no-kgraft.diff
+
+---
Old:
helperenv.diff
modalias-kernel_module.diff
modalias-no-kgraft.diff
symset-table
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.9UD0GS/_old 2017-10-18 10:43:28.888599817 +0200
+++ /var/tmp/diff_new_pack.9UD0GS/_new 2017-10-18 10:43:28.888599817 +0200
@@ -53,7 +53,6 @@
Source1:RPM-HOWTO.tar.bz2
Source4:rpm-suse_macros
Source5:rpmsort
-Source6:symset-table
Source8:rpmconfigcheck
Source9:sysconfig.services-rpm
Source10: beecrypt-4.1.2.tar.bz2
@@ -91,7 +90,6 @@
Patch36:rpmqpack.diff
Patch37:convertdb1static.diff
Patch38:build.diff
-Patch39:modalias-kernel_module.diff
Patch41:debugedit-comp-dir.diff
Patch42:perlprov.diff
Patch43:rpm-shorten-changelog.diff
@@ -125,7 +123,6 @@
Patch76:python3-abi-kind.diff
Patch77:langnoc.diff
Patch78:headerchk2.diff
-Patch79:helperenv.diff
# PATCH-FEATURE-UPSTREAM 4.14 0e87aed1785d0531c40b23889f8338744f6abb3a
Patch80:0001-set-SOURCE_DATE_EPOCH-from-changelog.patch
# PATCH-FEATURE-UPSTREAM 4.14 57f94a582602f0353cdb17a02dc12c4461d4f32d
@@ -138,7 +135,6 @@
Patch92:find-lang-python.patch
Patch93:weakdepscompat.diff
Patch94:checksepwarn.diff
-Patch96:modalias-no-kgraft.diff
Patch98:normalize_blocksize.diff
Patch99:enable-postin-scripts-error.diff
Patch100: rpm-findlang-inject-metainfo.patch
@@ -234,13 +230,13 @@
%patch -P 4
%patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
%patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
-%patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39
+%patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38
%patch -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58
%patch -P 60 -P 61 -P 65 -P 66 -P 67 -P 68 -P 69
-%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
+%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78
%patch -P 80 -P 81 -P 82 -P 83 -P 85
-%patch -P 92 -P 93 -P 94 -P 96 -P 98 -P 99
+%patch -P 92 -P 93 -P 94 -P 98 -P 99
%patch -P 100 -P 101 -P 102 -P 103 -P 104 -P 105
%ifarch aarch64 ppc64le
@@ -345,7 +341,6 @@
install -c -m0644 %{SOURCE9} %{buildroot}/var/adm/fillup-templates/
rm -f %{buildroot}/usr/lib/rpm/cpanflute %{buildroot}/usr/lib/rpm/cpanflute2
install -m 755 %{SOURCE5} %{buildroot}/usr/lib/rpm
-install -m 755 %{SOURCE6} %{buildroot}/usr/lib/rpm
install -m 755 scripts/find-supplements{,.ksyms} %{buildroot}/usr/lib/rpm
install -m 755 scripts/firmware.prov %{buildroot}/usr/lib/rpm
install -m 755 scripts/debuginfo.prov %{buildroot}/usr/lib/rpm
++ fileattrs.diff ++
--- /var/tmp/diff_new_pack.9UD0GS/_old 2017-10-18 10:43:29.024593428 +0200
+++ /var/tmp/diff_new_pack.9UD0GS/_new 2017-10-18 10:43:29.024593428 +0200
@@ -1,20 +1,34 @@
./fileattrs/Makefile.am.orig 2014-02-20 12:54:01.473814793 +
-+++ ./fileattrs/Makefile.am2014-02-20 12:55:37.318814624 +
-@@ -7,6 +7,6 @@ fattrsdir = $(rpmconfigdir)/fileattrs
+---
+ fileattrs/Makefile.am|3 ++-
+ fileattrs/debuginfo.attr |2 ++
+ fileattrs/elf.attr |3 ++-
+ fileattrs/elflib.attr|4
+ fileattrs/firmware.attr |2 ++
+
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2017-09-13 21:33:01
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Wed Sep 13 21:33:01 2017 rev:248 rq:521004 version:4.13.0.1
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-08-04 11:56:30.859896848
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-09-13
21:33:06.502782185 +0200
@@ -1,0 +2,6 @@
+Tue Aug 22 11:05:53 UTC 2017 - fv...@suse.com
+
+- Change Supplements in rpm-suse_macros to not depend on bundle-lang-other
+ anymore, it does not exist in Leap and will likely be dropped from TW.
+
+---
Other differences:
--
rpm-python.spec: same change
rpm.spec: same change
++ rpm-suse_macros ++
--- /var/tmp/diff_new_pack.hLRDch/_old 2017-09-13 21:33:08.714471006 +0200
+++ /var/tmp/diff_new_pack.hLRDch/_new 2017-09-13 21:33:08.714471006 +0200
@@ -259,7 +259,7 @@
Requires: %{-n:%{-n*}}%{!-n:%{name}} = %{version} \
%{-r:Requires: %{-r*}} \
Provides: %{-n:%{-n*}}%{!-n:%{name}}-lang-all = %{version} \
-Supplements: packageand(bundle-lang-other:%{-n:%{-n*}}%{!-n:%{name}}) \
+Supplements: %{-n:%{-n*}}%{!-n:%{name}} \
BuildArch: noarch \
%description %{-n:-n %{-n*}-}lang \
Provides translations for the \"%{name}\" package.
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2017-08-04 11:56:28
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Fri Aug 4 11:56:28 2017 rev:247 rq:512653 version:4.13.0.1
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-06-18 13:48:28.950927105
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-08-04
11:56:30.859896848 +0200
@@ -1,0 +2,46 @@
+Wed Jul 26 12:39:40 UTC 2017 - rguent...@suse.com
+
+- Amend finddebuginfo.diff to adjust readelf -Wn pattern matching
+ to account for fixed readelf no longer emitting spurious newlines
+ with -W.
+
+---
+Mon Jul 10 12:03:08 UTC 2017 - dims...@opensuse.org
+
+- Drop net-tools Requires from rpm-build: net-tools only ships
+ uninteresting binaries. Most people would probably rather have
+ net-tools-depreacted expected (e.g. ifconfig), but as we did not
+ pull this in neither, we can just ignore this.
+
+---
+Wed Jul 5 16:28:46 CEST 2017 - ngomp...@gmail.com
+
+- Define %_sharedstatedir as /var/lib, which is the path for
+ shared state content in Red Hat/Fedora; Mageia; and Debian/Ubuntu.
+ The old path (/usr/com) isn't recognized by FHS, whereas /var/lib
+ is recognized as suitable for this purpose.
+- Change the RPM binary payload from old-lzma to xz,
+ in line with payload settings for RH/Fedora and Mageia
+- Backport upstream commit to read changelog entries with full
+ timestamps
+ New patch: changes-doc.diff
+
+---
+Thu Jun 15 07:08:45 UTC 2017 - alarr...@suse.com
+
+- Added a %rpm_vercmp macro which accepts two versions as parameters and
+ returns -1, 0, 1 if the first version is less than, equal or
+ greater than the second version respectively.
+- Added a %pkg_version macro that accepts a package or capability name
+ as argument and returns the version number of the installed package. If
+ no package provides the argument, it returns the string ~~~
+- Added a %pkg_vcmp macro that accepts 3 parameters. The first parameter
+ is a package name or provided capability name, the second argument is an
+ operator ( < <= = >= > != ) and the third parameter is a version string
+ to compare the installed version of the first argument with.
+- Added a %pkg_version_cmp macro which accepts a package or capability name
+ as first argument and a version number as second argument and returns
+ -1, 0, 1 or ~~~ . The number values have the same meaning as in %rpm_vercmp
+ and the ~~~ string is returned if the package or capability can't be found.
+
+---
New:
changes-doc.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.6cQ0aZ/_old 2017-08-04 11:56:34.311409685 +0200
+++ /var/tmp/diff_new_pack.6cQ0aZ/_new 2017-08-04 11:56:34.319408556 +0200
@@ -146,6 +146,7 @@
Patch102: emptymanifest.diff
Patch103: find-lang-qt-qm.patch
Patch104: perlprov-package.diff
+Patch105: changes-doc.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -199,7 +200,6 @@
Requires: grep
Requires: gzip
Requires: make
-Requires: net-tools
Requires: patch
Requires: perl-base
Requires: sed
@@ -241,7 +241,7 @@
%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
%patch -P 80 -P 81 -P 82 -P 83 -P 85
%patch -P 92 -P 93 -P 94 -P 96 -P 98 -P 99
-%patch -P 100 -P 101 -P 102 -P 103 -P 104
+%patch -P 100 -P 101 -P 102 -P 103 -P 104 -P 105
%ifarch aarch64 ppc64le
%patch6464
@@ -289,7 +289,7 @@
autoreconf -fi
sed -i -e 's,{PYTHON_VERSION}mu,{PYTHON_VERSION}mu python${PYTHON_VERSION}m,'
configure
./configure --disable-dependency-tracking --prefix=%{_prefix}
--mandir=%{_mandir} --infodir=%{_infodir} \
---libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var --with-lua \
+--libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var
--sharedstatedir=/var/lib --with-lua \
--with-vendor=suse \
--with-rundir=/run \
--without-archive \
++ changes-doc.diff ++
--- ./doc/rpm.8.orig2017-07-05 14:31:21.186733161 +
+++ ./doc/rpm.8 2017-07-05 14:32:12.097733071 +
@@ -65,7 +65,7 @@ rpm \- RPM Package Manager
.PP
- [\fB--changelog\fR] [\fB-c,--configfiles\fR] [\fB--conflicts\fR]
+ [\fB--changelog\fR] [\fB--changes\fR] [\fB-c,--configfiles\fR]
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2017-06-18 13:48:19
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Sun Jun 18 13:48:19 2017 rev:246 rq:503706 version:4.13.0.1
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-05-17 10:45:24.578323761
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-06-18
13:48:28.950927105 +0200
@@ -1,0 +2,7 @@
+Fri Jun 9 15:33:01 UTC 2017 - srie...@suse.com
+
+- Add patch to handle newer package statement variations for Perl
+ 5.12+
+ * perlprov-package.diff
+
+---
New:
perlprov-package.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.SGKUzv/_old 2017-06-18 13:48:32.274459450 +0200
+++ /var/tmp/diff_new_pack.SGKUzv/_new 2017-06-18 13:48:32.27845 +0200
@@ -145,6 +145,7 @@
Patch101: nobfd.diff
Patch102: emptymanifest.diff
Patch103: find-lang-qt-qm.patch
+Patch104: perlprov-package.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -240,7 +241,7 @@
%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
%patch -P 80 -P 81 -P 82 -P 83 -P 85
%patch -P 92 -P 93 -P 94 -P 96 -P 98 -P 99
-%patch -P 100 -P 101 -P 102 -P 103
+%patch -P 100 -P 101 -P 102 -P 103 -P 104
%ifarch aarch64 ppc64le
%patch6464
++ perlprov-package.diff ++
Support package statements like "package 1.2.3;" and "package 1.2.3 {", which
are
new in Perl 5.12 and 5.14
--- ./scripts/perl.prov.orig2017-06-09 15:20:11.869617486 +0200
+++ ./scripts/perl.prov 2017-06-09 15:04:59.840952250 +0200
@@ -129,9 +129,9 @@
# package name so we report all namespaces except some common
# false positives as if they were provided packages (really ugly).
-if (m/^\s*package\s+([_:a-zA-Z0-9]+)\s*;/) {
+if (m/^\s*package\s+([_:a-zA-Z0-9]+)\s*(?:v?([0-9_.]+)\s*)?[;{]/) {
$package = $1;
- undef $version;
+ $version = $2;
if ($package eq 'main') {
undef $package;
} else {
@@ -139,7 +139,7 @@
# the package definition is broken up over multiple blocks.
# In that case, don't stomp a previous $VERSION we might have
# found. (See BZ#214496.)
-$require{$package} = undef unless (exists $require{$package});
+$require{$package} = $version unless (exists $require{$package});
}
}
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2017-05-17 10:45:20
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Wed May 17 10:45:20 2017 rev:245 rq:492375 version:4.13.0.1
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-04-03 11:03:56.105624915
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-05-17
10:45:24.578323761 +0200
@@ -1,0 +2,6 @@
+Mon Apr 10 14:25:07 UTC 2017 - fv...@suse.com
+
+- Add patch to handle special case of .qm file paths correctly (boo#1027925):
+ * find-lang-qt-qm.patch
+
+---
New:
find-lang-qt-qm.patch
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.R49Bxq/_old 2017-05-17 10:45:27.009981698 +0200
+++ /var/tmp/diff_new_pack.R49Bxq/_new 2017-05-17 10:45:27.013981134 +0200
@@ -144,6 +144,7 @@
Patch100: rpm-findlang-inject-metainfo.patch
Patch101: nobfd.diff
Patch102: emptymanifest.diff
+Patch103: find-lang-qt-qm.patch
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -239,7 +240,7 @@
%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
%patch -P 80 -P 81 -P 82 -P 83 -P 85
%patch -P 92 -P 93 -P 94 -P 96 -P 98 -P 99
-%patch -P 100 -P 101 -P 102
+%patch -P 100 -P 101 -P 102 -P 103
%ifarch aarch64 ppc64le
%patch6464
++ find-lang-qt-qm.patch ++
Author: Fabian Vogt
Subject: Handle special cases of qt translations correctly
References: boo#1027925
Some KDE frameworks write their translations to files like this:
/usr/share/locale/ca/LC_MESSAGES/libkirigami2plugin_qt.qm
Without this patch it gets detected as %lang(qt), which is obviously
incorrect. This copies two lines from the .mo handling and adjusts
them to handle _qt.qm files as well. "qt" is not an official ISO language
code, so this should not break anything in the past or hopefully the future.
Signed-off-by: Fabian Vogt
---
scripts/find-lang.sh |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--- scripts/find-lang.sh.orig
+++ scripts/find-lang.sh
@@ -303,9 +303,11 @@ s:%lang(C) ::
find "$TOP_DIR" -type f -o -type l|sed '
s:'"$TOP_DIR"'::
-'"$NO_ALL_NAME$QT"'s:\(.*/'"$NAME"'_\([a-zA-Z]\{2\}\([_@].*\)\?\)\.qm$\):%lang(\2)
\1:
+'"$ALL_NAME$QT"'s:\(.*/locale/\)\([^/]\+\)\(/.\+/\)\([^/]\+_qt\.qm$\):%lang(\2)
\1\2\3\4:
+'"$NO_ALL_NAME$QT"'s:\(.*/locale/\)\([^/]\+\)\(/.\+/\)\('"$NAME"'_qt\.qm$\):%lang(\2)
\1\2\3\4:
+'"$NO_ALL_NAME$QT"'s:^\([^%].*/'"$NAME"'_\([a-zA-Z]\{2\}\([_@].*\)\?\)\.qm$\):%lang(\2)
\1:
'"$ALL_NAME$QT"'s:\(.*/[^/_]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
-'"$ALL_NAME$QT"'s:\(.*/[^/_]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
+'"$ALL_NAME$QT"'s:^\([^%].*/[^/_]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1:
'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1:
s:^[^%].*::
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2017-04-03 11:03:53
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Mon Apr 3 11:03:53 2017 rev:244 rq:483307 version:4.13.0.1
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2017-03-03 17:41:48.072309788
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-04-03
11:03:56.105624915 +0200
@@ -1,0 +2,13 @@
+Fri Mar 17 18:14:37 UTC 2017 - ku...@suse.com
+
+- Convert rpmconfigcheck init script to systemd unit
+
+---
+Mon Mar 6 12:37:48 UTC 2017 - rguent...@suse.com
+
+- Tweak debugsubpkg.diff to no longer use obsoleted RPM interfaces
+ and add support for debuginfo compressed by DWZ.
+- Add %_find_debuginfo_dwz_opts and DWZ limits to macrosin.diff.
+- Add dwz requires to rpm-build. [fate#322957]
+
+---
@@ -11,0 +25,10 @@
+
+---
+Wed Feb 22 12:54:05 UTC 2017 - bwiedem...@suse.com
+
+- Add upstream patches 0001-set-SOURCE_DATE_EPOCH-from-changelog.patch
+ 0002-Extend-changelog-to-support-full-timestamps-903.patch
+ 0003-Allow-SOURCE_DATE_EPOCH-to-override-file-timestamps.patch
+ 0004-Allow-SOURCE_DATE_EPOCH-to-override-RPMTAG_BUILDTIME.patch
+ in order to allow for building bit-identical rpms as described in
+ https://github.com/rpm-software-management/rpm/pull/144
New:
0001-set-SOURCE_DATE_EPOCH-from-changelog.patch
0002-Extend-changelog-to-support-full-timestamps-903.patch
0003-Allow-SOURCE_DATE_EPOCH-to-override-file-timestamps.patch
0004-Allow-SOURCE_DATE_EPOCH-to-override-RPMTAG_BUILDTIME.patch
rpmconfigcheck.service
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.2v5qrN/_old 2017-04-03 11:04:00.784963813 +0200
+++ /var/tmp/diff_new_pack.2v5qrN/_new 2017-04-03 11:04:00.784963813 +0200
@@ -59,6 +59,7 @@
Source10: beecrypt-4.1.2.tar.bz2
Source11: db-4.8.30.tar.bz2
Source12: baselibs.conf
+Source13: rpmconfigcheck.service
Patch1: beecrypt-4.1.2.diff
Patch2: db.diff
Patch3: rpm-4.12.0.1-fix-bashisms.patch
@@ -125,6 +126,14 @@
Patch77:langnoc.diff
Patch78:headerchk2.diff
Patch79:helperenv.diff
+# PATCH-FEATURE-UPSTREAM 4.14 0e87aed1785d0531c40b23889f8338744f6abb3a
+Patch80:0001-set-SOURCE_DATE_EPOCH-from-changelog.patch
+# PATCH-FEATURE-UPSTREAM 4.14 57f94a582602f0353cdb17a02dc12c4461d4f32d
+Patch81:0002-Extend-changelog-to-support-full-timestamps-903.patch
+# PATCH-FEATURE-UPSTREAM 4.14 8d84878ee05b2e63858af3a5a49d98e9e2933b1b
+Patch82:0003-Allow-SOURCE_DATE_EPOCH-to-override-file-timestamps.patch
+# PATCH-FEATURE-UPSTREAM 4.14 b8a54d6a1e9bb6140b6b47e23dc707e4b967537e
+Patch83:0004-Allow-SOURCE_DATE_EPOCH-to-override-RPMTAG_BUILDTIME.patch
Patch85:brp-compress-no-img.patch
Patch92:find-lang-python.patch
Patch93:weakdepscompat.diff
@@ -176,6 +185,7 @@
Requires: bzip2
Requires: coreutils
Requires: diffutils
+Requires: dwz
Requires: file
Requires: findutils
Requires: gawk
@@ -227,7 +237,7 @@
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58
%patch -P 60 -P 61 -P 65 -P 66 -P 67 -P 68 -P 69
%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
-%patch -P 85
+%patch -P 80 -P 81 -P 82 -P 83 -P 85
%patch -P 92 -P 93 -P 94 -P 96 -P 98 -P 99
%patch -P 100 -P 101 -P 102
@@ -300,10 +310,10 @@
for f in %{buildroot}/%{_libdir}/*.la; do
sed -i -e "s,/%_lib/libpopt.la,-lpopt,g" $f
done
-mkdir -p %{buildroot}/etc/init.d
-install -m 755 %{SOURCE8} %{buildroot}/etc/init.d
mkdir -p %{buildroot}/usr/sbin
-ln -sf ../../etc/init.d/rpmconfigcheck %{buildroot}/usr/sbin/rcrpmconfigcheck
+install -m 755 %{SOURCE8} %{buildroot}/usr/sbin
+mkdir -p %{buildroot}/usr/lib/systemd/system
+install -m 644 %{SOURCE13} %{buildroot}/usr/lib/systemd/system/
cp -a suse_macros %{buildroot}/usr/lib/rpm
mkdir -p %{buildroot}/usr/lib/rpm/macros.d
mkdir -p %{buildroot}/usr/lib/rpm/suse
@@ -392,8 +402,8 @@
/bin/rpm
/usr/bin/*
%exclude /usr/bin/rpmbuild
- /etc/init.d/rpmconfigcheck
- /usr/sbin/rcrpmconfigcheck
+ /usr/sbin/rpmconfigcheck
+ /usr/lib/systemd/system/rpmconfigcheck.service
/usr/lib/rpm
%{_libdir}/rpm-plugins
%{_libdir}/librpm.so.*
++
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2017-03-03 17:41:46
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is "rpm"
Fri Mar 3 17:41:46 2017 rev:243 rq:461331 version:4.13.0.1
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2016-11-03 11:12:42.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2017-03-03
17:41:48.072309788 +0100
@@ -1,0 +2,35 @@
+Wed Mar 1 13:55:51 CET 2017 - m...@suse.de
+
+- Tweak debugedit-comp-dir patch so that debugedit does not crash
+ with a NULL comp_dir [bnc#1027228]
+
+---
+Mon Feb 27 13:24:26 UTC 2017 - rguent...@suse.com
+
+- Fix debugedit-canon-fix.diff to handle directory table size
+ shrinking by 1 byte correctly.
+
+---
+Mon Feb 20 14:17:26 CET 2017 - m...@suse.de
+
+- update to rpm-4.13.0.1
+ * fix several out of bounds reads in the OpenPGP parser
+ * fix handling of OpenPGP reserved tag (should be rejected)
+ * fix various crashes from malformed packages with invalid tags
+ * fix transfiletriggerpostun nondeterministic behavior
+
+---
+Thu Jan 19 15:10:48 CET 2017 - m...@suse.de
+
+- update to rpm-4.13.0
+ * support of rich (boolean) dependencies
+ * support of file triggers
+- new patches:
+ * nobfd.diff
+ * emptymanifest.diff
+- dropped patches:
+ * rpm-4.12.0.1-lua-5.3.patch
+ * fixsizeforbigendian.diff
+ * repackage-nomd5.diff
+
+---
Old:
fixsizeforbigendian.diff
repackage-nomd5.diff
rpm-4.12.0.1-lua-5.3.patch
rpm-4.12.0.1.tar.bz2
New:
emptymanifest.diff
nobfd.diff
rpm-4.13.0.1.tar.bz2
Other differences:
--
++ python3-rpm.spec ++
--- /var/tmp/diff_new_pack.lrlFB1/_old 2017-03-03 17:41:50.455972943 +0100
+++ /var/tmp/diff_new_pack.lrlFB1/_new 2017-03-03 17:41:50.455972943 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python3-rpm
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: python3-rpm
-Version:4.12.0.1
+Version:4.13.0.1
Release:0
Summary:Python Bindings for Manipulating RPM Packages
License:GPL-2.0+
++ rpm-python.spec ++
--- /var/tmp/diff_new_pack.lrlFB1/_old 2017-03-03 17:41:50.503966160 +0100
+++ /var/tmp/diff_new_pack.lrlFB1/_new 2017-03-03 17:41:50.507965595 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rpm-python
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: rpm-python
-Version:4.12.0.1
+Version:4.13.0.1
Release:0
#!BuildIgnore: rpmlint-Factory
Summary:Python Bindings for Manipulating RPM Packages
++ rpm.spec ++
--- /var/tmp/diff_new_pack.lrlFB1/_old 2017-03-03 17:41:50.543960509 +0100
+++ /var/tmp/diff_new_pack.lrlFB1/_new 2017-03-03 17:41:50.547959944 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rpm
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -47,9 +47,9 @@
Summary:The RPM Package Manager
License:GPL-2.0+
Group: System/Packages
-Version:4.12.0.1
+Version:4.13.0.1
Release:0
-Source: http://rpm.org/releases/rpm-4.12.x/rpm-%{version}.tar.bz2
+Source: http://ftp.rpm.org/releases/rpm-4.13.x/rpm-%{version}.tar.bz2
Source1:RPM-HOWTO.tar.bz2
Source4:rpm-suse_macros
Source5:rpmsort
@@ -109,7 +109,6 @@
Patch56:debuglink.diff
Patch57:debuginfo-mono.patch
Patch58:lazystatfs.diff
-Patch59:repackage-nomd5.diff
Patch60:safeugid.diff
Patch61:noprereqdeprec.diff
Patch65:initscriptsprov.diff
@@ -130,12 +129,12 @@
Patch92:find-lang-python.patch
Patch93:weakdepscompat.diff
Patch94:checksepwarn.diff
-Patch95:
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2016-11-03 11:12: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 2016-06-05 14:17:44.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2016-11-03
11:12:42.0 +0100
@@ -1,0 +2,5 @@
+Sun Oct 30 14:46:36 UTC 2016 - jeng...@inai.de
+
+- Correct summary/description of -lang subpackages
+
+---
Other differences:
--
rpm-python.spec: same change
rpm.spec: same change
++ rpm-suse_macros ++
--- /var/tmp/diff_new_pack.cVRwJI/_old 2016-11-03 11:12:46.0 +0100
+++ /var/tmp/diff_new_pack.cVRwJI/_new 2016-11-03 11:12:46.0 +0100
@@ -254,7 +254,7 @@
# Template for lang sub-package.
%lang_package(n:r:) \
%package %{-n:-n %{-n*}-}lang \
-Summary: Languages for package %{name} \
+Summary: Translations for package %{name} \
Group: System/Localization \
Requires: %{-n:%{-n*}}%{!-n:%{name}} = %{version} \
%{-r:Requires: %{-r*}} \
@@ -262,5 +262,5 @@
Supplements: packageand(bundle-lang-other:%{-n:%{-n*}}%{!-n:%{name}}) \
BuildArch: noarch \
%description %{-n:-n %{-n*}-}lang \
-Provides translations to the package %{name}
+Provides translations for the \"%{name}\" package.
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2016-06-05 14:17:43
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 2016-05-26 23:52:39.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2016-06-05
14:17:44.0 +0200
@@ -1,0 +2,6 @@
+Tue May 31 13:58:28 CEST 2016 - m...@suse.de
+
+- add is_opensuse and leap_version macros to suse_macros
+ [bnc#940315]
+
+---
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.ropb3e/_old 2016-06-05 14:17:46.0 +0200
+++ /var/tmp/diff_new_pack.ropb3e/_new 2016-06-05 14:17:46.0 +0200
@@ -203,7 +203,7 @@
%description build
If you want to build a rpm, you need this package. It provides rpmbuild
-and requires some packages that are usually required
+and requires some packages that are usually required.
%prep
%setup -q -n rpm-%{version}
@@ -246,6 +246,10 @@
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}/' \
+-e '/@is_opensuse@%{?is_opensuse:nomatch}/d' \
+-e 's/@is_opensuse@/%{?is_opensuse}%{!?is_opensuse:0}/' \
+-e '/@leap_version@%{?leap_version:nomatch}/d' \
+-e 's/@leap_version@/%{?leap_version}%{!?leap_version:0}/' \
< %{SOURCE4} > suse_macros
rm -f m4/libtool.m4
rm -f m4/lt*.m4
++ rpm-suse_macros ++
--- /var/tmp/diff_new_pack.ropb3e/_old 2016-06-05 14:17:46.0 +0200
+++ /var/tmp/diff_new_pack.ropb3e/_new 2016-06-05 14:17:46.0 +0200
@@ -236,6 +236,8 @@
%suse_version @suse_version@
%sles_version @sles_version@
%ul_version @ul_version@
+%is_opensuse @is_opensuse@
+%leap_version @leap_version@
%do_profiling 1
%cflags_profile_generate -fprofile-generate
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2016-05-26 23:52:38
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 2016-05-05 12:09:17.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2016-05-26
23:52:39.0 +0200
@@ -1,0 +2,8 @@
+Thu May 19 10:44:52 UTC 2016 - dims...@opensuse.org
+
+- Add rpm-findlang-inject-metainfo.patch: allow packagers to inject
+ a metainfo.xml file for the -lang package, which can then serve
+ AppStream based Software Centers to show -lang packages as
+ extensions to applications (boo#980583).
+
+---
New:
rpm-findlang-inject-metainfo.patch
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.gqQgY6/_old 2016-05-26 23:52:41.0 +0200
+++ /var/tmp/diff_new_pack.gqQgY6/_new 2016-05-26 23:52:41.0 +0200
@@ -135,6 +135,7 @@
Patch97:rpm-4.12.0.1-lua-5.3.patch
Patch98:normalize_blocksize.diff
Patch99:enable-postin-scripts-error.diff
+Patch100: rpm-findlang-inject-metainfo.patch
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -229,6 +230,7 @@
%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
%patch -P 85
%patch -P 92 -P 93 -P 94 -P 95 -P 96 -P 97 -P 98 -P 99
+%patch -P 100
%ifarch aarch64 ppc64le
%patch6464
++ rpm-findlang-inject-metainfo.patch ++
Index: scripts/find-lang.sh
===
--- scripts/find-lang.sh.orig
+++ scripts/find-lang.sh
@@ -11,6 +11,8 @@
#in tact and are included with any redistribution of this file or any
#work based on this file.
+# 2016-05-19 Dominique Leuenberger
+# * Add support to create a metainfo.xml for -lang packages
# 2004-06-20 Arkadiusz Miśkiewicz
# * merge PLD changes, kde, all-name (mkochano,pascalek@PLD)
# 1999-10-19 Artur Frysiak
@@ -37,6 +39,7 @@ Additional options:
--with-man find localized man pages
--all-name match all package/domain names
--without-mo do not find locale files
+ --metainfocreate a metainfo.xml file for AppStream
EOF
exit 1
}
@@ -66,6 +69,7 @@ ALL_NAME=#
NO_ALL_NAME=
ONLY_C=#
NO_C=#
+METAINFO=0
while test $# -gt 0 ; do
case "${1}" in
@@ -114,6 +118,11 @@ while test $# -gt 0 ; do
NO_C=
shift
;;
+ --metainfo )
+ METAINFO=1
+ METADESKID=${2}
+ shift 2
+ ;;
* )
MO_NAME=${1}
shift
@@ -278,6 +287,24 @@ if ! grep -q / $MO_NAME_NEW; then
exit 1
fi
+if [ "${METAINFO}" -gt 0 ]; then
+# create a metainfo.xml file for METADESKID
+mkdir -p ${TOP_DIR}/usr/share/appdata
+cat > ${TOP_DIR}/usr/share/appdata/${METADESKID}-lang.metainfo.xml <
+
+
+ ${METADESKID}-lang
+ ${METADESKID}.desktop
+ Translations
+ Translate the user interface
+ CC0-1.0
+ https://bugzilla.opensuse.org
+
+EOF
+ echo /usr/share/appdata/${METADESKID}-lang.metainfo.xml >> $MO_NAME_NEW
+fi
+
sort -u $MO_NAME_NEW >> $MO_NAME
rm -f $MO_NAME_NEW
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2016-05-05 12:09:16
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 2016-04-05 10:40:02.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2016-05-05
12:09:17.0 +0200
@@ -1,0 +2,24 @@
+Mon May 2 13:50:24 CEST 2016 - m...@suse.de
+
+- work around bug in rpm's macro expandsion [bnc#969381]
+
+---
+Thu Apr 21 15:08:22 CEST 2016 - m...@suse.de
+
+- tweak rpm-4.12.0.1-lua-5.3.patch so that it does not need
+ the -p1 option
+- add option to make postinstall scriptlet errors fatal
+ [bnc#967728]
+ new patch: enable-postin-scripts-error.diff
+- rework nfs-blocksize-free.patch to always normalize big
+ blocksizes to 4096 bytes
+ [bnc#894610] [bnc#829717] [bnc#965322]
+ removed patch: nfs-blocksize-free.patch
+ new patch: normalize_blocksize.diff
+- drop service_del_preun, service_del_postun macros, they are
+ provided by the systemd package
+- change restart_on_update and stop_on_removal macros to use
+ service_del_preun and service_del_postun
+ [bnc#968405] [bnc#969381]
+
+---
Old:
nfs-blocksize-free.patch
New:
enable-postin-scripts-error.diff
normalize_blocksize.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.9rlGXv/_old 2016-05-05 12:09:19.0 +0200
+++ /var/tmp/diff_new_pack.9rlGXv/_new 2016-05-05 12:09:19.0 +0200
@@ -133,7 +133,8 @@
Patch95:fixsizeforbigendian.diff
Patch96:modalias-no-kgraft.diff
Patch97:rpm-4.12.0.1-lua-5.3.patch
-Patch98:nfs-blocksize-free.patch
+Patch98:normalize_blocksize.diff
+Patch99:enable-postin-scripts-error.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -227,9 +228,7 @@
%patch -P 60 -P 61 -P 65 -P 66 -P 67 -P 68 -P 69
%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
%patch -P 85
-%patch -P 92 -P 93 -P 94 -P 95 -P 96
-%patch97 -p1
-%patch98 -p1
+%patch -P 92 -P 93 -P 94 -P 95 -P 96 -P 97 -P 98 -P 99
%ifarch aarch64 ppc64le
%patch6464
++ enable-postin-scripts-error.diff ++
--- ./lib/psm.c.orig2016-04-21 13:22:27.901033751 +
+++ ./lib/psm.c 2016-04-21 13:23:45.324742853 +
@@ -285,7 +285,9 @@ static rpmRC runScript(rpmts ts, rpmte t
int warn_only = (stag != RPMTAG_PREIN &&
stag != RPMTAG_PREUN &&
stag != RPMTAG_PRETRANS &&
-stag != RPMTAG_VERIFYSCRIPT);
+stag != RPMTAG_VERIFYSCRIPT &&
+!(stag == RPMTAG_POSTIN &&
+ rpmExpandNumeric("%{_fail_on_postinstall_errors}")));
sfd = rpmtsNotify(ts, te, RPMCALLBACK_SCRIPT_START, stag, 0);
if (sfd == NULL)
--- ./macros.in.orig2016-04-21 13:21:58.933142657 +
+++ ./macros.in 2016-04-21 13:22:27.902033748 +
@@ -1327,6 +1327,11 @@ end}
%{-S:%{expand:%__scm_setup_%{-S*} %{!-v:-q}}}\
%{!-N:%autopatch %{-v} %{-p:-p%{-p*}}}
+# Should errors in %post scriptlet be propagated as errors?
+#
+# Note: set to 1 for legacy compatibility.
+%_fail_on_postinstall_errors 0
+
# \endverbatim
#*/
++ macrosin.diff ++
--- /var/tmp/diff_new_pack.9rlGXv/_old 2016-05-05 12:09:19.0 +0200
+++ /var/tmp/diff_new_pack.9rlGXv/_new 2016-05-05 12:09:19.0 +0200
@@ -287,7 +287,7 @@
#--
# arch macro for all supported Sparc processors
-@@ -1127,3 +1313,26 @@ end}
+@@ -1127,3 +1313,24 @@ end}
# \endverbatim
#*/
@@ -306,8 +306,6 @@
+%{nil}
+
+%service_add() %{fillup_and_insserv %{1}}
-+%service_del_preun() %{stop_on_removal %{1}}
-+%service_del_postun() %{restart_on_update %{1}}
+
+%user_group_add() \
+/usr/sbin/groupadd -r %{1} 2>/dev/null || :\
++ normalize_blocksize.diff ++
--- ./lib/transaction.c.orig2016-04-21 12:21:53.649740302 +
+++ ./lib/transaction.c 2016-04-21 12:28:00.821356311 +
@@ -134,6 +134,13 @@ static rpmDiskSpaceInfo rpmtsCreateDSI(c
dsi->iavail = !(sfb.f_ffree == 0 && sfb.f_files == 0)
? sfb.f_ffree : -1;
+/* normalize block size to 4096 bytes if it is too big. */
+if (dsi->bsize > 4096) {
+ uint64_t old_size = dsi->bavail * dsi->bsize;
+
commit rpm for openSUSE:Factory
Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2016-04-05 10:40:00 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 2015-10-28 17:14:49.0 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2016-04-05 10:40:02.0 +0200 @@ -1,0 +2,6 @@ +Fri Jan 15 19:20:15 UTC 2016 - stefan.bru...@rwth-aachen.de + +- add beecrypt-4.1.2-build.diff: + * make sure debug info is not stripped from internal beecrypt + +--- New: beecrypt-4.1.2-build.diff Other differences: -- ++ python3-rpm.spec ++ --- /var/tmp/diff_new_pack.CzkIB9/_old 2016-04-05 10:40:04.0 +0200 +++ /var/tmp/diff_new_pack.CzkIB9/_new 2016-04-05 10:40:04.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3-rpm # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed rpm-python.spec: same change ++ rpm.spec ++ --- /var/tmp/diff_new_pack.CzkIB9/_old 2016-04-05 10:40:05.0 +0200 +++ /var/tmp/diff_new_pack.CzkIB9/_new 2016-04-05 10:40:05.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package rpm # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -62,6 +62,7 @@ Patch1: beecrypt-4.1.2.diff Patch2: db.diff Patch3: rpm-4.12.0.1-fix-bashisms.patch +Patch4: beecrypt-4.1.2-build.diff # quilt patches start here Patch11:debugedit.diff Patch13:ignore-auxv.diff @@ -217,6 +218,7 @@ rm -f rpmdb/db.h %patch -P 1 %patch3 -p1 +%patch -P 4 %patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19 %patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29 %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39 ++ beecrypt-4.1.2-build.diff ++ --- acinclude.m4 |4 ++-- configure.ac |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Index: beecrypt-4.1.2/configure.ac === --- beecrypt-4.1.2.orig/configure.ac +++ beecrypt-4.1.2/configure.ac @@ -1,8 +1,8 @@ # Process this file with autoconf to produce a configure script. AC_INIT([beecrypt],[4.1.2],[bob.debl...@telenet.be]) -AM_INIT_AUTOMAKE AC_CANONICAL_TARGET +AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR(beecrypt.h) AC_CONFIG_HEADERS([config.h]) Index: beecrypt-4.1.2/acinclude.m4 === --- beecrypt-4.1.2.orig/acinclude.m4 +++ beecrypt-4.1.2/acinclude.m4 @@ -459,7 +459,7 @@ AC_DEFUN([BEECRYPT_GNU_CC],[ CFLAGS="$CFLAGS -Wall -pedantic" else # Generic optimizations, including cpu tuning -BEECRYPT_CFLAGS_REM([-g]) +#BEECRYPT_CFLAGS_REM([-g]) CFLAGS="$CFLAGS -DNDEBUG -fomit-frame-pointer" if test "$bc_cv_c_aggressive_opt" = yes; then case $bc_target_cpu in @@ -571,7 +571,7 @@ AC_DEFUN([BEECRYPT_GNU_CXX],[ CXXFLAGS="$CXXFLAGS -Wall -pedantic" else # Generic optimizations, including cpu tuning -BEECRYPT_CXXFLAGS_REM([-g]) +#BEECRYPT_CXXFLAGS_REM([-g]) CXXFLAGS="$CXXFLAGS -DNDEBUG" if test "$bc_cv_c_aggressive_opt" = yes; then case $bc_target_cpu in
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2015-10-28 17:14:48
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 2015-10-06 13:22:47.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2015-10-28
17:14:49.0 +0100
@@ -1,0 +2,12 @@
+Sat Oct 17 10:34:53 UTC 2015 - sch...@linux-m68k.org
+
+- %install_info_delete: only delete if package is removed
+
+---
+Thu Oct 1 14:35:04 UTC 2015 - fv...@suse.com
+
+- Add nfs-blocksize-free.patch:
+ * Blocksize of NFS shouldn't be used directly
+- Fixes bsc#894610 and bsc#829717
+
+---
New:
nfs-blocksize-free.patch
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.ogRq65/_old 2015-10-28 17:14:52.0 +0100
+++ /var/tmp/diff_new_pack.ogRq65/_new 2015-10-28 17:14:52.0 +0100
@@ -132,6 +132,7 @@
Patch95:fixsizeforbigendian.diff
Patch96:modalias-no-kgraft.diff
Patch97:rpm-4.12.0.1-lua-5.3.patch
+Patch98:nfs-blocksize-free.patch
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -226,6 +227,7 @@
%patch -P 85
%patch -P 92 -P 93 -P 94 -P 95 -P 96
%patch97 -p1
+%patch98 -p1
%ifarch aarch64 ppc64le
%patch6464
++ nfs-blocksize-free.patch ++
>From 07f6674286467f82adf0d370b8d12d72aee6817c Mon Sep 17 00:00:00 2001
From: Fabian Vogt
Date: Mon, 28 Sep 2015 18:21:19 +0200
Subject: [PATCH] Blocksize of NFS shouldn't be used directly
RPM uses the blocksize to calculate whether an RPM
can be installed on the system. For NFS this fails
for e.g. glibc-locale as it has many small files,
which rpm counts as one block. As huge NFS block
sizes (>= 1MiB) are common, this makes glibc-locale
roughly 7 GiB in installed size.
As a workaround, if the NFS block size is > 4096,
assume 4096 and scale the count of free blocks
accordingly.
See also RH bug 847960
Signed-off-by: Fabian Vogt
---
lib/transaction.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/lib/transaction.c b/lib/transaction.c
index 8167640..d8d8820 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -6,6 +6,8 @@
#include
+#include/* NFS_SUPER_MAGIC */
+
#include /* rpmMachineScore, rpmReadPackageFile
*/
#include /* XXX for rpmExpand */
#include
@@ -137,6 +139,14 @@ static rpmDiskSpaceInfo rpmtsCreateDSI(const rpmts ts,
dev_t dev,
/* XXX assigning negative value to unsigned type */
dsi->iavail = !(sfb.f_ffree == 0 && sfb.f_files == 0)
? sfb.f_ffree : -1;
+
+/* We can't tell the block size of a network file system.
+ * sfb.f_bsize would be the network layer's block size. */
+if(sfb.f_type == NFS_SUPER_MAGIC && dsi->bsize > 4096) {
+int64_t old_bsize = dsi->bsize;
+dsi->bsize = 4096; /* Assume 4k block size */
+dsi->bavail *= old_bsize / dsi->bsize;
+}
/* Find mount point belonging to this device number */
resolved_path = realpath(dirName, mntPoint);
--
2.5.2
++ rpm-suse_macros ++
--- /var/tmp/diff_new_pack.ogRq65/_old 2015-10-28 17:14:52.0 +0100
+++ /var/tmp/diff_new_pack.ogRq65/_new 2015-10-28 17:14:52.0 +0100
@@ -237,6 +237,7 @@
%run_ldconfig /sbin/ldconfig
+# for %post
%install_info(:-:) \
ALL_ARGS=(%{**}) \
NUM_ARGS=${#ALL_ARGS[@]} \
@@ -246,12 +247,12 @@
fi \
fi ;
+# for %preun
%install_info_delete(:-:) \
-ALL_ARGS=(%{**}) \
-NUM_ARGS=${#ALL_ARGS[@]} \
+test -n "$FIRST_ARG" || FIRST_ARG=$1 \
if test -x /sbin/install-info ; then \
- if ! test -e "${ALL_ARGS[$((NUM_ARGS-1))]}" ; then \
- /sbin/install-info --quiet --delete "${ALL_ARGS[@]}" \
+ if [ "$FIRST_ARG" = 0 ]; then \
+ /sbin/install-info --quiet --delete %{**} \
fi ; \
fi ;
commit rpm for openSUSE:Factory
Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2015-10-06 13:22:46 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 2015-09-03 17:58:00.0 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2015-10-06 13:22:47.0 +0200 @@ -1,0 +2,5 @@ +Mon Sep 21 07:43:58 UTC 2015 - sch...@suse.de + +- Add armv6hl to %arml macro + +--- Other differences: -- rpm-python.spec: same change rpm.spec: same change ++ macrosin.diff ++ --- /var/tmp/diff_new_pack.9mweti/_old 2015-10-06 13:22:50.0 +0200 +++ /var/tmp/diff_new_pack.9mweti/_new 2015-10-06 13:22:50.0 +0200 @@ -282,7 +282,7 @@ # arch macro for all supported ARM processors -%arm armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl +%armarmv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl -+%arml armv3l armv4l armv5l armv5tel armv6l armv7l armv7hl armv7hnl ++%arml armv3l armv4l armv5l armv5tel armv6l armv6hl armv7l armv7hl armv7hnl +%armb armv4b armv5b armv5teb #--
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2015-09-03 17:57:59
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 2015-07-05 17:50:33.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2015-09-03
17:58:00.0 +0200
@@ -1,0 +2,7 @@
+Sat Jul 18 09:01:11 UTC 2015 - i...@marguerite.su
+
+- add patch: rpm-4.12.0.1-lua-5.3.patch
+ * replace luaL_optint/luaL_checkint w/ (int)luaL_optinteger
+(int)luaL_checkinteger for compatibility w/ lua 5.3
+
+---
New:
rpm-4.12.0.1-lua-5.3.patch
Other differences:
--
++ python3-rpm.spec ++
--- /var/tmp/diff_new_pack.9YNexW/_old 2015-09-03 17:58:54.0 +0200
+++ /var/tmp/diff_new_pack.9YNexW/_new 2015-09-03 17:58:54.0 +0200
@@ -31,7 +31,7 @@
BuildRequires: libselinux-devel
BuildRequires: libsemanage-devel
BuildRequires: libtool
-BuildRequires: lua51-devel
+BuildRequires: lua-devel
BuildRequires: ncurses-devel
BuildRequires: popt-devel
BuildRequires: python3-devel
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.9YNexW/_old 2015-09-03 17:58:54.0 +0200
+++ /var/tmp/diff_new_pack.9YNexW/_new 2015-09-03 17:58:54.0 +0200
@@ -32,7 +32,7 @@
BuildRequires: libselinux-devel
BuildRequires: libsemanage-devel
BuildRequires: libtool
-BuildRequires: lua51-devel
+BuildRequires: lua-devel
BuildRequires: make
BuildRequires: ncurses-devel
BuildRequires: patch
@@ -131,6 +131,7 @@
Patch94:checksepwarn.diff
Patch95:fixsizeforbigendian.diff
Patch96:modalias-no-kgraft.diff
+Patch97:rpm-4.12.0.1-lua-5.3.patch
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -224,6 +225,7 @@
%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
%patch -P 85
%patch -P 92 -P 93 -P 94 -P 95 -P 96
+%patch97 -p1
%ifarch aarch64 ppc64le
%patch6464
++ rpm-4.12.0.1-lua-5.3.patch ++
Index: rpm-4.12.0.1/luaext/lposix.c
===
--- rpm-4.12.0.1.orig/luaext/lposix.c
+++ rpm-4.12.0.1/luaext/lposix.c
@@ -361,22 +361,35 @@ static int Pfork(lua_State *L)/** for
static int Pwait(lua_State *L) /** wait([pid]) */
{
+#if LUA_VERSION_NUM < 503
pid_t pid = luaL_optint(L, 1, -1);
+#else
+ pid_t pid = (int)luaL_optinteger(L, 1, -1);
+#endif
return pushresult(L, waitpid(pid, NULL, 0), NULL);
}
static int Pkill(lua_State *L) /** kill(pid,[sig]) */
{
+#if LUA_VERSION_NUM < 503
pid_t pid = luaL_checkint(L, 1);
int sig = luaL_optint(L, 2, SIGTERM);
+#else
+ pid_t pid = (int)luaL_checkinteger(L, 1);
+ int sig = (int)luaL_optinteger(L, 2, SIGTERM);
+#endif
return pushresult(L, kill(pid, sig), NULL);
}
static int Psleep(lua_State *L)/** sleep(seconds) */
{
+#if LUA_VERSION_NUM < 503
unsigned int seconds = luaL_checkint(L, 1);
+#else
+ unsigned int seconds = (int)luaL_checkinteger(L, 1);
+#endif
lua_pushnumber(L, sleep(seconds));
return 1;
}
@@ -529,7 +542,11 @@ static int Pgetprocessid(lua_State *L)
static int Pttyname(lua_State *L) /** ttyname(fd) */
{
+#if LUA_VERSION_NUM < 503
int fd=luaL_optint(L, 1, 0);
+#else
+ int fd = (int)luaL_optinteger(L, 1, 0);
+#endif
lua_pushstring(L, ttyname(fd));
return 1;
}
@@ -879,8 +896,11 @@ static int exit_override(lua_State *L)
{
if (!have_forked)
return luaL_error(L, "exit not permitted in this context");
-
+#if LUA_VERSION_NUM < 503
exit(luaL_optint(L, 1, EXIT_SUCCESS));
+#else
+exit((int)luaL_optinteger(L, 1, EXIT_SUCCESS));
+#endif
}
static const luaL_Reg os_overrides[] =
commit rpm for openSUSE:Factory
Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2015-07-05 17:50:31 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 2015-03-01 14:45:35.0 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2015-07-05 17:50:33.0 +0200 @@ -1,0 +2,5 @@ +Sun Jun 21 16:41:03 UTC 2015 - lmue...@suse.com + +- add a space when printing information about updating a sysconfig file + +--- Other differences: -- rpm-python.spec: same change rpm.spec: same change ++ rpm-suse_macros ++ --- /var/tmp/diff_new_pack.Yf8V0V/_old 2015-07-05 17:50:35.0 +0200 +++ /var/tmp/diff_new_pack.Yf8V0V/_new 2015-07-05 17:50:35.0 +0200 @@ -188,7 +188,7 @@ %sysc_fillup() \ if [ -x /bin/fillup ] ; then \ if [ -f $SYSC_TEMPLATE ] ; then \ - echo Updating /etc/sysconfig/$SD_NAME$PNAME... \ + echo Updating /etc/sysconfig/$SD_NAME$PNAME ... \ mkdir -p /etc/sysconfig/$SD_NAME \ touch /etc/sysconfig/$SD_NAME$PNAME \ /bin/fillup -q /etc/sysconfig/$SD_NAME$PNAME $SYSC_TEMPLATE \
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2015-03-01 14:45:34
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 2015-01-30 06:02:27.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2015-03-01
14:45:35.0 +0100
@@ -1,0 +2,13 @@
+Fri Feb 27 12:21:40 UTC 2015 - co...@suse.com
+
+- apply db.diff from the subdir to avoid patching through a symlink
+ (to please new patch)
+- comment gcc-PIE for now
+
+---
+Fri Feb 20 12:26:17 UTC 2015 - meiss...@suse.com
+
+- add gcc-PIE to requires of rpm-build to make PIE building
+ default. bsc#912298
+
+---
Other differences:
--
++ python3-rpm.spec ++
--- /var/tmp/diff_new_pack.dVEFHX/_old 2015-03-01 14:45:38.0 +0100
+++ /var/tmp/diff_new_pack.dVEFHX/_new 2015-03-01 14:45:38.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python3-rpm
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.dVEFHX/_old 2015-03-01 14:45:38.0 +0100
+++ /var/tmp/diff_new_pack.dVEFHX/_new 2015-03-01 14:45:38.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rpm
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -176,6 +176,7 @@
Requires: findutils
Requires: gawk
Requires: gcc
+#Requires: gcc-PIE
Requires: gettext-tools
Requires: glibc-devel
Requires: glibc-locale
@@ -206,10 +207,13 @@
tar xjf %{SOURCE10}
tar xjf %{SOURCE11}
ln -s db-4.8.30 db
+cd db
+%patch2 -p1
+cd ..
ln -s beecrypt-4.1.2 beecrypt
chmod -R u+w db/*
rm -f rpmdb/db.h
-%patch -P 1 -P 2
+%patch -P 1
%patch3 -p1
%patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
%patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2015-01-30 06:02:23
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-11-24 11:08:04.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2015-01-30
06:02:27.0 +0100
@@ -1,0 +2,14 @@
+Sun Nov 30 02:59:00 UTC 2014 - Led led...@gmail.com
+
+- fix bashisms in brp-compress, symset-table and check-rpaths
+ scripts
+- fix shebang in find-supplements.ksyms script that contains
+ bash-specific constructions
+- updated patches:
+ * modalias.diff
+ * modalias-kernel_module.diff
+ * brpcompress.diff
+- add patches:
+ * rpm-4.12.0.1-fix-bashisms.patch
+
+---
New:
rpm-4.12.0.1-fix-bashisms.patch
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.Ajz1yr/_old 2015-01-30 06:02:31.0 +0100
+++ /var/tmp/diff_new_pack.Ajz1yr/_new 2015-01-30 06:02:31.0 +0100
@@ -61,6 +61,7 @@
Source12: baselibs.conf
Patch1: beecrypt-4.1.2.diff
Patch2: db.diff
+Patch3: rpm-4.12.0.1-fix-bashisms.patch
# quilt patches start here
Patch11:debugedit.diff
Patch13:ignore-auxv.diff
@@ -209,6 +210,7 @@
chmod -R u+w db/*
rm -f rpmdb/db.h
%patch -P 1 -P 2
+%patch3 -p1
%patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
%patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
%patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39
++ brpcompress.diff ++
--- /var/tmp/diff_new_pack.Ajz1yr/_old 2015-01-30 06:02:31.0 +0100
+++ /var/tmp/diff_new_pack.Ajz1yr/_new 2015-01-30 06:02:31.0 +0100
@@ -14,7 +14,7 @@
COMPRESS=gzip -9 -n
COMPRESS_EXT=.gz
-+function check_for_hard_link
++check_for_hard_link()
+{
+dir=$1
+b=$2
++ modalias-kernel_module.diff ++
--- /var/tmp/diff_new_pack.Ajz1yr/_old 2015-01-30 06:02:31.0 +0100
+++ /var/tmp/diff_new_pack.Ajz1yr/_new 2015-01-30 06:02:31.0 +0100
@@ -3,7 +3,7 @@
--- scripts/find-supplements.ksyms.orig
+++ scripts/find-supplements.ksyms
@@ -1,6 +1,8 @@
- #! /bin/sh
+ #!/bin/bash
+SPECFILE=${RPMBUILD_SPECFILE:-/usr/src/packages/SOURCES/$1.spec}
IFS=$'\n'
++ modalias.diff ++
--- /var/tmp/diff_new_pack.Ajz1yr/_old 2015-01-30 06:02:31.0 +0100
+++ /var/tmp/diff_new_pack.Ajz1yr/_new 2015-01-30 06:02:31.0 +0100
@@ -25,7 +25,7 @@
--- ./scripts/find-supplements.ksyms.orig 2011-05-11 15:01:39.0
+
+++ ./scripts/find-supplements.ksyms 2011-05-11 15:01:39.0 +
@@ -0,0 +1,56 @@
-+#! /bin/sh
++#!/bin/bash
+
+IFS=$'\n'
+
++ rpm-4.12.0.1-fix-bashisms.patch ++
diff -Ndur rpm-4.12.0.1/scripts/check-rpaths
rpm-4.12.0.1-fix-bashisms/scripts/check-rpaths
--- rpm-4.12.0.1/scripts/check-rpaths 2014-06-30 11:47:14.0 +0300
+++ rpm-4.12.0.1-fix-bashisms/scripts/check-rpaths 2014-11-30
04:51:05.189260640 +0200
@@ -17,7 +17,7 @@
test -z $QA_SKIP_RPATHS || {
-echo $WARNING: '\$QA_SKIP_RPATHS' is obsoleted by 'QA_RPATHS=[0-7]' 2
+echo WARNING: '\$QA_SKIP_RPATHS' is obsoleted by 'QA_RPATHS=[0-7]' 2
exit 0
}
++ symset-table ++
--- /var/tmp/diff_new_pack.Ajz1yr/_old 2015-01-30 06:02:31.0 +0100
+++ /var/tmp/diff_new_pack.Ajz1yr/_new 2015-01-30 06:02:31.0 +0100
@@ -13,13 +13,14 @@
trap cd / ; rm -rf $tmpdir EXIT
cd $tmpdir
-shopt -s nullglob
-for symsets in /boot/symsets-*.tar.gz; do
+ls /boot/symsets-*.tar.gz 2/dev/null |
+while read symsets; do
zcat $symsets \
| tar xf -
done
-for symsets in *; do
+ls * 2/dev/null |
+while read symsets; do
krel=${symsets#symsets-}
for symset in $symsets/*; do
class=${symset##*/} ; class=${class%.*}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2014-11-24 11:08:02
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-10-06 22:05:10.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2014-11-24
11:08:04.0 +0100
@@ -1,0 +2,6 @@
+Tue Nov 11 10:51:37 UTC 2014 - mma...@suse.cz
+
+- Do not generate supplements for kgraft patches (bnc#904848)
+ new patch: modalias-no-kgraft.diff
+
+---
New:
modalias-no-kgraft.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.MmcWJ4/_old 2014-11-24 11:08:06.0 +0100
+++ /var/tmp/diff_new_pack.MmcWJ4/_new 2014-11-24 11:08:06.0 +0100
@@ -129,6 +129,7 @@
Patch93:weakdepscompat.diff
Patch94:checksepwarn.diff
Patch95:fixsizeforbigendian.diff
+Patch96:modalias-no-kgraft.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -216,7 +217,7 @@
%patch -P 60 -P 61 -P 65 -P 66 -P 67 -P 68 -P 69
%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
%patch -P 85
-%patch -P 92 -P 93 -P 94 -P 95
+%patch -P 92 -P 93 -P 94 -P 95 -P 96
%ifarch aarch64 ppc64le
%patch6464
++ modalias-no-kgraft.diff ++
From: Michal Marek mma...@suse.cz
Subject: Do not generate supplements for kgraft patches
References: bnc#904848
kgraft-patches are to be automatically installed if a matching kernel is
installed. Generating the KMP supplements thus makes no sense.
Signed-off-by: Michal Marek mma...@suse.cz
---
scripts/find-supplements.ksyms |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- scripts/find-supplements.ksyms.orig
+++ scripts/find-supplements.ksyms
@@ -7,7 +7,7 @@ PACKAGE=$1
case $1 in
kernel-module-*);; # Fedora kernel module package names start with
# kernel-module.
-kernel*) is_kernel_package=1 ;;
+kernel* | kgraft-patch*) is_kernel_package=1 ;;
esac
if ! [ -z $is_kernel_package ]; then
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2014-10-06 22:05:01
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-09-28 19:53:37.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2014-10-06
22:05:10.0 +0200
@@ -1,0 +2,6 @@
+Mon Oct 6 15:08:17 CEST 2014 - m...@suse.de
+
+- fix size and payloadsize generation for big endian platforms
+ new patch: fixsizeforbigendian.diff
+
+---
New:
fixsizeforbigendian.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.p3iouf/_old 2014-10-06 22:05:12.0 +0200
+++ /var/tmp/diff_new_pack.p3iouf/_new 2014-10-06 22:05:12.0 +0200
@@ -128,6 +128,7 @@
Patch92:find-lang-python.patch
Patch93:weakdepscompat.diff
Patch94:checksepwarn.diff
+Patch95:fixsizeforbigendian.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -215,7 +216,7 @@
%patch -P 60 -P 61 -P 65 -P 66 -P 67 -P 68 -P 69
%patch -P 70 -P 71 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
%patch -P 85
-%patch -P 92 -P 93 -P 94
+%patch -P 92 -P 93 -P 94 -P 95
%ifarch aarch64 ppc64le
%patch6464
++ fixsizeforbigendian.diff ++
--- ./build/pack.c.orig 2014-10-06 13:05:52.801204141 +
+++ ./build/pack.c 2014-10-06 13:06:19.815077722 +
@@ -290,6 +290,8 @@ static rpmRC generateSignature(char *SHA
rpmRC rc = RPMRC_OK;
char *reservedSpace;
int spaceSize = 0;
+uint32_t size32 = (uint32_t)size;
+uint32_t payloadSize32 = (uint32_t)payloadSize;
/* Prepare signature */
sig = rpmNewSignature();
@@ -322,14 +324,14 @@ static rpmRC generateSignature(char *SHA
td.tag = payloadtag;
td.count = 1;
td.type = typetag;
-td.data = payloadSize;
+td.data = typetag == RPM_INT32_TYPE ? payloadSize32 : payloadSize;
headerPut(sig, td, HEADERPUT_DEFAULT);
rpmtdReset(td);
td.tag = sizetag;
td.count = 1;
td.type = typetag;
-td.data = size;
+td.data = typetag == RPM_INT32_TYPE ? size32 : size;
headerPut(sig, td, HEADERPUT_DEFAULT);
spaceSize = rpmExpandNumeric(%{__gpg_reserved_space});
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2014-09-28 19:53:32
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-09-15 17:39:57.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2014-09-28
19:53:37.0 +0200
@@ -1,0 +2,18 @@
+Thu Sep 18 13:40:43 CEST 2014 - m...@suse.de
+
+- update to rpm-4.12.0.1
+ * fixes archivesize being off a couple of bytes
+
+---
+Tue Sep 16 13:55:09 CEST 2014 - m...@suse.de
+
+- update to rpm-4.12.0
+ * weakdeps support is now upstream
+ * new optional payload format to support files 4GB
+ * lots of cleanups all over the codebase
+- dropped patches:
+ autodeps.diff, psm-errno.diff, exportoldtags.diff, pythondeps.diff,
+ newweakdeps.diff, findsupplements.diff, rpm-gst-provides.patch,
+ noposttrans.diff, fontprovides.diff
+
+---
Old:
autodeps.diff
exportoldtags.diff
findsupplements.diff
fontprovides.diff
newweakdeps.diff
noposttrans.diff
psm-errno.diff
pythondeps.diff
rpm-4.11.3.tar.bz2
rpm-gst-provides.patch
New:
rpm-4.12.0.1.tar.bz2
Other differences:
--
++ python3-rpm.spec ++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:39.0 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:39.0 +0200
@@ -17,7 +17,7 @@
Name: python3-rpm
-Version:4.11.3
+Version:4.12.0.1
Release:0
Summary:Python Bindings for Manipulating RPM Packages
License:GPL-2.0+
++ rpm-python.spec ++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:39.0 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:39.0 +0200
@@ -17,7 +17,7 @@
Name: rpm-python
-Version:4.11.3
+Version:4.12.0.1
Release:0
#!BuildIgnore: rpmlint-Factory
Summary:Python Bindings for Manipulating RPM Packages
++ rpm.spec ++
--- /var/tmp/diff_new_pack.jvzhqi/_old 2014-09-28 19:53:39.0 +0200
+++ /var/tmp/diff_new_pack.jvzhqi/_new 2014-09-28 19:53:39.0 +0200
@@ -47,9 +47,9 @@
Summary:The RPM Package Manager
License:GPL-2.0+
Group: System/Packages
-Version:4.11.3
+Version:4.12.0.1
Release:0
-Source: http://rpm.org/releases/rpm-4.11.x/rpm-%{version}.tar.bz2
+Source: http://rpm.org/releases/rpm-4.12.x/rpm-%{version}.tar.bz2
Source1:RPM-HOWTO.tar.bz2
Source4:rpm-suse_macros
Source5:rpmsort
@@ -62,7 +62,6 @@
Patch1: beecrypt-4.1.2.diff
Patch2: db.diff
# quilt patches start here
-Patch10:newweakdeps.diff
Patch11:debugedit.diff
Patch13:ignore-auxv.diff
Patch12:localetag.diff
@@ -74,7 +73,6 @@
Patch19:rpmrctests.diff
Patch20:waitlock.diff
Patch21:suspendlock.diff
-Patch23:autodeps.diff
Patch24:brp.diff
Patch25:brpcompress.diff
Patch26:checkfilesnoinfodir.diff
@@ -112,9 +110,6 @@
Patch59:repackage-nomd5.diff
Patch60:safeugid.diff
Patch61:noprereqdeprec.diff
-Patch62:pythondeps.diff
-Patch63:fontprovides.diff
-Patch64:rpm-gst-provides.patch
Patch65:initscriptsprov.diff
Patch66:remove-translations.diff
Patch67:headeradddb.diff
@@ -122,7 +117,6 @@
Patch69:nobuildcolor.diff
Patch70:fileattrs.diff
Patch71:nomagiccheck.diff
-Patch72:findsupplements.diff
Patch73:assumeexec.diff
Patch74:mono-find-requires.diff
Patch75:rpm-deptracking.patch
@@ -130,13 +124,10 @@
Patch77:langnoc.diff
Patch78:headerchk2.diff
Patch79:helperenv.diff
-Patch80:psm-errno.diff
-Patch82:noposttrans.diff
Patch85:brp-compress-no-img.patch
Patch92:find-lang-python.patch
Patch93:weakdepscompat.diff
Patch94:checksepwarn.diff
-Patch95:exportoldtags.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -216,15 +207,15 @@
chmod -R u+w db/*
rm -f rpmdb/db.h
%patch -P 1 -P 2
-%patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
-%patch -P 20 -P 21 -P 23 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
+%patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
+%patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2014-09-15 17:39:49
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-08-20 10:50:43.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2014-09-15
17:39:57.0 +0200
@@ -1,0 +2,17 @@
+Mon Sep 8 18:51:28 CEST 2014 - m...@suse.de
+
+- update to rpm-4.11.3
+ * consists of cherry picked bug fixes
+ * fix double-free on malformed signature header (RhBug:1133885)
+ * fix curl globbing being enabled on remote retrieval (RhBug:1076277)
+ * fix verification of SHA224 signatures (RhBug:1066494)
+ * fix buffer overflows on malformed macro define/undefine (RhBug:1087000)
+ * fix buffer overflow on unterminated macro options
+ * fix file actions sometimes carrying state across multiple
+rpmtsRun() calls (RhBug:1076552, RhBug:1128359)
+ * fix %autopatch options getting expanded twice
+ * add support for %autosetup -S git_am (RhBug:1082038)
+- dropped patches: gentlyadjustmacros.diff, rundir.diff,
+ m68k.patch, debugedit-m68k.patch
+
+---
Old:
debugedit-m68k.patch
gentlyadjustmacros.diff
m68k.patch
rpm-4.11.2.tar.bz2
rundir.diff
New:
rpm-4.11.3.tar.bz2
Other differences:
--
++ python3-rpm.spec ++
--- /var/tmp/diff_new_pack.HorHwv/_old 2014-09-15 17:40:00.0 +0200
+++ /var/tmp/diff_new_pack.HorHwv/_new 2014-09-15 17:40:00.0 +0200
@@ -17,7 +17,7 @@
Name: python3-rpm
-Version:4.11.2
+Version:4.11.3
Release:0
Summary:Python Bindings for Manipulating RPM Packages
License:GPL-2.0+
++ rpm-python.spec ++
--- /var/tmp/diff_new_pack.HorHwv/_old 2014-09-15 17:40:00.0 +0200
+++ /var/tmp/diff_new_pack.HorHwv/_new 2014-09-15 17:40:00.0 +0200
@@ -17,7 +17,7 @@
Name: rpm-python
-Version:4.11.2
+Version:4.11.3
Release:0
#!BuildIgnore: rpmlint-Factory
Summary:Python Bindings for Manipulating RPM Packages
++ rpm.spec ++
--- /var/tmp/diff_new_pack.HorHwv/_old 2014-09-15 17:40:00.0 +0200
+++ /var/tmp/diff_new_pack.HorHwv/_new 2014-09-15 17:40:00.0 +0200
@@ -47,7 +47,7 @@
Summary:The RPM Package Manager
License:GPL-2.0+
Group: System/Packages
-Version:4.11.2
+Version:4.11.3
Release:0
Source: http://rpm.org/releases/rpm-4.11.x/rpm-%{version}.tar.bz2
Source1:RPM-HOWTO.tar.bz2
@@ -137,11 +137,7 @@
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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# avoid bootstrapping problem
@@ -228,13 +224,11 @@
%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 -P 96 -P 97
+%patch -P 92 -P 93 -P 94 -P 95
%ifarch aarch64 ppc64le
%patch6464
%endif
-%patch68000
-%patch68001
cp config.guess config.sub db/dist/
cp config.guess config.sub beecrypt/
@@ -333,7 +327,6 @@
install -m 755 scripts/find-supplements{,.ksyms} %{buildroot}/usr/lib/rpm
install -m 755 scripts/firmware.prov %{buildroot}/usr/lib/rpm
install -m 755 scripts/debuginfo.prov %{buildroot}/usr/lib/rpm
-install -m 755 scripts/appdata.prov %{buildroot}/usr/lib/rpm
rm -f %{buildroot}/usr/lib/locale %{buildroot}/usr/lib/rpmrc
mkdir -p %{buildroot}/etc/rpm
chmod 755 %{buildroot}/etc/rpm
++ brp.diff ++
--- /var/tmp/diff_new_pack.HorHwv/_old 2014-09-15 17:40:01.0 +0200
+++ /var/tmp/diff_new_pack.HorHwv/_new 2014-09-15 17:40:01.0 +0200
@@ -1,15 +1,15 @@
./scripts/Makefile.am.orig 2012-03-20 08:07:25.0 +
-+++ ./scripts/Makefile.am 2012-06-01 11:39:13.0 +
-@@ -25,6 +25,7 @@ EXTRA_DIST = \
- rpmconfig_SCRIPTS = \
+--- ./scripts/Makefile.am.orig 2014-09-05 11:48:54.0 +
./scripts/Makefile.am 2014-09-08 16:42:03.387071432 +
+@@ -26,6 +26,7 @@ rpmconfig_SCRIPTS = \
+ appdata.prov \
brp-compress brp-python-bytecompile brp-java-gcjcompile \
brp-strip brp-strip-comment-note brp-python-hardlink \
+ brp-suse \
commit rpm for openSUSE:Factory
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.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2014-08-20
10:50:43.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.utnhNW/_new 2014-08-20 10:50:45.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.utnhNW/_new 2014-08-20 10:50:45.0 +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 +
./build/files.c2014-08-18 13:02:12.918275693 +
@@ -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 +
./build/parseSpec.c2014-08-18 13:00:59.917648619 +
+@@ -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 +
./build/rpmbuild_internal.h2014-08-18 13:01:40.838439511 +
+@@ -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 +
./macros.in2014-08-18 12:59:21.194153431 +
+@@ -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 +
./scripts/find-debuginfo.sh2014-08-18 12:59:21.195153440 +
@@ -149,6 +149,11 @@
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2014-06-18 22:04:35
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-05-22 20:37:52.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2014-06-18
22:04:40.0 +0200
@@ -1,0 +2,6 @@
+Thu May 22 16:40:35 CEST 2014 - m...@suse.de
+
+- adapt restart_on_update and stop_on_removal to use
+ systemctl [bnc#878255]
+
+---
Other differences:
--
rpm-python.spec: same change
rpm.spec: same change
++ rpm-suse_macros ++
--- /var/tmp/diff_new_pack.ROv9JL/_old 2014-06-18 22:04:42.0 +0200
+++ /var/tmp/diff_new_pack.ROv9JL/_new 2014-06-18 22:04:42.0 +0200
@@ -31,7 +31,7 @@
if test $YAST_IS_RUNNING != instsys -a
$DISABLE_RESTART_ON_UPDATE != yes ; then \
test -x /bin/systemctl /bin/systemctl daemon-reload
/dev/null 21 || : \
for service in %{?*} ; do \
- /etc/init.d/$service try-restart /dev/null || : \
+ test -x /bin/systemctl /bin/systemctl try-restart $service
/dev/null 21 || : \
done \
fi \
fi \
@@ -46,7 +46,7 @@
test -f /etc/sysconfig/services . /etc/sysconfig/services \
if test $YAST_IS_RUNNING != instsys -a
$DISABLE_STOP_ON_REMOVAL != yes ; then \
for service in %{?*} ; do \
- /etc/init.d/$service stop /dev/null \
+ test -x /bin/systemctl /bin/systemctl stop $service
/dev/null 21 || : \
done \
fi \
fi \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
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.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2014-05-22
20:37:52.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.lhpITh/_new 2014-05-22 20:37:57.0 +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 +
+++ configure.ac2014-04-25 13:40:13.822532172 +
@@ -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.orig2014-04-25 13:40:13.823532166 +
+++ platform.in 2014-04-25 13:41:13.034198906 +
@@ -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
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2014-03-13 20:44:05
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-02-28 16:22:19.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2014-03-13
20:44:06.0 +0100
@@ -1,0 +2,7 @@
+Mon Mar 10 14:28:45 CET 2014 - m...@suse.de
+
+- export the old weak dependency tags so that they are
+ accessible from python
+ new patch: exportoldtags.diff
+
+---
New:
exportoldtags.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.kKWR1O/_old 2014-03-13 20:44:08.0 +0100
+++ /var/tmp/diff_new_pack.kKWR1O/_new 2014-03-13 20:44:08.0 +0100
@@ -136,6 +136,7 @@
Patch92:find-lang-python.patch
Patch93:weakdepscompat.diff
Patch94:checksepwarn.diff
+Patch95:exportoldtags.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
Patch68000: m68k.patch
Patch68001: debugedit-m68k.patch
@@ -225,7 +226,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
+%patch -P 92 -P 93 -P 94 -P 95
%ifarch aarch64 ppc64le
%patch6464
++ exportoldtags.diff ++
--- ./lib/rpmtag.h.orig 2014-03-10 13:26:56.411058656 +
+++ ./lib/rpmtag.h 2014-03-10 13:27:49.545058562 +
@@ -217,14 +217,14 @@ typedef enum rpmTag_e {
RPMTAG_PRETRANSPROG= 1153, /* s[] */
RPMTAG_POSTTRANSPROG = 1154, /* s[] */
RPMTAG_DISTTAG = 1155, /* s */
-RPMTAG_OLDSUGGESTSNAME = 1156, /* s[] (unimplemented) */
-#defineRPMTAG_OLDSUGGESTS RPMTAG_OLDSUGGESTSNAME /* s[]
(unimplemented) */
-RPMTAG_OLDSUGGESTSVERSION = 1157, /* s[] (unimplemented) */
-RPMTAG_OLDSUGGESTSFLAGS= 1158, /* i[] (unimplemented) */
-RPMTAG_OLDENHANCESNAME = 1159, /* s[] (unimplemented) */
-#defineRPMTAG_OLDENHANCES RPMTAG_OLDENHANCESNAME /* s[]
(unimplemented) */
-RPMTAG_OLDENHANCESVERSION = 1160, /* s[] (unimplemented) */
-RPMTAG_OLDENHANCESFLAGS= 1161, /* i[] (unimplemented) */
+RPMTAG_OLDSUGGESTSNAME = 1156, /* s[] */
+#defineRPMTAG_OLDSUGGESTS RPMTAG_OLDSUGGESTSNAME /* s[] */
+RPMTAG_OLDSUGGESTSVERSION = 1157, /* s[] */
+RPMTAG_OLDSUGGESTSFLAGS= 1158, /* i[] */
+RPMTAG_OLDENHANCESNAME = 1159, /* s[] */
+#defineRPMTAG_OLDENHANCES RPMTAG_OLDENHANCESNAME /* s[] */
+RPMTAG_OLDENHANCESVERSION = 1160, /* s[] */
+RPMTAG_OLDENHANCESFLAGS= 1161, /* i[] */
RPMTAG_PRIORITY= 1162, /* i[] extension placeholder
(unimplemented) */
RPMTAG_CVSID = 1163, /* s (unimplemented) */
#defineRPMTAG_SVNIDRPMTAG_CVSID/* s (unimplemented) */
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2014-02-28 16:22:17
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-02-07 10:29:47.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2014-02-28
16:22:19.0 +0100
@@ -1,0 +2,33 @@
+Tue Feb 25 15:19:48 CET 2014 - m...@suse.de
+
+- fix bug in weakdepscompa.diff patch
+
+---
+Fri Feb 21 13:33:48 CET 2014 - m...@suse.de
+
+- make the 'douple separator' error a warning
+ new patch: checksepwarn.diff
+
+---
+Thu Feb 20 16:24:24 CET 2014 - m...@suse.de
+
+- cherry-pick new weakdeps tags from upstream
+ new patch: newweakdeps.diff
+ dropped: weakdeps.diff
+- add weakdepscompat.diff to support querying the old tags
+
+---
+Thu Feb 20 15:37:49 CET 2014 - m...@suse.de
+
+- drop outdated and non-free RPM-Tips tarball [bnc#849465]
+
+---
+Thu Feb 20 14:17:58 CET 2014 - m...@suse.de
+
+- update to rpm-4.11.2
+ * dropped patches: appdata_provides.diff, application_provides.diff,
+beedigest.diff, debug_gdb_scripts.diff, getauxval.diff,
+ignore_poolstr_dummy_entries.diff, ppc64le.diff,
+selfconflicts.diff, strpoolrehash.diff
+
+---
Old:
RPM-Tips.html.tar.bz2
appdata_provides.diff
application_provides.diff
beedigest.diff
debug_gdb_scripts.diff
getauxval.diff
ignore_poolstr_dummy_entries.diff
ppc64le.diff
rpm-4.11.1.tar.bz2
selfconflicts.diff
strpoolrehash.diff
weakdeps.diff
New:
checksepwarn.diff
newweakdeps.diff
rpm-4.11.2.tar.bz2
weakdepscompat.diff
Other differences:
--
++ python3-rpm.spec ++
--- /var/tmp/diff_new_pack.pc7JGa/_old 2014-02-28 16:22:20.0 +0100
+++ /var/tmp/diff_new_pack.pc7JGa/_new 2014-02-28 16:22:20.0 +0100
@@ -17,7 +17,7 @@
Name: python3-rpm
-Version:4.11.1
+Version:4.11.2
Release:0
Summary:Python Bindings for Manipulating RPM Packages
License:GPL-2.0+
@@ -60,8 +60,6 @@
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 _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-python.spec ++
--- /var/tmp/diff_new_pack.pc7JGa/_old 2014-02-28 16:22:20.0 +0100
+++ /var/tmp/diff_new_pack.pc7JGa/_new 2014-02-28 16:22:20.0 +0100
@@ -17,7 +17,7 @@
Name: rpm-python
-Version:4.11.1
+Version:4.11.2
Release:0
#!BuildIgnore: rpmlint-Factory
Summary:Python Bindings for Manipulating RPM Packages
@@ -61,7 +61,7 @@
%make_install
find %{buildroot} -not -type d -and -not -path
%{buildroot}%{_libdir}/python%{py_ver}/site-packages/rpm/\* -print0 | xargs -0
rm
pushd %{buildroot}/%py_sitedir/rpm
-rm -f _rpmmodule.a _rpmmodule.la
+rm -f _rpm*.a _rpm*.la
python %py_libdir/py_compile.py *.py
python -O %py_libdir/py_compile.py *.py
popd
++ rpm.spec ++
--- /var/tmp/diff_new_pack.pc7JGa/_old 2014-02-28 16:22:20.0 +0100
+++ /var/tmp/diff_new_pack.pc7JGa/_new 2014-02-28 16:22:20.0 +0100
@@ -47,11 +47,10 @@
Summary:The RPM Package Manager
License:GPL-2.0+
Group: System/Packages
-Version:4.11.1
+Version:4.11.2
Release:0
Source: http://rpm.org/releases/rpm-4.11.x/rpm-%{version}.tar.bz2
Source1:RPM-HOWTO.tar.bz2
-Source2:RPM-Tips.html.tar.bz2
Source4:rpm-suse_macros
Source5:rpmsort
Source6:symset-table
@@ -63,6 +62,7 @@
Patch1: beecrypt-4.1.2.diff
Patch2: db.diff
# quilt patches start here
+Patch10:newweakdeps.diff
Patch11:debugedit.diff
Patch13:ignore-auxv.diff
Patch12:localetag.diff
@@ -74,7 +74,6 @@
Patch19:rpmrctests.diff
Patch20:waitlock.diff
Patch21:suspendlock.diff
-Patch22:weakdeps.diff
Patch23:autodeps.diff
Patch24:brp.diff
Patch25:brpcompress.diff
@@ -132,20 +131,11 @@
Patch78:headerchk2.diff
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2014-02-07 10:29:46
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 2013-12-03 14:27:30.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2014-02-07
10:29:47.0 +0100
@@ -1,0 +2,5 @@
+Fri Jan 31 09:00:48 UTC 2014 - lnus...@suse.de
+
+- package /usr/lib/rpm/macros.d
+
+---
Other differences:
--
++ python3-rpm.spec ++
--- /var/tmp/diff_new_pack.EtsmhS/_old 2014-02-07 10:29:48.0 +0100
+++ /var/tmp/diff_new_pack.EtsmhS/_new 2014-02-07 10:29:48.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python3-rpm
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.EtsmhS/_old 2014-02-07 10:29:48.0 +0100
+++ /var/tmp/diff_new_pack.EtsmhS/_new 2014-02-07 10:29:48.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rpm
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -307,6 +307,7 @@
mkdir -p %{buildroot}/usr/sbin
ln -sf ../../etc/init.d/rpmconfigcheck %{buildroot}/usr/sbin/rcrpmconfigcheck
cp -a suse_macros %{buildroot}/usr/lib/rpm
+mkdir -p %{buildroot}/usr/lib/rpm/macros.d
mkdir -p %{buildroot}/usr/lib/rpm/suse
ln -s ../suse_macros %{buildroot}/usr/lib/rpm/suse/macros
for d in BUILD RPMS SOURCES SPECS SRPMS BUILDROOT ; do
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-12-03 14:27:27
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 2013-11-30 07:38:19.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-12-03
14:27:30.0 +0100
@@ -1,0 +2,5 @@
+Mon Dec 2 16:18:36 UTC 2013 - adr...@suse.de
+
+- activate config.guess and config.sub update also for ppc64le
+
+---
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.az1VdY/_old 2013-12-03 14:27:31.0 +0100
+++ /var/tmp/diff_new_pack.az1VdY/_new 2013-12-03 14:27:31.0 +0100
@@ -237,7 +237,7 @@
%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 -P 92
-%ifarch aarch64
+%ifarch aarch64 ppc64le
%patch6464
%endif
%patch68000
@@ -357,7 +357,7 @@
fi
done
popd
-%ifarch aarch64
+%ifarch aarch64 ppc64le
install -m 755 config.guess %{buildroot}/usr/lib/rpm
install -m 755 config.sub %{buildroot}/usr/lib/rpm
%endif
++ auto-config-update-aarch64-ppc64le.diff ++
--- /var/tmp/diff_new_pack.az1VdY/_old 2013-12-03 14:27:32.0 +0100
+++ /var/tmp/diff_new_pack.az1VdY/_new 2013-12-03 14:27:32.0 +0100
@@ -2,7 +2,7 @@
===
--- build/parseBuildInstallClean.c.orig
+++ build/parseBuildInstallClean.c
-@@ -46,7 +46,21 @@ int parseBuildInstallClean(rpmSpec spec,
+@@ -46,7 +46,22 @@ int parseBuildInstallClean(rpmSpec spec,
} else if (rc 0) {
goto exit;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm-python.changes 2013-11-30
07:38:19.0 +0100
@@ -1,0 +2,5 @@
+Wed Nov 20 14:41:34 CET 2013 - m...@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.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-11-30
07:38:19.0 +0100
@@ -1,0 +2,19 @@
+Fri Nov 29 11:54:44 UTC 2013 - dval...@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 - sch...@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 - speili...@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.0 +0100
+++ /var/tmp/diff_new_pack.rAL5f0/_new 2013-11-30 07:38:21.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.rAL5f0/_new 2013-11-30 07:38:21.0 +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,
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-11-15 13:32:43
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 2013-10-30 15:51:44.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-11-15
13:32:44.0 +0100
@@ -1,0 +2,8 @@
+Wed Nov 6 18:07:49 UTC 2013 - dval...@suse.com
+
+- Add support for ppc64le (ppc64le.diff)
+ those are upstream commits:
+ ef1497b1f81966fed56f008bc8ee8ba42102efd6
+ cf07feda05822377d62b973adc4010c0d7f9eaa0
+
+---
New:
ppc64le.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.Cnf5CU/_old 2013-11-15 13:32:46.0 +0100
+++ /var/tmp/diff_new_pack.Cnf5CU/_new 2013-11-15 13:32:46.0 +0100
@@ -142,6 +142,9 @@
Patch88:selfconflicts.diff
Patch89:application_provides.diff
Patch90:appdata_provides.diff
+#upstream commit cf07feda05822377d62b973adc4010c0d7f9eaa0
+#upstream commit ef1497b1f81966fed56f008bc8ee8ba42102efd6
+Patch91:ppc64le.diff
Patch6464: auto-config-update-aarch64.diff
Patch68000: m68k.patch
Patch68001: debugedit-m68k.patch
@@ -231,7 +234,8 @@
%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
+%patch -P 90 -P 91
+
%ifarch aarch64
%patch6464
%endif
++ beecrypt-4.1.2.diff ++
--- /var/tmp/diff_new_pack.Cnf5CU/_old 2013-11-15 13:32:46.0 +0100
+++ /var/tmp/diff_new_pack.Cnf5CU/_new 2013-11-15 13:32:46.0 +0100
@@ -1,5 +1,7 @@
beecrypt-4.1.2/Makefile.am.orig2004-12-22 07:06:31.0 +
-+++ beecrypt-4.1.2/Makefile.am 2006-11-24 14:08:27.0 +
+Index: beecrypt-4.1.2/Makefile.am
+===
+--- beecrypt-4.1.2/Makefile.am.orig
beecrypt-4.1.2/Makefile.am
@@ -49,7 +49,7 @@ libaltdir=$(prefix)/lib@LIBALT@
libalt_LTLIBRARIES = libbeecrypt.la
@@ -21,8 +23,10 @@
+
bench:
(cd tests $(MAKE) $(AM_MAKEFLAGS) bench)
beecrypt-4.1.2/base64.c.orig 2004-12-19 20:21:04.0 +
-+++ beecrypt-4.1.2/base64.c2006-11-24 14:08:27.0 +
+Index: beecrypt-4.1.2/base64.c
+===
+--- beecrypt-4.1.2/base64.c.orig
beecrypt-4.1.2/base64.c
@@ -253,7 +253,6 @@ char* b64encode(const void* data, size_t
unsigned c;
@@ -31,8 +35,10 @@
if (ns == 0) ns = strlen((const char*) s);
nt = ((ns + 2) / 3) * 4;
beecrypt-4.1.2/c++/io/DataOutputStream.cxx.orig2004-11-04
12:38:15.0 +
-+++ beecrypt-4.1.2/c++/io/DataOutputStream.cxx 2006-11-24 14:09:35.0
+
+Index: beecrypt-4.1.2/c++/io/DataOutputStream.cxx
+===
+--- beecrypt-4.1.2/c++/io/DataOutputStream.cxx.orig
beecrypt-4.1.2/c++/io/DataOutputStream.cxx
@@ -126,8 +126,8 @@ void DataOutputStream::writeLong(javalon
void DataOutputStream::writeChar(javaint v) throw (IOException)
{
++ ppc64le.diff ++
diff -Nur installplatform.old installplatform
--- installplatform.old 2013-11-06 19:34:36.446381950 +0100
+++ installplatform 2013-11-06 19:38:24.617417000 +0100
@@ -54,12 +54,18 @@
CANONARCH=s390x
CANONCOLOR=3
;;
-ppc64*)
+ppc64|ppc64p7)
ISANAME=ppc
ISABITS=64
CANONARCH=ppc64
CANONCOLOR=3
;;
+ppc64le)
+ ISANAME=ppc
+ ISABITS=64
+ CANONARCH=ppc64le
+ CANONCOLOR=3
+ ;;
ppc*)
ISANAME=ppc
ISABITS=32
diff -Nur lib/rpmrc.c.orig lib/rpmrc.c
--- lib/rpmrc.c.orig2013-11-06 19:34:36.426381894 +0100
+++ lib/rpmrc.c 2013-11-06 19:38:32.713558000 +0100
@@ -1119,6 +1119,7 @@
# endif /* sparc*-linux */
# if defined(__linux__) defined(__powerpc__)
+# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
{
int powerlvl;
if (!rstreq(un.machine, ppc)
@@ -1127,6 +1128,7 @@
strcpy(un.machine, ppc64p7);
}
}
+# endif /* __ORDER_BIG_ENDIAN__ */
# endif /* ppc64*-linux */
# if defined(__GNUC__) defined(__alpha__)
diff -Nurrpmrc.in.orig rpmrc.in
--- rpmrc.in2013-11-06 19:34:36.446381950 +0100
+++ rpmrc.in2013-11-06 19:41:21.698505000 +0100
@@ -48,6 +48,7 @@
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-10-30 15:51:43
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 2013-10-09 23:41:56.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-10-30
15:51:44.0 +0100
@@ -1,0 +2,5 @@
+Wed Oct 30 10:19:00 UTC 2013 - sch...@suse.de
+
+- debugedit-m68k.patch: Add support for m68k
+
+---
New:
debugedit-m68k.patch
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.URmYp8/_old 2013-10-30 15:51:46.0 +0100
+++ /var/tmp/diff_new_pack.URmYp8/_new 2013-10-30 15:51:46.0 +0100
@@ -144,6 +144,7 @@
Patch90:appdata_provides.diff
Patch6464: auto-config-update-aarch64.diff
Patch68000: m68k.patch
+Patch68001: debugedit-m68k.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# avoid bootstrapping problem
@@ -235,6 +236,7 @@
%patch6464
%endif
%patch68000
+%patch68001
cp config.guess config.sub db/dist/
cp config.guess config.sub beecrypt/
#chmod 755 scripts/find-supplements{,.ksyms}
++ debugedit-m68k.patch ++
Index: tools/debugedit.c
===
--- tools/debugedit.c.orig
+++ tools/debugedit.c
@@ -1235,6 +1235,10 @@ edit_dwarf2 (DSO *dso)
goto fail;
break;
#endif
+ case EM_68K:
+ if (rtype != R_68K_32)
+ goto fail;
+ break;
default:
fail:
error (1, 0, %s: Unhandled relocation %d in .debug_info
section,
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-10-09 23:41:55
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 2013-10-03 07:43:51.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-10-09
23:41:56.0 +0200
@@ -1,0 +2,5 @@
+Wed Oct 9 09:49:47 UTC 2013 - sch...@suse.de
+
+- m68k.patch: Add support for m68k
+
+---
New:
m68k.patch
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.5Ejiqc/_old 2013-10-09 23:41:58.0 +0200
+++ /var/tmp/diff_new_pack.5Ejiqc/_new 2013-10-09 23:41:58.0 +0200
@@ -143,6 +143,7 @@
Patch89:application_provides.diff
Patch90:appdata_provides.diff
Patch6464: auto-config-update-aarch64.diff
+Patch68000: m68k.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# avoid bootstrapping problem
@@ -233,6 +234,7 @@
%ifarch aarch64
%patch6464
%endif
+%patch68000
cp config.guess config.sub db/dist/
cp config.guess config.sub beecrypt/
#chmod 755 scripts/find-supplements{,.ksyms}
++ m68k.patch ++
Index: installplatform
===
--- installplatform.orig
+++ installplatform
@@ -108,6 +108,12 @@ for ARCH in noarch `grep ^arch_canon $RP
CANONARCH=aarch64
CANONCOLOR=3
;;
+m68k)
+ ISANAME=m68k
+ ISABITS=32
+ CANONARCH=m68k
+ CANONCOLOR=0
+ ;;
noarch)
CANONARCH=noarch
CANONCOLOR=0
Index: rpmrc.in
===
--- rpmrc.in.orig
+++ rpmrc.in
@@ -109,6 +109,8 @@ archcolor: armv5tejl 1
archcolor: armv6l 1
archcolor: armv7l 1
+archcolor: m68k 1
+
archcolor: m68kmint 1
archcolor: s390 1
@@ -299,6 +301,8 @@ buildarchtranslate: armv6hl: armv6hl
buildarchtranslate: armv7l: armv7l
buildarchtranslate: armv7hl: armv7hl
+buildarchtranslate: m68k: m68k
+
buildarchtranslate: atarist: m68kmint
buildarchtranslate: atariste: m68kmint
buildarchtranslate: ataritt: m68kmint
@@ -405,6 +409,8 @@ arch_compat: armv4tl: armv4l
arch_compat: armv4l: armv3l
arch_compat: armv3l: noarch
+arch_compat: m68k: noarch
+
arch_compat: atarist: m68kmint noarch
arch_compat: atariste: m68kmint noarch
arch_compat: ataritt: m68kmint noarch
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-10-03 07:43:50
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 2013-09-27 19:48:38.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-10-03
07:43:51.0 +0200
@@ -1,0 +2,7 @@
+Wed Oct 2 18:24:42 CEST 2013 - m...@suse.de
+
+- add application_provides.diff and appdata_provides.diff to
+ generate provides for .desktop files
+ (both patches are sent to upstream)
+
+---
New:
appdata_provides.diff
application_provides.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.CbTAwF/_old 2013-10-03 07:43:53.0 +0200
+++ /var/tmp/diff_new_pack.CbTAwF/_new 2013-10-03 07:43:53.0 +0200
@@ -140,6 +140,8 @@
Patch86:strpoolrehash.diff
Patch87:ignore_poolstr_dummy_entries.diff
Patch88:selfconflicts.diff
+Patch89:application_provides.diff
+Patch90:appdata_provides.diff
Patch6464: auto-config-update-aarch64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -226,7 +228,8 @@
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
%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
+%patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88 -P 89
+%patch -P 90
%ifarch aarch64
%patch6464
%endif
@@ -326,6 +329,7 @@
install -m 755 scripts/find-supplements{,.ksyms} %{buildroot}/usr/lib/rpm
install -m 755 scripts/firmware.prov %{buildroot}/usr/lib/rpm
install -m 755 scripts/debuginfo.prov %{buildroot}/usr/lib/rpm
+install -m 755 scripts/appdata.prov %{buildroot}/usr/lib/rpm
rm -f %{buildroot}/usr/lib/locale %{buildroot}/usr/lib/rpmrc
mkdir -p %{buildroot}/etc/rpm
chmod 755 %{buildroot}/etc/rpm
++ appdata_provides.diff ++
From fd6498712cdda8ecd9f1d89462300164dbe563bc Mon Sep 17 00:00:00 2001
From: Michael Schroeder m...@suse.de
Date: Wed, 2 Oct 2013 15:11:33 +0200
Subject: [PATCH 3/3] Add support for automatic appdata() provides
Appdata files contain application information used by the AppStream
project. We generate two provides: appdata() to support enumeration
of all application packages and appdata(filenname) to make it easy
to link installed packages with appdata files.
---
fileattrs/Makefile.am | 5 +++--
fileattrs/appdata.attr | 2 ++
scripts/Makefile.am| 2 +-
scripts/appdata.prov | 18 ++
4 files changed, 24 insertions(+), 3 deletions(-)
create mode 100644 fileattrs/appdata.attr
create mode 100755 scripts/appdata.prov
--- ./fileattrs/Makefile.am.orig2013-10-02 16:21:01.966355169 +
+++ ./fileattrs/Makefile.am 2013-10-02 16:19:10.317355367 +
@@ -7,6 +7,7 @@ fattrsdir = $(rpmconfigdir)/fileattrs
fattrs_DATA = \
desktop.attr elf.attr font.attr libtool.attr perl.attr perllib.attr \
pkgconfig.attr python.attr ocaml.attr script.attr mono.attr \
- debuginfo.attr elflib.attr firmware.attr ksyms.attr sysvinit.attr
+ debuginfo.attr elflib.attr firmware.attr ksyms.attr sysvinit.attr \
+ appdata.attr
EXTRA_DIST = $(fattrs_DATA)
--- ./fileattrs/appdata.attr.orig 2013-10-02 16:18:42.750355416 +
+++ ./fileattrs/appdata.attr2013-10-02 16:18:42.750355416 +
@@ -0,0 +1,2 @@
+%__appdata_provides%{_rpmconfigdir}/appdata.prov
+%__appdata_path^%{_datadir}/appdata/.*\\.appdata\\.xml$
--- ./scripts/Makefile.am.orig 2013-10-02 16:18:21.679355453 +
+++ ./scripts/Makefile.am 2013-10-02 16:18:42.750355416 +
@@ -19,7 +19,7 @@ EXTRA_DIST = \
find-php-provides find-php-requires \
mono-find-requires mono-find-provides \
ocaml-find-requires.sh ocaml-find-provides.sh \
- pkgconfigdeps.sh libtooldeps.sh \
+ pkgconfigdeps.sh libtooldeps.sh appdata.prov \
fontconfig.prov desktop-file.prov script.req \
sysvinitdeps.sh \
macros.perl macros.php macros.python
--- ./scripts/appdata.prov.orig 2013-10-02 16:18:42.750355416 +
+++ ./scripts/appdata.prov 2013-10-02 16:18:42.750355416 +
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Transform appdata xml file into RPM appdata(filename) provides
+#
+# Author: Michael Schroeder m...@suse.de
+# Based on other provides scripts from RPM
+
+OLD_IFS=$IFS
+while read instfile ; do
+ case $instfile in
+
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-09-27 19:48: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 2013-09-26 11:52:18.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-09-27
19:48:38.0 +0200
@@ -1,0 +2,6 @@
+Fri Sep 27 15:13:45 CEST 2013 - m...@suse.de
+
+- add selfconflicts.diff: fix self-conflicts and self-obsoletes
+ handling for verify operations [bnc#838133]
+
+---
New:
selfconflicts.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.jeIgBP/_old 2013-09-27 19:48:41.0 +0200
+++ /var/tmp/diff_new_pack.jeIgBP/_new 2013-09-27 19:48:41.0 +0200
@@ -139,6 +139,7 @@
Patch85:brp-compress-no-img.patch
Patch86:strpoolrehash.diff
Patch87:ignore_poolstr_dummy_entries.diff
+Patch88:selfconflicts.diff
Patch6464: auto-config-update-aarch64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -225,7 +226,7 @@
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
%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
+%patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88
%ifarch aarch64
%patch6464
%endif
++ selfconflicts.diff ++
From fae0eef24582dd9e071be8e884ff0851d4b57437 Mon Sep 17 00:00:00 2001
From: Michael Schroeder m...@suse.de
Date: Fri, 27 Sep 2013 15:09:20 +0200
Subject: [PATCH] Ignore self-obsoletes and self-conflicts in dependency check
code
We already ignored them when checking against the added package list,
but not when checking against installed packages. Thus, rpm -V reported
them as errors.
---
lib/depends.c | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git lib/depends.c lib/depends.c
index 3d70e68..3ef27bc 100644
--- lib/depends.c
+++ lib/depends.c
@@ -504,6 +504,12 @@ static int rpmdbProvides(rpmts ts, depCache dcache, rpmds
dep)
if (deptag != RPMTAG_OBSOLETENAME Name[0] == '/') {
mi = rpmtsPrunedIterator(ts, RPMDBI_INSTFILENAMES, Name, prune);
while ((h = rpmdbNextIterator(mi)) != NULL) {
+ /* Ignore self-conflicts */
+ if (deptag == RPMTAG_CONFLICTNAME) {
+ unsigned int instance = headerGetInstance(h);
+ if (instance instance == rpmdsInstance(dep))
+ continue;
+ }
rpmdsNotify(dep, (db files), rc);
break;
}
@@ -527,6 +533,12 @@ static int rpmdbProvides(rpmts ts, depCache dcache, rpmds
dep)
int prix = (selfevr) ? -1 : rpmdbGetIteratorFileNum(mi);
int match = rpmdsMatches(tspool, h, prix, dep, selfevr,
_rpmds_nopromote);
+ /* Ignore self-obsoletes and self-conflicts */
+ if (match (deptag == RPMTAG_OBSOLETENAME || deptag ==
RPMTAG_CONFLICTNAME)) {
+ unsigned int instance = headerGetInstance(h);
+ if (instance instance == rpmdsInstance(dep))
+ match = 0;
+ }
if (match) {
rpmdsNotify(dep, (db provides), rc);
break;
@@ -672,8 +684,18 @@ static void checkInstDeps(rpmts ts, depCache dcache, rpmte
te,
rpmstrPool pool = rpmtsPool(ts);
while ((h = rpmdbNextIterator(mi)) != NULL) {
- char * pkgNEVRA = headerGetAsString(h, RPMTAG_NEVRA);
- rpmds ds = rpmdsNewPool(pool, h, depTag, 0);
+ char * pkgNEVRA;
+ rpmds ds;
+
+ /* Ignore self-obsoletes and self-conflicts */
+ if (depTag == RPMTAG_OBSOLETENAME || depTag == RPMTAG_CONFLICTNAME) {
+ unsigned int instance = headerGetInstance(h);
+ if (instance instance == rpmteDBInstance(te))
+ continue;
+ }
+
+ pkgNEVRA = headerGetAsString(h, RPMTAG_NEVRA);
+ ds = rpmdsNewPool(pool, h, depTag, 0);
checkDS(ts, dcache, te, pkgNEVRA, ds, dep, 0);
--
1.8.1.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-09-26 11:52:17
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 2013-09-08 13:03:38.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-09-26
11:52:18.0 +0200
@@ -1,0 +2,13 @@
+Tue Sep 24 10:36:15 UTC 2013 - m...@bernhard-voelker.de
+
+- replace obsoleted find -perm +NNN syntax [bnc#842004]
+ to -perm /NNN in debugsource-package.diff and
+ finddebuginfo.diff.
+
+---
+Wed Sep 11 18:28:39 CEST 2013 - m...@suse.de
+
+- fix two bugs in the rpmstrPoolRehash() function:
+ adding strpoolrehash.diff and ignore_poolstr_dummy_entries.diff
+
+---
New:
ignore_poolstr_dummy_entries.diff
strpoolrehash.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.5gfgK9/_old 2013-09-26 11:52:20.0 +0200
+++ /var/tmp/diff_new_pack.5gfgK9/_new 2013-09-26 11:52:20.0 +0200
@@ -137,6 +137,8 @@
Patch83:debug_gdb_scripts.diff
Patch84:beedigest.diff
Patch85:brp-compress-no-img.patch
+Patch86:strpoolrehash.diff
+Patch87:ignore_poolstr_dummy_entries.diff
Patch6464: auto-config-update-aarch64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -223,7 +225,7 @@
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
%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
+%patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87
%ifarch aarch64
%patch6464
%endif
++ debugsource-package.diff ++
--- /var/tmp/diff_new_pack.5gfgK9/_old 2013-09-26 11:52:20.0 +0200
+++ /var/tmp/diff_new_pack.5gfgK9/_new 2013-09-26 11:52:20.0 +0200
@@ -31,9 +31,9 @@
$strict || strict_error=WARNING
-# Strip ELF binaries
--find $RPM_BUILD_ROOT ! -path ${debugdir}/*.debug -type f \( -perm +111 -or
-name *.so* -or -name *.ko \) -print 0 | sort -z |
+-find $RPM_BUILD_ROOT ! -path ${debugdir}/*.debug -type f \( -perm /111 -or
-name *.so* -or -name *.ko \) -print 0 | sort -z |
+# Strip ELF binaries (and no static libraries)
-+find $RPM_BUILD_ROOT ! -path ${debugdir}/*.debug -type f \( -perm +111 -or
-name *.so* -or -name *.ko \) ! -name *.a -print0 | sort -z |
++find $RPM_BUILD_ROOT ! -path ${debugdir}/*.debug -type f \( -perm /111 -or
-name *.so* -or -name *.ko \) ! -name *.a -print0 | sort -z |
xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' |
while read nlinks inum f; do
case $(objdump -h $f 2/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)')
in
++ finddebuginfo.diff ++
--- /var/tmp/diff_new_pack.5gfgK9/_old 2013-09-26 11:52:20.0 +0200
+++ /var/tmp/diff_new_pack.5gfgK9/_new 2013-09-26 11:52:20.0 +0200
@@ -39,7 +39,7 @@
- -print |
-file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped/\1/p' |
-xargs --no-run-if-empty stat -c '%h %D_%i %n' |
-+find $RPM_BUILD_ROOT ! -path ${debugdir}/*.debug -type f \( -perm +111 -or
-name *.so* -or -name *.ko \) -print 0 | sort -z |
++find $RPM_BUILD_ROOT ! -path ${debugdir}/*.debug -type f \( -perm /111 -or
-name *.so* -or -name *.ko \) -print 0 | sort -z |
+xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' |
while read nlinks inum f; do
+ case $(objdump -h $f 2/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)')
in
++ ignore_poolstr_dummy_entries.diff ++
--- build/rpmfc.c.orig 2013-09-11 17:13:39.165560997 +
+++ build/rpmfc.c 2013-09-11 17:13:52.171560974 +
@@ -848,6 +848,8 @@ rpmRC rpmfcApply(rpmfc fc)
previx = -1;
for (rpmsid id = 1; id = nddict; id++) {
s = rpmstrPoolStr(fc-ddict, id);
+ if (!s || !*s)
+ continue;
/* Parse out (file#,deptype,N,EVR,Flags) */
ix = strtol(s, se, 10);
++ strpoolrehash.diff ++
--- rpmio/rpmstrpool.c.orig 2013-09-11 15:33:48.371571600 +
+++ rpmio/rpmstrpool.c 2013-09-11 16:20:56.106566595 +
@@ -219,8 +219,17 @@ static void rpmstrPoolRehash(rpmstrPool
pool-hash = poolHashFree(pool-hash);
pool-hash = poolHashCreate(sizehint);
-for (int i = 1; i pool-offs_size; i++)
- poolHashAddEntry(pool, rpmstrPoolStr(pool, i), i);
+for (int i = 1; i = pool-offs_size; i++) {
+ /* this is a little bit tricky because we have to skip the
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-09-08 13:03: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 2013-09-04 14:04:51.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-09-08
13:03:38.0 +0200
@@ -1,0 +2,5 @@
+Thu Sep 5 12:01:51 UTC 2013 - sch...@linux-m68k.org
+
+- brp-compress-no-img.patch: don't compress image files
+
+---
New:
brp-compress-no-img.patch
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.NsLCaS/_old 2013-09-08 13:03:40.0 +0200
+++ /var/tmp/diff_new_pack.NsLCaS/_new 2013-09-08 13:03:40.0 +0200
@@ -136,6 +136,7 @@
Patch82:noposttrans.diff
Patch83:debug_gdb_scripts.diff
Patch84:beedigest.diff
+Patch85:brp-compress-no-img.patch
Patch6464: auto-config-update-aarch64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -222,7 +223,7 @@
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
%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
+%patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85
%ifarch aarch64
%patch6464
%endif
++ brp-compress-no-img.patch ++
--- scripts/brp-compress2013-09-02 19:00:09.0 +0200
+++ scripts/brp-compress2013-09-02 19:03:12.0 +0200
@@ -47,6 +47,7 @@ do
find $d -type f ! -name dir | while read f
do
[ -f $f ] || continue
+ case $(file $f) in *image data*) continue;; esac
case $f in
*.gz|*.Z)gunzip $f || check_for_hard_link $d $f; b=`echo $f |
sed -e 's/\.\(gz\|Z\)$//'`;;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-09-04 14:04:49
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 2013-08-05 20:39:51.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-09-04
14:04:51.0 +0200
@@ -1,0 +2,6 @@
+Thu Aug 29 17:49:27 CEST 2013 - m...@suse.de
+
+- add beedigest.diff to plug memory leaks and support DSA signatures
+ with hashes other than sha-1 (already upstream)
+
+---
New:
beedigest.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.GOTw7e/_old 2013-09-04 14:04:53.0 +0200
+++ /var/tmp/diff_new_pack.GOTw7e/_new 2013-09-04 14:04:53.0 +0200
@@ -135,6 +135,7 @@
Patch81:getauxval.diff
Patch82:noposttrans.diff
Patch83:debug_gdb_scripts.diff
+Patch84:beedigest.diff
Patch6464: auto-config-update-aarch64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -221,7 +222,7 @@
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
%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
+%patch -P 80 -P 81 -P 82 -P 83 -P 84
%ifarch aarch64
%patch6464
%endif
++ beedigest.diff ++
--- rpmio/digest.h.orig 2013-08-27 14:26:38.260872601 +
+++ rpmio/digest.h 2013-08-27 14:26:47.404872585 +
@@ -5,8 +5,7 @@
typedef struct pgpDigAlg_s * pgpDigAlg;
-typedef int (*setmpifunc)(pgpDigAlg digp,
- int num, const uint8_t *p, const uint8_t *pend);
+typedef int (*setmpifunc)(pgpDigAlg digp, int num, const uint8_t *p);
typedef int (*verifyfunc)(pgpDigAlg pgpkey, pgpDigAlg pgpsig,
uint8_t *hash, size_t hashlen, int hash_algo);
typedef void (*freefunc)(pgpDigAlg digp);
--- rpmio/digest_beecrypt.c.orig2013-08-27 14:26:38.260872601 +
+++ rpmio/digest_beecrypt.c 2013-08-29 15:45:42.754558355 +
@@ -198,66 +198,6 @@ int rpmDigestFinal(DIGEST_CTX ctx, void
return 0;
}
-/ helpers /
-
-static inline char * pgpHexCvt(char *t, const byte *s, int nbytes)
-{
-static char hex[] = 0123456789abcdef;
-while (nbytes-- 0) {
-unsigned int i;
-i = *s++;
-*t++ = hex[ (i 4) 0xf ];
-*t++ = hex[ (i ) 0xf ];
-}
-*t = '\0';
-return t;
-}
-
-static const char * pgpMpiHex(const byte *p, const byte *pend)
-{
-static char prbuf[2048];
-char *t = prbuf;
-int nbytes = pgpMpiLen(p) - 2;
-if (nbytes 1024 || nbytes pend - (p + 2))
- return NULL;
-t = pgpHexCvt(t, p+2, nbytes);
-return prbuf;
-}
-
-static int pgpHexSet(int lbits, mpnumber * mpn, const byte * p, const byte *
pend)
-{
-unsigned int mbits = pgpMpiBits(p);
-unsigned int nbits;
-unsigned int nbytes;
-char *t;
-unsigned int ix;
-
-nbits = (lbits mbits ? lbits : mbits);
-nbytes = ((nbits + 7) 3);
-t = xmalloc(2*nbytes+1);
-ix = 2 * ((nbits - mbits) 3);
-
-if (ix 0) memset(t, (int)'0', ix);
-strcpy(t+ix, pgpMpiHex(p, pend));
-(void) mpnsethex(mpn, t);
-t = _free(t);
-return 0;
-}
-
-static void pgpFreeSigRSADSA(pgpDigAlg sa)
-{
-if (sa-data)
- free(sa-data);
-sa-data = 0;
-}
-
-static void pgpFreeKeyRSADSA(pgpDigAlg sa)
-{
-if (sa-data)
- free(sa-data);
-sa-data = 0;
-}
-
/** RSA **/
@@ -267,45 +207,73 @@ struct pgpDigSigRSA_s {
struct pgpDigKeyRSA_s {
rsapk rsa_pk;
+int nbytes;
};
-static int pgpSetSigMpiRSA(pgpDigAlg pgpsig, int num,
- const uint8_t *p, const uint8_t *pend)
+static int pgpSetSigMpiRSA(pgpDigAlg pgpsig, int num, const uint8_t *p)
{
struct pgpDigSigRSA_s *sig = pgpsig-data;
+int mlen = pgpMpiLen(p) - 2;
int rc = 1;
+if (!sig)
+ sig = pgpsig-data = xcalloc(1, sizeof(*sig));
+
switch (num) {
case 0:
- sig = pgpsig-data = xcalloc(1, sizeof(*sig));
- (void) mpnsethex(sig-c, pgpMpiHex(p, pend));
- rc = 0;
+ if (!mpnsetbin(sig-c, p + 2, mlen))
+ rc = 0;
break;
}
return rc;
}
-static int pgpSetKeyMpiRSA(pgpDigAlg pgpkey, int num,
- const uint8_t *p, const uint8_t *pend)
+static int
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-08-05 20:39:49
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 2013-08-01 17:15:09.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-08-05
20:39:51.0 +0200
@@ -1,0 +2,6 @@
+Mon Aug 5 15:45:38 UTC 2013 - dmuel...@suse.com
+
+- weakdeps.diff: readd support for recommends, suggests, enhances
+ supplements
+
+---
Other differences:
--
rpm-python.spec: same change
rpm.spec: same change
++ weakdeps.diff ++
--- /var/tmp/diff_new_pack.YnckxS/_old 2013-08-05 20:39:53.0 +0200
+++ /var/tmp/diff_new_pack.YnckxS/_new 2013-08-05 20:39:53.0 +0200
@@ -7,16 +7,16 @@
tags because I wanted to be compatible. The point is that
applications that don't know about the new MISSINGOK semantics
will mis-interpret the provides/requires otherwise, which
- I deemed to risky.
+ I deemed too risky.
B) use RPMSENSE_STRONG to support a strong version, Recommends
instead of Suggests and Supplements instead of Enhances.
Needs extcond.diff for query operations.
./build/parsePreamble.c.orig 2013-06-27 09:28:49.0 +
-+++ ./build/parsePreamble.c2013-07-12 11:32:45.0 +
-@@ -341,6 +341,8 @@ static struct tokenBits_s const installS
+--- build/parsePreamble.c
build/parsePreamble.c
+@@ -341,6 +341,8 @@
{ verify, RPMSENSE_SCRIPT_VERIFY },
{ pretrans, RPMSENSE_PRETRANS },
{ posttrans,RPMSENSE_POSTTRANS },
@@ -25,7 +25,7 @@
{ NULL, 0 }
};
-@@ -795,6 +797,18 @@ static rpmRC handlePreambleTag(rpmSpec s
+@@ -795,6 +797,18 @@
if (parseRCPOT(spec, spec-sourcePackage, field, tag, 0, tagflags))
goto exit;
break;
@@ -44,7 +44,7 @@
case RPMTAG_EXCLUDEARCH:
case RPMTAG_EXCLUSIVEARCH:
case RPMTAG_EXCLUDEOS:
-@@ -903,6 +917,14 @@ static struct PreambleRec_s const preamb
+@@ -903,6 +917,14 @@
{RPMTAG_BUGURL, 0, 0, LEN_AND_STR(bugurl)},
{RPMTAG_COLLECTIONS, 0, 0, LEN_AND_STR(collections)},
{RPMTAG_ORDERFLAGS, 2, 0, LEN_AND_STR(orderwithrequires)},
@@ -59,9 +59,9 @@
{0, 0, 0, 0}
};
./build/parseReqs.c.orig 2013-06-10 15:55:10.0 +
-+++ ./build/parseReqs.c2013-07-12 11:32:45.0 +
-@@ -92,6 +92,18 @@ rpmRC parseRCPOT(rpmSpec spec, Package p
+--- build/parseReqs.c
build/parseReqs.c
+@@ -92,6 +92,18 @@
case RPMTAG_BUILDCONFLICTS:
nametag = RPMTAG_CONFLICTNAME;
break;
@@ -80,9 +80,9 @@
}
for (r = field; *r != '\0'; r = re) {
./build/reqprov.c.orig 2013-06-10 15:55:10.0 +
-+++ ./build/reqprov.c 2013-07-12 11:32:45.0 +
-@@ -81,6 +81,16 @@ int addReqProv(Package pkg, rpmTagVal ta
+--- build/reqprov.c
build/reqprov.c
+@@ -81,6 +81,18 @@
extra = Flags RPMSENSE_TRIGGER;
dsp = pkg-triggers;
break;
@@ -90,18 +90,31 @@
+ versiontag = RPMTAG_SUGGESTSVERSION;
+ flagtag = RPMTAG_SUGGESTSFLAGS;
+ extra = Flags _ALL_REQUIRES_MASK;
++ dsp = pkg-suggests;
+ break;
+case RPMTAG_ENHANCESNAME:
+ versiontag = RPMTAG_ENHANCESVERSION;
+ flagtag = RPMTAG_ENHANCESFLAGS;
+ extra = Flags _ALL_REQUIRES_MASK;
++ dsp = pkg-enhances;
+ break;
case RPMTAG_REQUIRENAME:
default:
tagN = RPMTAG_REQUIRENAME;
./build/rpmfc.c.orig 2013-06-10 15:55:10.0 +
-+++ ./build/rpmfc.c2013-07-12 11:32:45.0 +
-@@ -1087,6 +1087,12 @@ static struct DepMsg_s depMsgs[] = {
+--- build/rpmbuild_internal.h
build/rpmbuild_internal.h
+@@ -97,6 +97,8 @@
+ rpmds obsoletes;
+ rpmds triggers;
+ rpmds order;
++rpmds suggests;
++rpmds enhances;
+ rpmfi cpioList;
+ rpm_loff_t cpioArchiveSize;
+
+--- build/rpmfc.c
build/rpmfc.c
+@@ -1087,6 +1087,12 @@
{ Obsoletes, { %{?__find_obsoletes}, NULL, NULL, NULL },
RPMTAG_OBSOLETENAME, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS,
0, -1 },
@@ -114,7 +127,7 @@
{ NULL, { NULL, NULL, NULL, NULL }, 0, 0, 0, 0, 0 }
};
-@@ -1163,6 +1169,14 @@ static rpmRC rpmfcGenerateDependsHelper(
+@@ -1163,6 +1169,14 @@
continue;
tagflags = RPMSENSE_FIND_REQUIRES;
break;
@@ -129,9 +142,20 @@
default:
continue;
break;
./lib/formats.c.orig
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-08-01 17:15:08
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 2013-07-18 16:07:56.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-08-01
17:15:09.0 +0200
@@ -1,0 +2,5 @@
+Thu Aug 1 15:34:49 CEST 2013 - m...@suse.de
+
+- fix typo in .debug_gdb_scripts name [bnc#818502]
+
+---
New:
debug_gdb_scripts.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.MipWVr/_old 2013-08-01 17:15:10.0 +0200
+++ /var/tmp/diff_new_pack.MipWVr/_new 2013-08-01 17:15:10.0 +0200
@@ -134,6 +134,7 @@
Patch80:psm-errno.diff
Patch81:getauxval.diff
Patch82:noposttrans.diff
+Patch83:debug_gdb_scripts.diff
Patch6464: auto-config-update-aarch64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -220,7 +221,7 @@
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
%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
+%patch -P 80 -P 81 -P 82 -P 83
%ifarch aarch64
%patch6464
%endif
++ debug_gdb_scripts.diff ++
--- tools/debugedit.c.orig 2013-08-01 13:32:47.885854357 +
+++ tools/debugedit.c 2013-08-01 13:33:37.028854270 +
@@ -270,7 +270,7 @@ static struct
{ .debug_ranges, NULL, NULL, 0, 0, 0 },
{ .debug_types, NULL, NULL, 0, 0, 0 },
{ .debug_macro, NULL, NULL, 0, 0, 0 },
-{ .debug_gdb_script, NULL, NULL, 0, 0, 0 },
+{ .debug_gdb_scripts, NULL, NULL, 0, 0, 0 },
{ NULL, NULL, NULL, 0, 0, 0 }
};
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-07-18 16:07:55
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm
Changes:
--- /work/SRC/openSUSE:Factory/rpm/python3-rpm.changes 2013-01-10
22:34:42.0 +0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/python3-rpm.changes 2013-07-18
16:07:56.0 +0200
@@ -1,0 +2,5 @@
+Fri Jul 12 15:36:43 CEST 2013 - m...@suse.de
+
+- update to rpm-4.11.1
+
+---
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2013-07-03 10:26:49.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-07-18
16:07:56.0 +0200
@@ -1,0 +2,20 @@
+Mon Jul 15 16:17:45 CEST 2013 - m...@suse.de
+
+- backport noposttrans.diff from rpm master [bnc#773575]
+
+---
+Fri Jul 12 15:36:43 CEST 2013 - m...@suse.de
+
+- update to rpm-4.11.1
+ * fix bogus file conflict on symlink permissions
+ * fix replaced files not getting reported at all during verification
+ * fix explicit file conflicts in installed packages being ignored
+ * fix multiple corner cases in config file handling
+ * fix disk-space accounting bugs
+ * report replacing directories with non-directories as file conflict
+- package rpmdb_* database tools
+- get rid of kernel symbol requires/provides, instead add simple
+ package provides/requires like in Fedora
+- delete files.diff patch, it caused more harm than good
+
+---
Old:
config-guess-sub-update.diff
debugedit-aarch64.diff
files.diff
psm-errno.patch
rpm-4.10.3.1.tar.bz2
rpm-beecrypt.diff
New:
getauxval.diff
noposttrans.diff
psm-errno.diff
rpm-4.11.1.tar.bz2
Other differences:
--
++ python3-rpm.spec ++
--- /var/tmp/diff_new_pack.yYCeCV/_old 2013-07-18 16:07:59.0 +0200
+++ /var/tmp/diff_new_pack.yYCeCV/_new 2013-07-18 16:07:59.0 +0200
@@ -17,7 +17,7 @@
Name: python3-rpm
-Version:4.10.3.1
+Version:4.11.1
Release:0
Summary:Python Bindings for Manipulating RPM Packages
License:GPL-2.0+
++ rpm-python.spec ++
--- /var/tmp/diff_new_pack.yYCeCV/_old 2013-07-18 16:07:59.0 +0200
+++ /var/tmp/diff_new_pack.yYCeCV/_new 2013-07-18 16:07:59.0 +0200
@@ -17,7 +17,7 @@
Name: rpm-python
-Version:4.10.3.1
+Version:4.11.1
Release:0
#!BuildIgnore: rpmlint-Factory
Summary:Python Bindings for Manipulating RPM Packages
++ rpm.spec ++
--- /var/tmp/diff_new_pack.yYCeCV/_old 2013-07-18 16:07:59.0 +0200
+++ /var/tmp/diff_new_pack.yYCeCV/_new 2013-07-18 16:07:59.0 +0200
@@ -47,9 +47,9 @@
Summary:The RPM Package Manager
License:GPL-2.0+
Group: System/Packages
-Version:4.10.3.1
+Version:4.11.1
Release:0
-Source: http://rpm.org/releases/rpm-4.10.x/rpm-%{version}.tar.bz2
+Source: http://rpm.org/releases/rpm-4.11.x/rpm-%{version}.tar.bz2
Source1:RPM-HOWTO.tar.bz2
Source2:RPM-Tips.html.tar.bz2
Source4:rpm-suse_macros
@@ -63,7 +63,6 @@
Patch1: beecrypt-4.1.2.diff
Patch2: db.diff
# quilt patches start here
-Patch10:rpm-beecrypt.diff
Patch11:debugedit.diff
Patch13:ignore-auxv.diff
Patch12:localetag.diff
@@ -93,7 +92,6 @@
Patch37:convertdb1static.diff
Patch38:build.diff
Patch39:modalias-kernel_module.diff
-Patch40:files.diff
Patch41:debugedit-comp-dir.diff
Patch42:perlprov.diff
Patch43:rpm-shorten-changelog.diff
@@ -133,9 +131,9 @@
Patch77:langnoc.diff
Patch78:headerchk2.diff
Patch79:helperenv.diff
-Patch80:config-guess-sub-update.diff
-Patch81:debugedit-aarch64.diff
-Patch82:psm-errno.patch
+Patch80:psm-errno.diff
+Patch81:getauxval.diff
+Patch82:noposttrans.diff
Patch6464: auto-config-update-aarch64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -213,15 +211,12 @@
ln -s db-4.8.30 db
ln -s beecrypt-4.1.2 beecrypt
chmod -R u+w db/*
-#tar xjf %{SOURCE12}
-#ln -s neon-0.24.7 neon
-# will get linked from db3
rm -f rpmdb/db.h
%patch -P 1 -P 2
-%patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
+%patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
%patch -P 20 -P 21 -P 22 -P 23 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
%patch -P 30 -P 31 -P 32 -P
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-07-03 10:26:47
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 2013-06-25 14:45:49.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-07-03
10:26:49.0 +0200
@@ -1,0 +2,10 @@
+Tue Jul 2 09:53:02 UTC 2013 - dmuel...@suse.com
+
+- extend the armv7hl hack also to armv6hl
+
+---
+Thu Jun 27 22:03:51 UTC 2013 - dmuel...@suse.com
+
+- add support for armv6hl target
+
+---
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.XOFmjG/_old 2013-07-03 10:26:50.0 +0200
+++ /var/tmp/diff_new_pack.XOFmjG/_new 2013-07-03 10:26:50.0 +0200
@@ -251,13 +251,11 @@
export CFLAGS=-g -O0 -fno-strict-aliasing -ffunction-sections
%endif
-%if %{_target_cpu}
%ifarch %arm
BUILDTARGET=--build=%{_target_cpu}-suse-linux-gnueabi
%else
BUILDTARGET=--build=%{_target_cpu}-suse-linux
%endif
-%endif
#cp -p /usr/share/gettext/config.rpath .
cp autogen.sh beecrypt
@@ -355,15 +353,10 @@
rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la
sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm
# On arm the kernel architecture is ignored. Not the best idea, but lets stay
compatible with other distros
-%ifarch armv7hl
-# rpm is using the host_cpu as default for the platform, but armv7hl is not
known by the kernel.
+%ifarch armv7hl armv6hl
+# rpm is using the host_cpu as default for the platform, but armv6/7hl is not
known by the kernel.
# so we need to enforce the platform here.
-# We don't want to use armv7l because it would make us incompatible to Fedora
and MeeGo plattforms.
-echo -n armv7hl-suse-linux %{buildroot}/etc/rpm/platform
-%endif
-%ifarch armv5tel
-# switch to armv5tel even when system cpu is armv7
-echo -n armv5tel-suse-linux %{buildroot}/etc/rpm/platform
+echo -n %{_target_cpu}-suse-linux-gnueabi %{buildroot}/etc/rpm/platform
%endif
%post
++ macrosin.diff ++
--- /var/tmp/diff_new_pack.XOFmjG/_old 2013-07-03 10:26:51.0 +0200
+++ /var/tmp/diff_new_pack.XOFmjG/_new 2013-07-03 10:26:51.0 +0200
@@ -284,7 +284,7 @@
#--
# arch macro for all supported ARM processors
-%arm armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv7l
-+%arm armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl
armv6l armv7l armv7hl
++%arm armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl
armv6l armv6hl armv7l armv7hl
+%arml armv3l armv4l armv5l armv5tel armv6l armv7l armv7hl
+%armb armv4b armv5b armv5teb
++ rpmrc.diff ++
--- /var/tmp/diff_new_pack.XOFmjG/_old 2013-07-03 10:26:51.0 +0200
+++ /var/tmp/diff_new_pack.XOFmjG/_new 2013-07-03 10:26:51.0 +0200
@@ -52,15 +52,17 @@
optflags: hppa1.0 -O2 -g -mpa-risc-1-0
optflags: hppa1.1 -O2 -g -mpa-risc-1-0
optflags: hppa1.2 -O2 -g -mpa-risc-1-0
-@@ -67,6 +68,7 @@
+@@ -66,7 +67,9 @@
+ optflags: armv5tel -O2 -g -march=armv5te
optflags: armv5tejl -O2 -g -march=armv5te
optflags: armv6l -O2 -g -march=armv6
++optflags: armv6hl -O2 -g -march=armv6 -mfloat-abi=hard -mabi=aapcs-linux
optflags: armv7l -O2 -g -march=armv7
+optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mthumb
-mabi=aapcs-linux
optflags: atarist -O2 -g -fomit-frame-pointer
optflags: atariste -O2 -g -fomit-frame-pointer
-@@ -76,12 +78,13 @@
+@@ -76,12 +79,13 @@
optflags: milan -O2 -g -fomit-frame-pointer
optflags: hades -O2 -g -fomit-frame-pointer
@@ -76,15 +78,17 @@
#
# Canonical arch names and numbers
-@@ -142,6 +145,7 @@
+@@ -141,7 +145,9 @@
+ arch_canon: armv5tel: armv5tel12
arch_canon: armv5tejl: armv5tejl 12
arch_canon: armv6l: armv6l12
++arch_canon: armv6hl: armv6hl 12
arch_canon: armv7l: armv7l12
+arch_canon: armv7hl: armv7hl 12
arch_canon: m68kmint: m68kmint 13
arch_canon: atarist: m68kmint 13
-@@ -166,6 +170,7 @@
+@@ -166,6 +172,7 @@
arch_canon: sh4: sh417
arch_canon: sh4a: sh4a 17
arch_canon: xtensa: xtensa 18
@@ -92,7 +96,7 @@
#
# Canonical OS names and numbers
-@@ -203,17 +208,17 @@
+@@ -203,17 +210,17 @@
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-06-25 07:48:10
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 2013-06-20 17:05:13.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-06-25
14:45:49.0 +0200
@@ -1,0 +2,5 @@
+Sun Jun 23 19:03:27 UTC 2013 - sch...@linux-m68k.org
+
+- psm-errno.patch: avoid losing errno from failures to unpack archive
+
+---
New:
psm-errno.patch
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.2ghCrP/_old 2013-06-25 14:45:50.0 +0200
+++ /var/tmp/diff_new_pack.2ghCrP/_new 2013-06-25 14:45:50.0 +0200
@@ -135,6 +135,7 @@
Patch79:helperenv.diff
Patch80:config-guess-sub-update.diff
Patch81:debugedit-aarch64.diff
+Patch82:psm-errno.patch
Patch6464: auto-config-update-aarch64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@@ -224,7 +225,7 @@
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
%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
+%patch -P 80 -P 81 -P 82
%ifarch aarch64
%patch6464
%endif
++ psm-errno.patch ++
Index: lib/psm.c
===
--- lib/psm.c
+++ lib/psm.c
@@ -807,6 +807,7 @@ static rpmRC rpmpsmStage(rpmpsm psm, pkg
case PSM_PROCESS:
if (psm-goal == PKG_INSTALL) {
int fsmrc = 0;
+ int saved_errno = 0;
rpmpsmNotify(psm, RPMCALLBACK_INST_START, 0);
/* make sure first progress call gets made */
@@ -826,6 +827,7 @@ static rpmRC rpmpsmStage(rpmpsm psm, pkg
fsmrc = rpmfsmRun(FSM_PKGINSTALL, psm-ts, psm-te, psm-fi,
payload, psm, NULL, psm-failedFile);
+ saved_errno = errno;
rpmswAdd(rpmtsOp(psm-ts, RPMTS_OP_UNCOMPRESS),
fdOp(payload, FDSTAT_READ));
@@ -843,6 +845,7 @@ static rpmRC rpmpsmStage(rpmpsm psm, pkg
rpmpsmNotify(psm, RPMCALLBACK_INST_STOP, psm-total);
if (fsmrc) {
+ errno = saved_errno;
rpmlog(RPMLOG_ERR,
_(unpacking of archive failed%s%s: %s\n),
(psm-failedFile != NULL ? _( on file ) : ),
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2013-06-20 15:48:24 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 2013-05-27 09:59:03.0 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-06-20 17:05:13.0 +0200 @@ -1,0 +2,11 @@ +Thu Jun 20 13:47:46 UTC 2013 - co...@suse.com + +- use gettext-devel instead of real package name gettext-tools + to use the (for bootstrapping) preferred gettext-tools-mini + +--- +Thu Jun 20 09:46:47 UTC 2013 - co...@suse.com + +- add systemd-rpm-macros to essential list + +--- Other differences: -- rpm-python.spec: same change ++ rpm.spec ++ --- /var/tmp/diff_new_pack.qgJtbm/_old 2013-06-20 17:05:15.0 +0200 +++ /var/tmp/diff_new_pack.qgJtbm/_new 2013-06-20 17:05:15.0 +0200 @@ -22,7 +22,7 @@ BuildRequires: file-devel BuildRequires: findutils BuildRequires: gcc -BuildRequires: gettext-tools +BuildRequires: gettext-devel BuildRequires: glibc-devel BuildRequires: gzip BuildRequires: libacl-devel @@ -190,6 +190,7 @@ Requires: patch Requires: perl-base Requires: sed +Requires: systemd-rpm-macros Requires: tar Requires: util-linux Requires: which -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2013-05-27 09:59:02 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 2013-05-16 11:30:44.0 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-05-27 09:59:03.0 +0200 @@ -1,0 +2,5 @@ +Sun May 19 14:05:14 UTC 2013 - sch...@suse.de + +- auto-config-update-aarch64.diff: increase level to 8 + +--- Other differences: -- rpm-python.spec: same change rpm.spec: same change ++ auto-config-update-aarch64.diff ++ --- /var/tmp/diff_new_pack.uMyJNb/_old 2013-05-27 09:59:05.0 +0200 +++ /var/tmp/diff_new_pack.uMyJNb/_new 2013-05-27 09:59:05.0 +0200 @@ -12,7 +12,7 @@ +char* buf = strdup( +ref=/usr/lib/rpm\n +for s in guess sub; do\n -+for c in $(find -maxdepth 5 -name \config.$s\); 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 + done\n -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-05-16 11:30:43
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 2013-05-07 15:42:40.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-05-16
11:30:44.0 +0200
@@ -1,0 +2,11 @@
+Wed May 8 22:25:09 UTC 2013 - sch...@suse.de
+
+- Remove unused files
+
+---
+Wed May 8 14:56:15 UTC 2013 - dmuel...@suse.com
+
+- auto-config-update-aarch64.diff:
+ * search up to 5 levels for interesting files to patch
+
+---
Old:
hack-setup-macro.diff
rpm-4.10.2.tar.bz2
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.cUeGBa/_old 2013-05-16 11:30:46.0 +0200
+++ /var/tmp/diff_new_pack.cUeGBa/_new 2013-05-16 11:30:46.0 +0200
@@ -60,7 +60,6 @@
Source10: beecrypt-4.1.2.tar.bz2
Source11: db-4.8.30.tar.bz2
Source12: baselibs.conf
-Source6464: auto-config-update-aarch64.diff
Patch1: beecrypt-4.1.2.diff
Patch2: db.diff
# quilt patches start here
@@ -136,6 +135,7 @@
Patch79:helperenv.diff
Patch80:config-guess-sub-update.diff
Patch81:debugedit-aarch64.diff
+Patch6464: auto-config-update-aarch64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# avoid bootstrapping problem
++ auto-config-update-aarch64.diff ++
--- /var/tmp/diff_new_pack.cUeGBa/_old 2013-05-16 11:30:46.0 +0200
+++ /var/tmp/diff_new_pack.cUeGBa/_new 2013-05-16 11:30:46.0 +0200
@@ -12,7 +12,7 @@
+char* buf = strdup(
+ref=/usr/lib/rpm\n
+for s in guess sub; do\n
-+for c in $(find -maxdepth 3 -name \config.$s\); do\n
++for c in $(find -maxdepth 5 -name \config.$s\); do\n
+ grep -q config-patches@ $c || continue\n
+ grep -q aarch64 $c || install -m 755 $ref/config.$s
$c\n
+ done\n
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-04-18 10:43:29
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2013-03-30 14:54:30.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-04-18
10:43:31.0 +0200
@@ -1,0 +2,14 @@
+Fri Apr 5 18:47:53 UTC 2013 - dmuel...@suse.com
+
+- update to 4.10.3.1:
+ * Fix install-regression introduced in RPM 4.10.0 which can
+ cause creation of real files and directories skipped when
+ the path is shared with a %ghost.
+ * translation updates
+
+---
+Fri Apr 5 12:39:12 UTC 2013 - idon...@suse.com
+
+- Add Source URL, see https://en.opensuse.org/SourceUrls
+
+---
New:
rpm-4.10.3.1.tar.bz2
Other differences:
--
++ python3-rpm.spec ++
--- /var/tmp/diff_new_pack.LvgwNg/_old 2013-04-18 10:43:37.0 +0200
+++ /var/tmp/diff_new_pack.LvgwNg/_new 2013-04-18 10:43:37.0 +0200
@@ -17,7 +17,7 @@
Name: python3-rpm
-Version:4.10.2
+Version:4.10.3.1
Release:0
Summary:Python Bindings for Manipulating RPM Packages
License:GPL-2.0+
++ rpm-python.spec ++
--- /var/tmp/diff_new_pack.LvgwNg/_old 2013-04-18 10:43:37.0 +0200
+++ /var/tmp/diff_new_pack.LvgwNg/_new 2013-04-18 10:43:37.0 +0200
@@ -17,7 +17,7 @@
Name: rpm-python
-Version:4.10.2
+Version:4.10.3.1
Release:0
#!BuildIgnore: rpmlint-Factory
Summary:Python Bindings for Manipulating RPM Packages
++ rpm.spec ++
--- /var/tmp/diff_new_pack.LvgwNg/_old 2013-04-18 10:43:37.0 +0200
+++ /var/tmp/diff_new_pack.LvgwNg/_new 2013-04-18 10:43:37.0 +0200
@@ -47,9 +47,9 @@
Summary:The RPM Package Manager
License:GPL-2.0+
Group: System/Packages
-Version:4.10.2
+Version:4.10.3.1
Release:0
-Source: rpm-%{version}.tar.bz2
+Source: http://rpm.org/releases/rpm-4.10.x/rpm-%{version}.tar.bz2
Source1:RPM-HOWTO.tar.bz2
Source2:RPM-Tips.html.tar.bz2
Source4:rpm-suse_macros
++ rpm-beecrypt.diff ++
--- /var/tmp/diff_new_pack.LvgwNg/_old 2013-04-18 10:43:37.0 +0200
+++ /var/tmp/diff_new_pack.LvgwNg/_new 2013-04-18 10:43:37.0 +0200
@@ -10,7 +10,7 @@
/* Define to 1 if you have the bzlib.h header file. */
#undef HAVE_BZLIB_H
-@@ -203,6 +206,10 @@
+@@ -206,6 +209,10 @@
*/
#undef LT_OBJDIR
@@ -21,7 +21,7 @@
/* Define to 1 if `major', `minor', and `makedev' are declared in mkdev.h.
*/
#undef MAJOR_IN_MKDEV
-@@ -287,6 +294,9 @@
+@@ -290,6 +297,9 @@
/* Build with acl support? */
#undef WITH_ACL
@@ -634,7 +634,7 @@
librpmio_la_SOURCES += digest_nss.c
+endif
- librpmio_la_LDFLAGS = -version-info 3:2:0
+ librpmio_la_LDFLAGS = -version-info 3:3:0
librpmio_la_LIBADD = \
../misc/libmisc.la \
@WITH_NSS_LIB@ \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2013-03-30 14:54:25 Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) Package is rpm, Maintainer is m...@suse.com Changes: rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2013-03-26 12:05:30.0 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-03-30 14:54:30.0 +0100 @@ -1,0 +2,5 @@ +Sat Mar 30 13:53:48 UTC 2013 - co...@suse.com + +- which is essential for man packages + +--- Other differences: -- rpm-python.spec: same change ++ rpm.spec ++ --- /var/tmp/diff_new_pack.N9hGNV/_old 2013-03-30 14:54:37.0 +0100 +++ /var/tmp/diff_new_pack.N9hGNV/_new 2013-03-30 14:54:37.0 +0100 @@ -191,6 +191,7 @@ Requires: sed Requires: tar Requires: util-linux +Requires: which Requires: xz # drop candidates Requires: cpio -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-03-26 12:05:28
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2013-02-25 20:44:23.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-03-26
12:05:30.0 +0100
@@ -1,0 +2,5 @@
+Mon Mar 25 13:38:45 UTC 2013 - sch...@suse.de
+
+- debugedit-aarch64.diff: handle aarch64 relocation
+
+---
New:
debugedit-aarch64.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.sIL3dR/_old 2013-03-26 12:05:35.0 +0100
+++ /var/tmp/diff_new_pack.sIL3dR/_new 2013-03-26 12:05:35.0 +0100
@@ -134,6 +134,7 @@
Patch78:headerchk2.diff
Patch79:helperenv.diff
Patch80:config-guess-sub-update.diff
+Patch81:debugedit-aarch64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# avoid bootstrapping problem
@@ -220,7 +221,7 @@
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
%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
+%patch -P 80 -P 81
cp config.guess config.sub db/dist/
cp config.guess config.sub beecrypt/
#chmod 755 scripts/find-supplements{,.ksyms}
++ debugedit-aarch64.diff ++
Index: tools/debugedit.c
===
--- tools/debugedit.c.orig
+++ tools/debugedit.c
@@ -1223,6 +1223,10 @@ edit_dwarf2 (DSO *dso)
if (rtype != R_ALPHA_REFLONG)
goto fail;
break;
+ case EM_AARCH64:
+ if (rtype != R_AARCH64_ABS32)
+ goto fail;
+ break;
default:
fail:
error (1, 0, %s: Unhandled relocation %d in .debug_info
section,
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2013-02-25 20:44:22
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2013-01-10 22:34:42.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-02-25
20:44:23.0 +0100
@@ -1,0 +2,10 @@
+Fri Feb 15 15:29:25 UTC 2013 - dmuel...@suse.com
+
+- add ignore-auxv.diff:
+ * avoid auxv parsing for any platform other than powerpc
+- add config-guess-sub-update.diff:
+ * update config.guess/sub for aarch64 support
+- update rpmrc.diff, build.diff:
+ * Support aarch64
+
+---
New:
config-guess-sub-update.diff
hack-setup-macro.diff
ignore-auxv.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.qLqS1B/_old 2013-02-25 20:44:27.0 +0100
+++ /var/tmp/diff_new_pack.qLqS1B/_new 2013-02-25 20:44:27.0 +0100
@@ -65,6 +65,7 @@
# quilt patches start here
Patch10:rpm-beecrypt.diff
Patch11:debugedit.diff
+Patch13:ignore-auxv.diff
Patch12:localetag.diff
Patch14:nameversioncompare.diff
Patch15:dbfsync.diff
@@ -132,6 +133,7 @@
Patch77:langnoc.diff
Patch78:headerchk2.diff
Patch79:helperenv.diff
+Patch80:config-guess-sub-update.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# avoid bootstrapping problem
@@ -211,13 +213,16 @@
# will get linked from db3
rm -f rpmdb/db.h
%patch -P 1 -P 2
-%patch -P 10 -P 11 -P 12 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
+%patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19
%patch -P 20 -P 21 -P 22 -P 23 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29
%patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39
%patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
%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
+cp config.guess config.sub db/dist/
+cp config.guess config.sub beecrypt/
#chmod 755 scripts/find-supplements{,.ksyms}
#chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
#chmod 755 scripts/firmware.prov
++ build.diff ++
--- /var/tmp/diff_new_pack.qLqS1B/_old 2013-02-25 20:44:27.0 +0100
+++ /var/tmp/diff_new_pack.qLqS1B/_new 2013-02-25 20:44:27.0 +0100
@@ -1,6 +1,6 @@
./db3/configure.orig 2012-03-20 08:07:25.0 +
-+++ ./db3/configure2012-06-01 12:55:07.0 +
-@@ -10,9 +10,9 @@ rm -f config.cache
+--- db3/configure
db3/configure
+@@ -10,9 +10,9 @@
# XXX edit CFLAGS= ... out of invocation args ???
ARGS=`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's%
--param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`
@@ -12,9 +12,22 @@
mv Makefile Makefile.orig
cat Makefile.orig | sed -e '/^install[:-]/c\
./installplatform.orig 2012-03-30 07:05:20.0 +
-+++ ./installplatform 2012-06-01 13:03:48.0 +
-@@ -118,6 +118,11 @@ for ARCH in noarch `grep ^arch_canon $RP
+--- installplatform
installplatform
+@@ -95,6 +95,12 @@
+ CANONARCH=arm
+ CANONCOLOR=0
+ ;;
++aarch64*)
++ ISANAME=aarchh
++ ISABITS=64
++ CANONARCH=aarch64
++ CANONCOLOR=3
++ ;;
+ alpha*)
+ ISANAME=alpha
+ ISABITS=64
+@@ -118,6 +124,11 @@
PPD=${DESTDIR}/${platformdir}/${ARCH}-${OS}
[ -d $PPD ] || mkdir -p $PPD
++ config-guess-sub-update.diff ++
1145 lines (skipped)
++ hack-setup-macro.diff ++
--- build/parsePrep.c.old
+++ build/parsePrep.c
@@ -351,6 +351,12 @@
appendStringBuf(spec-prep, getStringBuf(after));
+{
+char* buf = strdup(for f in config.guess config.sub; do test
/usr/share/automake-1.12/$f ln -sf /usr/share/automake-1.12/ $f; done);
+appendLineStringBuf(spec-prep, buf);
+free(buf);
+}
+
/* Fix the permissions of the setup build tree */
{ char *fix = rpmExpand(%{_fixperms} ., NULL);
if (fix *fix != '%') {
++ ignore-auxv.diff ++
--- lib/rpmrc.c
+++ lib/rpmrc.c
@@ -79,10 +79,12 @@
int localize;
};
+#if defined(__linux__) defined(__powerpc__)
static struct rpmat_s {
const char *platform;
uint64_t hwcap;
} rpmat;
+#endif
typedef struct defaultEntry_s {
char * name;
@@ -907,7 +909,7 @@
#endif
-#if
commit rpm for openSUSE:Factory
Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2013-01-10 22:34:41 Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) Package is rpm, Maintainer is m...@suse.com Changes: --- /work/SRC/openSUSE:Factory/rpm/python3-rpm.changes 2012-11-04 09:55:09.0 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/python3-rpm.changes 2013-01-10 22:34:42.0 +0100 @@ -1,0 +2,5 @@ +Wed Jan 2 14:25:09 UTC 2013 - dmuel...@suse.com + +- Update to 4.10.2 + +--- --- /work/SRC/openSUSE:Factory/rpm/rpm-python.changes 2012-04-23 16:13:04.0 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm-python.changes 2013-01-10 22:34:42.0 +0100 @@ -1,0 +2,5 @@ +Wed Jan 2 14:25:20 UTC 2013 - dmuel...@suse.com + +- Update to 4.10.2 + +--- --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-11-22 17:22:57.0 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2013-01-10 22:34:42.0 +0100 @@ -1,0 +2,46 @@ +Thu Jan 10 12:04:15 UTC 2013 - co...@suse.com + +- remove the macros that were documented to be removed january 2013: + %run_permissions, use %set_permissions instead + %run_suseconfig, SuSEconfig is gone + %suse_update_config + +--- +Wed Jan 2 13:46:17 UTC 2013 - dmuel...@suse.com + +- update to 4.10.2 (bnc#796375): + * Fix missing error code on unparseable signature in packages, + regression introduced in rpm 4.10.0. This could result in packages + with malformed signature falling through signature checking. + * Fix missing error code on --import on bogus key file (RhBug:869667) + * Fix installation of packages containing skipped hardlinks (RhBug:864622) + * Fix --setperms regression introduced in rpm 4.10.0 (RhBug:881835) + * Fix locale dependent behavior in rpm2cpio.sh (RhBug:878363) + * Add --undefine cli switch for undefining macros (related to RhBug:876308) + * Fix warnings when building with gcc = 4.7 + * Permit key imports on transactions where signature checking is + disabled, regression of sorts introduced in 4.10.0 (RhBug:856225) + * Fix RPMPROB_FILTER_FORCERELOCATE aka --badreloc, regression introduced in + 4.9.0 (RhBug:828784) + * Verify files from non-installed packages again, regression introduced + in 4.9.0 (RhBug:826589) + * Fix large ( 4GB) package support, regression introduced in + 4.9.0 (RhBug:844936) + * Only create the first instance of a file shared between multiple + packages on install (speedup + improved verification timestamp behavior) + * Report config and missinok flags too in deptype format extension + * Fix relative path handling in --whatprovides query + * Add --noclean and --nocheck options to rpmbuild (RhBug:756531) + * Permit non-existent %ghost directories to be packaged (RhBug:839656) + * Dont silence patch by default (RhBug:678000, RhBug:773503) + * Accept owner as an alias to user %verify attribute (RhBug:838657) + * Add power64 arch macro for all supported PowerPC 64 processors (RhBug:818320) + * Fix bogus unclosed %if error when %include is used in conditionals + * Report starting line for unclosed %if errors in spec + * Always print out package dependencies on build + * Restore pre-4.10.0 fdFree() behavior, ie return the fd itself while + references exist, returning NULL introduced fd leak regressions. +* Remove up-streamed patches: + - obsoletesdeptag.diff, fdopen_strncat.diff, powerpc-fix-platform.diff, missingok.diff + +--- Old: fdopen_strncat.diff fix-fd-leak.diff missingok.diff obsoletesdeptag.diff powerpc-fix-platform.diff rpm-4.10.0.tar.bz2 New: rpm-4.10.2.tar.bz2 Other differences: -- ++ python3-rpm.spec ++ --- /var/tmp/diff_new_pack.yv1Rq9/_old 2013-01-10 22:34:45.0 +0100 +++ /var/tmp/diff_new_pack.yv1Rq9/_new 2013-01-10 22:34:45.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-rpm # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python3-rpm -Version:4.10.0 +Version:4.10.2 Release:0 Summary:Python Bindings for Manipulating RPM Packages License:GPL-2.0+ ++ rpm-python.spec ++ ---
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2012-11-22 17:22:55
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-11-12 12:39:44.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-11-22
17:22:57.0 +0100
@@ -1,0 +2,9 @@
+Tue Nov 20 18:47:06 UTC 2012 - dims...@opensuse.org
+
+- Change user_group_add macro to not invoke useradd and groupadd
+ with -o parameter. Non-unique does not make sense when not
+ passing -u/-g (useradd/groupadd) and fails on newer pwdutils/
+ shadowurils implementations. The macro does not allow for a
+ uid/gid being passed.
+
+---
Other differences:
--
rpm-python.spec: same change
rpm.spec: same change
++ macrosin.diff ++
--- /var/tmp/diff_new_pack.3qUzIH/_old 2012-11-22 17:23:00.0 +0100
+++ /var/tmp/diff_new_pack.3qUzIH/_new 2012-11-22 17:23:00.0 +0100
@@ -313,7 +313,7 @@
+%service_del_postun() %{restart_on_update %{1}}
+
+%user_group_add() \
-+/usr/sbin/groupadd -o -r %{1} 2/dev/null || :\
-+/usr/sbin/useradd -o -r -g %{1} -d %{2} -s %{3} -c %{4} %{1} 2/dev/null || :\
++/usr/sbin/groupadd -r %{1} 2/dev/null || :\
++/usr/sbin/useradd -r -g %{1} -d %{2} -s %{3} -c %{4} %{1} 2/dev/null || :\
+%{nil}
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2012-11-12 12:39:43 Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) Package is rpm, Maintainer is m...@suse.com Changes: rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-11-06 16:23:22.0 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-11-12 12:39:44.0 +0100 @@ -1,0 +2,12 @@ +Mon Nov 12 10:29:13 UTC 2012 - co...@suse.com + +- buildrequire rpm-build - it's ignored otherwise + +--- +Fri Nov 9 06:30:41 UTC 2012 - co...@suse.com + +- remove pwdutils and timezone from default essentials, timezone + is only required by very specific test suites, the builds happen + in UTC anyway - and pwdutils hides packaging bugs + +--- Other differences: -- rpm-python.spec: same change ++ rpm.spec ++ --- /var/tmp/diff_new_pack.OYEtps/_old 2012-11-12 12:39:48.0 +0100 +++ /var/tmp/diff_new_pack.OYEtps/_new 2012-11-12 12:39:48.0 +0100 @@ -38,6 +38,7 @@ BuildRequires: patch BuildRequires: perl-base BuildRequires: popt-devel +BuildRequires: rpm-build BuildRequires: xz-devel BuildRequires: zlib-devel #!BuildIgnore: rpmlint-Factory @@ -196,8 +197,6 @@ # drop candidates Requires: cpio Requires: file -Requires: pwdutils -Requires: timezone %description build If you want to build a rpm, you need this package. It provides rpmbuild -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2012-11-06 16:23:18
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-11-04 09:55:09.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-11-06
16:23:22.0 +0100
@@ -1,0 +2,5 @@
+Sun Nov 4 10:16:54 UTC 2012 - co...@suse.com
+
+- insserv is not required any more
+
+---
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.u2BFsE/_old 2012-11-06 16:23:26.0 +0100
+++ /var/tmp/diff_new_pack.u2BFsE/_new 2012-11-06 16:23:26.0 +0100
@@ -42,7 +42,7 @@
BuildRequires: zlib-devel
#!BuildIgnore: rpmlint-Factory
Provides: rpminst
-PreReq: %insserv_prereq %fillup_prereq
+PreReq: %fillup_prereq
Summary:The RPM Package Manager
License:GPL-2.0+
Group: System/Packages
@@ -368,9 +368,6 @@
# delete no longer maintained databases
rm -f var/lib/rpm/Filemd5s var/lib/rpm/Filedigests var/lib/rpm/Requireversion
var/lib/rpm/Provideversion
-%postun
-%{insserv_cleanup}
-
%files -f rpm.lang
%defattr(-,root,root)
%doc CHANGES.gz COPYING GROUPS
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2012-11-04 09:55:07
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/rpm/python3-rpm.changes 2012-09-23
17:13:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/python3-rpm.changes 2012-11-04
09:55:09.0 +0100
@@ -1,0 +2,5 @@
+Sun Nov 4 08:54:25 UTC 2012 - co...@suse.com
+
+- fix build
+
+---
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-10-29 20:15:22.0
+0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-11-04
09:55:09.0 +0100
@@ -1,0 +2,11 @@
+Sun Nov 4 08:53:46 UTC 2012 - co...@suse.com
+
+- extend the list of build essentials - 4 drop candidates
+
+---
+Sun Nov 4 07:56:25 UTC 2012 - co...@suse.com
+
+- glibc-locale is build essential too - too many things go wrong
+ without locales
+
+---
Other differences:
--
++ python3-rpm.spec ++
--- /var/tmp/diff_new_pack.o6obrN/_old 2012-11-04 09:55:13.0 +0100
+++ /var/tmp/diff_new_pack.o6obrN/_new 2012-11-04 09:55:13.0 +0100
@@ -19,7 +19,6 @@
Name: python3-rpm
Version:4.10.0
Release:0
-#!BuildIgnore: rpmlint-Factory
Summary:Python Bindings for Manipulating RPM Packages
License:GPL-2.0+
Group: System/Packages
@@ -40,7 +39,7 @@
BuildRequires: zlib-devel
Requires: rpm = %{version}
%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' %_sourcedir/rpm.spec)}
-%global with_python 1
+%global with_python 3
%description
The python3-rpm package contains a module that permits applications
++ rpm-python.spec ++
--- /var/tmp/diff_new_pack.o6obrN/_old 2012-11-04 09:55:13.0 +0100
+++ /var/tmp/diff_new_pack.o6obrN/_new 2012-11-04 09:55:13.0 +0100
@@ -41,7 +41,7 @@
Requires: rpm = %{version}
%py_requires
%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' %_sourcedir/rpm.spec)}
-%global with_python 1
+%global with_python 2
%description
The rpm-python package contains a module that permits applications
++ rpm.spec ++
--- /var/tmp/diff_new_pack.o6obrN/_old 2012-11-04 09:55:13.0 +0100
+++ /var/tmp/diff_new_pack.o6obrN/_new 2012-11-04 09:55:13.0 +0100
@@ -174,20 +174,30 @@
# SUSE's build essentials
Requires: binutils
Requires: bzip2
+Requires: coreutils
+Requires: diffutils
Requires: file
Requires: findutils
Requires: gawk
Requires: gcc
Requires: gettext-tools
Requires: glibc-devel
+Requires: glibc-locale
+Requires: grep
Requires: gzip
Requires: make
Requires: net-tools
Requires: patch
Requires: perl-base
+Requires: sed
Requires: tar
Requires: util-linux
Requires: xz
+# drop candidates
+Requires: cpio
+Requires: file
+Requires: pwdutils
+Requires: timezone
%description build
If you want to build a rpm, you need this package. It provides rpmbuild
@@ -250,7 +260,10 @@
make %{?_smp_mflags}
popd
-./autogen.sh --disable-dependency-tracking --prefix=%{_prefix}
--mandir=%{_mandir} --infodir=%{_infodir} \
+export PYTHON=python%{with_python}
+autoreconf -fi
+sed -i -e 's,{PYTHON_VERSION}mu,{PYTHON_VERSION}mu python${PYTHON_VERSION}m,'
configure
+./configure --disable-dependency-tracking --prefix=%{_prefix}
--mandir=%{_mandir} --infodir=%{_infodir} \
--libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var --with-lua \
--with-vendor=suse \
--with-selinux --with-internal-beecrypt \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2012-10-29 20:13:42 Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) Package is rpm, Maintainer is m...@suse.com Changes: rpm-python.changes: same change --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-10-18 22:03:05.0 +0200 +++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-10-29 20:15:22.0 +0100 @@ -1,0 +2,5 @@ +Sun Oct 28 05:20:40 UTC 2012 - co...@suse.com + +- gawk and file are build essentials too + +--- Other differences: -- rpm-python.spec: same change ++ rpm.spec ++ --- /var/tmp/diff_new_pack.R9FlZa/_old 2012-10-29 20:15:24.0 +0100 +++ /var/tmp/diff_new_pack.R9FlZa/_new 2012-10-29 20:15:24.0 +0100 @@ -174,7 +174,9 @@ # SUSE's build essentials Requires: binutils Requires: bzip2 +Requires: file Requires: findutils +Requires: gawk Requires: gcc Requires: gettext-tools Requires: glibc-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2012-10-18 22:03:03
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-10-12 08:15:33.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-10-18
22:03:05.0 +0200
@@ -1,0 +2,7 @@
+Tue Oct 16 18:39:11 CEST 2012 - r...@suse.de
+
+- new patch: powerpc-fix-platform.diff
+ fix platform detection for ppc vs ppc64 (failed on ppc64 with
+ personality changed to ppc)
+
+---
New:
powerpc-fix-platform.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.cPJ0wY/_old 2012-10-18 22:03:06.0 +0200
+++ /var/tmp/diff_new_pack.cPJ0wY/_new 2012-10-18 22:03:06.0 +0200
@@ -135,6 +135,7 @@
Patch80:obsoletesdeptag.diff
Patch81:fdopen_strncat.diff
Patch82:fix-fd-leak.diff
+Patch83:powerpc-fix-platform.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# avoid bootstrapping problem
@@ -211,7 +212,7 @@
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
%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
+%patch -P 80 -P 81 -P 82 -P 83
#chmod 755 scripts/find-supplements{,.ksyms}
#chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
#chmod 755 scripts/firmware.prov
++ powerpc-fix-platform.diff ++
--- lib/rpmrc.c 2012/10/16 16:37:34 1.1
+++ lib/rpmrc.c 2012/10/16 16:38:10
@@ -1091,7 +1091,7 @@
# if defined(__linux__) defined(__powerpc__)
{
int powerlvl;
-if (sscanf(rpmat.platform, power%d, powerlvl) == 1 powerlvl
6)
+if (!rstreq(un.machine, ppc) sscanf(rpmat.platform,
power%d, powerlvl) == 1 powerlvl 6)
strcpy(un.machine, ppc64p7);
}
# endif /* ppc64*-linux */
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2012-10-12 08:10:46
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-09-27 10:29:18.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-10-12
08:15:33.0 +0200
@@ -1,0 +2,5 @@
+Wed Oct 10 07:03:41 UTC 2012 - adr...@suse.de
+
+- follow armv5tel architecture switch from armv5el
+
+---
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.xxwbwB/_old 2012-10-12 08:15:34.0 +0200
+++ /var/tmp/diff_new_pack.xxwbwB/_new 2012-10-12 08:15:34.0 +0200
@@ -228,7 +228,7 @@
%build
export CFLAGS=%{optflags} -ffunction-sections
export LDFLAGS=-Wl,-Bsymbolic-functions -ffunction-sections
-%ifarch alpha armv5tel
+%ifarch alpha
export CFLAGS=-g -O0 -fno-strict-aliasing -ffunction-sections
%endif
@@ -329,14 +329,14 @@
rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la
sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm
# On arm the kernel architecture is ignored. Not the best idea, but lets stay
compatible with other distros
-%ifarch armv7hl armv7l
+%ifarch armv7hl
# rpm is using the host_cpu as default for the platform, but armv7hl is not
known by the kernel.
# so we need to enforce the platform here.
# We don't want to use armv7l because it would make us incompatible to Fedora
and MeeGo plattforms.
echo -n armv7hl-suse-linux %{buildroot}/etc/rpm/platform
%endif
-%ifarch armv5el
-# switch to armv5tel on armv5el
+%ifarch armv5tel
+# switch to armv5tel even when system cpu is armv7
echo -n armv5tel-suse-linux %{buildroot}/etc/rpm/platform
%endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2012-09-26 16:27:08
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-09-22 09:25:20.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-09-26
16:27:10.0 +0200
@@ -1,0 +2,8 @@
+Mon Sep 24 11:43:13 UTC 2012 - co...@suse.com
+
+- put an end date as echo into
+ %run_permissions
+ %run_suseconfig
+ %suse_update_config
+
+---
Other differences:
--
rpm-python.spec: same change
rpm.spec: same change
++ rpm-suse_macros ++
--- /var/tmp/diff_new_pack.Unej0M/_old 2012-09-26 16:27:18.0 +0200
+++ /var/tmp/diff_new_pack.Unej0M/_new 2012-09-26 16:27:18.0 +0200
@@ -13,7 +13,6 @@
%makeinstallmake DESTDIR=%{?buildroot:%{buildroot}} install
%insserv_prereq insserv sed
%fillup_prereq fillup coreutils grep diffutils
-%suseconfig_fonts_prereq perl aaa_base
%install_info_prereqinfo
# this script calls all scripts in /usr/lib/rpm/brp-suse.d
@@ -69,24 +68,15 @@
# deprecated, use %set_permissions instead
%run_permissions() \
+ echo WARNING: run_permissions is obsolete and will be removed january
2013
+ echo use set_permissions (available since 11.4) with a file argument
if test $YAST_IS_RUNNING != instsys ; then \
- if test -x /sbin/SuSEconfig -a -f
/sbin/conf.d/SuSEconfig.permissions ; then \
- /sbin/SuSEconfig --module permissions \
+ if [ -x /usr/bin/chkstat ]; then \
+ /usr/bin/chkstat -n --set --system \
fi \
fi \
%nil
-%run_suseconfig(m:) \
- %{!-m:echo -e \\nERROR: missing parameter for macro run_suseconfig\\n ;
exit 1 ; } \
- if test $YAST_IS_RUNNING != instsys ; then \
- if test -x /sbin/SuSEconfig -a -f /sbin/conf.d/SuSEconfig.%{-m*} ; then \
- /sbin/SuSEconfig --module %{-m*} \
- else \
- echo -e \\nWARNING: SuSEconfig or requested SuSEconfig module not
present!\\n ; \
- fi \
- fi \
- %nil
-
%set_permissions(f:) \
if [ -x /usr/bin/chkstat ]; then \
/usr/bin/chkstat -n --set --system %{**} \
@@ -97,11 +87,15 @@
/usr/bin/chkstat -n --warn --system %{**} 12 \
%nil
+%run_suseconfig(m:) \
+ %{!-m:echo -e \\nERROR: missing parameter for macro run_suseconfig\\n ;
exit 1 ; } \
+ echo WARNING: run_suseconfig is obsolete (as is SUSEconfig) and the macro
will be removed in january 2013 \
+ echo It will be a nop as SUSEconfig is gone \
+ %nil
+
# %{suse_update_config [-fcl] [dirs...]}
%suse_update_config(fcl) \
-echo 'WARNING: REMOVE %%suse_update_config. If your sources are really' \
-echo 'too old to cover current architectures, prefer autoreconf --force
--install' \
-autoreconf --force --install \
+echo 'WARNING: REMOVE %%suse_update_config. The macro will be removed in
january 2013' \
%nil
%suse_update_libdir() \
@@ -287,7 +281,7 @@
%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 1220
+%suse_version 1230
%sles_version 0
%ul_version 0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2012-09-23 17:13:54 Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new (New) Package is rpm, Maintainer is m...@suse.com Changes: --- /work/SRC/openSUSE:Factory/rpm/python3-rpm.changes 2012-01-25 11:09:28.0 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new/python3-rpm.changes 2012-09-23 17:13:57.0 +0200 @@ -1,0 +2,5 @@ +Sat Sep 22 13:24:30 UTC 2012 - idon...@suse.com + +- Update for rpm 4.10.0 + +--- rpm.changes: same change Other differences: -- ++ python3-rpm.spec ++ --- /var/tmp/diff_new_pack.JcA8AP/_old 2012-09-23 17:14:04.0 +0200 +++ /var/tmp/diff_new_pack.JcA8AP/_new 2012-09-23 17:14:04.0 +0200 @@ -17,7 +17,7 @@ Name: python3-rpm -Version:4.9.1.2 +Version:4.10.0 Release:0 #!BuildIgnore: rpmlint-Factory Summary:Python Bindings for Manipulating RPM Packages rpm.spec: same change -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2012-07-19 17:59:29
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-07-09 13:31:11.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-07-19
17:59:31.0 +0200
@@ -1,0 +2,10 @@
+Thu Jul 19 08:52:02 UTC 2012 - co...@suse.com
+
+- add tar to the rpm build essentials
+
+---
+Wed Jul 18 15:52:25 UTC 2012 - co...@suse.com
+
+- add an -r option to %lang_package (bnc#513786)
+
+---
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.gGIvR2/_old 2012-07-19 17:59:36.0 +0200
+++ /var/tmp/diff_new_pack.gGIvR2/_new 2012-07-19 17:59:36.0 +0200
@@ -190,6 +190,7 @@
Requires: make
Requires: patch
Requires: perl-base
+Requires: tar
Requires: xz
%description build
++ rpm-suse_macros ++
--- /var/tmp/diff_new_pack.gGIvR2/_old 2012-07-19 17:59:36.0 +0200
+++ /var/tmp/diff_new_pack.gGIvR2/_new 2012-07-19 17:59:36.0 +0200
@@ -320,11 +320,12 @@
%nil
# Template for lang sub-package.
-%lang_package(n:) \
+%lang_package(n:r:) \
%package %{-n:-n %{-n*}-}lang \
Summary: Languages for package %{name} \
Group: System/Localization \
Requires: %{-n:%{-n*}}%{!-n:%{name}} = %{version} \
+%{-r:Requires: %{-r*}} \
Provides: %{-n:%{-n*}}%{!-n:%{name}}-lang-all = %{version} \
Supplements: packageand(bundle-lang-other:%{-n:%{-n*}}%{!-n:%{name}}) \
BuildArch: noarch \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2012-07-09 13:31:08
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-06-15 16:31:36.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-07-09
13:31:11.0 +0200
@@ -1,0 +2,6 @@
+Wed Jul 4 18:04:54 CEST 2012 - fcro...@suse.com
+
+- Add systemctl daemon-reload call when installing initscript
+ (bnc#769973).
+
+---
Other differences:
--
rpm-python.spec: same change
rpm.spec: same change
++ rpm-suse_macros ++
--- /var/tmp/diff_new_pack.Ce1AvS/_old 2012-07-09 13:31:16.0 +0200
+++ /var/tmp/diff_new_pack.Ce1AvS/_new 2012-07-09 13:31:16.0 +0200
@@ -30,6 +30,7 @@
if test $FIRST_ARG -ge 1 ; then \
test -f /etc/sysconfig/services . /etc/sysconfig/services \
if test $YAST_IS_RUNNING != instsys -a
$DISABLE_RESTART_ON_UPDATE != yes ; then \
+ test -x /bin/systemctl /bin/systemctl daemon-reload
/dev/null 21 || : \
for service in %{?*} ; do \
/etc/init.d/$service try-restart /dev/null || : \
done \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2012-06-15 15:42:35
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-06-10 23:20:49.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-06-15
16:31:36.0 +0200
@@ -1,0 +2,5 @@
+Wed Jun 13 13:24:28 CEST 2012 - r...@suse.de
+
+- set suse_version to 1220
+
+---
Other differences:
--
rpm-python.spec: same change
rpm.spec: same change
++ rpm-suse_macros ++
--- /var/tmp/diff_new_pack.O5HW5I/_old 2012-06-15 16:31:39.0 +0200
+++ /var/tmp/diff_new_pack.O5HW5I/_new 2012-06-15 16:31:39.0 +0200
@@ -302,7 +302,7 @@
%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 1210
+%suse_version 1220
%sles_version 0
%ul_version 0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2012-06-10 23:20:29
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-05-10 15:13:18.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-06-10
23:20:49.0 +0200
@@ -1,0 +2,5 @@
+Thu May 24 20:42:30 UTC 2012 - adr...@suse.de
+
+- set armv5tel architecture (similar to armv7hl approach)
+
+---
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.XBnj3D/_old 2012-06-10 23:20:51.0 +0200
+++ /var/tmp/diff_new_pack.XBnj3D/_new 2012-06-10 23:20:51.0 +0200
@@ -334,12 +334,17 @@
rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la
sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm
-%ifarch armv7hl
+# On arm the kernel architecture is ignored. Not the best idea, but lets stay
compatible with other distros
+%ifarch armv7hl armv7l
# rpm is using the host_cpu as default for the platform, but armv7hl is not
known by the kernel.
# so we need to enforce the platform here.
# We don't want to use armv7l because it would make us incompatible to Fedora
and MeeGo plattforms.
echo -n armv7hl-suse-linux %{buildroot}/etc/rpm/platform
%endif
+%ifarch armv5el
+# switch to armv5tel on armv5el
+echo -n armv5tel-suse-linux %{buildroot}/etc/rpm/platform
+%endif
%post
%{fillup_only -an services}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2012-05-10 15:13:16
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
rpm-python.changes: same change
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-04-23 16:13:04.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-05-10
15:13:18.0 +0200
@@ -1,0 +2,5 @@
+Thu May 10 10:51:41 UTC 2012 - co...@suse.com
+
+- remove duplicated rb_ macros - they are in ruby
+
+---
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.wEnIte/_old 2012-05-10 15:13:22.0 +0200
+++ /var/tmp/diff_new_pack.wEnIte/_new 2012-05-10 15:13:22.0 +0200
@@ -160,6 +160,7 @@
%package devel
Summary:Include Files and Libraries mandatory for Development
+Group: System/Packages
Requires: rpm = %{version}
# for people confusing the one with the other
Recommends: rpm-build = %{version}
@@ -174,6 +175,7 @@
%package build
Summary:Tools and Scripts to create rpm packages
+Group: System/Packages
Requires: rpm = %{version}
Provides: rpm:%_bindir/rpmbuild
Provides: rpmbuild
++ rpm-suse_macros ++
--- /var/tmp/diff_new_pack.wEnIte/_old 2012-05-10 15:13:22.0 +0200
+++ /var/tmp/diff_new_pack.wEnIte/_new 2012-05-10 15:13:22.0 +0200
@@ -11,8 +11,6 @@
# package build macros
%make_install make install DESTDIR=%{?buildroot}
%makeinstallmake DESTDIR=%{?buildroot:%{buildroot}} install
-%rb_arch%(echo %{_host_cpu}-linux | sed -e s/i686/i586/ -e
s/armv5tel/armv4l/ -e s/hppa2.0/hppa/)
-%rb_ver %(/usr/bin/ruby -e 'puts VERSION.sub(/\\\.\\\d$/, )')
%insserv_prereq insserv sed
%fillup_prereq fillup coreutils grep diffutils
%suseconfig_fonts_prereq perl aaa_base
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit rpm for openSUSE:Factory
Hello community,
here is the log from the commit of package rpm for openSUSE:Factory checked in
at 2012-04-23 16:13:02
Comparing /work/SRC/openSUSE:Factory/rpm (Old)
and /work/SRC/openSUSE:Factory/.rpm.new (New)
Package is rpm, Maintainer is m...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/rpm/rpm-python.changes 2012-01-25
11:09:28.0 +0100
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm-python.changes 2012-04-23
16:13:04.0 +0200
@@ -1,0 +2,11 @@
+Mon Apr 23 11:16:26 CEST 2012 - m...@suse.de
+
+- modified capsule api diff to match rpm upstream
+
+---
+Wed Apr 11 16:54:02 UTC 2012 - klaussfre...@gmail.com
+
+- Fix usage of deprecated AsVoidPtr Python/C API,
+ replaced by Capsule API
+
+---
--- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2012-03-27 09:13:15.0
+0200
+++ /work/SRC/openSUSE:Factory/.rpm.new/rpm.changes 2012-04-23
16:13:04.0 +0200
@@ -1,0 +2,11 @@
+Fri Apr 20 14:40:50 CEST 2012 - m...@suse.de
+
+- fix some more crashes on malformed header data
+ [bnc#754281] [bnc#754284] [bnc#754285]
+- fix quoting in brp-python-hardlink [bnc#756087]
+- change env handling for supplements [bnc#741543]
+- fix _fix macros [bnc#728682]
+- fix obsoletes handling of installed packages [bnc#714724]
+- implement tilde support in version comparison [bnc#466994]
+
+---
New:
headerchk2.diff
helperenv.diff
instobscheck.diff
python-capsule-api.diff
pythonhardlink.diff
tilde.diff
Other differences:
--
rpm-python.spec: same change
++ rpm.spec ++
--- /var/tmp/diff_new_pack.NjMHBg/_old 2012-04-23 16:13:08.0 +0200
+++ /var/tmp/diff_new_pack.NjMHBg/_new 2012-04-23 16:13:08.0 +0200
@@ -138,6 +138,12 @@
Patch83:findlang-new-help-fix.diff
Patch84:langnoc.diff
Patch85:rpm-gcc47.patch
+Patch86:headerchk2.diff
+Patch87:pythonhardlink.diff
+Patch88:helperenv.diff
+Patch89:instobscheck.diff
+Patch90:tilde.diff
+Patch91:python-capsule-api.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
# avoid bootstrapping problem
@@ -154,7 +160,6 @@
%package devel
Summary:Include Files and Libraries mandatory for Development
-Group: System/Packages
Requires: rpm = %{version}
# for people confusing the one with the other
Recommends: rpm-build = %{version}
@@ -169,7 +174,6 @@
%package build
Summary:Tools and Scripts to create rpm packages
-Group: System/Packages
Requires: rpm = %{version}
Provides: rpm:%_bindir/rpmbuild
Provides: rpmbuild
@@ -211,7 +215,8 @@
%patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
%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
+%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
#chmod 755 scripts/find-supplements{,.ksyms}
#chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
#chmod 755 scripts/firmware.prov
++ fileattrs.diff ++
--- /var/tmp/diff_new_pack.NjMHBg/_old 2012-04-23 16:13:08.0 +0200
+++ /var/tmp/diff_new_pack.NjMHBg/_new 2012-04-23 16:13:08.0 +0200
@@ -37,9 +37,9 @@
--- /dev/null 1970-01-01 00:00:00.0 +
+++ fileattrs/ksyms.attr 2011-12-15 13:47:26.787456907 +0100
@@ -0,0 +1,4 @@
-+%__ksyms_provides %{__set_helper_env}%{_rpmconfigdir}/find-provides.ksyms
%name
-+%__ksyms_requires %{__set_helper_env}%{_rpmconfigdir}/find-requires.ksyms
%name
-+%__ksyms_supplements
%{__set_helper_env}%{_rpmconfigdir}/find-supplements.ksyms %name
++%__ksyms_provides %{_rpmconfigdir}/find-provides.ksyms %name
++%__ksyms_requires %{_rpmconfigdir}/find-requires.ksyms %name
++%__ksyms_supplements %{_rpmconfigdir}/find-supplements.ksyms %name
+%__ksyms_path (/lib/modules/.*\.ko(\.gz)?)|(/boot/vmlinu[xz].*)$
Index: fileattrs/Makefile.am
===
++ headerchk2.diff ++
--- lib/header.c.orig 2012-04-17 16:16:29.0 +
+++ lib/header.c2012-04-17 16:53:32.0 +
@@ -197,7 +197,7 @@ int headerVerifyInfo(int il, int dl, con
return i;
if (hdrchkAlign(info-type, info-offset))
return i;
- if (!negate hdrchkRange(dl, info-offset))
+ if (hdrchkRange(dl, info-offset))
return i;
if (hdrchkData(info-count))
return i;
@@
