rpms
/
cmake
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Update to 2.8.11-rc2 

- Rebase ImageMagick patch
This commit is contained in:
Orion Poplawski 2013-04-17 19:30:21 -06:00
parent edc556d31e
commit 44545375b1
4 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/cmake-2.8.9.tar.gz
/cmake-2.8.10.2.tar.gz
/cmake-2.8.11-rc1.tar.gz
/cmake-2.8.11-rc2.tar.gz

21
cmake-2.8.11-rc1-IM_pkgconfig_hints.patch
View File

@ -36,24 +36,3 @@ diff -up cmake-2.8.11-rc1/Modules/FindImageMagick.cmake.IM_pkgconfig_hints cmake
DOC "Path to the ImageMagick Magick++ library."
)
@@ -147,17 +157,17 @@ foreach(component ${ImageMagick_FIND_COM
)
if(component STREQUAL "Magick++")
FIND_IMAGEMAGICK_API(Magick++ Magick++.h
- Magick++ CORE_RL_Magick++_ Magick++-Q16 Magick++-Q8
+ Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8
)
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-Q16 MagickWand-Q8
+ Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8
)
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-Q16 MagickCore-Q8
+ Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8
)
list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
else()

8
cmake.spec
View File

@ -4,7 +4,7 @@
# Set to bcond_with or use --without gui to disable qt4 gui build
%bcond_without gui
# Set to RC version if building RC, else %{nil}
%define rcver -rc1
%define rcver -rc2
%define rpm_macros_dir %{_sysconfdir}/rpm
%if 0%{?fedora} > 18
@ -13,7 +13,7 @@
Name: cmake
Version: 2.8.11
Release: 0.4.rc1%{?dist}
Release: 0.5.rc2%{?dist}
Summary: Cross-platform make system
Group: Development/Tools
@ -190,6 +190,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
* Wed Apr 17 2013 Orion Poplawski <orion@cora.nwra.com> - 2.8.11-0.5.rc2
- Update to 2.8.11-rc2
- Rebase ImageMagick patch
* Mon Mar 18 2013 Rex Dieter <rdieter@fedoraproject.org> 2.8.11-0.4.rc1
- respin cmake-2.8.11-rc1-IM_pkgconfig_hints.patch
- drop/omit backup files when applying patches

2
sources
View File

@ -1 +1 @@
64090a9f01356590ce16aa302439c55d cmake-2.8.11-rc1.tar.gz
85804e965c6131c183483fbf43f5f821 cmake-2.8.11-rc2.tar.gz