[qpid-cpp/f16] Removed all references to RHEL from the specfile.
Darryl L. Pierce
mcpierce at fedoraproject.org
Thu Jun 7 13:42:40 UTC 2012
commit bb236fd4c966c8830cbd81407aab93a3e6dc66c7
Author: Darryl L. Pierce <dpierce at redhat.com>
Date: Fri Jun 1 14:42:19 2012 -0400
Removed all references to RHEL from the specfile.
qpid-cpp.spec | 111 +++------------------------------------------------------
1 files changed, 5 insertions(+), 106 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index f616677..8321a75 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -13,9 +13,6 @@
# * 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.
@@ -33,10 +30,6 @@
# 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
-# Set rhel_4 to 1 for RHEL-4 builds
-%global rhel_4 0
-# Set rhel_5 to 1 for RHEL-5 builds
-%global rhel_5 0
# LIBRARY VERSIONS
%global QPIDCOMMON_VERSION_INFO 5:0:0
@@ -108,20 +101,8 @@ URL: http://qpid.apache.org
Source0: qpid-%{version}.tar.gz
Source1: store-%{qpid_release}.%{store_svnrev}.tar.gz
-%if %{rhel_4}
-Patch3: RHEL4_SASL_Conf.patch
-Patch4: qpidd.patch
-Patch5: bz530364-rhel4.patch
-%endif
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# limit the architectures only in RHEL
-%if 0%{?rhel}
-ExclusiveArch: i386 i686 x86_64
-%endif
-#Vendor: Red Hat, Inc.
-
BuildRequires: boost-devel
BuildRequires: libtool
BuildRequires: doxygen
@@ -136,13 +117,9 @@ 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 %{client_rdma}
BuildRequires: libibverbs-devel
@@ -159,15 +136,10 @@ BuildRequires: xerces-c-devel
BuildRequires: db4-devel
BuildRequires: libaio-devel
-%if %{rhel_5}
-BuildRequires: openais-devel
-BuildRequires: cman-devel
-%else
%if %{server_cluster}
BuildRequires: corosynclib-devel
BuildRequires: clusterlib-devel
%endif
-%endif
%description
@@ -225,13 +197,9 @@ Summary: Header files, documentation and testing tools for developing Qpid C++ c
Group: Development/System
Requires: %{pkg_name}-client = %version-%release
Requires: boost-devel
-%if %{rhel_5} || %{rhel_4}
-Requires: e2fsprogs-devel
-%else
Requires: boost-filesystem
Requires: boost-program-options
Requires: libuuid-devel
-%endif
Requires: python
Obsoletes: qpidc-devel
Obsoletes: qpidc-perftest
@@ -254,18 +222,13 @@ in C++ using Qpid. Qpid implements the AMQP messaging specification.
%_includedir/qpid/messaging
%_includedir/qpid/agent
%_includedir/qpid/types
-%if %{rhel_4}
-%_includedir/qpid-boost
-%endif
%_includedir/qmf
-%if ! %{rhel_4}
%{_libdir}/libqpidcommon.so
%{_libdir}/libqpidclient.so
%{_libdir}/libqpidtypes.so
%{_libdir}/libqpidmessaging.so
%_datadir/qpidc/examples/messaging
%_datadir/qpidc/examples/old_api
-%endif
%defattr(755,root,root,-)
%_bindir/qpid-perftest
%_bindir/qpid-topic-listener
@@ -289,9 +252,7 @@ in C++ using Qpid. Qpid implements the AMQP messaging specification.
%package -n %{pkg_name}-client-devel-docs
Summary: AMQP client development documentation
Group: Documentation
-%if ! %{rhel_5} && ! %{rhel_4}
BuildArch: noarch
-%endif
Obsoletes: qpidc-devel-docs
@@ -328,11 +289,7 @@ the open AMQP messaging protocol.
%{_libdir}/qpid/daemon/replication_exchange.so
%_sbindir/qpidd
%config(noreplace) %_sysconfdir/qpidd.conf
-%if %{rhel_4}
-%config(noreplace) %_libdir/sasl2/qpidd.conf
-%else
%config(noreplace) %_sysconfdir/sasl2/qpidd.conf
-%endif
%{_initrddir}/qpidd
%dir %{_libdir}/qpid/daemon
%{_libdir}/qpid/daemon/acl.so
@@ -378,10 +335,8 @@ Group: Development/System
Requires: %{pkg_name}-client-devel = %version-%release
Requires: %{pkg_name}-server = %version-%release
Requires: boost-devel
-%if ! %{rhel_5} && ! %{rhel_4}
Requires: boost-filesystem
Requires: boost-program-options
-%endif
Obsoletes: qpidd-devel
%description -n %{pkg_name}-server-devel
@@ -468,7 +423,7 @@ components.
# === Package: python-qpid-qmf ===
-%if %{python_qmf} && ! %{rhel_4}
+%if %{python_qmf}
%package -n python-qpid-qmf
Summary: The QPID Management Framework bindings for python
@@ -508,7 +463,7 @@ for python.
# === Package: ruby-qpid-qmf ===
-%if %{ruby_qmf} && ! %{rhel_4}
+%if %{ruby_qmf}
%package -n ruby-qpid-qmf
Summary: The QPID Management Framework bindings for ruby
@@ -539,7 +494,7 @@ for ruby.
# === Package: qpid-cpp-client-rdma ===
-%if %{client_rdma} && ! %{rhel_4}
+%if %{client_rdma}
%package -n %{pkg_name}-client-rdma
Summary: RDMA Protocol support (including Infiniband) for Qpid clients
@@ -567,7 +522,7 @@ Infiniband) as the transport for Qpid messaging.
# === Package: qpid-cpp-server-rdma ===
-%if %{server_rdma} && ! %{rhel_4}
+%if %{server_rdma}
%package -n %{pkg_name}-server-rdma
Summary: RDMA Protocol support (including Infiniband) for the Qpid daemon
@@ -676,7 +631,7 @@ messages.
# === Package: qpid-cpp-server-cluster ===
-%if %{server_cluster} && ! %{rhel_4}
+%if %{server_cluster}
%package -n %{pkg_name}-server-cluster
Summary: Cluster support for the Qpid daemon
@@ -698,11 +653,6 @@ A Qpid daemon plugin enabling broker clustering using openais
%post -n %{pkg_name}-server-cluster
-%if %{rhel_5}
-# 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 {
@@ -710,7 +660,6 @@ uidgid {
gid: qpidd
}
EOF
-%endif
/sbin/ldconfig
%postun -n %{pkg_name}-server-cluster
@@ -833,21 +782,6 @@ Group: System Environment/Tools
%setup -q -n qpid-%{version}
%setup -q -T -D -b 1 -n qpid-%{version}
-%if %{rhel_4}
-# set up boost for rhel-4
-pushd ./cpp/boost-1.32-support
-make apply
-popd
-pushd ../store-%{qpid_release}.%{store_svnrev}/rhel4-support
-make apply
-popd
-
-# apply rhel-4 patches
-%patch3
-%patch4
-%patch5
-%endif
-
%global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
%global rh_qpid_tests_failover "failover_soak run_failover_soak"
@@ -860,11 +794,7 @@ pushd cpp
CXXFLAGS="%{optflags} -DNDEBUG -O3 -Wno-unused-result" \
%configure --disable-static --with-swig --with-sasl --with-ssl --without-help2man \
-%if %{rhel_4}
---without-swig \
-%else
--with-swig \
-%endif
%if %{server_rdma}
--with-rdma \
%else
@@ -919,11 +849,7 @@ popd
# Store
pushd ../../store-%{qpid_release}.%{store_svnrev}
-%if %{rhel_4}
-export CXXFLAGS="%{optflags} -DNDEBUG -I/usr/include/qpid-boost"
-%else
export CXXFLAGS="%{optflags} -DNDEBUG"
-%endif
./bootstrap
%configure --disable-static --disable-rpath --disable-dependency-tracking --with-qpid-checkout=%{_builddir}/qpid-%{version}
make %{?_smp_mflags}
@@ -942,11 +868,6 @@ 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}/var/run/qpidd
-%if %{rhel_4}
-# boost headers
-install -d -m0755 %{buildroot}%_includedir/qpid-boost/boost
-cp -pr src/boost/* %{buildroot}%_includedir/qpid-boost/boost
-%endif
# Install perftest utilities
pushd src/tests/
for ptest in %{perftests}; do
@@ -975,9 +896,6 @@ pushd ../tools
popd
# remove things we don't want to package
-%if ! %{rhel_4}
-rm -f %{buildroot}%_libdir/librdmawrap.so
-%endif
rm -f %{buildroot}%{_libdir}/*.a
rm -f %{buildroot}%{_libdir}/*.l
rm -f %{buildroot}%{_libdir}/*.la
@@ -1003,8 +921,6 @@ rm -rf %{buildroot}%_datadir/qpidc/examples/xml-exchange
rm -rf %{buildroot}%{_libdir}/qpid/daemon/ha.so
rm -rf %{buildroot}%_bindir/qpid-ha
-%if ! %{rhel_4}
-
%if %{python_qmf}
install -d %{buildroot}%{python_sitearch}
install -pm 644 %{_builddir}/qpid-%{version}/cpp/bindings/qpid/python/cqpid.py %{buildroot}%{python_sitearch}
@@ -1025,8 +941,6 @@ rm -rf %{buildroot}%{python_sitearch}/_cqmf2.la
rm -rf %{buildroot}%{python_sitearch}/_cqpid.la
rm -rf %{buildroot}%{python_sitearch}/_qmfengine.la
-%endif
-
%if %{ruby_qmf}
install -d %{buildroot}%{ruby_sitelib}
install -d %{buildroot}%{ruby_sitearch}
@@ -1043,9 +957,6 @@ rm -f %{buildroot}%{_libdir}/_*
#rm -f %{buildroot}%{_libdir}/pkgconfig/qpid.pc
rm -fr %{buildroot}%{_libdir}/qpid/tests
rm -fr %{buildroot}%_libexecdir/qpid/tests
-%if ! %{rhel_4}
-rm -f %{buildroot}%{ruby_sitearch}/*.la
-%endif
popd
#Store
@@ -1063,13 +974,6 @@ popd
%if ! %{MRG_core}
rm -f %{buildroot}%_sysconfdir/qpidd.conf
rm -f %{buildroot}%_sysconfdir/rc.d/init.d/qpidd
-%if ! %{rhel_4}
-rm -f %{buildroot}%_sysconfdir/sasl2/qpidd.conf
-rm -f %{buildroot}%{ruby_sitelib}/qmf.rb
-%endif
-%if ! %{rhel_4}
-rm -f %{buildroot}%{ruby_sitearch}/qmfengine.so
-%endif
rm -f %{buildroot}%{_libdir}/libqmf.so.*
rm -f %{buildroot}%{_libdir}/libqmfconsole.so.*
rm -f %{buildroot}%{_libdir}/libqmfengine.so.*
@@ -1119,11 +1023,6 @@ rm -f %{buildroot}%{_libdir}/libqpidcommon.so
#rm -f %{buildroot}%_bindir/client_test
#rm -f %{buildroot}%_bindir/txtest
#rm -f %{buildroot}%_bindir/qmf-gen
-%if ! %{rhel_4}
-rm -f %{buildroot}%_libdir/librdmawrap.so.*
-rm -f %{buildroot}%_libdir/qpid/client/rdmaconnector.so
-rm -f %{buildroot}%_libdir/qpid/daemon/rdma.so
-%endif
#rm -f %{buildroot}%{_libdir}/libqmf.so
#rm -f %{buildroot}%{_libdir}/libqmfconsole.so
#rm -f %{buildroot}%{_libdir}/libqmfengine.so
More information about the scm-commits
mailing list