From 2d6778f0029565ec07cb99caf4a578de0ebf1627386ba22dc00673600ec84e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 19 Feb 2015 15:19:51 +0000 Subject: [PATCH] Accepting request 286771 from KDE:Unstable:Frameworks Comment jsoncpp BuildRequires, as it creates dependancy cycle OBS-URL: https://build.opensuse.org/request/show/286771 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=197 --- cmake-gui.changes | 5 +++++ cmake-gui.spec | 9 ++++----- cmake.changes | 5 +++++ cmake.spec | 9 ++++----- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/cmake-gui.changes b/cmake-gui.changes index 30c5223..f2a0b98 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 19 15:05:10 UTC 2015 - hrvoje.senjan@gmail.com + +- Comment jsoncpp BuildRequires, as it creates dependancy cycle + ------------------------------------------------------------------- Sat Feb 14 19:48:11 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/cmake-gui.spec b/cmake-gui.spec index 65d3afb..3657e76 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -38,9 +38,10 @@ BuildRequires: openssl-devel BuildRequires: python-sphinx BuildRequires: update-desktop-files BuildRequires: zlib-devel -%if 0%{?suse_version} > 1320 -BuildRequires: pkgconfig(jsoncpp) -%endif +# this is commented as it would create dependancy cycle between jsoncpp and cmake +#if 0%{?suse_version} > 1320 +#BuildRequires: pkgconfig(jsoncpp) +#endif BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(liblzma) Requires: cmake @@ -87,9 +88,7 @@ export CFLAGS="$CXXFLAGS" --system-bzip2 \ --no-system-libarchive \ %endif -%if 0%{?suse_version} <= 1320 --no-system-jsoncpp \ -%endif --parallel=0%{jobs} \ --qt-gui make VERBOSE=1 %{?_smp_mflags} diff --git a/cmake.changes b/cmake.changes index 76e029e..a73a877 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 19 15:05:10 UTC 2015 - hrvoje.senjan@gmail.com + +- Comment jsoncpp BuildRequires, as it creates dependancy cycle + ------------------------------------------------------------------- Mon Feb 16 14:59:01 UTC 2015 - tchvatal@suse.com diff --git a/cmake.spec b/cmake.spec index 0a59ba9..e56bae6 100644 --- a/cmake.spec +++ b/cmake.spec @@ -38,9 +38,10 @@ BuildRequires: gcc-c++ BuildRequires: libexpat-devel BuildRequires: ncurses-devel BuildRequires: zlib-devel -%if 0%{?suse_version} > 1320 -BuildRequires: pkgconfig(jsoncpp) -%endif +# this is commented as it would create dependancy cycle between jsoncpp and cmake +#if 0%{?suse_version} > 1320 +#BuildRequires: pkgconfig(jsoncpp) +#endif BuildRequires: pkgconfig(liblzma) Requires: make Recommends: cmake-mans @@ -71,9 +72,7 @@ export CFLAGS="$CXXFLAGS" %if 0%{?suse_version} <= 1110 --no-system-libarchive \ %endif -%if 0%{?suse_version} <= 1320 --no-system-jsoncpp \ -%endif --parallel=0%{jobs} \ --verbose \ --no-qt-gui