rpms/qpid-cpp/F-13 .cvsignore, 1.2, 1.3 qpid-cpp.spec, 1.1, 1.2 sources, 1.2, 1.3
Nuno Santos
nsantos at fedoraproject.org
Fri Mar 5 20:27:12 UTC 2010
Author: nsantos
Update of /cvs/pkgs/rpms/qpid-cpp/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8509
Modified Files:
.cvsignore qpid-cpp.spec sources
Log Message:
unified specfile
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qpid-cpp/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 25 Feb 2010 19:31:20 -0000 1.2
+++ .cvsignore 5 Mar 2010 20:27:12 -0000 1.3
@@ -1,2 +1,2 @@
-qpidc-0.5.829175.tar.gz
-rhm-0.5.3684.tar.gz
+qpid-cpp-0.6.895736.tar.gz
+store-0.6.3795.tar.gz
Index: qpid-cpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qpid-cpp/F-13/qpid-cpp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qpid-cpp.spec 25 Feb 2010 19:30:33 -0000 1.1
+++ qpid-cpp.spec 5 Mar 2010 20:27:12 -0000 1.2
@@ -1,363 +1,791 @@
+#
+# Spec file for Qpid C++ packages: qpid-cpp-server*, qpid-cpp-client* and qmf
+# svn revision: $Rev$
+#
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
+%{!?ruby_sitelib: %global ruby_sitelib %(/usr/bin/ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
+%{!?ruby_sitearch: %global ruby_sitearch %(/usr/bin/ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
-%global qpid_svnrev 829175
-%global rhm_svnrev 3684
-
-Name: qpid-cpp
-Version: 0.5.%{qpid_svnrev}
-Release: 4%{?dist}
-Summary: Libraries for Qpid C++ client applications
-Group: System Environment/Libraries
-License: ASL 2.0 and LGPLv2
-URL: http://qpid.apache.org
-Source0: qpidc-%{version}.tar.gz
-Source1: rhm-0.5.%{rhm_svnrev}.tar.gz
-Source2: qpidd.pp
-Patch0: so_number.patch
-Patch1: qmf.patch
-Patch2: bz538355.patch
-Patch3: xqilla.patch
-Patch4: db4.patch
+# ===========
+# The following section controls which rpms are produced for which builds.
+# * To set the following flags, assign the value 1 for true; 0 for false.
+# * These rpms produced by these two flags are mutually exclusive - ie they
+# won't duplicate any of the rpms.
+# RHEL-6:
+# * MRG_core is for building only RHEL-6 OS core components .
+# * MRG_non_core is for building only RHEL-6 MRG product components.
+# All other OSs (RHEL4/5/Fedora):
+# * The MRG product is entirely external to the OS.
+# * Set both MRG_core and MRG_non_core to true.
+%global MRG_core 1
+%global MRG_non_core 1
+
+# Release numbers
+%global qpid_release 0.6
+%global qpid_svnrev 895736
+%global store_svnrev 3795
+# Change this release number for each build of the same qpid_svnrev, otherwise set back to 1.
+%global release_num 1
+
+# NOTE: no more than one of these flags should be set at the same time!
+# RHEL-6 builds (the default) should have all these flags set to 0.
+%global fedora 1
+%global rhel_5 0
+
+# ===========
+
+# Note: if the mix is changed between MRG_core and MRG_non_core, then
+# the files that will be removed at the end of the install section will
+# need to be adjusted (moved from one section to the other).
+%global client %{MRG_core}
+%global server %{MRG_core}
+%global qmf %{MRG_core}
+%global ruby_qmf %{MRG_core}
+%global client_devel %{MRG_non_core}
+%global client_devel_docs %{MRG_non_core}
+%global server_devel %{MRG_non_core}
+%global qmf_devel %{MRG_non_core}
+%global client_rdma %{MRG_non_core}
+%global server_rdma %{MRG_non_core}
+%global client_ssl %{MRG_non_core}
+%global server_ssl %{MRG_non_core}
+%global server_xml %{MRG_non_core}
+%global server_cluster %{MRG_non_core}
+%global server_store %{MRG_non_core}
+%global rh_tests %{MRG_non_core}
+
+# RHEL-6: Because core packages are .el6 and non-core .el6mrg, the {core_release}
+# tag is needed for dependency checks of core packages from non-core packages.
+# Non-RHEL-6: {core_release} is set to same value as {release} below.
+%if %{fedora} || %{rhel_5}
+%global core_release %{release_num}%{?dist}
+%else
+%global core_release %{release_num}.el6
+%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# This overrides the package name - do not change this! It keeps all package
+# names consistent, irrespective of the {name} varialbe - which changes for
+# core and non-core builds.
+%global pkg_name qpid-cpp
+
+Name: qpid-cpp
+Version: %{qpid_release}.%{qpid_svnrev}
+Release: %{release_num}%{?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: store-%{qpid_release}.%{store_svnrev}.tar.gz
+Source2: qpidd.pp
+%if %{fedora}
+Patch0: so_number.patch
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{rhel_5}
+ExclusiveArch: i386 x86_64
+%else
+ExclusiveArch: i686 x86_64
+%endif
+Vendor: Red Hat, Inc.
BuildRequires: boost-devel
-BuildRequires: boost-program-options
-BuildRequires: boost-filesystem
BuildRequires: doxygen
-BuildRequires: e2fsprogs-devel
-BuildRequires: libuuid-devel
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: ruby
BuildRequires: ruby-devel
-BuildRequires: python
BuildRequires: python-devel
+BuildRequires: swig
BuildRequires: cyrus-sasl-devel
BuildRequires: cyrus-sasl-lib
BuildRequires: cyrus-sasl
+%if %{rhel_5}
+BuildRequires: e2fsprogs-devel
+%else
+BuildRequires: boost-program-options
+BuildRequires: boost-filesystem
+BuildRequires: libuuid-devel
+%endif
+
+%if %{MRG_non_core}
BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel
BuildRequires: nss-devel
BuildRequires: nspr-devel
BuildRequires: xqilla-devel
BuildRequires: xerces-c-devel
-BuildRequires: corosynclib-devel >= 1.0.0-1
-BuildRequires: clusterlib-devel >= 3.0.0-20
-BuildRequires: swig
-
-%ifarch i386 i586 i686 x86_64
-#RHM
BuildRequires: db4-devel
BuildRequires: libaio-devel
-#/RHM
+%if %{rhel_5}
+BuildRequires: openais-devel
+BuildRequires: cman-devel
+%else
+BuildRequires: corosynclib-devel >= 1.0.0-1
+BuildRequires: clusterlib-devel >= 3.0.0-20
%endif
+%endif # MRG_non_core
+
%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
+# === Package: qpid-cpp-client ===
+
+%if %{client}
+
+%package -n %{pkg_name}-client
Summary: Libraries for Qpid C++ client applications
+Group: System Environment/Libraries
Requires: boost
-Obsoletes: qpidc < %{version}-4
-Provides: qpidc = %{version}-4
-License: ASL 2.0
+Obsoletes: qpidc
Requires(post):/sbin/chkconfig
Requires(preun):/sbin/chkconfig
Requires(preun):/sbin/service
Requires(postun):/sbin/service
-%description client
+%description -n %{pkg_name}-client
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-devel
-Summary: Header files and documentation for developing Qpid C++ clients
+%files -n %{pkg_name}-client
+%defattr(-,root,root,-)
+%doc cpp/LICENSE cpp/NOTICE cpp/README cpp/INSTALL cpp/RELEASE_NOTES cpp/DESIGN
+%_libdir/libqpidcommon.so.*
+%_libdir/libqpidclient.so.*
+%dir %_libdir/qpid
+%dir %_libdir/qpid/client
+%dir %_sysconfdir/qpid
+%config(noreplace) %_sysconfdir/qpid/qpidc.conf
+
+%post -n %{pkg_name}-client
+/sbin/ldconfig
+
+%postun -n %{pkg_name}-client
+/sbin/ldconfig
+
+%endif # client
+
+# === Package: qpid-cpp-client-devel ===
+
+%if %{client_devel}
+
+%package -n %{pkg_name}-client-devel
+Summary: Header files, documentation and testing tools for developing Qpid C++ clients
Group: Development/System
-Requires: qpid-cpp-client = %{version}-%{release}
+Requires: %{pkg_name}-client = %{version}-%{core_release}
Requires: boost-devel
-Requires: boost-program-options
+Requires: %_includedir/uuid/uuid.h
+%if ! %{rhel_5}
Requires: boost-filesystem
-Requires: e2fsprogs-devel
-Requires: libuuid-devel
+Requires: boost-program-options
+%endif
Requires: python
-Obsoletes: qpidc-devel < %{version}-4
-Provides: qpidc-devel = %{version}-4
-License: ASL 2.0
+Obsoletes: qpidc-devel
+Obsoletes: qpidc-perftest
-%description client-devel
+%description -n %{pkg_name}-client-devel
Libraries, header files and documentation for developing AMQP clients
in C++ using Qpid. Qpid implements the AMQP messaging specification.
-%package client-devel-docs
+%files -n %{pkg_name}-client-devel
+%defattr(-,root,root,-)
+%dir %_includedir/qpid
+%_includedir/qpid/*.h
+%_includedir/qpid/amqp_0_10
+%_includedir/qpid/client
+%_includedir/qpid/console
+%_includedir/qpid/framing
+%_includedir/qpid/sys
+%_includedir/qpid/log
+%_includedir/qpid/management
+%_includedir/qpid/messaging
+%_includedir/qpid/agent
+%_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
+
+%post -n %{pkg_name}-client-devel
+/sbin/ldconfig
+
+%postun -n %{pkg_name}-client-devel
+/sbin/ldconfig
+
+%endif # client_devel
+
+# === Package: qpid-cpp-client-devel-docs ===
+
+%if %{client_devel_docs}
+
+%package -n %{pkg_name}-client-devel-docs
Summary: AMQP client development documentation
Group: Documentation
+%if !%{rhel_5}
BuildArch: noarch
-Obsoletes: qpidc-devel-docs < %{version}-4
-Provides: qpidc-devel-docs = %{version}-4
-License: ASL 2.0
+%endif
+Obsoletes: qpidc-devel-docs
-%description client-devel-docs
+%description -n %{pkg_name}-client-devel-docs
This package includes the AMQP clients development documentation in HTML
format for easy browsing.
-%package server
+%files -n %{pkg_name}-client-devel-docs
+%defattr(-,root,root,-)
+%doc cpp/docs/api/html
+
+%endif # client_devel_docs
+
+# === Package: qpid-cpp-server ===
+
+%if %{server}
+
+%package -n %{pkg_name}-server
Summary: An AMQP message broker daemon
Group: System Environment/Daemons
-Requires: qpid-cpp-client = %{version}-%{release}
+Requires: %{pkg_name}-client = %{version}-%{release}
Requires: cyrus-sasl
-Obsoletes: qpidd < %{version}-4
-Provides: qpidd = %{version}-4
Requires(post): policycoreutils
Requires(post): selinux-policy-minimum
Requires(post): /usr/sbin/semodule
Requires(postun): /usr/sbin/semodule
-License: ASL 2.0
+Obsoletes: qpidd
+Obsoletes: qpidd-acl
-%description server
+%description -n %{pkg_name}-server
A message broker daemon that receives stores and routes messages using
the open AMQP messaging protocol.
-%package server-devel
+%files -n %{pkg_name}-server
+%defattr(-,root,root,-)
+%_datadir/selinux/packages/qpidd.pp
+%_libdir/libqpidbroker.so.*
+%_libdir/qpid/daemon/replicating_listener.so
+%_libdir/qpid/daemon/replication_exchange.so
+%_sbindir/qpidd
+%config(noreplace) %_sysconfdir/qpidd.conf
+%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) %_localstatedir/run/qpidd
+%attr(600, qpidd, qpidd) %config(noreplace) %_localstatedir/lib/qpidd/qpidd.sasldb
+%doc %_mandir/man1/qpidd.*
+
+%pre -n %{pkg_name}-server
+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 \
+ -c "Owner of Qpidd Daemons" qpidd
+exit 0
+
+%post -n %{pkg_name}-server
+# 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 %{pkg_name}-server
+# 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 %{pkg_name}-server
+if [ "$1" -ge "1" ]; then
+ /sbin/service qpidd condrestart >/dev/null 2>&1 || :
+fi
+/sbin/ldconfig
+/usr/sbin/semodule -r qpidd
+
+%endif # server
+
+# === Package: qpid-cpp-server-devel ===
+
+%if %{server_devel}
+
+%package -n %{pkg_name}-server-devel
Summary: Libraries and header files for developing Qpid broker extensions
Group: Development/System
-Requires: qpid-cpp-client-devel = %{version}-%{release}
-Requires: qpid-cpp-server = %{version}-%{release}
+Requires: %{pkg_name}-client-devel = %{version}-%{release}
+Requires: %{pkg_name}-server = %{version}-%{core_release}
Requires: boost-devel
-Requires: boost-program-options
+%if !%{rhel_5}
Requires: boost-filesystem
-Obsoletes: qpidd-devel < %{version}-4
-Provides: qpidd-devel = %{version}-4
-License: ASL 2.0
+Requires: boost-program-options
+%endif
+Obsoletes: qpidd-devel
-%description server-devel
+%description -n %{pkg_name}-server-devel
Libraries and header files for developing extensions to the
Qpid broker daemon.
+%files -n %{pkg_name}-server-devel
+%defattr(-,root,root,-)
+%_libdir/libqpidbroker.so
+%_includedir/qpid/broker
+
+%post -n %{pkg_name}-server-devel
+/sbin/ldconfig
+
+%postun -n %{pkg_name}-server-devel
+/sbin/ldconfig
+
+%endif # server_devel
+
+# === Package: qmf ===
+
+%if %{qmf}
+
%package -n qmf
Summary: The QPID Management Framework
-Group: System Environment/Daemons
-Requires: qpid-cpp-client = %{version}-%{release}
-License: ASL 2.0
+Group: System Environment/Libraries
+Requires: %{pkg_name}-client = %{version}-%{release}
%description -n qmf
An extensible managememt framework layered on QPID messaging.
+%files -n qmf
+%defattr(-,root,root,-)
+%_libdir/libqmf.so.*
+%_libdir/libqmfengine.so.*
+%_libdir/libqmfconsole.so.*
+
+%post -n qmf
+/sbin/ldconfig
+
+%postun -n qmf
+/sbin/ldconfig
+
+%endif # qmf
+
+# === Package: qmf-devel ===
+
+%if %{qmf_devel}
+
%package -n qmf-devel
Summary: Header files and tools for developing QMF extensions
Group: Development/System
-Requires: qmf = %{version}-%{release}
-Requires: qpid-cpp-client-devel = %{version}-%{release}
-License: ASL 2.0
+Requires: qmf = %{version}-%{core_release}
+Requires: %{pkg_name}-client-devel = %{version}-%{release}
%description -n qmf-devel
Header files and code-generation tools needed for developers of QMF-managed
components.
+%files -n qmf-devel
+%defattr(-,root,root,-)
+%_libdir/libqmf.so
+%_libdir/libqmfengine.so
+%_libdir/libqmfconsole.so
+%_bindir/qmf-gen
+%{python_sitelib}/qmfgen
+
+%post -n qmf-devel
+/sbin/ldconfig
+
+%postun -n qmf-devel
+/sbin/ldconfig
+
+%endif # qmf_devel
+
+# === Package: ruby-qmf ===
+
+%if %{ruby_qmf}
+
%package -n ruby-qmf
Summary: The QPID Management Framework bindings for ruby
Group: System Environment/Libraries
-Requires: qpid-cpp-client = %{version}-%{release}
-License: ASL 2.0
+Requires: %{pkg_name}-client = %{version}-%{release}
%description -n ruby-qmf
An extensible managememt framework layered on QPID messaging, bindings
for ruby.
-%package server-acl
-Summary: ACL based security for the Qpid daemon
-Group: System Environment/Libraries
-Requires: qpid-cpp-server = %{version}-%{release}
-Obsoletes: qpidd-acl < %{version}-4
-Provides: qpidd-acl = %{version}-4
-License: ASL 2.0
+%files -n ruby-qmf
+%defattr(-,root,root,-)
+%{ruby_sitelib}/qmf.rb
+%{ruby_sitearch}/qmfengine.so
+
+%post -n ruby-qmf
+/sbin/ldconfig
+
+%postun -n ruby-qmf
+/sbin/ldconfig
+
+%endif # ruby_qmf
-%description server-acl
-A Qpid daemon plugin to support ACL-based access control.
+# === Package: qpid-cpp-client-rdma ===
-%package client-rdma
+%if %{client_rdma}
+
+%package -n %{pkg_name}-client-rdma
Summary: RDMA Protocol support (including Infiniband) for Qpid clients
Group: System Environment/Libraries
-Requires: qpid-cpp-client = %{version}-%{release}
-Obsoletes: qpidc-rdma < %{version}-4
-Provides: qpidc-rdma = %{version}-4
-License: ASL 2.0
+Requires: %{pkg_name}-client = %{version}-%{core_release}
+Obsoletes: qpidc-rdma
-%description client-rdma
+%description -n %{pkg_name}-client-rdma
A client plugin and support library to support RDMA protocols (including
Infiniband) as the transport for Qpid messaging.
-%package server-rdma
+%files -n %{pkg_name}-client-rdma
+%defattr(-,root,root,-)
+%_libdir/librdmawrap.so.*
+%_libdir/qpid/client/rdmaconnector.so
+%config(noreplace) %_sysconfdir/qpid/qpidc.conf
+
+%post -n %{pkg_name}-client-rdma
+/sbin/ldconfig
+
+%postun -n %{pkg_name}-client-rdma
+/sbin/ldconfig
+
+%endif # client_rdma
+
+# === Package: qpid-cpp-server-rdma ===
+
+%if %{server_rdma}
+
+%package -n %{pkg_name}-server-rdma
Summary: RDMA Protocol support (including Infiniband) for the Qpid daemon
Group: System Environment/Libraries
-Requires: qpid-cpp-server = %{version}-%{release}
-Requires: qpid-cpp-client-rdma = %{version}-%{release}
-Obsoletes: qpidd-rdma < %{version}-4
-Provides: qpidd-rdma = %{version}-4
-License: ASL 2.0
+Requires: %{pkg_name}-server = %{version}-%{core_release}
+Requires: %{pkg_name}-client-rdma = %{version}-%{release}
+Obsoletes: qpidd-rdma
-%description server-rdma
+%description -n %{pkg_name}-server-rdma
A Qpid daemon plugin to support RDMA protocols (including Infiniband) as the
transport for AMQP messaging.
-%package client-ssl
+%files -n %{pkg_name}-server-rdma
+%defattr(-,root,root,-)
+%_libdir/qpid/daemon/rdma.so
+
+%post -n %{pkg_name}-server-rdma
+/sbin/ldconfig
+
+%postun -n %{pkg_name}-server-rdma
+/sbin/ldconfig
+
+%endif # server_rdma
+
+# === Package: qpid-cpp-client-ssl ===
+
+%if %{client_ssl}
+
+%package -n %{pkg_name}-client-ssl
Summary: SSL support for Qpid clients
Group: System Environment/Libraries
-Requires: qpid-cpp-client = %{version}-%{release}
-Obsoletes: qpidc-ssl < %{version}-4
-Provides: qpidc-ssl = %{version}-4
-License: ASL 2.0
+Requires: %{pkg_name}-client = %{version}-%{core_release}
+Obsoletes: qpidc-ssl
-%description client-ssl
+%description -n %{pkg_name}-client-ssl
A client plugin and support library to support SSL as the transport
for Qpid messaging.
-%package server-ssl
+%files -n %{pkg_name}-client-ssl
+%defattr(-,root,root,-)
+%_libdir/libsslcommon.so.*
+%_libdir/qpid/client/sslconnector.so
+
+%post -n %{pkg_name}-client-ssl
+/sbin/ldconfig
+
+%postun -n %{pkg_name}-client-ssl
+/sbin/ldconfig
+
+%endif # client_ssl
+
+# === Package: qpid-cpp-server-ssl ===
+
+%if %{server_ssl}
+
+%package -n %{pkg_name}-server-ssl
Summary: SSL support for the Qpid daemon
Group: System Environment/Libraries
-Requires: qpid-cpp-server = %{version}-%{release}
-Requires: qpid-cpp-client-ssl = %{version}-%{release}
-Obsoletes: qpidd-ssl < %{version}-4
-Provides: qpidd-ssl = %{version}-4
-License: ASL 2.0
+Requires: %{pkg_name}-server = %{version}-%{core_release}
+Requires: %{pkg_name}-client-ssl = %{version}-%{release}
+Obsoletes: qpidd-ssl
-%description server-ssl
+%description -n %{pkg_name}-server-ssl
A Qpid daemon plugin to support SSL as the transport for AMQP
messaging.
-%package server-xml
+%files -n %{pkg_name}-server-ssl
+%defattr(-,root,root,-)
+%_libdir/qpid/daemon/ssl.so
+
+%post -n %{pkg_name}-server-ssl
+/sbin/ldconfig
+
+%postun -n %{pkg_name}-server-ssl
+/sbin/ldconfig
+
+%endif # server_ssl
+
+# === Package: qpid-cpp-server-xml ===
+
+%if %{server_xml}
+
+%package -n %{pkg_name}-server-xml
Summary: XML extensions for the Qpid daemon
Group: System Environment/Libraries
-Requires: qpid-cpp-server = %{version}-%{release}
+Requires: %{pkg_name}-server = %{version}-%{core_release}
Requires: xqilla
Requires: xerces-c
-Obsoletes: qpidd-xml < %{version}-4
-Provides: qpidd-xml = %{version}-4
-License: ASL 2.0
+Obsoletes: qpidd-xml
-%description server-xml
+%description -n %{pkg_name}-server-xml
A Qpid daemon plugin to support extended XML-based routing of AMQP
messages.
-%package server-cluster
+%files -n %{pkg_name}-server-xml
+%defattr(-,root,root,-)
+%_libdir/qpid/daemon/xml.so
+
+%post -n %{pkg_name}-server-xml
+/sbin/ldconfig
+
+%postun -n %{pkg_name}-server-xml
+/sbin/ldconfig
+
+%endif # server_xml
+
+# === Package: qpid-cpp-server-cluster ===
+
+%if %{server_cluster}
+
+%package -n %{pkg_name}-server-cluster
Summary: Cluster support for the Qpid daemon
Group: System Environment/Daemons
-Requires: qpid-cpp-server = %{version}-%{release}
-Requires: qpid-cpp-client = %{version}-%{release}
+Requires: %{pkg_name}-server = %{version}-%{core_release}
+Requires: %{pkg_name}-client = %{version}-%{core_release}
+%if %{rhel_5}
+Requires: openais
+Requires: cman
+%else
Requires: corosync >= 1.0.0-1
Requires: clusterlib >= 3.0.0-20
-Obsoletes: qpidd-cluster < %{version}-4
-Provides: qpidd-cluster = %{version}-4
-License: ASL 2.0
+%endif
+Obsoletes: qpidd-cluster
-%description server-cluster
-A Qpid daemon plugin enabling broker clustering using openais
+%description -n %{pkg_name}-server-cluster
+%if %{rhel_5}
+A Qpid daemon plugin enabling broker clustering using openais.
+%else
+A Qpid daemon plugin enabling broker clustering using corosync.
+%endif
-%package perftest
-Summary: Simple benchmarking tools
-Group: System Environment/Tools
-Requires: qpid-cpp-client = %{version}-%{release}
-Obsoletes: qpidc-perftest < %{version}-4
-Provides: qpidc-perftest = %{version}-4
-License: ASL 2.0
-
-%description perftest
-Tools for performing testing and benchmarking of MRG-Messaging
-
-%ifarch i386 i586 i686 x86_64
-#RHM
-%package server-store
+%files -n %{pkg_name}-server-cluster
+%defattr(-,root,root,-)
+%_libdir/qpid/daemon/cluster.so
+%_libdir/qpid/daemon/watchdog.so
+%_libexecdir/qpid/qpidd_watchdog
+
+%post -n %{pkg_name}-server-cluster
+%if %{rhel_5}
+# [RHEL-5] openais: Make the qpidd user a member of the root group, and also make
+# qpidd's primary group == ais.
+usermod -g ais -G root qpidd
+%else
+# [RHEL-6, Fedora] corosync: Set up corosync permissions for user qpidd
+cat > /etc/corosync/uidgid.d/qpidd <<EOF
+uidgid {
+ uid: qpidd
+ gid: qpidd
+}
+EOF
+%endif
+/sbin/ldconfig
+
+%postun -n %{pkg_name}-server-cluster
+/sbin/ldconfig
+
+%endif # server_cluster
+
+# === Package: qpid-cpp-server-store ===
+
+%if %{server_store}
+
+%package -n %{pkg_name}-server-store
Summary: Red Hat persistence extension to the Qpid messaging system
Group: System Environment/Libraries
-Requires: qpid-cpp-server = %{version}-%{release}
+License: LGPL 2.1+
+Requires: %{pkg_name}-server = %{version}-%{core_release}
Requires: db4
-Obsoletes: rhm < 0.5.%{rhm_svnrev}-4
-Provides: rhm = 0.5.%{rhm_svnrev}-4
-License: LGPLv2
+Requires: libaio
+Obsoletes: rhm
-%description server-store
+%description -n %{pkg_name}-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.
-#/RHM
-%endif
+storage using a libaio-based asynchronous journal. (Built from store svn
+r.%{store_svnrev}.)
-%pre server
-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 \
- -c "Owner of Qpidd Daemons" qpidd
-exit 0
+%files -n %{pkg_name}-server-store
+%defattr(-,root,root,-)
+%doc ../store-%{qpid_release}.%{store_svnrev}/README
+%_libdir/qpid/daemon/msgstore.so*
+%_libexecdir/qpid/jrnl.py*
+%_libexecdir/qpid/resize
+%_libexecdir/qpid/store_chk
+%attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm
-%prep
-%setup -q -n qpidc-%{version}
-%patch0
-%patch1
-%patch2
-%patch3 -p1
-install -d selinux
-install %{SOURCE2} selinux
+%post -n %{pkg_name}-server-store
+/sbin/ldconfig
+
+%postun -n %{pkg_name}-server-store
+/sbin/ldconfig
+
+%endif # server_store
+
+# === Package: rh-qpid-cpp-tests (internal package, not distributed) ===
+
+%if %{rh_tests} && ! %{fedora}
+
+%package -n rh-%{pkg_name}-tests
+Summary: Internal Red Hat test utilities
+Group: System Environment/Tools
+Requires: %{pkg_name}-server = %{version}-%{core_release}
+Obsoletes: rh-qpidc-tests
+
+%description -n rh-%{pkg_name}-tests
+Tools which can be used by Red Hat for doing different tests
+in RHTS and other places and which customers do not need
+to receive at all.
+
+%files -n rh-%{pkg_name}-tests
+%defattr(755,root,root,-)
+/opt/rh-qpid/failover/run_failover_soak
+/opt/rh-qpid/failover/failover_soak
+/opt/rh-qpid/clients/declare_queues
+/opt/rh-qpid/clients/replaying_sender
+/opt/rh-qpid/clients/resuming_receiver
-%setup -q -T -D -b 1 -n rhm-0.5.%{rhm_svnrev}
-%patch4 -p1
+%endif # rh_tests
-# fix spurious-executable-perm warnings
-find ../ \( -name '*.h' -o -name '*.cpp' \) -executable | xargs chmod a-x
+# ===
+%prep
+# Sanity checks on flag settings
+%if ! %{MRG_core} && ! %{MRG_non_core}
+echo "ERROR: Neither {MRG_core} nor {MRG_non_core} is set true (1)."
+exit 1
+%endif
+%if %{fedora} && %{rhel_5}
+echo "ERROR: Both {fedora} and {rhel_5} are true (1) at the same time."
+exit 1
+%endif
+
+%setup -q -n %{name}-%{version}
+%setup -q -T -D -b 1 -n %{name}-%{version}
+%if %{fedora}
+%patch0
+%endif
%global perftests "perftest topic_listener topic_publisher latencytest client_test txtest"
+%global rh_qpid_cpp_tests_failover "failover_soak run_failover_soak"
+%global rh_qpid_cpp_tests_clients "replaying_sender resuming_receiver declare_queues"
+
+install -d selinux
+install %{SOURCE2} selinux
%build
-pushd ../qpidc-0.5.829175/cpp
+pushd cpp
./bootstrap
CXXFLAGS="%{optflags} -DNDEBUG -O3" \
-%configure --disable-static --with-cpg --without-graphviz --without-help2man
-ECHO=echo make #%{?_smp_mflags}
+
+%if %{MRG_non_core}
+# [MRG_non_core] - Build everything with all options
+%configure --disable-static --with-swig --with-sasl --with-cpg --with-xml --with-rdma --with-ssl --without-graphviz --without-help2man
+make
# Make perftest utilities
pushd src/tests
for ptest in %{perftests}; do
- ECHO=echo make $ptest
+ make $ptest
done
+%if !%{fedora}
+# Make rh-qpid-cpp-test programs (RH internal)
+for rhtest in %{rh_qpid_cpp_tests_failover} %{rh_qpid_cpp_tests_clients}; do
+ make $rhtest
+done
+%endif
popd
popd
-%ifarch i386 i586 i686 x86_64
-#RHM
-pushd ../rhm-0.5.%{rhm_svnrev}
-export CXXFLAGS="%{optflags} -DNDEBUG"
+# Store
+pushd ../store-%{qpid_release}.%{store_svnrev}
+export CXXFLAGS="%{optflags} -DNDEBUG -O3"
./bootstrap
-%configure --disable-static --disable-rpath --disable-dependency-tracking --with-qpid-checkout=%{_builddir}/qpidc-%{version}
-make dist
-make #%{?_smp_mflags}
+%configure --disable-static --disable-rpath --disable-dependency-tracking --with-qpid-checkout=%{_builddir}/%{name}-%{version}
+make
+
+%else # MRG_non_core
+# [MRG_core] - Build without options
+%configure --disable-static --with-swig --with-sasl --without-cpg --without-xml --without-rdma --without-ssl --without-graphviz --without-help2man
+make
+%endif # MRG_non_core
popd
-#/RHM
-%endif
%install
rm -rf %{buildroot}
mkdir -p -m0755 %{buildroot}/%_bindir
-pushd %{_builddir}/qpidc-%{version}/cpp
+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}%_libdir/qpidd
install -d -m0755 %{buildroot}/var/run/qpidd
+
+%if %{MRG_non_core}
# Install perftest utilities
pushd src/tests/
for ptest in %{perftests}; do
libtool --mode=install install -m755 $ptest %{buildroot}/%_bindir
done
+%if !%{fedora}
+# Install rh-qpid-cpp-test programs (RH internal)
+mkdir -p -m 0755 %{buildroot}/opt/rh-qpid/failover
+mkdir -p -m 0755 %{buildroot}/opt/rh-qpid/clients
+for rhtest in %{rh_qpid_cpp_tests_failover} ; do
+ libtool --mode=install install -m 755 $rhtest %{buildroot}/opt/rh-qpid/failover/
+done
+for rhtest in %{rh_qpid_cpp_tests_clients} ; do
+ libtool --mode=install install -m 755 $rhtest %{buildroot}/opt/rh-qpid/clients/
+done
+%endif
popd
pushd docs/api
make html
popd
+
+#Store
+pushd %{_builddir}/store-%{qpid_release}.%{store_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 -f %{buildroot}%_sysconfdir/rhmd.conf
+popd
+%endif # MRG_non_core
+
rm -f %{buildroot}%_libdir/*.a
rm -f %{buildroot}%_libdir/*.l
rm -f %{buildroot}%_libdir/*.la
@@ -370,35 +798,58 @@ rm -f %{buildroot}%_libdir/qpid/daemon/*
echo "auth=no" >> %{buildroot}/etc/qpidd.conf
install -d %{buildroot}%{_datadir}/selinux/packages
-install -m 644 %{_builddir}/qpidc-%{version}/selinux/qpidd.pp %{buildroot}%{_datadir}/selinux/packages
-install -pm 644 %{_builddir}/qpidc-%{version}/cpp/bindings/qmf/ruby/qmf.rb %{buildroot}%{ruby_sitelib}
-install -pm 755 %{_builddir}/qpidc-%{version}/cpp/bindings/qmf/ruby/.libs/qmfengine.so %{buildroot}%{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 -f %{buildroot}%_libdir/_*
rm -fr %{buildroot}%_libdir/qpid/tests
rm -fr %{buildroot}%_libexecdir/qpid/tests
-rm -f %{buildroot}%{ruby_sitearch}/qmfengine.la
+rm -f %{buildroot}%{ruby_sitearch}/qmfengine.la
+rm -fr %{buildroot}%_includedir/qmf
popd
-%ifarch i386 i586 i686 x86_64
-#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
+%if ! %{MRG_core}
+rm -f %{buildroot}%_sysconfdir/qpidd.conf
+rm -f %{buildroot}%_sysconfdir/rc.d/init.d/qpidd
+rm -f %{buildroot}%_sysconfdir/sasl2/qpidd.conf
+rm -f %{buildroot}%{ruby_sitelib}/qmf.rb
+rm -f %{buildroot}%_libdir/libqmf.so.*
+rm -f %{buildroot}%_libdir/libqmfconsole.so.*
+rm -f %{buildroot}%_libdir/libqmfengine.so.*
+rm -f %{buildroot}%_libdir/libqpidbroker.so.*
+rm -f %{buildroot}%_libdir/libqpidclient.so.*
+rm -f %{buildroot}%_libdir/libqpidcommon.so.*
+rm -f %{buildroot}%_libdir/qpid/daemon/acl.so
+rm -f %{buildroot}%_libdir/qpid/daemon/replicating_listener.so
+rm -f %{buildroot}%_libdir/qpid/daemon/replication_exchange.so
+rm -f %{buildroot}%{ruby_sitearch}/qmfengine.so
+rm -f %{buildroot}%_sbindir/qpidd
+rm -f %{buildroot}%_datadir/man/man1/qpidd.1*
+rm -f %{buildroot}%_datadir/selinux/packages/qpidd.pp
+rm -f %{buildroot}%_localstatedir/lib/qpidd/qpidd.sasldb
+%endif
+
+%if ! %{MRG_non_core}
+rm -rf %{buildroot}%_includedir/qpid
+rm -rf %{buildroot}%_datadir/qpidc/examples
+rm -rf %{buildroot}%{python_sitelib}/qmfgen
+rm -f %{buildroot}%_bindir/qmf-gen
+rm -f %{buildroot}%_libdir/libqmf.so
+rm -f %{buildroot}%_libdir/libqmfconsole.so
+rm -f %{buildroot}%_libdir/libqmfengine.so
+rm -f %{buildroot}%_libdir/libqpidbroker.so
+rm -f %{buildroot}%_libdir/libqpidclient.so
+rm -f %{buildroot}%_libdir/libqpidcommon.so
%endif
%clean
rm -rf %{buildroot}
%check
+# All tests currently disabled, using 'make check' takes too long.
+# TODO: Find a small smoke test that runs quickly, perhaps a special make target?
+
#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
@@ -406,190 +857,21 @@ rm -rf %{buildroot}
#LANG=C ECHO=echo make check
#popd
-%ifarch i386 i586 i686 x86_64
-#RHM
-#pushd %{_builddir}/rhm-0.5.%{rhm_svnrev}
+# Store
+#pushd %{_builddir}/store-%{qpid_release}.%{store_svnrev}
#make check
#popd
-#/RHM
-%endif
-
-%files client
-%defattr(-,root,root,-)
-%doc ../qpidc-%{version}/cpp/LICENSE
-%doc ../qpidc-%{version}/cpp/NOTICE
-%doc ../qpidc-%{version}/cpp/README
-%doc ../qpidc-%{version}/cpp/INSTALL
-%doc ../qpidc-%{version}/cpp/RELEASE_NOTES
-%doc ../qpidc-%{version}/cpp/DESIGN
-%_libdir/libqpidcommon.so.3
-%_libdir/libqpidcommon.so.3.0.0
-%_libdir/libqpidclient.so.3
-%_libdir/libqpidclient.so.3.0.0
-%dir %_libdir/qpid
-%dir %_libdir/qpid/client
-%dir %_sysconfdir/qpid
-%config(noreplace) %_sysconfdir/qpid/qpidc.conf
-%files client-devel
-%defattr(-,root,root,-)
-%dir %_includedir/qpid
-%_includedir/qpid/*.h
-%_includedir/qpid/amqp_0_10
-%_includedir/qpid/client
-%_includedir/qpid/console
-%_includedir/qpid/framing
-%_includedir/qpid/sys
-%_includedir/qpid/log
-%_includedir/qpid/management
-%_includedir/qpid/messaging
-%_includedir/qpid/agent
-%_includedir/qmf
-%_libdir/libqpidcommon.so
-%_libdir/libqpidclient.so
-%_datadir/qpidc/examples
-
-%files server
-%defattr(-,root,root,-)
-%_datadir/selinux/packages/qpidd.pp
-%_libdir/libqpidbroker.so.3
-%_libdir/libqpidbroker.so.3.0.0
-%_libdir/qpid/daemon/replicating_listener.so
-%_libdir/qpid/daemon/replication_exchange.so
-%_libdir/qpid/daemon/watchdog.so
-%_sbindir/qpidd
-%_libexecdir/qpid/qpidd_watchdog
-%config(noreplace) %_sysconfdir/qpidd.conf
-%config(noreplace) %_sysconfdir/sasl2/qpidd.conf
-%{_initrddir}/qpidd
-%dir %_libdir/qpid/daemon
-%attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
-%attr(755, qpidd, qpidd) /var/run/qpidd
-# qpidd.sasldb contains sasl credentials, needs to be readable only by root
-%attr(600, qpidd, qpidd) %config(noreplace) %_localstatedir/lib/qpidd/qpidd.sasldb
-%doc %_mandir/man1/qpidd.*
-
-%files server-devel
-%defattr(-,root,root,-)
-%defattr(-,root,root,-)
-%_libdir/libqpidbroker.so
-%_includedir/qpid/broker
-
-%files -n qmf
-%defattr(-,root,root,-)
-%_libdir/libqmf.so.1
-%_libdir/libqmf.so.1.0.0
-%_libdir/libqmfengine.so.1
-%_libdir/libqmfengine.so.1.0.1
-%_libdir/libqmfconsole.so.3
-%_libdir/libqmfconsole.so.3.0.0
-
-%files -n qmf-devel
-%defattr(-,root,root,-)
-%_libdir/libqmf.so
-%_libdir/libqmfengine.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 server-acl
-%defattr(-,root,root,-)
-%_libdir/qpid/daemon/acl.so
-
-%files client-rdma
-%defattr(-,root,root,-)
-%_libdir/librdmawrap.so.0
-%_libdir/librdmawrap.so.0.0.0
-%_libdir/qpid/client/rdmaconnector.so
-%config(noreplace) %_sysconfdir/qpid/qpidc.conf
-
-%files server-rdma
-%defattr(-,root,root,-)
-%_libdir/qpid/daemon/rdma.so
-
-%files client-ssl
-%defattr(-,root,root,-)
-%_libdir/libsslcommon.so.3
-%_libdir/libsslcommon.so.3.0.0
-%_libdir/qpid/client/sslconnector.so
-
-%files server-ssl
-%defattr(-,root,root,-)
-%_libdir/qpid/daemon/ssl.so
-
-%files server-xml
-%defattr(-,root,root,-)
-%_libdir/qpid/daemon/xml.so
-
-%files server-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 client-devel-docs
-%defattr(-,root,root,-)
-%doc ../qpidc-%{version}/cpp/docs/api/html
-
-%ifarch i386 i586 i686 x86_64
-%files server-store
-%defattr(-,root,root,-)
-%doc ../rhm-0.5.%{rhm_svnrev}/README
-%{_libdir}/qpid/daemon/msgstore.so*
-# /var/rhm needs to be group writable so that journal files can be updated properly
-%attr(0775,qpidd,qpidd) %dir %_localstatedir/rhm
-%endif
-
-%post client -p /sbin/ldconfig
-
-%postun client -p /sbin/ldconfig
-
-%post server
-# This adds the proper /etc/rc*.d links for the script
-/sbin/chkconfig --add qpidd
+%post
/sbin/ldconfig
-/usr/sbin/semodule -i %_datadir/selinux/packages/qpidd.pp
-
-%preun server
-# 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 server
-if [ "$1" -ge "1" ]; then
- /sbin/service qpidd condrestart >/dev/null 2>&1 || :
-fi
+%postun
/sbin/ldconfig
-/usr/sbin/semodule -r qpidd
-
-%post client-rdma -p /sbin/ldconfig
-
-%postun client-rdma -p /sbin/ldconfig
-
-%post client-ssl -p /sbin/ldconfig
-
-%postun client-ssl -p /sbin/ldconfig
-
-%post -n qmf -p /sbin/ldconfig
-
-%postun -n qmf -p /sbin/ldconfig
-
%changelog
+* Tue Mar 2 2010 Kim van der Riet<kim.vdriet at redhat.com> - 0.6.895736-1
+- Imported unified specfile from RHEL maintained by Kim van der Riet
+
* Mon Feb 8 2010 Nuno Santos <nsantos at nsantos-laptop> - 0.5.829175-4
- Package rename
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qpid-cpp/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 25 Feb 2010 19:31:21 -0000 1.2
+++ sources 5 Mar 2010 20:27:12 -0000 1.3
@@ -1,2 +1,2 @@
-38777aa2e3e9597111423213a879cb73 qpidc-0.5.829175.tar.gz
-18b1134366efd0e22ac87d0dcd423443 rhm-0.5.3684.tar.gz
+58a144119153570e6d325b996ec0c3a6 qpid-cpp-0.6.895736.tar.gz
+345a65238dba672c54e170aa0e497bdb store-0.6.3795.tar.gz
More information about the scm-commits
mailing list