packages: kde4-kdelibs/kde4-kdelibs.spec - bump up qt4 BRs - BR rpm-build-m...

[shadzik]

Author: shadzik                      Date: Tue Jan  4 18:06:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- bump up qt4 BRs
- BR rpm-build-macros 1.600 at least
- remove variables already defined in %cmake macro

---- Files affected:
packages/kde4-kdelibs:
   kde4-kdelibs.spec (1.226 -> 1.227) 

---- Diffs:

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs.spec
diff -u packages/kde4-kdelibs/kde4-kdelibs.spec:1.226 packages/kde4-kdelibs/kde4-kdelibs.spec:1.227
--- packages/kde4-kdelibs/kde4-kdelibs.spec:1.226	Tue Jan  4 17:57:28 2011
+++ packages/kde4-kdelibs/kde4-kdelibs.spec	Tue Jan  4 19:06:18 2011
@@ -4,7 +4,7 @@
 #
 %define		_state		stable
 %define		orgname		kdelibs
-%define		qtver		4.7.0
+%define		qtver		4.7.1
 
 Summary:	K Desktop Environment - libraries
 Summary(es.UTF-8):	K Desktop Environment - bibliotecas
@@ -84,7 +84,7 @@
 BuildRequires:	qca-devel >= 2.0.0
 BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-qmake >= %{qtver}
-BuildRequires:	rpmbuild(macros) >= 1.293
+BuildRequires:	rpmbuild(macros) >= 1.600
 BuildRequires:	shared-desktop-ontologies-devel >= 0.5
 BuildRequires:	shared-mime-info >= 0.18
 BuildRequires:	soprano-devel >= 2.4.63
@@ -236,8 +236,6 @@
 install -d build
 cd build
 %cmake \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DLIB_INSTALL_DIR=%{_libdir} \
 	-DCONFIG_INSTALL_DIR=%{_datadir}/config \
 	-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
 	-DDATA_INSTALL_DIR=%{_datadir}/apps \
@@ -245,11 +243,7 @@
 	-DMIME_INSTALL_DIR=/nogo \
 	-DTEMPLATES_INSTALL_DIR=%{_datadir}/templates \
 	-DHTML_INSTALL_DIR=%{_kdedocdir} \
-	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
 	-DKDE_DISTRIBUTION_TEXT="PLD-Linux" \
-%if "%{_lib}" == "lib64"
-	-DLIB_SUFFIX=64 \
-%endif
 	-DKDE4_ENABLE_FINAL=OFF \
 	../
 
@@ -1092,6 +1086,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.227  2011/01/04 18:06:18  shadzik
+- bump up qt4 BRs
+- BR rpm-build-macros 1.600 at least
+- remove variables already defined in %cmake macro
+
 Revision 1.226  2011/01/04 16:57:28  arekm
 - up to 4.5.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.226&r2=1.227&f=u