Browse Source

update: cmake

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2604 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 13 years ago
parent
commit
5f6684ca29
1 changed files with 16 additions and 6 deletions
  1. 16 6
      c/cmake/cmake-vl.spec

+ 16 - 6
c/cmake/cmake-vl.spec

@@ -4,8 +4,8 @@
 Name: cmake
 Summary: Cross-platform make system
 Summary(ja): クロスプラットフォームな Make システム
-Version: 2.8.2
-Release: 4%{?_dist_release}
+Version: 2.8.3
+Release: 1%{?_dist_release}
 
 Group: Development/Tools
 License: BSD
@@ -15,10 +15,12 @@ Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
 Source1: macros.cmake
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: curl-devel
-BuildRequires: expat-devel
+#BuildRequires: curl-devel
+#BuildRequires: expat-devel
+BuildRequires: libidn-devel
 BuildRequires: ncurses-devel
-BuildRequires: zlib-devel
+BuildRequires: openssl-devel
+#BuildRequires: zlib-devel
 %if %{with gui}
 BuildRequires: qt4-devel, desktop-file-utils
 %define qt_gui --qt-gui
@@ -58,9 +60,13 @@ find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x
     --prefix=%{_prefix} \
     --datadir=/share/%{name} \
     --mandir=/share/man \
-    --system-libs \
+    --no-system-libs \
     %{?qt_gui}
 
+%if %{?_dist_release} == "vl5"
+sed -i 's/HAVE_SYS_WAIT_H:INTERNAL=/HAVE_SYS_WAIT_H:INTERNAL=1/' CMakeCache.txt
+%endif
+
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
@@ -121,6 +127,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* 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
+
 * Sun Sep  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.8.2-4
 - fixed typo (not --with-system-libs, but --system-libs)
 - added BR: curl-devel, expat-devel, zlib-devel