From 63ee1a962e02bcf64123edae9e55b0723f83e3d7 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Thu, 12 Apr 2018 17:55:22 +0200 Subject: RPM: cd into build dir in openSUSE. This step is needed because of the differences in the %cmake macro between Fedora/Centos and openSUSE. Change-Id: I7ac94e560b4c298934f78e96036a814f3eadc4a5 Reviewed-on: https://code.wireshark.org/review/26924 Reviewed-by: Anders Broman --- packaging/rpm/wireshark.spec.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in index cf89a9b06f..5f6d6ca483 100644 --- a/packaging/rpm/wireshark.spec.in +++ b/packaging/rpm/wireshark.spec.in @@ -283,6 +283,9 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT +%if 0%{?suse_version} +cd build +%endif %if %{with ninja} NINJA=$(which ninja || which ninja-build) DESTDIR=$RPM_BUILD_ROOT $NINJA install @@ -295,6 +298,9 @@ make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install_guides %endif %endif +%if 0%{?suse_version} +cd - +%endif # If we're being installed in an unusual prefix tell the loader where # to find our libraries. -- cgit v1.2.3