From 0d1473e6992dfeac506dfe55605254e0c892f58c97c6c1ecc5f80e9adf763e0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 11 Dec 2017 09:54:46 +0000 Subject: [PATCH 1/2] Accepting request 555504 from CrossToolchain:avr OBS-URL: https://build.opensuse.org/request/show/555504 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=57 --- dpkg.changes | 5 +++++ dpkg.spec | 5 +++++ drop-tar-option.patch | 14 ++++++++++++++ update-alternatives.spec | 2 +- 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 drop-tar-option.patch diff --git a/dpkg.changes b/dpkg.changes index 9c19474..d6a1455 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Dec 9 09:03:19 UTC 2017 - kkaempf@suse.com + +- fix Leap 42.2,42.3 build: add drop-tar-option.patch + ------------------------------------------------------------------- Wed Nov 8 16:15:47 UTC 2017 - mpluskal@suse.com diff --git a/dpkg.spec b/dpkg.spec index 487d5ee..2d7bc15 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -27,6 +27,8 @@ Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version} Source3: sensible-editor # PATCH-FIX-OPENSUSE replace debian with opensuse. replace macros. update-alternatives temp directories' path and name from dpkg* to rpm*. Patch1: update-alternatives-suse.patch +# PATCH-FIX-SUSE: tar of Leap 42.{2,3} does not recognize --sort=name, --clamp-mtime options +Patch2: drop-tar-option.patch # PATCH-FIX-SUSE: update if two alternatives have same priority bnc#969171 Patch7: 0001-In-case-of-equal-priority-rather-update.patch BuildRequires: autoconf @@ -80,6 +82,9 @@ Libraries and header files for dpkg. %prep %setup -q %patch1 -p1 +%if 0%{?suse_version} == 1315 +%patch2 -p1 +%endif %patch7 -p1 %build diff --git a/drop-tar-option.patch b/drop-tar-option.patch new file mode 100644 index 0000000..10905ec --- /dev/null +++ b/drop-tar-option.patch @@ -0,0 +1,14 @@ +diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-dpkg-1.18.23/scripts/Dpkg/Source/Archive.pm ./scripts/Dpkg/Source/Archive.pm +--- ../orig-dpkg-1.18.23/scripts/Dpkg/Source/Archive.pm 2017-02-22 22:50:39.000000000 +0100 ++++ ./scripts/Dpkg/Source/Archive.pm 2017-12-09 09:59:34.985938649 +0100 +@@ -51,8 +51,8 @@ + my $mtime = $opts{source_date} // $ENV{SOURCE_DATE_EPOCH} || time; + # Call tar creation process + $spawn_opts{delete_env} = [ 'TAR_OPTIONS' ]; +- $spawn_opts{exec} = [ $Dpkg::PROGTAR, '-cf', '-', '--format=gnu', '--sort=name', +- '--mtime', "\@$mtime", '--clamp-mtime', '--null', ++ $spawn_opts{exec} = [ $Dpkg::PROGTAR, '-cf', '-', '--format=gnu', ++ '--mtime', "\@$mtime", '--null', + '--numeric-owner', '--owner=0', '--group=0', + @{$opts{options}}, '-T', '-' ]; + *$self->{pid} = spawn(%spawn_opts); diff --git a/update-alternatives.spec b/update-alternatives.spec index 228e2d0..36b8fa9 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -22,7 +22,7 @@ Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0+ Group: System/Management -URL: http://ftp.de.debian.org/debian/pool/main/d/dpkg/ +Url: http://ftp.de.debian.org/debian/pool/main/d/dpkg/ Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz Source3: sensible-editor Patch0: update-alternatives-suse.patch From 7a05a041559fcec66de800e5d1a00d1ab21a642efc6717d24bcd7d1e8f0914dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 13 Dec 2017 17:31:44 +0000 Subject: [PATCH 2/2] Accepting request 556721 from home:pluskalm:branches:system:packagemanager - Update test dependencies - Build localised manpages OBS-URL: https://build.opensuse.org/request/show/556721 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=58 --- dpkg.changes | 6 ++++++ dpkg.spec | 8 ++++++-- update-alternatives.spec | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dpkg.changes b/dpkg.changes index d6a1455..1812c2e 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 13 15:55:48 UTC 2017 - mpluskal@suse.com + +- Update test dependencies +- Build localised manpages + ------------------------------------------------------------------- Sat Dec 9 09:03:19 UTC 2017 - kkaempf@suse.com diff --git a/dpkg.spec b/dpkg.spec index 2d7bc15..e82fe35 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -22,7 +22,7 @@ Release: 0 Summary: Debian package management system License: GPL-2.0+ Group: System/Packages -Url: http://www.debian.org +URL: http://www.debian.org Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz Source3: sensible-editor # PATCH-FIX-OPENSUSE replace debian with opensuse. replace macros. update-alternatives temp directories' path and name from dpkg* to rpm*. @@ -39,17 +39,19 @@ BuildRequires: libmd-devel BuildRequires: libselinux-devel BuildRequires: libtool BuildRequires: ncurses-devel +BuildRequires: po4a BuildRequires: update-alternatives BuildRequires: xz-devel BuildRequires: zlib-devel BuildRequires: perl(Date::Parse) BuildRequires: perl(IO::String) +BuildRequires: perl(Test::Pod) +BuildRequires: perl(Test::Strict) Requires: cpio Requires: make Requires: patch Requires: update-alternatives Requires: perl(Date::Parse) -%{perl_requires} Requires(post): coreutils Recommends: perl(File::FcntlLock) Provides: deb = %{version} @@ -57,6 +59,7 @@ Obsoletes: deb < %{version} Provides: dpkg-dev = %{version} Provides: dpkg-doc = %{version} Provides: dselect = %{version} +%{perl_requires} %description This package contains tools for working with Debian packages. It makes @@ -149,6 +152,7 @@ done exit 0 %files lang -f %{name}.lang +%{_mandir}/??/man*/* %files %doc ABOUT-NLS AUTHORS COPYING doc/triggers.txt NEWS README* THANKS TODO debian/changelog diff --git a/update-alternatives.spec b/update-alternatives.spec index 36b8fa9..b5007e7 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -22,7 +22,7 @@ Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0+ Group: System/Management -Url: http://ftp.de.debian.org/debian/pool/main/d/dpkg/ +URL: http://ftp.de.debian.org/debian/pool/main/d/dpkg/ Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz Source3: sensible-editor Patch0: update-alternatives-suse.patch @@ -81,7 +81,7 @@ if [ -d var/lib/rpm/alternatives ]; then # We proceed even if no alternatives directory exists, such situation # occurs in buildroot environment (we can't buildrequire package # itself). - mv -f var/lib/rpm/alternatives/* /var/lib/alternatives/ || : + mv -f var/lib/rpm/alternatives/* %{_localstatedir}/lib/alternatives/ || : rmdir var/lib/rpm/alternatives ||: fi