rpms/qpidc/devel .cvsignore, 1.2, 1.3 qpidc.spec, 1.1, 1.2 sources, 1.2, 1.3

[Nuno Santos (nsantos)]

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23250/devel

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
auto-import qpidc-0.2-1 on branch devel from qpidc-0.2-1.src.rpm
updated package import


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Mar 2007 21:23:24 -0000	1.2
+++ .cvsignore	16 Apr 2007 18:30:53 -0000	1.3
@@ -1 +1 @@
-qpidc-0.1.tar.gz
+qpidc-0.2.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qpidc.spec	12 Mar 2007 21:23:24 -0000	1.1
+++ qpidc.spec	16 Apr 2007 18:30:53 -0000	1.2
@@ -1,15 +1,15 @@
 #
-# Spec file for Qpid C++ packages: qpidc qpidc-devel, qpidd
+# Spec file for Qpid C++ packages: qpidc qpidc-devel, qpidd, qpidd-devel
 #
-%define daemon qpidd
+%define qpidd qpidd
 
 Name:           qpidc
-Version:        0.1
-Release:        4%{?dist}
+Version:        0.2
+Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        Apache Software License
-URL:            http://rhm.et.redhat.com/qpidc/
+URL:            http://rhm.et.redhat.com/qpidc
 Source0:        http://rhm.et.redhat.com/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,15 +48,25 @@
 Libraries, header files and documentation for developing AMQP clients
 in C++ using Qpid.  Qpid implements the AMQP messaging specification.
 
-%package -n %{daemon}
+%package -n %{qpidd}
 Summary: An AMQP message broker daemon
 Group: System Environment/Daemons
 Requires: %name = %version-%release
 
-%description -n %{daemon}
+%description -n %{qpidd}
 A message broker daemon that receives stores and routes messages using
 the open AMQP messaging protocol.
 
+%package -n %{qpidd}-devel
+Summary: Libraries and header files for developing Qpid broker extensions
+Group: Development/System
+Requires: %name-devel = %version-%release
+Requires: %{qpidd} = %version-%release
+
+%description -n %{qpidd}-devel
+Libraries and header files for developing extensions to the
+Qpid broker daemon.
+
 %prep
 %setup -q
 
@@ -72,9 +82,6 @@
 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
 rm -rf %{buildroot}
@@ -92,37 +99,45 @@
 
 %files devel
 %defattr(-,root,root,-)
-%_includedir/qpidc
+%_includedir/qpid/*.h
+%_includedir/qpid/client
+%_includedir/qpid/framing
+%_includedir/qpid/sys
 %_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}
+%files -n %{qpidd}
+%defattr(-,root,root,-)
 %_libdir/libqpidbroker.so.0
 %_libdir/libqpidbroker.so.0.1.0
-%_sbindir/%{daemon}
-%{_initrddir}/qpidd
-%doc %_mandir/man1/%{daemon}.*
+%_sbindir/%{qpidd}
+%{_initrddir}/%{qpidd}
+%doc %_mandir/man1/%{qpidd}.*
+
+%files -n %{qpidd}-devel
+%doc rpm/README.qpidd-devel 
+%defattr(-,root,root,-)
+%_libdir/libqpidbroker.so
+%_includedir/qpid/broker
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%post -n %{daemon}
+%post -n %{qpidd}
 # This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add qpidd
 /sbin/ldconfig
 
-%preun -n %{daemon}
+%preun -n %{qpidd}
 # 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 -n %{daemon}
+%postun -n %{qpidd}
 if [ "$1" -ge "1" ]; then
         /sbin/service qpidd condrestart >/dev/null 2>&1 || :
 fi
@@ -130,6 +145,12 @@
 
 %changelog
 
+* Thu Apr 12 2007 Alan Conway <aconway at redhat.com> - 0.2-1
+- Bumped version number for rhm dependencies. 
+
+* Wed Apr 11 2007 Alan Conway <aconway at redhat.com> - 0.1-5
+- Add qpidd-devel sub-package.
+
 * Mon Feb 19 2007 Jim Meyering <meyering at redhat.com> - 0.1-4
 - Address http://bugzilla.redhat.com/220630:
 - Remove redundant "cppunit" build-requires.
@@ -145,3 +166,4 @@
 * Fri Dec  8 2006 David Lutterkort <dlutter at redhat.com> - 0.1-1
 - Initial version based on Jim Meyering's sketch and discussions with Alan
   Conway
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Mar 2007 21:23:24 -0000	1.2
+++ sources	16 Apr 2007 18:30:53 -0000	1.3
@@ -1 +1 @@
-4725e88e47891367c8cd6fe9e06abf70  qpidc-0.1.tar.gz
+444d52d632f96f2b3a633a692bf35315  qpidc-0.2.tar.gz