From a81850e3f1a97f18b1053229a7a02d8d47c26dcbf6ea53c2e3f20223e7cbbba4 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Sat, 16 Apr 2016 15:19:18 +0000
Subject: [PATCH] Accepting request 390308 from
home:AndreasStieger:branches:devel:tools:building
cmake 3.5.2
OBS-URL: https://build.opensuse.org/request/show/390308
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=246
---
cmake-3.5.1-SHA-256.txt | 14 --------------
cmake-3.5.1-SHA-256.txt.asc | 17 -----------------
cmake-3.5.1.tar.gz | 3 ---
cmake-3.5.2-SHA-256.txt | 14 ++++++++++++++
cmake-3.5.2-SHA-256.txt.asc | 17 +++++++++++++++++
cmake-3.5.2.tar.gz | 3 +++
cmake-gui.changes | 11 +++++++++++
cmake-gui.spec | 13 ++++++++-----
cmake.changes | 11 +++++++++++
cmake.spec | 12 +++++++-----
10 files changed, 71 insertions(+), 44 deletions(-)
delete mode 100644 cmake-3.5.1-SHA-256.txt
delete mode 100644 cmake-3.5.1-SHA-256.txt.asc
delete mode 100644 cmake-3.5.1.tar.gz
create mode 100644 cmake-3.5.2-SHA-256.txt
create mode 100644 cmake-3.5.2-SHA-256.txt.asc
create mode 100644 cmake-3.5.2.tar.gz
diff --git a/cmake-3.5.1-SHA-256.txt b/cmake-3.5.1-SHA-256.txt
deleted file mode 100644
index 9b49bad..0000000
--- a/cmake-3.5.1-SHA-256.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-a01c25b90296cabbeeca85c2258336e6ccefc36f93589b4d32af6cd95646a83f cmake-3.5.1-Darwin-x86_64.dmg
-3f14c8d627275415824bd9a001fe544e45f6953909e533e075e1ee96cd69b312 cmake-3.5.1-Darwin-x86_64.tar.Z
-ba981bb8db55ebe5b0ee830f52ece68435e484a9e46e4a6bd83abc69d9d48a4e cmake-3.5.1-Darwin-x86_64.tar.gz
-f9dfc288ff37c1bba995a76498953166f7ed32570e2947309817e4a76f1aba7e cmake-3.5.1-Linux-i386.sh
-e47aa53ca7f11c89367431d5634bbbcbaff883103cd1503233593f86e970cb08 cmake-3.5.1-Linux-i386.tar.Z
-3c892ae5b9d6ae63205b925fb0a460747844ea3f6b6b50dbb3134e61f1d380bc cmake-3.5.1-Linux-i386.tar.gz
-557209cfc8713a8226074d31a64b43b7a42b495416c7ebe387abc9cb20f1b341 cmake-3.5.1-Linux-x86_64.sh
-de8886f348603f09ffc751729f9197d9fa7e2a32135b459e3e560cc3b14d2444 cmake-3.5.1-Linux-x86_64.tar.Z
-e8f94a57a95c6a4cbe0fe05b5d16a7b78bf67c77fcec14f0834303a06a6244b0 cmake-3.5.1-Linux-x86_64.tar.gz
-d8ab3b5dd6ba6de6c88f676dc78bbc83aa3a5ffcdc0aa7b59a8007eeceb15241 cmake-3.5.1-win32-x86.msi
-02cbd8e8bd105d2314170b6a2959b9a5d043a8d45a97f5cbe6e46413b26dcf6c cmake-3.5.1-win32-x86.zip
-9b5d032648b427d282ceb91bf5a5e9b38c248d6ad842d3fc5e820710414c3241 cmake-3.5.1.tar.Z
-93d651a754bcf6f0124669646391dd5774c0fc4d407c384e3ae76ef9a60477e8 cmake-3.5.1.tar.gz
-57e494f323d033840c717d51172db6c37be4c41d1096003d5766da4a38e80473 cmake-3.5.1.zip
diff --git a/cmake-3.5.1-SHA-256.txt.asc b/cmake-3.5.1-SHA-256.txt.asc
deleted file mode 100644
index 9f3fc4e..0000000
--- a/cmake-3.5.1-SHA-256.txt.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAABCAAGBQJW9AfOAAoJEC0s7xA0khaEkQkP/jPegTcVSsvRKf139bHb4zFa
-GADn0pUTK6+4/2ijVwj/4MKs/Wg85LU5tn1uwEN3tYGPbA4XK/gTCugB7WO+tJFd
-M1Uyi8pRYY4zov3+KpD5SJpyDxgxoq0YdnlthEHyoIp2bXXmLnlDQEXBeydCRE43
-Y1G2ICzetGRX3NRl0svxb5vEncEmhA3y+IS4AkkybYtnj/lagzY6OCoY1BsUFPw0
-HUbf/8u8fkjop4ZUfMXKRvCaAO9BRK2/59LPHGDnsZZd1g2oRVISSoLGkSZIdnHb
-kyGP65QHpQVIlvrZppPC6ryFqilQ2h0PLAq2G9wq4ioAuHV08XxXhsbGdD2jqojb
-xeaoPburJoe62h3KfagK8G4EzVQ6lsPi9HDwvDV5Y87l6YN4fZ1zdnRTd8nCEJE7
-Ks3fJuQ1H9Iy3+BrX1lF8WtP2V3uLpFvqyOMQ2X5liHN3mwHYzLQf1lzEtHecWpI
-81KiLS1FoHJ/h2n3nYexeBfWKVRxktABWVnw1yzuGiI/2wsMuI8PgcmQutc4Hvdv
-xvHQU2xRr8O1/dLgaGl5cFNl3889r0iMRXTpZbZGGm71e15XhBo4nZk/v1C8fxCG
-EexNQpHrtrJLHXQK82wjDyy4QHpd1tmHLhBkwQIQUgTj/r3DTriJyS2P4ZUVUxcx
-1DMMvISG6H2UqL31u48a
-=484e
------END PGP SIGNATURE-----
diff --git a/cmake-3.5.1.tar.gz b/cmake-3.5.1.tar.gz
deleted file mode 100644
index e2bc0d5..0000000
--- a/cmake-3.5.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:93d651a754bcf6f0124669646391dd5774c0fc4d407c384e3ae76ef9a60477e8
-size 6863121
diff --git a/cmake-3.5.2-SHA-256.txt b/cmake-3.5.2-SHA-256.txt
new file mode 100644
index 0000000..47537fc
--- /dev/null
+++ b/cmake-3.5.2-SHA-256.txt
@@ -0,0 +1,14 @@
+630a9a930518c840c931f6d54b6bdd87693072c1291f1c63e6b9474c351e0b80 cmake-3.5.2-Darwin-x86_64.dmg
+ce96b92eef838c7a568e89c841b95e07dd0ac39fe7a93f25b759bbfd9968eb62 cmake-3.5.2-Darwin-x86_64.tar.Z
+0263be8f59ba1ae88172d5db769c2af69bcd8b2cbd4a9b1a981c406ce609a4ca cmake-3.5.2-Darwin-x86_64.tar.gz
+c0e8aef366791fe40ca0698a3a6a03b72bfcc541b2ba0e4a60fcfa0694ffa240 cmake-3.5.2-Linux-i386.sh
+9b921b65d5e91ac315a00f15eed7e460716e9916247bd995a3e73a37db3b11eb cmake-3.5.2-Linux-i386.tar.Z
+053d158dfc1393ec2c4b7f142868b6c92b3e10297068c9ff73bc9e654821c304 cmake-3.5.2-Linux-i386.tar.gz
+2999af0a9e0f8173fe84a494e8a7e183e81c3e57e95c0d867aa1c76af0269760 cmake-3.5.2-Linux-x86_64.sh
+6eb6468b7c28c99f98dc9ff82b2a07b740f2f548f4c183eded1783240c564f1a cmake-3.5.2-Linux-x86_64.tar.Z
+5f7aeaebe33521647625e0411467de71a2886743e4aa2c179e04c9e141c6c8cd cmake-3.5.2-Linux-x86_64.tar.gz
+32a7d80fd69f37de7cbc03ce633d3d33cee16dd241145c0147ffc771306ac81e cmake-3.5.2-win32-x86.msi
+671073aee66b3480a564d0736792e40570a11e861bb34819bb7ae7858bbdfb80 cmake-3.5.2-win32-x86.zip
+93d5cd50283fb661f21dfa586e91363952b023816aab647926a7172ac80ea6cd cmake-3.5.2.tar.Z
+92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a cmake-3.5.2.tar.gz
+43273227405d2f6f609d86e1c7cef4bd7d731193001316999640fabe93b2f557 cmake-3.5.2.zip
diff --git a/cmake-3.5.2-SHA-256.txt.asc b/cmake-3.5.2-SHA-256.txt.asc
new file mode 100644
index 0000000..3281243
--- /dev/null
+++ b/cmake-3.5.2-SHA-256.txt.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJXEQuuAAoJEC0s7xA0khaECaoQAJiW6ErSkPpVSDvUEg+kha5n
+S1HziA6SBk7m5ciJdNdcTl9c0mXNwoyeguoU0aSa/NtQTtrOS7WVTXeHy9eEOIOP
+dYMPjcxMp5pwLx0Q9ml3Mgqeo23kU33oL3/qlqHCt8H9HWzn6hxUta7oRC/cXCSD
+djUZWdxpN2rDSnTzCpVqlGvhnlxEml2/7HOL1O5/N3Od7qIZ5RDCwV4bCjaJ4aeu
+iVwOvKmDORvLVGvkD9aunxkDEoGKPwzKCiyZ+Zv2A+tGVH3+boaI+uHpjj6+bgAa
+0oOHUZanXBte4aNK7HEVbciUfRxW8vqTU8vqxD4fMgf1iRsXr1ATSQ5v36JZg8hp
+QcTGOtcRINugdCOfbIsgY87H6lDsuVKx8CiM8GPBAD7eygLtGEye/7r5Y9v3smKU
+R9Ch/fXXBTLc3AR+99wKaBLGqpNFVOeXtx9oQtEcpURUTlc7PnyjPXZa44ODKjxj
+mMy54iBxiyBsAkT61lzhomtDms462DysTWngarB6sOKfBDU3n+EiFDaNM4pvA2ii
+uFrWOpIu7voTUpVe+L61/4bxMielhcKaNs+l36j/P49z3gCUm+DaKVUH1GZLnjhf
+AFpYRy3W3jZv+hvl/cihI/bKunxm4d6G5ehZ1bFvt4H2jhlPo0lqEu+36VjGxzzJ
+0T3i9cntaBPj7k6Mzo7u
+=CAso
+-----END PGP SIGNATURE-----
diff --git a/cmake-3.5.2.tar.gz b/cmake-3.5.2.tar.gz
new file mode 100644
index 0000000..b5e035d
--- /dev/null
+++ b/cmake-3.5.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a
+size 6863498
diff --git a/cmake-gui.changes b/cmake-gui.changes
index 72e7635..337533c 100644
--- a/cmake-gui.changes
+++ b/cmake-gui.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Apr 16 12:57:14 UTC 2016 - astieger@suse.com
+
+- cmake 3.5.2:
+ * Fix lookup of an ALIAS target outside aliased target's directory
+ * Rename local target lookup methods to clarify purpose
+ * cmFortranParser: Skip #line directives that do not name files
+ * Ninja: Fix detection of custom command symbolic outputs
+ * Ninja: Restat custom command byproducts even with a SYMBOLIC output (#16049)
+ * ASM: Add missing <INCLUDES> placeholder for "compile" rules
+
-------------------------------------------------------------------
Fri Mar 25 11:14:39 UTC 2016 - foss@grueninger.de
diff --git a/cmake-gui.spec b/cmake-gui.spec
index bd3c7af..9661a08 100644
--- a/cmake-gui.spec
+++ b/cmake-gui.spec
@@ -17,7 +17,7 @@
Name: cmake-gui
-Version: 3.5.1
+Version: 3.5.2
Release: 0
Summary: CMake graphical user interface
License: BSD-3-Clause
@@ -39,19 +39,21 @@ BuildRequires: gcc-c++
BuildRequires: libarchive-devel >= 3.0.2
BuildRequires: libexpat-devel
BuildRequires: openssl-devel
-BuildRequires: python-sphinx
-BuildRequires: update-desktop-files
-BuildRequires: zlib-devel
# this is commented as it would create dependancy cycle between jsoncpp and cmake
#if 0%{?suse_version} > 1320
#BuildRequires: pkgconfig(jsoncpp)
#endif
+BuildRequires: pkg-config
+BuildRequires: python-sphinx
+BuildRequires: update-desktop-files
+BuildRequires: zlib-devel
BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(liblzma)
Requires: cmake
Recommends: cmake-man
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} >= 1320
+BuildRequires: pkg-config
BuildRequires: pkgconfig(Qt5Widgets)
%else
BuildRequires: libqt4-devel
@@ -81,6 +83,7 @@ echo "`grep cmake-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOURC
EXTRA_FLAGS="--qt-gui"
export CXXFLAGS="%{optflags}"
export CFLAGS="$CXXFLAGS"
+# FIXME: you should use the %%configure macro
./configure \
--prefix=%{_prefix} \
--datadir=/share/cmake \
@@ -102,7 +105,7 @@ export CFLAGS="$CXXFLAGS"
make VERBOSE=1 %{?_smp_mflags}
%install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
mkdir -p %{buildroot}%{_libdir}/cmake
%suse_update_desktop_file CMake Development IDE Tools Qt
# delete files that belong to the 'cmake' package
diff --git a/cmake.changes b/cmake.changes
index 4c39d1b..e3f4d67 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Apr 16 12:57:14 UTC 2016 - astieger@suse.com
+
+- cmake 3.5.2:
+ * Fix lookup of an ALIAS target outside aliased target's directory
+ * Rename local target lookup methods to clarify purpose
+ * cmFortranParser: Skip #line directives that do not name files
+ * Ninja: Fix detection of custom command symbolic outputs
+ * Ninja: Restat custom command byproducts even with a SYMBOLIC output (#16049)
+ * ASM: Add missing <INCLUDES> placeholder for "compile" rules
+
-------------------------------------------------------------------
Fri Mar 25 11:16:16 UTC 2016 - foss@grueninger.de
diff --git a/cmake.spec b/cmake.spec
index a7e8acf..a0c1d33 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -17,7 +17,7 @@
Name: cmake
-Version: 3.5.1
+Version: 3.5.2
Release: 0
Summary: Cross-platform, open-source make system
License: BSD-3-Clause
@@ -40,20 +40,21 @@ Patch6: cmake-version-in-generated-files.patch
BuildRequires: curl-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
+BuildRequires: libarchive-devel >= 3.0.2
+BuildRequires: libbz2-devel
BuildRequires: libexpat-devel
BuildRequires: ncurses-devel
-BuildRequires: zlib-devel
# this is commented as it would create dependancy cycle between jsoncpp and cmake
#if 0%{?suse_version} > 1320
#BuildRequires: pkgconfig(jsoncpp)
#endif
+BuildRequires: pkg-config
+BuildRequires: zlib-devel
BuildRequires: pkgconfig(liblzma)
Requires: make
Requires: python-base
Recommends: cmake-mans
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: libarchive-devel >= 3.0.2
-BuildRequires: libbz2-devel
%description
CMake is a cross-platform, open-source build system
@@ -71,6 +72,7 @@ echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOU
%build
export CXXFLAGS="%{optflags}"
export CFLAGS="%{optflags}"
+# FIXME: you should use the %%configure macro
./configure \
--prefix=%{_prefix} \
--datadir=/share/%{name} \
@@ -87,7 +89,7 @@ export CFLAGS="%{optflags}"
make VERBOSE=1 %{?_smp_mflags}
%install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
mkdir -p %{buildroot}%{_libdir}/cmake
find %{buildroot}%{_datadir}/cmake -type f -print0 | xargs -0 chmod 644
# rpm macros