The package rpms/qpid-cpp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/qpid-cpp.git/commit/?id=dbdd70e3a....
Change:
+%ifnarch s390 s390x %{arm}
Thanks.
Full change:
============
commit dbdd70e3a8e6f9379c756f94929816bb09a74ee7
Author: Irina Boverman <iboverma(a)redhat.com>
Date: Fri Dec 1 12:14:55 2017 -0500
1.37.0-1
diff --git a/0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
b/0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
deleted file mode 100644
index b727626..0000000
--- a/0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f7a46d3b6216a745eb1722ccdb74e8f03c9e90a9 Mon Sep 17 00:00:00 2001
-From: "Darryl L. Pierce" <mcpierce(a)gmail.com>
-Date: Wed, 3 Apr 2013 10:07:37 -0400
-Subject: [PATCH 1/3] NO-JIRA: qpidd.service file for use on Fedora
-
-This patch provides the needed systemd file for running the Qpid broker
-as a service.
----
- qpid/cpp/etc/qpidd-primary.service | 15 +++++++++++++++
- qpid/cpp/etc/qpidd.service | 14 ++++++++++++++
- 2 files changed, 29 insertions(+)
- create mode 100644 qpid/cpp/etc/qpidd-primary.service
- create mode 100644 qpid/cpp/etc/qpidd.service
-
-diff --git a/qpid/cpp/etc/qpidd-primary.service b/qpid/cpp/etc/qpidd-primary.service
-new file mode 100644
-index 0000000..f15168c
---- /dev/null
-+++ b/qpid/cpp/etc/qpidd-primary.service
-@@ -0,0 +1,15 @@
-+[Unit]
-+Description=An AMQP message broker cluster primary daemon.
-+Documentation=man:qpidd(1)
http://qpid.apache.org/
-+Requires=network.target
-+After=network.target
-+
-+[Service]
-+User=qpidd
-+Group=qpidd
-+Type=simple
-+EnvironmentFile=/etc/sysconfig/qpidd
-+ExecStart=/usr/sbin/qpid-ha -b localhost:$QPID_PORT promote
-+
-+[Install]
-+WantedBy=multi-user.target
-diff --git a/qpid/cpp/etc/qpidd.service b/qpid/cpp/etc/qpidd.service
-new file mode 100644
-index 0000000..10a99d1
---- /dev/null
-+++ b/qpid/cpp/etc/qpidd.service
-@@ -0,0 +1,14 @@
-+[Unit]
-+Description=An AMQP message broker daemon.
-+Documentation=man:qpidd(1)
http://qpid.apache.org/
-+Requires=network.target
-+After=network.target
-+
-+[Service]
-+User=qpidd
-+Group=qpidd
-+Type=simple
-+ExecStart=/usr/sbin/qpidd --config /etc/qpid/qpidd.conf
-+
-+[Install]
-+WantedBy=multi-user.target
---
-2.1.0
-
diff --git a/0002-NO-JIRA-Allow-overriding-the-Perl-install-location.patch
b/0002-NO-JIRA-Allow-overriding-the-Perl-install-location.patch
deleted file mode 100644
index f97dbc7..0000000
--- a/0002-NO-JIRA-Allow-overriding-the-Perl-install-location.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From baf68f10eefc06799eddb4f7f4fb68263d248d50 Mon Sep 17 00:00:00 2001
-From: "Darryl L. Pierce" <dpierce(a)redhat.com>
-Date: Wed, 11 Mar 2015 10:50:13 -0400
-Subject: [PATCH 2/3] NO-JIRA: Allow overriding the Perl install location.
-
----
- qpid/cpp/bindings/CMakeLists.txt | 14 +++++++++-----
- qpid/cpp/bindings/qpid/perl/CMakeLists.txt | 17 +++++++++++------
- 2 files changed, 20 insertions(+), 11 deletions(-)
-
-diff --git a/qpid/cpp/bindings/CMakeLists.txt b/qpid/cpp/bindings/CMakeLists.txt
-index 3c55871..8f0bdf4 100644
---- a/qpid/cpp/bindings/CMakeLists.txt
-+++ b/qpid/cpp/bindings/CMakeLists.txt
-@@ -134,11 +134,15 @@ if (SWIG_FOUND)
-
- if (BUILD_BINDING_PERL)
- message(STATUS "Building Perl bindings")
-- execute_process(COMMAND ${PERL_EXECUTABLE} "-V::prefix:"
-- OUTPUT_VARIABLE QPERL_PREFIX
-- OUTPUT_STRIP_TRAILING_WHITESPACE)
-- string(REGEX REPLACE "'(.*)'" "\\1" PERL_PREFIX
${QPERL_PREFIX})
-- string(REPLACE ${PERL_PREFIX} ${CMAKE_INSTALL_PREFIX} PERL_PFX_ARCHLIB
${PERL_ARCHLIB})
-+ if (NOT PERL_PFX_ARCHLIB)
-+ execute_process(COMMAND ${PERL_EXECUTABLE} "-V::prefix:"
-+ OUTPUT_VARIABLE QPERL_PREFIX
-+ OUTPUT_STRIP_TRAILING_WHITESPACE)
-+ string(REGEX REPLACE "'(.*)'" "\\1" PERL_PREFIX
${QPERL_PREFIX})
-+ string(REPLACE ${PERL_PREFIX} ${CMAKE_INSTALL_PREFIX} PERL_PFX_ARCHLIB
${PERL_ARCHLIB})
-+ else (NOT PERL_PFX_ARCHLIB)
-+ message(STATUS "*** Using Perl language directory:
${PERL_PFX_ARCHLIB}")
-+ endif (NOT PERL_PFX_ARCHLIB)
-
- add_subdirectory(qpid/perl)
- endif (BUILD_BINDING_PERL)
-diff --git a/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
b/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
-index 3c859d6..e270562 100644
---- a/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
-+++ b/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
-@@ -43,13 +43,18 @@ include_directories(${PERL_INCLUDE_PATH}
- # it's coming from a version of Cmake < 2.8
- install(TARGETS ${SWIG_MODULE_cqpid_perl_REAL_NAME}
- RENAME cqpid_perl.so
-- DESTINATION ${PERL_PFX_ARCHLIB}
-+ DESTINATION ${PERL_PFX_ARCHLIB}/auto/cqpid_perl
- COMPONENT ${QPID_COMPONENT_CLIENT}
- )
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cqpid_perl.pm
-- ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
-- ${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL
-- DESTINATION ${PERL_PFX_ARCHLIB}
-- COMPONENT ${QPID_COMPONENT_CLIENT}
-- )
-+ ${CMAKE_CURRENT_SOURCE_DIR}/lib/qpid_messaging.pm
-+ ${CMAKE_CURRENT_SOURCE_DIR}/lib/qpid.pm
-+ DESTINATION ${PERL_PFX_ARCHLIB}
-+ COMPONENT ${QPID_COMPONENT_CLIENT}
-+ )
-+
-+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/qpid
-+ DESTINATION ${PERL_PFX_ARCHLIB}
-+ COMPONENT ${QPID_COMPONENT_CLIENT}
-+ )
---
-2.1.0
-
diff --git a/0003-NO-JIRA-Allow-overriding-the-Ruby-install-location.patch
b/0003-NO-JIRA-Allow-overriding-the-Ruby-install-location.patch
deleted file mode 100644
index 8939a7c..0000000
--- a/0003-NO-JIRA-Allow-overriding-the-Ruby-install-location.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From fc0b4f44e9f1b7f3646e6210bf695d2b5f80d9ed Mon Sep 17 00:00:00 2001
-From: "Darryl L. Pierce" <dpierce(a)redhat.com>
-Date: Wed, 11 Mar 2015 15:10:47 -0400
-Subject: [PATCH 3/3] NO-JIRA: Allow overriding the Ruby install location.
-
----
- qpid/cpp/bindings/CMakeLists.txt | 14 ++++++++------
- qpid/cpp/bindings/qpid/ruby/CMakeLists.txt | 13 +++++++++----
- 2 files changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/qpid/cpp/bindings/CMakeLists.txt b/qpid/cpp/bindings/CMakeLists.txt
-index 8f0bdf4..a90a126 100644
---- a/qpid/cpp/bindings/CMakeLists.txt
-+++ b/qpid/cpp/bindings/CMakeLists.txt
-@@ -122,14 +122,16 @@ if (SWIG_FOUND)
- endif (BUILD_BINDING_PYTHON)
-
- if (BUILD_BINDING_RUBY)
-- message(STATUS "Building Ruby bindings")
-+ message(STATUS "Building Ruby bindings")
-+ if (NOT RUBY_PFX_ARCH_DIR)
- execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts
RbConfig::CONFIG['prefix']"
-- OUTPUT_VARIABLE RUBY_PREFIX
-- OUTPUT_STRIP_TRAILING_WHITESPACE)
-+ OUTPUT_VARIABLE RUBY_PREFIX
-+ OUTPUT_STRIP_TRAILING_WHITESPACE)
- string(REPLACE ${RUBY_PREFIX} ${CMAKE_INSTALL_PREFIX} RUBY_PFX_ARCH_DIR
${RUBY_SITEARCH_DIR})
--# string(REPLACE ${RUBY_PREFIX} ${CMAKE_INSTALL_PREFIX} RUBY_PFX_ARCH_DIR
${RUBY_ARCH_DIR})
-- add_subdirectory(qpid/ruby)
-- add_subdirectory(qmf2/ruby)
-+ endif (NOT RUBY_PFX_ARCH_DIR)
-+
-+ add_subdirectory(qpid/ruby)
-+ add_subdirectory(qmf2/ruby)
- endif (BUILD_BINDING_RUBY)
-
- if (BUILD_BINDING_PERL)
-diff --git a/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
b/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
-index c31b4d4..78e21d6 100644
---- a/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
-+++ b/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
-@@ -54,10 +54,15 @@ set_source_files_properties(${swig_generated_file_fullname}
PROPERTIES COMPILE_F
- ## Install the complete Ruby binding
- ##----------------------------------
- install(TARGETS ${SWIG_MODULE_cqpid_ruby_REAL_NAME}
-- RENAME cqpid.so
-- DESTINATION ${RUBY_PFX_ARCH_DIR}
-- COMPONENT ${QPID_COMPONENT_CLIENT}
--)
-+ RENAME cqpid.so
-+ DESTINATION ${RUBY_PFX_ARCH_DIR}
-+ COMPONENT ${QPID_COMPONENT_CLIENT}
-+ )
-+
-+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib
-+ DESTINATION ${RUBY_PFX_ARCH_DIR}
-+ COMPONENT ${QPID_COMPONENT_CLIENT}
-+ )
-
- add_custom_command(OUTPUT ${GEM_BINDINGS_SOURCE_FILE}
- COMMAND cp ${swig_generated_file_fullname}
${GEM_BINDINGS_SOURCE_FILE}
---
-2.1.0
-
diff --git a/licenses.xml b/licenses.xml
new file mode 100644
index 0000000..3502960
--- /dev/null
+++ b/licenses.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"
standalone="no"?>
+<licenseSummary>
+ <dependencies>
+ <dependency>
+ <packageName>qpid-cpp</packageName>
+ <version>1.37.0</version>
+ <licenses>
+ <license>
+ <name>ASL 2.0</name>
+ <
url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+ </dependency>
+ </dependencies>
+</licenseSummary>
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 4b681dd..36e1739 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -1,7 +1,16 @@
# Define pkgdocdir for releases that don't define it already
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
%global _perldocdir %{_docdir}/perl-qpid-messaging-%{version}
-%global _pythondocdir %{_docdir}/python-qpid-messaging-%{version}
+
+%{!?__python2:%global __python2 %{__python}}
+%{!?__python2:%global python2_sitelib %{python_sitelib}}
+%if 0%{?fedora}
+%global pythonx python2
+%else
+%global pythonx python
+%endif
+
+%global _pythondocdir %{_docdir}/%{pythonx}-qpid-messaging-%{version}
# We ship a .pc file but don't need to depend on pkg-config
%global __requires_exclude pkg-config
@@ -9,20 +18,18 @@
%global proton_min_ver 0.18.0
Name: qpid-cpp
-Version: 1.36.0
-Release: 2%{?dist}
+Version: 1.37.0
+Release: 1%{?dist}
Summary: Libraries for Qpid C++ client applications
License: ASL 2.0
URL:
http://qpid.apache.org
Source0:
http://www.apache.org/dist/qpid/cpp/%{version}/%{name}-%{version}.tar.gz
-%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 7)
-Patch1: 0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
-%endif
-%if 0%{?fedora}
-Patch2: 0002-NO-JIRA-Allow-overriding-the-Perl-install-location.patch
-Patch3: 0003-NO-JIRA-Allow-overriding-the-Ruby-install-location.patch
-%endif
+Source1: licenses.xml
+
+%global _pkglicensedir %{_licensedir}/%{name}-%{version}
+%{!?_licensedir:%global license %doc}
+%{!?_licensedir:%global _pkglicensedir %{_pkgdocdir}}
BuildRequires: boost-devel
BuildRequires: boost-filesystem
@@ -43,7 +50,7 @@ BuildRequires: libdb4-cxx-devel
%if (0%{?rhel} && 0%{?rhel} == 7)
BuildRequires: libdb-cxx-devel
%endif
-%ifnarch s390 s390x
+%ifnarch s390 s390x %{arm}
BuildRequires: libibverbs-devel
BuildRequires: librdmacm-devel
%endif
@@ -57,9 +64,9 @@ BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl-generators
%endif
BuildRequires: pkgconfig
-BuildRequires: python
-BuildRequires: python-devel
-BuildRequires: python-setuptools
+BuildRequires: %{pythonx}
+BuildRequires: %{pythonx}-devel
+BuildRequires: %{pythonx}-setuptools
BuildRequires: qpid-proton-c-devel >= %{proton_min_ver}
BuildRequires: ruby
BuildRequires: ruby-devel
@@ -108,7 +115,8 @@ the AMQP protocol.
%files client
%defattr(-,root,root,-)
-%doc LICENSE.txt
+%license %{_pkglicensedir}/LICENSE.txt
+%license %{_pkglicensedir}/licenses.xml
%doc NOTICE.txt
%doc README.md
%doc INSTALL.txt
@@ -117,7 +125,7 @@ the AMQP protocol.
%{_libdir}/libqpidtypes.so.*
%{_libdir}/libqpidmessaging.so.*
%dir %{_libdir}/qpid
-%ifnarch s390 s390x
+%ifnarch s390 s390x %{arm}
%dir %{_libdir}/qpid/client
%exclude %{_libdir}/qpid/client/rdmaconnector.so*
%endif
@@ -140,7 +148,7 @@ Requires: boost-devel
Requires: boost-filesystem
Requires: boost-program-options
Requires: libuuid-devel
-Requires: python
+Requires: %{pythonx}
%description client-devel
Libraries and header files for developing AMQP clients in C++ using Qpid.
@@ -198,6 +206,9 @@ format for easy browsing.
%files client-docs
%defattr(-,root,root,-)
%doc %{_pkgdocdir}
+%license %{_pkglicensedir}/LICENSE.txt
+%license %{_pkglicensedir}/licenses.xml
+
%package server
Summary: An AMQP message broker daemon
@@ -336,7 +347,7 @@ fi
/sbin/ldconfig
-%ifnarch s390 s390x
+%ifnarch s390 s390x %{arm}
%package client-rdma
Summary: RDMA Protocol support (including Infiniband) for Qpid clients
%if 0%{?fedora}
@@ -453,29 +464,31 @@ Requires: qpid-cpp-client = %{version}-%{release}
%files -n perl-qpid-messaging
%{perl_vendorarch}/*
-%doc LICENSE.txt
%doc %{_perldocdir}
-%package -n python-qpid-messaging
+%package -n %{pythonx}-qpid-messaging
Summary: Python bindings for the Qpid messaging framework
-
-Requires: python
+Requires: %{pythonx}
Requires: qpid(cpp-client)%{?_isa} = %{version}-%{release}
-Requires: python-qpid >= 1.35.0
+Requires: python-qpid
+
+%if 0%{?fedora}
+%{?python_provide:%python_provide python2-qpid-messaging}
+%endif
%{?filter_setup:
- %filter_provides_in %{python_sitearch}/.*\.so$
+ %filter_provides_in %{python2_sitearch}/.*\.so$
%filter_setup}
-%description -n python-qpid-messaging
+%description -n %{pythonx}-qpid-messaging
%{summary}.
-%files -n python-qpid-messaging
-%doc LICENSE.txt
+%files -n %{pythonx}-qpid-messaging
%{python2_sitearch}/qpid_messaging.py*
%{python2_sitearch}/_qpid_messaging.so
%{_pythondocdir}/examples
+
%endif
@@ -483,7 +496,7 @@ Requires: python-qpid >= 1.35.0
Summary: Management and diagostic tools for Apache Qpid
BuildArch: noarch
-Requires: python-qpid >= 1.35.0
+Requires: python-qpid
Requires: python-qpid-qmf = %{version}-%{release}
%description -n qpid-tools
@@ -497,24 +510,24 @@ Management and diagnostic tools for Apache Qpid brokers and
clients.
%{_bindir}/qpid-route
%{_bindir}/qpid-stat
%{_bindir}/qpid-tool
-%{python_sitelib}/qpidtoollibs
+%{python2_sitelib}/qpidtoollibs
%{_libexecdir}/qpid-qls-analyze
%dir %{_datadir}/qpid-tools
%dir %{_datadir}/qpid-tools/python
%{_datadir}/qpid-tools/python/qlslibs
-%doc NOTICE.txt
-%doc LICENSE.txt
%if "%{python_version}" >= "2.6"
-%{python_sitelib}/qpid_tools-*.egg-info
+%{python2_sitelib}/qpid_tools-*.egg-info
%endif
%package -n qpid-qmf
Summary: The QPID Management Framework
+
%if 0%{?fedora}
Requires: qpid(cpp-client)%{?_isa}
%endif
+
Requires: qpid-cpp-client%{?_isa} = %{version}-%{release}
%description -n qpid-qmf
@@ -547,7 +560,7 @@ components.
%{_includedir}/qmf
%{_libdir}/libqmf2.so
%{_bindir}/qmf-gen
-%{python_sitelib}/qmfgen
+%{python2_sitelib}/qmfgen
%{_libdir}/pkgconfig/qmf2.pc
%post -n qpid-qmf-devel -p /sbin/ldconfig
@@ -555,26 +568,30 @@ components.
%postun -n qpid-qmf-devel -p /sbin/ldconfig
-%package -n python-qpid-qmf
+%package -n %{pythonx}-qpid-qmf
Summary: The QPID Management Framework bindings for python
Requires: qpid-qmf%{?_isa} = %{version}-%{release}
Requires: %{name}-client%{?_isa} = %{version}-%{release}
-%description -n python-qpid-qmf
+%if 0%{?fedora}
+%{?python_provide:%python_provide python2-qpid-qmf}
+%endif
+
+%description -n %{pythonx}-qpid-qmf
+
An extensible management framework layered on QPID messaging, bindings
for python.
-%files -n python-qpid-qmf
-%{python_sitelib}/qmf
-%{python_sitearch}/qmf2.py*
-%{python_sitearch}/cqmf2.py*
-%{python_sitearch}/_cqmf2.so
+%files -n %{pythonx}-qpid-qmf
+%{python2_sitelib}/qmf
+%{python2_sitearch}/qmf2.py*
+%{python2_sitearch}/cqmf2.py*
+%{python2_sitearch}/_cqmf2.so
-%post -n python-qpid-qmf -p /sbin/ldconfig
-
-%postun -n python-qpid-qmf -p /sbin/ldconfig
+%post -n %{pythonx}-qpid-qmf -p /sbin/ldconfig
+%postun -n %{pythonx}-qpid-qmf -p /sbin/ldconfig
%if 0%{?fedora}
%package -n ruby-qpid-qmf
@@ -599,24 +616,15 @@ for ruby.
%prep
%setup -q -n qpid-cpp-%{version}
-%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 7)
-%patch1 -p3
-%endif
-%if 0%{?fedora}
-%patch2 -p3
-%patch3 -p3
-%endif
-
%build
-%if (0%{?rhel} && 0%{?rhel} <= 6)
-CXX11FLAG="-w"
-%else
CXX11FLAG="-std=c++11"
+%if (0%{?rhel} && 0%{?rhel} <= 6)
+CXX11FLAG="-w -std=c++0x"
%endif
%if (0%{?fedora} && 0%{?fedora} >= 26)
-GCC7FLAG="-Wno-implicit-fallthrough -Wno-deprecated-declarations
-Wno-error=maybe-uninitialized"
+GCC7FLAG="-Wno-error=maybe-uninitialized"
%else
GCC7FLAG=""
%endif
@@ -627,7 +635,7 @@ GCC7FLAG=""
-DBUILD_LINEARSTORE=true \
-DPERL_PFX_ARCHLIB=%{perl_vendorarch} \
-DBUILD_BINDING_RUBY=true \
- "-DCMAKE_CXX_FLAGS=$CXX11FLAG $GCC7FLAG $CXXFLAGS" \
+ "-DCMAKE_CXX_FLAGS=$CXXFLAGS $CXX11FLAG $GCC7FLAG" \
.
%endif
%if 0%{?rhel}
@@ -638,7 +646,7 @@ GCC7FLAG=""
-DCMAKE_EXE_LINKER_FLAGS="-Wl,-z,relro,-z,now" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,-z,relro" \
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,-z,relro" \
- "-DCMAKE_CXX_FLAGS=$CXX11FLAG $CXXFLAGS" \
+ "-DCMAKE_CXX_FLAGS=$CXXFLAGS $CXX11FLAG" \
.
%endif
@@ -649,12 +657,14 @@ make docs-user-api
rm -rf %{buildroot}
pushd management/python
-%{__python} setup.py install \
- --install-purelib %{python_sitelib} \
+
+%{__python2} setup.py install \
+ --install-purelib %{python2_sitelib} \
--root %{buildroot}
+
popd
-chmod +x %{buildroot}/%{python_sitelib}/qpidtoollibs/disp.py
+chmod +x %{buildroot}/%{python2_sitelib}/qpidtoollibs/disp.py
mkdir -p -m0755 %{buildroot}/%{_bindir}
mkdir -p -m0755 %{buildroot}/%{_unitdir}
@@ -678,9 +688,9 @@ echo "auth=yes" >> %{buildroot}/etc/qpid/qpidd.conf
%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} >= 7)
# install systemd files
mkdir -p %{buildroot}/%{_unitdir}
-install -pm 644 %{_builddir}/qpid-cpp-%{version}/etc/qpidd.service \
+install -pm 644 %{_builddir}/qpid-cpp-%{version}/etc/fedora/qpidd.service \
%{buildroot}/%{_unitdir}
-install -pm 644 %{_builddir}/qpid-cpp-%{version}/etc/qpidd-primary.service \
+install -pm 644 %{_builddir}/qpid-cpp-%{version}/etc/fedora/qpidd-primary.service \
%{buildroot}/%{_unitdir}
%endif
@@ -693,7 +703,7 @@ chmod +x %{buildroot}/%{python_sitearch}/*so
# QMF Python management
install -d %{_builddir}/qpid-cpp-%{version}/managementgen/qmfgen \
- %{buildroot}/%{python_sitelib}
+ %{buildroot}/%{python2_sitelib}
%if 0%{?fedora}
# QMF Ruby package
@@ -716,6 +726,15 @@ rm -f %{buildroot}/%{_initrddir}/qpidd*
%endif
rm -f %{buildroot}/%{_libdir}/qpid/daemon/store.so*
+%if 0%{?rhel} && 0%{?rhel} <= 6
+install -pm 644 %{SOURCE1} %{buildroot}%{_pkgdocdir}
+%else
+install -dm 755 %{buildroot}%{_pkglicensedir}
+install -pm 644 %{SOURCE1} %{buildroot}%{_pkglicensedir}
+install -pm 644 %{buildroot}%{_pkgdocdir}/LICENSE.txt %{buildroot}%{_pkglicensedir}
+rm -f %{buildroot}%{_pkgdocdir}/LICENSE.txt
+%endif
+
# clean up leftover examples files:
rm -f %{buildroot}/%{_datadir}/qpid/examples/README.txt
rm -f %{buildroot}/%{_datadir}/qpid/examples/qmf2/agent.cpp
@@ -738,6 +757,8 @@ rm -f %{buildroot}/%{python_sitearch}/qpid_messaging.py*
rm -fr %{buildroot}%_libdir/perl5
%endif
+rm %{buildroot}/%{_bindir}/*.bat
+
%clean
rm -rf %{buildroot}
@@ -747,6 +768,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Dec 1 2017 Irina Boverman <iboverma(a)redhat.com> - 1.37.0-1
+- Rebased to 1.37.0
+
* Thu Nov 16 2017 Irina Boverman <iboverma(a)redhat.com> - 1.36.0-2
- Rebuilt against qpid-proton 0.18.1
diff --git a/sources b/sources
index 2a64c1e..1b7184c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qpid-cpp-1.36.0.tar.gz) =
4f96dd60ac8fc0ffdbac47e8804472a615c32358b0ac69e851f01752ebaa8c2b7240de8668afb00ee2ab526ff61a31c6bde6f6dd2d55f447e072ec2376b34b20
+SHA512 (qpid-cpp-1.37.0.tar.gz) =
fdaaf07ea1dc3f9a68ed184f268ce4a028029ce7565c08c424e55d24b6abe69143c7e5c009361bb5b23d79108770627a03351a3079ea5bb57eb30f7eae6cb023