pool/cmake
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 286771 from KDE:Unstable:Frameworks

Browse Source 
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
This commit is contained in:
Tomáš Chvátal 2015-02-19 15:19:51 +00:00 committed by Git OBS Bridge
parent 5167a13425
commit 2d6778f002
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake-gui.changes
View File

@ -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

9
cmake-gui.spec
View File

@ -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}

5
cmake.changes
View File

@ -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

9
cmake.spec
View File

@ -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