From 82c51f18872bf9b233e9518d875d6fc4a6bd71924027b90faae898d867524fe2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 3 Jan 2017 11:56:10 +0000 Subject: [PATCH 1/3] - Update to final release 0.9.2 * Always ignore newlines between words. OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=11 --- _service | 13 ------------- libvmime-sotag.diff | 6 +++--- libvmime.changes | 6 ++++++ libvmime.spec | 9 +++------ v0.9.2.tar.gz | 3 +++ vmime-0.9.2~g500.tar.xz | 3 --- 6 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 _service create mode 100644 v0.9.2.tar.gz delete mode 100644 vmime-0.9.2~g500.tar.xz diff --git a/_service b/_service deleted file mode 100644 index 62b1b6f..0000000 --- a/_service +++ /dev/null @@ -1,13 +0,0 @@ - - - git - git://github.com/kisli/vmime - bdbccdd64d139366210e4bd30e2fd1715edefa32 - 0.9.2~g@TAG_OFFSET@ - - - *.tar - xz - - - diff --git a/libvmime-sotag.diff b/libvmime-sotag.diff index 5793524..8e8b458 100644 --- a/libvmime-sotag.diff +++ b/libvmime-sotag.diff @@ -4,9 +4,9 @@ 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, +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 ++-- diff --git a/libvmime.changes b/libvmime.changes index 8fb6310..b4a1705 100644 --- a/libvmime.changes +++ b/libvmime.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 3 11:51:36 UTC 2017 - jengelh@inai.de + +- Update to final release 0.9.2 +* Always ignore newlines between words. + ------------------------------------------------------------------- Sun Oct 30 18:36:29 UTC 2016 - jengelh@inai.de diff --git a/libvmime.spec b/libvmime.spec index c08bc42..22bc636 100644 --- a/libvmime.spec +++ b/libvmime.spec @@ -16,19 +16,16 @@ # -%define version_unconverted 0.9.2~g500 - Name: libvmime %define lname libvmime-suse3 -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: vmime-%version.tar.xz +Source: https://github.com/kisli/vmime/archive/v%version.tar.gz Patch1: libvmime-nodatetime.diff Patch2: libvmime-sotag.diff Patch3: dont-fixup.diff diff --git a/v0.9.2.tar.gz b/v0.9.2.tar.gz new file mode 100644 index 0000000..674bc62 --- /dev/null +++ b/v0.9.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34a7416ebabbaeb68ac8233ce978c703f784ea33a4df6cfc7725c8786b1acace +size 528660 diff --git a/vmime-0.9.2~g500.tar.xz b/vmime-0.9.2~g500.tar.xz deleted file mode 100644 index 08d8fcf..0000000 --- a/vmime-0.9.2~g500.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df76ff3097ac2bdee5c7d5549e950a3f709c19135b79c173b3a0f1ef948c8860 -size 390976 From d20c5101f40601f1a4c47f27d49763de7a3a1feea9e3b517a4be5d148f1a72ee Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 4 Jan 2017 11:49:39 +0000 Subject: [PATCH 2/3] 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 > 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 -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 From cf5dbe71874154767a5c34a9124a72b81a5240bddc6b60849186ecb6887e518b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 4 Jan 2017 16:11:45 +0000 Subject: [PATCH 3/3] mention patches OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=13 --- libvmime.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvmime.changes b/libvmime.changes index b4a1705..a557c4c 100644 --- a/libvmime.changes +++ b/libvmime.changes @@ -3,6 +3,8 @@ 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