[mimetic] Fix build with gcc 4.7.

Ville Skyttä scop at fedoraproject.org
Wed Aug 1 06:03:44 UTC 2012


commit 1e0c881a9ffda6aab3c0e5a28272acf3092f2357
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Aug 1 09:03:27 2012 +0300

    Fix build with gcc 4.7.
    
    - Remove inaccurate license info from description.

 mimetic-0.9.7-gcc47.patch |   12 ++++++++++++
 mimetic.spec              |   12 +++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/mimetic-0.9.7-gcc47.patch b/mimetic-0.9.7-gcc47.patch
new file mode 100644
index 0000000..3765d03
--- /dev/null
+++ b/mimetic-0.9.7-gcc47.patch
@@ -0,0 +1,12 @@
+diff -up mimetic-0.9.7/mimetic/tokenizer.h~ mimetic-0.9.7/mimetic/tokenizer.h
+--- mimetic-0.9.7/mimetic/tokenizer.h~	2011-09-10 15:35:17.000000000 +0300
++++ mimetic-0.9.7/mimetic/tokenizer.h	2012-08-01 08:57:45.491276077 +0300
+@@ -147,7 +147,7 @@ struct ContTokenizer: public ItTokenizer
+     ContTokenizer(const Container* cont, const DelimCont& delims)
+     : ItTokenizer<const_iterator,value_type>(cont->begin(), cont->end())
+     {
+-        setDelimList(delims);
++        this->setDelimList(delims);
+     }
+     void setSource(const Container* cont)
+     {
diff --git a/mimetic.spec b/mimetic.spec
index f57e20f..96ea123 100644
--- a/mimetic.spec
+++ b/mimetic.spec
@@ -2,7 +2,7 @@
 
 Name:		mimetic
 Version:	0.9.7
-Release:	%release_func 1702
+Release:	%release_func 1703
 Summary:	A full featured MIME library written in C++
 
 Group:		System Environment/Libraries
@@ -11,6 +11,7 @@ URL:		http://www.codesink.org/mimetic_mime_library.html
 Source0:	http://www.codesink.org/download/%name-%version.tar.gz
 Patch0:		mimetic-0.9.2-noconfigh.patch
 Patch1:		undef-op.patch
+Patch2:		mimetic-0.9.7-gcc47.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 
 BuildRequires:	doxygen
@@ -23,14 +24,14 @@ Requires:	%name = %version-%release
 
 
 %description
-mimetic is a GPL MIME library written in C++ designed to be easy to use
+mimetic is a MIME library written in C++ designed to be easy to use
 and integrate but yet fast and efficient. mimetic doesn't use exceptions
 but it heavily uses templates so a mostly standard compliant C++ compiler
 is required.
 
 
 %description devel
-mimetic is a GPL MIME library written in C++ designed to be easy to use
+mimetic is a MIME library written in C++ designed to be easy to use
 and integrate but yet fast and efficient. mimetic doesn't use exceptions
 but it heavily uses templates so a mostly standard compliant C++ compiler
 is required.
@@ -43,6 +44,7 @@ will use %name.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -86,6 +88,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug  1 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.9.7-1703
+- Fix build with gcc 4.7.
+- Remove inaccurate license info from description.
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-1702
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list