You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2006/12/20 15:40:10 UTC
svn commit: r489103 - in /incubator/qpid/trunk/qpid/cpp: ./ Makefile.am
README.txt docs/api/Makefile.am etc/init.d/ etc/qpidd qpidc.spec
Author: aconway
Date: Wed Dec 20 06:40:09 2006
New Revision: 489103
URL: http://svn.apache.org/viewvc?view=rev&rev=489103
Log:
make rpm in cpp directory builds qpidc RPMs in default locations.
Note: you need to chown or chmod the directories under
/usr/src/redhat/RPMS/i386 to be writable for this to work, there is
probably a better solution. Building RPMs as root is a Bad Idea.
Added:
incubator/qpid/trunk/qpid/cpp/etc/qpidd
- copied unchanged from r488706, incubator/qpid/trunk/qpid/cpp/etc/init.d/qpidd
Removed:
incubator/qpid/trunk/qpid/cpp/etc/init.d/
Modified:
incubator/qpid/trunk/qpid/cpp/ (props changed)
incubator/qpid/trunk/qpid/cpp/Makefile.am
incubator/qpid/trunk/qpid/cpp/README.txt
incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
incubator/qpid/trunk/qpid/cpp/qpidc.spec
Propchange: incubator/qpid/trunk/qpid/cpp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Dec 20 06:40:09 2006
@@ -11,3 +11,4 @@
config.in
qpid-cpp-0.1.tar.bz2
qpid-cpp-0.1.tar.gz
+config.cache
Modified: incubator/qpid/trunk/qpid/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/Makefile.am?view=diff&rev=489103&r1=489102&r2=489103
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile.am Wed Dec 20 06:40:09 2006
@@ -1,10 +1,7 @@
AUTOMAKE_OPTIONS = 1.9.2 foreign
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = README.txt README-dev DESIGN LICENSE.txt NOTICE.txt README.rhel3
-dist_doc_DATA = README.txt
-
-dist_sysconf_DATA = etc/init.d/qpidd
+EXTRA_DIST = README-dev DESIGN LICENSE.txt NOTICE.txt README.rhel3 README.txt etc/qpidd
SUBDIRS = gen lib tests src docs/api docs/man
@@ -12,3 +9,15 @@
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
+# Convenience targets for making RPMs.
+RPM_TAR=/usr/src/redhat/SOURCES/$(distdir).tar.gz
+
+$(RPM_TAR): dist-gzip
+ cp $(distdir).tar.gz $(RPM_TAR)
+ rpmbuild -bs -v qpidc.spec
+
+srpm: $(RPM_TAR)
+ rpmbuild -bs -v qpidc.spec
+
+rpm: $(RPM_TAR)
+ rpmbuild -ba -v qpidc.spec
Modified: incubator/qpid/trunk/qpid/cpp/README.txt
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/README.txt?view=diff&rev=489103&r1=489102&r2=489103
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/README.txt (original)
+++ incubator/qpid/trunk/qpid/cpp/README.txt Wed Dec 20 06:40:09 2006
@@ -1 +1,15 @@
-TODO: Fill in this readme!
+
+Qpid C++ is a C++ implementation of the AMQP protcol described at
+http://amqp.org/
+
+For instructions on using the Qpid broker daemon see man qpidd(1)
+
+For information on the C++ client API see ./html/index.html
+
+Note the daemon and client API can be installed separately.
+
+The Qpid project also provides Java, Ruby and Python implementations.
+
+For additional software or information on the Qpid project go to:
+ http://incubator.apache.org/qpid/index.html
+
Modified: incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am?view=diff&rev=489103&r1=489102&r2=489103
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/docs/api/Makefile.am Wed Dec 20 06:40:09 2006
@@ -3,7 +3,7 @@
dist-hook: html
-nobase_dist_doc_DATA=$(wildcard html/*)
+EXTRA_DIST=html
SOURCES = \
$(wildcard $(topsrcdir)/gen/*.h) \
Modified: incubator/qpid/trunk/qpid/cpp/qpidc.spec
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/qpidc.spec?view=diff&rev=489103&r1=489102&r2=489103
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/qpidc.spec (original)
+++ incubator/qpid/trunk/qpid/cpp/qpidc.spec Wed Dec 20 06:40:09 2006
@@ -1,9 +1,14 @@
+#
+# Spec file for Qpid C++ packages: qpidc qpidc-devel, qpidd
+#
+%define daemon qpidd
+
Name: qpidc
Version: 0.1
Release: 1%{?dist}
-Summary: Libraries for Qpid C++ client applications.
-Group: System Environment/Libraries
-License: Apache
+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
Source0: %{name}-%{version}.tar.gz
@@ -26,6 +31,11 @@
Requires: boost
+Requires(post):/sbin/chkconfig
+Requires(preun):/sbin/chkconfig
+Requires(preun):/sbin/service
+Requires(postun): /sbin/service
+
%description
Run-time libraries for AMQP client applications developed using Qpid
C++. Clients exchange messages with an AMQP message broker using
@@ -34,7 +44,7 @@
%package devel
Summary: Header files and documentation for developing Qpid C++ clients.
Group: Development/System
-Requires: %name-client = %version-%release
+Requires: %name = %version-%release
Requires: libtool
Requires: apr-devel
Requires: boost-devel
@@ -45,13 +55,12 @@
Libraries, header files and documentation for developing AMQP clients
in C++ using Qpid. Qpid implements the AMQP messaging specification.
-%define daemon qpidd
%package -n %{daemon}
Summary: An AMQP message broker daemon.
Group: System Environment/Daemons
-Requires: %name-client = %version-%release
+Requires: %name = %version-%release
-%description %{daemon}
+%description -n %{daemon}
A message broker daemon that receives stores and routes messages using
the open AMQP messaging protocol.
@@ -63,44 +72,61 @@
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%_libdir/*.a
-rm -f $RPM_BUILD_ROOT%_libdir/*.la
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+install -Dp -m0755 etc/qpidd %{buildroot}%{_initrddir}/qpidd
+rm -f %{buildroot}%_libdir/*.a
+rm -f %{buildroot}%_libdir/*.la
+
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%check
make check
-%files %{name}
+%files
%defattr(-,root,root,-)
-%doc LICENSE.txt NOTICE.txt
-%doc %_docdir/html/*
+%doc LICENSE.txt NOTICE.txt README.txt
%_libdir/libqpidcommon.so.0
%_libdir/libqpidcommon.so.0.1.0
%_libdir/libqpidclient.so.0
%_libdir/libqpidclient.so.0.1.0
-%files %{name}-devel
+%files devel
%defattr(-,root,root,-)
-%_includedir/qpid/*.h
+%_includedir/qpidc
%_libdir/libqpidcommon.so
%_libdir/libqpidclient.so
+%doc docs/api/html
-%files %{daemon}
+%files -n %{daemon}
+%_libdir/libqpidbroker.so
%_libdir/libqpidbroker.so.0
%_libdir/libqpidbroker.so.0.1.0
%_sbindir/%{daemon}
+%{_initrddir}/qpidd
%doc %_mandir/man1/%{daemon}.*
-#FIXME: Fix Makefile.am to install etc/init.d/%{daemon} properly:
-%_sysconfdir/init.d/%{daemon}
+%post
+# This adds the proper /etc/rc*.d links for the script
+/sbin/chkconfig --add qpidd
+
+%preun
+# 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
+if [ "$1" -ge "1" ]; then
+ /sbin/service qpidd condrestart >/dev/null 2>&1 || :
+fi
%changelog
-* Mon Dec 11 2006 Alan Conway <ac...@localhost.localdomain> - 0.1-1
-- Second cut, still needs work and testing.
+* Mon Dec 19 2006 Alan Conway <ac...@redhat.com> - 0.1-1
+- Fixed problems with qpidd init script and doc files.
* Fri Dec 8 2006 David Lutterkort <dl...@redhat.com> - 0.1-1
- Initial version based on Jim Meyering's sketch and discussions with Alan