rpms/basket/devel basket.spec,1.25,1.26

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/basket/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30012/devel

Modified Files:
	basket.spec 
Log Message:
* Thu Dec 04 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.3.1-4
- fix F-8,9 -> F-10+ upgrade path
- Cannot configure basket, kcm_basket.la missing (#474425)
- drop needless Requires: hicolor-icon-theme



Index: basket.spec
===================================================================
RCS file: /cvs/pkgs/rpms/basket/devel/basket.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- basket.spec	13 Nov 2008 05:25:14 -0000	1.25
+++ basket.spec	4 Dec 2008 15:09:10 -0000	1.26
@@ -4,7 +4,7 @@
 
 Name:          basket
 Version:       1.0.3.1
-Release:       2%{?dist}
+Release:       4%{?dist}
 Summary:       Taking care of your ideas
 
 Group:         Applications/Productivity
@@ -17,11 +17,9 @@
 
 BuildRequires: kdelibs3-devel gpgme-devel gettext desktop-file-utils
 %if 0%{?with_kontact}
-BuildRequires: kdepim-devel
+BuildRequires: kdepim3-devel
 %endif 
 
-Requires:      hicolor-icon-theme
-
 %description
 A multi-purpose note-taking application that makes it easy to write down ideas
 as you think, and quickly find them later.  You can collect, import or share
@@ -33,7 +31,7 @@
 Group:          Applications/Productivity
 Summary:        Basket plugin for Kontact
 Requires:       %{name} = %{version}-%{release}
-Requires:       kdepim3 kontact
+Requires:       kdepim3
 
 %description kontact
 This package contains the kontact plugin for BasKet.
@@ -71,8 +69,8 @@
         $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
 # Removing a random sym link created during the build process
+# This will be needed again when/if basket ever provides HTML docs -- Rex
 rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/basket/common
 
 %{find_lang} %{name}
@@ -128,6 +126,14 @@
 update-desktop-database &> /dev/null || :
 
 %changelog
+* Thu Dec 04 2008 Rex Dieter <rdieter at fedoraproject.org> 1.0.3.1-4
+- fix ->F-10+ upgrade path
+- Cannot configure basket, kcm_basket.la missing (#474425)
+- drop needless Requires: hicolor-icon-theme
+
+* Sat Nov 15 2008 Christopher D. Stover <quantumburnz at hotmail.com> 1.0.3.1-3
+- resolved kontact broken dependency
+
 * Mon Nov 10 2008 Christopher D. Stover <quantumburnz at hotmail.com> 1.0.3.1-2
 - added a requires for hicolor-icon-theme
 - removed -p from the main package /sbin/ldconfig