Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 4

cmake.spec Changed

@@ -7,13 +7,19 @@
 %define rcver %{nil}
 
 %define rpm_macros_dir %{_sysconfdir}/rpm
-%if 0%{?fedora} > 18
+%if 0%{?fedora} || 0%{?rhel} >= 7
 %define rpm_macros_dir %{_rpmconfigdir}/macros.d
 %endif
 
+%if 0%{?fedora} < 23
+%bcond_with python3
+%else
+%bcond_without python3
+%endif
+
 Name:           cmake
-Version:        2.8.12.2
-Release:        2%{?dist}
+Version:        3.4.3
+Release:        3%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -23,43 +29,18 @@
 # some GPL-licensed bison-generated files, these all include an exception granting redistribution under terms of your choice
 License:        BSD and MIT and zlib
 URL:            http://www.cmake.org
-Source0:        http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz
+Source0:        http://www.cmake.org/files/v3.4/cmake-%{version}%{?rcver}.tar.gz
 Source1:        cmake-init.el
 Source2:        macros.cmake
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1202899
+Source3:        cmake.attr
+Source4:        cmake.prov
 # Patch to find DCMTK in Fedora (bug #720140)
 Patch0:         cmake-dcmtk.patch
 # Patch to fix RindRuby vendor settings
 # http://public.kitware.com/Bug/view.php?id=12965
 # https://bugzilla.redhat.com/show_bug.cgi?id=822796
-# Patch to use ninja-build instead of ninja (renamed in Fedora)
-# https://bugzilla.redhat.com/show_bug.cgi?id=886184
-Patch1:         cmake-ninja.patch
 Patch2:         cmake-findruby.patch
-# Patch to fix FindPostgreSQL
-# https://bugzilla.redhat.com/show_bug.cgi?id=828467
-# http://public.kitware.com/Bug/view.php?id=13378
-Patch3:         cmake-FindPostgreSQL.patch
-# Fix issue with finding consistent python versions
-# http://public.kitware.com/Bug/view.php?id=13794
-# https://bugzilla.redhat.com/show_bug.cgi?id=876118
-Patch4:         cmake-FindPythonLibs.patch
-# Add FindLua52.cmake
-Patch5:		cmake-2.8.11-rc4-lua-5.2.patch
-# Add -fno-strict-aliasing when compiling cm_sha2.c
-# http://www.cmake.org/Bug/view.php?id=14314
-Patch6:         cmake-strict_aliasing.patch
-# Patch away .png extension in icon name in desktop file.
-# http://www.cmake.org/Bug/view.php?id=14315
-Patch7:         cmake-desktop_icon.patch
-# Remove automatic Qt module dep adding
-Patch8:         cmake-qtdeps.patch
-# Fix FindFreetype for 2.5.1+
-# http://public.kitware.com/Bug/view.php?id=14601
-Patch9:		cmake-FindFreetype.patch
-# Upstream patch to find Boost MPI library
-# http://www.cmake.org/Bug/view.php?id=14739
-# https://bugzilla.redhat.com/show_bug.cgi?id=756141
-Patch10:        cmake-boostmpi.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,20 +49,30 @@
 BuildRequires:  bzip2-devel
 BuildRequires:  curl-devel
 BuildRequires:  expat-devel
+BuildRequires:  jsoncpp-devel
 BuildRequires:  libarchive-devel
+BuildRequires:  /usr/bin/sphinx-build
+BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
 BuildRequires:  emacs
+%if %{with python3}
+%{!?python3_pkgversion: %global python3_pkgversion 3}
+BuildRequires:  python%{python3_pkgversion}-devel
+%else
+BuildRequires:  python2-devel
+%endif
 %if %{without bootstrap}
 #BuildRequires: xmlrpc-c-devel
 %endif
 %if %{with gui}
-BuildRequires: qt4-devel, desktop-file-utils
+BuildRequires: pkgconfig(Qt5)
+BuildRequires: desktop-file-utils
 %define qt_gui --qt-gui
 %endif
 
 Requires:       rpm
 
-%if (0%{?fedora} >= 16)
+%if 0%{?fedora} || 0%{?rhel} >= 7
 Requires: emacs-filesystem >= %{_emacs_version}
 %endif
 
