From d26d83c484cee5d26e9cb83d43ccda25d44e6e37 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Fri, 3 Aug 2007 17:37:21 +0000
Subject: [PATCH] misc updates

---
 intltool.spec | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/intltool.spec b/intltool.spec
index d394b28..6cf98f5 100644
--- a/intltool.spec
+++ b/intltool.spec
@@ -5,12 +5,14 @@ Name: intltool
 Summary: Utility for internationalizing various kinds of data files
 Version: 0.36.0
 Release: 1%{?dist}
-License: GPL
+License: GPLv2 with exception
 Group: Development/Tools
 Source: http://ftp.gnome.org/pub/gnome/sources/intltool/0.35/%{name}-%{version}.tar.bz2
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires: patch
+# for /usr/share/aclocal
+Requires: automake
 Obsoletes: xml-i18n-tools
 Provides: xml-i18n-tools = 0.11
 Requires: perl(XML::Parser)
@@ -31,16 +33,16 @@ them in the po files.
 make
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/*
 %{_datadir}/intltool
 %{_datadir}/aclocal/*
@@ -49,7 +51,10 @@ make
 %changelog
 * Fri Aug  3 2007 Matthias Clasen <mclasen@redhat.com> - 0.36.0-1
 - Update to 0.36.0
+- Update license field
 - Drop patch rejected, obsolete and upstreamed patches
+- Some spec file cleanups
+- Require automake
 
 * Tue Jul 31 2007 David Zeuthen <davidz@redhat.com> - 0.35.5-5
 - Add support for PolicyKit .policy files (b.g.o #462312)