From f0da961450e94cd4446e116b2ffb285d7380a14d Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@fedoraproject.org>
Date: Tue, 4 Dec 2007 06:29:54 +0000
Subject: [PATCH] remove fedora-packager-setup.sh its now part of
 fedora-packager

---
 fedora-packager-setup.sh | 97 ----------------------------------------
 koji.spec                |  7 +--
 2 files changed, 4 insertions(+), 100 deletions(-)
 delete mode 100755 fedora-packager-setup.sh

diff --git a/fedora-packager-setup.sh b/fedora-packager-setup.sh
deleted file mode 100755
index 386f5c3..0000000
--- a/fedora-packager-setup.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-
-set -e
-
-function check_wget() {
-    if [ ! -f /usr/bin/wget ]; then
-        echo "You must have wget installed to download the required CA certificates"
-        echo "Please run \"yum install wget\" as root, and re-run this script"
-        exit 1
-    fi
-}
-
-echo "Setting up Koji client..."
-
-if [ ! -f ~/.fedora.cert ]; then
-    echo "You need a client certificate from the Fedora Account System"
-    echo "Please download one from https://admin.fedoraproject.org/accounts/gen-cert.cgi"
-    echo "Save it to ~/.fedora.cert and re-run this script"
-    exit 1
-fi
-
-if [ ! -f ~/.fedora-upload-ca.cert ]; then
-    check_wget
-    /usr/bin/wget -q "https://admin.fedoraproject.org/accounts/fedora-upload-ca.cert" -O ~/.fedora-upload-ca.cert
-fi
-
-if [ ! -f ~/.fedora-server-ca.cert ]; then
-    check_wget
-    /usr/bin/wget -q "https://admin.fedoraproject.org/accounts/fedora-server-ca.cert" -O ~/.fedora-server-ca.cert
-fi
-
-if [ ! -d ~/.koji ]; then
-    mkdir  ~/.koji
-fi
-
-# remove existing contents of ~/.koji to avoid confusion
-rm -f ~/.koji/*
-
-cat > ~/.koji/config <<EOF
-[koji]
-
-;configuration for koji cli tool
-
-;url of XMLRPC server
-server = http://koji.fedoraproject.org/kojihub
-
-;url of web interface
-weburl = http://koji.fedoraproject.org/koji
-
-;url of package download site
-pkgurl = http://koji.fedoraproject.org/packages
-
-;path to the koji top directory
-;topdir = /mnt/koji
-
-;configuration for SSL athentication
-
-;client certificate
-cert = ~/.fedora.cert
-
-;certificate of the CA that issued the client certificate
-ca = ~/.fedora-upload-ca.cert
-
-;certificate of the CA that issued the HTTP server certificate
-serverca = ~/.fedora-server-ca.cert
-
-EOF
-
-cat <<EOF
-Creating an SSL certificate to import into your browser, to enable
-user authentication at http://koji.fedoraproject.org/koji/
-Choose your own passphrase, you will be prompted for this when importing the certificate.
-
-EOF
-
-if [ -f ~/fedora-browser-cert.p12 ]; then
-    rm ~/fedora-browser-cert.p12
-fi
-
-/usr/bin/openssl pkcs12 -export -in ~/.fedora.cert -CAfile ~/.fedora-upload-ca.cert -out ~/fedora-browser-cert.p12
-
-cat <<EOF
-
-Browser certificate exported to ~/fedora-browser-cert.p12
-To import the certificate into Firefox:
-
-Edit -> Preferences -> Advanced
-Click "View Certificates"
-On "Your Certificates" tab, click "Import"
-Select ~/fedora-browser-cert.p12
-Type the export passphrase you chose earlier
-
-Once imported, you should see a certificate named "Fedora Project".
-Your username should appear underneath this.
- 
-You should now be able to click the "login" link at http://koji.fedoraproject.org/koji/ successfully.
-EOF
diff --git a/koji.spec b/koji.spec
index 4fdfe5e..95fdc87 100644
--- a/koji.spec
+++ b/koji.spec
@@ -1,6 +1,6 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define baserelease 1
+%define baserelease 2
 #build with --define 'testbuild 1' to have a timestamp appended to release
 %if x%{?testbuild} == x1
 %define release %{baserelease}.%(date +%%Y%%m%%d.%%H%%M.%%S)
@@ -15,7 +15,6 @@ Summary: Build system tools
 Group: Applications/System
 URL: http://hosted.fedoraproject.org/projects/koji
 Source: %{name}-%{version}.tar.bz2
-Source1: fedora-packager-setup.sh
 Patch0: fedora-config.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -91,7 +90,6 @@ 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
@@ -154,6 +152,9 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
+* Tue Dec 04 2007 Dennis Gilmore <dennis@ausil.us> -1.2.2-2
+- remove fedora-packager-setup.sh it is now part of fedora-packager
+
 * Tue Jun  5 2007 Mike Bonnet <mikeb@redhat.com> - 1.2.2-1
 - only allow admins to perform non-scratch builds from srpm
 - bug fixes to the cmd-line and web UIs