|
|
@@ -1,10 +1,13 @@
|
|
|
+# Set to bcond_without or use --with bootstrap if bootstrapping a new release
|
|
|
+# or architecture
|
|
|
+%bcond_with bootstrap
|
|
|
# Set to bcond_with or use --without gui to disable qt4 gui build
|
|
|
%bcond_without gui
|
|
|
|
|
|
Name: cmake
|
|
|
Summary: Cross-platform make system
|
|
|
Summary(ja): クロスプラットフォームな Make システム
|
|
|
-Version: 2.8.3
|
|
|
+Version: 2.8.6
|
|
|
Release: 1%{?_dist_release}
|
|
|
|
|
|
Group: Development/Tools
|
|
|
@@ -14,13 +17,18 @@ URL: http://www.cmake.org/
|
|
|
Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
|
|
|
Source1: macros.cmake
|
|
|
|
|
|
+# Patch to find DCMTK in Fedora (bug #720140)
|
|
|
+Patch0: cmake-dcmtk.patch
|
|
|
+
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
-#BuildRequires: curl-devel
|
|
|
-#BuildRequires: expat-devel
|
|
|
+BuildRequires: curl-devel
|
|
|
+BuildRequires: expat-devel
|
|
|
+BuildRequires: gcc-gfortran
|
|
|
+BuildRequires: libarchive-devel
|
|
|
BuildRequires: libidn-devel
|
|
|
BuildRequires: ncurses-devel
|
|
|
BuildRequires: openssl-devel
|
|
|
-#BuildRequires: zlib-devel
|
|
|
+BuildRequires: zlib-devel
|
|
|
%if %{with gui}
|
|
|
BuildRequires: qt4-devel, desktop-file-utils
|
|
|
%define qt_gui --qt-gui
|
|
|
@@ -52,17 +60,20 @@ The %{name}-gui package contains the Qt based GUI for CMake.
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
+%patch0 -p1 -b .dcmtk
|
|
|
+
|
|
|
# Fixup permissions
|
|
|
-find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
|
|
|
+#find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
|
|
|
|
|
|
%build
|
|
|
./bootstrap \
|
|
|
--prefix=%{_prefix} \
|
|
|
--datadir=/share/%{name} \
|
|
|
--mandir=/share/man \
|
|
|
- --no-system-libs \
|
|
|
+ --%{?with_bootstrap:no-}system-libs \
|
|
|
%{?qt_gui}
|
|
|
|
|
|
+sed -i 's/-lcurses/-lcurses -ltinfo/' Source/CMakeFiles/ccmake.dir/link.txt
|
|
|
%if %{?_dist_release} == "vl5"
|
|
|
sed -i 's/HAVE_SYS_WAIT_H:INTERNAL=/HAVE_SYS_WAIT_H:INTERNAL=1/' CMakeCache.txt
|
|
|
%endif
|
|
|
@@ -114,6 +125,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
|
|
|
%{_bindir}/cpack
|
|
|
%{_bindir}/ctest
|
|
|
%{_datadir}/%{name}/
|
|
|
+%{_datadir}/aclocal/cmake.m4
|
|
|
%{_mandir}/man1/*
|
|
|
|
|
|
%if %{with gui}
|
|
|
@@ -127,6 +139,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Nov 19 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.8.6-1
|
|
|
+- new upstream release
|
|
|
+- forced to link with libtinfo.so (ccmake)
|
|
|
+- used --system-libs again
|
|
|
+
|
|
|
* Sat Jan 8 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.8.3-1
|
|
|
- new upstream release
|
|
|
- used --no-system-libs, removed BR: curl-devel, expat-devel, zlib-devel
|
inagaki