packages: kde4-oxygen-icons/kde4-oxygen-icons.spec - adjusted to new %cmake...

shadzik shadzik at pld-linux.org
Tue Jan 4 19:21:26 CET 2011


Author: shadzik                      Date: Tue Jan  4 18:21:26 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjusted to new %cmake macro

---- Files affected:
packages/kde4-oxygen-icons:
   kde4-oxygen-icons.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: packages/kde4-oxygen-icons/kde4-oxygen-icons.spec
diff -u packages/kde4-oxygen-icons/kde4-oxygen-icons.spec:1.40 packages/kde4-oxygen-icons/kde4-oxygen-icons.spec:1.41
--- packages/kde4-oxygen-icons/kde4-oxygen-icons.spec:1.40	Tue Jan  4 18:29:02 2011
+++ packages/kde4-oxygen-icons/kde4-oxygen-icons.spec	Tue Jan  4 19:21:21 2011
@@ -19,7 +19,7 @@
 # Source2-md5:	1111e8a60b33ad694e91d574233dde0e
 URL:		http://www.kde.org/
 BuildRequires:	cmake >= 2.8.0
-BuildRequires:	rpmbuild(macros) >= 1.293
+BuildRequires:	rpmbuild(macros) >= 1.600
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,15 +60,11 @@
 %build
 install -d build
 cd build
-%cmake .. \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
+%cmake \
 	-DCMAKE_CXX_COMPILER_WORKS=1 \
 	-DCMAKE_CXX_COMPILER="%{__cc}" \
 	-DCMAKE_C_COMPILER_WORKS=1 \
-%if "%{_lib}" == "lib64"
-	-DLIB_SUFFIX=64
-%endif
+	../
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -154,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2011/01/04 18:21:21  shadzik
+- adjusted to new %cmake macro
+
 Revision 1.40  2011/01/04 17:29:02  arekm
 - up to 4.5.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-oxygen-icons/kde4-oxygen-icons.spec?r1=1.40&r2=1.41&f=u



More information about the pld-cvs-commit mailing list