diff --git a/fix_build_leap.diff b/fix_build_leap.diff deleted file mode 100644 index 80c1d1b..0000000 --- a/fix_build_leap.diff +++ /dev/null @@ -1,20 +0,0 @@ -From 0f4955b0b25a0caad18a0b1bbe268c239bbe8da5 Mon Sep 17 00:00:00 2001 -From: Raymond Wooninck -Date: Sat, 19 Nov 2016 13:36:11 +0100 -Subject: Make it work on Leap - - -diff --git a/libgraphtheory/CMakeLists.txt b/libgraphtheory/CMakeLists.txt -index 0065feb..e61e77d 100644 ---- a/libgraphtheory/CMakeLists.txt -+++ b/libgraphtheory/CMakeLists.txt -@@ -21,6 +21,9 @@ - # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -+SET(GCC_COVERAGE_COMPILE_FLAGS "-fext-numeric-literals") -+SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}" ) -+ - include_directories( - ./ - ) diff --git a/rocs.changes b/rocs.changes index 30bed3b..120f03a 100644 --- a/rocs.changes +++ b/rocs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 30 19:02:13 UTC 2020 - Christophe Giboudeaux + +- Remove the unneeded python dependency +- Remove obsolete conditions +- Drop fix_build_leap.diff + ------------------------------------------------------------------- Tue Jan 7 10:36:36 UTC 2020 - Christophe Giboudeaux diff --git a/rocs.spec b/rocs.spec index 88d6078..0a0ab67 100644 --- a/rocs.spec +++ b/rocs.spec @@ -32,7 +32,6 @@ Source: https://download.kde.org/stable/release-service/%{version}/src/% Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif -Patch1: fix_build_leap.diff BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: fdupes BuildRequires: cmake(Grantlee5) @@ -46,7 +45,6 @@ BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5Service) BuildRequires: cmake(KF5TextEditor) BuildRequires: cmake(KF5XmlGui) -BuildRequires: python-devel BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: cmake(Qt5Concurrent) @@ -63,11 +61,7 @@ BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5XmlPatterns) Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} -%if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif %if %{with lang} Recommends: %{name}-lang %endif @@ -107,9 +101,6 @@ to build software using Rocs. %prep %setup -q -%if 0%{?suse_version} < 1330 -%patch1 -p1 -%endif %build %ifarch ppc ppc64