commit 0c6b01be2db4fbd3e310e518527fc8b9bc3be237 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Fri Oct 26 20:01:46 2018 +0200
- don't break compatibility; package public header in includedir, private headers in pkgincludedir - release 5 libmspack-headers.patch | 6 +++--- libmspack.spec | 25 ++++--------------------- 2 files changed, 7 insertions(+), 24 deletions(-) --- diff --git a/libmspack.spec b/libmspack.spec index baa8647..6795ef3 100644 --- a/libmspack.spec +++ b/libmspack.spec @@ -6,7 +6,7 @@ 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: 4 +Release: 5 License: LGPL v2.1 Group: Libraries Source0: https://www.cabextract.org.uk/libmspack/%{name}-%{version}.tar.gz @@ -92,7 +92,6 @@ Microsoftu. rm -rf $RPM_BUILD_ROOT %{__make} install \ - includedir=%{_includedir}/mspack \ DESTDIR=$RPM_BUILD_ROOT %clean @@ -112,25 +111,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/*.html %attr(755,root,root) %{_libdir}/libmspack.so %{_libdir}/libmspack.la -%dir %{_includedir}/mspack -%{_includedir}/mspack/cab.h -%{_includedir}/mspack/chm.h -%{_includedir}/mspack/crc32.h -%{_includedir}/mspack/des.h -%{_includedir}/mspack/hlp.h -%{_includedir}/mspack/kwaj.h -%{_includedir}/mspack/lit.h -%{_includedir}/mspack/lzss.h -%{_includedir}/mspack/lzx.h -%{_includedir}/mspack/mspack.h -%{_includedir}/mspack/mszip.h -%{_includedir}/mspack/oab.h -%{_includedir}/mspack/qtm.h -%{_includedir}/mspack/readbits.h -%{_includedir}/mspack/readhuff.h -%{_includedir}/mspack/sha.h -%{_includedir}/mspack/system.h -%{_includedir}/mspack/szdd.h +%{_includedir}/mspack.h +# private headers, used by cabextract (see headers patch) +%{_includedir}/libmspack %{_pkgconfigdir}/libmspack.pc %if %{with static_libs} diff --git a/libmspack-headers.patch b/libmspack-headers.patch index 2387a97..b8ffc8c 100644 --- a/libmspack-headers.patch +++ b/libmspack-headers.patch @@ -1,11 +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 @@ +@@ -18,7 +18,8 @@ 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/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/mspack.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 + 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 noinst_LTLIBRARIES = libmscabd.la libmschmd.la ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libmspack.git/commitdiff/0c6b01be2db4fbd3e310e518527fc8b9bc3be237 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit