Skip to content

Commit 60dbadb

Browse files
authored
FIX(spec) build requirements, package name, and license (#9)
1 parent 07abb5d commit 60dbadb

File tree

2 files changed

+17
-56
lines changed

2 files changed

+17
-56
lines changed

dist/dtests-fedora-cpp.spec

Lines changed: 0 additions & 46 deletions
This file was deleted.

dist/dtests-rhel-cpp.spec

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,43 @@
22
%global debug_package %{nil}
33

44
Summary: DTests C++ client code and runtime (for writing custom unit tests)
5-
Name: dtests-cpp-runtime
5+
Name: cli-cpp
66
Version: 20170612
77
Release: 1%{?dist}
8-
License: GPLv2+
8+
License: ASL 2.0
99
Group: Development/Tools
1010
Source: dtests-%{version}.tar.gz
11-
URL: http://ooo.englab.brq.redhat.com/c/dtests/
11+
URL: https://github.com/rh-messaging/cli-cpp
1212
BuildRequires: cmake
1313
BuildRequires: make
1414
BuildRequires: gcc-c++
15-
BuildRequires: qpid-proton-c-devel
16-
BuildRequires: qpid-cpp-client-devel
17-
BuildRequires: qpid-cpp-server-devel
1815
BuildRequires: boost-devel
1916
BuildRequires: qpid-proton-cpp-devel
20-
Requires: qpid-proton-c
21-
Requires: qpid-cpp-client
22-
Requires: qpid-cpp-server
2317
Requires: boost-filesystem
2418
Requires: boost-regex
2519
Requires: boost-system
2620
Requires: qpid-proton-cpp
2721

22+
%ifarch x86_64
23+
BuildRequires: qpid-proton-c-devel
24+
BuildRequires: qpid-cpp-client-devel
25+
Requires: qpid-proton-c
26+
Requires: qpid-cpp-client
27+
%endif
2828

2929
%description
3030
C++ clients, tools and runtime libraries
3131

3232
%prep
33-
%setup -n dtests/dtests/node_data/clients/cpp
33+
%setup
3434

3535
%build
36+
37+
%ifarch x86_64
3638
cmake -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_MODERN=ON -DENABLE_QPID_CLIENT=OFF -DENABLE_QPID_MESSAGING=ON -DENABLE_QPID_PROTON=ON -DBUILD_WITH_UNIT_TESTS=ON -DCMAKE_INSTALL_PREFIX=%{buildroot}/opt/dtests
39+
%else
40+
cmake -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_MODERN=ON -DENABLE_QPID_CLIENT=OFF -DENABLE_QPID_MESSAGING=OFF -DENABLE_QPID_PROTON=ON -DBUILD_WITH_UNIT_TESTS=ON -DCMAKE_INSTALL_PREFIX=%{buildroot}/opt/dtests
41+
%endif
3742
make
3843

3944
%install
@@ -43,5 +48,7 @@ make install
4348
/opt/dtests
4449

4550
%changelog
51+
* Sun Oct 4 2020 Jiri Danek <jdanek@redhat.com> - 20201004
52+
- Fix build requirements, rename package, change license from GPL to ASL
4653
* Wed Sep 30 2015 Middleware Messaging <opiske@redhat.com> - 20150930
4754
- Initial release

0 commit comments

Comments
 (0)