From 9daf2d5b2416c43700464514cb10e2ddaf831847 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 7 Sep 2010 12:29:02 +0200 Subject: [PATCH] Update to m4-1.4.15 --- .gitignore | 2 ++ m4-1.4.14-include.patch | 11 ----------- m4.spec | 9 +++++---- sources | 4 ++-- 4 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 m4-1.4.14-include.patch diff --git a/.gitignore b/.gitignore index f494ce1..b29ae61 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ m4-1.4.14.tar.xz m4-1.4.14.tar.xz.sig +/m4-1.4.15.tar.xz +/m4-1.4.15.tar.xz.sig diff --git a/m4-1.4.14-include.patch b/m4-1.4.14-include.patch deleted file mode 100644 index 48b91d4..0000000 --- a/m4-1.4.14-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up m4-1.4.14/src/m4.h_old m4-1.4.14/src/m4.h ---- m4-1.4.14/src/m4.h_old 2010-03-01 15:43:40.376976016 +0100 -+++ m4-1.4.14/src/m4.h 2010-03-01 15:44:00.265984491 +0100 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #include "binary-io.h" - #include "clean-temp.h" diff --git a/m4.spec b/m4.spec index 3b1e704..bd66d3a 100644 --- a/m4.spec +++ b/m4.spec @@ -1,13 +1,11 @@ Summary: The GNU macro processor Name: m4 -Version: 1.4.14 +Version: 1.4.15 Release: 1%{?dist} License: GPLv3+ Group: Applications/Text Source0: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz Source1: http://ftp.gnu.org/gnu/m4/m4-%{version}.tar.xz.sig -# patch adds include direction for using fstat and related macros -Patch0: m4-1.4.14-include.patch URL: http://www.gnu.org/software/m4/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info @@ -25,7 +23,6 @@ Install m4 if you need a macro processor. %prep %setup -q -%patch0 -p1 -b .include chmod 644 COPYING %build @@ -63,6 +60,10 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 7 2010 Vitezslav Crhonek - 1.4.15-1 +- Update to m4-1.4.15 (removed include patch, already applied in upstream source) + Resolves: #630709 + * Mon Mar 1 2010 Vitezslav Crhonek - 1.4.14-1 - Update to m4-1.4.14 Resolves: #568339 diff --git a/sources b/sources index 9463b87..a1c00b1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e2b871099546846d1df586f195f79b53 m4-1.4.14.tar.xz -08de115c6dc912a3a8baf6af2ef3c7b3 m4-1.4.14.tar.xz.sig +1caf3410e6590f493834dc99ee04d027 m4-1.4.15.tar.xz +e54fabe01e11dd5ac110658f7dcef55e m4-1.4.15.tar.xz.sig