- Update to new git snapshot v0.9.2-50-ga9b8221

OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=23

_service

@@ -0,0 +1,14 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/kisli/vmime</param>
+		<param name="revision">a9b822140bf8926620fd21b880893d4c214dd8c0</param>
+		<param name="parent-tag">v0.9.2</param>
+		<param name="versionformat">0.9.2.@TAG_OFFSET@</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>

libvmime.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jun 25 12:21:09 UTC 2018 - jengelh@inai.de
+
+- Update to new git snapshot v0.9.2-50-ga9b8221
+  * Dropped support for boost::shared_ptr<>, enabled exclusive
+    C++11 use of std::shared_ptr.
+  * Handle parsing of (RFC-nonconforming) address lines containing
+    bare at signs, like "a@b.c <e@f.g>" or
+    "=?UTF-8?Q?a=c2=a0recipient_=28foo@bar.com=29?= <e@f.g>".
+  * Add SMTPS with AUTH PLAIN without SASL.
+
 -------------------------------------------------------------------
 Mon Apr 23 07:58:00 UTC 2018 - jengelh@inai.de
 

libvmime.spec

@@ -21,13 +21,13 @@ Name:           libvmime
 Summary:        Library for working with RFC 2822, MIME messages and IMAP/POP/SMTP
 License:        GPL-3.0-or-later
 Group:          Development/Libraries/C and C++
-Version:        0.9.2
+Version:        0.9.2.50
 Release:        0
 Url:            http://vmime.org/
 
-Source:         https://github.com/kisli/vmime/archive/v%version.tar.gz
+#Source:         https://github.com/kisli/vmime/archive/v%%version.tar.gz
+Source:         vmime-%version.tar.xz
 Patch1:         libvmime-nodatetime.diff
-Patch2:         no-override-cflags.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  ImageMagick
 %if 0%{?suse_version} < 1310
@@ -94,7 +94,7 @@ This subpackage contains the headers for the library's API.
 
 %prep
 %setup -qn vmime-%version
-%patch -P 1 -P 2 -p1
+%patch -P 1 -p1
 
 %build
 %if 0%{?with_pdf}
@@ -104,7 +104,7 @@ popd
 %endif
 
 cf="%optflags -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1"
-cmake . \
+%cmake \
 	-DVMIME_SENDMAIL_PATH:STRING="%_sbindir/sendmail" \
 	-DVMIME_BUILD_SAMPLES:BOOL=OFF \
 %if 0%{?sle_version}
@@ -113,12 +113,7 @@ cmake . \
 	-DVMIME_HAVE_TLS_SUPPORT:BOOL=ON \
 	-DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \
 	-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
-	-DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \
+	-DCMAKE_CXX_FLAGS:STRING="$cf" \
-%if 0%{?suse_version} >= 1310
-	-DCMAKE_CXX_FLAGS:STRING="$cf -std=gnu++11" \
-%else
-	-DCMAKE_CXX_FLAGS:STRING="$cf -std=gnu++0x" \
-%endif
 	-DCMAKE_C_FLAGS:STRING="$cf"
 make %{?_smp_mflags} VERBOSE=1
 
@@ -128,8 +123,15 @@ b="%buildroot"
 mkdir -p "$b/%_docdir/%name"
 cp -a doc/book/book.pdf "$b/%_docdir/%name/"
 %endif
-make install DESTDIR="$b"
+%cmake_install
+
+# https://github.com/kisli/vmime/issues/200
+mv "$b/usr/%_libdir" "$b/usr/"
+mv "$b/usr/cmake" "$b/%_datadir/"
+
 find "$b" -type f -name "*.la" -delete
+# Bump number a bit, for Kopano Core
+perl -i -pe 's{Version:.*}{Version: %version}' "$b/%_libdir/pkgconfig/vmime.pc"
 
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
@@ -144,6 +146,7 @@ find "$b" -type f -name "*.la" -delete
 %_includedir/vmime
 %_libdir/libvmime.so
 %_libdir/pkgconfig/*.pc
+%_datadir/cmake/
 %if 0%{?with_pdf}
 %_docdir/%name
 %endif

no-override-cflags.diff

@@ -1,28 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2018-04-23 09:57:31.270364598 +0200
-References: https://github.com/kisli/vmime/issues/196
-
-Do not tack on any -O/-g flags at the end of the command line,
-as that negates any that we got from %optflags.
-
----
- CMakeLists.txt |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: vmime-0.9.2/CMakeLists.txt
-===================================================================
---- vmime-0.9.2.orig/CMakeLists.txt
-+++ vmime-0.9.2/CMakeLists.txt
-@@ -1050,9 +1050,9 @@ ELSE()
- 			"${CMAKE_CXX_FLAGS} -D_REENTRANT=1 -W -Wall -pedantic -Wpointer-arith -Wold-style-cast -Wconversion -Wcast-align -Wno-long-long"
- 		)
- 
--		SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
--		SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
--		SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
-+		SET(CMAKE_CXX_FLAGS_RELEASE "")
-+		SET(CMAKE_CXX_FLAGS_DEBUG "")
-+		SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "")
- 
- 		#SET(CMAKE_EXE_LINKER_FLAGS "-s")
-