SPECS: kdepim.spec - Added Obsoletes for indexlib (removed BR) - i...

[adgor]

Author: adgor                        Date: Wed Nov 30 10:12:19 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Added Obsoletes for indexlib (removed BR)
- indexlib-config moved to -devel
- Removed TODO (outdated - desktop files already checked)

---- Files affected:
SPECS:
   kdepim.spec (1.202 -> 1.203) 

---- Diffs:

================================================================
Index: SPECS/kdepim.spec
diff -u SPECS/kdepim.spec:1.202 SPECS/kdepim.spec:1.203
--- SPECS/kdepim.spec:1.202	Tue Nov 29 23:09:46 2005
+++ SPECS/kdepim.spec	Wed Nov 30 11:12:14 2005
@@ -1,16 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-# - system indexlib-devel is not used, bundled one instead is compiled and installed
-#   also bundled one is newer than system
-# - check files
-#   /usr/share/applnk/Applications/kalarm.desktop
-#   /usr/share/applnk/Utilities/kandy.desktop
-#   /usr/share/applnk/Utilities/karm.desktop
-#   /usr/share/applnk/Utilities/kmailcvt.desktop
-#   /usr/share/icons/locolor/16x16/apps/kpilot.png
-#   /usr/share/icons/locolor/16x16/apps/ktnef.png
-#   /usr/share/icons/locolor/32x32/apps/ktnef.png
-
 # Conditional build:
 %bcond_without	apidocs		# do not prepare API documentation
 #
@@ -50,7 +38,6 @@
 BuildRequires:	gpgme-devel >= 1:1.0.0
 BuildRequires:	gnupg-agent
 %{?with_apidocs:BuildRequires:	graphviz}
-BuildRequires:	indexlib-devel
 BuildRequires:	kdelibs-devel >= %{_minlibsevr}
 BuildRequires:	libgnokii-devel
 BuildRequires:	libmal-devel >= 0.31
@@ -103,6 +90,7 @@
 Requires:	kdelibs-devel >= %{_minlibsevr}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Conflicts:	kdenetwork-devel < 10:3.1.90
+Obsoletes:	indexlib-devel
 Obsoletes:	kdepim-libkcal-devel
 
 %description devel
@@ -452,6 +440,7 @@
 Summary(pl):	Współdzielone biblioteki kdepim
 Group:		X11/Libraries
 Requires:	kdelibs >= %{_minlibsevr}
+Obsoletes:	indexlib
 Obsoletes:	kdenetwork
 Obsoletes:	kdepim-commonlibs
 Obsoletes:	kdepim-kaddressbook-libs
@@ -634,7 +623,6 @@
 %attr(755,root,root) %{_bindir}/*groupwarewizard
 %attr(755,root,root) %{_bindir}/groupwisewizard
 %attr(755,root,root) %{_bindir}/ical2vcal
-%attr(755,root,root) %{_bindir}/indexlib-config
 %attr(755,root,root) %{_bindir}/kode
 %attr(755,root,root) %{_bindir}/kolabwizard
 %attr(755,root,root) %{_bindir}/kontact
@@ -897,6 +885,7 @@
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/indexlib-config
 %{_includedir}/KNotesIface.h
 %{_includedir}/KNotesAppIface.h
 %{_includedir}/kdepimmacros.h
@@ -1387,6 +1376,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.203  2005/11/30 10:12:14  adgor
+- Added Obsoletes for indexlib (removed BR)
+- indexlib-config moved to -devel
+- Removed TODO (outdated - desktop files already checked)
+
 Revision 1.202  2005/11/29 22:09:46  adgor
 - One more ...
 
================================================================

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