diff --git a/.cvsignore b/.cvsignore index bbc4fbd..4f914bb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -koji-1.1.tar.bz2 +koji-1.2.0.tar.bz2 diff --git a/fedora-packager-setup.sh b/fedora-packager-setup.sh index 7deec12..a608c91 100755 --- a/fedora-packager-setup.sh +++ b/fedora-packager-setup.sh @@ -4,10 +4,15 @@ echo Creating User Koji environment if [ ! -d ~/.koji ]; then mkdir ~/.koji fi +if [ -f ~/.fedora.cert ] && [ -f ~/.koji/client.crt ]; then + if [ ~/.fedora.cert -nt ~/.koji/client.crt ]; then + rm ~/.koji/client.crt + fi +fi if [ ! -f ~/.koji/client.crt ]; then if [ -f ~/.fedora.cert ]; then - cp ~/.fedora.cert ~/.koji/client.crt + cp -l ~/.fedora.cert ~/.koji/client.crt else echo "you need a client cert please download one from https://admin.fedoraproject.org/accounts/gen-cert.cgi" echo "Save it to ~/.koji/client.crt" @@ -17,13 +22,13 @@ if [ ! -f ~/.koji/client.crt ]; then fi if [ -f ~/.fedora-upload-ca.cert ]; then - cp ~/.fedora-upload-ca.cert ~/.koji/clientca.crt + cp -l ~/.fedora-upload-ca.cert ~/.koji/clientca.crt else wget "http://fedoraproject.org/wiki/PackageMaintainers/BuildSystemClientSetup?action=AttachFile&do=get&target=fedora-upload-ca.cert" -O ~/.koji/clientca.crt fi if [ -f ~/.fedora-server-ca.cert ]; then - cp ~/.fedora-server-ca.cert ~/.koji/serverca.crt + cp -l ~/.fedora-server-ca.cert ~/.koji/serverca.crt else wget "http://fedoraproject.org/wiki/PackageMaintainers/BuildSystemClientSetup?action=AttachFile&do=get&target=fedora-server-ca.cert" -O ~/.koji/serverca.crt fi diff --git a/koji.spec b/koji.spec index cab7b5c..ed953e7 100644 --- a/koji.spec +++ b/koji.spec @@ -8,7 +8,7 @@ %define release %{baserelease} %endif Name: koji -Version: 1.1 +Version: 1.2.0 Release: %{release}%{?dist} License: LGPL Summary: Build system tools @@ -51,7 +51,7 @@ Requires(pre): /usr/sbin/useradd Requires: cvs Requires: rpm-build Requires: redhat-rpm-config -Requires: createrepo >= 0.4.4 +Requires: createrepo >= 0.4.8-2 %description builder koji-builder is the daemon that runs on build machines and executes @@ -62,8 +62,6 @@ Summary: Koji Utilities Group: Applications/Internet Requires: postgresql-python Requires: %{name} = %{version}-%{release} -Requires: rpm-build -Requires: createrepo >= 0.4.4 %description utils Utilities for the Koji system @@ -153,9 +151,33 @@ if [ $1 = 0 ]; then fi %changelog +* Tue May 15 2007 Jesse Keating - 1.2.0-2 +- overwrite and hardlink ssl cert for fedora packagers (dgilmore) + +* Tue May 15 2007 Mike Bonnet - 1.2.0-1 +- change version numbering to a 3-token scheme +- install the koji favicon + +* Mon May 14 2007 Mike Bonnet - 1.1-5 +- cleanup koji-utils Requires +- fix encoding and formatting in email notifications +- expand archlist based on ExclusiveArch/BuildArchs +- allow import of rpms without srpms +- commit before linking in prepRepo to release db locks +- remove exec bit from kojid logs and uploaded files (patch by Enrico Scholz) + * Thu May 03 2007 Jesse Keating 1.1-2 - Clean up some of the text in fedora-packager-setup.sh +* Tue May 1 2007 Mike Bonnet - 1.1-4 +- remove spurious Requires: from the koji-utils package + +* Tue May 1 2007 Mike Bonnet - 1.1-3 +- fix typo in BuildNotificationTask (patch provided by Michael Schwendt) +- add the --changelog param to the buildinfo command +- always send email notifications to the package builder and package owner +- improvements to the web UI + * Mon Apr 09 2007 Jesse Keating 1.1-1 - make the output listPackages() consistent regardless of with_dups - prevent large batches of repo deletes from holding up regens diff --git a/sources b/sources index e1d6ddc..74e6bb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9af35f955b1e806515e6e09c9f632eba koji-1.1.tar.bz2 +07e9596d3645834a1386120cab0cb7e2 koji-1.2.0.tar.bz2