Accepting request 158228 from devel:libraries:c_c++

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/158228
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvmime?expand=0&rev=7
This commit is contained in:
Stephan Kulow 2013-03-11 09:19:07 +00:00 committed by Git OBS Bridge
parent 75f62eb2b6
commit f1380c6756
4 changed files with 57 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Mar 3 19:47:40 UTC 2013 - jengelh@inai.de
- Add vmime-automake1_13.diff to fix up ancient autotools constructs
-------------------------------------------------------------------
Sat Aug 11 14:44:08 UTC 2012 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
#
# spec file for package libvmime
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -38,6 +38,7 @@ 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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
@ -101,8 +102,7 @@ complete mail client.
%prep
%setup -qn vmime
%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -p1
%patch7
%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -p1
%build
export CFLAGS="%optflags -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1";

41
vmime-automake1_13.diff Normal file
View File

@ -0,0 +1,41 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2013-03-03 20:43:59.641072360 +0100
AM_INIT_AUTOMAKE takes one argument.
AM_CONFIG_HEADERS is obsolete.
---
Makefile.am | 3 ---
configure.in | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
Index: vmime/Makefile.am
===================================================================
--- vmime.orig/Makefile.am
+++ vmime/Makefile.am
@@ -10,9 +10,6 @@ SUBDIRS = src $(INCLUDE) $(BINDING)
DIST_SUBDIRS = $(SUBDIRS) autotools
-#AUTOMAKE_OPTIONS = dist-bzip2
-AUTOMAKE_OPTIONS = no-dist
-
pkgconfigdir = $(VMIME_PKGCONFIGDIR)
pkgconfig_DATA = $(GENERIC_VERSIONED_LIBRARY_NAME).pc
Index: vmime/configure.in
===================================================================
--- vmime.orig/configure.in
+++ vmime/configure.in
@@ -36,9 +36,9 @@ AC_SUBST(LIBRARY_RELEASE)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(vmime, 0.9.2)
+AM_INIT_AUTOMAKE([no-dist])
AC_CONFIG_SRCDIR([src/base.cpp])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE

View File

@ -1,5 +1,11 @@
--- SConstruct.orig
+++ SConstruct
---
SConstruct | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
Index: vmime/SConstruct
===================================================================
--- vmime.orig/SConstruct
+++ vmime/SConstruct
@@ -595,8 +595,6 @@ env.Append(CPPDEFINES = ['_REENTRANT=1']
env.Append(CXXFLAGS = ['-W'])