SPECS: kdepim.spec - adapterized

charles charles at pld-linux.org
Tue Apr 4 09:35:18 CEST 2006 

Author: charles                      Date: Tue Apr  4 07:35:18 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapterized

---- Files affected:
SPECS:
   kdepim.spec (1.221 -> 1.222) 

---- Diffs:

================================================================
Index: SPECS/kdepim.spec
diff -u SPECS/kdepim.spec:1.221 SPECS/kdepim.spec:1.222
--- SPECS/kdepim.spec:1.221	Sat Apr  1 19:00:41 2006
+++ SPECS/kdepim.spec	Tue Apr  4 09:35:12 2006
@@ -5,7 +5,7 @@
 %bcond_without	apidocs		# do not prepare API documentation
 %bcond_without	hidden_visibility	# pass '--fvisibility=hidden'
 					# & '--fvisibility-inlines-hidden'
-					# to g++ 
+					# to g++
 #
 %define		_state		stable
 %define		_minlibsevr	9:%{version}
@@ -21,15 +21,15 @@
 Release:	1
 Epoch:		9
 License:	GPL
-Vendor:		The KDE Team
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	ac6b3b503e27a65a7b883c1e0a57262e
 Patch100:	%{name}-branch.diff
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-kmail_toolbars.patch
-BuildRequires:	automake
 BuildRequires:	autoconf
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	bluez-libs-devel
 BuildRequires:	cyrus-sasl-devel
@@ -38,8 +38,8 @@
 BuildRequires:	ed
 BuildRequires:	flex
 %{?with_hidden_visibility:BuildRequires:	gcc-c++ >= 5:4.1.0-0.20051206r108118.1}
-BuildRequires:	gpgme-devel >= 1:1.0.0
 BuildRequires:	gnupg-agent
+BuildRequires:	gpgme-devel >= 1:1.0.0
 %{?with_apidocs:BuildRequires:	graphviz}
 BuildRequires:	kdelibs-devel >= %{_minlibsevr}
 BuildRequires:	libgnokii-devel
@@ -48,25 +48,25 @@
 BuildRequires:	openssl-devel
 BuildRequires:	pcre-devel
 BuildRequires:	pilot-link-devel
-%{?with_hidden_visibility:BuildRequires:	qt-devel >= 6:3.3.5.051113-1}
 BuildRequires:	qt-designer-libs
+%{?with_hidden_visibility:BuildRequires:	qt-devel >= 6:3.3.5.051113-1}
 %{?with_apidocs:BuildRequires:	qt-doc}
 BuildRequires:	rpmbuild(macros) >= 1.129
 #BuildRequires:	unsermake >= 040511
 BuildRequires:	zlib-devel
+BuildConflicts:	indexlib
 BuildConflicts:	kdepim-kontact-libs
 BuildConflicts:	kdepim-libkmailprivate
-BuildConflicts:	indexlib
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 # subpackage akregator
 Obsoletes:	akregator
+#Obsoletes:	kdeaddons-konqueror
 Obsoletes:	kdeaddons-kontact
 Obsoletes:	kdepim-kontact
 Obsoletes:	kdepim-korganizer
 Obsoletes:	kdepim-korganizer-libs
 Obsoletes:	kdepim-kresources
 Obsoletes:	kdepim-ksync
-#Obsoletes:	kdeaddons-konqueror
 #Obsoletes:	kdepim-libkcal
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -89,14 +89,14 @@
 %package devel
 Summary:	Development files for KDE pim
 Summary(pl):	Pliki nagłówkowe do KDE pim
-Summary(uk):	ćÁĘĚÉ ŇĎÚŇĎÂËÉ ÄĚŃ kdepim
 Summary(ru):	ćÁĘĚŮ ŇÁÚŇÁÂĎÔËÉ ÄĚŃ kdepim
+Summary(uk):	ćÁĘĚÉ ŇĎÚŇĎÂËÉ ÄĚŃ kdepim
 Group:		X11/Development/Libraries