@@ -89,6 +80,9 @@
 # see https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries
 Provides: bundled(md5-deutsch)
 
+# https://fedorahosted.org/fpc/ticket/555
+Provides: bundled(kwsys)
+
 %description
 CMake is used to control the software compilation process using simple 
 platform and compiler independent configuration files. CMake generates 
@@ -120,36 +114,27 @@
 %setup -q -n %{name}-%{version}%{?rcver}
 # We cannot use backups with patches to Modules as they end up being installed
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-# Setup copyright docs for main package
-mkdir _doc
-find Source Utilities -type f -iname copy\* | while read f
-do
-  fname=$(basename $f)
-  dir=$(dirname $f)
-  dname=$(basename $dir)
-  cp -p $f _doc/${fname}_${dname}
-done
+
+%if %{with python3}
+echo '#!%{__python3}' > cmake.prov
+%else
+echo '#!%{__python2}' > cmake.prov
+%endif
+tail -n +2 %{SOURCE4} >> cmake.prov
 
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
+export LDFLAGS="%{__global_ldflags}"
 mkdir build
 pushd build
 ../bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
              --docdir=/share/doc/%{name} --mandir=/share/man \
              --%{?with_bootstrap:no-}system-libs \
              --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
+             --sphinx-man \
              %{?qt_gui}
 make VERBOSE=1 %{?_smp_mflags}
 
@@ -158,10 +143,19 @@
 pushd build
 make install DESTDIR=%{buildroot}
 find %{buildroot}/%{_datadir}/%{name}/Modules -type f | xargs chmod -x
+[ -n "$(find %{buildroot}/%{_datadir}/%{name}/Modules -name \*.orig)" ] &&
+  echo "Found .orig files in %{_datadir}/%{name}/Modules, rebase patches" &&
+  exit 1
 popd
