SPECS: kde4-kdepimlibs.spec - merged from DEVEL - 4.2.0

shadzik shadzik at pld-linux.org
Tue Feb 3 13:43:46 CET 2009


Author: shadzik                      Date: Tue Feb  3 12:43:46 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL
- 4.2.0

---- Files affected:
SPECS:
   kde4-kdepimlibs.spec (1.54 -> 1.55) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdepimlibs.spec
diff -u SPECS/kde4-kdepimlibs.spec:1.54 SPECS/kde4-kdepimlibs.spec:1.55
--- SPECS/kde4-kdepimlibs.spec:1.54	Sat Sep 13 17:25:19 2008
+++ SPECS/kde4-kdepimlibs.spec	Tue Feb  3 13:43:41 2009
@@ -3,29 +3,30 @@
 # Conditional build:
 %bcond_without	apidocs		# do not prepare API documentation
 #
-%define		qtver		4.4.0
+%define		qtver		4.4.3
 %define		_state		stable
 %define		orgname		kdepimlibs
 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.1.1
-Release:	1
+Version:	4.2.0
+Release:	3
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	36316f5fc5b2e0ec123a8e00a522dd80
-BuildRequires:	Qt3Support-devel
+# Source0-md5:	8a91677e2dca7d4db26b33c78e239e5e
+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:	akonadi-devel >= 1.0.0
-BuildRequires:	automoc4 >= 0.9.83
+BuildRequires:	akonadi-devel >= 1.1.1
+BuildRequires:	automoc4 >= 0.9.88
 BuildRequires:	bison
 BuildRequires:	boost-devel >= 1.35.0
-BuildRequires:	cmake
+BuildRequires:	cmake >= 2.6.2
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	docbook-dtd42-xml
 %{?with_apidocs:BuildRequires:	doxygen}
@@ -33,9 +34,9 @@
 BuildRequires:	gpgme-devel
 %{?with_apidocs:BuildRequires:	graphviz}
 BuildRequires:	kde4-kdelibs-devel >= %{version}
+BuildRequires:	libical-devel >= 0.33
 BuildRequires:	openssl-devel
 BuildRequires:	pcre-devel
-BuildRequires:	pth-devel
 BuildRequires:	qt4-build >= %{qtver}
 %{?with_apidocs:BuildRequires:	qt4-doc >= %{qtver}}
 BuildRequires:	qt4-qmake >= %{qtver}
@@ -45,6 +46,7 @@
 BuildConflicts:	kdepim-kontact-libs
 BuildConflicts:	kdepim-libkmailprivate
 Requires:	%{name} = %{version}-%{release}
+Requires(post,postun):	/sbin/ldconfig
 Obsoletes:	kdepimlibs4
 Conflicts:	kdelibs
 Conflicts:	kdepimlibs4
@@ -74,6 +76,7 @@
 
 %prep
 %setup -q -n %{orgname}-%{version}
+%patch100 -p0
 
 %build
 install -d build
@@ -118,7 +121,9 @@
 %attr(755,root,root) %{_libdir}/libkxmlrpcclient.so.4.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkxmlrpcclient.so.4
 %attr(755,root,root) %{_libdir}/libgpgme++-pthread.so.2.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgpgme++-pthread.so.2
 %attr(755,root,root) %{_libdir}/libgpgme++.so.2.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgpgme++.so.2
 %attr(755,root,root) %{_libdir}/libkblog.so.4.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkblog.so.4
 %attr(755,root,root) %{_libdir}/libkimap.so.4.*.*
@@ -132,13 +137,17 @@
 %attr(755,root,root) %{_libdir}/libmailtransport.so.4.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmailtransport.so.4
 %attr(755,root,root) %{_libdir}/libqgpgme.so.1.*.*
+%attr(755,root,root) %ghost %{_libdir}/libqgpgme.so.1
 %attr(755,root,root) %{_libdir}/libgpgme++-pth.so.2.*.*
-%attr(755,root,root) %{_libdir}/libsyndication.so.4.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgpgme++-pth.so.2
 %attr(755,root,root) %ghost %{_libdir}/libsyndication.so.4
+%attr(755,root,root) %{_libdir}/libsyndication.so.4.*.*
 %attr(755,root,root) %ghost %{_libdir}/libakonadi-kde.so.4
 %attr(755,root,root) %{_libdir}/libakonadi-kde.so.4.*.*
 %attr(755,root,root) %ghost %{_libdir}/libakonadi-kmime.so.4
 %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) %{_libdir}/kde4/kabc_directory.so
 %attr(755,root,root) %{_libdir}/kde4/kabc_file.so
@@ -201,12 +210,16 @@
 
 %{_datadir}/kde4/servicetypes/kresources_manager.desktop
 %{_datadir}/kde4/servicetypes/kresources_plugin.desktop
