From 491914b7e06bccfd6180a773ac5ee8dcf8cdb013 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Fri, 4 Apr 2014 09:33:10 -0600
Subject: [PATCH] Rebase patches to prevent .orig files in Modules Add install
 check for .orig files

---
 cmake-FindPostgreSQL.patch |  7 +++----
 cmake-dcmtk.patch          | 15 +++++++--------
 cmake-findruby.patch       |  7 +++----
 cmake.spec                 | 13 ++++++++++---
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/cmake-FindPostgreSQL.patch b/cmake-FindPostgreSQL.patch
index 419b612..eee6e15 100644
--- a/cmake-FindPostgreSQL.patch
+++ b/cmake-FindPostgreSQL.patch
@@ -1,7 +1,6 @@
-diff -up cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake.findpostgresql cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake
---- cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake.findpostgresql	2012-10-24 11:12:01.000000000 -0600
-+++ cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake	2012-10-24 19:49:54.189433358 -0600
-@@ -92,77 +92,99 @@ set( PostgreSQL_ROOT_DIRECTORIES
+--- cmake-3.0.0-rc1/Modules/FindPostgreSQL.cmake.orig	2014-02-26 08:41:21.000000000 -0700
++++ cmake-3.0.0-rc1/Modules/FindPostgreSQL.cmake	2014-04-04 09:15:48.822447888 -0600
+@@ -100,77 +100,99 @@
  #
  # Look for an installation.
  #
diff --git a/cmake-dcmtk.patch b/cmake-dcmtk.patch
index d7f77bf..e00b493 100644
--- a/cmake-dcmtk.patch
+++ b/cmake-dcmtk.patch
@@ -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 @@ diff -up cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk cmake-2.8.6-rc1/Modules/F
  #
  
  if(NOT DCMTK_FOUND AND NOT DCMTK_DIR)
-@@ -44,20 +48,26 @@ endif()
+@@ -47,20 +51,26 @@
  
  foreach(lib
      dcmdata
@@ -40,7 +39,7 @@ diff -up cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk cmake-2.8.6-rc1/Modules/F
    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 @@ diff -up cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk cmake-2.8.6-rc1/Modules/F
  
    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 @@ diff -up cmake-2.8.6-rc1/Modules/FindDCMTK.cmake.dcmtk cmake-2.8.6-rc1/Modules/F
  
  foreach(dir
      config
-@@ -96,16 +110,20 @@ foreach(dir
+@@ -99,16 +113,20 @@
      dcmimage
      dcmimgle
      dcmjpeg
diff --git a/cmake-findruby.patch b/cmake-findruby.patch
index 6c60931..f5ea634 100644
--- a/cmake-findruby.patch
+++ b/cmake-findruby.patch
@@ -1,7 +1,6 @@
-diff -up cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby cmake-2.8.10-rc1/Modules/FindRuby.cmake
---- cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby	2012-10-02 10:12:18.000000000 -0600
-+++ cmake-2.8.10-rc1/Modules/FindRuby.cmake	2012-10-02 15:50:30.463292214 -0600
-@@ -92,14 +92,8 @@ if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSIO
+--- cmake-3.0.0-rc1/Modules/FindRuby.cmake.orig	2014-02-26 08:41:21.000000000 -0700
++++ cmake-3.0.0-rc1/Modules/FindRuby.cmake	2014-03-05 10:09:49.692974698 -0700
+@@ -112,14 +112,8 @@
     _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
     _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
  
diff --git a/cmake.spec b/cmake.spec
index 0ba5c04..9541c32 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -13,7 +13,7 @@
 
 Name:           cmake
 Version:        3.0.0
-Release:        0.5.rc3%{?dist}
+Release:        0.6.rc3%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -126,8 +126,8 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch6 -p1 -b .strict_aliasing
+%patch7 -p1 -b .desktop_icon
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
@@ -160,6 +160,9 @@ make VERBOSE=1 %{?_smp_mflags}
 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
 # Install bash completion symlinks
 mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
@@ -244,6 +247,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Fri Apr 4 2014 Orion Poplawski <orion@cora.nwra.com> - 3.0.0-0.6.rc3
+- Rebase patches to prevent .orig files in Modules
+- Add install check for .orig files
+
 * Wed Mar 26 2014 Orion Poplawski <orion@cora.nwra.com> - 3.0.0-0.5.rc3
 - Update to 3.0.0-rc3
 - Add patch to fix FindwxWidgets when cross-compiling for Windows (bug #1081207)