make-4.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10332 ec354946-7b23-47d6-9f5a-488ba84defc7

m/make/make-vl.spec

@@ -2,49 +2,45 @@ Summary:     A GNU tool which simplifies the build process for users.
 Summary(ja): ユーザのビルド手続きを平易にする GNU ツール
 Name: make
 Epoch: 1
-Version: 3.82
-Release: 2%{?_dist_release}
+Version: 4.1
+Release: 1%{?_dist_release}
 License: GPL
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
 Source: ftp://ftp.gnu.org/gnu/make/make-%{version}.tar.bz2
-Source1: make-3.81-ja.po
 
-Patch1: make-3.82-noclock_gettime.patch
-Patch2: make-3.82-j8k.patch
-Patch3: make-3.82-getcwd.patch
-Patch4: make-3.82-err-reporting.patch
+Patch0: make-4.0-getcwd.patch
+Patch1: make-4.0-newlines.patch
 
-# Upstream: https://savannah.gnu.org/bugs/?30748
-Patch6: make-3.82-weird-shell.patch
-
-Patch7: make-3.82-newlines.patch
-Patch8: make-3.82-jobserver.patch
-Patch9: make-3.82-bugfixes.patch
-Patch10: make-3.82-sort-blank.patch
-Patch11: make-3.82-copy-on-expand.patch
+# Assume we don't have clock_gettime in configure, so that
+# make is not linked against -lpthread (and thus does not
+# limit stack to 2MB).
+Patch2: make-4.0-noclock_gettime.patch
 
-# Upstream: https://savannah.gnu.org/bugs/?33873
-Patch12: make-3.82-parallel-remake.patch
+# BZs #142691, #17374
+Patch3: make-4.0-j8k.patch
 
-# http://savannah.gnu.org/bugs/?34335
-Patch13: make-3.82-warn_undefined_function.patch
+# make sure errno for error reporting is not lost accross _() calls
+Patch4: make-4.0-err-reporting.patch
 
-# http://lists.gnu.org/archive/html/bug-make/2011-06/msg00032.html
-Patch14: make-3.82-trace.patch
+# Upstream: https://savannah.gnu.org/bugs/?30748
+# The default value of .SHELL_FLAGS is -c.
+Patch5: make-4.0-weird-shell.patch
 
-# http://lists.gnu.org/archive/html/bug-make/2011-04/msg00002.html
-Patch15: make-3.82-expensive_glob.patch
+# make seg faults when run with no arguments
+Patch6: make-4.1-rh1277968.patch
 
-# Upstream: https://savannah.gnu.org/bugs/?30653
-Patch16: make-3.82-dont-prune-intermediate.patch
+# fix ja.po
+Patch1000: make-4.1-ja.po.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRequires: automake >= 1.7.3
+BuildRequires: guile-devel
 BuildRequires: perl
 BuildRequires: procps
+BuildRequires: texinfo
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -71,49 +67,38 @@ commonly used to simplify the process of installing programs.
 GNU make ツールは，プログラムのインストールを容易にするのに
 非常によく使われますので，このパッケージは是非インストールして下さい．
 
-
 %prep
 %setup -q
 
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p0
-%patch13 -p2
-%patch14 -p1
-%patch15 -p0
-%patch16 -p0
+
 rm -f tests/scripts/features/parallelism.orig
 
-cp %{SOURCE1} po/ja.po
+%patch1000 -p1 -b .po
 
 %build
-config/missing --run aclocal -I config
-config/missing --run automake --gnu Makefile
-config/missing --run autoconf
+%if %{?_dist_release} == "vl6"
 %configure
-make
+%else
+%configure --with-guile
+%endif
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
-
-pushd $RPM_BUILD_ROOT
-  ln -sf make .%{_bindir}/gmake
-#  gzip -9nf .%{_infodir}/make.info*
-  rm -f .%{_infodir}/dir
-popd
+rm -rf ${RPM_BUILD_ROOT}
+make DESTDIR=$RPM_BUILD_ROOT install
+ln -sf make ${RPM_BUILD_ROOT}/%{_bindir}/gmake
+ln -sf make.1 ${RPM_BUILD_ROOT}/%{_mandir}/man1/gmake.1
+rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
 
 %find_lang %name
 
-
 %check
 echo ============TESTING===============
 /usr/bin/env LANG=C make check
@@ -134,13 +119,19 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc NEWS README
+%doc NEWS README COPYING AUTHORS
 %{_bindir}/*
 %{_mandir}/man*/*
 %{_infodir}/*.info*
-#%{_datadir}/locale/*/LC_MESSAGES/make*
+%{_includedir}/gnumake.h
 
 %changelog
+* Wed May 25 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1-1
+- new upstream release.
+- dropped all patches.
+- imported patches from rawhide.
+- added Patch1000 to fix ja.po.
+
 * Sun Feb 02 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.82-2
 - rebuild with VineSeed environment