From f9342e7d4234ecedc5e4b9a06231412e3148b62b2215a140b726ccc775cf05ab Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 9 Mar 2013 19:33:17 +0000 Subject: [PATCH] Accepting request 158126 from home:seife:branches:devel:tools fix build with autmake-1.13, convert changes to utf-8 OBS-URL: https://build.opensuse.org/request/show/158126 OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=13 --- patchutils.changes | 15 ++++++++++----- patchutils.spec | 12 ++++++++---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/patchutils.changes b/patchutils.changes index ed904be..f4178c5 100644 --- a/patchutils.changes +++ b/patchutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 9 17:37:27 UTC 2013 - seife+obs@b1-systems.com + +- fix build with autmake-1.13, convert changes to utf-8 + ------------------------------------------------------------------- Fri Dec 2 16:30:33 UTC 2011 - coolo@suse.com @@ -102,12 +107,12 @@ Tue Apr 8 01:43:10 CEST 2003 - ro@suse.de Wed Mar 26 14:29:29 CET 2003 - mmj@suse.de - Update to 0.2.22:, including the following since 0.2.17: - · New splitdiff option to split out every file-level patch, and + · New splitdiff option to split out every file-level patch, and a new option was added to grepdiff to display matching hunks - · A new tool was added for exchanging the order of two patches - · Support for ISO 8601 timezones - · Several bug fixes - · Our patches are in mainline + · A new tool was added for exchanging the order of two patches + · Support for ISO 8601 timezones + · Several bug fixes + · Our patches are in mainline ------------------------------------------------------------------- Mon Mar 3 17:04:33 CET 2003 - pthomas@suse.de diff --git a/patchutils.spec b/patchutils.spec index e3dc29b..a9febed 100644 --- a/patchutils.spec +++ b/patchutils.spec @@ -1,7 +1,7 @@ # # spec file for package patchutils # -# Copyright (c) 2011 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 @@ -15,15 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: patchutils Url: http://cyberelk.net/tim/patchutils/ -License: GPL-2.0+ -Group: Productivity/File utilities -Requires: patch diffutils +Requires: diffutils +Requires: patch BuildRequires: automake Version: 0.3.2 Release: 0 Summary: A Collection of Tools for Manipulating Patch Files +License: GPL-2.0+ +Group: Productivity/File utilities Source: http://cyberelk.net/tim/data/patchutils/stable/patchutils-%{version}.tar.bz2 Patch: %name-0.2.30-tailsyntax.diff Patch1: overrun.diff @@ -53,6 +55,8 @@ Authors: %patch -p1 %patch1 %patch2 -p1 +# new autoconf 1.13 removed old macro +sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in %build autoreconf -fi