rpms/qpidc/F-11 .cvsignore, 1.19, 1.20 qpidc.spec, 1.81, 1.82 sources, 1.40, 1.41

Tue Jun 23 17:23:18 UTC 2009

Author: nsantos

Update of /cvs/extras/rpms/qpidc/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20534

Modified Files:
	.cvsignore qpidc.spec sources 
Log Message:
Rebased to svn rev 787286


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20

--- .cvsignore	11 Mar 2009 20:52:51 -0000	1.19
+++ .cvsignore	23 Jun 2009 17:22:47 -0000	1.20
@@ -1 +1 @@
-qpidc-0.5.752600.tar.gz
+qpidc-0.5.787286.tar.gz


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/qpidc.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- qpidc.spec	1 Jun 2009 21:43:31 -0000	1.81
+++ qpidc.spec	23 Jun 2009 17:22:47 -0000	1.82
@@ -4,17 +4,18 @@
 #
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig  -e 'puts Config::CONFIG["sitelibdir"]')}
+%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 Name:           qpidc
-Version:        0.5.752600
-Release:        6%{?dist}
+Version:        0.5.787286
+Release:        2%{?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
-Patch:		qpidc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel
@@ -115,6 +116,15 @@ Requires: %name-devel = %version-%releas
 Header files and code-generation tools needed for developers of QMF-managed
 components.
 
+%package -n ruby-qmf
+Summary: The QPID Management Framework bindings for ruby
+Group: System Environment/Libraries
+Requires: %name = %version-%release
+
+%description -n ruby-qmf
+An extensible managememt framework layered on QPID messaging, bindings
+for ruby.
+
 %package -n qpidd-acl
 Summary: ACL based security for the Qpid daemon
 Group: System Environment/Libraries
@@ -136,7 +146,7 @@ Infiniband) as the transport for Qpid me
 Summary: RDMA Protocol support (including Infiniband) for the Qpid daemon
 Group: System Environment/Libraries
 Requires: qpidd = %version-%release
-Requires: %name-rdma
+Requires: %name-rdma = %version-%release
 
 %description -n qpidd-rdma
 A Qpid daemon plugin to support RDMA protocols (including Infiniband) as the
@@ -155,7 +165,7 @@ for Qpid messaging.
 Summary: SSL support for the Qpid daemon
 Group: System Environment/Libraries
 Requires: qpidd = %version-%release
-Requires: %name-ssl
+Requires: %name-ssl = %version-%release
 
 %description -n qpidd-ssl
 A Qpid daemon plugin to support SSL as the transport for AMQP
@@ -200,7 +210,6 @@ exit 0
 
 %prep
 %setup -q
-%patch
 
 %define perftests "perftest topic_listener topic_publisher \
 	latencytest client_test txtest"
@@ -253,6 +262,14 @@ echo "auth=no" >> %{buildroot}/etc/qpidd
 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}
+
+rm -f %{buildroot}%_libdir/_*
+rm -fr %{buildroot}%_libdir/qpid/tests
+rm -fr %{buildroot}%_libexecdir/qpid/tests
+rm -f %{buildroot}%{ruby_sitearch}/qmfengine.la
+
 %clean
 rm -rf %{buildroot}
 
@@ -260,7 +277,7 @@ rm -rf %{buildroot}
 # 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
 
 %files
 %defattr(-,root,root,-)
@@ -305,7 +322,6 @@ rm -rf %{buildroot}
 %{_initrddir}/qpidd
 %dir %_libdir/qpid/daemon
 %attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
-#%attr(755, qpidd, qpidd) %_libdir/qpidd
 %attr(755, qpidd, qpidd) /var/run/qpidd
 %attr(600, qpidd, qpidd) %config(noreplace) %_localstatedir/lib/qpidd/qpidd.sasldb
 %doc %_mandir/man1/qpidd.*
@@ -318,6 +334,8 @@ rm -rf %{buildroot}
 
 %files -n qmf
 %defattr(-,root,root,-)
+%_libdir/libqmfcommon.so.0
+%_libdir/libqmfcommon.so.0.1.0
 %_libdir/libqmfagent.so.0
 %_libdir/libqmfagent.so.0.1.0
 %_libdir/libqmfconsole.so.0
@@ -325,11 +343,17 @@ rm -rf %{buildroot}
 
 %files -n qmf-devel
 %defattr(-,root,root,-)
+%_libdir/libqmfcommon.so
 %_libdir/libqmfagent.so
 %_libdir/libqmfconsole.so
 %_bindir/qmf-gen
 %{python_sitelib}/qmfgen
 
+%files -n ruby-qmf
+%defattr(-,root,root,-)
+%{ruby_sitelib}/qmf.rb
+%{ruby_sitearch}/qmfengine.so
+
 %files -n qpidd-acl
 %defattr(-,root,root,-)
 %_libdir/qpid/daemon/acl.so
@@ -414,6 +438,9 @@ fi
 %postun -n qmf -p /sbin/ldconfig
 
 %changelog
+* Mon Jun 22 2009 Nuno Santos <nsantos at redhat.com> - 0.5.787286-1
+- Rebased to svn rev 787286
+
 * Mon May  4 2009 Nuno Santos <nsantos at redhat.com> - 0.5.752600-6
 - patch for SASL credentials refresh
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qpidc/F-11/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	16 Mar 2009 17:51:25 -0000	1.40
+++ sources	23 Jun 2009 17:22:47 -0000	1.41
@@ -1 +1 @@
-ad10931d7e753251480a0bae55f74e82  qpidc-0.5.752600.tar.gz
+60586d9ee384250a3dabbbe174eef226  qpidc-0.5.787286.tar.gz


