diff --git a/.cvsignore b/.cvsignore index d5034e3..bbc4fbd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -koji-1.0.tar.bz2 +koji-1.1.tar.bz2 diff --git a/fedora-packager-setup.sh b/fedora-packager-setup.sh new file mode 100755 index 0000000..29959e7 --- /dev/null +++ b/fedora-packager-setup.sh @@ -0,0 +1,72 @@ +#!/bin/bash + +echo Creating User Koji environment +if [ ! -d ~/.koji ]; then +mkdir ~/.koji +fi + +if [ ! -f ~/.koji/client.crt ]; then + if [ -f ~/.fedora.cert ]; then + cp ~/.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" + echo "Then run this script again" + exit + fi +fi + +if [ -f ~/.fedora-upload-ca.cert ]; then + cp ~/.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 +else + wget "http://fedoraproject.org/wiki/PackageMaintainers/BuildSystemClientSetup?action=AttachFile&do=get&target=fedora-server-ca.cert" -O ~/.koji/serverca.crt +fi + + +cat > ~/.koji/config < Preferences -> Advanced +Click "View Certificates" +On "Your Certificates" tab, click "Import" +Select fedora-client-cert.p12 +Type the export password (if you specified one) +You should see your username appear under "Fedora Project" + +- You should now be able to click the "login" link on the website successfully" +openssl pkcs12 -export -in ~/.koji/client.crt -CAfile ~/.koji/clientca.crt -out fedora-client-cert.p12 diff --git a/koji.spec b/koji.spec index 09ffa2b..4c2d4b3 100644 --- a/koji.spec +++ b/koji.spec @@ -8,13 +8,14 @@ %define release %{baserelease} %endif Name: koji -Version: 1.0 +Version: 1.1 Release: %{release}%{?dist} License: LGPL Summary: Build system tools Group: Applications/System URL: http://hosted.fedoraproject.org/projects/koji Source: %{name}-%{PACKAGE_VERSION}.tar.bz2 +Source1: fedora-packager-setup.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: python-krbV >= 1.0.13 @@ -89,6 +90,7 @@ koji-web is a web UI to the Koji system. %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install +install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir} %clean rm -rf $RPM_BUILD_ROOT @@ -151,6 +153,12 @@ if [ $1 = 0 ]; then fi %changelog +* 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 +- allow sorting the host list by arches +- Add a script to setup Fedora developer's environment + * Mon Apr 02 2007 Jesse Keating 1.0-1 - Release 1.0! diff --git a/sources b/sources index faf817b..e1d6ddc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -509770ad9155722acf3baa4cb467c2b8 koji-1.0.tar.bz2 +9af35f955b1e806515e6e09c9f632eba koji-1.1.tar.bz2