diff --git a/mimetic-0.8.9-gcc41.patch b/mimetic-0.8.9-gcc41.patch deleted file mode 100644 index 69dd309..0000000 --- a/mimetic-0.8.9-gcc41.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- mimetic-0.8.9/mimetic/utils.h.gcc41 2005-03-07 16:35:08.000000000 +0100 -+++ mimetic-0.8.9/mimetic/utils.h 2005-12-25 22:56:59.000000000 +0100 -@@ -56,13 +56,6 @@ - * returns an Iterator pointing at the first character of the found pattern - * or \p eit if the search fails - */ --template --Iterator find_bm(Iterator bit, Iterator eit, const std::string& word) --{ -- return find_bm(bit, eit, word, -- typename std::iterator_traits::iterator_category()); --} -- - // find_bm specialization for random access iterators - template - Iterator find_bm(Iterator bit, Iterator eit, const std::string& word, const std::random_access_iterator_tag&) -@@ -94,6 +87,13 @@ - return bit + i + 1; - } - -+template -+Iterator find_bm(Iterator bit, Iterator eit, const std::string& word) -+{ -+ return find_bm(bit, eit, word, -+ typename std::iterator_traits::iterator_category()); -+} -+ - - - } // ns utils diff --git a/mimetic-0.9.0-noconfigh.patch b/mimetic-0.9.0-noconfigh.patch deleted file mode 100644 index 40cd6d2..0000000 --- a/mimetic-0.9.0-noconfigh.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- mimetic-0.9.0/mimetic/os/file.h.noconfigh 2005-02-23 11:26:15.000000000 +0100 -+++ mimetic-0.9.0/mimetic/os/file.h 2006-03-12 17:56:02.000000000 +0100 -@@ -23,14 +23,14 @@ - #include - #include - #include --#ifdef HAVE_MMAP -+#if 1 - #include - #endif - - namespace mimetic - { - --#if HAVE_MMAP == 1 -+#if 1 == 1 - typedef MMFile File; - #else - typedef StdFile File; ---- mimetic-0.9.0/mimetic/os/directory.h.noconfigh 2005-03-25 12:05:44.000000000 +0100 -+++ mimetic-0.9.0/mimetic/os/directory.h 2006-03-12 17:56:23.000000000 +0100 -@@ -3,7 +3,7 @@ - #include - #include - #include --#ifdef HAVE_DIRENT_H -+#if 1 - #include - #endif - #include ---- mimetic-0.9.0/mimetic/rfc822/messageid.h.noconfigh 2005-03-25 12:20:31.000000000 +0100 -+++ mimetic-0.9.0/mimetic/rfc822/messageid.h 2006-03-12 17:56:02.000000000 +0100 -@@ -18,10 +18,10 @@ - #include - #include - #include --#if HAVE_STDINT_H -+#if 1 - #include - #endif --#ifdef HAVE_INTTYPES_H -+#if 1 - #include - #endif - #include ---- mimetic-0.9.0/mimetic/message.h.noconfigh 2005-03-07 16:35:08.000000000 +0100 -+++ mimetic-0.9.0/mimetic/message.h 2006-03-12 17:56:02.000000000 +0100 -@@ -21,7 +21,7 @@ - #include - #include - #include --#ifdef HAVE_UNISTD_H -+#if 1 - #include - #endif - diff --git a/mimetic-0.9.1-noconfigh.patch b/mimetic-0.9.1-noconfigh.patch new file mode 100644 index 0000000..f5e5a3a --- /dev/null +++ b/mimetic-0.9.1-noconfigh.patch @@ -0,0 +1,76 @@ +--- mimetic-0.9.1/mimetic/os/file.h.noconfigh 2005-02-23 11:26:15.000000000 +0100 ++++ mimetic-0.9.1/mimetic/os/file.h 2006-04-16 11:37:40.000000000 +0200 +@@ -23,14 +23,14 @@ + #include + #include + #include +-#ifdef HAVE_MMAP ++#if 1 + #include + #endif + + namespace mimetic + { + +-#if HAVE_MMAP == 1 ++#if 1 == 1 + typedef MMFile File; + #else + typedef StdFile File; +--- mimetic-0.9.1/mimetic/os/directory.h.noconfigh 2006-04-11 11:35:05.000000000 +0200 ++++ mimetic-0.9.1/mimetic/os/directory.h 2006-04-16 11:40:26.000000000 +0200 +@@ -3,7 +3,7 @@ + #include + #include + #include +-#ifdef HAVE_DIRENT_H ++#if 1 + #include + #endif + #include +@@ -82,7 +82,7 @@ + m_eoi == right.m_eoi && + m_dirp->m_path == right.m_dirp->m_path && + m_dirent && right.m_dirent && +- #ifdef _DIRENT_HAVE_D_TYPE ++ #if 1 + m_dirent->d_type == right.m_dirent->d_type && + #endif + std::string(m_dirent->d_name) == right.m_dirent->d_name; +@@ -96,7 +96,7 @@ + { + m_de.name = dent->d_name; + m_de.type = DirEntry::Unknown; +- #ifdef _DIRENT_HAVE_D_TYPE ++ #if 1 + switch(dent->d_type) + { + case DT_DIR: +--- mimetic-0.9.1/mimetic/rfc822/messageid.h.noconfigh 2006-04-11 12:04:58.000000000 +0200 ++++ mimetic-0.9.1/mimetic/rfc822/messageid.h 2006-04-16 11:38:39.000000000 +0200 +@@ -15,12 +15,12 @@ + ***************************************************************************/ + #ifndef _MIMETIC_MESSAGEID_H_ + #define _MIMETIC_MESSAGEID_H_ +-#ifdef HAVE_STDINT_H ++#if 1 + #include + #endif + #include + #include +-#ifdef HAVE_INTTYPES_H ++#if 1 + #include + #endif + #include +--- mimetic-0.9.1/mimetic/message.h.noconfigh 2005-03-07 16:35:08.000000000 +0100 ++++ mimetic-0.9.1/mimetic/message.h 2006-04-16 11:37:40.000000000 +0200 +@@ -21,7 +21,7 @@ + #include + #include + #include +-#ifdef HAVE_UNISTD_H ++#if 1 + #include + #endif + diff --git a/mimetic.spec b/mimetic.spec index 2c80c38..89c96a5 100644 --- a/mimetic.spec +++ b/mimetic.spec @@ -3,16 +3,15 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: mimetic -Version: 0.9.0 -Release: %release_func 2 +Version: 0.9.1 +Release: %release_func 1 Summary: A full featured MIME library written in C++ Group: System Environment/Libraries License: GPL URL: http://codesink.org/mimetic_mime_library.html Source0: http://codesink.org/download/%name-%version.tar.gz -Patch0: mimetic-0.9.0-noconfigh.patch -Patch1: mimetic-0.8.9-gcc41.patch +Patch0: mimetic-0.9.1-noconfigh.patch BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) BuildRequires: doxygen @@ -44,7 +43,6 @@ will use %name. %prep %setup -q %patch0 -p1 -b .noconfigh -%patch1 -p1 -b .gcc41 %build @@ -58,7 +56,6 @@ rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%_libdir/*.la - echo "\ // cleared by the Fedora Extras package; content causes conflicts // with autoconf/automake 'config.h' files else" > $RPM_BUILD_ROOT%_includedir/%name/config.h @@ -90,6 +87,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Apr 16 2006 Enrico Scholz - 0.9.1-1 +- updated to 0.9.1 +- rediffed -noconfigh patch and cover new #ifdef's +- removed -gcc41 patch + * Sun Mar 12 2006 Enrico Scholz - 0.9.0-2 - fixed a missing case in the noconfigh patch diff --git a/sources b/sources index e301830..01ce719 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -1c81a12a7acf28367ea6a10218924f8c mimetic-0.9.0.tar.gz +4a36d2a7873927758f39b195751ea064 mimetic-0.9.1.tar.gz +