From 02a1c68e951760a77bda79d4eaf9e955b66d6b55 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 20 Nov 2012 19:59:20 -0600 Subject: [PATCH] update to upstream 1.7.1 release --- .gitignore | 1 + 0001-mount-all-of-dev.patch | 51 --------------- ...nd-avoid-passing-recently-added-even.patch | 63 ------------------- koji.spec | 11 ++-- sources | 2 +- 5 files changed, 7 insertions(+), 121 deletions(-) delete mode 100644 0001-mount-all-of-dev.patch delete mode 100644 0003-in-taginfo-command-avoid-passing-recently-added-even.patch diff --git a/.gitignore b/.gitignore index 5e70751..983abb7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ koji-1.4.0.tar.bz2 /koji-1.5.0.tar.bz2 /koji-1.6.0.tar.bz2 /koji-1.7.0.tar.bz2 +/koji-1.7.1.tar.bz2 diff --git a/0001-mount-all-of-dev.patch b/0001-mount-all-of-dev.patch deleted file mode 100644 index cf64bbf..0000000 --- a/0001-mount-all-of-dev.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d7311cbd83546a168337df6d267d0f76b1e10fba Mon Sep 17 00:00:00 2001 -From: Jay Greguske -Date: Thu, 17 Feb 2011 15:13:30 -0500 -Subject: [PATCH] mount all of /dev - ---- - builder/kojid | 21 +-------------------- - 1 file changed, 1 insertion(+), 20 deletions(-) - -diff --git a/builder/kojid b/builder/kojid -index 92d40f1..a80ca9d 100755 ---- a/builder/kojid -+++ b/builder/kojid -@@ -1753,9 +1753,7 @@ class ImageTask(BaseTaskHandler): - - # Here we configure mock to bind mount a set of /dev directories - bind_opts = {'dirs' : { -- '/dev/pts' : '/dev/pts', -- '/dev/shm' : '/dev/shm', -- '/dev/mapper' : '/dev/mapper', -+ '/dev' : '/dev', - '/selinux' : '/selinux'} - } - rootopts = {'install_group': inst_group, -@@ -1769,23 +1767,6 @@ class ImageTask(BaseTaskHandler): - # create the mock chroot - self.logger.debug("Initializing image buildroot") - broot.init() -- -- # Create the loopback devices we need -- cmd = 'for i in $(seq 0 7); do mknod /dev/loop$i b 7 $i; done' -- rv = broot.mock(['--chroot', cmd]) -- if rv: -- broot.expire() -- raise koji.LiveCDError, \ -- "Could not create loopback device files: %s" % parseStatus(rv, '"%s"' % cmd) -- -- # Create /dev/urandom -- cmd = 'mknod /dev/urandom c 1 9' -- rv = broot.mock(['--chroot', cmd]) -- if rv: -- broot.expire() -- raise koji.LiveCDError, \ -- "Could not create /dev/urandom: %s" % parseStatus(rv, '"%s"' % cmd) -- - self.logger.debug("Image buildroot ready: " + broot.rootdir()) - return broot - --- -1.7.11.4 - diff --git a/0003-in-taginfo-command-avoid-passing-recently-added-even.patch b/0003-in-taginfo-command-avoid-passing-recently-added-even.patch deleted file mode 100644 index 3390fb0..0000000 --- a/0003-in-taginfo-command-avoid-passing-recently-added-even.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 19de74773d1e946c73161ac0d819812613463e47 Mon Sep 17 00:00:00 2001 -From: Mike McLean -Date: Wed, 6 Jun 2012 18:47:53 -0400 -Subject: [PATCH 03/22] in taginfo command, avoid passing (recently added) - event opts unless needed (otherwise we get an error - from older servers on plain taginfo commands) - ---- - cli/koji | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/cli/koji b/cli/koji -index c292f0f..01ca322 100755 ---- a/cli/koji -+++ b/cli/koji -@@ -4104,13 +4104,15 @@ def anon_handle_taginfo(options, session, args): - parser.error(_("Please specify a tag")) - assert False - activate_session(session) -- event = koji.util.eventFromOpts(session, options) or {} -+ event = koji.util.eventFromOpts(session, options) -+ event_opts = {} - if event: - event['timestr'] = time.asctime(time.localtime(event['ts'])) - print "Querying at event %(id)i (%(timestr)s)" % event -+ event_opts['event'] = event['id'] - perms = dict([(p['id'], p['name']) for p in session.getAllPerms()]) - for tag in args: -- info = session.getTag(tag, event=event.get('id')) -+ info = session.getTag(tag, **event_opts) - if info is None: - print "No such tag: %s\n" % tag - continue -@@ -4124,8 +4126,8 @@ def anon_handle_taginfo(options, session, args): - if session.mavenEnabled(): - print "Maven support?: %s" % (info['maven_support'] and 'yes' or 'no') - print "Include all Maven archives?: %s" % (info['maven_include_all'] and 'yes' or 'no') -- dest_targets = session.getBuildTargets(destTagID=info['id'], event=event.get('id')) -- build_targets = session.getBuildTargets(buildTagID=info['id'], event=event.get('id')) -+ dest_targets = session.getBuildTargets(destTagID=info['id'], **event_opts) -+ build_targets = session.getBuildTargets(buildTagID=info['id'], **event_opts) - repos = {} - if not event: - for target in dest_targets + build_targets: -@@ -4149,13 +4151,13 @@ def anon_handle_taginfo(options, session, args): - print "Targets that build from this tag:" - for target in build_targets: - print " %s" % target['name'] -- external_repos = session.getTagExternalRepos(tag_info=info['id'], event=event.get('id')) -+ external_repos = session.getTagExternalRepos(tag_info=info['id'], **event_opts) - if external_repos: - print "External repos:" - for rinfo in external_repos: - print " %(priority)3i %(external_repo_name)s (%(url)s)" % rinfo - print "Inheritance:" -- for parent in session.getInheritanceData(tag, event=event.get('id')): -+ for parent in session.getInheritanceData(tag, **event_opts): - flags = '' - for code,expr in ( - ('M',parent['maxdepth'] is not None), --- -1.7.11.4 - diff --git a/koji.spec b/koji.spec index c896ae8..2f667ff 100644 --- a/koji.spec +++ b/koji.spec @@ -1,16 +1,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: koji -Version: 1.7.0 -Release: 7%{?dist} +Version: 1.7.1 +Release: 1%{?dist} License: LGPLv2 and GPLv2+ # koji.ssl libs (from plague) are GPLv2+ Summary: Build system tools Group: Applications/System URL: http://fedorahosted.org/koji Patch0: fedora-config.patch -Patch1: 0003-in-taginfo-command-avoid-passing-recently-added-even.patch -Patch2: 0001-mount-all-of-dev.patch Source: https://fedorahosted.org/released/koji/koji-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -124,8 +122,6 @@ koji-web is a web UI to the Koji system. %prep %setup -q %patch0 -p1 -b .orig -%patch1 -p1 -%patch2 -p1 %build @@ -229,6 +225,9 @@ if [ $1 = 0 ]; then fi %changelog +* Wed Nov 21 2012 Dennis Gilmore - 1.7.1-1 +- update to upstream 1.7.1 release + * Sat Sep 01 2012 Dennis Gilmore - 1.7.0-7 - add patch to mount all of /dev on appliances and lives diff --git a/sources b/sources index 90e04d9..87d1173 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84be4c5d35ccaa11a3f00191db5fd2e8 koji-1.7.0.tar.bz2 +d150f499260f5180f1340a0e11f2d64c koji-1.7.1.tar.bz2