- 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 c0447fa64c0721588510dfd6c5853587f66aad52..3c6fad6dbf96b386830a13e4fe7389b179c44d55 100644 (file)
--- 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
 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
 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
 %{?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"
 %prep
 %setup -q
 %if "%{_lib}" == "lib64"

-%patch1 -p1
+%patch0 -p1

 %endif
 %endif

+%patch1 -p0

 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)

-SET (CMAKE_AR "%{__ar}" CACHE FILEPATH " " FORCE)

 EOF
 
 %build
 EOF
 
 %build