From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 4 Mar 2023 18:22:18 +0000 (+0100)
Subject: - updated to 1.11
X-Git-Tag: auto/th/cabextract-1.11-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcabextract.git;a=commitdiff_plain;h=HEAD

- updated to 1.11
- removed no longer valid libmspack-headers-path (cabinfo uses defines from custom libmspack headers, including private ones)
---

diff --git a/cabextract-libmspack-headers-path.patch b/cabextract-libmspack-headers-path.patch
deleted file mode 100644
index 9272b2c..0000000
--- a/cabextract-libmspack-headers-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
diff --git a/cabextract.spec b/cabextract.spec
index 08c58dc..be113cf 100644
--- a/cabextract.spec
+++ b/cabextract.spec
@@ -1,14 +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.9.1
-Release:	2
+Version:	1.11
+Release:	1
 License:	GPL v2+
 Group:		Applications/Archiving
-Source0:	http://www.cabextract.org.uk/%{name}-%{version}.tar.gz
-# Source0-md5:	cb0ee8eee4f6596fa18478d59e1973c2
-Patch0:		%{name}-libmspack-headers-path.patch
-URL:		http://www.cabextract.org.uk/
+Source0:	https://www.cabextract.org.uk/%{name}-%{version}.tar.gz
+# Source0-md5:	3f678e8cb815f26d73e9413913b20505
+URL:		https://www.cabextract.org.uk/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	libmspack-devel >= 0.8alpha-5
@@ -27,9 +26,6 @@ cabextract może takie pliki rozpakować.
 
 %prep
 %setup -q
-%patch0 -p1
-# make sure we use system libmspack
-%{__rm} -r mspack
 
 %build
 %{__aclocal}