- up to 3.9.4

diff --git a/cmake.spec b/cmake.spec
index de0719328662cd5bb3e610b797c59c651fa7936c..57e3f8fa600b79334657ee81cee5b02c5c99e1b4 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -19,19 +19,19 @@
 Summary:       Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
 Summary:       Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake

-Version:       3.8.2
+Version:       3.9.4

 Release:       1
 License:       BSD
 Group:         Development/Building
 Release:       1
 License:       BSD
 Group:         Development/Building

-Source0:       https://cmake.org/files/v3.8/%{name}-%{version}.tar.gz
-# Source0-md5: b5dff61f6a7f1305271ab3f6ae261419
+Source0:       https://cmake.org/files/v3.9/%{name}-%{version}.tar.gz
+# Source0-md5: 33769e001bdcd788f565bf378692e5ae

 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-libx32.patch
 Patch2:                %{name}-helpers.patch
 Patch3:                %{name}-findruby.patch
 Patch4:                %{name}-findruby2.patch
 Patch5:                man-syntax.patch
 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-libx32.patch
 Patch2:                %{name}-helpers.patch
 Patch3:                %{name}-findruby.patch
 Patch4:                %{name}-findruby2.patch
 Patch5:                man-syntax.patch

-Patch6:                imagemagick7.patch
+

 Patch7:                %{name}-xmlrpc.patch
 URL:           https://cmake.org/
 %if %{with gui}
 Patch7:                %{name}-xmlrpc.patch
 URL:           https://cmake.org/
 %if %{with gui}


@@ -137,7 +137,7 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1

-%patch6 -p1
+

 %patch7 -p1
 
 cat > "init.cmake" <<EOF
 %patch7 -p1
 
 cat > "init.cmake" <<EOF


@@ -231,7 +231,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cmake-gui
 %{_datadir}/mime/packages/cmakecache.xml
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cmake-gui
 %{_datadir}/mime/packages/cmakecache.xml

-%{_desktopdir}/CMake.desktop
+%{_desktopdir}/cmake-gui.desktop

 %{_iconsdir}/hicolor/128x128/apps/CMakeSetup.png
 %{_iconsdir}/hicolor/32x32/apps/CMakeSetup.png
 %{_mandir}/man1/cmake-gui.1*
 %{_iconsdir}/hicolor/128x128/apps/CMakeSetup.png
 %{_iconsdir}/hicolor/32x32/apps/CMakeSetup.png
 %{_mandir}/man1/cmake-gui.1*

diff --git a/imagemagick7.patch b/imagemagick7.patch
deleted file mode 100644 (file)
index 51b0e6f..0000000
--- a/imagemagick7.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- cmake-3.5.2/Modules/FindImageMagick.cmake~ 2016-04-15 15:41:21.000000000 +0200
-+++ cmake-3.5.2/Modules/FindImageMagick.cmake  2016-12-25 21:47:56.573276549 +0100
-@@ -114,7 +114,7 @@
-       ${ImageMagick_INCLUDE_DIRS}
-       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
-     PATH_SUFFIXES
--      ImageMagick ImageMagick-6
-+      ImageMagick ImageMagick-6 ImageMagick-7
-     DOC "Path to the ImageMagick arch-independent include dir."
-     )
-   find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR
-@@ -126,7 +126,7 @@
-       ${ImageMagick_INCLUDE_DIRS}
-       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
-     PATH_SUFFIXES
--      ImageMagick ImageMagick-6
-+      ImageMagick ImageMagick-6 ImageMagick-7
-     DOC "Path to the ImageMagick arch-specific include dir."
-     )
-   find_library(ImageMagick_${component}_LIBRARY
-@@ -207,17 +207,17 @@
-     )
-   if(component STREQUAL "Magick++")
-     FIND_IMAGEMAGICK_API(Magick++ Magick++.h
--      Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
-+      Magick++ CORE_RL_Magick++_ Magick++-7.Q16 Magick++-6.Q16 Magick++-Q16 Magick++-7.Q8 Magick++-6.Q8 Magick++-Q8 Magick++-7.Q16HDRI Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-7.Q8HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
-   elseif(component STREQUAL "MagickWand")
-     FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
--      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
-+      Wand MagickWand CORE_RL_wand_ MagickWand-7.Q16 MagickWand-6.Q16 MagickWand-Q16 MagickWand-7.Q8 MagickWand-6.Q8 MagickWand-Q8 MagickWand-7.Q16HDRI MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-7.Q8HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
-   elseif(component STREQUAL "MagickCore")
-     FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
--      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
-+      Magick MagickCore CORE_RL_magick_ MagickCore-7.Q16 MagickCore-6.Q16 MagickCore-Q16 MagickCore-7.Q8 MagickCore-6.Q8 MagickCore-Q8 MagickCore-7.Q16HDRI MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-7.Q8HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
-       )
-     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
-   else()