commit 43fb266427d819d98734ccc70b1697f4fafe7c0e
Author: Adam Gołębiowski <ad...@pld-linux.org>
Date: Fri Nov 16 07:43:36 2018 +0100
- updated to 1.9
cabextract-libmspack-headers-path.patch | 14 ++++++++++++++
cabextract.spec | 8 ++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/cabextract.spec b/cabextract.spec
index 6a3d2f9..c075d7c 100644
--- a/cabextract.spec
+++ b/cabextract.spec
@@ -1,12 +1,13 @@
Summary: A program to extract Microsoft Cabinet files
Summary(pl.UTF-8): Program do rozpakowywania plików MS Cabinet
Name: cabextract
-Version: 1.8
+Version: 1.9
Release: 1
License: GPL v2+
Group: Applications/Archiving
Source0: http://www.cabextract.org.uk/%{name}-%{version}.tar.gz
-# Source0-md5: e16660a9769423bf438233f87a6667a2
+# Source0-md5: c38f4d1920dd4f597c707f16273ad480
+Patch0: %{name}-libmspack-headers-path.patch
URL: http://www.cabextract.org.uk/
BuildRequires: autoconf >= 2.57
BuildRequires: automake
@@ -26,6 +27,7 @@ cabextract może takie pliki rozpakować.
%prep
%setup -q
+%patch0 -p1
# make sure we use system libmspack
%{__rm} -r mspack
@@ -39,6 +41,8 @@ cabextract może takie pliki rozpakować.
--with-external-libmspack
%{__make}
+%{__make} check
+
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/cabextract-libmspack-headers-path.patch
b/cabextract-libmspack-headers-path.patch
new file mode 100644
index 0000000..9272b2c
--- /dev/null
+++ b/cabextract-libmspack-headers-path.patch
@@ -0,0 +1,14 @@
+--- cabextract-1.9/src/cabinfo.c~ 2018-10-31 11:06:12.000000000 +0100
++++ cabextract-1.9/src/cabinfo.c 2018-11-16 07:41:46.199355355 +0100
+@@ -25,9 +25,9 @@
+ #include <sys/types.h>
+
+ /* include <system.h> from libmspack for LD and EndGetI?? macros */
+-#include <mspack/system.h>
++#include <libmspack/system.h>
+ /* include <cab.h> from libmspack for cab structure offsets */
+-#include <mspack/cab.h>
++#include <libmspack/cab.h>
+
+ #if HAVE_FSEEKO
+ # define FSEEK fseeko
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cabextract.git/commitdiff/43fb266427d819d98734ccc70b1697f4fafe7c0e
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
