rpms/qpidc/devel qpidc.spec,1.105,1.106

Nuno Santos nsantos at fedoraproject.org
Fri Oct 30 19:49:57 UTC 2009


Author: nsantos

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

Modified Files:
	qpidc.spec 
Log Message:
Finish renaming of subpackages


Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- qpidc.spec	27 Oct 2009 21:19:02 -0000	1.105
+++ qpidc.spec	30 Oct 2009 19:49:57 -0000	1.106
@@ -8,13 +8,14 @@
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 %define qpid_svnrev 819819
-%define rhm_svnrev 3641
+%define rhm_svnrev  3641
 
-%define cli qpid-cpp-client
-%define srv qpid-cpp-server
+%define new qpid-cpp
 %define old qpidc
+%define cli %{new}-client
+%define srv %{new}-server
 
-Name:           %{cli}
+Name:           %{new}
 Version:        0.5.%{qpid_svnrev}
 Release:        2%{?dist}
 Summary:        Libraries for Qpid C++ client applications
@@ -30,7 +31,7 @@ BuildRoot:      %{_tmppath}/%{old}-%{ver
 BuildRequires: boost-devel
 BuildRequires: doxygen
 BuildRequires: e2fsprogs-devel
-BuildRequires: libuuid-devel
+##################BuildRequires: libuuid-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: ruby
@@ -50,13 +51,21 @@ BuildRequires: corosynclib-devel >= 1.0.
 BuildRequires: clusterlib-devel >= 3.0.0-20
 BuildRequires: swig
 
-%ifarch i686 x86_64
+%ifarch i386 i586 i686 x86_64
 #RHM
 BuildRequires: db4-devel
 BuildRequires: libaio-devel
 #/RHM
 %endif
 
+%description
+
+Run-time libraries for AMQP client applications developed using Qpid
+C++. Clients exchange messages with an AMQP message broker using
+the AMQP protocol.
+
+%package client
+Summary:        Libraries for Qpid C++ client applications
 Requires: boost
 Obsoletes: qpidc
 
@@ -65,7 +74,8 @@ Requires(preun):/sbin/chkconfig
 Requires(preun):/sbin/service
 Requires(postun):/sbin/service
 
-%description
+%description client
+
 Run-time libraries for AMQP client applications developed using Qpid
 C++. Clients exchange messages with an AMQP message broker using
 the AMQP protocol.
@@ -216,7 +226,7 @@ Obsoletes: qpidd-cluster
 %description -n %{srv}-cluster
 A Qpid daemon plugin enabling broker clustering using openais
 
-%ifarch i686 x86_64
+%ifarch i386 i586 i686 x86_64
 #RHM
 %package -n rhm-cpp-server-store
 Summary: Red Hat persistence extension to the Qpid messaging system
@@ -265,7 +275,7 @@ done
 popd
 popd
 
-%ifarch i686 x86_64
+%ifarch i386 i586 i686 x86_64
 #RHM
 pushd ../rhm-0.5.%{rhm_svnrev}
 export CXXFLAGS="%{optflags} -DNDEBUG" 
@@ -317,7 +327,7 @@ rm -fr %{buildroot}%_libexecdir/qpid/tes
 rm -f %{buildroot}%{ruby_sitearch}/qmfengine.la
 popd
 
-%ifarch i686 x86_64
+%ifarch i386 i586 i686 x86_64
 #RHM
 pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
 make install DESTDIR=%{buildroot}
@@ -343,7 +353,7 @@ rm -rf %{buildroot}
 #LANG=C ECHO=echo make check
 #popd
 
-%ifarch i686 x86_64
+%ifarch i386 i586 i686 x86_64
 #RHM
 #pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
 #make check
@@ -351,7 +361,7 @@ rm -rf %{buildroot}
 #/RHM
 %endif
 
-%files
+%files client
 %defattr(-,root,root,-)
 %doc cpp/LICENSE cpp/NOTICE cpp/README cpp/INSTALL cpp/RELEASE_NOTES cpp/DESIGN
 %_libdir/libqpidcommon.so.3
@@ -469,7 +479,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc cpp/docs/api/html
 
-%ifarch i686 x86_64
+%ifarch i386 i586 i686 x86_64
 %files -n rhm-cpp-server-store
 %defattr(-,root,root,-)
 %doc ../rhm-0.5.%{rhm_svnrev}/README 




More information about the fedora-extras-commits mailing list