From 4c24337f7fa7b08fbd695d0ba6087aaa8ffb120f Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 14 Sep 2015 13:43:47 +0200 Subject: [PATCH] Update to 1.1.12 --- pbzip2-1.1.12-buildflags.patch | 26 ++++++++++++++++++++++++++ pbzip2-1.1.6-buildflags.patch | 21 --------------------- pbzip2.spec | 9 ++++++--- sources | 2 +- 4 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 pbzip2-1.1.12-buildflags.patch delete mode 100644 pbzip2-1.1.6-buildflags.patch diff --git a/pbzip2-1.1.12-buildflags.patch b/pbzip2-1.1.12-buildflags.patch new file mode 100644 index 0000000..23fe33a --- /dev/null +++ b/pbzip2-1.1.12-buildflags.patch @@ -0,0 +1,26 @@ +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) + + diff --git a/pbzip2-1.1.6-buildflags.patch b/pbzip2-1.1.6-buildflags.patch deleted file mode 100644 index 2fb2f42..0000000 --- a/pbzip2-1.1.6-buildflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up pbzip2-1.1.6/Makefile~ pbzip2-1.1.6/Makefile ---- pbzip2-1.1.6/Makefile~ 2011-10-30 21:22:47.000000000 +0200 -+++ pbzip2-1.1.6/Makefile 2012-06-01 23:42:11.653480198 +0300 -@@ -3,7 +3,7 @@ SHELL = /bin/sh - - # Compiler to use - CC = g++ --CFLAGS = -O2 -+CFLAGS ?= -O2 - #CFLAGS += -g -Wall - #CFLAGS += -ansi - #CFLAGS += -pedantic -@@ -37,7 +37,7 @@ CFLAGS += -DUSE_STACKSIZE_CUSTOMIZATION - CFLAGS += -pthread - - # External libraries --LDFLAGS = -lbz2 -+LDFLAGS += -lbz2 - LDFLAGS += -lpthread - - # Where you want pbzip2 installed when you do 'make install' diff --git a/pbzip2.spec b/pbzip2.spec index edf9eea..023a5d2 100644 --- a/pbzip2.spec +++ b/pbzip2.spec @@ -1,6 +1,6 @@ Name: pbzip2 -Version: 1.1.6 -Release: 8%{?dist} +Version: 1.1.12 +Release: 1%{?dist} Summary: Parallel implementation of bzip2 URL: http://www.compression.ca/pbzip2/ License: BSD @@ -12,7 +12,7 @@ BuildRequires: bzip2 BuildRequires: bzip2-devel %endif Source0: http://www.compression.ca/pbzip2/%{name}-%{version}.tar.gz -Patch0: %{name}-1.1.6-buildflags.patch +Patch0: %{name}-1.1.12-buildflags.patch %description PBZIP2 is a parallel implementation of the bzip2 block-sorting file @@ -54,6 +54,9 @@ rm -rf %{buildroot} %changelog +* Wed Sep 14 2015 Adam Tkac +- update to 1.1.12 + * Thu Jun 18 2015 Fedora Release Engineering - 1.1.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 7b25454..6ac87bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -26cc5a0d882198f106e75101ff0544a3 pbzip2-1.1.6.tar.gz +91a4911b13305850423840eb0fa6f4f9 pbzip2-1.1.12.tar.gz