rpms/qpidc/devel .cvsignore, 1.23, 1.24 qpidc.spec, 1.97, 1.98 sources, 1.44, 1.45

Thu Sep 24 22:19:06 UTC 2009

Author: nsantos

Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32464

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 818599; rhm-cpp-server-store obsoletes rhm top-level package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24

--- .cvsignore	21 Sep 2009 19:13:21 -0000	1.23
+++ .cvsignore	24 Sep 2009 22:19:06 -0000	1.24
@@ -1 +1,2 @@
-qpidc-0.5.817349.tar.gz
+qpidc-0.5.818599.tar.gz
+rhm-0.5.3641.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- qpidc.spec	21 Sep 2009 19:13:21 -0000	1.97
+++ qpidc.spec	24 Sep 2009 22:19:06 -0000	1.98
@@ -7,16 +7,19 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
+%define qpid_svnrev 818599
+%define rhm_svnrev 3641
+
 Name:           qpidc
-Version:        0.5.817349
+Version:        0.5.%{qpid_svnrev}
 Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 Group:          System Environment/Libraries
 License:        ASL 2.0
 URL:            http://qpid.apache.org
 Source0:        %{name}-%{version}.tar.gz
-Source1:	qpidd.pp
-#Patch1:		qpidc_f12_new_cpg.diff
+Source1:	rhm-0.5.%{rhm_svnrev}.tar.gz
+Source2:	qpidd.pp
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel
@@ -41,6 +44,10 @@ BuildRequires: xerces-c-devel
 BuildRequires: corosynclib-devel >= 1.0.0-1
 BuildRequires: clusterlib-devel >= 3.0.0-20
 BuildRequires: swig
+#RHM
+BuildRequires: db4-devel
+BuildRequires: libaio-devel
+#/RHM
 
 Requires: boost
 
@@ -204,6 +211,20 @@ Requires: qpidc = %version-%release
 %description perftest
 Tools for performing testing and benchmarking of MRG-Messaging
 
+%package -n rhm-cpp-server-store
+Summary: Red Hat persistence extension to the Qpid messaging system
+Group: System Environment/Libraries
+Requires: qpidd = 0.5.%{qpid_svnrev}
+Requires: db4
+Requires: libaio
+Obsoletes: rhm
+ExclusiveArch: i386 i586 x86_64
+
+%description -n rhm-cpp-server-store
+Red Hat persistence extension to the Qpid AMQP broker: persistent message
+storage using either a libaio-based asynchronous journal, or synchronously
+with Berkeley DB.
+
 %pre -n qpidd
 getent group qpidd >/dev/null || groupadd -r qpidd
 getent passwd qpidd >/dev/null || \
@@ -212,21 +233,20 @@ getent passwd qpidd >/dev/null || \
 exit 0
 
 %prep
-%setup -q
-#%patch1 -p1
+%setup
+%setup -T -D -b 1
 
 %define perftests "perftest topic_listener topic_publisher latencytest client_test txtest"
 
 install -d selinux
-install %{SOURCE1} selinux
+install %{SOURCE2} selinux
 
 %build
+pushd cpp
+./bootstrap
 CXXFLAGS="%{optflags} -DNDEBUG -O3" \
 %configure --disable-static --with-cpg --without-graphviz --without-help2man
 ECHO=echo make #%{?_smp_mflags}
-# Remove this generated perl file, we don't need it and it upsets rpmlint.
-# This is generating an error as of 21 Nov 08 because the file doesn't exist.
-# rm docs/api/html/installdox
 
 # Make perftest utilities
 pushd src/tests
@@ -234,21 +254,36 @@ for ptest in %{perftests}; do
   ECHO=echo make $ptest
 done
 popd
+popd
+
+#RHM
+pushd ../rhm-0.5.%{rhm_svnrev}
+export CXXFLAGS="%{optflags} -DNDEBUG" 
+./bootstrap
+%configure --disable-static --disable-rpath --disable-dependency-tracking --with-qpid-checkout=%{_builddir}/%{name}-%{version}
+make dist
+make #%{?_smp_mflags}
+popd
+#/RHM
 
 %install
 rm -rf %{buildroot}
 mkdir -p -m0755 %{buildroot}/%_bindir
+pushd %{_builddir}/%{name}-%{version}/cpp
 make install DESTDIR=%{buildroot}
 install -Dp -m0755 etc/qpidd %{buildroot}%{_initrddir}/qpidd
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/qpidd
 install -d -m0755 %{buildroot}%{_libdir}/qpidd
 install -d -m0755 %{buildroot}/var/run/qpidd
 # Install perftest utilities
-pushd %{_builddir}/%{name}-%{version}/src/tests/
+pushd src/tests/
 for ptest in %{perftests}; do
   libtool --mode=install install -m755 $ptest %{buildroot}/%_bindir
 done
 popd
