PR#2: Add a patch to fix missing header files in -devel subpackage - rpms/squashfuse

rpms / squashfuse

#2 Add a patch to fix missing header files in -devel subpackage

Closed 2 years ago by salimma. Opened 3 years ago by suve.

rpms/ suve/squashfuse fix-missing-header-files into rawhide

Add a patch to fix missing header files in -devel subpackage

Artur Iwicki • 3 years ago

7f81786

squashfuse--PR-36.patch

file added

+40

		`@@ -0,0 +1,40 @@`
		`+ From fc07fe641c9edcb9059c643f17803f0b3d6ba3b1 Mon Sep 17 00:00:00 2001`
		`+ From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>`
		`+ Date: Thu, 17 Oct 2019 01:37:51 -0400`
		`+ Subject: [PATCH] Install remaining headers`
		`+`
		`+ ---`
		`+ Makefile.am \| 6 +++++-`
		`+ squashfuse.pc.in \| 2 +-`
		`+ 2 files changed, 6 insertions(+), 2 deletions(-)`
		`+`
		`+ diff --git a/Makefile.am b/Makefile.am`
		`+ index 1507525..456e824 100644`
		`+ --- a/Makefile.am`
		`+ +++ b/Makefile.am`
		`+ @@ -14,7 +14,11 @@ bin_PROGRAMS =`
		`+ noinst_PROGRAMS =`
		`+`
		`+ lib_LTLIBRARIES = libsquashfuse.la libfuseprivate.la`
		`+ -include_HEADERS = squashfuse.h squashfs_fs.h`
		`+ +`
		`+ +pkgincludedir = @includedir@/squashfuse`
		`+ +pkginclude_HEADERS = squashfuse.h squashfs_fs.h \`
		`+ + cache.h common.h config.h decompress.h dir.h file.h fs.h stack.h table.h \`
		`+ + traverse.h util.h xattr.h`
		`+`
		`+ pkgconfigdir = @pkgconfigdir@`
		`+ pkgconfig_DATA = squashfuse.pc`
		`+ diff --git a/squashfuse.pc.in b/squashfuse.pc.in`
		`+ index f131107..adbc769 100644`
		`+ --- a/squashfuse.pc.in`
		`+ +++ b/squashfuse.pc.in`
		`+ @@ -1,7 +1,7 @@`
		`+ prefix=@prefix@`
		`+ exec_prefix=@exec_prefix@`
		`+ libdir=@libdir@`
		`+ -includedir=@includedir@`
		`+ +includedir=@includedir@/squashfuse`
		`+`
		`+ Name: squashfuse`
		`+ Description: squashfuse library to mount squashfs archives`

squashfuse.spec

file modified

+9 -3

		`@@ -7,6 +7,10 @@`
		`URL: https://github.com/vasi/squashfuse`
		`Source0: https://github.com/vasi/squashfuse/archive/%{version}.tar.gz`

		`+ # Fix -devel package missing header files`
		`+ # See: https://patch-diff.githubusercontent.com/raw/vasi/squashfuse/pull/36.patch`
		`+ Patch0: %{name}--PR-36.patch`
		`+`
		`BuildRequires: autoconf, automake, fuse-devel, gcc, libattr-devel, libtool, libzstd-devel, lz4-devel, xz-devel, zlib-devel`
		`Requires: %{name}-libs%{?_isa} = %{version}-%{release}`

		`@@ -34,7 +38,7 @@`


		`%prep`
		`- %autosetup`
		`+ %autosetup -p1`


		`%build`
		`@@ -54,8 +58,7 @@`
		`%{_mandir}/man1/*`

		`%files devel`
		`- %{_includedir}/squashfs_fs.h`
		`- %{_includedir}/squashfuse.h`
		`+ %{_includedir}/squashfuse/`
		`%{_libdir}/pkgconfig/squashfuse.pc`
		`%{_libdir}/*.so`

		`@@ -65,6 +68,9 @@`
		`%ldconfig_scriptlets libs`

		`%changelog`
		`+ * Tue Sep 01 2020 Artur Iwicki <fedora@svgames.pl> - 0.1.102-7`
		`+ - Add a patch that fixes missing header files in -devel subpackage`
		`+`
		`* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.102-6`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild`

suve commented 3 years ago

As mentioned in rhbz1761626, the squashfuse-devel package is currently basically useless, as it does not install all the header files.

This PR cherry-picks the patch that fixes the problem. Contrary to PR #1, it does not switch the package source to a git snapshot, instead opting to patching a tagged release.