rpms/automake/devel filter-provides-automake.sh, NONE, 1.1 filter-requires-automake.sh, NONE, 1.1 automake.spec, 1.30, 1.31

[fedora-cvs-commits at redhat.com]

Author: karsten

Update of /cvs/dist/rpms/automake/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23379

Modified Files:
	automake.spec 
Added Files:
	filter-provides-automake.sh filter-requires-automake.sh 
Log Message:
- bz 225302:
- make install DESTDIR=...
- fix BuildRoot
- fix post/preun requirements
- define all directories on ./configure line
- filter perl(Automake*) dependencies
- replace all tabs with spaces
- remove trailing dot from summary



--- NEW FILE filter-provides-automake.sh ---
#!/bin/sh

/usr/lib/rpm/find-provides $* | egrep -v 'perl\(Automake' | sort -u


--- NEW FILE filter-requires-automake.sh ---
#!/bin/sh

/usr/lib/rpm/find-requires $* | egrep -v 'perl\(Automake' | sort -u


Index: automake.spec
===================================================================
RCS file: /cvs/dist/rpms/automake/devel/automake.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- automake.spec	18 Jan 2007 14:44:27 -0000	1.30
+++ automake.spec	20 Feb 2007 12:42:34 -0000	1.31
@@ -1,18 +1,25 @@
 %define api_version 1.10
 
-Summary:	A GNU tool for automatically creating Makefiles.
-Name:		automake
-Version:	%{api_version}
-Release:	3
-License:	GPL
-Group:		Development/Tools
-Source:		http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
-URL:		http://sources.redhat.com/automake
-Requires:	perl, autoconf >= 2.58
-Buildrequires:	autoconf >= 2.58
-Prereq:		/sbin/install-info
-BuildArchitectures:	noarch
-Buildroot:	%{_tmppath}/%{name}-%{version}-root
+Summary:    A GNU tool for automatically creating Makefiles
+Name:       automake
+Version:    %{api_version}
+Release:    4
+License:    GPL
+Group:      Development/Tools
+Source:     http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
+Source1:    filter-provides-automake.sh
+Source2:    filter-requires-automake.sh
+URL:        http://sources.redhat.com/automake
+Requires:   autoconf >= 2.58
+Buildrequires:  autoconf >= 2.58
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+BuildArch:  noarch
+Buildroot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%define _use_internal_dependency_generator 0
+%define __find_provides %{SOURCE1}
+%define __find_requires %{SOURCE2}
 
 %description
 Automake is a tool for automatically generating `Makefile.in'
@@ -27,13 +34,14 @@
 %setup -q -n automake-%{version}
 
 %build
-./configure --prefix=%{_prefix}
-make
+./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
+   --bindir=%{_bindir} --datadir=%{_datadir}
+make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%{_datadir}/doc/automake/amhello-1.0.tar.gz
 
 # create this dir empty so we can own it
@@ -55,7 +63,7 @@
 fi
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS README THANKS NEWS
 %{_bindir}/*
 %{_infodir}/*.info*
@@ -64,6 +72,16 @@
 %dir %{_datadir}/aclocal
 
 %changelog
+* Tue Feb 20 2007 Karsten Hopp <karsten at redhat.com> 1.10-4
+- bz 225302:
+- make install DESTDIR=...
+- fix BuildRoot
+- fix post/preun requirements
+- define all directories on ./configure line
+- filter perl(Automake*) dependencies
+- replace all tabs with spaces
+- remove trailing dot from summary
+
 * Thu Jan 18 2007 Karsten Hopp <karsten at redhat.com> 1.10-3
 - don't abort (un)install scriptlets when _excludedocs is set (Ville Skyttä)