[qpid-cpp/f16] Replaced the use of old rpm macros with new ones.
Darryl L. Pierce
mcpierce at fedoraproject.org
Thu Jun 7 13:42:35 UTC 2012
commit 6350a88c861ee8ffbf293da082e0e6e3cffb63a1
Author: Darryl L. Pierce <dpierce at redhat.com>
Date: Fri Jun 1 14:28:10 2012 -0400
Replaced the use of old rpm macros with new ones.
Replaced %_libdir with %{_libdir}
qpid-cpp.spec | 169 +++++++++++++++++++++++++++++----------------------------
1 files changed, 85 insertions(+), 84 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index e4be8b1..f616677 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -198,15 +198,15 @@ the AMQP protocol.
%files -n %{pkg_name}-client
%defattr(-,root,root,-)
%doc cpp/LICENSE cpp/NOTICE cpp/README.txt cpp/INSTALL cpp/RELEASE_NOTES cpp/DESIGN
-%_libdir/libqpidcommon.so.*
-%_libdir/libqpidclient.so.*
-%_libdir/libqpidtypes.so.*
-%_libdir/libqpidmessaging.so.*
-%dir %_libdir/qpid
-%dir %_libdir/qpid/client
+%{_libdir}/libqpidcommon.so.*
+%{_libdir}/libqpidclient.so.*
+%{_libdir}/libqpidtypes.so.*
+%{_libdir}/libqpidmessaging.so.*
+%dir %{_libdir}/qpid
+%dir %{_libdir}/qpid/client
%dir %_sysconfdir/qpid
%config(noreplace) %_sysconfdir/qpid/qpidc.conf
-%_libdir/pkgconfig/qpid.pc
+%{_libdir}/pkgconfig/qpid.pc
%post -n %{pkg_name}-client
/sbin/ldconfig
@@ -258,11 +258,11 @@ in C++ using Qpid. Qpid implements the AMQP messaging specification.
%_includedir/qpid-boost
%endif
%_includedir/qmf
-%_libdir/libqpidcommon.so
-%_libdir/libqpidclient.so
-%_libdir/libqpidtypes.so
-%_libdir/libqpidmessaging.so
%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
@@ -323,9 +323,9 @@ the open AMQP messaging protocol.
%files -n %{pkg_name}-server
%defattr(-,root,root,-)
-%_libdir/libqpidbroker.so.*
-%_libdir/qpid/daemon/replicating_listener.so
-%_libdir/qpid/daemon/replication_exchange.so
+%{_libdir}/libqpidbroker.so.*
+%{_libdir}/qpid/daemon/replicating_listener.so
+%{_libdir}/qpid/daemon/replication_exchange.so
%_sbindir/qpidd
%config(noreplace) %_sysconfdir/qpidd.conf
%if %{rhel_4}
@@ -334,8 +334,8 @@ the open AMQP messaging protocol.
%config(noreplace) %_sysconfdir/sasl2/qpidd.conf
%endif
%{_initrddir}/qpidd
-%dir %_libdir/qpid/daemon
-%_libdir/qpid/daemon/acl.so
+%dir %{_libdir}/qpid/daemon
+%{_libdir}/qpid/daemon/acl.so
%attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
%ghost %attr(755, qpidd, qpidd) /var/run/qpidd
#%attr(600, qpidd, qpidd) %config(noreplace) %_localstatedir/lib/qpidd/qpidd.sasldb
@@ -391,7 +391,7 @@ Qpid broker daemon.
%files -n %{pkg_name}-server-devel
%defattr(-,root,root,-)
%defattr(-,root,root,-)
-%_libdir/libqpidbroker.so
+%{_libdir}/libqpidbroker.so
%_includedir/qpid/broker
%post -n %{pkg_name}-server-devel
@@ -419,11 +419,11 @@ An extensible management framework layered on QPID messaging.
%files -n qpid-qmf
%defattr(-,root,root,-)
-%_libdir/libqmf.so.*
-%_libdir/libqmf2.so.*
-%_libdir/libqmfengine.so.*
-%_libdir/libqmfconsole.so.*
-%_libdir/pkgconfig/qmf2.pc
+%{_libdir}/libqmf.so.*
+%{_libdir}/libqmf2.so.*
+%{_libdir}/libqmfengine.so.*
+%{_libdir}/libqmfconsole.so.*
+%{_libdir}/pkgconfig/qmf2.pc
%post -n qpid-qmf
/sbin/ldconfig
@@ -451,10 +451,10 @@ components.
%files -n qpid-qmf-devel
%defattr(-,root,root,-)
-%_libdir/libqmf.so
-%_libdir/libqmf2.so
-%_libdir/libqmfengine.so
-%_libdir/libqmfconsole.so
+%{_libdir}/libqmf.so
+%{_libdir}/libqmf2.so
+%{_libdir}/libqmfengine.so
+%{_libdir}/libqmfconsole.so
%_bindir/qmf-gen
%{python_sitelib}/qmfgen
@@ -553,8 +553,8 @@ Infiniband) as the transport for Qpid messaging.
%files -n %{pkg_name}-client-rdma
%defattr(-,root,root,-)
-%_libdir/librdmawrap.so.*
-%_libdir/qpid/client/rdmaconnector.so
+%{_libdir}/librdmawrap.so*
+%{_libdir}/qpid/client/rdmaconnector.so
%config(noreplace) %_sysconfdir/qpid/qpidc.conf
%post -n %{pkg_name}-client-rdma
@@ -582,7 +582,7 @@ transport for AMQP messaging.
%files -n %{pkg_name}-server-rdma
%defattr(-,root,root,-)
-%_libdir/qpid/daemon/rdma.so
+%{_libdir}/qpid/daemon/rdma.so
%post -n %{pkg_name}-server-rdma
/sbin/ldconfig
@@ -608,8 +608,8 @@ for Qpid messaging.
%files -n %{pkg_name}-client-ssl
%defattr(-,root,root,-)
-%_libdir/libsslcommon.so.*
-%_libdir/qpid/client/sslconnector.so
+%{_libdir}/libsslcommon.so.*
+%{_libdir}/qpid/client/sslconnector.so
%post -n %{pkg_name}-client-ssl
/sbin/ldconfig
@@ -636,7 +636,7 @@ messaging.
%files -n %{pkg_name}-server-ssl
%defattr(-,root,root,-)
-%_libdir/qpid/daemon/ssl.so
+%{_libdir}/qpid/daemon/ssl.so
%post -n %{pkg_name}-server-ssl
/sbin/ldconfig
@@ -664,7 +664,7 @@ messages.
%files -n %{pkg_name}-server-xml
%defattr(-,root,root,-)
-%_libdir/qpid/daemon/xml.so
+%{_libdir}/qpid/daemon/xml.so
%post -n %{pkg_name}-server-xml
/sbin/ldconfig
@@ -692,8 +692,8 @@ 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
+%{_libdir}/qpid/daemon/cluster.so
+%{_libdir}/qpid/daemon/watchdog.so
%_libexecdir/qpid/qpidd_watchdog
@@ -739,7 +739,7 @@ with Berkeley DB.
%files -n %{pkg_name}-server-store
%defattr(-,root,root,-)
%doc ../store-%{qpid_release}.%{store_svnrev}/README
-%_libdir/qpid/daemon/msgstore.so*
+%{_libdir}/qpid/daemon/msgstore.so*
%{python_sitearch}/qpidstore/__init__.py*
%{python_sitearch}/qpidstore/jerr.py*
%{python_sitearch}/qpidstore/jrnl.py*
@@ -940,7 +940,7 @@ 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 %{rhel_4}
# boost headers
@@ -975,16 +975,17 @@ pushd ../tools
popd
# remove things we don't want to package
-rm -f %{buildroot}%_libdir/*.a
-rm -f %{buildroot}%_libdir/*.l
-rm -f %{buildroot}%_libdir/*.la
%if ! %{rhel_4}
rm -f %{buildroot}%_libdir/librdmawrap.so
%endif
-rm -f %{buildroot}%_libdir/libsslcommon.so
-rm -f %{buildroot}%_libdir/qpid/client/*.la
-rm -f %{buildroot}%_libdir/qpid/daemon/*.la
-rm -f %{buildroot}%_libdir/libcqpid_perl.so
+rm -f %{buildroot}%{_libdir}/*.a
+rm -f %{buildroot}%{_libdir}/*.l
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/libsslcommon.so
+rm -f %{buildroot}%{_libdir}/qpid/client/*.la
+rm -f %{buildroot}%{_libdir}/qpid/daemon/*.la
+rm -f %{buildroot}%{_libdir}/libcqpid_perl.so
+rm -f %{buildroot}%{ruby_sitearchdir}/*.la
# this should be fixed in the examples Makefile (make install)
rm -f %{buildroot}%_datadir/qpidc/examples/Makefile
@@ -999,7 +1000,7 @@ rm -rf %{buildroot}%_datadir/qpidc/examples/tradedemo
rm -rf %{buildroot}%_datadir/qpidc/examples/xml-exchange
# remove HA files
-rm -rf %{buildroot}%_libdir/qpid/daemon/ha.so
+rm -rf %{buildroot}%{_libdir}/qpid/daemon/ha.so
rm -rf %{buildroot}%_bindir/qpid-ha
%if ! %{rhel_4}
@@ -1038,9 +1039,9 @@ install -pm 755 %{_builddir}/qpid-%{version}/cpp/bindings/qmf2/ruby/.libs/cqmf2.
%endif
-rm -f %{buildroot}%_libdir/_*
-#rm -f %{buildroot}%_libdir/pkgconfig/qpid.pc
-rm -fr %{buildroot}%_libdir/qpid/tests
+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
@@ -1051,11 +1052,11 @@ popd
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
+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
@@ -1066,20 +1067,20 @@ rm -f %{buildroot}%_sysconfdir/rc.d/init.d/qpidd
rm -f %{buildroot}%_sysconfdir/sasl2/qpidd.conf
rm -f %{buildroot}%{ruby_sitelib}/qmf.rb
%endif
-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
%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.*
+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
@@ -1096,13 +1097,13 @@ 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
+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}
@@ -1118,24 +1119,24 @@ rm -f %{buildroot}%_libdir/libqpidcommon.so
#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
%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/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}%{_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
More information about the scm-commits
mailing list