-Requires:	kdelibs-devel >= %{_minlibsevr}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Conflicts:	kdenetwork-devel < 10:3.1.90
+Requires:	kdelibs-devel >= %{_minlibsevr}
 Obsoletes:	indexlib-devel
 Obsoletes:	kdepim-libkcal-devel
+Conflicts:	kdenetwork-devel < 10:3.1.90
 
 %description devel
 This package contains header files needed if you wish to build
@@ -162,8 +162,8 @@
 Summary:	Address book
 Summary(pl):	Książka adresowa
 Group:		X11/Applications
-Requires:	kdelibs >= %{_minlibsevr}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	kdelibs >= %{_minlibsevr}
 
 %description kaddressbook
 The KDE address book.
@@ -194,8 +194,8 @@
 Summary:	A communication program between mobile phone and PC
 Summary(pl):	Program do komunikacji między PC a tel. komórkowym
 Group:		X11/Applications
-Requires:	kdebase-core >= %{_minlibsevr}
 #Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	kdebase-core >= %{_minlibsevr}
 Obsoletes:	kdepim-cellphone
 
 %description kandy
@@ -228,11 +228,11 @@
 Summary(pt_BR):	Cliente / leitor de e-mails para o KDE
 Group:		X11/Applications
 URL:		http://kmail.kde.org/
-Requires:	kdebase-core >= %{_minbaseevr}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	kde-kio-imap4 >= %{epoch}:%{version}-%{release}
 Requires:	kde-kio-pop3 >= %{_minbaseevr}
 Requires:	kde-kio-smtp >= %{_minbaseevr}
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	kdebase-core >= %{_minbaseevr}
 Obsoletes:	kde-kio-sieve
 Obsoletes:	kdenetwork-kmail
 Obsoletes:	kdenetwork-korn
@@ -281,9 +281,9 @@
 Summary(pl):	Czytnik newsów dla KDE
 Summary(pt_BR):	Leitor de notícias (news) do KDE
 Group:		X11/Applications
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	kde-kio-nntp >= %{_minbaseevr}
 Requires:	kdebase-core >= %{_minbaseevr}
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Obsoletes:	kdenetwork-knode
 
 %description knode
@@ -368,8 +368,8 @@
 Summary(pl):	Wskaźnik skrzynki pocztowej dla KDE
 Summary(pt_BR):	Miniaplicativo de monitoraçăo da caixa de correio
 Group:		X11/Applications
-Requires:	kdebase-desktop >= %{_minbaseevr}
 #Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	kdebase-desktop >= %{_minbaseevr}
 Obsoletes:	kdenetwork-korn
 
 %description korn
@@ -445,6 +445,9 @@
 Summary(pl):	Współdzielone biblioteki kdepim
 Group:		X11/Libraries
 Requires:	kdelibs >= %{_minlibsevr}
+Provides:	kdepim-kmail-libs = %{epoch}:%{version}-%{release}
+Provides:	kdepim-libkdenetwork = %{epoch}:%{version}-%{release}
+Provides:	kdepim-libkdepim = %{epoch}:%{version}-%{release}
 Obsoletes:	indexlib
 Obsoletes:	kdenetwork
 Obsoletes:	kdepim-commonlibs
@@ -463,9 +466,6 @@
 Obsoletes:	kdepim-libksieve
 Obsoletes:	kdepim-libktnef
 Obsoletes:	kdepim-libmimelib
-Provides:	kdepim-libkdenetwork = %{epoch}:%{version}-%{release}
-Provides:	kdepim-libkdepim = %{epoch}:%{version}-%{release}
-Provides:	kdepim-kmail-libs = %{epoch}:%{version}-%{release}
 Conflicts:	akregator < 3.4.0
 
 %description libs
@@ -1380,6 +1380,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.222  2006/04/04 07:35:12  charles
+- adapterized
+
 Revision 1.221  2006/04/01 17:00:41  glen
 - unify macros
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdepim.spec?r1=1.221&r2=1.222&f=u

More information about the pld-cvs-commit mailing list