Accepting request 773189 from home:StefanBruens:branches:devel:tools:building

- Revert LIBDIR change in macros - it is inconsistent (all other
  INSTALL_<dir>s use absolute paths), unneeded (paths may be
  absolute or relative), and breaks a number of packages.
- Update minimum libarchive version, >= 3.3.3.
- Do not flag macros as config file.
- Adjust constraints (7G disk space is required, independent
  of architecture).

OBS-URL: https://build.opensuse.org/request/show/773189
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=398

_constraints

@@ -1,14 +1,7 @@
 <constraints>
-  <overwrite>
-    <conditions>
-      <arch>aarch64</arch>
-      <arch>ppc64</arch>
-      <arch>ppc64le</arch>
-    </conditions>
   <hardware>
     <disk>
-        <size unit="G">6</size>
+      <size unit="G">7</size>
     </disk>
   </hardware>
-  </overwrite>
 </constraints>

cmake.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Feb 10 15:26:56 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Revert LIBDIR change in macros - it is inconsistent (all other
+  INSTALL_<dir>s use absolute paths), unneeded (paths may be
+  absolute or relative), and breaks a number of packages.
+- Update minimum libarchive version, >= 3.3.3.
+- Do not flag macros as config file.
+- Adjust constraints (7G disk space is required, independent
+  of architecture).
+
 -------------------------------------------------------------------
 Fri Feb  7 02:11:06 UTC 2020 - Simon Lees <sflees@suse.de>
 

cmake.macros

@@ -23,7 +23,7 @@
         -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
         -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
         -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\
+        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
         -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\
         -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\
         -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\

cmake.spec

@@ -66,8 +66,8 @@ Requires:       this-is-only-for-build-envs
 Conflicts:      cmake
 Provides:       cmake = %{version}
 %else
-BuildRequires:  pkgconfig(jsoncpp)
-BuildRequires:  pkgconfig(libarchive) >= 3.0.2
+BuildRequires:  pkgconfig(jsoncpp) >= 1.4.1
+BuildRequires:  pkgconfig(libarchive) >= 3.3.3
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libzstd)
 Conflicts:      cmake-mini
@@ -199,7 +199,7 @@ rm %{buildroot}%{_docdir}/cmake/Copyright.txt
 %files
 %license Copyright.txt
 %doc README.rst
-%config %{_rpmconfigdir}/macros.d/macros.cmake
+%{_rpmconfigdir}/macros.d/macros.cmake
 %{_libexecdir}/rpm
 %{_bindir}/cpack
 %{_bindir}/cmake