Hello community, here is the log from the commit of package yum for openSUSE:Factory checked in at 2012-02-24 12:07:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yum (Old) and /work/SRC/openSUSE:Factory/.yum.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yum", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yum/yum.changes 2011-09-23 12:53:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yum.new/yum.changes 2012-02-24 12:07:04.000000000 +0100 @@ -1,0 +2,41 @@ +Thu Feb 23 11:17:38 UTC 2012 - [email protected] + +- Add yum-3.4.3-updatesd-dbus-conf-syntax.patch (sent upstream) + +------------------------------------------------------------------- +Thu Feb 23 08:44:08 UTC 2012 - [email protected] + +- Update to version 3.4.3: + * yum/__init__.py: Don't call repo.doSetup() if we've already setup the + repos. + * yum/history.py, yum/rpmtrans.py: Disable the rpmtrans chroot workaround. + Use exclusive locking in history. + * yummain.py: Change the logging for NFS path problems from debug to critical. + * yummain.py: Checks if we have read and write access in the current + directory. If not, chdir to /. + * output.py: Make the source xgettext-friendly. xgettext ignores + _(var), so localize literals instead. + * cli.py: Don't show -c warning, when we've changed it due to --installroot. + * yum/rpmtrans.py: Workaround rpm chroot insanity, so we can use sqlite from + unInstStop() cb. + - See changelog for more details... +- Rebased the following patches: + * yum-3.2.25-license-to-confirm.patch + * yum-3.2.25-suse-changelogs.patch + * yum-3.2.25-suse-missing-tags.patch + * yum-3.2.25-disable-annoying-debug-info.patch + * yum-3.2.25-add-lib-cpp-file.patch +- Dropped the following patches: + * yum-3.2.6-epoch_workaround.patch - Fixed upstream + * yum-3.2.25-add-sourcerpm-for-old-yum.patch - Fixed upstream +- Spec file cleanup: + * Ran spec-cleaner + * Removed checks for SUSE versions older than 11.1 + * Provide rc-script for %{_initdir}/yum-updatesd (Init script packaging policy) + * Suggest cron and logrotate for optional features + * Rename package 'yum-common' to 'python-yum' (Python packaging policy) + and fix it's file permissions. Also set a more appropriate RPM group + (Development/Languages/Python) + * Split out rather huge lang file (rpmlint issue) + +------------------------------------------------------------------- Old: ---- yum-3.2.25-add-lib-cpp-file.patch yum-3.2.25-add-sourcerpm-for-old-yum.patch yum-3.2.25-disable-annoying-debug-info.patch yum-3.2.25-license-to-confirm.patch yum-3.2.25-suse-changelogs.patch yum-3.2.25-suse-missing-tags.patch yum-3.2.25.tar.bz2 yum-3.2.6-epoch_workaround.patch New: ---- yum-3.4.3-add-lib-cpp-file.patch yum-3.4.3-disable-annoying-debuginfo.patch yum-3.4.3-license-to-confirm.patch yum-3.4.3-suse-changelogs.patch yum-3.4.3-suse-missing-tags.patch yum-3.4.3-updatesd-dbus-conf-syntax.patch yum-3.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum.spec ++++++ --- /var/tmp/diff_new_pack.vNSB67/_old 2012-02-24 12:07:06.000000000 +0100 +++ /var/tmp/diff_new_pack.vNSB67/_new 2012-02-24 12:07:06.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yum (Version 3.2.25) +# spec file for package yum # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,97 +15,91 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yum -BuildRequires: dbus-1 intltool python-devel -Version: 3.2.25 -Release: 5 +Version: 3.4.3 +Release: 0 Summary: RPM installer/updater -Group: System/Packages License: GPL-2.0+ +Group: System/Packages Url: http://linux.duke.edu/yum/ -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.gz Source1: %{name}.conf Source2: %{name}-updatesd.init -Patch0: %{name}-3.2.6-epoch_workaround.patch -Patch1: yum-3.2.25-license-to-confirm.patch -Patch2: yum-3.2.25-suse-changelogs.patch -Patch3: yum-3.2.25-suse-missing-tags.patch -Patch4: yum-3.2.25-disable-annoying-debug-info.patch -Patch5: yum-3.2.25-add-sourcerpm-for-old-yum.patch -Patch6: yum-3.2.25-add-lib-cpp-file.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: rpm >= 4.4.0 -Requires: rpm-python -Requires: yum-metadata-parser >= 1.1.0 +# PATCH-FIX-OPENSUSE +Patch1: %{name}-3.4.3-license-to-confirm.patch +# PATCH-FIX-OPENSUSE +Patch2: %{name}-3.4.3-suse-changelogs.patch +# PATCH-FIX-OPENSUSE +Patch3: %{name}-3.4.3-suse-missing-tags.patch +# PATCH-FIX-OPENSUSE +Patch4: %{name}-3.4.3-disable-annoying-debuginfo.patch +# PATCH-FIX-OPENSUSE +Patch6: %{name}-3.4.3-add-lib-cpp-file.patch +# PATCH-FIX-UPSTREAM +Patch7: %{name}-3.4.3-updatesd-dbus-conf-syntax.patch +BuildRequires: dbus-1 +BuildRequires: intltool +BuildRequires: python-devel Requires: python-gpgme Requires: python-iniparse -%if %{suse_version} <= 1010 -Requires: python-elementtree -%else Requires: python-xml +Requires: python-yum = %{version} +Requires: rpm >= 4.4.0 +Requires: rpm-python +Requires: yum-metadata-parser >= 1.1.0 +Suggests: cron +Suggests: logrotate +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(pre): coreutils +Requires(pre): %insserv_prereq +Requires(pre): %fillup_prereq +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %endif -%py_requires -PreReq: coreutils -Requires: yum-common = %{version}-%{release} +%lang_package %description Yum is a utility that can check for and automatically download and install updated RPM packages. Dependencies are obtained and downloaded automatically prompting the user as necessary. - - -Authors: --------- - Seth Vidal <[email protected]> - %package updatesd -License: GPL-2.0+ Summary: YUM update notification daemon Group: System/Packages -Requires: yum = %{version}-%{release} +Requires: %{name} = %{version} Requires: dbus-1-python Requires: python-gobject2 -PreReq: %insserv_prereq +Requires(pre): %insserv_prereq %description updatesd yum-updatesd provides a daemon which checks for available updates and can notify you when they are available via email, syslog or dbus. - - -Authors: --------- - Seth Vidal <[email protected]> - -%package common -License: GPL-2.0+ +%package -n python-yum Summary: YUM update notification daemon -Group: System/Packages +Group: Development/Languages/Python Requires: dbus-1-python Requires: python-gobject2 Requires: python-urlgrabber -PreReq: %insserv_prereq +Provides: yum-common = %{version} +Obsoletes: yum-common < %{version} -%description common +%description -n python-yum Common libraries for YUM based programs -Authors: --------- - Seth Vidal <[email protected]> - %prep %setup -q -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch6 -p1 +%patch7 -p1 + +# 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 %ifnarch %{ix86} for i in rpmUtils yum @@ -121,27 +115,25 @@ make %install -make DESTDIR=%{buildroot} install -install -m 644 %{SOURCE1} %{buildroot}/etc/yum/yum.conf +%make_install +install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/yum.conf # install custom init script -%{__mkdir_p} %{buildroot}/etc/init.d -install -m 755 %{SOURCE2} %{buildroot}/etc/init.d/yum-updatesd +mkdir -p %{buildroot}%{_sysconfdir}/init.d +install %{SOURCE2} %{buildroot}%{_initddir}/yum-updatesd +ln -s %{_initddir}/yum-updatesd %{buildroot}%{_sbindir}/rcyum-updatesd # remove the original one -rm %{buildroot}/etc/rc.d/init.d/yum-updatesd -rm -rf %{buildroot}/etc/rc.d +rm %{buildroot}%{_sysconfdir}/rc.d/init.d/yum-updatesd +rm -rf %{buildroot}%{_sysconfdir}/rc.d -mkdir -p %{buildroot}/%{_sysconfdir}/yum/pluginconf.d/ %{buildroot}/usr/lib/yum-plugins/ +mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/pluginconf.d/ \ + %{buildroot}%{_prefix}/lib/yum-plugins/ \ + %{buildroot}%{_localstatedir}/adm/fillup-templates/ +mv %{buildroot}%{_sysconfdir}/sysconfig/yum-cron %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.yum-cron %find_lang %{name} -%postun updatesd -%restart_on_update yum-updatesd -%insserv_cleanup - -%preun updatesd -%stop_on_removal yum-updatesd - %post +%fillup_only -n yum-cron # if we are upgrading from older distros the config should be moved # to the new place CONFD="/etc/yum" @@ -191,36 +183,48 @@ fi fi -%clean -rm -rf %{buildroot} +%preun updatesd +%stop_on_removal yum-updatesd + +%postun updatesd +%restart_on_update yum-updatesd +%insserv_cleanup -%files -f %{name}.lang -%defattr(-, root, root) -%doc README AUTHORS COPYING TODO INSTALL ChangeLog PLUGINS -%dir /var/cache/yum -%dir %{_sysconfdir}/yum -%dir %{_sysconfdir}/yum/repos.d -%dir %{_sysconfdir}/yum/pluginconf.d -%dir %{_sysconfdir}/yum -%dir /usr/lib/yum-plugins -%config(noreplace) %{_sysconfdir}/yum/yum.conf +%files +%defattr(-,root,root) +%doc README AUTHORS COPYING TODO PLUGINS +%dir %{_localstatedir}/cache/%{name} +%dir %{_sysconfdir}/%{name} +%dir %{_sysconfdir}/%{name}/repos.d +%dir %{_sysconfdir}/%{name}/pluginconf.d +%dir %{_prefix}/lib/yum-plugins +%config(noreplace) %{_sysconfdir}/%{name}/yum.conf %config %{_sysconfdir}/logrotate.d/%{name} +%{_localstatedir}/adm/fillup-templates/sysconfig.yum-cron +%{_sysconfdir}/cron.daily/0yum.cron +%config %{_sysconfdir}/%{name}/yum-daily.yum +%config %{_sysconfdir}/%{name}/yum-weekly.yum +%config %{_sysconfdir}/bash_completion.d/yum.bash %{_mandir}/*/* -%defattr(0755, root, root) +%defattr(0755,root,root) %{_datadir}/yum-cli %{_bindir}/* %exclude %{_mandir}/man*/yum-updatesd* -%files common -%defattr(0755, root, root) -%{py_sitedir}/* +%files lang -f %name.lang +%defattr(-,root,root) + +%files -n python-yum +%defattr(-,root,root) +%{python_sitearch}/* %files updatesd -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/yum/yum-updatesd.conf +%defattr(-,root,root) +%attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/yum-updatesd.conf %config %{_sysconfdir}/init.d/yum-updatesd -%config %{_sysconfdir}/dbus-1/system.d/yum-updatesd.conf -%config(noreplace) %{_sysconfdir}/yum/version-groups.conf +%{_sbindir}/rcyum-updatesd +%attr(644,root,root) %config %{_sysconfdir}/dbus-1/system.d/yum-updatesd.conf +%config(noreplace) %{_sysconfdir}/%{name}/version-groups.conf %{_sbindir}/yum-updatesd %{_mandir}/man*/yum-updatesd* ++++++ yum-3.2.25-add-lib-cpp-file.patch -> yum-3.4.3-add-lib-cpp-file.patch ++++++ --- /work/SRC/openSUSE:Factory/yum/yum-3.2.25-add-lib-cpp-file.patch 2011-09-23 12:53:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yum.new/yum-3.4.3-add-lib-cpp-file.patch 2012-02-24 12:07:04.000000000 +0100 @@ -1,6 +1,6 @@ ---- yum/misc.py.orig 2010-07-14 16:40:01.000000000 +0200 -+++ yum/misc.py 2010-07-14 16:40:18.000000000 +0200 -@@ -100,6 +100,8 @@ +--- a/yum/misc.py 2011-06-28 22:27:22.000000000 +0200 ++++ b/yum/misc.py 2012-02-23 10:56:21.646571323 +0100 +@@ -112,6 +112,8 @@ return True if filename == '/usr/lib/sendmail': return True ++++++ yum-3.4.3-disable-annoying-debuginfo.patch ++++++ --- a/yum/misc.py 2011-06-28 22:27:22.000000000 +0200 +++ b/yum/misc.py 2012-02-23 10:09:03.045503693 +0100 @@ -895,8 +895,8 @@ else: if x.encode(enc) == item: - if enc != 'utf-8': - print '\n%s encoding on %s\n' % (enc, item) + #if enc != 'utf-8': + # print '\n%s encoding on %s\n' % (enc, item) return x.encode('utf-8') ++++++ yum-3.2.25-license-to-confirm.patch -> yum-3.4.3-license-to-confirm.patch ++++++ --- /work/SRC/openSUSE:Factory/yum/yum-3.2.25-license-to-confirm.patch 2011-09-23 12:53:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yum.new/yum-3.4.3-license-to-confirm.patch 2012-02-24 12:07:04.000000000 +0100 @@ -1,15 +1,15 @@ ---- yum/packages.py.orig 2010-04-09 12:26:43.000000000 +0200 -+++ yum/packages.py 2010-04-09 13:24:51.000000000 +0200 -@@ -34,6 +34,8 @@ +diff -ru a/yum/packages.py b/yum/packages.py +--- a/yum/packages.py 2011-06-28 22:27:22.000000000 +0200 ++++ b/yum/packages.py 2012-02-23 09:37:06.661458025 +0100 +@@ -35,6 +35,7 @@ import Errors import errno import struct +import glob -+ from constants import * + from operator import itemgetter - import urlparse -@@ -1015,6 +1017,23 @@ +@@ -1252,6 +1253,23 @@ def xml_dump_primary_metadata(self): msg = """\n<package type="rpm">""" msg += misc.to_unicode(self._dump_base_items()) @@ -33,3 +33,4 @@ msg += misc.to_unicode(self._dump_format_items()) msg += """\n</package>""" return misc.to_utf8(msg) +Only in b/yum: .packages.py.swp ++++++ yum-3.2.25-suse-changelogs.patch -> yum-3.4.3-suse-changelogs.patch ++++++ --- /work/SRC/openSUSE:Factory/yum/yum-3.2.25-suse-changelogs.patch 2011-09-23 12:53:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yum.new/yum-3.4.3-suse-changelogs.patch 2012-02-24 12:07:04.000000000 +0100 @@ -1,11 +1,12 @@ ---- yum/packages.py.orig 2010-04-09 12:26:43.000000000 +0200 -+++ yum/packages.py 2010-04-09 13:40:53.000000000 +0200 -@@ -1007,6 +1007,8 @@ - else: - clogs = self.changelog[:clog_limit] +diff -ru a/yum/packages.py b/yum/packages.py +--- a/yum/packages.py 2011-06-28 22:27:22.000000000 +0200 ++++ b/yum/packages.py 2012-02-23 09:50:01.803476488 +0100 +@@ -1238,6 +1238,8 @@ + last_ts = 0 + hack_ts = 0 for (ts, author, content) in reversed(clogs): + if author[0] == '-': + author = author[2:] - msg += """<changelog author="%s" date="%s">%s</changelog>\n""" % ( - misc.to_xml(author, attrib=True), misc.to_xml(str(ts)), - misc.to_xml(content)) + if ts != last_ts: + hack_ts = 0 + else: ++++++ yum-3.2.25-suse-missing-tags.patch -> yum-3.4.3-suse-missing-tags.patch ++++++ --- /work/SRC/openSUSE:Factory/yum/yum-3.2.25-suse-missing-tags.patch 2011-09-23 12:53:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yum.new/yum-3.4.3-suse-missing-tags.patch 2012-02-24 12:07:04.000000000 +0100 @@ -1,22 +1,21 @@ ---- yum/packages.py.orig 2010-04-09 12:26:43.000000000 +0200 -+++ yum/packages.py 2010-04-12 12:24:00.000000000 +0200 -@@ -897,7 +899,9 @@ - msg += self._dump_pco('provides') +diff -ru a/yum/packages.py b/yum/packages.py +--- a/yum/packages.py 2011-06-28 22:27:22.000000000 +0200 ++++ b/yum/packages.py 2012-02-23 09:56:09.814485258 +0100 +@@ -1121,6 +1121,8 @@ msg += self._dump_requires() msg += self._dump_pco('conflicts') -- msg += self._dump_pco('obsoletes') -+ msg += self._dump_pco('obsoletes') + msg += self._dump_pco('obsoletes') + msg += self._dump_suggests_and_recommends() + msg += self._dump_enhances_and_supplements() msg += self._dump_files(True) - msg += """\n </format>""" - return msg -@@ -968,7 +972,111 @@ + if msg[-1] != '\n': + msg += """\n""" +@@ -1173,11 +1175,110 @@ def _requires_with_pre(self): raise NotImplementedError() - -+ ++ + # Rather than trying to stuff enhances, suggests, supplements and recommends + # into yum like the other tags, I'll save my sanity and just do it by hand. + def _dump_suggests_and_recommends(self): @@ -71,9 +70,7 @@ + return msg + + def _dump_enhances_and_supplements(self): -+ msg = "" -+ enhances = "" -+ supplements = "" ++ msg, enhances, supplements = "", "", "" + names = self.hdr[rpm.RPMTAG_ENHANCESNAME] + if not names: + return msg @@ -117,10 +114,12 @@ + msg += "\n <rpm:enhances>\n" + msg += enhances + msg += " </rpm:enhances>\n" -+ + return msg + -+ def _dump_requires(self): - """returns deps in format""" + """returns deps in XML format""" mylist = self._requires_with_pre() +- + msg = "" + + if mylist: msg = "\n <rpm:requires>\n" ++++++ yum-3.4.3-updatesd-dbus-conf-syntax.patch ++++++ --- a/etc/yum-updatesd-dbus.conf 2011-06-28 22:27:22.000000000 +0200 +++ b/etc/yum-updatesd-dbus.conf 2012-02-23 12:15:41.392684741 +0100 @@ -3,21 +3,19 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd";> <busconfig> <policy user="root"> - <allow own="edu.duke.linux.yum"/> - <allow send_destination="edu.duke.linux.yum"/> - <allow send_interface="edu.duke.linux.yum"/> + <allow own="edu.duke.linux.yum" + send_destination="edu.duke.linux.yum" + send_interface="edu.duke.linux.yum"/> </policy> <policy at_console="true"> - <allow own="edu.duke.linux.yum"/> - - <allow send_destination="edu.duke.linux.yum"/> - <allow send_interface="edu.duke.linux.yum"/> + <allow own="edu.duke.linux.yum" + send_destination="edu.duke.linux.yum" + send_interface="edu.duke.linux.yum"/> </policy> <policy context="default"> - <deny own="edu.duke.linux.yum"/> - - <deny send_destination="edu.duke.linux.yum"/> - <deny send_interface="edu.duke.linux.yum"/> + <deny own="edu.duke.linux.yum" + send_destination="edu.duke.linux.yum" + send_interface="edu.duke.linux.yum"/> </policy> </busconfig> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
