Index: SPECS/kdepim.spec
===================================================================
--- SPECS/kdepim.spec   (revision 50740)
+++ SPECS/kdepim.spec   (working copy)
@@ -770,6 +770,7 @@
 Summary:       Kaddressbook program
 Group:         Graphical desktop/KDE
 Provides:      kaddressbook
+Requires:       %lib_name-kaddressbook = %epoch:%version-%release

 %description kaddressbook
 The KDE addressbook application.
[neoclust@n5 kdepim]$ vi SPECS/kdepim.spec
[neoclust@n5 kdepim]$ svn diff
Index: SPECS/kdepim.spec
===================================================================
--- SPECS/kdepim.spec   (revision 50740)
+++ SPECS/kdepim.spec   (working copy)
@@ -152,11 +152,12 @@
 Conflicts: kdepim-knotes <= 1:3.5.3-5mdv2007
 Conflicts: kdepim-knode <= 1:3.5.3-5mdv2007
 Conflicts: kdepim-kmail < 1:3.5.7-%mkrel 5
-Requires: sasl-plug-digestmd5
-Requires: sasl-plug-login
-Requires: sasl-plug-plain
+Requires:  sasl-plug-digestmd5
+Requires:  sasl-plug-login
+Requires:  sasl-plug-plain
 Obsoletes: kdepim =< 3.1-17mdk
-Requires: kde-custom-icons
+Requires:  kde-custom-icons
+Requires:  %lib_name-common >= %epoch:%version-%release

 %description common
 Common files for kdepim
@@ -370,11 +371,11 @@
 #----------------------------------------------------------------------

 %package akregator
-Group:      Graphical desktop/KDE
-Summary:    aKregator is KDE RSS aggregator with great look and feel.
+Group:          Graphical desktop/KDE
+Summary:        aKregator is KDE RSS aggregator with great look and feel.
 Provides:      akregator = %epoch:%version-%release
 Obsoletes:     akregator <= 1.0.2
-Obsoletes:  %lib_name-akregator
+Obsoletes:      %lib_name-akregator
 Requires:      kdepim-common = %epoch:%version-%release
 Conflicts:     kdepim-devel < 1:3.5.7-9mdv

@@ -420,15 +421,15 @@
 Obsoletes: %lib_name-kpilot-devel
 Obsoletes: %lib_name-kaddressbook-devel
 Obsoletes: %lib_name-korganizer-devel
-Provides: %lib_name-devel = %epoch:%version-%release
-Requires: %lib_name-common = %epoch:%version-%release
-Requires: %lib_name-ktnef = %epoch:%version-%release
-Requires: %lib_name-kitchensync = %epoch:%version-%release
-Requires: %lib_name-qopensync = %epoch:%version-%release
-Requires: %lib_name-kontact = %epoch:%version-%release
-Requires: %lib_name-kpilot = %epoch:%version-%release
-Requires: %lib_name-kaddressbook = %epoch:%version-%release
-Requires: %lib_name-korganizer = %epoch:%version-%release
+Provides:  %lib_name-devel = %epoch:%version-%release
+Requires:  %lib_name-common = %epoch:%version-%release
+Requires:  %lib_name-ktnef = %epoch:%version-%release
+Requires:  %lib_name-kitchensync = %epoch:%version-%release
+Requires:  %lib_name-qopensync = %epoch:%version-%release
+Requires:  %lib_name-kontact = %epoch:%version-%release
+Requires:  %lib_name-kpilot = %epoch:%version-%release
+Requires:  %lib_name-kaddressbook = %epoch:%version-%release
+Requires:  %lib_name-korganizer = %epoch:%version-%release


 %description devel
@@ -540,16 +541,17 @@
 Group:      Graphical desktop/KDE
 Summary:    KDE Mailer
 Requires:   kdepim-common = %epoch:%version-%release