+%lang(en) %{_kdedocdir}/en/kcontrol/kresources
+%lang(en) %{_kdedocdir}/en/kioslave/imap
+%lang(en) %{_kdedocdir}/en/kioslave/ldap
+%lang(en) %{_kdedocdir}/en/kioslave/nntp
+%lang(en) %{_kdedocdir}/en/kioslave/pop3
+%lang(en) %{_kdedocdir}/en/kioslave/smtp
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/*.so
-%attr(755,root,root) %{_libdir}/*.so.*
-#%{_includedir}/emailfunctions
 %{_includedir}/akonadi
 %{_includedir}/kabc
 %{_includedir}/kcal
@@ -226,9 +239,9 @@
 
 %dir %{_libdir}/gpgmepp
 %{_libdir}/gpgmepp/*.cmake
+%{_libdir}/KdepimLibs-4.2.0
 %{_datadir}/apps/cmake/modules/*.cmake
 
-%{_datadir}/apps/libical
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -236,19 +249,122 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.54  2008/09/13 15:25:19  witekfl
-- rel 1
+Revision 1.55  2009/02/03 12:43:41  shadzik
+- merged from DEVEL
+- 4.2.0
+
+Revision 1.49.2.36  2009/02/03 09:15:10  arekm
+- rel 3; include branch diff
+
+Revision 1.49.2.35  2009/01/22 19:30:47  shadzik
+- updated automoc4 BR; rel 2
+
+Revision 1.49.2.34  2009/01/22 11:30:06  shadzik
+- 4.2.0
+
+Revision 1.49.2.33  2009/01/07 18:33:35  shadzik
+- updated akonadi BR
+- rel 2
+
+Revision 1.49.2.32  2009/01/07 18:22:53  shadzik
+- 4.2 RC1
+
+Revision 1.49.2.31  2009/01/05 17:53:39  glen
+- revert source url change
+
+Revision 1.49.2.30  2009/01/02 21:01:08  rotom
+- up to 4.1.87
+- new Source URL
+
+Revision 1.49.2.29  2008/12/15 13:45:40  shadzik
+- 4.1.85
+
+Revision 1.49.2.28  2008/12/08 12:50:55  paszczus
+- updated to 4.1.82
+
+Revision 1.49.2.27  2008/11/29 02:35:09  shadzik
+- 4.1.81
+
+Revision 1.49.2.26  2008/11/26 18:30:53  shadzik
+- 4.2 beta1
+
+Revision 1.49.2.25  2008/11/18 20:40:05  shadzik
+- undo kill C: kdelibs
+
+Revision 1.49.2.24  2008/11/18 17:10:35  shadzik
+- kill C: kdelibs
+
+Revision 1.49.2.23  2008/11/13 14:29:35  paszczus
+- updated to 4.1.73
+
+Revision 1.49.2.22  2008/11/11 16:17:19  shadzik
+- even better, just own the kresource folder
+
+Revision 1.49.2.21  2008/11/11 16:14:41  shadzik
+- don't package kcontrol docdir
+
+Revision 1.49.2.20  2008/11/07 09:40:01  shadzik
+- more ghost files
+
+Revision 1.49.2.19  2008/11/07 09:29:31  shadzik
+- R: ldconfig
+- donät package already ghosted files!
+
+Revision 1.49.2.18  2008/11/06 20:25:30  paszczus
+- added BR: libical-devel >= 0.33
+
+Revision 1.49.2.17  2008/11/06 02:30:57  shadzik
+- 4.1.72
+
+Revision 1.49.2.16  2008/10/23 16:48:22  rotom
+- up to 4.1.71
+
+Revision 1.49.2.15  2008/10/18 11:26:00  rotom
+- up to 4.1.70
+
+Revision 1.49.2.14  2008/10/10 09:05:34  paszczus
+- updated to 4.1.69
+
+Revision 1.49.2.13  2008/10/02 09:28:51  paszczus
+- updated to 4.1.68
+
+Revision 1.49.2.12  2008/09/19 20:12:30  paszczus
+- updated to 4.1.67
+
+Revision 1.49.2.11  2008/09/04 18:40:37  paszczus
+- updated to 4.1.65
+
+Revision 1.49.2.10  2008/08/31 10:15:29  wolf
+gpgme-devel-1.1.6-1.athlon zaznaczył pth-devel-2.0.7-3.athlon (wł. libtool(/usr/lib/libpth.la))
+
+Revision 1.49.2.9  2008/08/30 21:59:57  shadzik
+- 4.1.64
+
+Revision 1.49.2.8  2008/08/21 15:44:40  paszczus
+- updated to 4.1.63
+
+Revision 1.49.2.7  2008/08/17 22:13:05  shadzik
+- 4.1.62
+
+Revision 1.49.2.6  2008/08/15 11:46:08  shadzik
+- cmake fix now in cmake itself
+
+Revision 1.49.2.5  2008/08/09 14:46:39  shadzik
+- fix build with cmake > 2.6.0
+
+Revision 1.49.2.4  2008/08/08 13:36:30  shadzik
+- 4.1.61
+- strict cmake version
+
+Revision 1.49.2.3  2008/08/05 21:30:59  shadzik
+- uhm, cmake too
+
+Revision 1.49.2.2  2008/08/05 21:30:39  shadzik
+- updated qt BR
+- rel 2
 
-Revision 1.53  2008/09/13 15:08:19  witekfl
-- up to 4.1.1
-- rel 0.1
-
-Revision 1.52  2008/08/15 11:45:39  shadzik
-- reverted
-
-Revision 1.50  2008/08/09 16:46:01  shadzik
-- don't export QTDIR
-- cosmetics
+Revision 1.49.2.1  2008/08/05 19:02:36  shadzik
+- 4.1.60
 
 Revision 1.49  2008/07/25 21:19:57  arekm
 - rel 4; br akonadi 1.0.0
================================================================

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



More information about the pld-cvs-commit mailing list