rpms/pinot/devel pinot-0.90-gcc44.patch, NONE, 1.1 pinot-0.90-gmime24.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 pinot.spec, 1.39, 1.40 sources, 1.13, 1.14 pinot-0.89-gmime24.patch, 1.1, NONE

[Adel Gadllah]

Author: drago01

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

Modified Files:
	.cvsignore pinot.spec sources 
Added Files:
	pinot-0.90-gcc44.patch pinot-0.90-gmime24.patch 
Removed Files:
	pinot-0.89-gmime24.patch 
Log Message:
0.90, fix build with gcc-4.4

pinot-0.90-gcc44.patch:

--- NEW FILE pinot-0.90-gcc44.patch ---
diff -upNr pinot-0.90.orign/Tokenize/filters/HtmlFilter.cc pinot-0.90/Tokenize/filters/HtmlFilter.cc
--- pinot-0.90.orign/Tokenize/filters/HtmlFilter.cc	2008-12-07 06:52:05.000000000 +0100
+++ pinot-0.90/Tokenize/filters/HtmlFilter.cc	2009-03-01 11:11:16.000000000 +0100
@@ -143,7 +143,9 @@ static string findCharset(const char *pC
 	}
 
 	// Is a charset specified ?
-	char *pCharset = strstr(pContent, "charset=");
+	char *tmp;
+	strcpy(tmp, pContent);
+	char *pCharset = strstr(tmp, "charset=");
 	if (pCharset != NULL)
 	{
 		char *pEndOfCharset = strpbrk(pCharset, "\t\r\n \"");
diff -upNr pinot-0.90.orign/Utils/DocumentInfo.h pinot-0.90/Utils/DocumentInfo.h
--- pinot-0.90.orign/Utils/DocumentInfo.h	2008-10-26 13:00:43.000000000 +0100
+++ pinot-0.90/Utils/DocumentInfo.h	2009-03-01 11:04:57.000000000 +0100
@@ -21,6 +21,7 @@
 
 #include <sys/types.h>
 #include <string>
+#include <cstring>
 #include <map>
 #include <set>
 

pinot-0.90-gmime24.patch:

--- NEW FILE pinot-0.90-gmime24.patch ---
diff -upNr pinot-0.90.orign/configure.in pinot-0.90/configure.in
--- pinot-0.90.orign/configure.in	2009-01-24 11:40:17.000000000 +0100
+++ pinot-0.90/configure.in	2009-03-01 10:58:42.000000000 +0100
@@ -388,7 +388,7 @@ HTTP_CFLAGS="$NEON_CFLAGS $CURL_CFLAGS $
 HTTP_LIBS="$NEON_LIBS $CURL_LIBS $SSL_LIBS"
 AC_SUBST(HTTP_CFLAGS)
 AC_SUBST(HTTP_LIBS)
-PKG_CHECK_MODULES(GMIME, gmime-2.0 >= 2.0 )
+PKG_CHECK_MODULES(GMIME, gmime-2.4 >= 2.4 )
 AC_SUBST(GMIME_CFLAGS)
 AC_SUBST(GMIME_LIBS)
 PKG_CHECK_MODULES(XML, libxml++-2.6 >= 2.12 )


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	21 Sep 2008 10:26:59 -0000	1.13
+++ .cvsignore	1 Mar 2009 10:25:13 -0000	1.14
@@ -1 +1 @@
-pinot-0.89.tar.gz
+pinot-0.90.tar.gz


Index: pinot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- pinot.spec	27 Feb 2009 00:34:01 -0000	1.39
+++ pinot.spec	1 Mar 2009 10:25:13 -0000	1.40
@@ -1,6 +1,6 @@
 Name:  pinot
-Version: 0.89
-Release: 5%{?dist}
+Version: 0.90
+Release: 1%{?dist}
 Summary: Personal search and metasearch for the Desktop      
 
 Group: User Interface/Desktops        
@@ -8,7 +8,8 @@
 URL: http://pinot.berlios.de/            
 Source0: http://download2.berlios.de/pinot/%{name}-%{version}.tar.gz  
 Patch0: fix_lang_detect.patch
-Patch1: pinot-0.89-gmime24.patch
+Patch1: pinot-0.90-gmime24.patch
+Patch2:	pinot-0.90-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sqlite-devel >= 3.3.1
@@ -56,6 +57,7 @@
 %setup -q 
 %patch0 -p1 -b .lang_detect
 %patch1 -p1 -b .gmime24
+%patch2 -p1 -b .gcc44
 
 %build
 autoreconf --force --install
@@ -72,6 +74,11 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/pinot.desktop
 
+desktop-file-install       \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applications/pinot-prefs.desktop
+
 %find_lang %{name}
 
 %clean
@@ -96,11 +103,13 @@
 %{_bindir}/pinot-index
 %{_bindir}/pinot-search
 %{_bindir}/pinot-label
+%{_bindir}/pinot-prefs
 %{_datadir}/pinot/
 %{_libdir}/pinot/
 %{_datadir}/dbus-1/services/de.berlios.Pinot.service
 %{_sysconfdir}/xdg/autostart/*.desktop
 %{_datadir}/applications/fedora-pinot.desktop
+%{_datadir}/applications/pinot-prefs.desktop
 %{_mandir}/man1/pinot.*
 %{_mandir}/man1/pinot-dbus-daemon.*
 %{_mandir}/man1/pinot-index.*
@@ -121,6 +130,10 @@
 
 
 %changelog
+* Sun Mar 01 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.90-1
+- Update to 0.90
+- Fix build against gcc-4.4
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.89-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	21 Sep 2008 10:26:59 -0000	1.13
+++ sources	1 Mar 2009 10:25:13 -0000	1.14
@@ -1 +1 @@
-eaec47484a82b0a003191e8c64271d03  pinot-0.89.tar.gz
+5c106f781e82ecf18fb9d8b0cae65c71  pinot-0.90.tar.gz


--- pinot-0.89-gmime24.patch DELETED ---