From: shadzik <shadzik@pld-linux.org>
Date: Fri, 15 Aug 2008 11:41:37 +0000 (+0000)
Subject: - fix ar detection
X-Git-Tag: auto/ti/cmake-2_6_1-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcmake.git;a=commitdiff_plain;h=6342daf8b7b34bfad231b3fbfeb4697248bb531f;hp=9f78fa9d7ed48a67552a903c7642168878082818

- fix ar detection
- we shouldn't give a damn whether it's Index, Pindex, Srindex, index.[html,php,cgi,dupa] or anything else
  let http-daemon decide for us which one to choose
- rel 2

Changed files:
    cmake.spec -> 1.33
---

diff --git a/cmake.spec b/cmake.spec
index c0447fa..3c6fad6 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -12,13 +12,14 @@ Summary:	Cross-platform, open-source make system
 Summary(pl.UTF-8):	Wieloplatformowy system make o otwartych źródłach
 Name:		cmake
 Version:	2.6.1
-Release:	1
+Release:	2
 License:	BSD
 Group:		Development/Building
 Source0:	http://www.cmake.org/files/v2.6/%{name}-%{version}.tar.gz
 # Source0-md5:	6717f4bc3cfcced4172ad98660ce7599
-Patch1:		%{name}-lib64.patch
-URL:		http://www.cmake.org/HTML/index.html
+Patch0:		%{name}-lib64.patch
+Patch1:		%{name}-ar.patch
+URL:		http://www.cmake.org/HTML/
 %{?with_gui:BuildRequires:	QtGui-devel}
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
@@ -57,12 +58,12 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 %prep
 %setup -q
 %if "%{_lib}" == "lib64"
-%patch1 -p1
+%patch0 -p1
 %endif
+%patch1 -p0
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
-SET (CMAKE_AR "%{__ar}" CACHE FILEPATH " " FORCE)
 EOF
 
 %build