rpms/gmime/EL-4 gmime-2.2.1-use-pkg-config.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gmime.spec, 1.2, 1.3 sources, 1.2, 1.3

[Thorsten Leemhuis (thl)]

Author: thl

Update of /cvs/extras/rpms/gmime/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15799

Modified Files:
	.cvsignore gmime.spec sources 
Added Files:
	gmime-2.2.1-use-pkg-config.patch 
Log Message:
2.2.1-2 -- Sync with gmime-2_2_1-1 from core for EPEL

gmime-2.2.1-use-pkg-config.patch:

--- NEW FILE gmime-2.2.1-use-pkg-config.patch ---
--- gmime-2.2.1/gmime-config.in.use_pkg_config	2006-05-23 15:58:36.000000000 +0200
+++ gmime-2.2.1/gmime-config.in	2006-05-23 16:05:07.000000000 +0200
@@ -55,11 +55,11 @@
 	;;
 
     --cflags)
-       	echo @GMIME_INCLUDEDIR@ @GMIME_CFLAGS@ @glib_cflags@
+       	echo `pkg-config --cflags gmime-2.0`
        	;;
 
     --libs)
-       	echo -L at libdir@ @GMIME_LIBS@ @LIBS@ @glib_libs@
+       	echo `pkg-config --libs gmime-2.0`
        	;;
 
     *)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gmime/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:26:21 -0000	1.2
+++ .cvsignore	4 Dec 2006 17:33:33 -0000	1.3
@@ -1 +1 @@
-gmime-2.1.9.tar.gz
+gmime-2.2.1.tar.gz


Index: gmime.spec
===================================================================
RCS file: /cvs/extras/rpms/gmime/EL-4/gmime.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gmime.spec	10 Dec 2004 22:03:03 -0000	1.2
+++ gmime.spec	4 Dec 2006 17:33:33 -0000	1.3
@@ -1,47 +1,77 @@
 Name:           gmime
-Version:        2.1.9
-Release:        3
-Epoch:          0
-Summary:        GMime library -- creation and parsing of MIME-messages   
+Version:        2.2.1
+Release:        2%{?dist}
+Summary:        Library for creating and parsing MIME messages
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://spruce.sourceforge.net/gmime/
-Source0:        http://spruce.sourceforge.net/gmime/sources/v2.1/gmime-2.1.9.tar.gz
+Source0:        http://spruce.sourceforge.net/gmime/sources/v2.2/gmime-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	glib2-devel >= 0:2.0.0
-BuildRequires:	zlib-devel >= 0:1.2.1.1
+BuildRequires:  glib2-devel >= 2.0.0
+BuildRequires:  zlib-devel >= 1.2.1.1
+
+Patch1: gmime-2.2.1-use-pkg-config.patch
+
+# Mono disabled for epel
+%define mono_archs none
+# no mono on s390 for now: s390 s390x 
+
+%ifarch %mono_archs
+BuildRequires:  mono-devel gtk-sharp2-gapi
+BuildRequires:  gtk-sharp2 >= 2.4.0
+%endif
 
 %description
-The GMime suite provides a core library and set of utilities which may be 
-used for the creation and parsing of messages using the Multipurpose 
+The GMime suite provides a core library and set of utilities which may be
+used for the creation and parsing of messages using the Multipurpose
 Internet Mail Extension (MIME).
 
 
 %package        devel
 Summary:        Header files to develop libgmime applications
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
+Requires:       glib2-devel
 
 %description    devel
-The GMime suite provides a core library and set of utilities which may be 
-used for the creation and parsing of messages using the Multipurpose 
+The GMime suite provides a core library and set of utilities which may be
+used for the creation and parsing of messages using the Multipurpose
 Internet Mail Extension (MIME). The devel-package contains header files
 to develop applications that use libgmime.
 
+%ifarch %mono_archs
+%package        sharp
+Summary:        mono bindings for gmime
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       gtk-sharp2
+
+%description    sharp
+The GMime suite provides a core library and set of utilities which may be
+used for the creation and parsing of messages using the Multipurpose
+Internet Mail Extension (MIME). The devel-package contains support 
+for developing mono applications that use libgmime.
+%endif
 
 %prep
 %setup -q
+%patch1 -p1 -b .use-pkg-config
 
 
 %build
-%configure
+%ifarch %mono_archs
+export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
+MONO_ARGS="--enable-mono"
+%endif
+%configure $MONO_ARGS
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 # Don't conflict with sharutils:
@@ -70,11 +100,64 @@
 %{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_libdir}/gmimeConf.sh
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/gmime-2.0.pc
 %{_includedir}/gmime-2.0
-%{_datadir}/gtk-doc
+%{_datadir}/gtk-doc/html/gmime
+
+%ifarch %mono_archs
+%files sharp
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/gmime-sharp.pc
+%{_prefix}/lib/mono/gac/gmime-sharp
+%{_prefix}/lib/mono/gmime-sharp
+%{_datadir}/gapi-2.0/gmime-api.xml
+%endif
 
 %changelog
+* Mon Dec 04 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.2.1-2
+- Sync with gmime-2_2_1-1 from core for EPEL (later versions require a newer
+  glib2
+- disable mono for epel
+- use dist
+
+* Tue May 23 2006 Alexander Larsson <alexl at redhat.com> - 2.2.1-1
+- Update to 2.2.1
+- Fix multilib -devel conflict by using pkg-config in gmime-config (#192675)
+
+* Tue Feb 28 2006 Karsten Hopp <karsten at redhat.de> 2.1.19-4
+- BuildRequires: gtk-sharp2 on mono archs only
+
+* Sun Feb 12 2006 Christopher Aillon <caillon at redhat.com> - 2.1.19-3
+- Rebuild
+
+* Tue Feb  7 2006 Jesse Keating <jkeating at redhat.com> - 2.1.19-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Tue Jan 31 2006 Christopher Aillon <caillon at redhat.com> - 2.1.19-2
+- Rebuild
+
+* Sun Jan 22 2006 Alexander Larsson <alexl at redhat.com> - 2.1.19-1
+- Update to 2.1.19 (needed by beagle 0.2.0)
+
+* Thu Jan 19 2006 Alexander Larsson <alexl at redhat.com> 2.1.17-3
+- Build on s390x
+
+* Mon Jan  9 2006 Alexander Larsson <alexl at redhat.com> 2.1.17-2
+- build gmime-sharp conditionally on mono arches
+
+* Mon Jan  9 2006 Alexander Larsson <alexl at redhat.com> - 2.1.17-1
+- Move from Extras to Core, Update to 2.1.17, add gmime-sharp subpackage
+
+* Wed Aug 10 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.1.15-1
+- Update to 2.1.15
+- Use dist
+
+* Wed May 18 2005 Colin Charles <colin at fedoraproject.org> - 2.1.9-5
+- bump release, request build on ppc
+
+* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.1.9-4
+- add dep glib2-devel for pkgconfig in -devel package
+
 * Mon Oct 18 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.1.9-0.fdr.3
 - Remove ldconfig from Requires pre and post
 
@@ -84,6 +167,6 @@
 - Fixes to the files section
 - Change ldconfig in post* calls to -p /sbin/ldconfig
 
-
 * Sun Oct 17 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.1.9-0.fdr.1
 - Initial RPM release.
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gmime/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:26:21 -0000	1.2
+++ sources	4 Dec 2006 17:33:33 -0000	1.3
@@ -1 +1 @@
-8bd24a56d5f56be9150deb9840a0812a  gmime-2.1.9.tar.gz
+b05e4d6344c8465fb74386e5f1fed45c  gmime-2.2.1.tar.gz