Hello community, here is the log from the commit of package libvmime for openSUSE:Factory checked in at 2013-04-08 14:53:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvmime (Old) and /work/SRC/openSUSE:Factory/.libvmime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvmime", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libvmime/libvmime.changes 2013-03-11 10:19:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvmime.new/libvmime.changes 2013-04-08 14:53:18.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Mar 27 18:26:20 UTC 2013 - [email protected] + +- Update to new git snapshot (54b5fe13f7e7cb6c4f63884e91ff472b42b63147) +- Removed because merged: vmime-0.8.1-charset-catch.diff, + vmime-mixed-qp-in-parameter.diff, vmime-0.9.2-qp-in-buffers.diff +- Removed because they no longer apply: vmime-automake1_13.diff, + vmime-noansiflag.patch + +------------------------------------------------------------------- Old: ---- libvmime-0.9.1+svn603.tar.bz2 spice_source.sh vmime-0.8.1-charset-catch.diff vmime-0.9.2-qp-in-buffers.diff vmime-automake1_13.diff vmime-mixed-qp-in-parameter.diff vmime-noansiflag.patch New: ---- libvmime-0.9.1+git175.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvmime.spec ++++++ --- /var/tmp/diff_new_pack.vqdxIo/_old 2013-04-08 14:53:23.000000000 +0200 +++ /var/tmp/diff_new_pack.vqdxIo/_new 2013-04-08 14:53:23.000000000 +0200 @@ -17,50 +17,53 @@ Name: libvmime -%define lname libvmime-0_9_2-0 +%define lname libvmime-0_9_2-1 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 Release: 0 -Url: http://vmime.sf.net/ +Url: http://vmime.org/ #Svn-Clone: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk #Source: http://downloads.sf.net/vmime/%name-%version.tar.bz2 -Source: %name-0.9.1+svn603.tar.bz2 -Source2: spice_source.sh +Source: %name-0.9.1+git175.tar.xz Patch1: libvmime-nodatetime.diff -# PATCH-WORKAROUND-UPSTREAM libvmime-sotag.diff Patch2: libvmime-sotag.diff -# PATCH-FEATURE-UPSTREAM vmime-0.8.1-charset-catch.diff x -- ZCP team will deal with this in time -Patch3: vmime-0.8.1-charset-catch.diff -Patch4: vmime-0.9.2-header-value-on-next-line.diff -Patch5: vmime-mixed-qp-in-parameter.diff -Patch6: vmime-0.9.2-qp-in-buffers.diff -Patch7: vmime-noansiflag.patch -Patch8: vmime-automake1_13.diff +Patch3: vmime-0.9.2-header-value-on-next-line.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: ImageMagick +BuildRequires: cmake >= 2.8.3 BuildRequires: gcc-c++ -BuildRequires: libgcrypt-devel +BuildRequires: inkscape BuildRequires: libgsasl-devel -BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: postfix -BuildRequires: scons +%if 0%{?suse_version} >= 1130 && "%_repository" != "devel:libraries:c_c++" +# Cannot realistically build because of all the new libs this prj has +# Nothing provides libzzip-0-13 required by texlive +# Nothing provides libMagick++.so.5 required by Inkscape +%define with_pdf 1 +BuildRequires: texlive-bin-latex +BuildRequires: texlive-latex +%if 0%{?suse_version} >= 1230 +BuildRequires: texlive-metafont-bin +BuildRequires: tex(8r.enc) +BuildRequires: tex(courier.sty) +BuildRequires: tex(fancyheadings.sty) +BuildRequires: tex(pcrr7t.tfm) +BuildRequires: tex(ucs.sty) +%endif +%endif BuildRequires: xz %if 0%{?suse_version} >= 1100 -BuildRequires: gettext-tools BuildRequires: libgnutls-devel -BuildRequires: libselinux-devel %else -%if 0%{?suse_version} > 0 +%if 0%{?suse_version} BuildRequires: gnutls-devel %endif %endif -%if 0%{?fedora_version} > 0 || 0%{?redhat_version} || 0%{?centos_version} -BuildRequires: gettext +%if 0%{?fedora_version} || 0%{?redhat_version} || 0%{?centos_version} BuildRequires: gnutls-devel %endif @@ -102,42 +105,50 @@ %prep %setup -qn vmime -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -p1 +%patch -P 1 -P 2 -P 3 -p1 %build -export CFLAGS="%optflags -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1"; -export CXXFLAGS="$CFLAGS"; +%if 0%{?with_pdf} +pushd doc/book/ +make book_pdf +popd +%endif + +cf="%optflags -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1" # sendmail's awesome location. export PATH="$PATH:/usr/sbin"; -%if 0%{?suse_version} >= 1100 || 0%{?!suse_version} -scons autotools; -# SL10 and other too old distros: -# Rely on scons already having been run before the tarball was made. -%endif -%configure --disable-static -make %{?_smp_mflags}; +cmake . \ + -DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \ + -DCMAKE_RELEASE_TYPE:STRING="Release" \ + -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \ + -DCMAKE_C_FLAGS:STRING="$cf" -DCMAKE_CXX_FLAGS:STRING="$cf" +make %{?_smp_mflags} VERBOSE=1 %install b="%buildroot"; -make install DESTDIR="$b" docdir="%_docdir/%name"; +%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; -%check -make check; - %post -n %lname -p /sbin/ldconfig - %postun -n %lname -p /sbin/ldconfig %files -n %lname %defattr(-,root,root) -%_libdir/%{name}*.so.* +%_libdir/%name-%version.so.1* %files devel %defattr(-,root,root) -%doc %_docdir/%name -%_includedir/* -%_libdir/%{name}*.so +%_includedir/vmime +%_libdir/libvmime-%version.so +%_libdir/libvmime.so %_libdir/pkgconfig/*.pc +%if 0%{?with_pdf} +%_docdir/%name +%endif %changelog ++++++ libvmime-nodatetime.diff ++++++ --- /var/tmp/diff_new_pack.vqdxIo/_old 2013-04-08 14:53:23.000000000 +0200 +++ /var/tmp/diff_new_pack.vqdxIo/_new 2013-04-08 14:53:23.000000000 +0200 @@ -1,12 +1,17 @@ +From 6908ad636e59339b9042205e6fd22444f45a7529 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt <[email protected]> +Date: Wed, 27 Mar 2013 17:52:26 +0100 +Subject: [PATCH] src: avoid __DATE__ and __TIME__ + --- - src/base.cpp | 2 +- + src/base.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: libvmime-0.9.1/src/base.cpp -=================================================================== ---- libvmime-0.9.1.orig/src/base.cpp -+++ libvmime-0.9.1/src/base.cpp -@@ -74,7 +74,7 @@ const string libname() { return (VMIME_P +diff --git a/src/base.cpp b/src/base.cpp +index d5f3e78..74bbba7 100644 +--- a/src/base.cpp ++++ b/src/base.cpp +@@ -75,7 +75,7 @@ const string libname() { return (VMIME_PACKAGE); } * * @return library version */ @@ -15,3 +20,6 @@ /** Return the library API version (eg: "6:1:6"). * +-- +1.8.1.4 + ++++++ libvmime-sotag.diff ++++++ --- /var/tmp/diff_new_pack.vqdxIo/_old 2013-04-08 14:53:23.000000000 +0200 +++ /var/tmp/diff_new_pack.vqdxIo/_new 2013-04-08 14:53:23.000000000 +0200 @@ -1,43 +1,38 @@ -From: Jan Engelhardt <[email protected]> -Date: 2011-06-25 23:04 +0200 +From 24449ea8c7eca61c08b955c95ea7c5295a2a2bde Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt <[email protected]> +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's right now. Add -release suffix -unconditionally. - +soversions, hence no trust that it is correct now. Add some suffix +that is unique within our distro and distinguishes itself from +upstream. --- - SConstruct | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -Index: vmime/SConstruct -=================================================================== ---- vmime.orig/SConstruct -+++ vmime/SConstruct -@@ -1017,7 +1017,7 @@ vmime_pc.write("Name: " + packageRealNam - vmime_pc.write("Description: " + packageDescription + "\n") - vmime_pc.write("Version: " + packageVersion + "\n") - vmime_pc.write("Requires: " + vmime_pc_requires + "\n") --vmime_pc.write("Libs: -L${libdir} -l" + packageVersionedGenericName + " " + vmime_pc_libs + "\n") -+vmime_pc.write("Libs: -L${libdir} -l" + packageVersionedGenericName + "-" + str(packageVersion) + " " + vmime_pc_libs + "\n") - #vmime_pc.write("Cflags: -I${includedir}/" + packageVersionedGenericName + "\n") - vmime_pc.write("Cflags: -I${includedir}/" + "\n") +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1c45d89..9760e13 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,7 +50,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 1) + SET(VMIME_API_VERSION_REVISION 0) + SET(VMIME_API_VERSION_AGE 0) -@@ -1090,7 +1090,7 @@ def generateAutotools(target, source, en - vmime_pc_in.write("Description: " + packageDescription + "\n") - vmime_pc_in.write("Version: @VERSION@\n") - vmime_pc_in.write("Requires: @GSASL_REQUIRED@\n") -- vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n") -+ vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@-@PACKAGE_VERSION@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n") - #vmime_pc_in.write("Cflags: -I${includedir}/@GENERIC_VERSIONED_LIBRARY_NAME@\n") - vmime_pc_in.write("Cflags: -I${includedir}/ @LIBGNUTLS_CFLAGS@\n") - vmime_pc_in.close() -@@ -1162,8 +1162,7 @@ INCLUDES = -I$(prefix)/include -I$(top_s +@@ -63,7 +63,7 @@ SET(VMIME_API_VERSION ${VMIME_API_VERSION_CURRENT}.${VMIME_API_VERSION_REVISION} + # VMime Library - Makefile_am.write('lib_LTLIBRARIES = ' + packageVersionedName + '.la\n') - Makefile_am.write(packageVersionedName + '_la_LDFLAGS = -export-dynamic -version-info ' --# + '@LIBRARY_VERSION@ -release @LIBRARY_RELEASE@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@\n') -- + '@LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@\n') -+ + '@LIBRARY_VERSION@ -release @PACKAGE_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@\n') + # Set base name +-SET(VMIME_LIBRARY_NAME vmime) ++SET(VMIME_LIBRARY_NAME vmime-0.9.2) - sourceFiles = [] # for conversion: subpath/file.cpp --> subpath_file.cpp - # used to avoid collision when two files have the same name if different dirs + # Source files + FILE( +-- +1.8.1.4 + ++++++ vmime-0.9.2-header-value-on-next-line.diff ++++++ --- /var/tmp/diff_new_pack.vqdxIo/_old 2013-04-08 14:53:23.000000000 +0200 +++ /var/tmp/diff_new_pack.vqdxIo/_new 2013-04-08 14:53:23.000000000 +0200 @@ -1,7 +1,12 @@ -diff -Nurb libvmime-0.9.2.orig/src/headerField.cpp libvmime-0.9.2.patched/src/headerField.cpp ---- libvmime-0.9.2.orig/src/headerField.cpp 2010-05-20 05:33:45.000000000 -0700 -+++ libvmime-0.9.2.patched/src/headerField.cpp 2011-08-29 12:10:08.438497914 -0700 -@@ -157,14 +157,12 @@ +--- + src/headerField.cpp | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/src/headerField.cpp b/src/headerField.cpp +index 1d33dac..ec575dc 100644 +--- a/src/headerField.cpp ++++ b/src/headerField.cpp +@@ -160,16 +160,14 @@ ref <headerField> headerField::parseNext { contentsEnd = pos; pos += 2; @@ -12,19 +17,14 @@ contentsEnd = pos; ++pos; - break; -- } -+ } else { + } - while (pos < end) +- while (pos < end) ++ else while (pos < end) { -@@ -186,24 +184,13 @@ - - ++pos; - } -+ } + c = buffer[pos]; - // Handle the case of folded lines - if (buffer[pos] == ' ' || buffer[pos] == '\t') +@@ -195,18 +193,6 @@ ref <headerField> headerField::parseNext { // This is a folding white-space: we keep it as is and // we continue with contents parsing... @@ -43,3 +43,4 @@ } else { +-- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
