SHA256
3
0
forked from pool/dpkg

Accepting request 310535 from system:packagemanager

- Exclude the update-alternatives manpage to avoid conflict

- Verion bump to 1.18.1:
  * Bump to latest upstream release
  * Plenty of fixes with too long changelog, see changelog file in
    documentation
  * Also fixes bnc#926749 CVE-2015-0840
  * Refresh patch:
    + update-alternatives-suse.patch

- Adjust to the new manpage location

- Verion bump to 1.18.1:
  * Bump to latest upstream release
  * Plenty of fixes with too long changelog, see changelog file in
    documentation
  * Also fixes bnc#926749 CVE-2015-0840
  * Refresh patch:
    + update-alternatives-suse.patch

OBS-URL: https://build.opensuse.org/request/show/310535
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dpkg?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger 2015-06-06 07:53:53 +00:00 committed by Git OBS Bridge
commit 461a99fa79
7 changed files with 44 additions and 11 deletions

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 5 13:44:48 UTC 2015 - tchvatal@suse.com
- Exclude the update-alternatives manpage to avoid conflict
-------------------------------------------------------------------
Thu Jun 4 11:14:05 UTC 2015 - tchvatal@suse.com
- Verion bump to 1.18.1:
* Bump to latest upstream release
* Plenty of fixes with too long changelog, see changelog file in
documentation
* Also fixes bnc#926749 CVE-2015-0840
* Refresh patch:
+ update-alternatives-suse.patch
-------------------------------------------------------------------
Wed Apr 1 12:59:58 UTC 2015 - tchvatal@suse.com

View File

@ -18,7 +18,7 @@
%define admindir %{_localstatedir}/lib/rpm/
Name: dpkg
Version: 1.17.24
Version: 1.18.1
Release: 0
Summary: Debian package management system
License: GPL-2.0+
@ -146,6 +146,7 @@ exit 0
%defattr(-,root,root)
%doc ABOUT-NLS AUTHORS COPYING doc/triggers.txt NEWS README* THANKS TODO debian/changelog
%doc %{_mandir}/man*/*
%exclude %{_mandir}/man*/update-alternatives*
%dir %{_sysconfdir}/dpkg
%config(noreplace) %{_sysconfdir}/dpkg/*
%{_bindir}/*

View File

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

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

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

View File

@ -1,6 +1,6 @@
diff -ur dpkg-1.16.7.orig/man/update-alternatives.8 dpkg-1.16.7/man/update-alternatives.8
--- dpkg-1.16.7.orig/man/update-alternatives.8 2012-06-30 09:21:47.000000000 +0200
+++ dpkg-1.16.7/man/update-alternatives.8 2012-07-07 00:38:09.628280915 +0200
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 @@
.SH DESCRIPTION
.B update\-alternatives

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Jun 5 07:44:29 UTC 2015 - tchvatal@suse.com
- Adjust to the new manpage location
-------------------------------------------------------------------
Thu Jun 4 11:15:32 UTC 2015 - tchvatal@suse.com
- Verion bump to 1.18.1:
* Bump to latest upstream release
* Plenty of fixes with too long changelog, see changelog file in
documentation
* Also fixes bnc#926749 CVE-2015-0840
* Refresh patch:
+ update-alternatives-suse.patch
-------------------------------------------------------------------
Wed Apr 1 12:57:51 UTC 2015 - tchvatal@suse.com

View File

@ -18,7 +18,7 @@
%define admindir %{_localstatedir}/lib/rpm/
Name: update-alternatives
Version: 1.17.24
Version: 1.18.1
Release: 0
Summary: Maintain symbolic links determining default commands
License: GPL-2.0+
@ -58,13 +58,13 @@ make -C utils/ %{?_smp_mflags}
%install
install -d -m 0755 %{buildroot}/%{_sbindir}/
install -d -m 0755 %{buildroot}/%{_mandir}/man8/
install -d -m 0755 %{buildroot}/%{_mandir}/man1/
install -d -m 0755 %{buildroot}/%{_sysconfdir}/alternatives
install -d -m 0755 %{buildroot}/%{admindir}/alternatives
install -d -m 0755 %{buildroot}/%{_localstatedir}/log
install -m 0755 utils/%{name} %{buildroot}/%{_sbindir}
install -m 0644 man/%{name}.8 %{buildroot}/%{_mandir}/man8/
install -m 0644 man/%{name}.1 %{buildroot}/%{_mandir}/man1/
touch %{buildroot}/%{_localstatedir}/log/%{name}.log
@ -74,7 +74,7 @@ touch %{buildroot}/%{_localstatedir}/log/%{name}.log
%dir %{_sysconfdir}/alternatives
%dir %{_localstatedir}/lib/rpm/alternatives
%{_sbindir}/update-alternatives
%{_mandir}/man8/update-alternatives.8*
%{_mandir}/man1/update-alternatives.1*
%ghost %{_localstatedir}/log/update-alternatives.log
%changelog