Author: shadzik Date: Tue Jan 4 18:18:23 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated qt4 and rpm-build-macro BRs
- adjusted %build section to new macro
---- Files affected:
packages/kde4-kdepimlibs:
kde4-kdepimlibs.spec (1.128 -> 1.129)
---- Diffs:
================================================================
Index: packages/kde4-kdepimlibs/kde4-kdepimlibs.spec
diff -u packages/kde4-kdepimlibs/kde4-kdepimlibs.spec:1.128
packages/kde4-kdepimlibs/kde4-kdepimlibs.spec:1.129
--- packages/kde4-kdepimlibs/kde4-kdepimlibs.spec:1.128 Tue Jan 4 18:05:19 2011
+++ packages/kde4-kdepimlibs/kde4-kdepimlibs.spec Tue Jan 4 19:18:17 2011
@@ -2,7 +2,7 @@
#
# Conditional build:
#
-%define qtver 4.7.0
+%define qtver 4.7.1
%define _state stable
%define orgname kdepimlibs
@@ -36,7 +36,7 @@
BuildRequires: pcre-devel
BuildRequires: qt4-build >= %{qtver}
BuildRequires: qt4-qmake >= %{qtver}
-BuildRequires: rpmbuild(macros) >= 1.293
+BuildRequires: rpmbuild(macros) >= 1.600
BuildRequires: zlib-devel
BuildConflicts: indexlib
BuildConflicts: kdepim-kontact-libs
@@ -79,13 +79,6 @@
install -d build
cd build
%cmake \
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DLIB_INSTALL_DIR=%{_libdir} \
- -DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
- -DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
-%if "%{_lib}" == "lib64"
- -DLIB_SUFFIX=64 \
-%endif
../
%{__make}
@@ -307,6 +300,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.129 2011/01/04 18:18:17 shadzik
+- updated qt4 and rpm-build-macro BRs
+- adjusted %build section to new macro
+
Revision 1.128 2011/01/04 17:05:19 arekm
- up to 4.5.5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepimlibs/kde4-kdepimlibs.spec?r1=1.128&r2=1.129&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
