rpms/gmime/devel gmime-2.2.1-use-pkg-config.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gmime.spec, 1.11, 1.12 sources, 1.4, 1.5

[fedora-cvs-commits at redhat.com]

Author: alexl

Update of /cvs/dist/rpms/gmime/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5130

Modified Files:
	.cvsignore gmime.spec sources 
Added Files:
	gmime-2.2.1-use-pkg-config.patch 
Log Message:
* 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)



gmime-2.2.1-use-pkg-config.patch:
 gmime-config.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- 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/dist/rpms/gmime/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jan 2006 14:29:30 -0000	1.4
+++ .cvsignore	23 May 2006 15:58:47 -0000	1.5
@@ -1 +1 @@
-gmime-2.1.19.tar.gz
+gmime-2.2.1.tar.gz


Index: gmime.spec
===================================================================
RCS file: /cvs/dist/rpms/gmime/devel/gmime.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gmime.spec	28 Feb 2006 13:14:12 -0000	1.11
+++ gmime.spec	23 May 2006 15:58:47 -0000	1.12
@@ -1,17 +1,20 @@
 Name:           gmime
-Version:        2.1.19
-Release:        4
+Version:        2.2.1
+Release:        1
 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-%{version}.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 >= 2.0.0
 BuildRequires:  zlib-devel >= 1.2.1.1
 
+Patch1: gmime-2.2.1-use-pkg-config.patch
+
+
 # Mono only availible on these:
 %define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x
 
@@ -54,6 +57,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .use-pkg-config
 
 
 %build
@@ -110,6 +114,10 @@
 %endif
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gmime/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jan 2006 14:29:30 -0000	1.4
+++ sources	23 May 2006 15:58:47 -0000	1.5
@@ -1 +1 @@
-81475ea1a2074a3c402e31651ea357df  gmime-2.1.19.tar.gz
+b05e4d6344c8465fb74386e5f1fed45c  gmime-2.2.1.tar.gz