|
|
@@ -1,20 +1,21 @@
|
|
|
-%define api_version 1.11
|
|
|
+%define api_version 1.12
|
|
|
|
|
|
Summary: A GNU tool for automatically creating Makefiles.
|
|
|
Summary(ja): Makefile を自動生成するための GNU ツール
|
|
|
Name: automake
|
|
|
-Version: %{api_version}.1
|
|
|
-Release: 4%{?_dist_release}
|
|
|
+Version: %{api_version}.2
|
|
|
+Release: 1%{?_dist_release}
|
|
|
License: GPL
|
|
|
Group: Development/Tools
|
|
|
-Source: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.bz2
|
|
|
-Patch100: automake-1.11.1_CVE-2012-3386.patch
|
|
|
+Source: ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
|
|
|
+Patch0: automake-1.12.2-aclocal7-sleep.patch
|
|
|
+Patch1: automake-1.12.2-vala-fails.patch
|
|
|
|
|
|
URL: http://sources.redhat.com/automake
|
|
|
Requires: perl, autoconf >= 2.58
|
|
|
Buildrequires: autoconf >= 2.58
|
|
|
Requires(pre): install-info
|
|
|
-# Prereq: install-info
|
|
|
+
|
|
|
BuildArchitectures: noarch
|
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
@@ -23,8 +24,7 @@ Distribution: Vine Linux
|
|
|
Packager: daisuke
|
|
|
|
|
|
# run "make check" by default
|
|
|
-%{?_without_check: %define _without_check 1}
|
|
|
-%{!?_without_check: %define _without_check 0}
|
|
|
+%bcond_without check
|
|
|
|
|
|
%description
|
|
|
Automake is an experimental Makefile generator. Automake was inspired
|
|
|
@@ -39,51 +39,66 @@ GNU's Autoconf package.
|
|
|
|
|
|
%prep
|
|
|
%setup -q -n automake-%{version}
|
|
|
-
|
|
|
-%patch100 -p1 -b .CVE-2012-3386
|
|
|
+%patch0 -p1
|
|
|
+%patch1 -p1
|
|
|
|
|
|
%build
|
|
|
-./configure --prefix=%{_prefix}
|
|
|
+./configure \
|
|
|
+ --prefix=%{_prefix} \
|
|
|
+ --docdir=%{_docdir}/%{name}-%{version}
|
|
|
%{__make} %{?_smp_mflags}
|
|
|
-%if ! %{_without_check}
|
|
|
- %{__make} check
|
|
|
-%endif
|
|
|
+cp m4/acdir/README README.aclocal
|
|
|
+cp contrib/multilib/README README.multilib
|
|
|
|
|
|
|
|
|
%install
|
|
|
rm -rf ${RPM_BUILD_ROOT}
|
|
|
-%makeinstall
|
|
|
+make install DESTDIR=${RPM_BUILD_ROOT}
|
|
|
+mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
|
|
|
+
|
|
|
|
|
|
# create this dir empty so we can own it
|
|
|
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/aclocal
|
|
|
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/aclocal
|
|
|
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
|
|
|
|
|
|
|
|
+%check
|
|
|
+%if %{with check}
|
|
|
+%{__make} check
|
|
|
+%endif
|
|
|
+
|
|
|
%clean
|
|
|
rm -rf ${RPM_BUILD_ROOT}
|
|
|
|
|
|
|
|
|
%post
|
|
|
-/sbin/install-info %{_infodir}/automake.info.gz %{_infodir}/dir
|
|
|
+/sbin/install-info %{_infodir}/automake.info.gz %{_infodir}/dir ||:
|
|
|
|
|
|
|
|
|
%preun
|
|
|
if [ $1 = 0 ]; then
|
|
|
- /sbin/install-info --delete %{_infodir}/automake.info.gz %{_infodir}/dir
|
|
|
+ /sbin/install-info --delete %{_infodir}/automake.info.gz %{_infodir}/dir ||:
|
|
|
fi
|
|
|
|
|
|
|
|
|
%files
|
|
|
%defattr(-,root,root)
|
|
|
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
|
|
|
+%doc REAME.aclocal README.multilib
|
|
|
%{_bindir}/*
|
|
|
%{_infodir}/*.info*
|
|
|
%{_datadir}/automake-%{api_version}
|
|
|
%{_datadir}/aclocal-%{api_version}
|
|
|
+%{_mandir}/man1/*
|
|
|
%dir %{_datadir}/aclocal
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Nov 27 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.12.2-1
|
|
|
+- update to 1.12.2
|
|
|
+- add patch1 to skip vala test.
|
|
|
+
|
|
|
* Sun Sep 30 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.11.1-4
|
|
|
- change prereq to Require(pre)
|
|
|
|
daisuke