Accepting request 379572 from system:packagemanager
- 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/request/show/379572 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dpkg?expand=0&rev=14
This commit is contained in:
commit
6a9fedda74
@ -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
|
||||
|
||||
|
@ -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+
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cb26a97ca21c970cbe63a762125fe21f7437663badf6ce686589fe62650399da
|
||||
size 4340240
|
3
dpkg_1.18.4.tar.xz
Normal file
3
dpkg_1.18.4.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fe89243868888ce715bf45861f26264f767d4e4dbd0d6f1a26ce60bbbbf106da
|
||||
size 4377024
|
@ -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");
|
||||
|
@ -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
|
||||
|
||||
|
@ -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,-)
|
||||
|
Loading…
Reference in New Issue
Block a user