Hello community,
here is the log from the commit of package gmime for openSUSE:Factory checked
in at 2012-01-17 11:32:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gmime (Old)
and /work/SRC/openSUSE:Factory/.gmime.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gmime", Maintainer is "sbra...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gmime/gmime.changes 2012-01-06
11:44:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gmime.new/gmime.changes 2012-01-17
16:05:48.000000000 +0100
@@ -1,0 +2,39 @@
+Thu Jan 12 16:44:26 UTC 2012 - vu...@opensuse.org
+
+- The binaries shipped in the tools subpackage are GPL-2.0+, so fix
+ the license of this subpackage. Fix bnc#741054.
+
+-------------------------------------------------------------------
+Wed Jan 11 11:53:16 UTC 2012 - dims...@opensuse.org
+
+- Update to version 2.6.4:
+ + GMime 2.6.x is ABI/API incompatible to GMime 2.4.x.
+ + Most notable is the lack of GMimeSession which has been
+ dropped in favor of a much simpler callback mechanism.
+ GMimeCipherContexts constructors now take a password_request
+ callback function rather than forcing you to subclass
+ GMimeSession to get this functionality.
+ + Several other API changes, see documentation.
+ + See ChangeLog for full details since 2.4.x.
+- Add xz BuildRequires because we can't build a package for a
+ xz-compressed tarball without explicitly specifying that... See
+ bnc#697467 for more details.
+- Add gpgme-devel BuildRequires: new upstream dependency.
+- Add gmime-compiler-warnings.patch: Fix compiler warnings and brp
+ checks about function reach end of statement without return
+ value.
+- Add gmime-mono-arch-indep.patch: Revert commit bce1443e321a2: we
+ do not install mono libraries to %{_libdir}, but %{_prefix}/lib/
+- Add libtool BuildRequires and call to autoreconf, as the above
+ patch touches the build system.
+- Rename libgmime-2_4-2 subpackage to libgmime-2_6-0, following the
+ upstream soname bump.
+- Remove gmime-2_4-devel and gmime-2_4-doc Provides/Obsoletes from
+ devel subpackage: with 2.6, all files are now different in this
+ package.
+- Remove gmime-2_4-sharp Provides from sharp subpackage: since 2.6
+ has a different API, a Provides is wrong. We keep the Obsoletes,
+ though, as there are some common files and the gmime-2_4-sharp
+ packages should get removed anyway.
+
+-------------------------------------------------------------------
Old:
----
gmime-2.4.28.tar.bz2
New:
----
gmime-2.6.4.tar.xz
gmime-compiler-warnings.patch
gmime-mono-arch-indep.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gmime.spec ++++++
--- /var/tmp/diff_new_pack.eQcY78/_old 2012-01-17 16:05:49.000000000 +0100
+++ /var/tmp/diff_new_pack.eQcY78/_new 2012-01-17 16:05:49.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gmime
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,23 +15,29 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
-
Name: gmime
-Version: 2.4.28
-Release: 1
+Version: 2.6.4
+Release: 0
Url: http://spruce.sourceforge.net/gmime/
-Group: Productivity/Networking/Email/Utilities
-License: LGPLv2.1+ ; Public Domain, Freeware ; MIT License (or similar)
Summary: MIME Parser and Utility Library
-Source:
http://download.gnome.org/sources/gmime/2.4/%{name}-%{version}.tar.bz2
+License: LGPL-2.1+ ; SUSE-Public-Domain ; MIT
+Group: Productivity/Networking/Email/Utilities
+Source:
http://download.gnome.org/sources/gmime/2.6/%{name}-%{version}.tar.xz
+# PATCH-FIX-OPENSUSE gmime-mono-arch-indep.patch bgo#667072
dims...@opensuse.org -- Do not install mono libs to libdir
+Patch0: gmime-mono-arch-indep.patch
+# PATCH-FIX-UPSTREAM gmime-compiler-warnings.patch bgo#667684
dims...@opensuse.org -- Fix compiler warnings, taken from upstream git, commit
3d1a969
+Patch1: gmime-compiler-warnings.patch
+BuildRequires: gpgme-devel
BuildRequires: gtk-doc
+# Needed for patch0
+BuildRequires: libtool
BuildRequires: mono-devel
+# Only needed because we don't (and won't) support building xz tarballs by
default... See bnc#697467
+BuildRequires: xz
BuildRequires: zlib-devel
+BuildRequires: pkgconfig(gapi-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(glib-sharp-2.0)
-BuildRequires: pkgconfig(gapi-2.0)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -39,9 +45,9 @@
the Multipurpose Internet Mail Extension (MIME).
%package tools
-License: LGPLv2.1+ ; Public Domain, Freeware ; MIT License (or similar)
-Group: Productivity/Networking/Email/Utilities
Summary: MIME Parser and Utility Library -- Tools
+License: GPL-2.0+
+Group: Productivity/Networking/Email/Utilities
Provides: gmime-2_4 = %{version}
Obsoletes: gmime-2_4 < %{version}
@@ -49,21 +55,23 @@
GMime is a C/C++ library for parsing and creating messages using
the Multipurpose Internet Mail Extension (MIME).
-%package -n libgmime-2_4-2
-License: LGPLv2.1+ ; Public Domain, Freeware ; MIT License (or similar)
-Group: System/Libraries
+%package -n libgmime-2_6-0
Summary: MIME Parser and Utility Library
+License: LGPL-2.1+ ; SUSE-Public-Domain ; MIT
+Group: System/Libraries
-%description -n libgmime-2_4-2
+%description -n libgmime-2_6-0
GMime is a C/C++ library for parsing and creating messages using
the Multipurpose Internet Mail Extension (MIME).
%package sharp
-License: LGPLv2.1+ ; Public Domain, Freeware ; MIT License (or similar)
-Group: Development/Libraries/Other
Summary: MIME Parser and Utility Library -- Mono Bindings
-Requires: libgmime-2_4-2 = %{version} glib-sharp2
-Provides: gmime-2_4-sharp = %{version}
+License: LGPL-2.1+ ; SUSE-Public-Domain ; MIT
+Group: Development/Libraries/Other
+Requires: libgmime-2_6-0 = %{version} glib-sharp2
+# Obsoletes without Provides: gmime-2_4-sharp was an old name
+# during 2.4.x days, and even though API is different, we need to
+# get rid of it since some files are common.
Obsoletes: gmime-2_4-sharp < %{version}
%description sharp
@@ -71,14 +79,10 @@
the Multipurpose Internet Mail Extension (MIME).
%package devel
-License: LGPLv2.1+ ; Public Domain, Freeware ; MIT License (or similar)
-Group: Development/Libraries/C and C++
Summary: MIME Parser and Utility Library -- Development Files
-Requires: libgmime-2_4-2 = %{version}
-Provides: gmime-2_4-devel = %{version}
-Obsoletes: gmime-2_4-devel < %{version}
-Provides: gmime-2_4-doc = %{version}
-Obsoletes: gmime-2_4-doc < %{version}
+License: LGPL-2.1+ ; SUSE-Public-Domain ; MIT
+Group: Development/Libraries/C and C++
+Requires: libgmime-2_6-0 = %{version}
%description devel
GMime is a C/C++ library for parsing and creating messages using
@@ -88,6 +92,8 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
%ifarch %arm
@@ -95,6 +101,8 @@
# with >= -O2. See https://bugs.launchpad.net/gcc/+bug/836588.
CFLAGS="%{optflags} -O1"
%endif
+# Needed for patch0
+autoreconf -fiv
%configure\
--enable-largefile\
--disable-static\
@@ -102,53 +110,50 @@
make %{?jobs:-j%jobs}
%install
-%makeinstall GACUTIL_FLAGS="/package gtk-sharp /root -bootstrap
$RPM_BUILD_ROOT%{_prefix}/lib"
-# rename to prevent conflict with uu* utils from sharutils
-mv $RPM_BUILD_ROOT%{_bindir}/uuencode $RPM_BUILD_ROOT%{_bindir}/gmime-uuencode
-mv $RPM_BUILD_ROOT%{_bindir}/uudecode $RPM_BUILD_ROOT%{_bindir}/gmime-uudecode
+%makeinstall
+find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print
for FILE in COPYING ; do
MD5SUM=$(md5sum $FILE | sed 's/ .*//')
if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then
ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE
fi
done
-rm $RPM_BUILD_ROOT%{_libdir}/*.*a
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-%post -n libgmime-2_4-2 -p /sbin/ldconfig
+%post -n libgmime-2_6-0 -p /sbin/ldconfig
-%postun -n libgmime-2_4-2 -p /sbin/ldconfig
+%postun -n libgmime-2_6-0 -p /sbin/ldconfig
%files tools
%defattr (-, root, root)
# NEWS is empty
-%doc AUTHORS COPYING ChangeLog PORTING README TODO
+# COPYING is LGPL while the binaries are GPL
+%doc AUTHORS ChangeLog README TODO
%{_bindir}/*uu*
-%files -n libgmime-2_4-2
+%files -n libgmime-2_6-0
%defattr (-, root, root)
# NEWS is empty
-%doc AUTHORS COPYING ChangeLog PORTING README TODO
+%doc AUTHORS COPYING ChangeLog README TODO
%{_libdir}/*.so.*
%files sharp
%defattr (-, root, root)
-%dir %{_prefix}/lib/mono/gmime-sharp-2.4
+%dir %{_prefix}/lib/mono/gmime-sharp-2.6
%dir %{_prefix}/lib/mono/gac/gmime-sharp
-%dir %{_prefix}/lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4
-%{_prefix}/lib/mono/gmime-sharp-2.4/gmime-sharp.dll
-%{_prefix}/lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4/gmime-sharp.dll
-%{_prefix}/lib/mono/gac/gmime-sharp/2.4.0.0__2b75c2ad004c52e4/gmime-sharp.dll.config
+%dir %{_prefix}/lib/mono/gac/gmime-sharp/2.6.0.0__2b75c2ad004c52e4
+%{_prefix}/lib/mono/gmime-sharp-2.6/gmime-sharp.dll
+%{_prefix}/lib/mono/gac/gmime-sharp/2.6.0.0__2b75c2ad004c52e4/gmime-sharp.dll
+%{_prefix}/lib/mono/gac/gmime-sharp/2.6.0.0__2b75c2ad004c52e4/gmime-sharp.dll.config
+%{_datadir}/gapi-2.0/gmime-api.xml
# devel file:
-%{_libdir}/pkgconfig/gmime-sharp-2.4.pc
+%{_libdir}/pkgconfig/gmime-sharp-2.6.pc
%files devel
%defattr (-, root, root)
-%{_includedir}/gmime-2.4
+%doc PORTING
+%{_includedir}/gmime-2.6
%{_libdir}/*.so
-%{_libdir}/pkgconfig/gmime-2.4.pc
-%doc %{_datadir}/gtk-doc/html/gmime-2.4/
+%{_libdir}/pkgconfig/gmime-2.6.pc
+%doc %{_datadir}/gtk-doc/html/gmime-2.6/
%changelog
++++++ gmime-compiler-warnings.patch ++++++
>From 3d1a9694454b4abb7061c9faacca42f98c6a0080 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <f...@gnome.org>
Date: Wed, 11 Jan 2012 13:15:24 +0000
Subject: Fixed compiler warnings
2012-01-11 Jeffrey Stedfast <f...@gnome.org>
* gmime/gmime-pkcs7-context.c: Fixed some switch statements to
include a 'default' code path, fixing some compiler
warnings. Fixes bug #667684.
---
diff --git a/gmime/gmime-pkcs7-context.c b/gmime/gmime-pkcs7-context.c
index 7f8774a..be3c1e6 100644
--- a/gmime/gmime-pkcs7-context.c
+++ b/gmime/gmime-pkcs7-context.c
@@ -313,6 +313,8 @@ pkcs7_stream_seek (void *stream, off_t offset, int whence)
return (off_t) g_mime_stream_seek ((GMimeStream *) stream,
(gint64) offset, GMIME_STREAM_SEEK_CUR);
case SEEK_END:
return (off_t) g_mime_stream_seek ((GMimeStream *) stream,
(gint64) offset, GMIME_STREAM_SEEK_END);
+ default:
+ return -1;
}
}
@@ -489,6 +491,7 @@ pkcs7_trust (gpgme_validity_t trust)
{
switch (trust) {
case GPGME_VALIDITY_UNKNOWN:
+ default:
return GMIME_CERTIFICATE_TRUST_NONE;
case GPGME_VALIDITY_UNDEFINED:
return GMIME_CERTIFICATE_TRUST_UNDEFINED;
--
cgit v0.9.0.2
++++++ gmime-mono-arch-indep.patch ++++++
>From a2fb1c7b384c0ec27821c8a2e4574a9e1f0721da Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <f...@gnome.org>
Date: Wed, 11 Jan 2012 13:53:49 +0000
Subject: Copy gtk-sharp build process over to gmime-sharp
2012-01-11 Jeffrey Stedfast <f...@gnome.org>
* mono/Makefile.am: Fixed up to more closely match the gtk-sharp
build.
* mono/gmime-sharp.pc.in: Fixed to more closely match gtk-sharp.
---
diff --git a/mono/Makefile.am b/mono/Makefile.am
index 6225b4c..49d7021 100644
--- a/mono/Makefile.am
+++ b/mono/Makefile.am
@@ -1,4 +1,5 @@
API = gmime-api.xml
+SNK = gmime-sharp.snk
RAW_API = gmime-api.raw
METADATA = GMime.metadata
ASSEMBLY_NAME = gmime-sharp
@@ -6,14 +7,18 @@ references = $(GLIB_SHARP_LIBS)
SOURCES_XML = sources.xml
PACKAGE_SHARP = $(PACKAGE)-sharp-$(GMIME_API_VERSION)
-TARGET = $(ASSEMBLY)
ASSEMBLY = $(ASSEMBLY_NAME).dll
+TARGET = $(ASSEMBLY) $(ASSEMBLY).config
+TARGET_API = $(API)
noinst_DATA = $(API) $(ASSEMBLY) $(ASSEMBLY).config
CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API)
DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs
gmime-sharp-$(GMIME_API_VERSION).pc
+GACUTIL_FLAGS = -package $(PACKAGE_SHARP) -gacdir $(DESTDIR)$(prefix)/lib
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(PACKAGE_SHARP).pc
+gapidir = $(datadir)/gapi-2.0
+gapi_DATA = $(TARGET_API)
sources = \
StreamWrapper.cs \
@@ -54,8 +59,8 @@ build_customs = \
EXTRA_DIST = \
$(ASSEMBLY).config.in \
- $(ASSEMBLY_NAME).snk \
AssemblyInfo.cs.in \
+ $(SNK) \
$(METADATA) \
$(RAW_API) \
$(customs) \
@@ -76,31 +81,28 @@ generated-stamp: $(API) $(build_customs)
$(GAPI_CODEGEN) --generate $(API) --outdir=generated
--customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
&& touch generated-stamp
+if PLATFORM_WIN32
+GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=$(SNK) $(ASSEMBLY)
+else
+GAPI_CDECL_INSERT=
+endif
+
$(ASSEMBLY): $(build_sources) generated-stamp $(srcdir)/$(ASSEMBLY_NAME).snk
$(CSC) -unsafe /out:$(ASSEMBLY) /target:library $(references) \
-keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk $(build_sources) generated/*.cs
- sn -q -R $(ASSEMBLY) $(srcdir)/$(ASSEMBLY_NAME).snk
+ $(GAPI_CDECL_INSERT)
+ sn -q -R $(ASSEMBLY) $(srcdir)/$(SNK)
-install-data-hook:
- @if test -n '$(TARGET)'; then
\
- if test -n '$(DESTDIR)'; then
\
- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root
$(DESTDIR)$(libdir)"; \
- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root
$(DESTDIR)$(libdir) || exit 1; \
- else
\
- echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP)
/gacdir $(libdir)"; \
- $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir
$(libdir) || exit 1; \
- fi;
\
+install-data-local:
+ @if test -n '$(TARGET)'; then
\
+ echo "$(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS)";
\
+ $(GACUTIL) -i $(ASSEMBLY) -f $(GACUTIL_FLAGS) || exit 1;
\
fi
uninstall-local:
- @if test -n '$(TARGET)'; then
\
- if test -n '$(DESTDIR)'; then
\
- echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP)
/root $(DESTDIR)$(libdir)"; \
- $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root
$(DESTDIR)$(libdir) || exit 1; \
- else
\
- echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP)
/gacdir $(libdir)"; \
- $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir
$(libdir) || exit 1; \
- fi;
\
+ @if test -n '$(TARGET)'; then
\
+ echo "$(GACUTIL) -u $(ASSEMBLY) $(GACUTIL_FLAGS)";
\
+ $(GACUTIL) -u $(ASSEMBLY) $(GACUTIL_FLAGS) || exit 1;
\
fi
parse:
diff --git a/mono/gmime-sharp.pc.in b/mono/gmime-sharp.pc.in
index 353a00d..ca9fc1c 100644
--- a/mono/gmime-sharp.pc.in
+++ b/mono/gmime-sharp.pc.in
@@ -1,7 +1,11 @@
-exec_prefix=@prefix@
-libdir=@libdir@
+prefix=${pcfiledir}/../..
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+gapidir=${prefix}/share/gapi-2.0
Name: gmime-sharp
Version: @VERSION@
Description: .NET bindings for GMime
+Cflags: -I:${gapidir}/gmime-api.xml
Libs: -r:${libdir}/mono/gmime-sharp-@GMIME_API_VERSION@/gmime-sharp.dll
+Requires: glib-sharp-2.0
--
cgit v0.9.0.2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