-Provides:      kmail
-Provides:      kdenetwork-kmail = %epoch:%version-%release
-Requires:      indexhtml >= 10.0-6mdk
-Requires:      kdebase-common
-Requires:      pinentry-qt
+Provides:   kmail
+Provides:   kdenetwork-kmail = %epoch:%version-%release
+Requires:   indexhtml >= 10.0-6mdk
+Requires:   kdebase-common
+Requires:   pinentry-qt
 Obsoletes:  kdenetwork-kmail <= %epoch:3.1.3-37mdk
 Obsoletes:  %lib_name-kmail <= 1:3.5.3
 Obsoletes:  %lib_name-kmail-devel
 Conflicts:  kdenetwork <= 3.1.92
 Conflicts:  kdepim-devel < 1:3.5.7-9mdv
+Requires:   %lib_name-index >= %epoch:%version-%release

 %description -n kdepim-kmail
 KDE Mailer
@@ -694,6 +696,7 @@
 Group:      Graphical desktop/KDE
 Provides:   ktnef
 Conflicts:  kdepim <= 1:3.1-17mdk
+Requires:   %lib_name-ktnef >= %epoch:%version-%release

 %description ktnef
 Ktnef.
@@ -770,6 +773,7 @@
 Summary:       Kaddressbook program
 Group:         Graphical desktop/KDE
 Provides:      kaddressbook
+Requires:       %lib_name-kaddressbook >= %epoch:%version-%release

 %description kaddressbook
 The KDE addressbook application.
@@ -817,8 +821,8 @@
 %package -n %lib_name-kaddressbook
 Summary:    Library file for Kaddressbook
 Group:      Development/KDE and Qt
-Provides:      %lib_name_orig-kaddressbook = %epoch:%version-%release
-Obsoletes: %lib_name-kaddressbook-devel
+Provides:   %lib_name_orig-kaddressbook = %epoch:%version-%release
+Obsoletes:  %lib_name-kaddressbook-devel

 %description  -n %lib_name-kaddressbook
 Library file for kaddressbook
@@ -840,10 +844,11 @@
 %package korganizer
 Summary:       Korganizer program
 Group:         Graphical desktop/KDE
-Provides: korganizer
-Provides: kalarm
-Provides: kalarmd
-Requires: kdepim-common = %epoch:%version-%release
+Provides:       korganizer
+Provides:       kalarm
+Provides:       kalarmd
+Requires:       kdepim-common = %epoch:%version-%release
+Requires:       %lib_name-korganizer >= %epoch:%version-%release

 %description korganizer
 A calendar-of-events and todo-list manager.
@@ -917,13 +922,14 @@
 #----------------------------------------------------------------------

 %package kpilot
-Summary: Kpilot program
-Group: Graphical desktop/KDE
-Requires: %lib_name-kpilot = %epoch:%version-%release
-Provides: kpilot
-Provides: kpilotDaemon
+Summary:        Kpilot program
+Group:          Graphical desktop/KDE
+Requires:       %lib_name-kpilot >= %epoch:%version-%release
+Provides:       kpilot
+Provides:       kpilotDaemon
 Conflicts:     %name-common <= %epoch:3.4.2-6mdk

+
 %description kpilot
 To sync with your PalmPilot
 Sync phone book entries between your palmtop and computer
@@ -988,15 +994,16 @@
 #----------------------------------------------------------------------

 %package kontact
-Summary: Kontact program
-Group: Graphical desktop/KDE
-Provides: kontact
-Requires: kdepim-kmail = %epoch:%version-%release
-Requires: kdepim-knotes = %epoch:%version-%release
-Requires: kdepim-kaddressbook = %epoch:%version-%release
-Requires: kdepim-knode = %epoch:%version-%release
-Requires: kdepim-korganizer = %epoch:%version-%release
-Requires: kdepim-akregator = %epoch:%version-%release
+Summary:   Kontact program
+Group:     Graphical desktop/KDE
+Provides:  kontact
+Requires:  kdepim-kmail = %epoch:%version-%release
+Requires:  kdepim-knotes = %epoch:%version-%release
+Requires:  kdepim-kaddressbook = %epoch:%version-%release
+Requires:  kdepim-knode = %epoch:%version-%release
+Requires:  kdepim-korganizer = %epoch:%version-%release
+Requires:  kdepim-akregator = %epoch:%version-%release
+Requires:  %lib_name-kontact >= %epoch:%version-%release
 Conflicts: kdeaddons <= 3.2.3-15mdk
 Conflicts: kdepim-common <= 1:3.4.0-10mdk