commit a19f7d59c2e9cf8f94f4f409f834cbeaba76a523
Author: Marcin Krol <h...@tld-linux.org>
Date: Sat May 18 13:06:59 2024 +0200
- updated to 1.3.4 20240123
mawk-fix_mawk_path.patch | 75 +++++++++++++++++++++++++++---------------------
mawk.spec | 18 +++++++-----
2 files changed, 53 insertions(+), 40 deletions(-)
---
diff --git a/mawk.spec b/mawk.spec
index 3350fcc..7407da9 100644
--- a/mawk.spec
+++ b/mawk.spec
@@ -2,7 +2,7 @@
%bcond_with bootdisk # build bootdisk version (linked with
glibc-static)
%bcond_without tests
-%define snap 20200120
+%define snap 20240123
%define rel 1
Summary: An interpreter for the awk programming language
@@ -19,11 +19,11 @@ Version: 1.3.4
Release: 0.%{snap}.%{rel}
License: GPL
Group: Applications/Text
-Source0:
ftp://ftp.invisible-island.net/mawk/%{name}-%{version}-%{snap}.tgz
-# Source0-md5: d48752f402d7371d9eb5f68de3da05d4
+Source0:
https://invisible-island.net/archives/mawk/%{name}-%{version}-%{snap}.tgz
+# Source0-md5: 90376fbf8faf6e63be373ccad93504ba
Source1: %{name}.1.pl
Patch0: %{name}-fix_%{name}_path.patch
-URL: http://invisible-island.net/mawk/mawk.html
+URL: https://invisible-island.net/mawk/mawk.html
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@@ -129,7 +129,7 @@ install -d
$RPM_BUILD_ROOT{%{_bindir},%{_mandir}/{man1,pl/man1},%{_examplesdir}/
%{__make} install \
prefix=$RPM_BUILD_ROOT%{_prefix} \
- MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
+ MANDIR=$RPM_BUILD_ROOT%{_mandir} \
BINDIR=$RPM_BUILD_ROOT%{_bindir}
ln -sf mawk $RPM_BUILD_ROOT%{_bindir}/awk
@@ -153,8 +153,12 @@ rm -rf $RPM_BUILD_ROOT
%doc ACKNOWLEDGMENT CHANGES README
%attr(755,root,root) %{_bindir}/mawk
%attr(755,root,root) %{_bindir}/awk
-%{_mandir}/man1/*
-%lang(pl) %{_mandir}/pl/man1/*
+%{_mandir}/man1/awk.1*
+%{_mandir}/man1/mawk.1*
+%{_mandir}/man7/mawk-arrays.7*
+%{_mandir}/man7/mawk-code.7*
+%lang(pl) %{_mandir}/pl/man1/awk.1*
+%lang(pl) %{_mandir}/pl/man1/mawk.1*
%{_examplesdir}/%{name}-%{version}
%if %{with bootdisk}
diff --git a/mawk-fix_mawk_path.patch b/mawk-fix_mawk_path.patch
index 6f05b85..0857353 100644
--- a/mawk-fix_mawk_path.patch
+++ b/mawk-fix_mawk_path.patch
@@ -1,72 +1,81 @@
-diff -urN mawk-1.3.4.org/examples/ct_length.awk
mawk-1.3.4/examples/ct_length.awk
---- mawk-1.3.4.org/examples/ct_length.awk 2008-09-09 22:52:55.000000000
+0200
-+++ mawk-1.3.4/examples/ct_length.awk 2010-09-30 21:51:50.144198850 +0200
+diff -urN mawk-1.3.4-20240123.orig/examples/ct_length.awk
mawk-1.3.4-20240123/examples/ct_length.awk
+--- mawk-1.3.4-20240123.orig/examples/ct_length.awk 2020-09-19
16:49:10.000000000 +0200
++++ mawk-1.3.4-20240123/examples/ct_length.awk 2024-05-18 12:58:43.543853813
+0200
@@ -1,4 +1,4 @@
-#!/usr/bin/mawk -f
+#!/bin/mawk -f
+ # $MawkId: ct_length.awk,v 1.3 2020/09/19 14:49:10 tom Exp $
# ct_length.awk
- #
-diff -urN mawk-1.3.4.org/examples/deps.awk mawk-1.3.4/examples/deps.awk
---- mawk-1.3.4.org/examples/deps.awk 2008-09-09 22:52:55.000000000 +0200
-+++ mawk-1.3.4/examples/deps.awk 2010-09-30 21:51:50.144198850 +0200
+diff -urN mawk-1.3.4-20240123.orig/examples/decl.awk
mawk-1.3.4-20240123/examples/decl.awk
+--- mawk-1.3.4-20240123.orig/examples/decl.awk 2020-09-19 15:46:31.000000000
+0200
++++ mawk-1.3.4-20240123/examples/decl.awk 2024-05-18 12:58:12.743403900
+0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/awk -f
++#!/bin/awk -f
+ # $MawkId: decl.awk,v 1.12 2020/09/19 13:46:31 tom Exp $
+
+ # parse a C declaration by recursive descent
+diff -urN mawk-1.3.4-20240123.orig/examples/deps.awk
mawk-1.3.4-20240123/examples/deps.awk
+--- mawk-1.3.4-20240123.orig/examples/deps.awk 2023-10-31 23:58:49.000000000
+0100
++++ mawk-1.3.4-20240123/examples/deps.awk 2024-05-18 12:58:51.511970207
+0200
@@ -1,4 +1,4 @@
-#!/usr/bin/mawk -f
+#!/bin/mawk -f
+ # $MawkId: deps.awk,v 1.4 2023/10/31 22:58:49 tom Exp $
+ # vile: notab ts=4 sw=4
- # find include dependencies in C source
- #
-diff -urN mawk-1.3.4.org/examples/eatc.awk mawk-1.3.4/examples/eatc.awk
---- mawk-1.3.4.org/examples/eatc.awk 2008-09-09 22:52:55.000000000 +0200
-+++ mawk-1.3.4/examples/eatc.awk 2010-09-30 21:51:50.144198850 +0200
+diff -urN mawk-1.3.4-20240123.orig/examples/eatc.awk
mawk-1.3.4-20240123/examples/eatc.awk
+--- mawk-1.3.4-20240123.orig/examples/eatc.awk 2020-09-19 13:51:23.000000000
+0200
++++ mawk-1.3.4-20240123/examples/eatc.awk 2024-05-18 12:58:58.040065566
+0200
@@ -1,4 +1,4 @@
-#!/usr/bin/mawk -f
+#!/bin/mawk -f
-
+ # $MawkId: eatc.awk,v 1.3 2020/09/19 11:51:23 tom Exp $
# eatc.awk
# another program to remove comments
-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
+diff -urN mawk-1.3.4-20240123.orig/examples/gdecl.awk
mawk-1.3.4-20240123/examples/gdecl.awk
+--- mawk-1.3.4-20240123.orig/examples/gdecl.awk 2020-09-19
16:04:25.000000000 +0200
++++ mawk-1.3.4-20240123/examples/gdecl.awk 2024-05-18 12:59:06.284185993
+0200
@@ -1,4 +1,4 @@
-#!/usr/bin/mawk -f
+#!/bin/mawk -f
+ # $MawkId: gdecl.awk,v 1.6 2020/09/19 14:04:25 tom Exp $
# parse a C declaration by recursive descent
- #
-diff -urN mawk-1.3.4.org/examples/hcal mawk-1.3.4/examples/hcal
---- mawk-1.3.4.org/examples/hcal 2008-09-09 22:52:55.000000000 +0200
-+++ mawk-1.3.4/examples/hcal 2010-09-30 21:51:50.147532449 +0200
+diff -urN mawk-1.3.4-20240123.orig/examples/hcal
mawk-1.3.4-20240123/examples/hcal
+--- mawk-1.3.4-20240123.orig/examples/hcal 2020-09-25 00:05:19.000000000
+0200
++++ mawk-1.3.4-20240123/examples/hcal 2024-05-18 12:59:11.696265048 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/mawk -We
+#!/bin/mawk -We
+ # $MawkId: hcal,v 1.6 2020/09/24 22:05:19 tom Exp $
+ # vile:ts=4 sw=4
- # edit the above to be the full pathname of 'mawk'
- # @(#) hcal - v01.00.02 - Tue Feb 27 21:21:21 EST 1996
-diff -urN mawk-1.3.4.org/examples/nocomment.awk
mawk-1.3.4/examples/nocomment.awk
---- mawk-1.3.4.org/examples/nocomment.awk 2008-09-09 22:52:55.000000000
+0200
-+++ mawk-1.3.4/examples/nocomment.awk 2010-09-30 21:51:50.147532449 +0200
+diff -urN mawk-1.3.4-20240123.orig/examples/nocomment.awk
mawk-1.3.4-20240123/examples/nocomment.awk
+--- mawk-1.3.4-20240123.orig/examples/nocomment.awk 2020-09-19
15:02:14.000000000 +0200
++++ mawk-1.3.4-20240123/examples/nocomment.awk 2024-05-18 12:59:20.616395351
+0200
@@ -1,4 +1,4 @@
-#!/usr/bin/mawk -f
+#!/bin/mawk -f
+ # $MawkId: nocomment.awk,v 1.3 2020/09/19 13:02:14 tom Exp $
# remove C comments from a list of files
- # using a comment as the record separator
-diff -urN mawk-1.3.4.org/examples/primes.awk mawk-1.3.4/examples/primes.awk
---- mawk-1.3.4.org/examples/primes.awk 2008-09-09 22:52:55.000000000 +0200
-+++ mawk-1.3.4/examples/primes.awk 2010-09-30 21:51:50.147532449 +0200
+diff -urN mawk-1.3.4-20240123.orig/examples/primes.awk
mawk-1.3.4-20240123/examples/primes.awk
+--- mawk-1.3.4-20240123.orig/examples/primes.awk 2008-09-09
22:52:55.000000000 +0200
++++ mawk-1.3.4-20240123/examples/primes.awk 2024-05-18 12:57:46.007013358
+0200
@@ -1,4 +1,4 @@
-#!/usr/bin/mawk -f
+#!/bin/mawk -f
# primes.awk
#
-diff -urN mawk-1.3.4.org/examples/qsort.awk mawk-1.3.4/examples/qsort.awk
---- mawk-1.3.4.org/examples/qsort.awk 2008-09-09 22:52:55.000000000 +0200
-+++ mawk-1.3.4/examples/qsort.awk 2010-09-30 21:51:50.147532449 +0200
+diff -urN mawk-1.3.4-20240123.orig/examples/qsort.awk
mawk-1.3.4-20240123/examples/qsort.awk
+--- mawk-1.3.4-20240123.orig/examples/qsort.awk 2020-09-19
16:20:45.000000000 +0200
++++ mawk-1.3.4-20240123/examples/qsort.awk 2024-05-18 12:59:28.276507247
+0200
@@ -1,4 +1,4 @@
-#!/usr/bin/mawk -f
+#!/bin/mawk -f
+ # $MawkId: qsort.awk,v 1.4 2020/09/19 14:20:45 tom Exp $
# qsort text files
- #
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mawk.git/commitdiff/a19f7d59c2e9cf8f94f4f409f834cbeaba76a523
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
