[libvmime] Upgrade to SVN 20110626 (#671585)

[Robert Scheck]

commit 65d017c2b6ed4cb9aa602c0c7a93db08fc9059e8
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jun 26 17:06:29 2011 +0200

    Upgrade to SVN 20110626 (#671585)

 .gitignore    |    2 +-
 libvmime.spec |   72 +++++++++++++++++++++++++++------------------------------
 sources       |    2 +-
 3 files changed, 36 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7dcd661..1668927 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-libvmime-0.9.1.tar.bz2
+libvmime-0.9.2.tar.bz2
diff --git a/libvmime.spec b/libvmime.spec
index 561860a..9da66a8 100644
--- a/libvmime.spec
+++ b/libvmime.spec
@@ -1,20 +1,25 @@
-Name:           libvmime
-Version:        0.9.1
-Release:        2%{?dist}
+%global sasl    1
+%global gnutls  1
+
 Summary:        Powerful library for MIME messages and Internet messaging services
-Group:          System Environment/Libraries
+Name:           libvmime
+Version:        0.9.2
+Release:        0.1.20110626svn%{?dist}
 License:        GPLv3+
+Group:          System Environment/Libraries
 URL:            http://www.vmime.org/
-Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-
+# When using tarball from released upstream version:
+# - http://downloads.sourceforge.net/vmime/%{name}-%{version}.tar.bz2
+#
+# When generating tarball package from upstream SVN:
+# - svn export -r 596 https://vmime.svn.sourceforge.net/svnroot/vmime/trunk/vmime libvmime-0.9.2
+# - tar cfj libvmime-0.9.2.tar.bz2 libvmime-0.9.2
+# - Use the visible date of latest SVN log entry for %{release} in spec file
+Source0:        http://downloads.sourceforge.net/vmime/%{name}-%{version}.tar.bz2
+BuildRequires:  sendmail, %{?sasl:libgsasl-devel}, %{?gnutls:gnutls-devel}
+BuildRequires:  scons, libtool, autoconf, automake
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Path of the sendmail binary gets a C/C++ definement during build
-BuildRequires:  sendmail
-
-BuildRequires:  libgsasl-devel
-BuildRequires:  gnutls-devel
-
 %description
 VMime is a powerful C++ class library for working with MIME messages
 and Internet messaging services like IMAP, POP or SMTP.
@@ -25,45 +30,37 @@ over the Internet. The library offers all the features to build a
 complete mail client.
 
 %package devel
-Summary:        Development headers for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
-Requires:       libgsasl-devel
-Requires:       gnutls-devel
-
-%description    devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
-%package static
-Summary:        Static libraries for %{name}
+Summary:        Development headers for the libvmime library
 Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       pkgconfig, %{?sasl:libgsasl-devel}, %{?gnutls:gnutls-devel}
+Obsoletes:      %{name}-static < 0.9.2
 
-%description    static
-This package contains static library files for %{name}.
+%description devel
+The libvmime package contains header files and libraries necessary
+for developing applications which use the libvmime C++ class library.
 
 %prep
 %setup -q
+scons autotools
 
 %build
 export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} INSTALL='install -p' install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
 
 # Docs are available online and are installed in the wrong location
-rm -rf %{buildroot}%{_datadir}/doc/vmime/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/vmime/
 
 # Don't install any libtool .la files
-rm -f %{buildroot}%{_libdir}/%{name}.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
@@ -80,11 +77,10 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/vmime.pc
 
-%files static
-%defattr(-,root,root,-)
-%{_libdir}/libvmime.a
-
 %changelog
+* Sun Jun 26 2011 Robert Scheck <robert at fedoraproject.org> 0.9.2-0.1.20110626svn
+- Upgrade to SVN 20110626 (#671585)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 2ac771c..4a38dbe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5b6de44f7f9ca0e4cefe597d1905605  libvmime-0.9.1.tar.bz2
+2ced916f4b7098cba98d59600d540305  libvmime-0.9.2.tar.bz2