X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=autoconf.spec;h=dbf228572f3e138434690108af6e077debc21043;hb=HEAD;hp=cc773335d27d0867a821003bc6da297dc2618dce;hpb=0b075bdc863f6103b830902077530d09be6a4550;p=packages%2Fautoconf.git

diff --git a/autoconf.spec b/autoconf.spec
index cc77333..6e633ca 100644
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -1,13 +1,9 @@
 #
 # Conditional build:
-%bcond_without	emacs	# without emacs autoconf-mode
-%bcond_without	xemacs	# without XEmacs autoconf-mode
-%bcond_without	tests
-#
-%undefine	with_emacs
-%undefine	with_xemacs
-#
-%include	/usr/lib/rpm/macros.perl
+%bcond_with	emacs	# emacs autoconf-mode
+%bcond_with	xemacs	# XEmacs autoconf-mode
+%bcond_without	tests	# do not perform "make check"
+
 Summary:	GNU autoconf - source configuration tools
 Summary(de.UTF-8):	Ein GNU-Hilfsmittel für Quellencode automatisch konfigurieren
 Summary(es.UTF-8):	Una herramienta GNU para configurar automáticamente el código fuente
@@ -19,40 +15,51 @@ Summary(pt_BR.UTF-8):	GNU autoconf - ferramentas de configuração de fontes
 Summary(ru.UTF-8):	GNU autoconf - автоконфигуратор исходных текстов
 Summary(uk.UTF-8):	GNU autoconf - автоконфігуратор вихідних текстів
 Name:		autoconf
-Version:	2.65
-Release:	2
+Version:	2.72
+Release:	1
 License:	GPL v2+/v3+
 Group:		Development/Building
 # stable releases:
-Source0:	http://ftp.gnu.org/gnu/autoconf/%{name}-%{version}.tar.xz
-# Source0-md5:	dfb23a46ecb73a0abade39c053a6c5a1
+Source0:	https://ftp.gnu.org/gnu/autoconf/%{name}-%{version}.tar.xz
+# Source0-md5:	1be79f7106ab6767f18391c5e22be701
 # devel releases:
 #Source0:	http://alpha.gnu.org/gnu/autoconf/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-mawk.patch
 Patch1:		%{name}-info.patch
 Patch2:		%{name}-AC_EGREP.patch
 Patch3:		%{name}-cxxcpp-warnonly.patch
-# it's unknown why this patch is here but it causes testsuite to fail
-Patch4:		%{name}-gettext.patch
-Patch5:		%{name}-git.patch
+Patch4:		%{name}-mksh.patch
+# https://savannah.gnu.org/support/index.php?110983 (AC_SYS_LARGEFILE/AC_SYS_YEAR2038 test failures on ix86)
+Patch5:		%{name}-largefile.patch
+Patch6:		%{name}-tests.patch
 URL:		http://www.gnu.org/software/autoconf/
 %{?with_emacs:BuildRequires:	emacs}
 BuildRequires:	xz
 BuildRequires:	m4 >= 3:1.4.13
 BuildRequires:	rpm-perlprov
+BuildRequires:	rpmbuild(macros) >= 1.745
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	texinfo >= 4.2
 %{?with_xemacs:BuildRequires:	xemacs}
 BuildConflicts:	m4 = 1.4o
 Requires:	/bin/awk
 Requires:	diffutils
+Conflicts:	automake < 1:1.8
 Conflicts:	gettext < 0.10.38-3
+Conflicts:	pkgconfig < 1:0.25-2
 %requires_eq	m4
 Requires:	mktemp
-Obsoletes:	autoconf252
-Obsoletes:	autoconf253
+Obsoletes:	autoconf252 < 2.53
+Obsoletes:	autoconf253 < 2.54
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if "%{_host_cpu}" == "x32"
+%define	build_arch %{_target_platform}
+%else
+%define	build_arch %{_host}
+%endif
+
 %define		_libdir		%{_datadir}
 
 %description
@@ -196,17 +203,19 @@ Emacs autoconf-mode.
 Tryb edycji autoconf dla emacsa.
 
 %prep
-%setup -q -c -T
-lzma -dc %{SOURCE0} | tar xf - -C ..
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-#%patch4 -p1
-#%patch5 -p1 # seems obsolete
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %configure \
+	--host=%{build_arch} \
+	--build=%{build_arch} \
 	%{?with_xemacs:EMACS=xemacs}
 %{__make} -j1
 
@@ -229,7 +238,7 @@ xemacs -batch -vanilla -f batch-byte-compile \
 %endif
 
 %if %{with emacs} && %{with xemacs}
-rm lib/emacs/*.elc
+%{__rm} lib/emacs/*.elc
 %{__make} -C lib/emacs install-dist_lispLISP \
 	DESTDIR=$RPM_BUILD_ROOT \
 	EMACS=emacs \
@@ -250,14 +259,22 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS ChangeLog ChangeLog.2 NEWS README THANKS TODO
-%attr(755,root,root) %{_bindir}/auto*
+%attr(755,root,root) %{_bindir}/autoconf
+%attr(755,root,root) %{_bindir}/autoheader
+%attr(755,root,root) %{_bindir}/autom4te
+%attr(755,root,root) %{_bindir}/autoreconf
+%attr(755,root,root) %{_bindir}/autoscan
+%attr(755,root,root) %{_bindir}/autoupdate
 %attr(755,root,root) %{_bindir}/ifnames
 %{_libdir}/autoconf
 %{_infodir}/autoconf.info*
 %{_infodir}/standards.info*
-%{_mandir}/man1/auto*.1*
-%{_mandir}/man1/config.sub.1*
-%{_mandir}/man1/config.guess.1*
+%{_mandir}/man1/autoconf.1*
+%{_mandir}/man1/autoheader.1*
+%{_mandir}/man1/autom4te.1*
+%{_mandir}/man1/autoreconf.1*
+%{_mandir}/man1/autoscan.1*
+%{_mandir}/man1/autoupdate.1*
 %{_mandir}/man1/ifnames.1*
 
 %if %{with emacs}