From b8c0f0e219da61403ca17e6205f6b9a062df67f482272000376f7475a473f0c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 25 Mar 2016 09:50:39 +0000 Subject: [PATCH] - Version update to 1.18.4: * Various fixes from upstream debian, see changelog file distributed with the package * Refreshed patch update-alternatives-suse.patch - Update to the 1.18.4: * Rebase patch update-alternatives-suse.patch * Touch the gost file in post OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=28 --- dpkg.changes | 8 ++++++++ dpkg.spec | 4 ++-- dpkg_1.18.1.tar.xz | 3 --- dpkg_1.18.4.tar.xz | 3 +++ update-alternatives-suse.patch | 34 ++++++++++++++++++---------------- update-alternatives.changes | 7 +++++++ update-alternatives.spec | 7 ++++--- 7 files changed, 42 insertions(+), 24 deletions(-) delete mode 100644 dpkg_1.18.1.tar.xz create mode 100644 dpkg_1.18.4.tar.xz diff --git a/dpkg.changes b/dpkg.changes index 3e1320d..23661a6 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Mar 25 09:49:52 UTC 2016 - tchvatal@suse.com + +- Version update to 1.18.4: + * Various fixes from upstream debian, see changelog file distributed + with the package + * Refreshed patch update-alternatives-suse.patch + ------------------------------------------------------------------- Fri Jun 5 13:44:48 UTC 2015 - tchvatal@suse.com diff --git a/dpkg.spec b/dpkg.spec index 71d3848..6d17597 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -1,7 +1,7 @@ # # spec file for package dpkg # -# 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 @@ -18,7 +18,7 @@ %define admindir %{_localstatedir}/lib/rpm/ Name: dpkg -Version: 1.18.1 +Version: 1.18.4 Release: 0 Summary: Debian package management system License: GPL-2.0+ diff --git a/dpkg_1.18.1.tar.xz b/dpkg_1.18.1.tar.xz deleted file mode 100644 index 9d6fe8f..0000000 --- a/dpkg_1.18.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb26a97ca21c970cbe63a762125fe21f7437663badf6ce686589fe62650399da -size 4340240 diff --git a/dpkg_1.18.4.tar.xz b/dpkg_1.18.4.tar.xz new file mode 100644 index 0000000..001c6dc --- /dev/null +++ b/dpkg_1.18.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe89243868888ce715bf45861f26264f767d4e4dbd0d6f1a26ce60bbbbf106da +size 4377024 diff --git a/update-alternatives-suse.patch b/update-alternatives-suse.patch index d40a8e4..089f6f2 100644 --- a/update-alternatives-suse.patch +++ b/update-alternatives-suse.patch @@ -1,7 +1,8 @@ -diff -ur dpkg-1.16.7.orig/man/update-alternatives.1 dpkg-1.16.7/man/update-alternatives.1 ---- dpkg-1.16.7.orig/man/update-alternatives.1 2012-06-30 09:21:47.000000000 +0200 -+++ dpkg-1.16.7/man/update-alternatives.1 2012-07-07 00:38:09.628280915 +0200 -@@ -33,7 +33,7 @@ +Index: dpkg-1.18.4/man/update-alternatives.1 +=================================================================== +--- dpkg-1.18.4.orig/man/update-alternatives.1 ++++ dpkg-1.18.4/man/update-alternatives.1 +@@ -33,7 +33,7 @@ update\-alternatives \- maintain symboli .SH DESCRIPTION .B update\-alternatives creates, removes, maintains and displays information about the symbolic @@ -10,7 +11,7 @@ diff -ur dpkg-1.16.7.orig/man/update-alternatives.1 dpkg-1.16.7/man/update-alter .PP It is possible for several programs fulfilling the same or similar functions to be installed on a single system at the same time. -@@ -43,7 +43,7 @@ +@@ -43,7 +43,7 @@ different editor, if desired, but makes to make a good choice for an editor to invoke if the user has not specified a particular preference. .PP @@ -19,7 +20,7 @@ diff -ur dpkg-1.16.7.orig/man/update-alternatives.1 dpkg-1.16.7/man/update-alter A generic name in the filesystem is shared by all files providing interchangeable functionality. The alternatives system and the system administrator -@@ -82,10 +82,10 @@ +@@ -82,10 +82,10 @@ installed, changed or removed, is called to update information about that file in the alternatives system. .B update\-alternatives is usually called from the @@ -32,7 +33,7 @@ diff -ur dpkg-1.16.7.orig/man/update-alternatives.1 dpkg-1.16.7/man/update-alter .PP It is often useful for a number of alternatives to be synchronized, so that they are changed as a group; for example, when several versions -@@ -189,7 +189,7 @@ +@@ -190,7 +190,7 @@ containing the symlinks. .TP administrative directory A directory, by default @@ -41,19 +42,20 @@ diff -ur dpkg-1.16.7.orig/man/update-alternatives.1 dpkg-1.16.7/man/update-alter containing .BR update\-alternatives ' state information. -diff -ur dpkg-1.16.7.orig/utils/update-alternatives.c dpkg-1.16.7/utils/update-alternatives.c ---- dpkg-1.16.7.orig/utils/update-alternatives.c 2012-06-30 09:21:47.000000000 +0200 -+++ dpkg-1.16.7/utils/update-alternatives.c 2012-07-07 00:38:09.631281296 +0200 -@@ -68,7 +68,7 @@ - static char *pass_opts[MAX_OPTS]; - static int nb_opts = 0; +Index: dpkg-1.18.4/utils/update-alternatives.c +=================================================================== +--- dpkg-1.18.4.orig/utils/update-alternatives.c ++++ dpkg-1.18.4/utils/update-alternatives.c +@@ -63,7 +63,7 @@ static int opt_skip_auto = 0; + static int opt_verbose = 0; + static int opt_force = 0; -#define ALT_TMP_EXT ".dpkg-tmp" +#define ALT_TMP_EXT ".rpm-tmp" /* * Functions. -@@ -77,7 +77,7 @@ +@@ -72,7 +72,7 @@ static int opt_force = 0; static void version(void) { @@ -62,9 +64,9 @@ diff -ur dpkg-1.16.7.orig/utils/update-alternatives.c dpkg-1.16.7/utils/update-a printf("\n"); printf(_( -@@ -359,7 +359,7 @@ +@@ -354,7 +354,7 @@ admindir_init(void) + { const char *basedir, *dpkg_basedir; - char *admindir; - dpkg_basedir = getenv("DPKG_ADMINDIR"); + dpkg_basedir = getenv("RPM_ADMINDIR"); diff --git a/update-alternatives.changes b/update-alternatives.changes index 027d89e..4eb7667 100644 --- a/update-alternatives.changes +++ b/update-alternatives.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 25 09:47:24 UTC 2016 - tchvatal@suse.com + +- Update to the 1.18.4: + * Rebase patch update-alternatives-suse.patch + * Touch the gost file in post + ------------------------------------------------------------------- Fri Jun 5 07:44:29 UTC 2015 - tchvatal@suse.com diff --git a/update-alternatives.spec b/update-alternatives.spec index c394924..e8b118c 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -1,7 +1,7 @@ # # spec file for package update-alternatives # -# 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 @@ -18,7 +18,7 @@ %define admindir %{_localstatedir}/lib/rpm/ Name: update-alternatives -Version: 1.18.1 +Version: 1.18.4 Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0+ @@ -66,7 +66,8 @@ install -d -m 0755 %{buildroot}/%{_localstatedir}/log install -m 0755 utils/%{name} %{buildroot}/%{_sbindir} install -m 0644 man/%{name}.1 %{buildroot}/%{_mandir}/man1/ -touch %{buildroot}/%{_localstatedir}/log/%{name}.log +%post +touch %{_localstatedir}/log/%{name}.log %files %defattr(-,root,root,-)