From 2d20b056bd39e42d984a4e008fbe33c91906554b Mon Sep 17 00:00:00 2001
From: vcrhonek <vcrhonek@fedoraproject.org>
Date: Tue, 1 Jul 2008 14:10:16 +0000
Subject: [PATCH] Merge review

---
 m4.spec | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/m4.spec b/m4.spec
index 5155124..ed69ab2 100644
--- a/m4.spec
+++ b/m4.spec
@@ -1,7 +1,7 @@
 Summary: The GNU macro processor
 Name: m4
 Version: 1.4.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source0: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.bz2
@@ -23,19 +23,19 @@ Install m4 if you need a macro processor.
 
 %prep
 %setup -q
+chmod 644 COPYING
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
+make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 %{_bindir}/m4
 %{_infodir}/*
@@ -53,6 +53,10 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Jul  1 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.4.11-2
+- Merge review
+  Resolves: #226115
+
 * Wed Apr 23 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.4.11-1
 - Update to m4-1.4.11 (removed vasnprintf patch, it's included in
   upstream source)