Attachment 586086 Details for Bug 823766 – Patch against automake/master

[patch] Patch against automake/master

automake-1.11.5-bz823766.patch (text/plain), 3.06 KB, created by Ralf Corsepius on 2012-05-22 17:10:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Corsepius

Created: 2012-05-22 17:10:20 UTC

Size: 3.06 KB

patch

obsolete

>diff --git a/automake.spec b/automake.spec
>index 3e90730..85123a8 100644
>--- a/automake.spec
>+++ b/automake.spec
>@@ -3,11 +3,12 @@
> Summary:    A GNU tool for automatically creating Makefiles
> Name:       automake
> Version:    %{api_version}.5
>-Release:    1%{?dist}
>+Release:    2%{?dist}
> License:    GPLv2+ and GFDL
> Group:      Development/Tools
> Source:     http://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
>-Patch0:     automake-1.11.3-checks.patch
>+# Back-port from automake-1.12
>+Patch0:     automake-1.11.5-checks.patch
> URL:        http://sourceware.org/automake/
> Requires:   autoconf >= 2.62
> Buildrequires:  autoconf >= 2.62
>@@ -16,20 +17,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 +42,13 @@ Makefiles.
> 
> %prep
> %setup -q -n automake-%{version}
>-#patch0 -p1
>+%patch0 -p1
> 
> %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
> 
> %install
> rm -rf ${RPM_BUILD_ROOT}
>@@ -60,7 +59,9 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
> rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
> 
> %check
>+%if %{with check}
> make check
>+%endif
> 
> %clean
> rm -rf ${RPM_BUILD_ROOT}
>@@ -75,7 +76,7 @@ fi
> 
> %files
> %defattr(-,root,root,-)
>-%doc AUTHORS README THANKS NEWS
>+%doc AUTHORS README THANKS NEWS COPYING*
> %{_bindir}/*
> %{_infodir}/*.info*
> %{_datadir}/automake-%{api_version}
>@@ -83,6 +84,16 @@ fi
> %{_mandir}/man1/*
> 
> %changelog
>+* Tue May 22 2012 Ralf CorsÃ©pius <corsepiu@fedoraproject.org> 1.11.5-2
>+- Remove utf-8 conversion of NEWS (Already utf-8 encoded).
>+- Include COPYING.
>+- Add rpm-4.9 perl-filters %%__provides_exclude, %%__requires_exclude.
>+  Remove rpm-4.8 perl-filters (Address RHBZ 823766).
>+- Add BR: perl-macros, Remove BR: perl-devel.
>+- Add support for --with/out=check.
>+- Add automake-1.11.5-checks.patch.
>+- Append --disable-silent-rules to configure.
>+
> * Mon Apr 16 2012 Karsten Hopp <karsten@redhat.com> 1.11.5-1
> - automake-1.11.5
>

Actions: View | Diff

Attachments on bug 823766: 586086 | 586087