Avoid using .gz in manpage listing and specify TYPELIBDIR and GIRDIR when building flatpak

-According to Fedora Guidelines, it is better to use the pattern when listing
manpages, because compression formats can change.

-When building flatpak from RPMs, it is needed to specify TYPELIBDIR and GIRDIR
because pkgconfig cannot find the paths correctly. When %{flatpak} macro is not set
or set to 0, there is no change.
This commit is contained in:
Jan Beran 2019-08-06 13:11:50 +02:00 committed by Jan Beran
commit 8443a601cf

View file

@ -6,7 +6,7 @@
Summary: Word processing program
Name: abiword
Version: %{majorversion}.%{minorversion}.%{microversion}
Release: 21%{?dist}
Release: 22%{?dist}
Epoch: 1
License: GPLv2+
URL: http://www.abisource.com/
@ -130,7 +130,10 @@ ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
%install
cd $RPM_BUILD_DIR/abiword-%{version}
make install DESTDIR=%{buildroot}
make install DESTDIR=%{buildroot} \
%if 0%{?flatpak}
TYPELIBDIR=%{_libdir}/girepository-1.0 GIRDIR=%{_datadir}/gir-1.0
%endif
# Register as an application to be visible in the software center
#
@ -205,7 +208,7 @@ find %{buildroot} -name '*.a' -delete
%{_datadir}/icons/hicolor/scalable/apps/abiword.svg
# Abiword help
%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord
%{_mandir}/man1/abiword.1.gz
%{_mandir}/man1/abiword.1*
%files -n libabiword
%doc $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT
@ -228,6 +231,10 @@ find %{buildroot} -name '*.a' -delete
%{python2_sitearch}/*
%changelog
* Mon Aug 12 2019 Jan Beran <jaberan@redhat.com> - 1:3.0.2-22
- Avoid using .gz when listing manpages
- Specify GIRDIR and TYPELIBDIR when building flatpak
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.0.2-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild