From d20c5101f40601f1a4c47f27d49763de7a3a1feea9e3b517a4be5d148f1a72ee Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 4 Jan 2017 11:49:39 +0000
Subject: [PATCH] switch to 0.9.2 rerelease

OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=12
---
 dont-fixup.diff     | 20 --------------------
 libvmime-sotag.diff | 36 ------------------------------------
 libvmime.spec       | 10 +++-------
 v0.9.2.tar.gz       |  4 ++--
 4 files changed, 5 insertions(+), 65 deletions(-)
 delete mode 100644 dont-fixup.diff
 delete mode 100644 libvmime-sotag.diff

diff --git a/dont-fixup.diff b/dont-fixup.diff
deleted file mode 100644
index 11d2b2d..0000000
--- a/dont-fixup.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-References: https://github.com/kisli/vmime/issues/149
-
-libkcinetmapi does a much better fixup on its own.
----
- src/vmime/text.cpp |    2 --
- 1 file changed, 2 deletions(-)
-
-Index: vmime-0.9.2.g500/src/vmime/text.cpp
-===================================================================
---- vmime-0.9.2.g500.orig/src/vmime/text.cpp
-+++ vmime-0.9.2.g500/src/vmime/text.cpp
-@@ -401,8 +401,6 @@ text* text::decodeAndUnfold(const parsin
- 	out->removeAllWords();
- 
- 	std::vector <shared_ptr <word> > words = word::parseMultiple(ctx, in, 0, in.length(), NULL);
--	fixBrokenWords(words);
--
- 	copy_vector(words, out->m_words);
- 
- 	return (out);
diff --git a/libvmime-sotag.diff b/libvmime-sotag.diff
deleted file mode 100644
index 8e8b458..0000000
--- a/libvmime-sotag.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-From 24449ea8c7eca61c08b955c95ea7c5295a2a2bde Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Wed, 27 Mar 2013 17:50:08 +0100
-Subject: [PATCH] build:
-
-AFAICS, VMIME broke its API between 0.4.x and 0.8.x without updating
-soversions, hence no trust that it is correct now. v0.9.2 also
-carries the same number as 0.9.1 despite the API having changed.
-Make sure it has a unique SONAME. Do the same as we do for wxWidgets-3_0,
-and use an unambiguous "suse" suffix.
----
- CMakeLists.txt |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: vmime-0.9.2~g490/CMakeLists.txt
-===================================================================
---- vmime-0.9.2~g490.orig/CMakeLists.txt
-+++ vmime-0.9.2~g490/CMakeLists.txt
-@@ -52,7 +52,7 @@ SET(VMIME_VERSION_MICRO  2)
- # . Interfaces added/removed/changed:               CURRENT++, REVISION=0
- # . Interfaces added (upward-compatible changes):   AGE++
- # . Interfaces removed:                             AGE=0
--SET(VMIME_API_VERSION_CURRENT   0)
-+SET(VMIME_API_VERSION_CURRENT   3)
- SET(VMIME_API_VERSION_REVISION  0)
- SET(VMIME_API_VERSION_AGE       0)
- 
-@@ -65,7 +65,7 @@ SET(VMIME_API_VERSION ${VMIME_API_VERSIO
- # VMime Library
- 
- # Set base name
--SET(VMIME_LIBRARY_NAME vmime)
-+SET(VMIME_LIBRARY_NAME vmime-suse)
- 
- # Source files
- FILE(
diff --git a/libvmime.spec b/libvmime.spec
index 22bc636..52e3a10 100644
--- a/libvmime.spec
+++ b/libvmime.spec
@@ -17,7 +17,7 @@
 
 
 Name:           libvmime
-%define lname	libvmime-suse3
+%define lname	libvmime1
 Summary:        Library for working with RFC 2822, MIME messages and IMAP/POP/SMTP
 License:        GPL-3.0+
 Group:          Development/Libraries/C and C++
@@ -27,8 +27,6 @@ Url:            http://vmime.org/
 
 Source:         https://github.com/kisli/vmime/archive/v%version.tar.gz
 Patch1:         libvmime-nodatetime.diff
-Patch2:         libvmime-sotag.diff
-Patch3:         dont-fixup.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  ImageMagick
 %if 0%{?suse_version} < 1310
@@ -98,7 +96,7 @@ complete mail client.
 
 %prep
 %setup -qn vmime-%version
-%patch -P 1 -P 2 -P 3 -p1
+%patch -P 1 -p1
 
 %build
 %if 0%{?with_pdf}
@@ -134,7 +132,6 @@ mkdir -p "$b/%_docdir/%name"
 cp -a doc/book/book.pdf "$b/%_docdir/%name/"
 %endif
 make install DESTDIR="$b"
-ln -s libvmime-suse.so "$b/%_libdir/libvmime.so"
 find "$b" -type f -name "*.la" -delete
 
 %post   -n %lname -p /sbin/ldconfig
@@ -143,12 +140,11 @@ find "$b" -type f -name "*.la" -delete
 %files -n %lname
 %defattr(-,root,root)
 %doc COPYING
-%_libdir/%name-suse.so.3*
+%_libdir/%name.so.1*
 
 %files devel
 %defattr(-,root,root)
 %_includedir/vmime
-%_libdir/libvmime-suse.so
 %_libdir/libvmime.so
 %_libdir/pkgconfig/*.pc
 %if 0%{?with_pdf}
diff --git a/v0.9.2.tar.gz b/v0.9.2.tar.gz
index 674bc62..b8148b9 100644
--- a/v0.9.2.tar.gz
+++ b/v0.9.2.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34a7416ebabbaeb68ac8233ce978c703f784ea33a4df6cfc7725c8786b1acace
-size 528660
+oid sha256:9874bf911a7dbc257297ab00f7541875da221ee8251a4218cc65abff6e362399
+size 528830