diff --git a/dpkg.changes b/dpkg.changes index 07fc0d5..d2ba77c 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 27 12:31:08 UTC 2017 - tchvatal@suse.com + +- Version update to 1.18.23: + * Various fixes all around + * Refreshed patch update-alternatives-suse.patch + ------------------------------------------------------------------- Wed Sep 7 12:40:11 UTC 2016 - tchvatal@suse.com diff --git a/dpkg.spec b/dpkg.spec index c0525e7..bf2ce19 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -1,7 +1,7 @@ # # spec file for package dpkg # -# 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 @@ -18,7 +18,7 @@ %define admindir %{_localstatedir}/lib/rpm/ Name: dpkg -Version: 1.18.10 +Version: 1.18.23 Release: 0 Summary: Debian package management system License: GPL-2.0+ diff --git a/dpkg_1.18.10.tar.xz b/dpkg_1.18.10.tar.xz deleted file mode 100644 index b0b9b15..0000000 --- a/dpkg_1.18.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:025524da41ba18b183ff11e388eb8686f7cc58ee835ed7d48bd159c46a8b6dc5 -size 4645448 diff --git a/dpkg_1.18.23.tar.xz b/dpkg_1.18.23.tar.xz new file mode 100644 index 0000000..c0b7489 --- /dev/null +++ b/dpkg_1.18.23.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc08802a0cea2ccd0c10716bc71531ff9b9234dd454b83a59f71117a37f36923 +size 4516252 diff --git a/update-alternatives-suse.patch b/update-alternatives-suse.patch index 99cb0ba..987540d 100644 --- a/update-alternatives-suse.patch +++ b/update-alternatives-suse.patch @@ -1,8 +1,8 @@ -Index: dpkg-1.18.10/man/update-alternatives.1 +Index: dpkg-1.18.23/man/update-alternatives.man =================================================================== ---- dpkg-1.18.10.orig/man/update-alternatives.1 -+++ dpkg-1.18.10/man/update-alternatives.1 -@@ -33,7 +33,7 @@ update\-alternatives \- maintain symboli +--- dpkg-1.18.23.orig/man/update-alternatives.man ++++ dpkg-1.18.23/man/update-alternatives.man +@@ -34,7 +34,7 @@ update\-alternatives \- maintain symboli .SH DESCRIPTION .B update\-alternatives creates, removes, maintains and displays information about the symbolic @@ -11,7 +11,7 @@ Index: dpkg-1.18.10/man/update-alternatives.1 .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 @@ different editor, if desired, but makes +@@ -44,7 +44,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 @@ -20,7 +20,7 @@ Index: dpkg-1.18.10/man/update-alternatives.1 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 @@ installed, changed or removed, +@@ -83,10 +83,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 @@ -33,19 +33,10 @@ Index: dpkg-1.18.10/man/update-alternatives.1 .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 -@@ -190,7 +190,7 @@ containing the symlinks. - .TP - administrative directory - A directory, by default --.IR /var/lib/dpkg/alternatives , -+.IR /var/lib/rpm/alternatives , - containing - .BR update\-alternatives ' - state information. -Index: dpkg-1.18.10/utils/update-alternatives.c +Index: dpkg-1.18.23/utils/update-alternatives.c =================================================================== ---- dpkg-1.18.10.orig/utils/update-alternatives.c -+++ dpkg-1.18.10/utils/update-alternatives.c +--- dpkg-1.18.23.orig/utils/update-alternatives.c ++++ dpkg-1.18.23/utils/update-alternatives.c @@ -70,7 +70,7 @@ static int opt_force = 0; static void version(void) @@ -55,10 +46,10 @@ Index: dpkg-1.18.10/utils/update-alternatives.c printf("\n"); printf(_( -Index: dpkg-1.18.10/utils/Makefile.am +Index: dpkg-1.18.23/utils/Makefile.am =================================================================== ---- dpkg-1.18.10.orig/utils/Makefile.am -+++ dpkg-1.18.10/utils/Makefile.am +--- dpkg-1.18.23.orig/utils/Makefile.am ++++ dpkg-1.18.23/utils/Makefile.am @@ -25,8 +25,8 @@ update_alternatives_SOURCES = \ update-alternatives.c diff --git a/update-alternatives.changes b/update-alternatives.changes index 00b4c96..8b948e6 100644 --- a/update-alternatives.changes +++ b/update-alternatives.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 27 12:38:32 UTC 2017 - tchvatal@suse.com + +- Update to 1.18.23: + * Various small fixes and memleaks removed +- Make sure to generate manpage + ------------------------------------------------------------------- Wed Sep 7 12:41:35 UTC 2016 - tchvatal@suse.com diff --git a/update-alternatives.spec b/update-alternatives.spec index 38561b2..6b023d1 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -1,7 +1,7 @@ # # spec file for package update-alternatives # -# 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 @@ -18,7 +18,7 @@ %define admindir %{_localstatedir}/lib/rpm/ Name: update-alternatives -Version: 1.18.10 +Version: 1.18.23 Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0+ @@ -64,6 +64,7 @@ autoreconf -fvi make -C lib/compat %{?_smp_mflags} make -C utils/ %{?_smp_mflags} +make -C man/ %{?_smp_mflags} %install install -d -m 0755 %{buildroot}/%{_sbindir}/ @@ -92,7 +93,7 @@ done %dir %{_localstatedir}/lib/rpm/alternatives %{_sbindir}/alternatives %{_sbindir}/update-alternatives -%{_mandir}/man1/update-alternatives.1* +%{_mandir}/man1/update-alternatives.1%{ext_man} %ghost %{_localstatedir}/log/alternatives.log %changelog