From 9faecf288e56924495c320be1c90f88a067185b53b2c83d80ce4ac3cdc5b8030 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 22 Jun 2016 17:41:27 +0000 Subject: [PATCH] - Update to new git snapshot 4d1a6ad2f267e3b83f7c04122af8d8e7ee9a2113 [0.9.2~g490] OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=5 --- _service | 13 +++++++++++++ libvmime-0.9.1+git432.tar.xz | 3 --- libvmime-sotag.diff | 17 +++++++++-------- libvmime.changes | 9 +++++++++ libvmime.spec | 29 ++++++++++++++--------------- vmime-0.9.2~g490.tar.xz | 3 +++ 6 files changed, 48 insertions(+), 26 deletions(-) create mode 100644 _service delete mode 100644 libvmime-0.9.1+git432.tar.xz create mode 100644 vmime-0.9.2~g490.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..62b1b6f --- /dev/null +++ b/_service @@ -0,0 +1,13 @@ + + + git + git://github.com/kisli/vmime + bdbccdd64d139366210e4bd30e2fd1715edefa32 + 0.9.2~g@TAG_OFFSET@ + + + *.tar + xz + + + diff --git a/libvmime-0.9.1+git432.tar.xz b/libvmime-0.9.1+git432.tar.xz deleted file mode 100644 index 9916c78..0000000 --- a/libvmime-0.9.1+git432.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b7f9bb2f284ded48d272e9ca51745e5039903867e55209e454c9d8bc901c5b6 -size 393852 diff --git a/libvmime-sotag.diff b/libvmime-sotag.diff index 5315302..5793524 100644 --- a/libvmime-sotag.diff +++ b/libvmime-sotag.diff @@ -4,23 +4,24 @@ 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. Add some suffix -that is unique within our distro and distinguishes itself from -upstream. +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/CMakeLists.txt +Index: vmime-0.9.2~g490/CMakeLists.txt =================================================================== ---- vmime.orig/CMakeLists.txt -+++ vmime/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 2) ++SET(VMIME_API_VERSION_CURRENT 3) SET(VMIME_API_VERSION_REVISION 0) SET(VMIME_API_VERSION_AGE 0) @@ -29,7 +30,7 @@ Index: vmime/CMakeLists.txt # Set base name -SET(VMIME_LIBRARY_NAME vmime) -+SET(VMIME_LIBRARY_NAME vmime-0.9.2) ++SET(VMIME_LIBRARY_NAME vmime-suse) # Source files FILE( diff --git a/libvmime.changes b/libvmime.changes index 85b8f89..327eb69 100644 --- a/libvmime.changes +++ b/libvmime.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jun 22 17:05:17 UTC 2016 - jengelh@inai.de + +- Update to new git snapshot + 4d1a6ad2f267e3b83f7c04122af8d8e7ee9a2113 [0.9.2~g490] +* handle "x-uuencode" type +* Skip word on unexpected error when fixing broken words. +* XOAUTH2 auth mechanism support + ------------------------------------------------------------------- Wed May 13 07:33:44 UTC 2015 - jengelh@inai.de diff --git a/libvmime.spec b/libvmime.spec index 36f862f..c3c1fac 100644 --- a/libvmime.spec +++ b/libvmime.spec @@ -16,20 +16,19 @@ # +%define version_unconverted 0.9.2~g490 + Name: libvmime -%define lname libvmime-0_9_2-2 +%define lname libvmime-suse3 Summary: Library for working with MIME messages and IMAP/POP/SMTP License: GPL-3.0+ Group: Development/Libraries/C and C++ -Version: 0.9.2 +Version: 0.9.2~g490 Release: 0 Url: http://vmime.org/ -#Git-Clone: git://github.com/kisli/vmime -#Git-Web: https://github.com/kisli/vmime -#Snapshot: v0.9.1-432-g674c369 #Source: http://downloads.sf.net/vmime/%name-%version.tar.bz2 -Source: %name-0.9.1+git432.tar.xz +Source: vmime-%version.tar.xz Patch1: libvmime-nodatetime.diff Patch2: libvmime-sotag.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,7 +43,7 @@ BuildRequires: inkscape BuildRequires: libgnutls-devel BuildRequires: libgsasl-devel BuildRequires: libopenssl-devel -BuildRequires: pkgconfig +BuildRequires: pkg-config BuildRequires: postfix %if 0%{?suse_version} >= 1130 %define with_pdf 1 @@ -99,7 +98,7 @@ over the Internet. The library offers all the features to build a complete mail client. %prep -%setup -qn vmime +%setup -qn vmime-%version %patch -P 1 -P 2 -p1 %build @@ -111,7 +110,7 @@ popd cf="%optflags -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1" # sendmail's awesome location. -export PATH="$PATH:/usr/sbin"; +export PATH="$PATH:/usr/sbin" cmake . \ -DVMIME_BUILD_SAMPLES:BOOL=OFF \ -DVMIME_HAVE_SASL_SUPPORT:BOOL=ON \ @@ -123,20 +122,20 @@ cmake . \ %if 0%{?suse_version} >= 1310 -DCMAKE_CXX_FLAGS:STRING="$cf -std=gnu++11" \ %else - -DCMAKE_CXX_FLAGS:STRING="$cf" \ + -DCMAKE_CXX_FLAGS:STRING="$cf -std=gnu++0x" \ %endif -DCMAKE_C_FLAGS:STRING="$cf" make %{?_smp_mflags} VERBOSE=1 %install -b="%buildroot"; +b="%buildroot" %if 0%{?with_pdf} mkdir -p "$b/%_docdir/%name" cp -a doc/book/book.pdf "$b/%_docdir/%name/" %endif make install DESTDIR="$b" -ln -s libvmime-%version.so "$b/%_libdir/libvmime.so" -find "$b" -type f -name "*.la" -delete; +ln -s libvmime-suse.so "$b/%_libdir/libvmime.so" +find "$b" -type f -name "*.la" -delete %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -144,12 +143,12 @@ find "$b" -type f -name "*.la" -delete; %files -n %lname %defattr(-,root,root) %doc COPYING -%_libdir/%name-%version.so.2* +%_libdir/%name-suse.so.3* %files devel %defattr(-,root,root) %_includedir/vmime -%_libdir/libvmime-%version.so +%_libdir/libvmime-suse.so %_libdir/libvmime.so %_libdir/pkgconfig/*.pc %if 0%{?with_pdf} diff --git a/vmime-0.9.2~g490.tar.xz b/vmime-0.9.2~g490.tar.xz new file mode 100644 index 0000000..c4533af --- /dev/null +++ b/vmime-0.9.2~g490.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b65eefc5214938a01c9a4082060b3b8251a8e9a64b538cb996ac4a92edf5515 +size 391000