rpms/cmake
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase patches to prevent .orig files in Modules

Browse Source 
Add install check for .orig files
This commit is contained in:
Orion Poplawski 2014-04-04 09:33:10 -06:00
parent 74892e312d
commit 491914b7e0
4 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake-FindPostgreSQL.patch
View File

@ -1,7 +1,6 @@
diff -up cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake.findpostgresql cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake --- cmake-3.0.0-rc1/Modules/FindPostgreSQL.cmake.orig 2014-02-26 08:41:21.000000000 -0700
--- cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake.findpostgresql 2012-10-24 11:12:01.000000000 -0600 +++ cmake-3.0.0-rc1/Modules/FindPostgreSQL.cmake 2014-04-04 09:15:48.822447888 -0600
+++ cmake-2.8.10-rc3/Modules/FindPostgreSQL.cmake 2012-10-24 19:49:54.189433358 -0600 @@ -100,77 +100,99 @@
@@ -92,77 +92,99 @@ set( PostgreSQL_ROOT_DIRECTORIES
# #
# Look for an installation. # Look for an installation.
# #

15
cmake-dcmtk.patch
View File

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

7
cmake-findruby.patch
View File

@ -1,7 +1,6 @@
diff -up cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby cmake-2.8.10-rc1/Modules/FindRuby.cmake --- cmake-3.0.0-rc1/Modules/FindRuby.cmake.orig 2014-02-26 08:41:21.000000000 -0700
--- cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby 2012-10-02 10:12:18.000000000 -0600 +++ cmake-3.0.0-rc1/Modules/FindRuby.cmake 2014-03-05 10:09:49.692974698 -0700
+++ cmake-2.8.10-rc1/Modules/FindRuby.cmake 2012-10-02 15:50:30.463292214 -0600 @@ -112,14 +112,8 @@
@@ -92,14 +92,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO
_RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
_RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)

13
cmake.spec
View File

@ -13,7 +13,7 @@
Name: cmake Name: cmake
Version: 3.0.0 Version: 3.0.0
Release: 0.5.rc3%{?dist} Release: 0.6.rc3%{?dist}
Summary: Cross-platform make system Summary: Cross-platform make system
Group: Development/Tools Group: Development/Tools
@ -126,8 +126,8 @@ The %{name}-gui package contains the Qt based GUI for CMake.
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1 -b .strict_aliasing
%patch7 -p1 %patch7 -p1 -b .desktop_icon
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
@ -160,6 +160,9 @@ make VERBOSE=1 %{?_smp_mflags}
pushd build pushd build
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
find %{buildroot}/%{_datadir}/%{name}/Modules -type f | xargs chmod -x 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 popd
# Install bash completion symlinks # Install bash completion symlinks
mkdir -p %{buildroot}%{_datadir}/bash-completion/completions mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
@ -244,6 +247,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog %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 * Wed Mar 26 2014 Orion Poplawski <orion@cora.nwra.com> - 3.0.0-0.5.rc3
- Update to 3.0.0-rc3 - Update to 3.0.0-rc3
- Add patch to fix FindwxWidgets when cross-compiling for Windows (bug #1081207) - Add patch to fix FindwxWidgets when cross-compiling for Windows (bug #1081207)