rpms/strigi/F-12 strigi-0.7.2-kdebug234398.patch, NONE, 1.1 strigi.spec, 1.46, 1.47

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/strigi/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21625

Modified Files:
	strigi.spec 
Added Files:
	strigi-0.7.2-kdebug234398.patch 
Log Message:
* Wed Jun 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7.3-4
- strigi flac analyser crashes with floating point (arithmetic) exception (kdebug234398)


strigi-0.7.2-kdebug234398.patch:
 flacendanalyzer.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE strigi-0.7.2-kdebug234398.patch ---
diff -up strigi-0.7.2/src/streamanalyzer/endanalyzers/flacendanalyzer.cpp.kde234398 strigi-0.7.2/src/streamanalyzer/endanalyzers/flacendanalyzer.cpp
--- strigi-0.7.2/src/streamanalyzer/endanalyzers/flacendanalyzer.cpp.kde234398	2010-02-03 13:03:07.000000000 -0600
+++ strigi-0.7.2/src/streamanalyzer/endanalyzers/flacendanalyzer.cpp	2010-06-30 08:39:35.124448418 -0500
@@ -284,7 +284,7 @@ FlacEndAnalyzer::analyze(Strigi::Analysi
     } while( !(blocktype & 0x80) );
 
     int64_t in_size = in->size();
-    if(in_size>=0)
+    if(in_size>=0 && duration>0)
       indexable.addValue(factory->bitRateField,(uint32_t)(8*((in_size-in->position())/duration)));
 
     return 0;


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-12/strigi.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- strigi.spec	12 Feb 2010 14:59:35 -0000	1.46
+++ strigi.spec	30 Jun 2010 13:56:14 -0000	1.47
@@ -1,7 +1,7 @@
 
 Name:		strigi
 Version:	0.7.2
-Release:	2%{?dist}
+Release:	4%{?dist}
 Summary:	A desktop search program
 Group:		Applications/Productivity
 License:	LGPLv2+
@@ -13,6 +13,10 @@ Source2:	strigi-daemon.desktop
 Patch0:		strigi-0.6.2-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+# http://bugs.kde.org/234398
+Patch100: strigi-0.7.2-kdebug234398.patch
+
 BuildRequires:	cmake >= 2.4.5
 BuildRequires:	clucene-core-devel qt4-devel dbus-devel
 BuildRequires:	libxml2-devel expat-devel bzip2-devel zlib-devel
@@ -54,6 +58,7 @@ Strigi search engine libraries
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 %patch0 -p1 -b .multilib
+%patch100 -p1 -b .kdebug234398
 
 %build
 mkdir -p %{_target_platform}
@@ -115,6 +120,12 @@ rm -rf %{buildroot}
 %{_libdir}/strigi/strigi*.so
 
 %changelog
+* Wed Jun 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7.3-4
+- strigi flac analyser crashes with floating point (arithmetic) exception (kdebug234398)
+
+* Mon May 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7.2-3
+- rebuild (exiv2)
+
 * Fri Feb 12 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.7.2-2
 - %%build: +%%_cmake_skip_rpath