packages: gmime/gmime-link.patch, gmime/gmime.spec - updated to 2.6 (note: ...

[qboosh]

Author: qboosh                       Date: Wed Nov  9 18:01:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.6 (note: new soname)
- updated link patch

---- Files affected:
packages/gmime:
   gmime-link.patch (1.5 -> 1.6) , gmime.spec (1.93 -> 1.94) 

---- Diffs:

================================================================
Index: packages/gmime/gmime-link.patch
diff -u packages/gmime/gmime-link.patch:1.5 packages/gmime/gmime-link.patch:1.6
--- packages/gmime/gmime-link.patch:1.5	Thu Apr  9 15:22:18 2009
+++ packages/gmime/gmime-link.patch	Wed Nov  9 19:01:09 2011
@@ -1,6 +1,5 @@
-diff -urN gmime-2.4.6/configure.in gmime-2.4.6.new/configure.in
---- gmime-2.4.6/configure.in	2009-04-09 14:38:18.000000000 +0200
-+++ gmime-2.4.6.new/configure.in	2009-04-09 15:12:53.710788863 +0200
+--- gmime-2.6.1.orig/configure.ac	2009-04-09 14:38:18.000000000 +0200
++++ gmime-2.6.1/configure.ac	2009-04-09 15:12:53.710788863 +0200
 @@ -387,13 +387,13 @@
  dnl *** Checks for libsocket ***
  dnl ****************************

================================================================
Index: packages/gmime/gmime.spec
diff -u packages/gmime/gmime.spec:1.93 packages/gmime/gmime.spec:1.94
--- packages/gmime/gmime.spec:1.93	Wed Aug 10 20:55:52 2011
+++ packages/gmime/gmime.spec	Wed Nov  9 19:01:09 2011
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	dotnet	# without .net support
+%bcond_without	dotnet	# without .NET support
 #
 %ifarch i386
 %undefine	with_dotnet
@@ -10,18 +10,19 @@
 Summary:	GMIME library
 Summary(pl.UTF-8):	Biblioteka GMIME
 Name:		gmime
-Version:	2.4.26
+Version:	2.6.1
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gmime/2.4/%{name}-%{version}.tar.xz
-# Source0-md5:	b02cbe21cd4ad82eb961f821f93dde58
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gmime/2.6/%{name}-%{version}.tar.xz
+# Source0-md5:	2dd685cb00531c79b96690b85fb19f73
 Patch0:		%{name}-link.patch
 URL:		http://spruce.sourceforge.net/gmime/
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.54
+BuildRequires:	automake >= 1:1.9
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.12.1
+BuildRequires:	glib2-devel >= 1:2.18.0
+BuildRequires:	gpgme-devel >= 1:1.1.6
 BuildRequires:	gtk-doc >= 1.8
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
@@ -32,6 +33,8 @@
 BuildRequires:	dotnet-gtk-sharp2-devel >= 2.9.0
 BuildRequires:	mono-csharp >= 1.1.16.1
 %endif
+Requires:	glib2 >= 1:2.18.0
+Requires:	gpgme >= 1:1.1.6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -45,7 +48,8 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe do tworzenia programów z użyciem libgmime
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.12.1
+Requires:	glib2-devel >= 1:2.18.0
+Requires:	gpgme-devel >= 1:1.1.6
 Requires:	zlib-devel
 
 %description devel
@@ -110,7 +114,7 @@
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -128,7 +132,10 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	HTML_DIR=%{_gtkdocdir}
 
-rm -f $RPM_BUILD_ROOT%{_bindir}/uu{de,en}code
+# packaged in sharutils
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/uu{de,en}code
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgmime-2.6.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -139,24 +146,23 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_libdir}/libgmime-2.4.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgmime-2.4.so.2
+%attr(755,root,root) %{_libdir}/libgmime-2.6.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgmime-2.6.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %doc PORTING
-%attr(755,root,root) %{_libdir}/libgmime-2.4.so
-%{_libdir}/libgmime-2.4.la
-%{_pkgconfigdir}/gmime-2.4.pc
-%{_includedir}/gmime-2.4
+%attr(755,root,root) %{_libdir}/libgmime-2.6.so
+%{_pkgconfigdir}/gmime-2.6.pc
+%{_includedir}/gmime-2.6
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libgmime-2.4.a
+%{_libdir}/libgmime-2.6.a
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/gmime-2.4
+%{_gtkdocdir}/gmime-2.6
 
 %if %{with dotnet}
 %files -n dotnet-gmime-sharp
@@ -165,8 +171,8 @@
 
 %files -n dotnet-gmime-sharp-devel
 %defattr(644,root,root,755)
-%{_prefix}/lib/mono/gmime-sharp-2.4
-%{_pkgconfigdir}/gmime-sharp-2.4.pc
+%{_prefix}/lib/mono/gmime-sharp-2.6
+%{_pkgconfigdir}/gmime-sharp-2.6.pc
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -175,6 +181,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2011/11/09 18:01:09  qboosh
+- updated to 2.6 (note: new soname)
+- updated link patch
+
 Revision 1.93  2011/08/10 18:55:52  qboosh
 - updated to 2.4.26
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gmime/gmime-link.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gmime/gmime.spec?r1=1.93&r2=1.94&f=u