From ab142c15b4263f067914244a78b3c020eb70cba98b27587437a37a5d99b0da5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 7 Sep 2016 12:31:49 +0000 Subject: [PATCH 1/2] - Use ls . instead of * to avoid error when nothing is in alternatives directory OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=40 --- update-alternatives.changes | 6 ++++++ update-alternatives.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/update-alternatives.changes b/update-alternatives.changes index 3115550..ce92997 100644 --- a/update-alternatives.changes +++ b/update-alternatives.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 7 12:31:05 UTC 2016 - tchvatal@suse.com + +- Use ls . instead of * to avoid error when nothing is in alternatives + directory + ------------------------------------------------------------------- Tue May 31 11:47:57 UTC 2016 - tchvatal@suse.com diff --git a/update-alternatives.spec b/update-alternatives.spec index bd3feba..2dd7193 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -77,7 +77,7 @@ install -m 0644 man/%{name}.1 %{buildroot}/%{_mandir}/man1/ touch %{_localstatedir}/log/alternatives.log # Fix broken alternatives list bnc#969171 cd %{_sysconfdir}/alternatives/ -for i in * ; do +for i in $(ls .) ; do # continue on errors but still print them out update-alternatives --auto $i || : done From 93e5bae1d992b49b524a247fa788f9b5f628d1f6e4a3e1940eb055e02e07f387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 7 Sep 2016 12:46:37 +0000 Subject: [PATCH 2/2] - Version update to 1.18.10: * Various few fixes, see changelog file in the package * Refresh patch update-alternatives-suse.patch * Remove patch dpkg-sparc.diff - Version update to 1.18.10: * Various few fixes, see changelog file in the package * Refresh patch update-alternatives-suse.patch * Remove patch dpkg-sparc.diff OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/dpkg?expand=0&rev=41 --- dpkg-sparc.diff | 25 ------------------- dpkg.changes | 8 ++++++ dpkg.spec | 13 +++++----- dpkg_1.18.10.tar.xz | 3 +++ dpkg_1.18.4.tar.xz | 3 --- update-alternatives-suse.patch | 45 ++++++++++++++++------------------ update-alternatives.changes | 8 ++++++ update-alternatives.spec | 13 ++++++---- 8 files changed, 55 insertions(+), 63 deletions(-) delete mode 100644 dpkg-sparc.diff create mode 100644 dpkg_1.18.10.tar.xz delete mode 100644 dpkg_1.18.4.tar.xz diff --git a/dpkg-sparc.diff b/dpkg-sparc.diff deleted file mode 100644 index 8900416..0000000 --- a/dpkg-sparc.diff +++ /dev/null @@ -1,25 +0,0 @@ -From: Jan Engelhardt -Date: 2013-07-03 11:48:39.034294424 +0200 -X-Upstream: General patch applicable for all distributions. - -cputable: support invocation via `./configure --host=sparcv9-linux-gnu` - -autoconf knows to handle sparc*, but the dpkg specific -m4/dpkg-arch.m4 does not. - ---- - cputable | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: dpkg-1.16.10/cputable -=================================================================== ---- dpkg-1.16.10.orig/cputable -+++ dpkg-1.16.10/cputable -@@ -37,5 +37,5 @@ sh3 sh3 sh3 32 little - sh3eb sh3eb sh3eb 32 big - sh4 sh4 sh4 32 little - sh4eb sh4eb sh4eb 32 big --sparc sparc sparc 32 big --sparc64 sparc64 sparc64 64 big -+sparc64 sparc64 sparc64.* 64 big -+sparc sparc sparc.* 32 big diff --git a/dpkg.changes b/dpkg.changes index 4faeaa7..07fc0d5 100644 --- a/dpkg.changes +++ b/dpkg.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 7 12:40:11 UTC 2016 - tchvatal@suse.com + +- Version update to 1.18.10: + * Various few fixes, see changelog file in the package + * Refresh patch update-alternatives-suse.patch + * Remove patch dpkg-sparc.diff + ------------------------------------------------------------------- Tue May 31 11:48:19 UTC 2016 - tchvatal@suse.com diff --git a/dpkg.spec b/dpkg.spec index 4f22309..c0525e7 100644 --- a/dpkg.spec +++ b/dpkg.spec @@ -18,7 +18,7 @@ %define admindir %{_localstatedir}/lib/rpm/ Name: dpkg -Version: 1.18.4 +Version: 1.18.10 Release: 0 Summary: Debian package management system License: GPL-2.0+ @@ -28,13 +28,14 @@ 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-UPSTREAM remove --utf8 since we only build En manpages. -Patch6: dpkg-sparc.diff # PATCH-FIX-SUSE: update if two alternatives have same priority bnc#969171 Patch7: 0001-In-case-of-equal-priority-rather-update.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libbz2-devel BuildRequires: libselinux-devel +BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: update-alternatives BuildRequires: xz @@ -79,10 +80,10 @@ Libraries and header files for dpkg. %prep %setup -q %patch1 -p1 -%patch6 -p1 %patch7 -p1 %build +autoreconf -fvi export CFLAGS="%{optflags}" export SELINUX_LIBS="-lselinux" %configure \ @@ -99,7 +100,7 @@ export SELINUX_LIBS="-lselinux" %ifarch x86_64 %define debarch amd64 %endif -%ifarch %ix86 +%ifarch %{ix86} %define debarch i386 %endif %ifarch ppc powerpc @@ -148,7 +149,7 @@ exit 0 %files %defattr(-,root,root) %doc ABOUT-NLS AUTHORS COPYING doc/triggers.txt NEWS README* THANKS TODO debian/changelog -%doc %{_mandir}/man*/* +%{_mandir}/man*/* %exclude %{_mandir}/man*/update-alternatives* %dir %{_sysconfdir}/dpkg %config(noreplace) %{_sysconfdir}/dpkg/* diff --git a/dpkg_1.18.10.tar.xz b/dpkg_1.18.10.tar.xz new file mode 100644 index 0000000..b0b9b15 --- /dev/null +++ b/dpkg_1.18.10.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:025524da41ba18b183ff11e388eb8686f7cc58ee835ed7d48bd159c46a8b6dc5 +size 4645448 diff --git a/dpkg_1.18.4.tar.xz b/dpkg_1.18.4.tar.xz deleted file mode 100644 index 001c6dc..0000000 --- a/dpkg_1.18.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 089f6f2..99cb0ba 100644 --- a/update-alternatives-suse.patch +++ b/update-alternatives-suse.patch @@ -1,7 +1,7 @@ -Index: dpkg-1.18.4/man/update-alternatives.1 +Index: dpkg-1.18.10/man/update-alternatives.1 =================================================================== ---- dpkg-1.18.4.orig/man/update-alternatives.1 -+++ dpkg-1.18.4/man/update-alternatives.1 +--- 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 .SH DESCRIPTION .B update\-alternatives @@ -42,20 +42,11 @@ Index: dpkg-1.18.4/man/update-alternatives.1 containing .BR update\-alternatives ' state information. -Index: dpkg-1.18.4/utils/update-alternatives.c +Index: dpkg-1.18.10/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. -@@ -72,7 +72,7 @@ static int opt_force = 0; +--- dpkg-1.18.10.orig/utils/update-alternatives.c ++++ dpkg-1.18.10/utils/update-alternatives.c +@@ -70,7 +70,7 @@ static int opt_force = 0; static void version(void) { @@ -64,12 +55,18 @@ Index: dpkg-1.18.4/utils/update-alternatives.c printf("\n"); printf(_( -@@ -354,7 +354,7 @@ admindir_init(void) - { - const char *basedir, *dpkg_basedir; +Index: dpkg-1.18.10/utils/Makefile.am +=================================================================== +--- dpkg-1.18.10.orig/utils/Makefile.am ++++ dpkg-1.18.10/utils/Makefile.am +@@ -25,8 +25,8 @@ update_alternatives_SOURCES = \ + update-alternatives.c -- dpkg_basedir = getenv("DPKG_ADMINDIR"); -+ dpkg_basedir = getenv("RPM_ADMINDIR"); - if (dpkg_basedir) - basedir = dpkg_basedir; - else + update_alternatives_CPPFLAGS = \ +- -DALT_TMP_EXT=\".dpkg-tmp\" \ +- -DADMINDIR_ENVVAR=\"DPKG_ADMINDIR\" \ ++ -DALT_TMP_EXT=\".rpm-tmp\" \ ++ -DADMINDIR_ENVVAR=\"RPM_ADMINDIR\" \ + $(AM_CPPFLAGS) + + update_alternatives_LDADD = \ diff --git a/update-alternatives.changes b/update-alternatives.changes index ce92997..00b4c96 100644 --- a/update-alternatives.changes +++ b/update-alternatives.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 7 12:41:35 UTC 2016 - tchvatal@suse.com + +- Version update to 1.18.10: + * Various few fixes, see changelog file in the package + * Refresh patch update-alternatives-suse.patch + * Remove patch dpkg-sparc.diff + ------------------------------------------------------------------- Wed Sep 7 12:31:05 UTC 2016 - tchvatal@suse.com diff --git a/update-alternatives.spec b/update-alternatives.spec index 2dd7193..38561b2 100644 --- a/update-alternatives.spec +++ b/update-alternatives.spec @@ -18,7 +18,7 @@ %define admindir %{_localstatedir}/lib/rpm/ Name: update-alternatives -Version: 1.18.4 +Version: 1.18.10 Release: 0 Summary: Maintain symbolic links determining default commands License: GPL-2.0+ @@ -27,14 +27,17 @@ 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 -Patch6: dpkg-sparc.diff # PATCH-FIX-SUSE: update if two alternatives have same priority bnc#969171 Patch7: 0001-In-case-of-equal-priority-rather-update.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: ncurses-devel +BuildRequires: pkgconfig BuildRequires: xz -Provides: alternatives = %{version} -Requires(post): update-alternatives Requires(post): coreutils +Requires(post): update-alternatives +Provides: alternatives = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,10 +54,10 @@ particular preference. %prep %setup -q -n dpkg-%{version} %patch0 -p1 -%patch6 -p1 %patch7 -p1 %build +autoreconf -fvi %configure \ --disable-silent-rules \ --with-admindir=%{admindir}