Accepting request 449725 from server:mail

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/449725
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvmime?expand=0&rev=17

_service

@@ -1,13 +0,0 @@
-<services>
-	<service name="tar_scm" mode="localonly">
-		<param name="scm">git</param>
-		<param name="url">git://github.com/kisli/vmime</param>
-		<param name="parent-tag">bdbccdd64d139366210e4bd30e2fd1715edefa32</param>
-		<param name="versionformat">0.9.2~g@TAG_OFFSET@</param>
-	</service>
-	<service name="recompress" mode="localonly">
-		<param name="file">*.tar</param>
-		<param name="compression">xz</param>
-	</service>
-	<service name="set_version" mode="localonly"/>
-</services>

dont-fixup.diff

@@ -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);

libvmime-sotag.diff

@@ -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. This changed again
-after 0.9.1; since we are also packaging up a git snapshot currently,
-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(

libvmime.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jan  3 11:51:36 UTC 2017 - jengelh@inai.de
+
+- Update to final release 0.9.2
+* Always ignore newlines between words.
+- Drop dont-fixup.diff (issue fixed upstream),
+  drop libvmime-sotag.diff (no longer needed).
+
 -------------------------------------------------------------------
 Sun Oct 30 18:36:29 UTC 2016 - jengelh@inai.de
 

libvmime.spec

@@ -16,22 +16,17 @@
 #
 
 
-%define version_unconverted 0.9.2~g500
-
 Name:           libvmime
-%define lname	libvmime-suse3
+%define lname	libvmime1
-Summary:        Library for working with MIME messages and IMAP/POP/SMTP
+Summary:        Library for working with RFC 2822, MIME messages and IMAP/POP/SMTP
 License:        GPL-3.0+
 Group:          Development/Libraries/C and C++
-Version:        0.9.2~g500
+Version:        0.9.2
 Release:        0
 Url:            http://vmime.org/
 
-#Source:	http://downloads.sf.net/vmime/%name-%version.tar.bz2
+Source:         https://github.com/kisli/vmime/archive/v%version.tar.gz
-Source:         vmime-%version.tar.xz
 Patch1:         libvmime-nodatetime.diff
-Patch2:         libvmime-sotag.diff
-Patch3:         dont-fixup.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  ImageMagick
 %if 0%{?suse_version} < 1310
@@ -101,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}
@@ -137,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
@@ -146,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}