Hello community, here is the log from the commit of package yum for openSUSE:Factory checked in at 2018-08-12 20:52:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yum (Old) and /work/SRC/openSUSE:Factory/.yum.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yum" Sun Aug 12 20:52:21 2018 rev:27 rq:628547 version:3.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yum/yum.changes 2017-12-12 21:18:18.571925173 +0100 +++ /work/SRC/openSUSE:Factory/.yum.new/yum.changes 2018-08-12 20:52:23.937105203 +0200 @@ -1,0 +2,8 @@ +Fri Aug 10 07:50:21 UTC 2018 - [email protected] + +- Add patch to fix bsc#1104227 correct path to rpmdb: + * yum-3.4.3-correct-rpmdb-path.patch +- Do not mark systemd service as config +- Do not install in sitearch as this is non-platform-specific package + +------------------------------------------------------------------- New: ---- yum-3.4.3-correct-rpmdb-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum.spec ++++++ --- /var/tmp/diff_new_pack.03KwhQ/_old 2018-08-12 20:52:24.561106468 +0200 +++ /var/tmp/diff_new_pack.03KwhQ/_new 2018-08-12 20:52:24.561106468 +0200 @@ -1,7 +1,7 @@ # # spec file for package yum # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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,16 +18,15 @@ #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - Name: yum Version: 3.4.3 Release: 0 Summary: RPM installer/updater -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Packages -Url: http://linux.duke.edu/yum/ +URL: http://yum.baseurl.org/ Source: %{name}-%{version}.tar.gz Source1: %{name}.conf Source2: %{name}-updatesd.service @@ -49,16 +48,25 @@ Patch10: %{name}-3.4.3-preserve-queryparams-in-urls.patch # PATCH-FIX-OPENSUSE Patch11: %{name}-3.2.29-parse-restart_suggested.patch +# PATCH-FIX-UPSTREAM +Patch12: yum-3.4.3-correct-rpmdb-path.patch BuildRequires: dbus-1 BuildRequires: intltool -BuildRequires: python2-devel +BuildRequires: python2-gpgme +BuildRequires: python2-iniparse +BuildRequires: python2-nose +BuildRequires: python2-rpm +BuildRequires: python2-setuptools +BuildRequires: python2-urlgrabber BuildRequires: systemd -Requires: python-yum = %{version}-%{release} +Requires: python2-yum = %{version}-%{release} Requires: rpm >= 4.4.0 Requires(pre): %fillup_prereq Requires(pre): coreutils +Recommends: %{name}-lang = %{version} Suggests: cron Suggests: logrotate +BuildArch: noarch %lang_package %description @@ -82,17 +90,16 @@ Summary: YUM update notification daemon Group: Development/Languages/Python Requires: dbus-1-python -Requires: python-pyliblzma -Requires: python-urlgrabber Requires: python2-gobject2 Requires: python2-gpgme Requires: python2-iniparse +Requires: python2-pyliblzma +Requires: python2-rpm +Requires: python2-urlgrabber Requires: python2-xml -Requires: rpm-python Requires: yum-metadata-parser >= 1.1.0 Provides: python-yum = %{version}-%{release} Obsoletes: python-yum < %{version}-%{release} -Provides: python-yum = %{version} Provides: yum-common = %{version} Obsoletes: yum-common < %{version} @@ -110,21 +117,12 @@ %patch9 -p1 %patch10 -p1 %patch11 +%patch12 -p1 # Fix non-executable scripts rpmlint issue: 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 -do - pushd $i - sed -e "s/lib/%{_lib}/" Makefile > Makefile.new - mv Makefile.new Makefile - popd -done -%endif - %build make %{?_smp_mflags} @@ -132,20 +130,25 @@ %make_install install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/yum.conf -# install custom init script -mkdir -p %{buildroot}%{_unitdir} -install %{SOURCE2} %{buildroot}%{_unitdir}/%{name}-updatesd.service +# install custom systemd service +install -Dm 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}-updatesd.service ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcyum-updatesd -# remove the original one + +# remove the original init rm %{buildroot}%{_sysconfdir}/rc.d/init.d/yum-updatesd rm -rf %{buildroot}%{_sysconfdir}/rc.d mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/pluginconf.d/ \ - %{buildroot}%{_prefix}/lib/yum-plugins/ \ + %{buildroot}%{_libexecdir}/yum-plugins/ \ %{buildroot}%{_fillupdir}/ mv %{buildroot}%{_sysconfdir}/sysconfig/yum-cron %{buildroot}%{_fillupdir}/sysconfig.yum-cron %find_lang %{name} +# The i18n module fails to initialize +#%check +#export PYTHONPATH=%{buildroot}%{python_sitelib} +#nosetests -v + %post %fillup_only -n yum-cron # if we are upgrading from older distros the config should be moved @@ -210,12 +213,13 @@ %service_del_postun %{name}-updatesd.service %files -%doc README AUTHORS COPYING TODO PLUGINS +%license COPYING +%doc README AUTHORS TODO PLUGINS %dir %{_localstatedir}/cache/%{name} %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/repos.d %dir %{_sysconfdir}/%{name}/pluginconf.d -%dir %{_prefix}/lib/yum-plugins +%dir %{_libexecdir}/yum-plugins %config(noreplace) %{_sysconfdir}/%{name}/yum.conf %config %{_sysconfdir}/logrotate.d/%{name} %{_fillupdir}/sysconfig.yum-cron @@ -232,11 +236,11 @@ %files lang -f %{name}.lang %files -n python2-yum -%{python_sitearch}/* +%{python_sitelib}/* %files updatesd %attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/yum-updatesd.conf -%config %{_unitdir}/%{name}-updatesd.service +%{_unitdir}/%{name}-updatesd.service %{_sbindir}/rcyum-updatesd %attr(644,root,root) %config %{_sysconfdir}/dbus-1/system.d/yum-updatesd.conf %config(noreplace) %{_sysconfdir}/%{name}/version-groups.conf ++++++ yum-3.4.3-correct-rpmdb-path.patch ++++++ >From 4a452134906d7dd7577adce2bbbae26d86efde52 Mon Sep 17 00:00:00 2001 From: Mike Miller <[email protected]> Date: Thu, 11 Jul 2013 09:54:13 +0200 Subject: [PATCH] Get correct rpmdb path from rpm configuration Fixes failure after install when system stores rpmdb in a non-standard location. --- yum/rpmsack.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/yum/rpmsack.py b/yum/rpmsack.py index 56c3793..5b9f798 100644 --- a/yum/rpmsack.py +++ b/yum/rpmsack.py @@ -233,6 +233,11 @@ class RPMDBPackageSack(PackageSackBase): self._persistdir = root + '/' + persistdir else: self._persistdir = persistdir + if hasattr(rpm, 'expandMacro'): + dbpath = rpm.expandMacro('%_dbpath') + else: + dbpath = '/var/lib/rpm' + self._rpmdbpath = os.path.normpath(root + '/' + dbpath) self._have_cached_rpmdbv_data = None self._cached_conflicts_data = None # Store the result of what happens, if a transaction completes. @@ -336,7 +341,7 @@ class RPMDBPackageSack(PackageSackBase): # We are keeping some data from before, and sometimes (Eg. remove only) # we never open the rpmdb again ... so get the mtime now. - rpmdbfname = self.root + "/var/lib/rpm/Packages" + rpmdbfname = self._rpmdbpath + "/Packages" self._cached_rpmdb_mtime = os.path.getmtime(rpmdbfname) def _safe_del(x, y): @@ -1146,7 +1151,7 @@ class RPMDBPackageSack(PackageSackBase): # http://lists.rpm.org/pipermail/rpm-maint/2007-November/001719.html # ...if anything gets implemented, we should change. rpmdbvfname = self._cachedir + "/version" - rpmdbfname = self.root + "/var/lib/rpm/Packages" + rpmdbfname = self._rpmdbpath + "/Packages" if os.path.exists(rpmdbvfname) and os.path.exists(rpmdbfname): # See if rpmdb has "changed" ... @@ -1169,7 +1174,7 @@ class RPMDBPackageSack(PackageSackBase): if self._cached_rpmdb_mtime is None: return # We haven't loaded any packages!!! - rpmdbfname = self.root + "/var/lib/rpm/Packages" + rpmdbfname = self._rpmdbpath + "/Packages" if not os.path.exists(rpmdbfname): return # haha @@ -1365,7 +1370,7 @@ class RPMDBPackageSack(PackageSackBase): self._name2pkg.setdefault(po.name, []).append(po) self._tup2pkg[po.pkgtup] = po if self.__cache_rpmdb__ and self._cached_rpmdb_mtime is None: - rpmdbfname = self.root + "/var/lib/rpm/Packages" + rpmdbfname = self._rpmdbpath + "/Packages" self._cached_rpmdb_mtime = os.path.getmtime(rpmdbfname) return po -- 1.8.2.3
