From d12f191672b95427e592696a508ddd92679f35cd Mon Sep 17 00:00:00 2001
From: Irina Boverman <iboverma(a)redhat.com>
Date: Thu, 23 Feb 2017 19:12:07 -0500
Subject: 0.17.0-1
---
qpid-proton.spec | 40 ++++++++++++----------------------------
sources | 2 +-
2 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/qpid-proton.spec b/qpid-proton.spec
index bc19c0a..24fa554 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -16,8 +16,8 @@
}
Name: qpid-proton
-Version: 0.14.0
-Release: 2%{?dist}
+Version: 0.17.0
+Release: 1%{?dist}
Group: System Environment/Libraries
Summary: A high performance, lightweight messaging library
@@ -54,9 +54,7 @@ BuildRequires: perl(Test::More)
%endif
BuildRequires: cyrus-sasl-devel
-#%if (0%{?rhel} && 0%{?rhel} == 7)
#Patch0: proton.patch
-#%endif
%description
Proton is a high performance, lightweight messaging library. It can be used in
@@ -88,7 +86,7 @@ Obsoletes: qpid-proton
%postun c -p /sbin/ldconfig
-%if 0%{?rhel}
+
%package cpp
Group: System Environment/Libraries
Summary: C++ libraries for Qpid Proton
@@ -107,7 +105,7 @@ Requires: qpid-proton-c%{?_isa} = %{version}-%{release}
%post cpp -p /sbin/ldconfig
%postun cpp -p /sbin/ldconfig
-%endif
+
%package c-devel
Group: Development/System
@@ -131,7 +129,6 @@ Obsoletes: qpid-proton-devel
%{_libdir}/cmake/Proton
-%if 0%{?rhel}
%package cpp-devel
Group: Development/System
Requires: qpid-proton-cpp%{?_isa} = %{version}-%{release}
@@ -147,7 +144,7 @@ Summary: Development libraries for writing messaging apps with Qpid
Proton
%{_libdir}/pkgconfig/libqpid-proton-cpp.pc
%{_libdir}/libqpid-proton-cpp.so
%{_libdir}/cmake/ProtonCpp
-%endif
+
%package c-docs
Summary: Documentation for the C development libraries for Qpid Proton
@@ -173,13 +170,13 @@ Obsoletes: qpid-proton-c-devel-docs
%doc %{proton_datadir}/examples/c/reactor/*.c
%doc %{proton_datadir}/examples/c/proactor/CMakeLists.txt
%doc %{proton_datadir}/examples/c/proactor/*.c
-%doc %{proton_datadir}/examples/c/proactor/*.h
+#%doc %{proton_datadir}/examples/c/proactor/*.h
%doc %{proton_datadir}/examples/c/proactor/README.dox
%doc %{proton_datadir}/examples/c/proactor/*.py*
%exclude %{proton_datadir}/examples/c/proactor/*.pyc
%exclude %{proton_datadir}/examples/c/proactor/*.pyo
-%if 0%{?rhel}
+
%package cpp-docs
Summary: Documentation for the C++ development libraries for Qpid Proton
BuildArch: noarch
@@ -201,7 +198,6 @@ Obsoletes: qpid-proton-cpp-devel-docs
%doc %{proton_datadir}/examples/cpp/mt
%doc %{proton_datadir}/examples/cpp/ssl_certs
%doc %{proton_datadir}/examples/cpp/*.dox
-%endif
%package -n python-qpid-proton
@@ -274,15 +270,14 @@ Requires: qpid-proton-c = %{version}-%{release}
%prep
%setup -q -n %{name}-%{version}
-#%if (0%{?rhel} && 0%{?rhel} == 7)
+
#%patch0 -p1
-#%endif
%build
CXX11FLAG="-std=c++11"
-%if (0%{?rhel} && 0%{?rhel} <= 6)
+%if (0%{?rhel} && 0%{?rhel} <= 6)
CXX11FLAG=""
%endif
@@ -307,7 +302,7 @@ CXX11FLAG=""
make all docs %{?_smp_mflags}
%if 0%{?fedora}
-(cd proton-c/bindings/python; %py3_build)
+(cd proton-c/bindings/python/dist; %py3_build)
%endif
%install
@@ -315,7 +310,7 @@ rm -rf %{buildroot}
%make_install
%if 0%{?fedora}
-(cd proton-c/bindings/python; %py3_install)
+(cd proton-c/bindings/python/dist; %py3_install)
%endif
CPROTON_BUILD=$PWD . ./config.sh
@@ -329,13 +324,6 @@ rm -rf %{buildroot}%{_libdir}/java
rm -rf %{buildroot}%{_libdir}/libproton-jni.so
rm -rf %{buildroot}%{_datarootdir}/java
rm -rf %{buildroot}%{_libdir}/proton.cmake
-%if 0%{?fedora}
-rm -rf %{buildroot}%{_libdir}/cmake/ProtonCpp
-rm -rf %{buildroot}%{_libdir}/*cpp*
-rm -rf %{buildroot}%{_libdir}/pkgconfig/libqpid-proton-cpp.pc
-rm -rf %{buildroot}%{proton_datadir}/docs/api-cpp
-rm -rf %{buildroot}%{proton_datadir}/examples/cpp
-%endif
%if 0%{?rhel}
rm -rf %{buildroot}%{_libdir}/perl5
rm -rf %{buildroot}%{_libdir}/php
@@ -364,13 +352,9 @@ rm -f %{buildroot}%{proton_datadir}/examples/c/reactor/*.cmake
rm -f %{buildroot}%{proton_datadir}/examples/c/reactor/Makefile
rm -f %{buildroot}%{proton_datadir}/examples/c/reactor/receiver
rm -f %{buildroot}%{proton_datadir}/examples/c/reactor/sender
-<<<<<<< HEAD
-=======
rm -fr %{buildroot}%{proton_datadir}/examples/c/proactor/CMakeFiles
rm -f %{buildroot}%{proton_datadir}/examples/c/proactor/*.cmake
rm -f %{buildroot}%{proton_datadir}/examples/c/proactor/Makefile
->>>>>>> 1967434... 0.17.0-1
-%if 0%{?rhel}
rm -fr %{buildroot}%{proton_datadir}/examples/cpp/CMakeFiles
rm -f %{buildroot}%{proton_datadir}/examples/cpp/*.cmake
rm -f %{buildroot}%{proton_datadir}/examples/cpp/Makefile
@@ -395,7 +379,6 @@ rm -f %{buildroot}%{proton_datadir}/examples/cpp/simple_recv
rm -f %{buildroot}%{proton_datadir}/examples/cpp/simple_send
rm -f %{buildroot}%{proton_datadir}/examples/cpp/ssl
rm -f %{buildroot}%{proton_datadir}/examples/cpp/ssl_client_cert
-%endif
rm -fr %{buildroot}%{proton_datadir}/examples/engine/java
rm -fr %{buildroot}%{proton_datadir}/examples/go
rm -fr %{buildroot}%{proton_datadir}/examples/java
@@ -414,6 +397,7 @@ popd
%endif
%changelog
+<<<<<<< HEAD
* Tue Feb 28 2017 Irina Boverman <iboverma(a)redhat.com> - 0.17.0-1
- Rebased to 0.17.0
- Renamed sub-packages qpid-proton-c-devel-docs/qpid-proton-cpp-devel-docs
diff --git a/sources b/sources
index b97658c..8579299 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22f8f034ce3c9d31fa1cb8b6d6fe9fd5 qpid-proton-0.14.0.tar.gz
+SHA512 (qpid-proton-0.17.0.tar.gz) =
ce082fdc2793fc9d3db1b558bd897d364543bd50cba60e66aff839f8f16d82c245381d836ef3ee5b6ee17ba2b2ffe1899b86ed9d1f8cf8db569f726b6d162463
--
cgit v1.1
https://src.fedoraproject.org/cgit/qpid-proton.git/commit/?h=epel7&id...