From 41fec2e9c77f9aca0d53eb92f1d24e34131f698e Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Fri, 18 Nov 2016 16:46:21 +0900 Subject: [PATCH] Imported Upstream version 1.1.12 Change-Id: I8950a828534f7f2b2229f2070f2e5c35d11ae8ce Signed-off-by: DongHun Kwak --- COPYING | 2 +- ChangeLog | 3 +++ Makefile | 13 +++++++------ Makefile.solaris.sunstudio | 4 ++-- README | 2 +- pbzip2.cpp | 2 +- pbzip2.spec | 3 +++ 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/COPYING b/COPYING index 7d724e7..105bd9c 100644 --- a/COPYING +++ b/COPYING @@ -37,4 +37,4 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Jeff Gilchrist, Ottawa, Canada. pbzip2@compression.ca -pbzip2 version 1.1.11 of Dec 12, 2014 +pbzip2 version 1.1.12 of Dec 21, 2014 diff --git a/ChangeLog b/ChangeLog index 6b1243b..404ee6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Changes in 1.1.12 (Dec 21, 2014) +- #1402154 - make relative symlinks on install (thanks to Evangelos Foutras) +- Install manpages to share folder, thanks to Ryan Schmidt (#1402044) Changes in 1.1.11 (Dec 12, 2014) - Fix bug #1399589 (compress crashing on OS X) Changes in 1.1.10 (Nov 23, 2014) diff --git a/Makefile b/Makefile index af7151f..e570882 100644 --- a/Makefile +++ b/Makefile @@ -75,14 +75,15 @@ pbzip2-static: pbzip2.cpp BZ2StreamScanner.cpp ErrorContext.cpp libbz2.a # Install the binary pbzip2 program and man page install: pbzip2 if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi - if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi - if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi + if ( test ! -d $(PREFIX)/share ) ; then mkdir -p $(PREFIX)/share ; fi + if ( test ! -d $(PREFIX)/share/man ) ; then mkdir -p $(PREFIX)/share/man ; fi + if ( test ! -d $(PREFIX)/share/man/man1 ) ; then mkdir -p $(PREFIX)/share/man/man1 ; fi cp -f pbzip2 $(PREFIX)/bin/pbzip2 chmod a+x $(PREFIX)/bin/pbzip2 - ln -s -f $(PREFIX)/bin/pbzip2 $(PREFIX)/bin/pbunzip2 - ln -s -f $(PREFIX)/bin/pbzip2 $(PREFIX)/bin/pbzcat - cp -f pbzip2.1 $(PREFIX)/man/man1 - chmod a+r $(PREFIX)/man/man1/pbzip2.1 + ln -s -f pbzip2 $(PREFIX)/bin/pbunzip2 + ln -s -f pbzip2 $(PREFIX)/bin/pbzcat + cp -f pbzip2.1 $(PREFIX)/share/man/man1 + chmod a+r $(PREFIX)/share/man/man1/pbzip2.1 clean: rm -f *.o pbzip2 diff --git a/Makefile.solaris.sunstudio b/Makefile.solaris.sunstudio index 2283f9d..e96ebe0 100644 --- a/Makefile.solaris.sunstudio +++ b/Makefile.solaris.sunstudio @@ -52,8 +52,8 @@ install: pbzip2 if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi cp -f pbzip2 $(PREFIX)/bin/pbzip2 chmod a+x $(PREFIX)/bin/pbzip2 - ln -s -f $(PREFIX)/bin/pbzip2 $(PREFIX)/bin/pbunzip2 - ln -s -f $(PREFIX)/bin/pbzip2 $(PREFIX)/bin/pbzcat + ln -s -f pbzip2 $(PREFIX)/bin/pbunzip2 + ln -s -f pbzip2 $(PREFIX)/bin/pbzcat cp -f pbzip2.1 $(PREFIX)/man/man1 chmod a+r $(PREFIX)/man/man1/pbzip2.1 diff --git a/README b/README index c678e5c..74d0625 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Dec 12, 2014 +Dec 21, 2014 Parallel BZIP2 v1.1.10 - by: Jeff Gilchrist Available at: http://compression.ca/ diff --git a/pbzip2.cpp b/pbzip2.cpp index 0c10dec..97996c1 100644 --- a/pbzip2.cpp +++ b/pbzip2.cpp @@ -3224,7 +3224,7 @@ int detectCPUs() */ void banner() { - fprintf(stderr, "Parallel BZIP2 v1.1.11 [Dec 12, 2014]\n"); + fprintf(stderr, "Parallel BZIP2 v1.1.12 [Dec 21, 2014]\n"); fprintf(stderr, "By: Jeff Gilchrist [http://compression.ca]\n"); fprintf(stderr, "Major contributions: Yavor Nikolov [http://javornikolov.wordpress.com]\n"); fprintf(stderr, "Uses libbzip2 by Julian Seward\n"); diff --git a/pbzip2.spec b/pbzip2.spec index 34e0d8c..86c11b9 100644 --- a/pbzip2.spec +++ b/pbzip2.spec @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* Sun Dec 21 2014 Jeff Gilchrist - 1.1.12-1 +- Release 1.1.12 + * Fri Dec 12 2014 Jeff Gilchrist - 1.1.11-1 - Release 1.1.11 -- 2.7.4