packages: autopano-sift-C/autopano-sift-C.spec - use Release build type (pa...

[qboosh]

Author: qboosh                       Date: Sun Oct 31 08:58:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use Release build type (pass appropriate C_FLAGS and CXX_FLAGS to cmake - both C and C++ are used)

---- Files affected:
packages/autopano-sift-C:
   autopano-sift-C.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/autopano-sift-C/autopano-sift-C.spec
diff -u packages/autopano-sift-C/autopano-sift-C.spec:1.5 packages/autopano-sift-C/autopano-sift-C.spec:1.6
--- packages/autopano-sift-C/autopano-sift-C.spec:1.5	Fri May 28 15:46:57 2010
+++ packages/autopano-sift-C/autopano-sift-C.spec	Sun Oct 31 09:57:57 2010
@@ -6,10 +6,10 @@
 Release:	1
 License:	GPL v2, but SIFT algorithm may require license in some countries
 Group:		Applications/Graphics
-Source0:	http://dl.sourceforge.net/hugin/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.gz
 # Source0-md5:	b9bade07e8c4f2ea383c22a082c260e0
 URL:		http://wiki.panotools.org/Autopano-sift-C
-BuildRequires:	cmake
+BuildRequires:	cmake >= 2.4
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpano13-devel
 BuildRequires:	libpng-devel
@@ -58,16 +58,15 @@
 %prep
 %setup -q 
 
-# don't override our optflags with cmake-predefined values
-sed -i 's/NOT CMAKE_BUILD_TYPE/GFY/' CMakeLists.txt
-
 %build
 install -d build
 cd build
 # CMAKE_AR is a hack, cmake is unable to find it otherwise :/
 %cmake .. \
 	-DCMAKE_AR=/usr/bin/ar \
-	%{?debug:-DCMAKE_BUILD_TYPE=Debug} \
+	-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:Release} \
+	-DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
+	-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
 %if "%{_lib}" == "lib64"
@@ -107,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/10/31 08:57:57  qboosh
+- use Release build type (pass appropriate C_FLAGS and CXX_FLAGS to cmake - both C and C++ are used)
+
 Revision 1.5  2010/05/28 13:46:57  caleb
 - Up to 2.5.1
 
@@ -121,4 +123,3 @@
 
 Revision 1.1  2008/07/30 20:46:55  qboosh
 - new
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/autopano-sift-C/autopano-sift-C.spec?r1=1.5&r2=1.6&f=u