From 7eeb07432fb73377a6f915f2081fff64e3fc9a378e63c8235f719b2a1db1e6af Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 3 Dec 2016 12:16:08 +0000 Subject: [PATCH] Accepting request 443471 from home:luca_b:test_KA KDE Applications - please review OBS-URL: https://build.opensuse.org/request/show/443471 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/rocs?expand=0&rev=47 --- fix_build_leap.diff | 20 ++++++++++++++++++++ rocs-16.08.3.tar.xz | 3 --- rocs-16.11.80.tar.xz | 3 +++ rocs.changes | 10 ++++++++++ rocs.spec | 20 ++++++++++++-------- 5 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 fix_build_leap.diff delete mode 100644 rocs-16.08.3.tar.xz create mode 100644 rocs-16.11.80.tar.xz diff --git a/fix_build_leap.diff b/fix_build_leap.diff new file mode 100644 index 0000000..80c1d1b --- /dev/null +++ b/fix_build_leap.diff @@ -0,0 +1,20 @@ +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-16.08.3.tar.xz b/rocs-16.08.3.tar.xz deleted file mode 100644 index 37ec375..0000000 --- a/rocs-16.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fcf95937f3a5f72b8c7b3d6bf0f800db9a88ead20aa520a6ffaec7925f3994fc -size 532532 diff --git a/rocs-16.11.80.tar.xz b/rocs-16.11.80.tar.xz new file mode 100644 index 0000000..0c11bf4 --- /dev/null +++ b/rocs-16.11.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:484385b15320c6be910ef36cb19741cbadb091709b5777b78aa1613b450dc992 +size 533236 diff --git a/rocs.changes b/rocs.changes index 7b39449..c03a976 100644 --- a/rocs.changes +++ b/rocs.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Nov 29 12:44:21 UTC 2016 - tittiatcoke@gmail.com + +- Update to KDE Applications 16.11.80 + * KDE Applications 16.12.0 Beta + * https://www.kde.org/announcements/announce-applications-16.12-beta.php + +- Added patches: + + fix_build_leap.diff + ------------------------------------------------------------------- Wed Nov 9 06:29:13 UTC 2016 - lbeltrame@kde.org diff --git a/rocs.spec b/rocs.spec index 40ef8be..3681a61 100644 --- a/rocs.spec +++ b/rocs.spec @@ -1,7 +1,7 @@ # # spec file for package rocs # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,28 +17,33 @@ Name: rocs -Version: 16.08.3 +Version: 16.11.80 Release: 0 +%define kf5_version 5.26.0 +# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Graph Theory IDE License: GPL-3.0+ Group: Amusements/Teaching/Mathematics Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz +Patch1: fix_build_leap.diff BuildRequires: boost-devel BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: fdupes BuildRequires: grantlee5-devel -BuildRequires: kconfig-devel BuildRequires: karchive-devel +BuildRequires: kconfig-devel BuildRequires: kcoreaddons-devel +BuildRequires: kcrash-devel BuildRequires: kdeclarative-devel BuildRequires: kdoctools-devel BuildRequires: ki18n-devel BuildRequires: kservice-devel BuildRequires: ktexteditor-devel BuildRequires: kxmlgui-devel +BuildRequires: pkgconfig BuildRequires: python-devel -BuildRequires: kcrash-devel BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(Qt5Concurrent) @@ -78,14 +83,14 @@ to build software using rocs. %prep %setup -q +%if 0%{?suse_version} < 1330 +%patch1 -p1 +%endif %build %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -%if 0%{?suse_version} == 1320 -export CXXFLAGS="$CXXFLAGS -fext-numeric-literals" -%endif %cmake_kf5 -d build %make_jobs @@ -95,7 +100,6 @@ export CXXFLAGS="$CXXFLAGS -fext-numeric-literals" %fdupes -s %{buildroot} %post -n librocsgraphtheory0 -p /sbin/ldconfig - %postun -n librocsgraphtheory0 -p /sbin/ldconfig %files