rpms/pinot/devel boost-spirit-134.patch, NONE, 1.1 pinot.spec, 1.2, 1.3

Adel Gadllah (drago01) fedora-extras-commits at redhat.com
Wed Aug 15 07:49:00 UTC 2007


Author: drago01

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

Modified Files:
	pinot.spec 
Added Files:
	boost-spirit-134.patch 
Log Message:
Fix bugs with new boost

boost-spirit-134.patch:

--- NEW FILE boost-spirit-134.patch ---
--- Search/SherlockParser.cpp	2007-08-14 15:28:20.000000000 +0800
+++ Search/SherlockParser.cpp	2007-08-14 15:28:13.000000000 +0800
@@ -535,7 +535,8 @@
 					userInput, nextInput, nextFactor, nextValue);
 
 				parse_info<> parseInfo = boost::spirit::parse(pData, plugin, skip);
-				fullParsing = parseInfo.full;
+				//fullParsing = parseInfo.full;
+				fullParsing = parseInfo.hit;
 			}
 			else
 			{
@@ -543,7 +544,8 @@
 				plugin_min_grammar plugin(searchParams);
 
 				parse_info<> parseInfo = boost::spirit::parse(pData, plugin, skip);
-				fullParsing = parseInfo.full;
+				//fullParsing = parseInfo.full;
+				fullParsing = parseInfo.hit;
 			}
 		}
 		catch (const exception &e)


Index: pinot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pinot.spec	14 Aug 2007 07:47:53 -0000	1.2
+++ pinot.spec	15 Aug 2007 07:48:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:  pinot
 Version: 0.75        
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Personal search and metasearch for the Desktop      
 
 Group: User Interface/Desktops        
@@ -9,6 +9,7 @@
 Source0: http://download2.berlios.de/pinot/%{name}-%{version}.tar.gz  
 Patch0: libtextcatfix.patch
 Patch1: remove_shebang.patch
+Patch2: boost-spirit-134.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sqlite-devel >= 3.3.1
@@ -17,7 +18,7 @@
 BuildRequires: taglib-devel >= 1.4
 BuildRequires: curl-devel >= 7.13
 BuildRequires: gmime-devel >= 2.1
-BuildRequires: boost-devel >= 1.34
+BuildRequires: boost-devel >= 1.33
 BuildRequires: gtkmm24-devel
 BuildRequires: libxml++-devel
 BuildRequires: dbus-glib-devel
@@ -52,6 +53,7 @@
 %setup -q
 %patch0 -p1 -b .libtextcat
 %patch1 -p1 -b .remove_shebang
+%patch2 -p0 -b .boost_spirit
 
 
 %build
@@ -129,6 +131,10 @@
 %{_libdir}/deskbar-applet/handlers/pinot-*
 
 %changelog
+* Wed Aug 15 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.75-8
+- Add upstream patch to fix bugs with new boost
+- Revert last change
+
 * Tue Aug 14 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.75-7
 - Bump required boost version
 




More information about the fedora-extras-commits mailing list