- package system.h (needed by cabextract),

- put header files under separate dir,
- release 2

diff --git a/libmspack-headers.patch b/libmspack-headers.patch
new file mode 100644 (file)
index 0000000..df50dfc
--- /dev/null
+++ b/libmspack-headers.patch
@@ -0,0 +1,11 @@
+--- 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,7 @@
+ AM_CPPFLAGS =         -I$(top_srcdir)/mspack -I$(top_srcdir)/test 
+ 
+ bin_PROGRAMS =                src/cabrip src/chmextract src/msexpand src/oabextract
+-include_HEADERS =     mspack/mspack.h
++include_HEADERS =     mspack/mspack.h mspack/system.h
+ lib_LTLIBRARIES =     libmspack.la
+ 
+ noinst_LTLIBRARIES =  libmscabd.la libmschmd.la

diff --git a/libmspack.spec b/libmspack.spec
index 9e77934092ec2dd075f6674c267ff28ee1656203..a75f2e2bc2f596d86ecc3c9f89130427e3f92e37 100644 (file)
--- a/libmspack.spec
+++ b/libmspack.spec
@@ -6,12 +6,13 @@ 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:       1
+Release:       2
 License:       LGPL v2.1
 Group:         Libraries
 Source0:       https://www.cabextract.org.uk/libmspack/%{name}-%{version}.tar.gz
 # Source0-md5: be4ed61868c6c1ecc173b678ce3459be
 Patch0:                %{name}-deps.patch
+Patch1:                %{name}-headers.patch
 URL:           https://www.cabextract.org.uk/libmspack/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -74,6 +75,7 @@ Microsoftu.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -90,6 +92,7 @@ Microsoftu.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+       includedir=%{_includedir}/mspack \
        DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -109,7 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*.html
 %attr(755,root,root) %{_libdir}/libmspack.so
 %{_libdir}/libmspack.la
-%{_includedir}/mspack.h
+%dir %{_includedir}/mspack
+%{_includedir}/mspack/system.h
+%{_includedir}/mspack/mspack.h
 %{_pkgconfigdir}/libmspack.pc
 
 %if %{with static_libs}