[cumin] Update cumin.spec to keep it in line with recent changes to source trunk.

[Trevor McKay]

commit cbe16760f8cdc03a6b6fd5bf9e08aea360b622b2
Author: Trevor McKay <tmckay at redhat.com>
Date:   Wed Feb 15 11:54:27 2012 -0500

    Update cumin.spec to keep it in line with recent changes to source trunk.

 cumin.spec         |   41 +++++++++++++++++++++--------------------
 fetch-new-tarball  |   12 ++++++++++++
 svn-export-tarball |   27 +++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 20 deletions(-)
---
diff --git a/cumin.spec b/cumin.spec
index 1cbd5e0..460d2f7 100644
--- a/cumin.spec
+++ b/cumin.spec
@@ -1,12 +1,11 @@
 Summary:        MRG management web console
 Name:           cumin
-Version:        0.1.5137
-Release:        5%{?dist}
+Version:        0.1.5220
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://svn.fedorahosted.org/svn/cumin
 Source0:        http://fedorahosted.org/releases/c/u/cumin/%{name}-%{version}.tar.gz
-Patch0:         cumin-database.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python
@@ -16,12 +15,9 @@ Requires:       python
 Requires:       postgresql
 Requires:       postgresql-server
 Requires:       python-qpid-qmf
-Requires:       python-qpid
-Requires:       pycairo
 Requires:       python-wallaby
 Requires:       python-psycopg2
 Requires:       python-suds
-Requires:       liberation-sans-fonts
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -38,7 +34,6 @@ of MRG.
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 
@@ -50,7 +45,14 @@ rm -rf %{buildroot}
 # Relocate stuff to linux system locations
 
 install -d %{buildroot}%{_bindir}
-install -pm 755 %{buildroot}%{cumin_home}/bin/* %{buildroot}%{_bindir}
+install -pm 755 %{buildroot}%{cumin_home}/bin/cumin %{buildroot}%{_bindir}
+install -pm 755 %{buildroot}%{cumin_home}/bin/cumin-web %{buildroot}%{_bindir}
+install -pm 755 %{buildroot}%{cumin_home}/bin/cumin-data %{buildroot}%{_bindir}
+
+# Put root-only programs in /usr/sbin
+install -d %{buildroot}%{_sbindir}
+install -pm 755 %{buildroot}%{cumin_home}/bin/cumin-admin %{buildroot}%{_sbindir}
+install -pm 755 %{buildroot}%{cumin_home}/bin/cumin-database %{buildroot}%{_sbindir}
 rm -rf %{buildroot}%{cumin_home}/bin
 
 install -d %{buildroot}%{cumin_doc}
@@ -58,9 +60,7 @@ install -pm 644 %{buildroot}%{cumin_home}/doc/* %{buildroot}%{cumin_doc}
 rm -rf %{buildroot}%{cumin_home}/doc
 
 install -d %{buildroot}%{cumin_etc}
-#install -pm 644 %{buildroot}%{cumin_home}/etc/cumin.* %{buildroot}%{cumin_etc}
 install -pm 644 %{buildroot}%{cumin_home}/etc/cumin.conf %{buildroot}%{cumin_etc}
-#install -pm 755 %{buildroot}%{cumin_home}/etc/sysvinit-cumin %{buildroot}%{_sysconfdir}/rc.d/init.d/cumin
 install -d %{buildroot}%{_unitdir}
 install -pm 644 %{buildroot}%{cumin_home}/etc/cumin.service %{buildroot}%{_unitdir}
 rm -rf %{buildroot}%{cumin_home}/etc
@@ -108,17 +108,10 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/cumin
-%{_bindir}/cumin-admin
-%{_bindir}/cumin-admin-test
-%{_bindir}/cumin-bench
-%{_bindir}/cumin-data
-%{_bindir}/cumin-database
 %{_bindir}/cumin-web
-%{_bindir}/cumin-test
-%{_bindir}/cumin-smoke-test
-%{_bindir}/cumin-command-test
-%{_bindir}/cumin-data-test
-%{_bindir}/cumin-web-test
+%{_bindir}/cumin-data
+%{_sbindir}/cumin-admin
+%{_sbindir}/cumin-database
 %{cumin_home}
 %attr(-,cumin,cumin) %{cumin_log}
 %attr(600,cumin,cumin) %config(noreplace) %{cumin_etc}/cumin.conf
@@ -126,6 +119,14 @@ rm -rf %{buildroot}
 %doc %{cumin_doc}/*
 
 %changelog
+* Wed Jan 15 2012 Trevor McKay <tmckay at redhat.com> - 0.1.5220-1
+- Tweak dependencies again, python-qpid-qmf requires python-qpid now
+- Remove dependencies on pycairo and liberation-sans-fonts (new
+- sources in trunk remove flash and the need for pycairo)
+- Move root-only programs to /usr/sbin
+- Remove test programs on installation
+- cumin-database.patch no longer necessary
+
 * Fri Jan 13 2012 Trevor McKay <tmckay at redhat.com> - 0.1.5137-5
 - Patch cumin-database to use postgresql-setup initdb if available
 
diff --git a/fetch-new-tarball b/fetch-new-tarball
new file mode 100755
index 0000000..2ce2e2b
--- /dev/null
+++ b/fetch-new-tarball
@@ -0,0 +1,12 @@
+#!/bin/bash -ex
+
+which svn fgrep cut svn-export-tarball > /dev/null
+url="http://svn.fedorahosted.org/svn/cumin/trunk"
+
+if [ $# = 1 ]; then
+    rev="$1"
+else
+    rev=$(svn info -r HEAD "$url" | fgrep Revision | cut -d " "  -f 2)
+fi
+
+svn-export-tarball "$url" "$rev" "cumin-0.1.${rev}"
diff --git a/svn-export-tarball b/svn-export-tarball
new file mode 100755
index 0000000..06b23ec
--- /dev/null
+++ b/svn-export-tarball
@@ -0,0 +1,27 @@
+#!/bin/bash -ex
+
+which svn tar rm mktemp >/dev/null
+
+if [ $# != 3 ]; then
+    echo "Usage: svn-export-tarball SVN-URL SVN-REVISION NAME-VERSION"
+    echo "Example: svn-export-tarball http://anonsvn.jboss.org/repos/rhmessaging/cumin 2144 cumin-0.1.2144"
+    exit 1
+fi
+
+url=$1
+revision=$2
+namever=$3
+tarball="${namever}.tar.gz"
+tmpdir=$(mktemp -d)
+
+trap "rm -rf ${tmpdir}" EXIT
+
+if [ -e "$tarball" ]; then
+    echo "Tarball ${tarball} already exists"
+    exit 1
+fi
+
+svn export -r "$revision" "$url" "${tmpdir}/${namever}"
+tar -C "$tmpdir" -czf "$tarball" "$namever"
+
+echo "Created ${tarball}"