Hello community,
here is the log from the commit of package yum for openSUSE:Factory checked in
at 2017-05-20 10:10:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yum (Old)
and /work/SRC/openSUSE:Factory/.yum.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yum"
Sat May 20 10:10:17 2017 rev:24 rq:495341 version:3.4.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/yum/yum.changes 2014-10-25 08:32:41.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.yum.new/yum.changes 2017-05-20
10:10:32.642326823 +0200
@@ -1,0 +2,14 @@
+Thu Mar 30 21:29:55 UTC 2017 - ngo...@datto.com
+
+- Add python-pyliblzma dependency to python-yum to fix issues
+ with accessing xz-compressed repo metadata
+- Move remaining python dependencies from yum to python-yum
+- Make yum dependency on python-yum stricter
+
+-------------------------------------------------------------------
+Thu Dec 1 09:07:41 UTC 2016 - m...@suse.com
+
+- yum-3.2.29-parse-restart_suggested.patch - parse restart_suggested flag
+ (bsc#1012867)
+
+-------------------------------------------------------------------
New:
----
yum-3.2.29-parse-restart_suggested.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yum.spec ++++++
--- /var/tmp/diff_new_pack.qO9tTI/_old 2017-05-20 10:10:33.314231885 +0200
+++ /var/tmp/diff_new_pack.qO9tTI/_new 2017-05-20 10:10:33.318231320 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yum
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -42,22 +42,19 @@
Patch9: %{name}-3.4.3-fix-repo-tag.patch
# PATCH-FIX-UPSTREAM bnc#896844
Patch10: %{name}-3.4.3-preserve-queryparams-in-urls.patch
+# PATCH-FIX-OPENSUSE
+Patch11: %{name}-3.2.29-parse-restart_suggested.patch
BuildRequires: dbus-1
BuildRequires: intltool
BuildRequires: python-devel
BuildRequires: systemd
-Requires: python-gpgme
-Requires: python-iniparse
-Requires: python-xml
-Requires: python-yum = %{version}
+Requires: python-yum = %{version}-%{release}
Requires: rpm >= 4.4.0
-Requires: rpm-python
+Requires(pre): %fillup_prereq
+Requires(pre): coreutils
Suggests: cron
Suggests: logrotate
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires(pre): coreutils
-Requires(pre): %fillup_prereq
-
%lang_package
%description
@@ -82,8 +79,12 @@
Group: Development/Languages/Python
Requires: dbus-1-python
Requires: python-gobject2
+Requires: python-gpgme
+Requires: python-iniparse
+Requires: python-pyliblzma
Requires: python-urlgrabber
-Requires: python-urlgrabber
+Requires: python-xml
+Requires: rpm-python
Requires: yum-metadata-parser >= 1.1.0
Provides: yum-common = %{version}
Obsoletes: yum-common < %{version}
@@ -101,10 +102,11 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p0
# Fix non-executable scripts rpmlint issue:
-sed -i "s|#!.*/usr/bin/python.*||"
rpmUtils/{arch,__init__,miscutils,oldUtils,transaction,updates}.py
-sed -i "s|#!.*/usr/bin/python.*||"
yum/{callbacks,comps,config,constants,depsolve,Errors,failover,history,i18n,__init__,logginglevels,mdparser,metalink,misc,packages,packageSack,parser,pgpmsg,pkgtag_db,plugins,repoMDObject,repos,rpmsack,rpmtrans,sqlitesack,sqlutils,transactioninfo,update_md,yumRepo}.py
+sed -i "s|#!.*%{_bindir}/python.*||"
rpmUtils/{arch,__init__,miscutils,oldUtils,transaction,updates}.py
+sed -i "s|#!.*%{_bindir}/python.*||"
yum/{callbacks,comps,config,constants,depsolve,Errors,failover,history,i18n,__init__,logginglevels,mdparser,metalink,misc,packages,packageSack,parser,pgpmsg,pkgtag_db,plugins,repoMDObject,repos,rpmsack,rpmtrans,sqlitesack,sqlutils,transactioninfo,update_md,yumRepo}.py
%ifnarch %{ix86}
for i in rpmUtils yum
@@ -126,7 +128,7 @@
# install custom init script
mkdir -p %{buildroot}%{_unitdir}
install %{SOURCE2} %{buildroot}%{_unitdir}/%{name}-updatesd.service
-ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcyum-updatesd
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcyum-updatesd
# remove the original one
rm %{buildroot}%{_sysconfdir}/rc.d/init.d/yum-updatesd
rm -rf %{buildroot}%{_sysconfdir}/rc.d
@@ -141,8 +143,8 @@
%fillup_only -n yum-cron
# if we are upgrading from older distros the config should be moved
# to the new place
-CONFD="/etc/yum"
-OCONF="/etc/yum.conf"
+CONFD="%{_sysconfdir}/yum"
+OCONF="%{_sysconfdir}/yum.conf"
NCONF="${CONFD}/yum.conf"
NCONFB="${CONFD}/yum.conf.rpmsave"
if [ -e "$OCONF" ] ; then
@@ -162,22 +164,22 @@
#
if [ -e "$NCONF" ] ; then
mv "$NCONF" "$NCONFB"
- echo "warning: /etc/yum/yum.conf backed up as
/etc/yum/yum.conf.rpmsave" >&2
+ echo "warning: %{_sysconfdir}/yum/yum.conf backed up as
%{_sysconfdir}/yum/yum.conf.rpmsave" >&2
fi
- echo "warning: /etc/yum.conf moved to /etc/yum/yum.conf" >&2
+ echo "warning: %{_sysconfdir}/yum.conf moved to
%{_sysconfdir}/yum/yum.conf" >&2
mv "$OCONF" "$NCONF"
fi
# migrate /etc/yum.repos.d to /etc/yum/repos.d/
-if [ -d "/etc/yum.repos.d" ] ; then
- if [ ! -d "/etc/yum/repos.d" ] ; then
- mkdir "/etc/yum/repos.d"
+if [ -d "%{_sysconfdir}/yum.repos.d" ] ; then
+ if [ ! -d "%{_sysconfdir}/yum/repos.d" ] ; then
+ mkdir "%{_sysconfdir}/yum/repos.d"
fi
- if [ "/etc/yum.repos.d/*" != '/etc/yum.repos.d/*' ] ; then
- for i in /etc/yum.repos.d/*;
+ if [ "%{_sysconfdir}/yum.repos.d/*" != '%{_sysconfdir}/yum.repos.d/*' ] ;
then
+ for i in %{_sysconfdir}/yum.repos.d/*;
do
- NCONF="/etc/yum/repos.d/`basename $i`"
- NCONFB="/etc/yum/repos.d/`basename $i`.rpmsave"
- OCONF="/etc/yum.repos.d/`basename $i`"
+ NCONF="%{_sysconfdir}/yum/repos.d/`basename $i`"
+ NCONFB="%{_sysconfdir}/yum/repos.d/`basename $i`.rpmsave"
+ OCONF="%{_sysconfdir}/yum.repos.d/`basename $i`"
if [ -e "$NCONF" ] ; then
mv "$NCONF" "$NCONFB"
echo "warning: $NCONF backed up as $NCONFB" >&2
++++++ yum-3.2.29-parse-restart_suggested.patch ++++++
Index: yum/update_md.py
===================================================================
--- yum/update_md.py.orig
+++ yum/update_md.py
@@ -71,7 +71,8 @@ class UpdateNotice(object):
'solution' : '',
'references' : [],
'pkglist' : [],
- 'reboot_suggested' : False
+ 'reboot_suggested' : False,
+ 'restart_suggested' : False
}
if elem:
@@ -260,7 +261,7 @@ class UpdateNotice(object):
"""
Parse an individual package::
- <!ELEMENT package (filename, sum, reboot_suggested)>
+ <!ELEMENT package (filename, sum, reboot_suggested,
restart_suggested)>
<!ATTLIST package name CDATA #REQUIRED>
<!ATTLIST package version CDATA #REQUIRED>
<!ATTLIST package release CDATA #REQUIRED>
@@ -268,6 +269,7 @@ class UpdateNotice(object):
<!ATTLIST package epoch CDATA #REQUIRED>
<!ATTLIST package src CDATA #REQUIRED>
<!ELEMENT reboot_suggested (#PCDATA)>
+ <!ELEMENT restart_suggested (#PCDATA)>
<!ELEMENT filename (#PCDATA)>
<!ELEMENT sum (#PCDATA)>
<!ATTLIST sum type (md5|sha1) "sha1">
@@ -288,6 +290,8 @@ class UpdateNotice(object):
package['sum'] = (child.attrib.get('type'), child.text)
elif child.tag == 'reboot_suggested':
self._md['reboot_suggested'] = True
+ elif child.tag == 'restart_suggested':
+ self._md['restart_suggested'] = True
return package
def xml(self):
