commit 4dc95bc683588c71f2cc9d764097bf17c6c4e0ea
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sun Jul 14 10:25:24 2019 +0200
- up to 1.0.8
bzip2-bzgrep.patch | 13 -------------
bzip2.spec | 8 ++++----
2 files changed, 4 insertions(+), 17 deletions(-)
---
diff --git a/bzip2.spec b/bzip2.spec
index 67535c6..d999665 100644
--- a/bzip2.spec
+++ b/bzip2.spec
@@ -11,17 +11,17 @@ Summary(pt_BR.UTF-8): Compactador de arquivo
extremamente poderoso
Summary(uk.UTF-8): Компресор файлів на базі алгоритму блочного сортування
Summary(ru.UTF-8): Компрессор файлов на основе алгоритма блочной сортировки
Name: bzip2
-Version: 1.0.7
+Version: 1.0.8
Release: 1
License: BSD-like
Group: Applications/Archiving
Source0: https://sourceware.org/pub/bzip2/%{name}-%{version}.tar.gz
-# Source0-md5: 1a6a61cc867be4f3d6549037a09bf13e
+# Source0-md5: 67e051268d0c475ea773822f7500d0e5
Source1: http://qboosh.pl/man/%{name}-man-pages.tar.bz2
# Source1-md5: 14a68bf85666428000aad7cb0785a6e5
Source2: %{name}.pc
Patch0: %{name}-libtoolizeautoconf.patch
-Patch1: %{name}-bzgrep.patch
+
# Modified from http://www.vanheusden.com/Linux/bzip2-1.0.2.diff.gz
Patch2: %{name}-progress-counter-1.0.2.patch
URL: https://sourceware.org/bzip2/
@@ -167,7 +167,7 @@ Bibliotecas estáticas para desenvolvimento com a bzip2.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
+
%{?with_progress:%patch2 -p1}
%build
diff --git a/bzip2-bzgrep.patch b/bzip2-bzgrep.patch
deleted file mode 100644
index 4809525..0000000
--- a/bzip2-bzgrep.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- bzip2-1.0.4/bzgrep.orig 2007-01-03 03:00:55.000000000 +0100
-+++ bzip2-1.0.4/bzgrep 2007-01-12 14:30:06.518134000 +0100
-@@ -63,9 +63,7 @@
- bzip2 -cdfq "$i" | $grep $opt "$pat"
- r=$?
- else
-- j=${i//\\/\\\\}
-- j=${j//|/\\|}
-- j=${j//&/\\&}
-+ j=$(echo "$i" | sed -e 's/\\/\\\\/g;s/|/\\|/g;s/&/\\&/g')
- j=`printf "%s" "$j" | tr '\n' ' '`
- bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
- r=$?
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/bzip2.git/commitdiff/4dc95bc683588c71f2cc9d764097bf17c6c4e0ea
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
