client/rhel/yum-rhn-plugin/Makefile.yum-rhn-plugin | 2 +- client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 15 ++++++++------- rel-eng/lib/spacewalk/releng/builder.py | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-)
New commits: commit 99bc67aaa8db1168106d0816fb4b88edb3b9f698 Author: Miroslav Suchý msuchy@redhat.com Date: Thu Sep 3 15:47:06 2009 +0200
add .tar.bz2 to known suffixes
diff --git a/rel-eng/lib/spacewalk/releng/builder.py b/rel-eng/lib/spacewalk/releng/builder.py index 8fe6e39..52c773e 100644 --- a/rel-eng/lib/spacewalk/releng/builder.py +++ b/rel-eng/lib/spacewalk/releng/builder.py @@ -637,7 +637,7 @@ class NoTgzBuilder(Builder): self._setup_sources() self.ran_tgz = True
- source_suffixes = ('.tar.gz', '.tar', '.zip', '.jar') + source_suffixes = ('.tar.gz', '.tar', '.zip', '.jar', '.tar.bz2') debug("Scanning for sources.") for filename in os.listdir(self.rpmbuild_gitcopy): for suffix in source_suffixes:
commit 436aba034150dd7558f29d25e2b843f027fecf61 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Sep 2 15:21:25 2009 +0200
use macros in spec file
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index a59b154..f18d161 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -55,9 +55,9 @@ make -f Makefile.yum-rhn-plugin install VERSION=%{version}-%{release} PREFIX=$RP %{_datadir}/yum-plugins/rhnplugin.pyc %{_datadir}/yum-plugins/rhnplugin.pyo
-/usr/share/rhn/actions/packages.py -/usr/share/rhn/actions/packages.pyc -/usr/share/rhn/actions/packages.pyo +%{_datadir}/rhn/actions/packages.py +%{_datadir}/rhn/actions/packages.pyc +%{_datadir}/rhn/actions/packages.pyo
%changelog
commit 97f0905d801e66fbd44d92ceba39e87e05c47087 Author: Miroslav Suchý msuchy@redhat.com Date: Wed Sep 2 15:24:17 2009 +0200
move rhnplugin from /var/lib/yum-plugins to /usr/share/yum-plugins - it is not executable
addressing rpmlint error
diff --git a/client/rhel/yum-rhn-plugin/Makefile.yum-rhn-plugin b/client/rhel/yum-rhn-plugin/Makefile.yum-rhn-plugin index da60f84..d4a8de6 100644 --- a/client/rhel/yum-rhn-plugin/Makefile.yum-rhn-plugin +++ b/client/rhel/yum-rhn-plugin/Makefile.yum-rhn-plugin @@ -2,7 +2,7 @@ PREFIX ?= / SYSCONF ?= etc PYTHON ?= python
-PKGDIR = /usr/lib/yum-plugins/ +PKGDIR = /usr/share/yum-plugins/
PKGNAME = yum-rhn-plugin VERSION = $(shell echo `grep ^Version: $(PKGNAME).spec | awk '{ print $$2 }'`) diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index 4c44fcc..a59b154 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -51,9 +51,9 @@ make -f Makefile.yum-rhn-plugin install VERSION=%{version}-%{release} PREFIX=$RP %{_mandir}/man8/rhnplugin.8* %{_mandir}/man8/yum-rhn-plugin.8*
-/usr/lib/yum-plugins/rhnplugin.py -/usr/lib/yum-plugins/rhnplugin.pyc -/usr/lib/yum-plugins/rhnplugin.pyo +%{_datadir}/yum-plugins/rhnplugin.py +%{_datadir}/yum-plugins/rhnplugin.pyc +%{_datadir}/yum-plugins/rhnplugin.pyo
/usr/share/rhn/actions/packages.py /usr/share/rhn/actions/packages.pyc
commit d79632500b084d1ee83111e13098a100993584aa Author: Miroslav Suchý msuchy@redhat.com Date: Wed Sep 2 14:36:51 2009 +0200
versioned obsolete and provide the obsolete package
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec index 7953c21..4c44fcc 100644 --- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec +++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec @@ -19,7 +19,8 @@ Requires: m2crypto >= 0.16-6
# Not really, but for upgrades we need these Requires: rhn-setup -Obsoletes: up2date +Obsoletes: up2date < 5.0.0 +Provides: up2date = %{version}
%description This yum plugin provides support for yum to access a Red Hat Network server for
spacewalk-commits@lists.fedorahosted.org