packages: kde4-kdebase-workspace/kde4-kdebase-workspace.spec - adjusted to ...

[shadzik]

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

---- Files affected:
packages/kde4-kdebase-workspace:
   kde4-kdebase-workspace.spec (1.249 -> 1.250) 

---- Diffs:

================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.249 packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.250
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.249	Tue Jan  4 18:24:30 2011
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec	Tue Jan  4 19:43:33 2011
@@ -3,7 +3,7 @@
 # - subpackage PolicyKit-kde and O: PolicyKit-kde
 %define		orgname		kdebase-workspace
 %define		_state		stable
-%define		qtver		4.7.0
+%define		qtver		4.7.1
 
 Summary:	KDE 4 base workspace components
 Summary(pl.UTF-8):	Podstawowe komponenty środowiska KDE 4
@@ -71,7 +71,7 @@
 BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	qzion-devel >= 0.4.0
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.600
 BuildRequires:	shared-desktop-ontologies-devel >= 0.5
 BuildRequires:	soprano-devel >= 2.4.64
 BuildRequires:	strigi-devel >= 0.7.0
@@ -607,16 +607,10 @@
 install -d build
 cd build
 %cmake \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DLIB_INSTALL_DIR=%{_libdir} \
 	-DLIBEXEC_INSTALL_DIR=%{_libdir}/kde4/libexec \
 	-DKDE4_KDM_PAM_SERVICE=kdm \
 	-DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \
 	-DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver \
-	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
-%if "%{_lib}" == "lib64"
-	-DLIB_SUFFIX=64 \
-%endif
 	../
 
 %{__make}
@@ -1931,6 +1925,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.250  2011/01/04 18:43:33  shadzik
+- adjusted to new cmake macro
+
 Revision 1.249  2011/01/04 17:24:30  arekm
 - up to 4.5.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec?r1=1.249&r2=1.250&f=u