[packages/libmspack] - updated to 0.9.1alpha - updated deps,headers patches - added progs patch (still install 4 useful u
qboosh
qboosh at pld-linux.org
Sat Dec 29 17:06:11 CET 2018
commit 1a2499b0438ea6f79c6807eaad2ace44c51556c4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Dec 29 17:10:54 2018 +0100
- updated to 0.9.1alpha
- updated deps,headers patches
- added progs patch (still install 4 useful utilities, even though they are not production ready)
libmspack-deps.patch | 103 +++++++++++++++++++++++-------------------------
libmspack-headers.patch | 15 ++++---
libmspack-progs.patch | 16 ++++++++
libmspack.spec | 10 +++--
4 files changed, 79 insertions(+), 65 deletions(-)
---
diff --git a/libmspack.spec b/libmspack.spec
index 6795ef3..aa5b892 100644
--- a/libmspack.spec
+++ b/libmspack.spec
@@ -5,17 +5,18 @@
Summary: A library for Microsoft compression formats
Summary(pl.UTF-8): Biblioteka do formatów kompresji używanych przez Microsoft
Name: libmspack
-Version: 0.8alpha
-Release: 5
+Version: 0.9.1alpha
+Release: 1
License: LGPL v2.1
Group: Libraries
Source0: https://www.cabextract.org.uk/libmspack/%{name}-%{version}.tar.gz
-# Source0-md5: be4ed61868c6c1ecc173b678ce3459be
+# Source0-md5: 9602ae4a6b0468d9aaef6359c1e90657
Patch0: %{name}-deps.patch
Patch1: %{name}-headers.patch
+Patch2: %{name}-progs.patch
URL: https://www.cabextract.org.uk/libmspack/
BuildRequires: autoconf >= 2.59
-BuildRequires: automake
+BuildRequires: automake >= 1:1.11
BuildRequires: gcc >= 5:3.0
BuildRequires: libtool >= 2:2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -76,6 +77,7 @@ Microsoftu.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
diff --git a/libmspack-deps.patch b/libmspack-deps.patch
index 0d991d7..ae66f84 100644
--- a/libmspack-deps.patch
+++ b/libmspack-deps.patch
@@ -1,56 +1,53 @@
---- libmspack-0.7.1alpha/Makefile.am.orig 2018-08-09 10:29:14.000000000 +0200
-+++ libmspack-0.7.1alpha/Makefile.am 2018-10-12 19:31:46.296437020 +0200
-@@ -60,39 +60,39 @@
- mspack/readbits.h mspack/readhuff.h
- libmschmd_la_LDFLAGS = -export-symbols-regex '^mspack_'
+--- libmspack-0.9.1alpha/Makefile.am.orig 2018-12-29 09:12:11.633803722 +0100
++++ libmspack-0.9.1alpha/Makefile.am 2018-12-29 11:02:49.790394594 +0100
+@@ -56,36 +56,36 @@
+ mspack/readbits.h mspack/readhuff.h
+ libmschmd_la_LDFLAGS = -export-symbols-regex '^mspack_'
--examples_cabd_memory_SOURCES = examples/cabd_memory.c libmscabd.la
-+examples_cabd_memory_SOURCES = examples/cabd_memory.c
- examples_cabd_memory_LDADD = libmscabd.la
--examples_multifh_SOURCES = examples/multifh.c libmscabd.la
-+examples_multifh_SOURCES = examples/multifh.c
- examples_multifh_LDADD = libmscabd.la
+-examples_cabd_memory_SOURCES = examples/cabd_memory.c libmscabd.la
++examples_cabd_memory_SOURCES = examples/cabd_memory.c
+ examples_cabd_memory_LDADD = libmscabd.la
+-examples_cabrip_SOURCES = examples/cabrip.c libmspack.la
++examples_cabrip_SOURCES = examples/cabrip.c
+ examples_cabrip_LDADD = libmspack.la
+-examples_chmextract_SOURCES = examples/chmextract.c test/error.h libmspack.la
++examples_chmextract_SOURCES = examples/chmextract.c test/error.h
+ examples_chmextract_LDADD = libmspack.la
+-examples_msexpand_SOURCES = examples/msexpand.c test/error.h libmspack.la
++examples_msexpand_SOURCES = examples/msexpand.c test/error.h
+ examples_msexpand_LDADD = libmspack.la
+-examples_multifh_SOURCES = examples/multifh.c libmscabd.la
++examples_multifh_SOURCES = examples/multifh.c
+ examples_multifh_LDADD = libmscabd.la
+-examples_oabextract_SOURCES = examples/oabextract.c test/error.h libmspack.la
++examples_oabextract_SOURCES = examples/oabextract.c test/error.h
+ examples_oabextract_LDADD = libmspack.la
--src_cabrip_SOURCES = src/cabrip.c libmspack.la
-+src_cabrip_SOURCES = src/cabrip.c
- src_cabrip_LDADD = libmspack.la
--src_chmextract_SOURCES = src/chmextract.c src/error.h libmspack.la
-+src_chmextract_SOURCES = src/chmextract.c src/error.h
- src_chmextract_LDADD = libmspack.la
--src_msexpand_SOURCES = src/msexpand.c src/error.h libmspack.la
-+src_msexpand_SOURCES = src/msexpand.c src/error.h
- src_msexpand_LDADD = libmspack.la
--src_oabextract_SOURCES = src/oabextract.c src/error.h libmspack.la
-+src_oabextract_SOURCES = src/oabextract.c src/error.h
- src_oabextract_LDADD = libmspack.la
+-test_cabd_md5_SOURCES = test/cabd_md5.c test/md5.c test/md5.h test/md5_fh.h test/error.h libmscabd.la
++test_cabd_md5_SOURCES = test/cabd_md5.c test/md5.c test/md5.h test/md5_fh.h test/error.h
+ test_cabd_md5_LDADD = libmscabd.la
+-test_chmd_find_SOURCES = test/chmd_find.c test/error.h libmschmd.la
++test_chmd_find_SOURCES = test/chmd_find.c test/error.h
+ test_chmd_find_LDADD = libmschmd.la
+-test_chmd_md5_SOURCES = test/chmd_md5.c test/md5.c test/md5.h test/md5_fh.h test/error.h libmschmd.la
++test_chmd_md5_SOURCES = test/chmd_md5.c test/md5.c test/md5.h test/md5_fh.h test/error.h
+ test_chmd_md5_LDADD = libmschmd.la
+-test_chmd_order_SOURCES = test/chmd_order.c test/md5.c test/md5.h test/md5_fh.h test/error.h libmschmd.la
++test_chmd_order_SOURCES = test/chmd_order.c test/md5.c test/md5.h test/md5_fh.h test/error.h
+ test_chmd_order_LDADD = libmschmd.la
+-test_chminfo_SOURCES = test/chminfo.c libmschmd.la
++test_chminfo_SOURCES = test/chminfo.c
+ test_chminfo_LDADD = libmschmd.la
- test_cabd_md5_SOURCES = test/cabd_md5.c test/md5.c test/md5.h \
-- test/md5_fh.h test/error.h libmscabd.la
-+ test/md5_fh.h test/error.h
- test_cabd_md5_LDADD = libmscabd.la
--test_cabd_test_SOURCES= test/cabd_test.c libmscabd.la
-+test_cabd_test_SOURCES= test/cabd_test.c
- test_cabd_test_LDADD = libmscabd.la
--test_chmd_find_SOURCES = test/chmd_find.c test/error.h libmschmd.la
-+test_chmd_find_SOURCES = test/chmd_find.c test/error.h
- test_chmd_find_LDADD = libmschmd.la
- test_chmd_md5_SOURCES = test/chmd_md5.c test/md5.c test/md5.h \
-- test/md5_fh.h test/error.h libmschmd.la
-+ test/md5_fh.h test/error.h
- test_chmd_md5_LDADD = libmschmd.la
- test_chmd_order_SOURCES = test/chmd_order.c test/md5.c test/md5.h \
-- test/md5_fh.h test/error.h libmschmd.la
-+ test/md5_fh.h test/error.h
- test_chmd_order_LDADD = libmschmd.la
--test_chmd_test_SOURCES = test/chmd_test.c libmschmd.la
-+test_chmd_test_SOURCES = test/chmd_test.c
- test_chmd_test_LDADD = libmschmd.la
- test_chmd_test_DEPENDENCIES = libmschmd.la test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm
--test_chminfo_SOURCES = test/chminfo.c libmschmd.la
-+test_chminfo_SOURCES = test/chminfo.c
- test_chminfo_LDADD = libmschmd.la
--test_kwajd_test_SOURCES = test/kwajd_test.c libmspack.la
-+test_kwajd_test_SOURCES = test/kwajd_test.c
- test_kwajd_test_LDADD = libmspack.la
-
- test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm: test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm.LZXC-is-lzxc
+-test_cabd_test_SOURCES = test/cabd_test.c test/md5.c test/md5.h test/md5_fh.h libmscabd.la
++test_cabd_test_SOURCES = test/cabd_test.c test/md5.c test/md5.h test/md5_fh.h
+ test_cabd_test_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_FILES=$(abs_srcdir)/test/test_files/cabd
+ test_cabd_test_LDADD = libmscabd.la
+-test_chmd_test_SOURCES = test/chmd_test.c test/md5.c test/md5.h test/md5_fh.h libmschmd.la
++test_chmd_test_SOURCES = test/chmd_test.c test/md5.c test/md5.h test/md5_fh.h
+ test_chmd_test_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_FILES=$(abs_srcdir)/test/test_files/chmd
+ test_chmd_test_LDADD = libmschmd.la
+-test_kwajd_test_SOURCES = test/kwajd_test.c libmspack.la
++test_kwajd_test_SOURCES = test/kwajd_test.c
+ test_kwajd_test_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_FILES=$(abs_srcdir)/test/test_files/kwajd
+ test_kwajd_test_LDADD = libmspack.la
diff --git a/libmspack-headers.patch b/libmspack-headers.patch
index b8ffc8c..8e96f8c 100644
--- a/libmspack-headers.patch
+++ b/libmspack-headers.patch
@@ -1,11 +1,10 @@
---- libmspack-0.8alpha/Makefile.am~ 2018-10-16 12:07:28.000000000 +0200
-+++ libmspack-0.8alpha/Makefile.am 2018-10-23 21:11:11.477166014 +0200
-@@ -18,7 +18,8 @@
- AM_CPPFLAGS = -I$(top_srcdir)/mspack -I$(top_srcdir)/test
+--- libmspack-0.9.1alpha/Makefile.am.orig 2018-12-29 11:03:21.843727561 +0100
++++ libmspack-0.9.1alpha/Makefile.am 2018-12-29 11:08:59.620390371 +0100
+@@ -12,6 +12,7 @@
+ AM_CPPFLAGS = -I$(srcdir)/mspack -I$(srcdir)/test
- bin_PROGRAMS = src/cabrip src/chmextract src/msexpand src/oabextract
- include_HEADERS = mspack/mspack.h
+ include_HEADERS = mspack/mspack.h
+pkginclude_HEADERS = mspack/cab.h mspack/chm.h mspack/crc32.h mspack/des.h mspack/hlp.h mspack/kwaj.h mspack/lit.h mspack/lzss.h mspack/lzx.h mspack/mszip.h mspack/oab.h mspack/qtm.h mspack/readbits.h mspack/readhuff.h mspack/sha.h mspack/system.h mspack/szdd.h
- lib_LTLIBRARIES = libmspack.la
+ lib_LTLIBRARIES = libmspack.la
+ pkgconfig_DATA = libmspack.pc
- noinst_LTLIBRARIES = libmscabd.la libmschmd.la
diff --git a/libmspack-progs.patch b/libmspack-progs.patch
new file mode 100644
index 0000000..a881f51
--- /dev/null
+++ b/libmspack-progs.patch
@@ -0,0 +1,16 @@
+--- libmspack-0.9.1alpha/Makefile.am.orig 2018-12-29 16:37:49.480165092 +0100
++++ libmspack-0.9.1alpha/Makefile.am 2018-12-29 17:04:27.293480182 +0100
+@@ -17,10 +17,11 @@
+ pkgconfig_DATA = libmspack.pc
+
+ noinst_LTLIBRARIES = libmscabd.la libmschmd.la
+-noinst_PROGRAMS = examples/cabd_memory examples/cabrip examples/chmextract \
+- examples/msexpand examples/multifh examples/oabextract \
++noinst_PROGRAMS = examples/cabd_memory \
++ examples/multifh \
+ test/cabd_md5 test/chmd_find test/chmd_md5 test/chmd_order \
+ test/chminfo
++bin_PROGRAMS = examples/cabrip examples/chmextract examples/msexpand examples/oabextract
+ check_PROGRAMS = test/cabd_test test/chmd_test test/kwajd_test
+
+ libmspack_la_SOURCES = mspack/mspack.h \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libmspack.git/commitdiff/1a2499b0438ea6f79c6807eaad2ace44c51556c4
More information about the pld-cvs-commit
mailing list