packages: libwbxml/libwbxml.spec - use cmake default params from rpm build ...

glen glen at pld-linux.org
Mon Nov 22 08:42:20 CET 2010


Author: glen                         Date: Mon Nov 22 07:42:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use cmake default params from rpm build macros

---- Files affected:
packages/libwbxml:
   libwbxml.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: packages/libwbxml/libwbxml.spec
diff -u packages/libwbxml/libwbxml.spec:1.24 packages/libwbxml/libwbxml.spec:1.25
--- packages/libwbxml/libwbxml.spec:1.24	Sun Nov 21 20:32:52 2010
+++ packages/libwbxml/libwbxml.spec	Mon Nov 22 08:42:15 2010
@@ -13,12 +13,13 @@
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/libwbxml/%{name}-%{version}.tar.bz2
 # Source0-md5:	7b51c425fc2ff9f502cd9b1e291b1955
-Patch15:	wbxml2-r59.patch
+Patch0:		wbxml2-r59.patch
 URL:		http://libwbxml.opensync.org/
 BuildRequires:	cmake
 BuildRequires:	expat-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
+BuildRequires:	rpmbuild(macros) >= 1.577
 BuildConflicts:	wbxml2
 Obsoletes:	libwbxml2
 Obsoletes:	wbxml2
@@ -52,19 +53,14 @@
 
 %prep
 %setup -q
-%patch15 -p3
+%patch0 -p3
 
 %build
 install -d build
 cd build
 %cmake .. \
-	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
 	-DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
-%if "%{_lib}" != "lib"
-	-DLIB_SUFFIX=64
-%endif
 
 %{__make}
 
@@ -102,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2010/11/22 07:42:15  glen
+- use cmake default params from rpm build macros
+
 Revision 1.24  2010/11/21 19:32:52  qboosh
 - updated to 0.10.8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libwbxml/libwbxml.spec?r1=1.24&r2=1.25&f=u



More information about the pld-cvs-commit mailing list