commit 6a0e547da876c253f2164c81a5b9f06db85ce12b
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date: Mon Feb 18 15:41:54 2013 +0100
- up to 1.3.4 20121209
mawk-fix_mawk_path.patch | 4 ++--
mawk.spec | 11 ++++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/mawk.spec b/mawk.spec
index 712ad21..0fe5e58 100644
--- a/mawk.spec
+++ b/mawk.spec
@@ -1,7 +1,8 @@
# Conditional build:
%bcond_with bootdisk # build bootdisk version (linked with
glibc-static)
+%bcond_without tests
-%define snap 20100625
+%define snap 20121209
Summary: An interpreter for the awk programming language
Summary(de.UTF-8): Mikes neuer Posix AWK-Interpretierer
@@ -19,7 +20,7 @@ License: GPL
Group: Applications/Text
# Source0: ftp://invisible-island.net/mawk/%{name}-%{version}.tgz
Source0: ftp://invisible-island.net/mawk/%{name}-%{version}-%{snap}.tgz
-# Source0-md5: 447e7c322fa1e58141f5085bae87351f
+# Source0-md5: 28de63bff452e031728509421087f20b
Source1: %{name}.1.pl
Patch0: %{name}-fix_%{name}_path.patch
URL: http://invisible-island.net/mawk/mawk.html
@@ -105,8 +106,6 @@ Wersja awka na bootkietkę.
%patch0 -p1
%build
-%{__aclocal}
-%{__autoconf}
%configure
%if %{with bootdisk}
%{__make} -j1 \
@@ -118,6 +117,8 @@ mv -f mawk mawk.BOOT
%{__make} -j1 \
LDFLAGS="%{rpmldflags}"
+%{?with_tests:%{__make} -j1 check}
+
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{_bindir},%{_mandir}/{man1,pl/man1},%{_examplesdir}/%{name}-%{version},/bin}
@@ -133,7 +134,7 @@ echo ".so mawk.1" > $RPM_BUILD_ROOT%{_mandir}/man1/awk.1
install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/pl/man1/mawk.1
echo ".so mawk.1" > $RPM_BUILD_ROOT%{_mandir}/pl/man1/awk.1
-mv -f examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -p examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%if %{with bootdisk}
install -d $RPM_BUILD_ROOT%{_libdir}/bootdisk/bin
diff --git a/mawk-fix_mawk_path.patch b/mawk-fix_mawk_path.patch
index 2cb6a38..6f05b85 100644
--- a/mawk-fix_mawk_path.patch
+++ b/mawk-fix_mawk_path.patch
@@ -29,8 +29,8 @@ diff -urN mawk-1.3.4.org/examples/gdecl.awk
mawk-1.3.4/examples/gdecl.awk
--- mawk-1.3.4.org/examples/gdecl.awk 2008-09-09 22:52:55.000000000 +0200
+++ mawk-1.3.4/examples/gdecl.awk 2010-09-30 21:51:50.144198850 +0200
@@ -1,4 +1,4 @@
--#!/usr/bin/mawk
-+#!/bin/mawk
+-#!/usr/bin/mawk -f
++#!/bin/mawk -f
# parse a C declaration by recursive descent
#
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mawk.git/commitdiff/6a0e547da876c253f2164c81a5b9f06db85ce12b
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
