packages: kde4-kdepimlibs/kde4-kdepimlibs.spec - merged from DEVEL

shadzik shadzik at pld-linux.org
Wed Jul 29 20:03:30 CEST 2009 

Author: shadzik                      Date: Wed Jul 29 18:03:30 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/kde4-kdepimlibs:
   kde4-kdepimlibs.spec (1.85 -> 1.86) 

---- Diffs:

================================================================
Index: packages/kde4-kdepimlibs/kde4-kdepimlibs.spec
diff -u packages/kde4-kdepimlibs/kde4-kdepimlibs.spec:1.85 packages/kde4-kdepimlibs/kde4-kdepimlibs.spec:1.86
--- packages/kde4-kdepimlibs/kde4-kdepimlibs.spec:1.85	Fri Jun 26 12:01:52 2009
+++ packages/kde4-kdepimlibs/kde4-kdepimlibs.spec	Wed Jul 29 20:03:24 2009
@@ -3,27 +3,29 @@
 # Conditional build:
 %bcond_without	apidocs		# do not prepare API documentation
 #
-%define		qtver		4.5.1
+%define		qtver		4.5.2
 %define		_state		stable
 %define		orgname		kdepimlibs
+%define		svn		979380
+
 Summary:	Personal Information Management (PIM) libraries for KDE
 Summary(pl.UTF-8):	Biblioteki zarządzania informacjami osobistymi (PIM) dla KDE
 Name:		kde4-kdepimlibs
-Version:	4.2.4
-Release:	2
+Version:	4.3.0
+Release:	1
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	ee1d783140be0bb67652784f6fa93f70
-Patch100:	%{name}-branch.diff
+# Source0-md5:	313f1a9d353f82c2ffee517115404dd5
+#Patch100: %{name}-branch.diff
 BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtCore-devel >= %{qtver}
 BuildRequires:	QtDBus-devel >= %{qtver}
 BuildRequires:	QtGui-devel >= %{qtver}
 BuildRequires:	QtSvg-devel >= %{qtver}
-BuildRequires:	QtXml-devel >= %{qtver}
 BuildRequires:	QtTest-devel >= %{qtver}
-BuildRequires:	akonadi-devel >= 1.1.2
+BuildRequires:	QtXml-devel >= %{qtver}
+BuildRequires:	akonadi-devel >= 1.1.95
 BuildRequires:	automoc4 >= 0.9.88
 BuildRequires:	bison
 BuildRequires:	boost-devel >= 1.35.0
@@ -35,7 +37,7 @@
 BuildRequires:	gpgme-devel
 %{?with_apidocs:BuildRequires:	graphviz}
 BuildRequires:	kde4-kdelibs-devel >= %{version}
-BuildRequires:	libical-devel >= 0.33
+BuildRequires:	libical-devel >= 0.43
 BuildRequires:	openssl-devel
 BuildRequires:	pcre-devel
 BuildRequires:	qt4-build >= %{qtver}
@@ -46,8 +48,8 @@
 BuildConflicts:	indexlib
 BuildConflicts:	kdepim-kontact-libs
 BuildConflicts:	kdepim-libkmailprivate
-Requires:	%{name} = %{version}-%{release}
 Requires(post,postun):	/sbin/ldconfig
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	kdepimlibs4
 Conflicts:	kdelibs
 Conflicts:	kdepimlibs4
@@ -77,6 +79,7 @@
 
 %prep
 %setup -q -n %{orgname}-%{version}
+##%setup -q -n %{orgname}-%{version}svn%{svn}
 #%patch100 -p0
 
 %build
@@ -84,6 +87,7 @@
 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"
@@ -150,6 +154,12 @@
 %attr(755,root,root) %{_libdir}/libakonadi-kmime.so.4.*.*
 %attr(755,root,root) %ghost %{_libdir}/libakonadi-kabc.so.4
 %attr(755,root,root) %{_libdir}/libakonadi-kabc.so.4.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkholidays.so.4
+%attr(755,root,root) %{_libdir}/libkholidays.so.4.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkpimtextedit.so.4
+%attr(755,root,root) %{_libdir}/libkpimtextedit.so.4.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmicroblog.so.4
+%attr(755,root,root) %{_libdir}/libmicroblog.so.4.*.*
 
 %attr(755,root,root) %{_libdir}/kde4/kabc_directory.so
 %attr(755,root,root) %{_libdir}/kde4/kabc_file.so
