rpms/diffutils/devel diffutils.spec,1.25,1.26

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/diffutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28967

Modified Files:
	diffutils.spec 
Log Message:
* Wed Jan  2 2008 Tim Waugh <twaugh at redhat.com> 2.8.1-20
- Converted spec file to UTF-8 (bug #225696).
- Fixed summary (bug #225696).
- Fixed PreReq (bug #225696).
- Removed Prefix (bug #225696).
- Fixed build root (bug #225696).
- Avoid %makeinstall (bug #225696).
- Fixed license tag (bug #225696).



Index: diffutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/diffutils/devel/diffutils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- diffutils.spec	6 Nov 2007 12:39:26 -0000	1.25
+++ diffutils.spec	2 Jan 2008 17:03:41 -0000	1.26
@@ -1,7 +1,7 @@
-Summary: A GNU collection of diff utilities.
+Summary: A GNU collection of diff utilities
 Name: diffutils
 Version: 2.8.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 Group: Applications/Text
 URL: http://www.gnu.org/software/diffutils/diffutils.html
 Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz
@@ -12,10 +12,10 @@
 Patch0: diffutils-2.8.4-i18n.patch
 Patch1: diffutils-2.8.1-badc.patch
 Patch2: diffutils-sdiff.patch
-License: GPL
-Prefix: %{_prefix}
-Prereq: /sbin/install-info
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+License: GPLv2+
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Diffutils includes four utilities: diff, cmp, diff3 and sdiff. Diff
@@ -42,7 +42,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
 
 ( cd $RPM_BUILD_ROOT
   gzip -9nf .%{_infodir}/diff*
@@ -77,6 +77,15 @@
 %{_infodir}/diff.info*gz
 
 %changelog
+* Wed Jan  2 2008 Tim Waugh <twaugh at redhat.com> 2.8.1-20
+- Converted spec file to UTF-8 (bug #225696).
+- Fixed summary (bug #225696).
+- Fixed PreReq (bug #225696).
+- Removed Prefix (bug #225696).
+- Fixed build root (bug #225696).
+- Avoid %%makeinstall (bug #225696).
+- Fixed license tag (bug #225696).
+
 * Tue Nov  6 2007 Tim Waugh <twaugh at redhat.com> 2.8.1-19
 - Rebuilt.
 
@@ -165,7 +174,7 @@
 * Wed Jul 12 2000 Prospector <bugzilla at redhat.com>
 - automatic rebuild
 
-* Thu Jul 06 2000 Trond Eivind Glomsrød <teg at redhat.com>
+* Thu Jul 06 2000 Trond Eivind Glomsrød <teg at redhat.com>
 - fix %%changelog entries (escape them)
 - update source location
 - remove manual stripping