rpms/mimetic/devel mimetic-0.8.9-gcc41.patch, NONE, 1.1 mimetic-0.8.9-noconfigh.patch, NONE, 1.1 mimetic.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Sun Dec 25 22:09:51 UTC 2005

Author: ensc

Update of /cvs/extras/rpms/mimetic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2979/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mimetic-0.8.9-gcc41.patch mimetic-0.8.9-noconfigh.patch 
	mimetic.spec 
Log Message:
auto-import mimetic-0.8.9-3 on branch devel from mimetic-0.8.9-3.src.rpm

mimetic-0.8.9-gcc41.patch:

--- NEW FILE mimetic-0.8.9-gcc41.patch ---
--- 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<typename Iterator>
-Iterator find_bm(Iterator bit, Iterator eit, const std::string& word)
-{
-    return find_bm(bit, eit, word, 
-        typename std::iterator_traits<Iterator>::iterator_category());
-}
-
 // find_bm specialization for random access iterators
 template<typename Iterator>
 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<typename Iterator>
+Iterator find_bm(Iterator bit, Iterator eit, const std::string& word)
+{
+    return find_bm(bit, eit, word, 
+        typename std::iterator_traits<Iterator>::iterator_category());
+}
+
 
 
 } // ns utils

mimetic-0.8.9-noconfigh.patch:

--- NEW FILE mimetic-0.8.9-noconfigh.patch ---
Oct 24 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
	* os/file.h, message.h: assume that HAVE_MMAP and HAVE_UNISTD_H are
	  '1'; this avoids problems when we are clearing <mimetic/config.h>
	  (which conflicts with autoconf/automake) later. Because this
	  patch is for a Fedora package, it is safe to assume that these
	  macros are set

--- mimetic-0.8.9/mimetic/os/file.h.noconfigh	2005-02-23 11:26:15.000000000 +0100
+++ mimetic-0.8.9/mimetic/os/file.h	2005-10-24 17:43:59.000000000 +0200
@@ -23,14 +23,14 @@
 #include <iterator>
 #include <mimetic/libconfig.h>
 #include <mimetic/os/stdfile.h>
-#ifdef HAVE_MMAP
+#if 1
 #include <mimetic/os/mmfile.h>
 #endif
 
 namespace mimetic
 {
 
-#if HAVE_MMAP == 1
+#if 1 == 1
 typedef MMFile File;
 #else
 typedef StdFile File;
--- mimetic-0.8.9/mimetic/message.h.noconfigh	2005-03-07 16:35:08.000000000 +0100
+++ mimetic-0.8.9/mimetic/message.h	2005-10-24 17:43:48.000000000 +0200
@@ -21,7 +21,7 @@
 #include <mimetic/mimeentity.h>
 #include <mimetic/utils.h>
 #include <mimetic/codec/codec.h>
-#ifdef HAVE_UNISTD_H
+#if 1
 #include <unistd.h>
 #endif
 


--- NEW FILE mimetic.spec ---
## $Id: mimetic.spec 1791 2005-10-24 15:54:46Z ensc at BIGO.ENSC.DE $

%{!?release_func:%global release_func() %1%{?dist}}

Name:		mimetic
Version:	0.8.9
Release:	%release_func 3
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.8.9-noconfigh.patch
Patch1:		mimetic-0.8.9-gcc41.patch
BuildRoot:	%_tmppath/%name-%version-%release-root-%(%__id_u -n)

BuildRequires:	doxygen


%package devel
Summary:	Files for development of applications which will use %name
Group:		Development/Libraries
Requires:	%name = %version-%release


%description
mimetic is a GPL 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
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.

This package contains files for the development of applications which
will use %name.


%prep
%setup -q
%patch0 -p1 -b .noconfigh
%patch1 -p1 -b .gcc41


%build
%configure --disable-static
%__make %{?_smp_mflags}
%__make docs -C doc


%install
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


%check
%__make check


%clean
rm -rf $RPM_BUILD_ROOT


%post   -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%_libdir/*.so.*


%files devel
%defattr(-,root,root,-)
%doc doc/html
%_libdir/*.so
%_includedir/%name


%changelog
* Sun Dec 25 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8.9-3
- fixed compilation with gcc41
- first Fedora Extras release (review #171624)

* Mon Oct 24 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8.9-2
- workaround problems with <mimetic/config.h> which conflicts with
  local files from autoconf/automake

* Mon Oct 24 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8.9-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mimetic/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Dec 2005 22:06:04 -0000	1.1
+++ .cvsignore	25 Dec 2005 22:09:50 -0000	1.2
@@ -0,0 +1 @@
+mimetic-0.8.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mimetic/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Dec 2005 22:06:04 -0000	1.1
+++ sources	25 Dec 2005 22:09:50 -0000	1.2
@@ -0,0 +1 @@
+fa3cb93e37684c71ac5afad02870302b  mimetic-0.8.9.tar.gz


