rpms/automake
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Disable vala tests again (still not fixed in 1.13.1)

Browse Source 
Sorry for noise.
This commit is contained in:
Pavel Raiskup 2013-01-12 10:07:41 +01:00
parent 20b6afb27a
commit 46d225df70
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
automake-1.13.1-disable-vala-tests.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/Makefile.in b/Makefile.in
index 47badba..7c57915 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1987,16 +1987,6 @@ t/upc2.sh \
t/upc3.sh \
t/vala-configure.sh \
t/vala-grepping.sh \
-t/vala-headers.sh \
-t/vala-libs.sh \
-t/vala-mix.sh \
-t/vala-mix2.sh \
-t/vala-non-recursive-setup.sh \
-t/vala-parallel.sh \
-t/vala-per-target-flags.sh \
-t/vala-recursive-setup.sh \
-t/vala-vapi.sh \
-t/vala-vpath.sh \
t/vars.sh \
t/vars3.sh \
t/var-recurs.sh \

12
automake.spec
View File

@ -7,6 +7,9 @@ Release: 1%{?dist}
License: GPLv2+ and GFDL License: GPLv2+ and GFDL
Group: Development/Tools Group: Development/Tools
Source: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz Source: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
# Disable test with vala (in Makefile.in — not Makefile.am — until the
# autoreconf run is not safe)
Patch0: automake-1.13.1-disable-vala-tests.patch
URL: http://www.gnu.org/software/automake/ URL: http://www.gnu.org/software/automake/
Requires: autoconf >= 2.65 Requires: autoconf >= 2.65
BuildRequires: autoconf >= 2.65 BuildRequires: autoconf >= 2.65
@ -40,6 +43,11 @@ Makefiles.
%prep %prep
%setup -q -n automake-%{version} %setup -q -n automake-%{version}
%patch0 -p1 -b .vala_tests_disable
# TODO: Do not run autoreconf until we are sure that on build machine is
# installed automake 1.13. Otherwise it will cause that Makefile is not using
# AM_TEST_ENVIRONMENT properly and testsuite will not work.
#autoreconf -i -f
%build %build
./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ ./configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
@ -76,12 +84,12 @@ fi
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Thu Jan 10 2013 Pavel Raiskup <praiskup@redhat.com> - 1.13.1-1 * Sat Jan 12 2013 Pavel Raiskup <praiskup@redhat.com> - 1.13.1-1
- update to recent automake-1.13.1 - update to recent automake-1.13.1
- minimum required autoconf is 2.65 (based on upstream suggestion) - minimum required autoconf is 2.65 (based on upstream suggestion)
- make check is run now parallel (based on 't/README' it helps also on - make check is run now parallel (based on 't/README' it helps also on
single-thread machines) single-thread machines)
- drop unnecessary patches - drop old sleep-patch and better disable vala tests (requires autoreconf)
* Wed Oct 25 2012 Pavel Raiskup <praiskup@redhat.com> - 1.12.2-6 * Wed Oct 25 2012 Pavel Raiskup <praiskup@redhat.com> - 1.12.2-6
- fedora-review -> s/define/global/, s/RPM_BUILD_ROOT/buildroot/, - fedora-review -> s/define/global/, s/RPM_BUILD_ROOT/buildroot/,