From 9c300d0bf45e732b16a7662467be905dc8a8a7a8 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 21 Apr 2021 23:31:15 +0900 Subject: [PATCH] Backport changes from Fedora - Suppress documentation in Flatpak builds - build gir with non-parallel to avoid strange behavior. Resolves: rhbz#1952350 --- liblangtag-noparallel-gir.patch | 8 ++++++++ liblangtag.spec | 15 +++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 liblangtag-noparallel-gir.patch diff --git a/liblangtag-noparallel-gir.patch b/liblangtag-noparallel-gir.patch new file mode 100644 index 0000000..d5b2bcf --- /dev/null +++ b/liblangtag-noparallel-gir.patch @@ -0,0 +1,8 @@ +diff -pruN liblangtag-0.6.2.orig/liblangtag-gobject/gendeps.sh liblangtag-0.6.2/liblangtag-gobject/gendeps.sh +--- liblangtag-0.6.2.orig/liblangtag-gobject/gendeps.sh 2012-12-13 17:59:17.000000000 +0900 ++++ liblangtag-0.6.2/liblangtag-gobject/gendeps.sh 2020-11-18 21:10:08.511540427 +0900 +@@ -11,3 +11,4 @@ while [ $# -ne 0 ]; do + echo " \$(AM_V_GEN) \$(srcdir)/gengir.sh \$(top_srcdir)/liblangtag \$@" + done + echo "\$(srcdir)/gendir.sh:" ++echo ".NOTPARALLEL:" diff --git a/liblangtag.spec b/liblangtag.spec index 5c2d46a..60f4d03 100644 --- a/liblangtag.spec +++ b/liblangtag.spec @@ -5,17 +5,20 @@ Name: liblangtag Version: 0.6.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: An interface library to access tags for identifying languages License: LGPLv3+ or MPLv2.0 URL: http://tagoh.bitbucket.org/liblangtag/ Source0: https://bitbucket.org/tagoh/%{name}/downloads/%{name}-%{version}.tar.bz2 +Patch0: liblangtag-noparallel-gir.patch Requires: %{name}-data = %{version}-%{release} BuildRequires: glibc-common +%if ! 0%{?flatpak} BuildRequires: gtk-doc +%endif BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) @@ -77,7 +80,11 @@ The %{name}-doc package contains documentation files for %{name}. %autosetup -p1 %build -%configure --disable-silent-rules --disable-static --enable-shared --enable-introspection +%configure \ +%if 0%{?flatpak} + --disable-gtk-doc \ +%endif + --disable-silent-rules --disable-static --enable-shared --enable-introspection sed -i \ -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ @@ -126,6 +133,10 @@ make %{?_smp_mflags} check %{_datadir}/gtk-doc/html/%{name} %changelog +* Wed Apr 21 2021 Akira TAGOH - 0.6.3-6 +- Suppress documentation in Flatpak builds +- build gir with non-parallel to avoid strange behavior. + * Fri Apr 16 2021 Mohan Boddu - 0.6.3-5 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937