[qpid-cpp/f16] Removed the MRG related macros.
Darryl L. Pierce
mcpierce at fedoraproject.org
Thu Jun 7 13:42:45 UTC 2012
commit 2aa305d8446554ca1307c42d9e201ea438c9bcf7
Author: Darryl L. Pierce <dpierce at redhat.com>
Date: Fri Jun 1 15:34:59 2012 -0400
Removed the MRG related macros.
Since this build is solely for Fedora, this removes all of the
non-Fedora related macros.
qpid-cpp.spec | 313 +--------------------------------------------------------
1 files changed, 1 insertions(+), 312 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 8321a75..d8ffd71 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -8,17 +8,6 @@
%{!?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"] ')}
-# ===========
-# 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.
-# 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.16
%global qpid_svnrev 1336378
@@ -26,11 +15,6 @@
# Change this release number for each build of the same qpid_svnrev, otherwise set back to 1.
%global release_num 1
-# NOTE: these flags should not both be set at the same time!
-# RHEL-6 builds should have all flags set to 0.
-# Set fedora to 1 for Fedora builds that use so_number.patch
-%global fedora 1
-
# LIBRARY VERSIONS
%global QPIDCOMMON_VERSION_INFO 5:0:0
%global QPIDTYPES_VERSION_INFO 3:0:2
@@ -47,44 +31,6 @@
# Single var with all lib version params (except store) for make
%global LIB_VERSION_MAKE_PARAMS QPIDCOMMON_VERSION_INFO=%{QPIDCOMMON_VERSION_INFO} QPIDBROKER_VERSION_INFO=%{QPIDBROKER_VERSION_INFO} QPIDCLIENT_VERSION_INFO=%{QPIDCLIENT_VERSION_INFO} QPIDMESSAGING_VERSION_INFO=%{QPIDMESSAGING_VERSION_INFO} QMF_VERSION_INFO=%{QMF_VERSION_INFO} QMFENGINE_VERSION_INFO=%{QMFENGINE_VERSION_INFO} QMFCONSOLE_VERSION_INFO=%{QMFCONSOLE_VERSION_INFO} RDMAWRAP_VERSION_INFO=%{RDMAWRAP_VERSION_INFO} SSLCOMMON_VERSION_INFO=%{SSLCOMMON_VERSION_INFO}
-# ===========
-
-# 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 python_qmf %{MRG_core}
-%global ruby_qmf %{MRG_core}
-%global client_devel %{MRG_core}
-%global client_devel_docs %{MRG_core}
-%global server_devel %{MRG_core}
-%global qmf_devel %{MRG_core}
-%ifnarch s390 s390x
-%global client_rdma %{MRG_non_core}
-%global server_rdma %{MRG_non_core}
-%else
-%global client_rdma 0
-%global server_rdma 0
-%endif
-%global client_ssl %{MRG_non_core}
-%global server_ssl %{MRG_non_core}
-%global server_xml %{MRG_non_core}
-%if %{fedora}
-%global server_cluster 0
-%else
-%global server_cluster %{MRG_non_core}
-%endif
-%global server_store %{MRG_non_core}
-%if %{fedora}
-%global rh_tests 0
-%global qpid_tools 1
-%else
-%global rh_tests %{MRG_non_core}
-%global qpid_tools 0
-%endif
-
%global name qpid-cpp
# This overrides the package name - do not change this! It keeps all package
# names consistent, irrespective of the {name} variable - which changes for
@@ -120,26 +66,14 @@ BuildRequires: cyrus-sasl
BuildRequires: boost-program-options
BuildRequires: boost-filesystem
BuildRequires: libuuid-devel
-
-%if %{client_rdma}
BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel
-%endif
-
BuildRequires: nss-devel
BuildRequires: nspr-devel
-
-%if %{server_xml}
BuildRequires: xqilla-devel
BuildRequires: xerces-c-devel
-%endif
-
BuildRequires: db4-devel
BuildRequires: libaio-devel
-%if %{server_cluster}
-BuildRequires: corosynclib-devel
-BuildRequires: clusterlib-devel
-%endif
%description
@@ -149,8 +83,6 @@ the AMQP protocol.
# === Package: qpid-cpp-client ===
-%if %{client}
-
%package -n %{pkg_name}-client
Summary: Libraries for Qpid C++ client applications
Group: System Environment/Libraries
@@ -186,12 +118,8 @@ the AMQP protocol.
%postun -n %{pkg_name}-client
/sbin/ldconfig
-%endif
-
# === 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
@@ -243,12 +171,8 @@ in C++ using Qpid. Qpid implements the AMQP messaging specification.
%postun -n %{pkg_name}-client-devel
/sbin/ldconfig
-%endif
-
# === Package: qpid-cpp-client-devel-docs ===
-%if %{client_devel_docs}
-
%package -n %{pkg_name}-client-devel-docs
Summary: AMQP client development documentation
Group: Documentation
@@ -264,12 +188,8 @@ format for easy browsing.
%defattr(-,root,root,-)
%doc cpp/docs/api/html
-%endif
-
# === Package: qpid-cpp-server ===
-%if %{server}
-
%package -n %{pkg_name}-server
Summary: An AMQP message broker daemon
Group: System Environment/Daemons
@@ -323,12 +243,8 @@ if [ $1 -ge 1 ]; then
fi
/sbin/ldconfig
-%endif
-
# === 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
@@ -355,12 +271,8 @@ Qpid broker daemon.
%postun -n %{pkg_name}-server-devel
/sbin/ldconfig
-%endif
-
# === Package: qpid-qmf ===
-%if %{qmf}
-
%package -n qpid-qmf
Summary: The QPID Management Framework
Group: System Environment/Daemons
@@ -386,12 +298,8 @@ An extensible management framework layered on QPID messaging.
%postun -n qpid-qmf
/sbin/ldconfig
-%endif
-
# === Package: qpid-qmf-devel ===
-%if %{qmf_devel}
-
%package -n qpid-qmf-devel
Summary: Header files and tools for developing QMF extensions
Group: Development/System
@@ -419,12 +327,8 @@ components.
%postun -n qpid-qmf-devel
/sbin/ldconfig
-%endif
-
# === Package: python-qpid-qmf ===
-%if %{python_qmf}
-
%package -n python-qpid-qmf
Summary: The QPID Management Framework bindings for python
Group: System Environment/Libraries
@@ -459,12 +363,8 @@ for python.
%postun -n python-qpid-qmf
/sbin/ldconfig
-%endif
-
# === Package: ruby-qpid-qmf ===
-%if %{ruby_qmf}
-
%package -n ruby-qpid-qmf
Summary: The QPID Management Framework bindings for ruby
Group: System Environment/Libraries
@@ -490,12 +390,8 @@ for ruby.
%postun -n ruby-qpid-qmf
/sbin/ldconfig
-%endif
-
# === Package: qpid-cpp-client-rdma ===
-%if %{client_rdma}
-
%package -n %{pkg_name}-client-rdma
Summary: RDMA Protocol support (including Infiniband) for Qpid clients
Group: System Environment/Libraries
@@ -518,12 +414,8 @@ Infiniband) as the transport for Qpid messaging.
%postun -n %{pkg_name}-client-rdma
/sbin/ldconfig
-%endif
-
# === 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
@@ -545,12 +437,8 @@ transport for AMQP messaging.
%postun -n %{pkg_name}-server-rdma
/sbin/ldconfig
-%endif
-
# === Package: qpid-cpp-client-ssl ===
-%if %{client_ssl}
-
%package -n %{pkg_name}-client-ssl
Summary: SSL support for Qpid clients
Group: System Environment/Libraries
@@ -572,12 +460,8 @@ for Qpid messaging.
%postun -n %{pkg_name}-client-ssl
/sbin/ldconfig
-%endif
-
# === 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
@@ -599,12 +483,8 @@ messaging.
%postun -n %{pkg_name}-server-ssl
/sbin/ldconfig
-%endif
-
# === 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
@@ -627,50 +507,8 @@ messages.
%postun -n %{pkg_name}-server-xml
/sbin/ldconfig
-%endif
-
-# === 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: %{pkg_name}-server = %version-%release
-Requires: %{pkg_name}-client = %version-%release
-Requires: openais
-Requires: cman
-Obsoletes: qpidd-cluster
-
-%description -n %{pkg_name}-server-cluster
-A Qpid daemon plugin enabling broker clustering using openais
-
-%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
-# [RHEL-6, Fedora] corosync: Set up corosync permissions for user qpidd
-cat > /etc/corosync/uidgid.d/qpidd <<EOF
-uidgid {
- uid: qpidd
- gid: qpidd
-}
-EOF
-/sbin/ldconfig
-
-%postun -n %{pkg_name}-server-cluster
-/sbin/ldconfig
-
-%endif
-
# === 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
@@ -703,36 +541,8 @@ with Berkeley DB.
%postun -n %{pkg_name}-server-store
/sbin/ldconfig
-%endif
-
-# === Package: rh-qpid-cpp-tests ===
-
-%if %{rh_tests}
-
-%package -n rh-%{pkg_name}-tests
-Summary: Internal Red Hat test utilities
-Group: System Environment/Tools
-Requires: %{pkg_name}-client = %version-%release
-
-%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
-
-%endif
-
# === Package: qpid-tools ===
-%if %{qpid_tools}
-
%package -n qpid-tools
Summary: Management and diagnostic tools for Apache Qpid
Group: System Environment/Tools
@@ -759,8 +569,6 @@ Management and diagnostic tools for Apache Qpid brokers and clients.
%{python_sitelib}/qpid_tools-*.egg-info
%endif
-%endif
-
# === Package: perl-qpid ===
%package -n perl-qpid
@@ -795,21 +603,9 @@ pushd cpp
CXXFLAGS="%{optflags} -DNDEBUG -O3 -Wno-unused-result" \
%configure --disable-static --with-swig --with-sasl --with-ssl --without-help2man \
--with-swig \
-%if %{server_rdma}
--with-rdma \
-%else
---without-rdma \
-%endif
-%if %{server_cluster}
---with-cpg \
-%else
--without-cpg \
-%endif
-%if %{server_xml}
--with-xml
-%else
---without-xml
-%endif
ECHO=echo make %{LIB_VERSION_MAKE_PARAMS} %{?_smp_mflags}
# Make perftest utilities
@@ -818,24 +614,8 @@ for ptest in %{perftests}; do
ECHO=echo make $ptest
done
-%if %{rh_tests}
-# Make rh-qpid-test programs (RH internal)
-for rhtest in %{rh_qpid_tests_failover} %{rh_qpid_tests_clients}; do
- make $rhtest
-done
-# Patch run_failover_soak to make it work outside source tree
-mv -f run_failover_soak run_failover_soak.orig
-cat run_failover_soak.orig | sed -e "s#^src_root=..#src_root=/usr/sbin#" \
- -e "s#\$src_root/\.libs#%{_libdir}/qpid/daemon#" \
- -e "s#\`dirname \$0\`#../failover#" \
- -e "s#^exec #cd /opt/rh-qpid/clients; exec #" > run_failover_soak
-
-popd
-%endif
-
popd
-%if %{fedora}
pushd ../python
./setup.py build
popd
@@ -845,11 +625,10 @@ popd
pushd ../extras/qmf
./setup.py build
popd
-%endif
# Store
pushd ../../store-%{qpid_release}.%{store_svnrev}
-export CXXFLAGS="%{optflags} -DNDEBUG"
+export CXXFLAGS="%{optflags} -DNDEBUG"
./bootstrap
%configure --disable-static --disable-rpath --disable-dependency-tracking --with-qpid-checkout=%{_builddir}/qpid-%{version}
make %{?_smp_mflags}
@@ -874,18 +653,6 @@ for ptest in %{perftests}; do
libtool --mode=install install -m755 $ptest %{buildroot}/%_bindir
done
-%if %{rh_tests}
-# Install rh-qpid-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_tests_failover} ; do
- libtool --mode=install install -m 755 $rhtest %{buildroot}/opt/rh-qpid/failover/
-done
-for rhtest in %{rh_qpid_tests_clients} ; do
- libtool --mode=install install -m 755 $rhtest %{buildroot}/opt/rh-qpid/clients/
-done
-%endif
-
popd
pushd docs/api
make html
@@ -921,7 +688,6 @@ rm -rf %{buildroot}%_datadir/qpidc/examples/xml-exchange
rm -rf %{buildroot}%{_libdir}/qpid/daemon/ha.so
rm -rf %{buildroot}%_bindir/qpid-ha
-%if %{python_qmf}
install -d %{buildroot}%{python_sitearch}
install -pm 644 %{_builddir}/qpid-%{version}/cpp/bindings/qpid/python/cqpid.py %{buildroot}%{python_sitearch}
install -pm 644 %{_builddir}/qpid-%{version}/cpp/bindings/qpid/python/.libs/_cqpid.so %{buildroot}%{python_sitearch}
@@ -941,7 +707,6 @@ rm -rf %{buildroot}%{python_sitearch}/_cqmf2.la
rm -rf %{buildroot}%{python_sitearch}/_cqpid.la
rm -rf %{buildroot}%{python_sitearch}/_qmfengine.la
-%if %{ruby_qmf}
install -d %{buildroot}%{ruby_sitelib}
install -d %{buildroot}%{ruby_sitearch}
install -pm 644 %{_builddir}/qpid-%{version}/cpp/bindings/qmf/ruby/qmf.rb %{buildroot}%{ruby_sitelib}
@@ -949,9 +714,6 @@ install -pm 644 %{_builddir}/qpid-%{version}/cpp/bindings/qmf2/ruby/qmf2.rb %{bu
install -pm 755 %{_builddir}/qpid-%{version}/cpp/bindings/qpid/ruby/.libs/cqpid.so %{buildroot}%{ruby_sitearch}
install -pm 755 %{_builddir}/qpid-%{version}/cpp/bindings/qmf/ruby/.libs/qmfengine.so %{buildroot}%{ruby_sitearch}
install -pm 755 %{_builddir}/qpid-%{version}/cpp/bindings/qmf2/ruby/.libs/cqmf2.so %{buildroot}%{ruby_sitearch}
-%endif
-
-%endif
rm -f %{buildroot}%{_libdir}/_*
#rm -f %{buildroot}%{_libdir}/pkgconfig/qpid.pc
@@ -971,79 +733,6 @@ rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%_sysconfdir/rhmd.conf
popd
-%if ! %{MRG_core}
-rm -f %{buildroot}%_sysconfdir/qpidd.conf
-rm -f %{buildroot}%_sysconfdir/rc.d/init.d/qpidd
-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}/libqpidmessaging.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}%{_libdir}/qpid/daemon/watchdog.so
-rm -f %{buildroot}%_libexecdir/qpid/qpidd_watchdog
-rm -f %{buildroot}%_sbindir/qpidd
-rm -f %{buildroot}%_datadir/man/man1/qpidd.1
-rm -f %{buildroot}%_localstatedir/lib/qpidd/qpidd.sasldb
-# The following should be removed when -devel becomes part of non-core:
-rm -rf %{buildroot}%_includedir/qmf
-rm -rf %{buildroot}%_includedir/qpid
-rm -rf %{buildroot}%_datadir/qpidc/examples/messaging
-rm -rf %{buildroot}%{python_sitelib}/qmfgen
-rm -f %{buildroot}%_bindir/qpid-perftest
-rm -f %{buildroot}%_bindir/qpid-topic-listener
-rm -f %{buildroot}%_bindir/qpid-topic-publisher
-rm -f %{buildroot}%_bindir/qpid-latency-test
-rm -f %{buildroot}%_bindir/qpid-client-test
-rm -f %{buildroot}%_bindir/qpid-txtest
-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}/libqpidmessaging.so
-rm -f %{buildroot}%{_libdir}/libqpidcommon.so
-%endif
-
-%if ! %{MRG_non_core}
-# The following should be uncommented when -devel becomes a part of non-core:
-#rm -rf %{buildroot}%_includedir/qmf
-#rm -rf %{buildroot}%_includedir/qpid
-#rm -rf %{buildroot}%_datadir/qpidc/examples/messaging
-#rm -rf %{buildroot}%{python_sitearch}/qmfgen
-#rm -f %{buildroot}%_bindir/perftest
-#rm -f %{buildroot}%_bindir/topic_listener
-#rm -f %{buildroot}%_bindir/topic_publisher
-#rm -f %{buildroot}%_bindir/latencytest
-#rm -f %{buildroot}%_bindir/client_test
-#rm -f %{buildroot}%_bindir/txtest
-#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}/libqpidmessaging.so
-#rm -f %{buildroot}%{_libdir}/libqpidcommon.so
-rm -f %{buildroot}%{_libdir}/libsslcommon.so.*
-rm -f %{buildroot}%{_libdir}/qpid/client/sslconnector.so
-rm -f %{buildroot}%{_libdir}/qpid/daemon/cluster.so
-rm -f %{buildroot}%{_libdir}/qpid/daemon/msgstore.so
-rm -f %{buildroot}%{_libdir}/qpid/daemon/ssl.so
-rm -f %{buildroot}%{_libdir}/qpid/daemon/xml.so
-rm -f %{buildroot}%{python_sitearch}/qpidstore/__init__.py*
-rm -f %{buildroot}%{python_sitearch}/qpidstore/jerr.py
-rm -f %{buildroot}%{python_sitearch}/qpidstore/jrnl.py
-rm -f %{buildroot}%{python_sitearch}/qpidstore/janal.py
-rm -f %{buildroot}%_libexecdir/qpid/resize
-rm -f %{buildroot}%_libexecdir/qpid/store_chk
-%endif
-
# Perl bindings
pushd %{_builddir}/qpid-%{version}
install -d -m 755 %{buildroot}%{perl_vendorarch}/
More information about the scm-commits
mailing list