Bump to pbzip 1.1.13

[Model] ALL
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] Bump to pbzip 1.1.13
[Cause & Measure] Bump to pbzip 1.1.13
[Checking Method] N/A

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

Change-Id: I804f65f810028c85f443131be21d877fdfb70c7f
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/Makefile b/Makefile
index 26a3933..878439a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,28 @@ SHELL = /bin/sh
 
 
 # Compiler to use
-CC = g++
-CFLAGS ?= -O2
-#CFLAGS += -g -Wall
-#CFLAGS += -ansi
-#CFLAGS += -pedantic
-#CFLAGS += -std=c++0x
-
-# Comment out CFLAGS line below for compatability mode for 32bit file sizes
+# CXX = g++
+
+
+# Thread-related flags
+# On some compilers -pthreads
+CXXFLAGS_PTHREAD = -pthread
+
+# Comment out CXXFLAGS line below to disable pthread semantics in code
+CXXFLAGS_PTHREAD += -D_POSIX_PTHREAD_SEMANTICS
+
+LDLIBS_PTHREAD = -lpthread
+
+
+# Optimization flags
+CXXFLAGS = -O2
+
+#CXXFLAGS += -g -Wall
+#CXXFLAGS += -ansi
+#CXXFLAGS += -pedantic
+#CXXFLAGS += -std=c++0x
+
+# Comment out CXXFLAGS line below for compatability mode for 32bit file sizes
 # (less than 2GB) and systems that have compilers that treat int as 64bit
 # natively (ie: modern AIX)
 CXXFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
@@ -40,8 +54,9 @@ LDFLAGS =
 
 
 # External libraries
-LDFLAGS += -lbz2
-LDFLAGS += -lpthread
+LDLIBS = -lbz2
+LDLIBS += $(LDLIBS_PTHREAD)
+
 
 # Where you want pbzip2 installed when you do 'make install'
 PREFIX = /usr

diff --git a/packaging/pbzip2.spec b/packaging/pbzip2.spec
index 953bd1e..85f1925 100644 (file)
--- a/packaging/pbzip2.spec
+++ b/packaging/pbzip2.spec
@@ -1,5 +1,5 @@
 Name:           pbzip2
-Version:        1.1.6
+Version:        1.1.13
 Release:        0
 Summary:        Parallel implementation of bzip2
 URL:            http://www.compression.ca/pbzip2/
@@ -30,7 +30,7 @@ install -Dm644 pbzip2.1 %{buildroot}%{_mandir}/man1/pbzip2.1
 ln -s pbzip2 %{buildroot}%{_bindir}/pbunzip2
 ln -s pbzip2 %{buildroot}%{_bindir}/pbzcat
 
-%docs_package
+%remove_docs
 
 %files
 %manifest %{name}.manifest