rpms/m4/devel m4.spec,1.33,1.34

[Vitezslav Crhonek (vcrhonek)]

Author: vcrhonek

Update of /cvs/extras/rpms/m4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2770

Modified Files:
	m4.spec 
Log Message:
Merge review


Index: m4.spec
===================================================================
RCS file: /cvs/extras/rpms/m4/devel/m4.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- m4.spec	23 Apr 2008 11:09:55 -0000	1.33
+++ m4.spec	1 Jul 2008 14:10:16 -0000	1.34
@@ -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 @@
 
 %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 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Jul  1 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.4.11-2
+- Merge review
+  Resolves: #226115
+
 * Wed Apr 23 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.4.11-1
 - Update to m4-1.4.11 (removed vasnprintf patch, it's included in
   upstream source)