-cp -a Example %{buildroot}%{_docdir}/%{name}/
+# Install bash completion symlinks
+mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
+for f in %{buildroot}%{_datadir}/%{name}/completions/*
+do
+  ln -s ../../%{name}/completions/$(basename $f) %{buildroot}%{_datadir}/bash-completion/completions/
+done
+# Install emacs cmake mode
 mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name}
-install -p -m 0644 Docs/cmake-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name}
+install -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name}/
 %{_emacs_bytecompile} %{buildroot}%{_emacs_sitelispdir}/%{name}/cmake-mode.el
 mkdir -p %{buildroot}%{_emacs_sitestartdir}
 install -p -m 0644 %SOURCE1 %{buildroot}%{_emacs_sitestartdir}/
@@ -169,59 +163,119 @@
 install -p -m0644 -D %{SOURCE2} %{buildroot}%{rpm_macros_dir}/macros.cmake
 sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" %{buildroot}%{rpm_macros_dir}/macros.cmake
 touch -r %{SOURCE2} %{buildroot}%{rpm_macros_dir}/macros.cmake
+%if 0%{?_rpmconfigdir:1}
+# RPM auto provides
+install -p -m0644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/rpm/fileattrs/cmake.attr
+install -p -m0755 -D cmake.prov %{buildroot}%{_prefix}/lib/rpm/cmake.prov
+%endif
 mkdir -p %{buildroot}%{_libdir}/%{name}
+# Install copyright files for main package
+cp -p Copyright.txt %{buildroot}/%{_docdir}/%{name}/
+find Source Utilities -type f -iname copy\* | while read f
+do
+  fname=$(basename $f)
+  dir=$(dirname $f)

cmake-dcmtk.patch Changed

@@ -1,7 +1,6 @@
-diff -up cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk cmake-2.8.6-rc1/Modules/FindDCMTK.cmake
---- cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk	2011-08-26 10:51:46.000000000 -0600
-+++ cmake-2.8.6-rc1/Modules/FindDCMTK.cmake	2011-08-29 16:58:07.299550799 -0600
-@@ -30,6 +30,10 @@
+--- cmake-3.0.0-rc1/Modules/FindDCMTK.cmake.orig	2014-02-26 08:41:21.000000000 -0700
++++ cmake-3.0.0-rc1/Modules/FindDCMTK.cmake	2014-04-04 09:14:46.290915700 -0600
+@@ -33,6 +33,10 @@
  # Written for VXL by Amitha Perera.
  # Upgraded for GDCM by Mathieu Malaterre.
  # Modified for EasyViz by Thomas Sondergaard.
@@ -12,7 +11,7 @@
  #
  
  if(NOT DCMTK_FOUND AND NOT DCMTK_DIR)
-@@ -44,20 +48,26 @@ endif()
+@@ -47,20 +51,26 @@
  
  foreach(lib
      dcmdata
@@ -40,7 +39,7 @@
    find_library(DCMTK_${lib}_LIBRARY
      ${lib}
      PATHS
-@@ -66,7 +76,8 @@ foreach(lib
+@@ -69,7 +79,8 @@
      ${DCMTK_DIR}/${lib}/libsrc/Debug
      ${DCMTK_DIR}/${lib}/Release
      ${DCMTK_DIR}/${lib}/Debug
@@ -50,7 +49,7 @@
  
    mark_as_advanced(DCMTK_${lib}_LIBRARY)
  
-@@ -82,13 +93,16 @@ set(DCMTK_dcmdata_TEST_HEADER dctypes.h)
+@@ -85,13 +96,16 @@
  set(DCMTK_dcmimage_TEST_HEADER dicoimg.h)
  set(DCMTK_dcmimgle_TEST_HEADER dcmimage.h)
  set(DCMTK_dcmjpeg_TEST_HEADER djdecode.h)
@@ -67,7 +66,7 @@
  
  foreach(dir
      config
-@@ -96,16 +110,20 @@ foreach(dir
+@@ -99,16 +113,20 @@
      dcmimage
      dcmimgle
      dcmjpeg

cmake-findruby.patch Changed

cmake-3.4.3.tar.gz Added

cmake.attr Added

cmake.prov Added

@@ -0,0 +1,82 @@
+#!/usr/bin/python
+# -*- coding:utf-8 -*-
+#
+# Copyright (C) 2015 Daniel Vrátil <dvratil@redhat.com>
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+
+import sys
+import re
+import glob
+
+class CMakeParser:
+    def __init__(self, filelist = None):
+        if filelist == None:
+            filelist = sys.stdin
+
+        paths = map(lambda x: x.rstrip(), filelist.readlines())
+        for path in paths:
+            modulePath, cmakeModule, lowercase = self.parseCmakeModuleConfig(path)
+            if modulePath and cmakeModule:
+                version = self.resolveCMakeModuleVersion(modulePath, cmakeModule, lowercase)
+
+                if version:
+                    print("cmake(%s) = %s" % (cmakeModule, version))
+                else:
+                    print("cmake(%s)" % cmakeModule)
+
+
+    def parseCmakeModuleConfig(self, configFile):
+        paths = configFile.rsplit("/", 3)
+
+        modulePath = "%s/cmake/%s" % (paths[0], paths[2])
+
+        lowercase = False
+        configFile = glob.glob("%s/*Config.cmake" % modulePath)
+        if not configFile:
+            configFile = glob.glob("%s/*-config.cmake" % modulePath)
+            lowercase = True
+        if not configFile:
+            return (None, None)
+
+        if lowercase:
+            moduleName = configFile[0][len(modulePath) + 1:-len("-config.cmake")]
+        else:
+            moduleName = configFile[0][len(modulePath) + 1:-len("Config.cmake")]
+
+        return (modulePath, moduleName, lowercase)
+
+    def resolveCMakeModuleVersion(self, modulePath, cmakeModule, lowercase):
+        versionFile = ("%s/%s-config-version.cmake" if lowercase else "%s/%sConfigVersion.cmake") % (modulePath, cmakeModule)
+        try:
+            f = open(versionFile, 'r')
+        except:
+            return None
+
+        for line in f:
+            line = line.strip()
+
+            # set(PACKAGE_VERSION <version>)
+            version = re.match(r"^set[\ ]*$[\ ]*PACKAGE_VERSION[\ ]+[\"]*([0-9\.]+)[\"]*[\ ]*[.]*$", line)
+            if version:
+                return version.groups(1)[0]
+
+        return None
+
+if __name__ == "__main__":
+    parser = CMakeParser()