rpms/basket/devel basket-1.0.2-gcc43.patch, NONE, 1.1 basket.spec, 1.16, 1.17

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/basket/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18217

Modified Files:
	basket.spec 
Added Files:
	basket-1.0.2-gcc43.patch 
Log Message:
* Wed Mar 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-5
- fix rawhide build (#433960)
- summary: s/for KDE//


basket-1.0.2-gcc43.patch:

--- NEW FILE basket-1.0.2-gcc43.patch ---
diff -up basket-1.0.2/src/backup.cpp.gcc43 basket-1.0.2/src/backup.cpp
--- basket-1.0.2/src/backup.cpp.gcc43	2007-04-12 06:39:18.000000000 -0500
+++ basket-1.0.2/src/backup.cpp	2008-04-02 11:43:01.000000000 -0500
@@ -44,6 +44,7 @@
 #include <kprogress.h>
 #include <kmessagebox.h>
 #include <unistd.h> // usleep()
+#include <cstdlib>
 
 /**
  * Backups are wrapped in a .tar.gz, inside that folder name.
diff -up basket-1.0.2/src/bnpview.cpp.gcc43 basket-1.0.2/src/bnpview.cpp
--- basket-1.0.2/src/bnpview.cpp.gcc43	2007-04-01 05:41:23.000000000 -0500
+++ basket-1.0.2/src/bnpview.cpp	2008-04-02 11:39:24.000000000 -0500
@@ -50,6 +50,7 @@
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <iostream>
+#include <cstdlib>
 #include "bnpview.h"
 #include "basket.h"
 #include "tools.h"


Index: basket.spec
===================================================================
RCS file: /cvs/pkgs/rpms/basket/devel/basket.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- basket.spec	18 Feb 2008 18:13:01 -0000	1.16
+++ basket.spec	2 Apr 2008 16:47:51 -0000	1.17
@@ -1,18 +1,19 @@
 Name:           basket
-Summary:        Notes taker for KDE
+Summary:        Notes taker
 Version:        1.0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 URL:            http://basket.kde.org/
 Source0:        http://basket.kde.org/downloads/basket-%{version}.tar.gz
 License:        GPLv2+
 # Make it appear in Kontact from enterprise branch
 Patch0:         basket-1.0.2-kdepimenterprise.patch
+Patch1:         basket-1.0.2-gcc43.patch
 
 Group:          Applications/Productivity
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  kdelibs-devel, desktop-file-utils, gamin-devel
-BuildRequires:  gpgme-devel, kdepim-devel
-Requires:       kdebase >= 3.0, hicolor-icon-theme
+
+BuildRequires:  kdelibs3-devel, desktop-file-utils, gamin-devel
+BuildRequires:  gpgme-devel, kdepim3-devel
 
 %description
 This application is mainly an all-purpose notes taker. It provides baskets
@@ -24,7 +25,7 @@
 Group:          Applications/Productivity
 Summary:        Basket plugin for Kontact
 Requires:       %{name} = %{version}-%{release}
-Requires:       kdepim
+Requires:       kdepim3
 
 %description kontact
 This package contains the kontact plugin for BasKet.
@@ -33,6 +34,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .kdepimenterprise
+%patch1 -p1 -b .gcc43
 
 
 %build
@@ -59,7 +61,7 @@
         --add-category KDE \
         $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/basket.desktop
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 %{find_lang} %{name}
 # HTML
@@ -113,6 +115,10 @@
 
 
 %changelog
+* Wed Mar 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-5
+- fix rawhide build (#433960)
+- summary: s/for KDE//
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0.2-4
 - Autorebuild for GCC 4.3