rpms/qpidc/devel qpidc.spec,1.104,1.105
Nuno Santos
nsantos at fedoraproject.org
Tue Oct 27 21:19:03 UTC 2009
Author: nsantos
Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13183
Modified Files:
qpidc.spec
Log Message:
Renaming of subpackages as per http://fedoraproject.org/wiki/Features/ImprovedQpidCppPackaging
Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- qpidc.spec 29 Sep 2009 15:27:28 -0000 1.104
+++ qpidc.spec 27 Oct 2009 21:19:02 -0000 1.105
@@ -10,18 +10,22 @@
%define qpid_svnrev 819819
%define rhm_svnrev 3641
-Name: qpidc
+%define cli qpid-cpp-client
+%define srv qpid-cpp-server
+%define old qpidc
+
+Name: %{cli}
Version: 0.5.%{qpid_svnrev}
-Release: 1%{?dist}
+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
+Source0: %{old}-%{version}.tar.gz
Source1: rhm-0.5.%{rhm_svnrev}.tar.gz
Source2: qpidd.pp
Patch0: so_number.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{old}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: boost-devel
BuildRequires: doxygen
@@ -54,6 +58,7 @@ BuildRequires: libaio-devel
%endif
Requires: boost
+Obsoletes: qpidc
Requires(post):/sbin/chkconfig
Requires(preun):/sbin/chkconfig
@@ -66,13 +71,15 @@ C++. Clients exchange messages with an A
the AMQP protocol.
%package devel
-Summary: Header files and documentation for developing Qpid C++ clients
+Summary: Header files, documentation and testing tools for developing Qpid C++ clients
Group: Development/System
-Requires: %name = %version-%release
+Requires: %{cli} = %version-%release
Requires: boost-devel
Requires: e2fsprogs-devel
Requires: libuuid-devel
Requires: python
+Obsoletes: qpidc-devel
+Obsoletes: qpidc-perftest
%description devel
Libraries, header files and documentation for developing AMQP clients
@@ -82,40 +89,44 @@ in C++ using Qpid. Qpid implements the
Summary: AMQP client development documentation
Group: Documentation
BuildArch: noarch
+Obsoletes: qpidc-devel-docs
%description devel-docs
This package includes the AMQP clients development documentation in HTML
format for easy browsing.
-%package -n qpidd
+%package -n %{srv}
Summary: An AMQP message broker daemon
Group: System Environment/Daemons
-Requires: %name = %version-%release
+Requires: %{cli} = %version-%release
Requires: cyrus-sasl
Requires(post): policycoreutils
Requires(post): selinux-policy-minimum
Requires(post): /usr/sbin/semodule
Requires(postun): /usr/sbin/semodule
+Obsoletes: qpidd
+Obsoletes: qpidd-acl
-%description -n qpidd
+%description -n %{srv}
A message broker daemon that receives stores and routes messages using
the open AMQP messaging protocol.
-%package -n qpidd-devel
+%package -n %{srv}-devel
Summary: Libraries and header files for developing Qpid broker extensions
Group: Development/System
-Requires: %name-devel = %version-%release
-Requires: qpidd = %version-%release
+Requires: %{cli}-devel = %version-%release
+Requires: %{srv} = %version-%release
Requires: boost-devel
+Obsoletes: qpidd-devel
-%description -n qpidd-devel
+%description -n %{srv}-devel
Libraries and header files for developing extensions to the
Qpid broker daemon.
%package -n qmf
Summary: The QPID Management Framework
Group: System Environment/Daemons
-Requires: %name = %version-%release
+Requires: %{cli} = %version-%release
%description -n qmf
An extensible managememt framework layered on QPID messaging.
@@ -124,7 +135,7 @@ An extensible managememt framework layer
Summary: Header files and tools for developing QMF extensions
Group: Development/System
Requires: qmf = %version-%release
-Requires: %name-devel = %version-%release
+Requires: %{cli}-devel = %version-%release
%description -n qmf-devel
Header files and code-generation tools needed for developers of QMF-managed
@@ -133,94 +144,84 @@ components.
%package -n ruby-qmf
Summary: The QPID Management Framework bindings for ruby
Group: System Environment/Libraries
-Requires: %name = %version-%release
+Requires: %{cli} = %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
-Requires: qpidd = %version-%release
-
-%description -n qpidd-acl
-A Qpid daemon plugin to support ACL-based access control.
-
%package rdma
Summary: RDMA Protocol support (including Infiniband) for Qpid clients
Group: System Environment/Libraries
-Requires: %name = %version-%release
+Requires: %{cli} = %version-%release
+Obsoletes: qpidc-rdma
%description rdma
A client plugin and support library to support RDMA protocols (including
Infiniband) as the transport for Qpid messaging.
-%package -n qpidd-rdma
+%package -n %{srv}-rdma
Summary: RDMA Protocol support (including Infiniband) for the Qpid daemon
Group: System Environment/Libraries
-Requires: qpidd = %version-%release
-Requires: %name-rdma = %version-%release
+Requires: %{srv} = %version-%release
+Requires: %{cli}-rdma = %version-%release
+Obsoletes: qpidd-rdma
-%description -n qpidd-rdma
+%description -n %{srv}-rdma
A Qpid daemon plugin to support RDMA protocols (including Infiniband) as the
transport for AMQP messaging.
%package ssl
Summary: SSL support for Qpid clients
Group: System Environment/Libraries
-Requires: %name = %version-%release
+Requires: %{cli} = %version-%release
+Obsoletes: qpidc-ssl
%description ssl
A client plugin and support library to support SSL as the transport
for Qpid messaging.
-%package -n qpidd-ssl
+%package -n %{srv}-ssl
Summary: SSL support for the Qpid daemon
Group: System Environment/Libraries
-Requires: qpidd = %version-%release
-Requires: %name-ssl = %version-%release
+Requires: %{srv} = %version-%release
+Requires: %{cli}-ssl = %version-%release
+Obsoletes: qpidd-ssl
-%description -n qpidd-ssl
+%description -n %{srv}-ssl
A Qpid daemon plugin to support SSL as the transport for AMQP
messaging.
-%package -n qpidd-xml
+%package -n %{srv}-xml
Summary: XML extensions for the Qpid daemon
Group: System Environment/Libraries
-Requires: qpidd = %version-%release
+Requires: %{srv} = %version-%release
Requires: xqilla
Requires: xerces-c
+Obsoletes: qpidd-xml
-%description -n qpidd-xml
+%description -n %{srv}-xml
A Qpid daemon plugin to support extended XML-based routing of AMQP
messages.
-%package -n qpidd-cluster
+%package -n %{srv}-cluster
Summary: Cluster support for the Qpid daemon
Group: System Environment/Daemons
-Requires: qpidd = %version-%release
-Requires: qpidc = %version-%release
+Requires: %{srv} = %version-%release
+Requires: %{cli} = %version-%release
Requires: corosync >= 1.0.0-1
Requires: clusterlib >= 3.0.0-20
+Obsoletes: qpidd-cluster
-%description -n qpidd-cluster
+%description -n %{srv}-cluster
A Qpid daemon plugin enabling broker clustering using openais
-%package perftest
-Summary: Simple benchmarking tools
-Group: System Environment/Tools
-Requires: qpidc = %version-%release
-
-%description perftest
-Tools for performing testing and benchmarking of MRG-Messaging
-
%ifarch i686 x86_64
#RHM
%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: %{srv} = 0.5.%{qpid_svnrev}
Requires: db4
Requires: libaio
Obsoletes: rhm
@@ -232,7 +233,7 @@ with Berkeley DB.
#/RHM
%endif
-%pre -n qpidd
+%pre -n %{srv}
getent group qpidd >/dev/null || groupadd -r qpidd
getent passwd qpidd >/dev/null || \
useradd -r -M -g qpidd -d %{_localstatedir}/lib/qpidd -s /sbin/nologin \
@@ -240,8 +241,8 @@ getent passwd qpidd >/dev/null || \
exit 0
%prep
-%setup
-%setup -T -D -b 1
+%setup -n %{old}-%{version}
+%setup -T -D -b 1 -n %{old}-%{version}
%patch0
%define perftests "perftest topic_listener topic_publisher latencytest client_test txtest"
@@ -269,7 +270,7 @@ popd
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}
+%configure --disable-static --disable-rpath --disable-dependency-tracking --with-qpid-checkout=%{_builddir}/%{old}-%{version}
make dist
make #%{?_smp_mflags}
popd
@@ -279,7 +280,7 @@ popd
%install
rm -rf %{buildroot}
mkdir -p -m0755 %{buildroot}/%_bindir
-pushd %{_builddir}/%{name}-%{version}/cpp
+pushd %{_builddir}/%{old}-%{version}/cpp
make install DESTDIR=%{buildroot}
install -Dp -m0755 etc/qpidd %{buildroot}%{_initrddir}/qpidd
install -d -m0755 %{buildroot}%{_localstatedir}/lib/qpidd
@@ -306,9 +307,9 @@ rm -f %{buildroot}%_libdir/qpid/daemon/*
echo "auth=no" >> %{buildroot}/etc/qpidd.conf
install -d %{buildroot}%{_datadir}/selinux/packages
-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}
+install -m 644 %{_builddir}/%{old}-%{version}/selinux/qpidd.pp %{buildroot}%{_datadir}/selinux/packages
+install -pm 644 %{_builddir}/%{old}-%{version}/cpp/bindings/qmf/ruby/qmf.rb %{buildroot}%{ruby_sitelib}
+install -pm 755 %{_builddir}/%{old}-%{version}/cpp/bindings/qmf/ruby/.libs/qmfengine.so %{buildroot}%{ruby_sitearch}
rm -f %{buildroot}%_libdir/_*
rm -fr %{buildroot}%_libdir/qpid/tests
@@ -335,7 +336,7 @@ popd
rm -rf %{buildroot}
%check
-#pushd %{_builddir}/%{name}-%{version}/cpp
+#pushd %{_builddir}/%{old}-%{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
@@ -379,8 +380,15 @@ rm -rf %{buildroot}
%_libdir/libqpidcommon.so
%_libdir/libqpidclient.so
%_datadir/qpidc/examples
+%defattr(755,root,root,-)
+%_bindir/perftest
+%_bindir/topic_listener
+%_bindir/topic_publisher
+%_bindir/latencytest
+%_bindir/client_test
+%_bindir/txtest
-%files -n qpidd
+%files -n %{srv}
%defattr(-,root,root,-)
%_datadir/selinux/packages/qpidd.pp
%_libdir/libqpidbroker.so.3
@@ -394,12 +402,13 @@ rm -rf %{buildroot}
%config(noreplace) %_sysconfdir/sasl2/qpidd.conf
%{_initrddir}/qpidd
%dir %_libdir/qpid/daemon
+%_libdir/qpid/daemon/acl.so
%attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
%attr(755, qpidd, qpidd) /var/run/qpidd
%attr(600, qpidd, qpidd) %config(noreplace) %_localstatedir/lib/qpidd/qpidd.sasldb
%doc %_mandir/man1/qpidd.*
-%files -n qpidd-devel
+%files -n %{srv}-devel
%defattr(-,root,root,-)
%defattr(-,root,root,-)
%_libdir/libqpidbroker.so
@@ -427,10 +436,6 @@ rm -rf %{buildroot}
%{ruby_sitelib}/qmf.rb
%{ruby_sitearch}/qmfengine.so
-%files -n qpidd-acl
-%defattr(-,root,root,-)
-%_libdir/qpid/daemon/acl.so
-
%files rdma
%defattr(-,root,root,-)
%_libdir/librdmawrap.so.0
@@ -438,7 +443,7 @@ rm -rf %{buildroot}
%_libdir/qpid/client/rdmaconnector.so
%config(noreplace) %_sysconfdir/qpid/qpidc.conf
-%files -n qpidd-rdma
+%files -n %{srv}-rdma
%defattr(-,root,root,-)
%_libdir/qpid/daemon/rdma.so
@@ -448,27 +453,18 @@ rm -rf %{buildroot}
%_libdir/libsslcommon.so.3.0.0
%_libdir/qpid/client/sslconnector.so
-%files -n qpidd-ssl
+%files -n %{srv}-ssl
%defattr(-,root,root,-)
%_libdir/qpid/daemon/ssl.so
-%files -n qpidd-xml
+%files -n %{srv}-xml
%defattr(-,root,root,-)
%_libdir/qpid/daemon/xml.so
-%files -n qpidd-cluster
+%files -n %{srv}-cluster
%defattr(-,root,root,-)
%_libdir/qpid/daemon/cluster.so
-%files perftest
-%defattr(755,root,root,-)
-%_bindir/perftest
-%_bindir/topic_listener
-%_bindir/topic_publisher
-%_bindir/latencytest
-%_bindir/client_test
-%_bindir/txtest
-
%files devel-docs
%defattr(-,root,root,-)
%doc cpp/docs/api/html
@@ -485,20 +481,20 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
-%post -n qpidd
+%post -n %{srv}
# This adds the proper /etc/rc*.d links for the script
/sbin/chkconfig --add qpidd
/sbin/ldconfig
/usr/sbin/semodule -i %_datadir/selinux/packages/qpidd.pp
-%preun -n qpidd
+%preun -n %{srv}
# 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 qpidd
+%postun -n %{srv}
if [ "$1" -ge "1" ]; then
/sbin/service qpidd condrestart >/dev/null 2>&1 || :
fi
@@ -519,6 +515,9 @@ fi
%postun -n qmf -p /sbin/ldconfig
%changelog
+* Tue Oct 27 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-2
+- Renaming of subpackages as per http://fedoraproject.org/wiki/Features/ImprovedQpidCppPackaging
+
* Tue Sep 29 2009 Nuno Santos <nsantos at redhat.com> - 0.5.819819-1
- Rebased to svn rev 819819 for F12 beta
More information about the fedora-extras-commits
mailing list