SPECS: kde4-kdepimlibs.spec - up to 4.0.66; avoid conflict with kde3

[arekm]

Author: arekm                        Date: Sun Mar 16 17:06:17 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 4.0.66; avoid conflict with kde3

---- Files affected:
SPECS:
   kde4-kdepimlibs.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdepimlibs.spec
diff -u SPECS/kde4-kdepimlibs.spec:1.17 SPECS/kde4-kdepimlibs.spec:1.18
--- SPECS/kde4-kdepimlibs.spec:1.17	Fri Mar  7 20:48:20 2008
+++ SPECS/kde4-kdepimlibs.spec	Sun Mar 16 18:06:11 2008
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-#  plik /usr/share/apps/kabc/countrytransl.map z instalacji kde4-kdepimlibs-4.0.64-0.1.x86_64 jest w konflikcie z plikiem z pakietu kdelibs-3.5.9-5.x86_64
-#  plik /usr/share/apps/kabc/formats/binary.desktop z instalacji kde4-kdepimlibs-4.0.64-0.1.x86_64 jest w konflikcie z plikiem z pakietu kdelibs-3.5.9-5.x86_64
 #
 # Conditional build:
 %bcond_without	apidocs		# do not prepare API documentation
@@ -11,12 +8,13 @@
 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.0.65
+Version:	4.0.66
 Release:	0.1
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	17161dadf895ff1af8f36cbb79c5110f
+# Source0-md5:	4d5b263af1af96cddf86eb65544267d0
+Patch0:		%{name}-kde3.patch
 BuildRequires:	Qt3Support-devel
 BuildRequires:	QtCore-devel >= 4.4.0
 BuildRequires:	QtDBus-devel >= 4.4.0
@@ -36,7 +34,6 @@
 BuildRequires:	openssl-devel
 BuildRequires:	pcre-devel
 BuildRequires:	pth-devel
-#BuildRequires:	qt-designer-libs
 BuildRequires:	qt4-build >= 4.4.0
 %{?with_apidocs:BuildRequires:	qt4-doc >= 4.4.0}
 BuildRequires:	qt4-qmake >= 4.4.0
@@ -77,6 +74,7 @@
 
 %prep
 %setup -q -n %{orgname}-%{version}
+%patch0 -p0
 
 %build
 export QTDIR=%{_prefix}
@@ -155,9 +153,9 @@
 %attr(755,root,root) %{_libdir}/kde4/kio_smtp.so
 
 %dir %{_datadir}/apps/kabc
-%{_datadir}/apps/kabc/countrytransl.map
+%{_datadir}/apps/kabc/*countrytransl.map
 %dir %{_datadir}/apps/kabc/formats
-%{_datadir}/apps/kabc/formats/binary.desktop
+%{_datadir}/apps/kabc/formats/*binary.desktop
 
 %{_datadir}/apps/kconf_update/mailtransports.upd
 %{_datadir}/apps/kconf_update/migrate-transports.pl
@@ -218,6 +216,8 @@
 %{_includedir}/mailtransport
 %{_includedir}/qgpgme
 
+%dir %{_libdir}/gpgmepp
+%{_libdir}/gpgmepp/*.cmake
 %{_datadir}/apps/cmake/modules/*.cmake
 
 %{_datadir}/apps/libical
@@ -228,6 +228,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2008-03-16 17:06:11  arekm
+- up to 4.0.66; avoid conflict with kde3
+
 Revision 1.17  2008-03-07 19:48:20  shadzik
 - 4.0.65
 
================================================================

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