X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=autoconf.spec;h=27f5a3df012ac7f13bf6c3a40d3a9166dbed2ed3;hb=0ab3f2cf72b76935a65e972891024bf6610c702a;hp=875e5874a98e271a49bfc8fe905ab3f8eedba114;hpb=47b741d1afc19b23db6c1c7aeb0e21c92cf6d3fb;p=packages%2Fautoconf.git

diff --git a/autoconf.spec b/autoconf.spec
index 875e587..27f5a3d 100644
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -2,6 +2,7 @@
 # Conditional build:
 %bcond_without	emacs	# without emacs autoconf-mode
 %bcond_without	xemacs	# without XEmacs autoconf-mode
+%bcond_without	tests	# do not perform "make check"
 #
 %undefine	with_emacs
 %undefine	with_xemacs
@@ -18,37 +19,36 @@ 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.61
-Release:	4
-License:	GPL
+Version:	2.67
+Release:	1
+License:	GPL v2+/v3+
 Group:		Development/Building
 # stable releases:
-Source0:	ftp://ftp.gnu.org/gnu/autoconf/%{name}-%{version}.tar.bz2
-# Source0-md5:	36d3fe706ad0950f1be10c46a429efe0
+Source0:	http://ftp.gnu.org/gnu/autoconf/%{name}-%{version}.tar.xz
+# Source0-md5:	1da24eebe4e6a774e4039242a4f06aad
 # devel releases:
-#Source0:	ftp://alpha.gnu.org/pub/gnu/autoconf/%{name}-%{version}.tar.bz2
+#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
-Patch4:		%{name}-gettext.patch
-Patch5:		%{name}-define.patch
 URL:		http://www.gnu.org/software/autoconf/
-BuildConflicts:	m4 = 1.4o
 %{?with_emacs:BuildRequires:	emacs}
-BuildRequires:	m4 >= 1:1.4p-0.pre2.2
+BuildRequires:	xz
+BuildRequires:	m4 >= 3:1.4.13
 BuildRequires:	rpm-perlprov
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	texinfo >= 4.2
 %{?with_xemacs:BuildRequires:	xemacs}
-Conflicts:	gettext < 0.10.38-3
+BuildConflicts:	m4 = 1.4o
 Requires:	/bin/awk
 Requires:	diffutils
-#Requires:	m4 >= 1:1.4p-0.pre2.2
+Conflicts:	gettext < 0.10.38-3
 %requires_eq	m4
 Requires:	mktemp
-BuildArch:	noarch
 Obsoletes:	autoconf252
 Obsoletes:	autoconf253
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_libdir		%{_datadir}
@@ -199,14 +199,14 @@ Tryb edycji autoconf dla emacsa.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 %configure \
 	%{?with_xemacs:EMACS=xemacs}
 %{__make} -j1
 
+%{?with_tests:%{__make} check}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -231,22 +231,29 @@ rm lib/emacs/*.elc
 	lispdir=%{_emacs_lispdir}
 %endif
 
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post	-p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun	-p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS ChangeLog ChangeLog.2 NEWS README THANKS TODO
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/auto*
+%attr(755,root,root) %{_bindir}/ifnames
 %{_libdir}/autoconf
-%{_infodir}/*.info*
-%{_mandir}/man1/*
+%{_infodir}/autoconf.info*
+%{_infodir}/standards.info*
+%{_mandir}/man1/auto*.1*
+%{_mandir}/man1/config.sub.1*
+%{_mandir}/man1/config.guess.1*
+%{_mandir}/man1/ifnames.1*
 
 %if %{with emacs}
 %files -n emacs-autoconf-mode-pkg