diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 125d08d..0cbc784 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -/liblangtag-0.5.6.tar.bz2 -/liblangtag-0.5.7.tar.bz2 -/liblangtag-0.5.8.tar.bz2 -/liblangtag-0.6.0.tar.bz2 -/liblangtag-0.6.1.tar.bz2 -/liblangtag-0.6.2.tar.bz2 +/liblangtag-0.6.4.tar.bz2 +/liblangtag-0.6.6.tar.bz2 +/liblangtag-0.6.7.tar.bz2 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 74a1211..1e258ba 100644 --- a/liblangtag.spec +++ b/liblangtag.spec @@ -4,22 +4,27 @@ %global soversion_gobject 0 Name: liblangtag -Version: 0.6.2 -Release: 7%{?dist} +Version: 0.6.7 +Release: 6%{?dist} Summary: An interface library to access tags for identifying languages -License: LGPLv3+ or MPLv2.0 -URL: http://tagoh.bitbucket.org/liblangtag/ +License: LGPL-3.0-or-later OR MPL-2.0 +URL: https://bitbucket.org/tagoh/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) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: make +BuildRequires: gcc %description %{name} is an interface library to access tags for identifying @@ -42,7 +47,7 @@ Features: %package data Summary: %{name} data files -License: UCD +License: Unicode-DFS-2015 BuildArch: noarch %description data @@ -76,16 +81,20 @@ 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' \ libtool export LD_LIBRARY_PATH=`pwd`/liblangtag/.libs:`pwd`/liblangtag-gobject/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install rm -f %{buildroot}/%{_libdir}/*.la %{buildroot}/%{_libdir}/%{name}/*.la %ldconfig_scriptlets @@ -94,7 +103,7 @@ rm -f %{buildroot}/%{_libdir}/*.la %{buildroot}/%{_libdir}/%{name}/*.la %check export LD_LIBRARY_PATH=`pwd`/liblangtag/.libs:`pwd`/liblangtag-gobject/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -make %{?_smp_mflags} check +%make_build check %files %doc AUTHORS NEWS README @@ -125,6 +134,74 @@ make %{?_smp_mflags} check %{_datadir}/gtk-doc/html/%{name} %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.6.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 17 2025 Fedora Release Engineering - 0.6.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 18 2024 Fedora Release Engineering - 0.6.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 0.6.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.6.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 1 2023 Akira TAGOH - 0.6.7-1 +- New upstream release. + Resolves: rhbz#2251364 + +* Thu Jul 20 2023 Fedora Release Engineering - 0.6.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Eike Rathke - 0.6.4-4 +- Migrated to SPDX license IDs + +* Thu Jan 19 2023 Fedora Release Engineering - 0.6.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.6.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jun 30 2022 Caolán McNamara - 0.6.4-1 +- Resolves: rhbz#2102551 latest available version +- fix make check by changing canonicalization test of "mo" from "ro-MD" to "ro" + +* Thu Jan 20 2022 Fedora Release Engineering - 0.6.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.6.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed May 19 2021 Timm Bäder - 0.6.3-7 +- Add gcc buildrequires +- Use make macros + +* Wed May 19 2021 Akira TAGOH - 0.6.3-6 +- Update License field for liblangtag-data. + It is actually Unicode but not UCD. + +* Wed Apr 21 2021 Akira TAGOH - 0.6.3-5 +- Suppress documentation in Flatpak builds +- build gir with non-parallel to avoid strange behavior. + +* Tue Jan 26 2021 Fedora Release Engineering - 0.6.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.6.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Sep 26 2019 Caolán McNamara - 0.6.3-1 +- Resolves: rhbz#1755875 latest available version + +* Thu Jul 25 2019 Fedora Release Engineering - 0.6.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 0.6.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/sources b/sources index 3f32a8d..8039d41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -284f120247323a35122ab32b4b359c45 liblangtag-0.6.2.tar.bz2 +SHA512 (liblangtag-0.6.7.tar.bz2) = 3628728f46865507d8794c1e7286c6ca04fc49f905594ab76db7bd2c8d8f9fac1e33693314d56bca6fdd8f99b8d207e6e6d2f751474832ceb60a4cdbf10fed68 diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..b6b1bef --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,7 @@ +summary: Basic test +require: + - liblangtag-gobject + - python3 + - python3-gobject +test: ./runtest.sh +framework: beakerlib diff --git a/tests/runtest.sh b/tests/runtest.sh new file mode 100755 index 0000000..d80a05b --- /dev/null +++ b/tests/runtest.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k + +basedir=$(pwd) + +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" + rlRun "pushd $tmp" + rlRun "set -o pipefail" + rlPhaseEnd + + rlPhaseStartTest + rlRun -t -s "python3 $basedir/test.py" 0 "Check liblangtag" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd diff --git a/tests/test.py b/tests/test.py new file mode 100644 index 0000000..71f1b38 --- /dev/null +++ b/tests/test.py @@ -0,0 +1,12 @@ +#! /usr/bin/python3 + +import gi +gi.require_version('LangTag', '0.6') +from gi.repository import LangTag + +tag = LangTag.Tag.new() +if not tag.parse("en-Latn-US"): + exit(1) + +if tag.canonicalize() != 'en-US': + exit(1)