diff --git a/.gitignore b/.gitignore index a359a58..38eac8b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ fedora-packager-0.5.1.2.tar.bz2 /fedora-packager-0.5.9.3.tar.bz2 /fedora-packager-0.5.9.4.tar.bz2 /fedora-packager-0.5.9.5.tar.bz2 +/fedora-packager-0.5.9.6.tar.bz2 diff --git a/0001-Don-t-error-out-just-from-stderr-from-rpm.patch b/0001-Don-t-error-out-just-from-stderr-from-rpm.patch deleted file mode 100644 index 785c74d..0000000 --- a/0001-Don-t-error-out-just-from-stderr-from-rpm.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9ff587cf36f042f12e8c350f8897b13690a984fd Mon Sep 17 00:00:00 2001 -From: Jesse Keating -Date: Fri, 11 Feb 2011 02:15:18 -0700 -Subject: [PATCH] Don't error out just from stderr from rpm - -Rpm can be bitchy, but also return 0, so handle that. Also try to do -something meaningful / useful with the error output. ---- - src/pyfedpkg/__init__.py | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py -index 3bb414d..a9d090f 100644 ---- a/src/pyfedpkg/__init__.py -+++ b/src/pyfedpkg/__init__.py -@@ -109,7 +109,15 @@ def _name_from_spec(spec): - except OSError, e: - raise FedpkgError(e) - if error: -- raise FedpkgError(error) -+ if sys.stdout.isatty(): -+ sys.stderr.write(error) -+ else: -+ # Yes, we could wind up sending error output to stdout in the -+ # case of no local tty, but I don't have a better way to do this. -+ log.info(error) -+ if proc.returncode: -+ raise FedpkgError('Could not parse the spec, exited %s' % -+ proc.returncode) - return output.split()[0] - - def _run_command(cmd, shell=False, env=None, pipe=[], cwd=None): --- -1.7.4 - diff --git a/fedora-packager-0.5.9.2-pkgowners-url.patch b/fedora-packager-0.5.9.2-pkgowners-url.patch deleted file mode 100644 index cf2652a..0000000 --- a/fedora-packager-0.5.9.2-pkgowners-url.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up fedora-packager-0.5.9.2/src/fedoradev-pkgowners.old fedora-packager-0.5.9.2/src/fedoradev-pkgowners ---- fedora-packager-0.5.9.2/src/fedoradev-pkgowners.old 2009-12-23 02:48:16.000000000 +0200 -+++ fedora-packager-0.5.9.2/src/fedoradev-pkgowners 2011-08-27 19:36:43.671428336 +0300 -@@ -85,12 +85,12 @@ this_init() - - # download owners - tmpfile_owners=$(mktemp -t ${myprog_name}.XXXXXXXXX) -- wget --quiet --output-document="${tmpfile_owners}" "https://admin.fedoraproject.org/pkgdb/acls/bugzilla?tg_format=plain" -+ wget --quiet --output-document="${tmpfile_owners}" "https://admin.fedoraproject.org/pkgdb/lists/bugzilla?tg_format=plain" - - # did download of owners succeed? - local returncode=$? - if (( ${returncode} > 0 )) || [[ ! -s "${tmpfile_owners}" ]] ; then -- echo "Could not download informations about owners from"$'\n'"https://admin.fedoraproject.org/pkgdb/acls/bugzilla?tg_format=plain ; aborting!" >&2 -+ echo "Could not download informations about owners from"$'\n'"https://admin.fedoraproject.org/pkgdb/lists/bugzilla?tg_format=plain ; aborting!" >&2 - this_finish - exit 2 - fi -@@ -168,7 +168,7 @@ myprog_help() - echo " --fasfile -- get email or real name from fas-file ; download uri:" - echo " https://admin.fedora.redhat.com/accounts/dump-group.cgi?group=cvsextras&format=csv" - echo " --pkgdbfile -- get pkgowners from local file instead of downloading it from:" -- echo " https://admin.fedoraproject.org/pkgdb/acls/bugzilla?tg_format=plain" -+ echo " https://admin.fedoraproject.org/pkgdb/lists/bugzilla?tg_format=plain" - echo " --realname -- print realname (needs --fasfile )" - echo - echo " --help -- this text" diff --git a/fedora-packager.spec b/fedora-packager.spec index 48ce108..052deed 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -3,7 +3,7 @@ %endif Name: fedora-packager -Version: 0.5.9.5 +Version: 0.5.9.6 Release: 1%{?dist} Summary: Tools for setting up a fedora maintainer environment @@ -11,8 +11,6 @@ Group: Applications/Productivity License: GPLv2+ URL: https://fedorahosted.org/fedora-packager Source0: https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-%{version}.tar.bz2 -# Patch correct url for fedoradev-pkgowners to work correctly -Patch0: fedora-packager-0.5.9.2-pkgowners-url.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel @@ -46,7 +44,6 @@ Provides fedora-cert and the fedora_cert python library %prep %setup -q -%patch0 -p1 %build %configure @@ -67,6 +64,8 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING TODO AUTHORS ChangeLog %{_bindir}/* %{_sbindir}/* +%dir %{_sysconfdir}/koji +%config(noreplace) %{_sysconfdir}/koji/* %exclude %{_bindir}/fedora-cert %files -n fedora-cert @@ -77,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 08 2011 Jesse Keating - 0.5.9.6-1 +- Install secondary-arch files correctly + * Mon Nov 07 2011 Jesse Keating - 0.5.9.5-1 - Move fedpkg to it's own package, no longer part of fedora-packager diff --git a/sources b/sources index 5638ace..9afcbd8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -17a65f6660459d686e3c2d4d4635050c fedora-packager-0.5.9.5.tar.bz2 +408cc2ba61dbb53e943a4073c120fe24 fedora-packager-0.5.9.6.tar.bz2