- updated to 1.6.2, release 3 (merge DEVEL branch to HEAD).

Changed files:
    automake.spec -> 1.68

diff --git a/automake.spec b/automake.spec
index 4aa26b1ddceeddfa5bc67b0402eea4aed2006a2b..25253796010ef4afcfb1b4a1553d18adc59c51aa 100644 (file)
--- a/automake.spec
+++ b/automake.spec
@@ -1,4 +1,3 @@
-
 %include       /usr/lib/rpm/macros.perl
 Summary:       GNU automake - Makefile configuration tools
 Summary(de):   GNU automake - Makefile-Konfigurationstools
@@ -6,24 +5,32 @@ Summary(es):  GNU automake - herramientas de configuraci
 Summary(fr):   automake de GNU - Outils de configuration des makefiles
 Summary(pl):   GNU Automake - generator plików Makefile
 Summary(pt_BR):        GNU automake - ferramentas de configuração de Makefile
+Summary(ru):   GNU automake - ÉÎÓÔÒÕÍÅÎÔÙ ÄÌÑ Á×ÔÏÍÁÔÉÞÅÓËÏÊ ÇÅÎÅÒÁÃÉÉ Makefile'Ï×
 Summary(tr):   Makefile yapýlandýrma araçlarý
+Summary(uk):   GNU automake - ¦ÎÓÔÒÕÍÅÎÔÉ ÄÌÑ Á×ÔÏÍÁÔÉÞÎϧ ÇÅÎÅÒÁæ§ Makefile'¦×
 Name:          automake
-Version:       1.5
-Release:       8
+Version:       1.6.2
+%define        _mver   %(echo %{version} | cut -d"." -f1-2)
+Release:       3
 License:       GPL
 Group:         Development/Building
-Source0:       ftp://sourceware.cygnus.com/pub/automake/%{name}-%{version}.tar.gz
+Source0:       ftp://sourceware.cygnus.com/pub/automake/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-man.patch
-Patch2:                %{name}-abi.patch
+Patch2:                %{name}-regex.m4.patch
+Patch3:                %{name}-no_versioned_dir.patch
 URL:           http://sourceware.cygnus.com/automake/
-BuildRequires: autoconf
-BuildRequires: perl
+BuildRequires: autoconf >= 2.52
+BuildRequires: rpm-perlprov
+Requires(pre): fileutils
 Requires:      perl
 Requires:      perl(File::Glob)
+Conflicts:     autoconf < 2.52
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildArch:     noarch
 
+%define                _aclocaldir     %{_datadir}/aclocal
+
 %description
 Automake is an experimental Makefile generator. Automake was inspired
 by the 4.4BSD make and include files, but aims to be portable and to
@@ -56,16 +63,29 @@ Automake 
 pelo 4.4BSD make e inclui arquivos, mas visa ser portável e compatível
 com os padrões GNU para variáveis e alvos de Makefile.
 
+%description -l ru
+Automake - ÜÔÏ ÜËÓÐÅÒÉÍÅÎÔÁÌØÎÙÊ ÇÅÎÅÒÁÔÏÒ Makefile'Ï×. éÄÅÑ ÂÙÌÁ
+ÎÁ×ÅÑÎÁ ÐÒÏÇÒÁÍÍÏÊ make É ÈÅÄÅÒÁÍÉ ÉÚ 4.4BSD, ÎÏ automake ÐÒÅÔÅÎÄÕÅÔ
+ÎÁ ÔÏ, ÞÔÏÂÙ ÂÙÔØ ÐÏÒÔÁÂÅÌØÎÏÊ É ÓÏÏÔ×ÅÔÓÔ×Ï×ÁÔØ ÓÔÁÎÄÁÒÔÁÍ GNU ÎÁ
+ÐÅÒÅÍÅÎÎÙÅ É ÃÅÌÉ Makefile'Ï×.
+
 %description -l tr
 Automake deneysel bir Makefile üreticisidir. 4.4BSD make ve include
 dosyalarýndan esinlenilmistir, ama amaç taþýnabilir olmak ve Makefile
 deðiþkenleri ve hedefleri için GNU standartlarýna uyum göstermektir.
 
+%description -l uk
+Automake - ÃÅ ÅËÓÐÅÒÉÍÅÎÔÁÌØÎÉÊ ÇÅÎÅÒÁÔÏÒ Makefile'¦×. ¶ÄÅÑ ÂÕÌÁ
+ÎÁצÑÎÁ ÐÒÏÇÒÁÍÏÀ make ÔÁ ÈÅÄÅÒÁÍÉ Ú 4.4BSD, ÁÌÅ automake ÍÁ¤ ÚÁ æÌØ
+ÍϦÌØΦÓÔØ ÔÁ צÄÐÏצÄΦÓÔØ ÓÔÁÎÄÁÒÔÁÍ GNU ÎÁ ÚͦÎΦ Ô¦ æ̦
+Makefile'¦×.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__autoconf}
@@ -74,14 +94,15 @@ de
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       m4datadir=%{_aclocaldir} \
+       pkgvdatadir=%{_datadir}/automake
 
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
 install aclocal.1 automake.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
-gzip -9nf AUTHORS ChangeLog NEWS README THANKS TODO
-
 %post
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
@@ -93,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz
+%doc AUTHORS ChangeLog NEWS README THANKS TODO
 %attr(755,root,root) %{_bindir}/*
 %{_infodir}/automake*
 
@@ -115,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_datadir}/automake/elisp-comp
 %attr(755,root,root) %{_datadir}/automake/install-sh
 %attr(755,root,root) %{_datadir}/automake/mdate-sh
-%attr(755,root,root) %{_datadir}/automake/ylwrap
-%attr(755,root,root) %{_datadir}/automake/py-compile
-%attr(755,root,root) %{_datadir}/automake/mkinstalldirs
 %attr(755,root,root) %{_datadir}/automake/missing
+%attr(755,root,root) %{_datadir}/automake/mkinstalldirs
+%attr(755,root,root) %{_datadir}/automake/py-compile
+%attr(755,root,root) %{_datadir}/automake/ylwrap