[cumin] Update to revision 5518

[Trevor McKay]

commit 22b62b3b78413317d3af39aee6fac283467225a6
Author: Trevor McKay <tmckay at redhat.com>
Date:   Wed Oct 24 17:19:00 2012 -0400

    Update to revision 5518

 .gitignore |    1 +
 cumin.spec |  131 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 sources    |    2 +-
 3 files changed, 116 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d10ab7d..d30c9e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /cumin-0.1.5137.tar.gz
 /cumin-0.1.5220.tar.gz
+/cumin-0.1.5518.tar.gz
diff --git a/cumin.spec b/cumin.spec
index 402fcc5..161a802 100644
--- a/cumin.spec
+++ b/cumin.spec
@@ -1,7 +1,7 @@
 Summary:        MRG management web console
 Name:           cumin
-Version:        0.1.5220
-Release:        2%{?dist}
+Version:        0.1.5518
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://svn.fedorahosted.org/svn/cumin
@@ -18,6 +18,7 @@ Requires:       python-qpid-qmf
 Requires:       python-wallaby
 Requires:       python-psycopg2
 Requires:       python-suds
+Requires:       python-ldap
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -31,6 +32,7 @@ of MRG.
 %global cumin_doc %{_defaultdocdir}/cumin-%{version}
 %global cumin_etc %{_sysconfdir}/cumin
 %global cumin_log %{_localstatedir}/log/cumin
+%global cumin_d /cumin.conf.d
 
 %prep
 %setup -q
@@ -60,6 +62,7 @@ install -pm 644 %{buildroot}%{cumin_home}/doc/* %{buildroot}%{cumin_doc}
 rm -rf %{buildroot}%{cumin_home}/doc
 
 install -d %{buildroot}%{cumin_etc}
+install -d %{buildroot}%{cumin_etc}%{cumin_d}
 install -pm 644 %{buildroot}%{cumin_home}/etc/cumin.conf %{buildroot}%{cumin_etc}
 install -d %{buildroot}%{_unitdir}
 install -pm 644 %{buildroot}%{cumin_home}/etc/cumin.service %{buildroot}%{_unitdir}
@@ -80,27 +83,38 @@ getent passwd cumin > /dev/null || \
 %post
 if [ ! -h %{cumin_home}/log ]; then
     # Link to the system log location
-
     ln -s %{cumin_log} %{cumin_home}/log  
 fi
-if [ $1 -eq 1 ] ; then 
-    # Initial installation
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%if 0%{?systemd_post:1}
+    %systemd_post cumin.service
+%else
+    if [ $1 -eq 1 ] ; then 
+        # Initial installation
+        /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+    fi
+%endif
 
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable cumin.service > /dev/null 2>&1 || :
-    /bin/systemctl stop cumin.service > /dev/null 2>&1 || :
-fi
+%if 0%{?systemd_preun:1}
+    %systemd_preun cumin.service
+%else
+    if [ $1 -eq 0 ] ; then
+        # Package removal, not upgrade
+        /bin/systemctl --no-reload disable cumin.service > /dev/null 2>&1 || :
+        /bin/systemctl stop cumin.service > /dev/null 2>&1 || :
+    fi
+%endif
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart cumin.service >/dev/null 2>&1 || :
-fi
+%if 0%{?systemd_postun:1}
+    %systemd_postun cumin.service
+%else
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+    if [ $1 -ge 1 ] ; then
+        # Package upgrade, not uninstall
+        /bin/systemctl try-restart cumin.service >/dev/null 2>&1 || :
+    fi
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -115,10 +129,93 @@ rm -rf %{buildroot}
 %{cumin_home}
 %attr(-,cumin,cumin) %{cumin_log}
 %attr(600,cumin,cumin) %config(noreplace) %{cumin_etc}/cumin.conf
+%attr(-,cumin,cumin) %{cumin_etc}%{cumin_d}
 %{_unitdir}/cumin.service
 %doc %{cumin_doc}/*
 
 %changelog
+* Tue Oct 23 2012 Trevor McKay <tmckay at redhat.com> - 0.1.5518-1
+- Add dependency on python-ldap
+- Add creation of /etc/cumin/cumin.conf.d for future use
+- Add use of systemd macros for F18+
+- Many, many bug fixes since 5137:
+
+- BZ438142
+- BZ635207
+- BZ699487
+- BZ703859
+- BZ705358
+- BZ733516
+- BZ737979
+- BZ739658
+- BZ748735
+- BZ750196
+- BZ751779
+- BZ752732
+- BZ756384
+- BZ760567
+- BZ765713
+- BZ765846
+- BZ765894
+- BZ767232
+- BZ768298
+- BZ769753
+- BZ771642
+- BZ772105
+- BZ782359
+- BZ782485
+- BZ782839
+- BZ782902
+- BZ783139
+- BZ785551
+- BZ785863
+- BZ787138
+- BZ789351
+- BZ796798
+- BZ799129
+- BZ799382
+- BZ799404
+- BZ800065
+- BZ800611
+- BZ800624
+- BZ801047
+- BZ801287
+- BZ801291
+- BZ802698
+- BZ802704
+- BZ805029
+- BZ807838 
+- BZ807912
+- BZ807970
+- BZ809006
+- BZ809369
+- BZ812407
+- BZ814386
+- BZ815316
+- BZ820681
+- BZ823506
+- BZ830243
+- BZ830245
+- BZ830854
+- BZ831203
+- BZ831235
+- BZ831244
+- BZ837037
+- BZ837047
+- BZ839576
+- BZ840112
+- BZ840121
+- BZ840123
+- BZ840133
+- BZ846010
+- BZ846345
+- BZ846349
+- BZ847940
+- BZ848344
+- BZ850759
+- BZ851205
+- BZ853454 
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.5220-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 5154005..83f2109 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3907ac1e74657a819707f9d183280058  cumin-0.1.5220.tar.gz
+347ff72ddfd763a27e8453e81f8174e8  cumin-0.1.5518.tar.gz