From c851205fea75619c14bd00061a54a983900c020e Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Feb 20 2007 12:42:34 +0000 Subject: - 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 --- diff --git a/automake.spec b/automake.spec index d65433c..40b0691 100644 --- a/automake.spec +++ b/automake.spec @@ -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 @@ GNU's Autoconf package. %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 @@ if [ $1 = 0 ]; then fi %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc AUTHORS README THANKS NEWS %{_bindir}/* %{_infodir}/*.info* @@ -64,6 +72,16 @@ fi %dir %{_datadir}/aclocal %changelog +* Tue Feb 20 2007 Karsten Hopp 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 1.10-3 - don't abort (un)install scriptlets when _excludedocs is set (Ville Skyttä) diff --git a/filter-provides-automake.sh b/filter-provides-automake.sh new file mode 100755 index 0000000..09f774d --- /dev/null +++ b/filter-provides-automake.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/lib/rpm/find-provides $* | egrep -v 'perl\(Automake' | sort -u diff --git a/filter-requires-automake.sh b/filter-requires-automake.sh new file mode 100755 index 0000000..980c092 --- /dev/null +++ b/filter-requires-automake.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/lib/rpm/find-requires $* | egrep -v 'perl\(Automake' | sort -u