From de01dc1e01c1a01bebb061a2fcaded2807b45eb9 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sep 25 2012 12:28:48 +0000 Subject: Fixes from Ralf Corsepius Resolves: #823766 --- diff --git a/automake.spec b/automake.spec index 6bcc2ab..c04564b 100644 --- a/automake.spec +++ b/automake.spec @@ -3,7 +3,7 @@ Summary: A GNU tool for automatically creating Makefiles Name: automake Version: %{api_version}.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and GFDL Group: Development/Tools Source: http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz @@ -16,20 +16,20 @@ Requires(preun): /sbin/install-info BuildArch: noarch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# run "make check" by default +%bcond_without check + # for better tests coverage: BuildRequires: libtool gettext-devel flex bison texinfo-tex texlive-dvips BuildRequires: gcc-java java-devel-openjdk gcc-gfortran /usr/bin/g77 BuildRequires: dejagnu expect emacs imake python-docutils vala # the filtering macros are currently in /etc/rpm/macros.perl: -BuildRequires: perl-devel +BuildRequires: perl-macros # remove bogus Automake perl dependencies and provides -%{?perl_default_filter: -%filter_from_provides /^perl(Automake::/d -%filter_from_requires /^perl(Automake::/d -%perl_default_filter -} +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Automake:: +%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(Automake:: %description Automake is a tool for automatically generating `Makefile.in' @@ -41,15 +41,13 @@ Makefiles. %prep %setup -q -n automake-%{version} -%patch0 -p1 +%patch0 -p1 -b .aclocal7-sleep %build ./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ --bindir=%{_bindir} --datadir=%{_datadir} --libdir=%{_libdir} \ - --docdir=%{_docdir}/%{name}-%{version} + --docdir=%{_docdir}/%{name}-%{version} --disable-silent-rules make %{?_smp_mflags} -mv -f NEWS NEWS_ -iconv -f ISO_8859-15 -t UTF-8 NEWS_ -o NEWS cp m4/acdir/README README.aclocal cp contrib/multilib/README README.multilib @@ -64,7 +62,9 @@ rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -rf ${RPM_BUILD_ROOT}%{_datadir}/aclocal %check +%if %{with check} make check +%endif %clean rm -rf ${RPM_BUILD_ROOT} @@ -79,7 +79,7 @@ fi %files %defattr(-,root,root,-) -%doc AUTHORS README THANKS NEWS README.aclocal README.multilib +%doc AUTHORS README THANKS NEWS README.aclocal README.multilib COPYING* %{_bindir}/* %{_infodir}/*.info* %{_datadir}/automake-%{api_version} @@ -87,6 +87,19 @@ fi %{_mandir}/man1/* %changelog +* Tue Sep 25 2012 Pavel Raiskup - 1.12.2-3 +- Thanks to Ralf Corsépius - these fixes are + slightly reworked changes (due to rebase of automake) from his patch attached + to bug #823766 +- Include COPYING. +- Add rpm-4.9 perl-filters %%__provides_exclude, %%__requires_exclude. + Remove rpm-4.8 perl-filters (Address RHBZ 823766). +- Remove utf-8 conversion of NEWS (Already utf-8 encoded). +- Add BR: perl-macros, Remove BR: perl-devel. +- Add support for --with/out=check. +- Append --disable-silent-rules to configure. +- remove trailing white spaces + * Wed Jul 18 2012 Fedora Release Engineering - 1.12.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild @@ -112,9 +125,9 @@ fi - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild * Mon Mar 29 2010 Karsten Hopp 1.11.1-5 -- removed redundant text about installing autoconf from package +- removed redundant text about installing autoconf from package description (#225302) -- don't create /usr/share/aclocal as it is owned be the filesystem +- don't create /usr/share/aclocal as it is owned be the filesystem package (#570744, #225302) * Fri Mar 05 2010 Karsten Hopp 1.11.1-4 @@ -372,7 +385,7 @@ fi * Fri Aug 24 2001 Jens Petersen - 1.4p5-2 - dont raise error when there is source in a subdirectory (bug #35156). - This was preventing automake from working in binutuls/gas + This was preventing automake from working in binutuls/gas [patch from HJ Lu ] - format long lines of output properly with backslash + newlines as in 1.4 (bug #35259) [patch from HJ Lu ]