+pushd docs/api
+make html
+popd
 rm -f %{buildroot}%_libdir/*.a
 rm -f %{buildroot}%_libdir/*.l
 rm -f %{buildroot}%_libdir/*.la
@@ -256,35 +291,54 @@ rm -f %{buildroot}%_libdir/librdmawrap.s
 rm -f %{buildroot}%_libdir/libsslcommon.so
 rm -f %{buildroot}%_libdir/qpid/client/*.la
 rm -f %{buildroot}%_libdir/qpid/daemon/*.la
-# remove examples, are being packages separately in the rhm-docs package
-#rm -fr %{buildroot}/usr/share/qpidc/examples
 
 # disable auth by default
 echo "auth=no" >> %{buildroot}/etc/qpidd.conf
 
 install -d %{buildroot}%{_datadir}/selinux/packages
-install -m 644 selinux/qpidd.pp %{buildroot}%{_datadir}/selinux/packages
-
-install -pm 644 bindings/qmf/ruby/qmf.rb $RPM_BUILD_ROOT%{ruby_sitelib}
-install -pm 755 bindings/qmf/ruby/.libs/qmfengine.so $RPM_BUILD_ROOT%{ruby_sitearch}
+install -m 644 %{_builddir}/%{name}-%{version}/selinux/qpidd.pp %{buildroot}%{_datadir}/selinux/packages
+install -pm 644 %{_builddir}/%{name}-%{version}/cpp/bindings/qmf/ruby/qmf.rb %{buildroot}%{ruby_sitelib}
+install -pm 755 %{_builddir}/%{name}-%{version}/cpp/bindings/qmf/ruby/.libs/qmfengine.so %{buildroot}%{ruby_sitearch}
 
 rm -f %{buildroot}%_libdir/_*
 rm -fr %{buildroot}%_libdir/qpid/tests
 rm -fr %{buildroot}%_libexecdir/qpid/tests
 rm -f %{buildroot}%{ruby_sitearch}/qmfengine.la
+popd
+
+#RHM
+pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
+make install DESTDIR=%{buildroot}
+install -d -m0775 %{buildroot}%{_localstatedir}/rhm
+install -d -m0755 %{buildroot}%{_libdir}/qpid/daemon
+rm -f %{buildroot}%_libdir/qpid/daemon/*.a
+rm -f %{buildroot}%_libdir/qpid/daemon/*.la
+rm -f %{buildroot}%_libdir/*.a
+rm -f %{buildroot}%_libdir/*.la
+rm %{buildroot}%_sysconfdir/rhmd.conf
+popd
+#/RHM
 
 %clean
 rm -rf %{buildroot}
 
 %check
+#pushd %{_builddir}/%{name}-%{version}/cpp
 # LANG=C needs to be in the environment to deal with a libtool issue
 # temporarily disabling make check due to libtool issues
 # needs to be re-enabled asap
-LANG=C ECHO=echo make check
+#LANG=C ECHO=echo make check
+#popd
+
+#RHM
+#pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
+#make check
+#popd
+#/RHM
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE NOTICE README INSTALL RELEASE_NOTES DESIGN
+%doc cpp/LICENSE cpp/NOTICE cpp/README cpp/INSTALL cpp/RELEASE_NOTES cpp/DESIGN
 %_libdir/libqpidcommon.so.2
 %_libdir/libqpidcommon.so.2.0.0
 %_libdir/libqpidclient.so.2
@@ -403,7 +457,13 @@ LANG=C ECHO=echo make check
 
 %files devel-docs
 %defattr(-,root,root,-)
-%doc docs/api/html
+%doc cpp/docs/api/html
+
+%files -n rhm-cpp-server-store
+%defattr(-,root,root,-)
+%doc ../rhm-0.5.%{rhm_svnrev}/README 
+%{_libdir}/qpid/daemon/msgstore.so*
+%attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm
 
 %post -p /sbin/ldconfig
 
@@ -443,7 +503,11 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
-* Fri Sep 19 2009 Nuno Santos <nsantos at redhat.com> - 0.5.817349-1
+* Thu Sep 24 2009 Nuno Santos <nsantos at redhat.com> - 0.5.818599-1
+- Rebased to svn rev 818599
+- rhm-cpp-server-store obsoletes rhm top-level package
+
+* Fri Sep 19 2009 Nuno Santos <nsantos at redhat.com> - 0.5.817349
 - Rebased to svn rev 817349
 
 * Wed Jul 29 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.5.790661-3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	21 Sep 2009 19:13:21 -0000	1.44
+++ sources	24 Sep 2009 22:19:06 -0000	1.45
@@ -1 +1,2 @@
-3d8e101731c2f8a8fba5907f9cdb9282  qpidc-0.5.817349.tar.gz
+b9b04d4744f8e1e1bd55e62388b49e29  qpidc-0.5.818599.tar.gz
+5f95f4583d345e5287457476e81d2f5b  rhm-0.5.3641.tar.gz