@@ -177,6 +187,7 @@
 
 %{_datadir}/apps/kconf_update/mailtransports.upd
 %{_datadir}/apps/kconf_update/migrate-transports.pl
+%{_datadir}/apps/libkholidays
 
 %{_datadir}/config.kcfg/mailtransport.kcfg
 
@@ -219,12 +230,26 @@
 %lang(en) %{_kdedocdir}/en/kioslave/pop3
 %lang(en) %{_kdedocdir}/en/kioslave/smtp
 
+%{_datadir}/mime/packages/kdepimlibs-mime.xml
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/*.so
+%{_includedir}/KDE/Akonadi
+%{_includedir}/KDE/KABC
+%{_includedir}/KDE/KBlog
+%{_includedir}/KDE/KCal
+%{_includedir}/KDE/KHolidays
+%{_includedir}/KDE/KLDAP
+%{_includedir}/KDE/KPIMIdentities
+%{_includedir}/KDE/KPIMTextEdit
+%{_includedir}/KDE/KPIMUtils
+%{_includedir}/KDE/KResources
+%{_includedir}/KDE/Syndication
 %{_includedir}/akonadi
 %{_includedir}/kabc
 %{_includedir}/kcal
+%{_includedir}/kholidays
 %{_includedir}/kldap
 %{_includedir}/kresources
 %{_includedir}/ktnef
@@ -235,14 +260,16 @@
 %{_includedir}/kimap
 %{_includedir}/kmime
 %{_includedir}/kpimidentities
+%{_includedir}/kpimtextedit
 %{_includedir}/kpimutils
 %{_includedir}/mailtransport
+%{_includedir}/microblog
 %{_includedir}/qgpgme
 
 %dir %{_libdir}/gpgmepp
 %{_libdir}/gpgmepp/*.cmake
 %dir %{_libdir}/cmake
-%{_libdir}/cmake/KdepimLibs-*
+%{_libdir}/cmake/KdepimLibs
 %{_datadir}/apps/cmake/modules/*.cmake
 
 
@@ -252,20 +279,42 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.85  2009/06/26 10:01:52  arekm
-- gpgme 1.2.0 fixes
+Revision 1.86  2009/07/29 18:03:24  shadzik
+- merged from DEVEL
+
+Revision 1.80.2.11  2009/07/21 22:58:12  shadzik
+- update qtver
+
+Revision 1.80.2.10  2009/07/21 22:56:32  shadzik
+- 4.3rc3
+
+Revision 1.80.2.9  2009/07/09 19:06:02  paszczus
+- updated to 4.2.96
+
+Revision 1.80.2.8  2009/07/04 15:34:05  shadzik
+- fix --target build
+
+Revision 1.80.2.7  2009/06/29 17:46:02  shadzik
+- 4.3 RC1
+
+Revision 1.80.2.6  2009/06/11 12:47:57  paszczus
+- updated to 4.2.91
+
+Revision 1.80.2.5  2009/06/08 10:52:25  paszczus
+- updated to 4.3b2 (4.2.90)
+- updated akonadi BR
 
-Revision 1.84  2009/05/28 22:05:37  shadzik
-- update qt br
+Revision 1.80.2.4  2009/05/30 14:27:43  paszczus
+- updated to 4.2.88
 
-Revision 1.83  2009/05/28 21:56:11  shadzik
-- 4.2.4 try #1
+Revision 1.80.2.3  2009/05/26 09:24:05  paszczus
+- updated to 4.2.87 (cmake files from 4.2.85)
 
-Revision 1.82  2009/05/28 20:02:35  arekm
-- rel 7
+Revision 1.80.2.2  2009/05/25 10:25:36  paszczus
+- Patch100 commented (no reason to put it on DEVEL for now); adaptarized
 
-Revision 1.81  2009/05/28 19:37:18  arekm
-- rel 6; branch diff is back
+Revision 1.80.2.1  2009/05/11 17:31:29  shadzik
+- 4.3 beta1
 
 Revision 1.80  2009/05/08 14:28:46  shadzik
 - rel 5
================================================================

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

More information about the pld-cvs-commit mailing list