- rpm: make rpm now builds RPMs under rpm/ directory.

- src/qpidd.cpp: added --daemon option to run as daemon.
- etc/qpidd: fixed bugs in init.rc script.
- qpidc.spec: fixed rpmlint warnings, added apache URL


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489905 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 24 insertions, 15 deletions

diff --git a/cpp/qpidc.spec b/cpp/qpidc.spec
index 6c23227be6..b9be94f62e 100644
--- a/cpp/qpidc.spec
+++ b/cpp/qpidc.spec
@@ -9,12 +9,10 @@ Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        Apache Software License
-URL:            http://incubator.apache.org/qpid/
-# FIXME: Source must be a URL pointing to where the tarball can be downloaded
+URL:            http://people.apache.org/dist/incubator/qpid/M1-incubating/cpp/qpidc-0.1.tar.gz
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# FIXME: The BR's need to be checked against a clean buildroot [lutter]
 BuildRequires: libtool
 BuildRequires: boost-devel
 BuildRequires: cppunit
@@ -23,12 +21,10 @@ BuildRequires: doxygen
 BuildRequires: graphviz
 BuildRequires: help2man
 BuildRequires: pkgconfig
-
-# FIXME: Remove when APR dependency is removed. [aconway]
 BuildRequires: e2fsprogs-devel
 BuildRequires: apr-devel
-Requires: apr
 
+Requires: apr
 Requires: boost
 
 Requires(post):/sbin/chkconfig
@@ -42,7 +38,7 @@ C++. Clients exchange messages with an AMQP message broker using
 the AMQP protocol.
 
 %package devel
-Summary: Header files and documentation for  developing Qpid C++ clients.
+Summary: Header files and documentation for developing Qpid C++ clients
 Group: Development/System
 Requires: %name = %version-%release
 Requires: libtool
@@ -56,7 +52,7 @@ Libraries, header files and documentation for developing AMQP clients
 in C++ using Qpid.  Qpid implements the AMQP messaging specification.
 
 %package -n %{daemon}
-Summary: An AMQP message broker daemon.
+Summary: An AMQP message broker daemon
 Group: System Environment/Daemons
 Requires: %name = %version-%release
 
@@ -69,7 +65,9 @@ the open AMQP messaging protocol.
 
 %build
 %configure
-make %{?_smp_mflags} 
+make %{?_smp_mflags}
+# Remove this generated perl file, we don't need it and it upsets rpmlint.
+rm docs/api/html/installdox
 
 %install
 rm -rf %{buildroot}
@@ -77,6 +75,8 @@ make install DESTDIR=%{buildroot}
 install  -Dp -m0755 etc/qpidd %{buildroot}%{_initrddir}/qpidd
 rm -f %{buildroot}%_libdir/*.a
 rm -f %{buildroot}%_libdir/*.la
+# There's no qpidd-devel package so no .so for the broker needed.
+rm -f %{buildroot}%_libdir/libqpidbroker.so
 
 
 %clean
@@ -99,34 +99,43 @@ make check
 %_libdir/libqpidcommon.so
 %_libdir/libqpidclient.so
 %doc docs/api/html
+# We don't need this perl script and it causes rpmlint to complain.
+# There is probably a more polite way of calculating the devel docdir.
 
 %files -n %{daemon}
-%_libdir/libqpidbroker.so
 %_libdir/libqpidbroker.so.0
 %_libdir/libqpidbroker.so.0.1.0
 %_sbindir/%{daemon}
 %{_initrddir}/qpidd
 %doc %_mandir/man1/%{daemon}.*
 
-%post
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%post -n %{daemon}
 # This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add qpidd
+/sbin/ldconfig
 
-%preun
+%preun -n %{daemon}
 # Check that this is actual deinstallation, not just removing for upgrade.
 if [ $1 = 0 ]; then
         /sbin/service qpidd stop >/dev/null 2>&1 || :
         /sbin/chkconfig --del qpidd
 fi
 
-%postun
+%postun -n %{daemon}
 if [ "$1" -ge "1" ]; then
         /sbin/service qpidd condrestart >/dev/null 2>&1 || :
 fi
+/sbin/ldconfig
 
 %changelog
-* Mon Dec 19 2006 Alan Conway <aconway@redhat.com> - 0.1-1
-- Fixed problems with qpidd init script and doc files.
+
+* Mon Dec 22 2006 Alan Conway <aconway@redhat.com> - 0.1-1
+- Fixed all rpmlint complaints (with help from David Lutterkort) 
+- Added qpidd --daemon behaviour, fix init.rc scripts
 
 * Fri Dec  8 2006 David Lutterkort <dlutter@redhat.com> - 0.1-1
 - Initial version based on Jim Meyering's sketch and discussions with Alan