testing/dpkg
SHA256
3
0
Fork 0
forked from pool/dpkg
Code Pull Requests Activity

Accepting request 425293 from system:packagemanager

Browse Source 
- 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

- Use ls . instead of * to avoid error when nothing is in alternatives
  directory

OBS-URL: https://build.opensuse.org/request/show/425293
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dpkg?expand=0&rev=18
This commit is contained in:
Dominique Leuenberger 2016-09-12 11:21:22 +00:00 committed by Git OBS Bridge
commit daaaa0a1c8
8 changed files with 62 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dpkg-sparc.diff
View File

@ -1,25 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
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

8
dpkg.changes
View File

@ -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

13
dpkg.spec
View File

@ -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/*

3
dpkg_1.18.10.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:025524da41ba18b183ff11e388eb8686f7cc58ee835ed7d48bd159c46a8b6dc5
size 4645448

3
dpkg_1.18.4.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fe89243868888ce715bf45861f26264f767d4e4dbd0d6f1a26ce60bbbbf106da
size 4377024

45
update-alternatives-suse.patch
View File

@ -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 = \

14
update-alternatives.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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
- Use ls . instead of * to avoid error when nothing is in alternatives
directory
-------------------------------------------------------------------
Tue May 31 11:47:57 UTC 2016 - tchvatal@suse.com

15
update-alternatives.spec
View File

@ -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}
@ -77,7 +80,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