rpms/rhm/F-8 rhm.spec,1.10,1.11

[Nuno Santos (nsantos)]

Author: nsantos

Update of /cvs/extras/rpms/rhm/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7922

Modified Files:
	rhm.spec 
Log Message:
import specfile


Index: rhm.spec
===================================================================
RCS file: /cvs/extras/rpms/rhm/F-8/rhm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rhm.spec	1 Jul 2008 19:50:50 -0000	1.10
+++ rhm.spec	2 Jul 2008 16:59:41 -0000	1.11
@@ -3,12 +3,12 @@
 #
 
 %define svnrev 2153
-# built against qpidc svn rev 667603
+# built against qpidc svn rev xxx
 
 Name:           rhm
 Version:        0.2.%{svnrev}
 Release:        1%{?dist}
-Summary:        Red Hat extensions to the Qpid messaging system
+Summary:        Red Hat persistence extension to the Qpid messaging system
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://rhm.et.redhat.com/rhm
@@ -20,23 +20,17 @@
 BuildRequires: qpidc-devel
 BuildRequires: qpidd-devel
 BuildRequires: db4-devel
-# TODO: Workaround missing dependency in qpidd-devel. Remove this
-# when qpid-devel is updated.
-BuildRequires: e2fsprogs-devel
 BuildRequires: libaio-devel
 BuildRequires: python
 BuildRequires: libtool
 
-Requires: qpidd
+Requires: qpidd >= 0.2.667603
 Requires: db4
 Requires: libaio
 
-Requires(preun):/sbin/service
-Requires(postun):/sbin/service
-
 %description
-Red Hat extensions to the Qpid AMQP broker: persistent message storage
-in Berkeley DB.
+Red Hat persistence extension to the Qpid AMQP broker: persistent message storage
+using either a libaio-based asynchronous journal, or synchronously with Berkeley DB.
 
 %prep
 %setup -q
@@ -48,12 +42,13 @@
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-install -Dp -m0755 etc/rhmd %{buildroot}%{_initrddir}/rhmd
-install -Dp -m0755 etc/rhmd.sh %{buildroot}%{_sbindir}/rhmd
-install -d  -m0775 %{buildroot}%{_localstatedir}/rhm
+install -d -m0775 %{buildroot}%{_localstatedir}/rhm
+install -d -m0755 %{buildroot}%{_libdir}/qpidd
+cp -a %{buildroot}%{_libdir}/libbdbstore.so* %{buildroot}%{_libdir}/qpidd
 rm -f %{buildroot}%_libdir/*.a
 rm -f %{buildroot}%_libdir/*.la
-rm -f %{buildroot}%_libdir/*.so
+rm -f %{buildroot}%_libdir/*.so*
+rm %{buildroot}%_sysconfdir/rhmd.conf
 
 %clean
 rm -rf %{buildroot}
@@ -64,35 +59,37 @@
 %files
 %defattr(-,root,root,-)
 %doc README COPYING
-%_libdir/libbdbstore.so.0
-%_libdir/libbdbstore.so.0.1.0
-%_initrddir/rhmd
-%_sbindir/rhmd
-#%attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm
-%config(noreplace) %_sysconfdir/rhmd.conf
-
-%post
-# This adds the proper /etc/rc*.d links for the script
-/sbin/chkconfig --add rhmd
-/sbin/ldconfig
-
-%preun
-# Check that this is actual deinstallation, not just removing for upgrade.
-if [ $1 = 0 ]; then
-  /sbin/service rhmd stop >/dev/null 2>&1 || :
-  /sbin/chkconfig --del rhmd
-fi
-
-%postun
-if [ "$1" -ge "1" ]; then
-  /sbin/service rhmd restart >/dev/null 2>&1 || :
-fi
-/sbin/ldconfig
+%{_libdir}/qpidd/libbdbstore.so*
+%attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm
 
 
 %changelog
-* Tue Jul  1 2008 Nuno Santos <nsantos at redhat.com> - 0.2.2153-1
-- MRG GA release
+* Mon Jun 16 2008 Kim van der Riet <kim.vdriet at redhat.com> - 0.2.2153-1
+- Rebased to rev.2153
+- Added qpidd rev no dependency
+
+* Fri Jun 12 2008 Kim van der Riet <kim.vdriet at redhat.com> - 0.2.2150-1
+- Rebased to rev.2150
+
+* Fri Jun 12 2008 Kim van der Riet <kim.vdriet at redhat.com> - 0.2.2148-3
+- Changed the installation mechanism for libs
+
+* Fri Jun 11 2008 Justin Ross <jross at redhat.com> - 0.2.2148-2
+- Use macros for the lib dir
+
+* Fri Jun 10 2008 Kim van der Riet <kim.vdriet at redhat.com> - 0.2.2148-1
+- rebase to rev 2148
+- imported nsantos' rhmd fixes
+
+* Fri Jun 10 2008 Kim van der Riet <kim.vdriet at redhat.com> - 0.2.2146-1
+- rebase to rev 2146
+- removed refs to dir /etc/rhmd
+
+* Fri Jun 6 2008 Kim van der Riet <kim.vdriet at redhat.com> - 0.2.2144-1
+- rebase to rev 2144
+
+* Wed Jun 4 2008 Kim van der Riet <kim.vdriet at redhat.com> - 0.2.2131-1
+- rebase to rev 2131
 
 * Thu May 15 2008 Nuno Santos <nsantos at redhat.com> - 0.2.2055-1
 - bumped for Beta 4