[hail] Fix bz#850142

[Pete Zaitcev]

commit 50d430adbbf1ee611d4f29a9b1d5e082626a7ee9
Author: Pete Zaitcev <zaitcev at kotori.zaitcev.us>
Date:   Mon Jan 21 19:59:58 2013 -0700

    Fix bz#850142
    
    Since this is Rawhide, and the package is not very important,
    also address the following:
     - Make the spec tab-clean with rpmlint check
     - Make sure this builds on Rawhide where the TeX had packages split
     - Drop the automatic conversions with systemd-sysv
    
    The TeX thing is needed by Doxygen, and it's naaaaasty. Apparently
    there is no suitable collection, so we had to add a few cherry-picked
    BuildRequires.

 hail.spec |   90 +++++++++++++++++++------------------------------------------
 1 files changed, 28 insertions(+), 62 deletions(-)
---
diff --git a/hail.spec b/hail.spec
index c148606..d5a93ea 100644
--- a/hail.spec
+++ b/hail.spec
@@ -1,6 +1,6 @@
 Name:		hail
 Version:	0.8
-Release:	0.10.gf9c5b967%{?dist}
+Release:	0.11.gf9c5b967%{?dist}
 Summary:	Project Hail core cloud services
 
 Group:		System Environment/Libraries
@@ -18,16 +18,22 @@ Source3:	cld.sysconf
 Source4:	chunkd.service
 Source5:	chunkd.sysconf
 
-Patch1:         hail-0.8-libdb.patch
-Patch2:         hail-0.8-fixes.patch
+Patch1:		hail-0.8-libdb.patch
+Patch2:		hail-0.8-fixes.patch
 
 BuildRequires:	libdb-devel glib2-devel doxygen openssl-devel
-BuildRequires:	texlive-latex fuse-devel libcurl-devel
+BuildRequires:	texlive-cm
+BuildRequires:	texlive-collection-latexextra
+BuildRequires:	texlive-collection-htmlxml
+BuildRequires:	texlive-latex-bin
+BuildRequires:	texlive-natbib
+BuildRequires:	texlive-pdftex-def
+BuildRequires:	fuse-devel libcurl-devel
 BuildRequires:	libxml2-devel procps tokyocabinet-devel
 BuildRequires:	systemd-units
 
 # These are only needed because we patch configure.am, to accomodate libdb.
-BuildRequires:  autoconf automake libtool
+BuildRequires:	autoconf automake libtool
 
 %description
 Core libraries and document associated with cloud computing related
@@ -37,10 +43,9 @@ Project Hail.
 Summary: Coarse locking service for %{name}
 Group: System Environment/Base
 Requires: %{name} = %{version}-%{release}
-Requires(post): systemd-sysv
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 
 %description -n cld
 Coarse locking daemon for cloud computing.  This software provides
@@ -55,10 +60,9 @@ and reliable small file storage.
 Summary: Single-node data storage service for %{name}
 Group: System Environment/Base
 Requires: %{name} = %{version}-%{release}
-Requires(post): systemd-sysv
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 
 %description -n chunkd
 Single-node data storage daemon for cloud computing.
@@ -125,64 +129,22 @@ make -s check
 %post -p /sbin/ldconfig
 
 %post -n cld
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post cld.service
 
 %preun -n cld
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable cld.service > /dev/null 2>&1 || :
-    /bin/systemctl stop cld.service > /dev/null 2>&1 || :
-fi
+%systemd_preun cld.service
 
 %postun -n cld
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart cld.service >/dev/null 2>&1 || :
-fi
-
-%triggerun -n cld -- cld < 0.8-0.4.gf9c5b967
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply cld
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save cld >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del cld >/dev/null 2>&1 || :
-/bin/systemctl try-restart cld.service >/dev/null 2>&1 || :
+%systemd_postun cld.service
 
 %post -n chunkd
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post chunkd.service
 
 %preun -n chunkd
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable chunkd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop chunkd.service > /dev/null 2>&1 || :
-fi
+%systemd_preun chunkd.service
 
 %postun	-n chunkd
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart chunkd.service >/dev/null 2>&1 || :
-fi
-
-%triggerun -n chunkd -- chunkd < 0.8-0.4.gf9c5b967
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply chunkd
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save chunkd >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del chunkd >/dev/null 2>&1 || :
-/bin/systemctl try-restart chunkd.service >/dev/null 2>&1 || :
+%systemd_postun chunkd.service
 
 %postun -p /sbin/ldconfig
 
@@ -218,6 +180,10 @@ fi
 %doc gendoc/html gendoc/latex/refman.pdf
 
 %changelog
+* Mon Jan 21 2013 Pete Zaitcev <zaitcev at redhat.com> - 0.8-0.11.gf9c5b967
+- Switch to systemd macros for pre/post/postun, bz#850142
+- Add requirement of texlive-latex-bin or else buildroot lacks pdflatex
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-0.10.gf9c5b967
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -227,7 +193,7 @@ fi
 * Mon Mar 19 2012 Pete Zaitcev <zaitcev at redhat.com> - 0.8-0.8.gf9c5b967
 - Move development documentation into noarch devel-doc subpackage, bz#804758
 
-* Wed Jan 24 2012 Pete Zaitcev <zaitcev at redhat.com> - 0.8-0.7.gf9c5b967
+* Wed Jan 25 2012 Pete Zaitcev <zaitcev at redhat.com> - 0.8-0.7.gf9c5b967
 - Fix leaks and crashes in hstor library
 - Add support for subdomain addressing of buckets, bz#784937
 - Force a build against libdb instead of db4