!6 pbzip2 在master进行升级,到1.1.13
From: @json-book Reviewed-by: @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
commit
5bde76ba0b
56
001-Fix-Invalid-Suffix_pbzip2.patch
Normal file
56
001-Fix-Invalid-Suffix_pbzip2.patch
Normal file
@ -0,0 +1,56 @@
|
||||
--- pbzip2-1.1.13/pbzip2.cpp 2023-02-06 19:35:50.155958930 +0800
|
||||
+++ pbzip2-1.1.13.new/pbzip2.cpp 2023-02-06 19:38:16.491958930 +0800
|
||||
@@ -1220,7 +1220,7 @@
|
||||
// give warning to user if block is larger than 250 million bytes
|
||||
if (fileData->bufSize > 250000000)
|
||||
{
|
||||
- fprintf(stderr, "pbzip2: *WARNING: Compressed block size is large [%"PRIuMAX" bytes].\n",
|
||||
+ fprintf(stderr, "pbzip2: *WARNING: Compressed block size is large [%" PRIuMAX " bytes].\n",
|
||||
(uintmax_t) fileData->bufSize);
|
||||
fprintf(stderr, " If program aborts, use regular BZIP2 to decompress.\n");
|
||||
}
|
||||
@@ -1829,7 +1829,7 @@
|
||||
|
||||
if (QuietMode != 1)
|
||||
{
|
||||
- fprintf(stderr, " Output Size: %"PRIuMAX" bytes\n", (uintmax_t)CompressedSize);
|
||||
+ fprintf(stderr, " Output Size: %" PRIuMAX " bytes\n", (uintmax_t)CompressedSize);
|
||||
}
|
||||
|
||||
#ifdef PBZIP_DEBUG
|
||||
@@ -2072,7 +2072,7 @@
|
||||
close(hOutfile);
|
||||
if (QuietMode != 1)
|
||||
{
|
||||
- fprintf(stderr, " Output Size: %"PRIuMAX" bytes\n", (uintmax_t)CompressedSize);
|
||||
+ fprintf(stderr, " Output Size: %" PRIuMAX " bytes\n", (uintmax_t)CompressedSize);
|
||||
}
|
||||
|
||||
syncSetProducerDone(1); // Not really needed for direct version
|
||||
@@ -2794,7 +2794,7 @@
|
||||
// unlikely to get here since more likely exception will be thrown
|
||||
if (OutputBuffer.size() != size)
|
||||
{
|
||||
- fprintf(stderr, "pbzip2: *ERROR: Could not initialize (OutputBuffer); size=%"PRIuMAX"! Aborting...\n", (uintmax_t)size);
|
||||
+ fprintf(stderr, "pbzip2: *ERROR: Could not initialize (OutputBuffer); size=%" PRIuMAX "! Aborting...\n", (uintmax_t)size);
|
||||
safe_mutex_unlock(OutMutex);
|
||||
exit(1);
|
||||
}
|
||||
@@ -4102,7 +4102,7 @@
|
||||
if (decompress == 1)
|
||||
fprintf(stderr, " BWT Block Size: %c00k\n", BWTblockSizeChar);
|
||||
if (hasInFile)
|
||||
- fprintf(stderr, " Input Size: %"PRIuMAX" bytes\n", (uintmax_t)InFileSize);
|
||||
+ fprintf(stderr, " Input Size: %" PRIuMAX " bytes\n", (uintmax_t)InFileSize);
|
||||
}
|
||||
|
||||
if (decompress == 1)
|
||||
@@ -4224,7 +4224,7 @@
|
||||
{
|
||||
NumBufferedBlocksMax = numCPU;
|
||||
if (QuietMode != 1)
|
||||
- fprintf(stderr, "*Warning* Max memory limit increased to %"PRIuMAX" MB to support %d CPUs\n", (uintmax_t)((NumBufferedBlocksMax + (numCPU * 2)) * blockSize)/1000000, numCPU);
|
||||
+ fprintf(stderr, "*Warning* Max memory limit increased to %" PRIuMAX " MB to support %d CPUs\n", (uintmax_t)((NumBufferedBlocksMax + (numCPU * 2)) * blockSize)/1000000, numCPU);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1,26 +0,0 @@
|
||||
diff -up pbzip2-1.1.12/Makefile.flags pbzip2-1.1.12/Makefile
|
||||
--- pbzip2-1.1.12/Makefile.flags 2015-09-09 16:10:11.389730644 +0200
|
||||
+++ pbzip2-1.1.12/Makefile 2015-09-09 16:10:43.823872798 +0200
|
||||
@@ -17,7 +17,7 @@ LDLIBS_PTHREAD = -lpthread
|
||||
|
||||
|
||||
# Optimization flags
|
||||
-CXXFLAGS = -O2
|
||||
+CXXFLAGS ?= -O2
|
||||
|
||||
#CXXFLAGS += -g -Wall
|
||||
#CXXFLAGS += -ansi
|
||||
@@ -50,11 +50,11 @@ CXXFLAGS += $(CXXFLAGS_PTHREAD)
|
||||
|
||||
|
||||
# Linker flags
|
||||
-LDFLAGS =
|
||||
+# LDFLAGS =
|
||||
|
||||
|
||||
# External libraries
|
||||
-LDLIBS = -lbz2
|
||||
+LDLIBS += -lbz2
|
||||
LDLIBS += $(LDLIBS_PTHREAD)
|
||||
|
||||
|
||||
Binary file not shown.
BIN
pbzip2-1.1.13.tar.gz
Normal file
BIN
pbzip2-1.1.13.tar.gz
Normal file
Binary file not shown.
18
pbzip2.spec
18
pbzip2.spec
@ -1,12 +1,13 @@
|
||||
%global debug_package %{nil}
|
||||
Name: pbzip2
|
||||
Version: 1.1.12
|
||||
Release: 10
|
||||
Version: 1.1.13
|
||||
Release: 1
|
||||
Summary: Parallel implementation of the bzip2 block-sorting file compressor
|
||||
License: BSD
|
||||
URL: http://www.compression.ca/pbzip2/
|
||||
|
||||
Source0: http://www.compression.ca/pbzip2/pbzip2-%{version}.tar.gz
|
||||
Patch0: pbzip2-1.1.12-buildflags.patch
|
||||
Source0: https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz
|
||||
Patch0: 001-Fix-Invalid-Suffix_pbzip2.patch
|
||||
|
||||
BuildRequires: gcc-c++ bzip2-devel
|
||||
|
||||
@ -19,11 +20,11 @@ The output of this version should be fully compatible with bzip2 v1.0.2 or newer
|
||||
|
||||
%prep
|
||||
%autosetup -n pbzip2-%{version} -p1
|
||||
f=AUTHORS; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 && mv $f.utf8 $f
|
||||
f=AUTHORS; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 && mv $f.utf8 $f && alias rpmbuild='rpmbuild --nodebuginfo'
|
||||
|
||||
%build
|
||||
%set_build_flags
|
||||
%make_build
|
||||
%make_build CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="%{__global_ldflags}"
|
||||
|
||||
|
||||
%install
|
||||
@ -46,5 +47,8 @@ popd
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Fri Feb 03 2023 wenchaofan <349464272@qq.com> - 1.1.13-1
|
||||
- Update to 1.1.13
|
||||
|
||||
* Fri Jan 10 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.1.12-10
|
||||
- Package init
|
||||
- Package init
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user