From b1815204852bb1f1a1d81d59b8bc721e1a4e01c72e0336fed79f7ddf38d0626a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 28 May 2019 11:58:22 +0000 Subject: [PATCH] - Update to Kopano branch of vmime, 0.9.2k2 OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=26 --- _service | 4 ++-- libvmime.changes | 6 ++++++ libvmime.spec | 28 ++++++++++++++++------------ vmime-0.9.2.50.tar.xz | 3 --- vmime-0.9.2.85.tar.xz | 3 +++ 5 files changed, 27 insertions(+), 17 deletions(-) delete mode 100644 vmime-0.9.2.50.tar.xz create mode 100644 vmime-0.9.2.85.tar.xz diff --git a/_service b/_service index f982a3e..de85e30 100644 --- a/_service +++ b/_service @@ -1,8 +1,8 @@ git - https://github.com/kisli/vmime - a9b822140bf8926620fd21b880893d4c214dd8c0 + https://github.com/kopano-dev/vmime + v0.9.2k2 v0.9.2 0.9.2.@TAG_OFFSET@ diff --git a/libvmime.changes b/libvmime.changes index 6bcd7c4..68498b5 100644 --- a/libvmime.changes +++ b/libvmime.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 28 10:38:46 UTC 2019 - Jan Engelhardt + +- Update to Kopano branch of vmime, 0.9.2k2 + * Unbreak own hostname qualification on POSIX systems + ------------------------------------------------------------------- Mon Jun 25 12:21:09 UTC 2018 - jengelh@inai.de diff --git a/libvmime.spec b/libvmime.spec index 8a0b278..59d8b0d 100644 --- a/libvmime.spec +++ b/libvmime.spec @@ -17,11 +17,11 @@ Name: libvmime -%define lname libvmime1 -Summary: Library for working with RFC 2822, MIME messages and IMAP/POP/SMTP +%define lname libvmime-kopano2 +Summary: Library for working with RFC 5322, MIME messages and IMAP/POP/SMTP License: GPL-3.0-or-later Group: Development/Libraries/C and C++ -Version: 0.9.2.50 +Version: 0.9.2.85 Release: 0 Url: http://vmime.org/ @@ -59,7 +59,7 @@ BuildRequires: tex(ucs.sty) BuildRequires: xz %description -VMime is a C++ class library for working with RFC2822 and +VMime is a C++ class library for working with RFC5322 and MIME-conforming messages (RFC2045–2049), as well as Internet messaging services like IMAP, POP or SMTP. @@ -72,7 +72,7 @@ Summary: Library for working with MIME messages and IMAP/POP/SMTP Group: System/Libraries %description -n %lname -VMime is a C++ class library for working with RFC2822 and +VMime is a C++ class library for working with RFC5322 and MIME-conforming messages (RFC2045–2049), as well as Internet messaging services like IMAP, POP or SMTP. @@ -86,7 +86,7 @@ Group: Development/Libraries/C and C++ Requires: %lname = %version %description devel -VMime is a C++ class library for working with RFC2822 and +VMime is a C++ class library for working with RFC5322 and MIME-conforming messages (RFC2045–2049), as well as Internet messaging services like IMAP, POP or SMTP. @@ -105,6 +105,12 @@ popd cf="%optflags -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1" %cmake \ + -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \ + -DINCLUDE_INSTALL_DIR:PATH="%_includedir" \ + -DLIB_INSTALL_DIR:PATH="%_libdir" \ + -DSYSCONF_INSTALL_DIR:PATH="%_sysconfdir" \ + -DSHARE_INSTALL_PREFIX:PATH="%_datadir" \ + -DCMAKE_INSTALL_LIBDIR:PATH="%_libdir" \ -DVMIME_SENDMAIL_PATH:STRING="%_sbindir/sendmail" \ -DVMIME_BUILD_SAMPLES:BOOL=OFF \ %if 0%{?sle_version} @@ -126,12 +132,9 @@ mkdir -p "$b/%_docdir/%name" cp -a doc/book/book.pdf "$b/%_docdir/%name/" %endif %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 +mkdir -p "$b/%_datadir" +mv "$b/%_prefix/cmake" "$b/%_datadir/" %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -139,12 +142,13 @@ find "$b" -type f -name "*.la" -delete %files -n %lname %defattr(-,root,root) %doc COPYING -%_libdir/%name.so.1* +%_libdir/libvmime-kopano.so.2* %files devel %defattr(-,root,root) %_includedir/vmime %_libdir/libvmime.so +%_libdir/libvmime-kopano.so %_libdir/pkgconfig/*.pc %_datadir/cmake/ %if 0%{?with_pdf} diff --git a/vmime-0.9.2.50.tar.xz b/vmime-0.9.2.50.tar.xz deleted file mode 100644 index d45820a..0000000 --- a/vmime-0.9.2.50.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:067a281760b5172e79ea42961650555684ad88afaf5cfe2fe2c58618b025a774 -size 379376 diff --git a/vmime-0.9.2.85.tar.xz b/vmime-0.9.2.85.tar.xz new file mode 100644 index 0000000..935a30a --- /dev/null +++ b/vmime-0.9.2.85.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ddd51369114d910011ca2c14c9717c372323b6331cf9dd50a2302de86f6902b +size 381112