- threads are required only if perl was built with threads

[packages/automake.git] / automake.spec

diff --git a/automake.spec b/automake.spec
index 289042daf7dd859eb68f0b101c5e5709db4cb561..339c6ae47d16ff7e202d0e1accc0cd7a7958dc3f 100644 (file)
--- a/automake.spec
+++ b/automake.spec
@@ -14,13 +14,13 @@ Summary(ru.UTF-8):  GNU automake - инструменты для автомати
 Summary(tr.UTF-8):     Makefile yapılandırma araçları
 Summary(uk.UTF-8):     GNU automake - інструменти для автоматичної генерації Makefile'ів
 Name:          automake
-Version:       1.10
-Release:       3
+Version:       1.11
+Release:       2
 Epoch:         1
-License:       GPL
+License:       GPL v2+
 Group:         Development/Building
-Source0:       ftp://sources.redhat.com/pub/automake/%{name}-%{version}.tar.bz2
-# Source0-md5: 0e2e0f757f9e1e89b66033905860fded
+Source0:       http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.bz2
+# Source0-md5: 4db4efe027e26b33930a7e151de19d0f
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-man.patch
 Patch2:                %{name}-no_versioned_dir.patch
@@ -28,15 +28,20 @@ Patch3:             %{name}-morearchs.patch
 URL:           http://sources.redhat.com/automake/
 %if %{with regeneration}
 BuildRequires: autoconf >= 2.60
-BuildRequires: automake
+BuildRequires: automake >= 1:1.10a
 %else
-BuildRequires: autoconf = 2.60
+BuildRequires: autoconf >= 2.63
 %endif
 BuildRequires: rpm-perlprov
 BuildRequires: texinfo >= 4.7
 Requires(pre): fileutils
 Requires:      filesystem >= 3.0-2
 Requires:      perl(File::Glob)
+%if %(%{__perl} -le 'use threads; print 1' || echo 0)
+# required only if perl was built with threads
+Requires:      perl(Thread::Queue)
+Requires:      perl(threads)
+%endif
 Conflicts:     autoconf < 2.60
 Conflicts:     libtool < 2:1.5-11
 #BuildArch:    noarch -- autoconf doesn't allow
@@ -98,9 +103,16 @@ Makefile'ів.
 %patch2 -p1
 %patch3 -p1
 
+%if %{with regeneration}
+# prepare temporary copy of m4 dir without amversion.m4 (which causes automake version check)
+mkdir m4-tmp
+cd m4-tmp
+ln -s ../m4/[!a]*.m4 ../m4/a[!m]*.m4 .
+%endif
+
 %build
 %if %{with regeneration}
-%{__aclocal} -I m4
+%{__aclocal} -I m4-tmp
 %endif
 %{__autoconf}
 %if %{with regeneration}
@@ -124,19 +136,22 @@ 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 ChangeLog NEWS README THANKS TODO
-%attr(755,root,root) %{_bindir}/*
-%{_infodir}/automake*
-
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/aclocal*
+%attr(755,root,root) %{_bindir}/automake*
+%{_infodir}/automake.info*
+%{_mandir}/man1/aclocal.1*
+%{_mandir}/man1/aclocal-1.11.1*
+%{_mandir}/man1/automake.1*
+%{_mandir}/man1/automake-1.11.1*
 
 %{_datadir}/aclocal-*
 %dir %{_datadir}/automake