Hello community,
here is the log from the commit of package dpkg for openSUSE:Factory checked in
at 2016-09-12 13:21:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dpkg (Old)
and /work/SRC/openSUSE:Factory/.dpkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dpkg"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dpkg/dpkg.changes 2016-06-05
14:17:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dpkg.new/dpkg.changes 2016-09-12
13:21:24.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Sep 7 12:40:11 UTC 2016 - tchva...@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
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/dpkg/update-alternatives.changes 2016-06-05
14:17:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dpkg.new/update-alternatives.changes
2016-09-12 13:21:24.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Sep 7 12:41:35 UTC 2016 - tchva...@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 - tchva...@suse.com
+
+- Use ls . instead of * to avoid error when nothing is in alternatives
+ directory
+
+-------------------------------------------------------------------
Old:
----
dpkg-sparc.diff
dpkg_1.18.4.tar.xz
New:
----
dpkg_1.18.10.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dpkg.spec ++++++
--- /var/tmp/diff_new_pack.zIpT9y/_old 2016-09-12 13:21:25.000000000 +0200
+++ /var/tmp/diff_new_pack.zIpT9y/_new 2016-09-12 13:21:25.000000000 +0200
@@ -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 @@
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 @@
%prep
%setup -q
%patch1 -p1
-%patch6 -p1
%patch7 -p1
%build
+autoreconf -fvi
export CFLAGS="%{optflags}"
export SELINUX_LIBS="-lselinux"
%configure \
@@ -99,7 +100,7 @@
%ifarch x86_64
%define debarch amd64
%endif
-%ifarch %ix86
+%ifarch %{ix86}
%define debarch i386
%endif
%ifarch ppc powerpc
@@ -148,7 +149,7 @@
%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/*
++++++ update-alternatives.spec ++++++
--- /var/tmp/diff_new_pack.zIpT9y/_old 2016-09-12 13:21:25.000000000 +0200
+++ /var/tmp/diff_new_pack.zIpT9y/_new 2016-09-12 13:21:25.000000000 +0200
@@ -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 @@
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 @@
%prep
%setup -q -n dpkg-%{version}
%patch0 -p1
-%patch6 -p1
%patch7 -p1
%build
+autoreconf -fvi
%configure \
--disable-silent-rules \
--with-admindir=%{admindir}
@@ -77,7 +80,7 @@
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
++++++ dpkg_1.18.4.tar.xz -> dpkg_1.18.10.tar.xz ++++++
++++ 245234 lines of diff (skipped)
++++++ update-alternatives-suse.patch ++++++
--- /var/tmp/diff_new_pack.zIpT9y/_old 2016-09-12 13:21:28.000000000 +0200
+++ /var/tmp/diff_new_pack.zIpT9y/_new 2016-09-12 13:21:28.000000000 +0200
@@ -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 @@
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 @@
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
+
+ update_alternatives_CPPFLAGS = \
+- -DALT_TMP_EXT=\".dpkg-tmp\" \
+- -DADMINDIR_ENVVAR=\"DPKG_ADMINDIR\" \
++ -DALT_TMP_EXT=\".rpm-tmp\" \
++ -DADMINDIR_ENVVAR=\"RPM_ADMINDIR\" \
+ $(AM_CPPFLAGS)
-- dpkg_basedir = getenv("DPKG_ADMINDIR");
-+ dpkg_basedir = getenv("RPM_ADMINDIR");
- if (dpkg_basedir)
- basedir = dpkg_basedir;
- else
+ update_alternatives_LDADD = \
