rpms/netpbm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix flatpak build

Browse Source 
When built for flatpaks, this will use the /app prefix, but netpbm's
dependencies are part of the runtime which is in /usr.  Therefore,
installation path macros must be used when installing the package but
not to refer to dependencies.
This commit is contained in:
Yaakov Selkowitz 2023-08-10 02:19:22 -04:00
parent 428d12c737
commit a5280fda99
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
netpbm.spec
View File

@ -124,15 +124,15 @@ make \
CFLAGS="$CFLAGS -fPIC -flax-vector-conversions -fno-strict-aliasing" \ CFLAGS="$CFLAGS -fPIC -flax-vector-conversions -fno-strict-aliasing" \
CFLAGS_CONFIG="$CFLAGS" \ CFLAGS_CONFIG="$CFLAGS" \
LADD="-lm" \ LADD="-lm" \
JPEGINC_DIR=%{_includedir} \ JPEGINC_DIR=%{_usr}/include \
PNGINC_DIR=%{_includedir} \ PNGINC_DIR=%{_usr}/include \
TIFFINC_DIR=%{_includedir} \ TIFFINC_DIR=%{_usr}/include \
JPEGLIB_DIR=%{_libdir} \ JPEGLIB_DIR=%{_usr}/%{_lib} \
JBIGLIB=%{_libdir}/libjbig.so.2.1 \ JBIGLIB=%{_usr}/%{_lib}/libjbig.so.2.1 \
PNGLIB_DIR=%{_libdir} \ PNGLIB_DIR=%{_usr}/%{_lib} \
TIFFLIB_DIR=%{_libdir} \ TIFFLIB_DIR=%{_usr}/%{_lib} \
LINUXSVGALIB="NONE" \ LINUXSVGALIB="NONE" \
X11LIB=%{_libdir}/libX11.so \ X11LIB=%{_usr}/%{_lib}/libX11.so \
XML2LIBS="NONE" XML2LIBS="NONE"
# prepare man files # prepare man files
@ -150,12 +150,12 @@ done
%install %install
make package pkgdir=%{buildroot}/usr LINUXSVGALIB="NONE" XML2LIBS="NONE" make package pkgdir=%{buildroot}%{_prefix} LINUXSVGALIB="NONE" XML2LIBS="NONE"
# Ugly hack to have libs in correct dir on 64bit archs. # Ugly hack to have libs in correct dir on 64bit archs.
mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_libdir}
if [ "%{_libdir}" != "/usr/lib" ]; then if [ "%{_lib}" != "lib" ]; then
mv %{buildroot}/usr/lib/lib* %{buildroot}%{_libdir} mv %{buildroot}%{_prefix}/lib/lib* %{buildroot}%{_libdir}
fi fi
cp -af lib/libnetpbm.a %{buildroot}%{_libdir}/libnetpbm.a cp -af lib/libnetpbm.a %{buildroot}%{_libdir}/libnetpbm.a
@ -177,16 +177,16 @@ done
rm -f %{buildroot}%{_mandir}/man5/extendedopacity.5 rm -f %{buildroot}%{_mandir}/man5/extendedopacity.5
mkdir -p %{buildroot}%{_datadir}/netpbm mkdir -p %{buildroot}%{_datadir}/netpbm
mv %{buildroot}/usr/misc/*.map %{buildroot}%{_datadir}/netpbm/ mv %{buildroot}%{_prefix}/misc/*.map %{buildroot}%{_datadir}/netpbm/
mv %{buildroot}/usr/misc/rgb.txt %{buildroot}%{_datadir}/netpbm/ mv %{buildroot}%{_prefix}/misc/rgb.txt %{buildroot}%{_datadir}/netpbm/
rm -rf %{buildroot}/usr/README rm -rf %{buildroot}%{_prefix}/README
rm -rf %{buildroot}/usr/VERSION rm -rf %{buildroot}%{_prefix}/VERSION
rm -rf %{buildroot}/usr/link rm -rf %{buildroot}%{_prefix}/link
rm -rf %{buildroot}/usr/misc rm -rf %{buildroot}%{_prefix}/misc
rm -rf %{buildroot}/usr/man rm -rf %{buildroot}%{_prefix}/man
rm -rf %{buildroot}/usr/pkginfo rm -rf %{buildroot}%{_prefix}/pkginfo
rm -rf %{buildroot}/usr/config_template rm -rf %{buildroot}%{_prefix}/config_template
rm -rf %{buildroot}/usr/pkgconfig_template rm -rf %{buildroot}%{_prefix}/pkgconfig_template
# Don't ship the static library # Don't ship the static library
rm -f %{buildroot}%{_libdir}/lib*.a rm -f %{buildroot}%{_libdir}/lib*.a