diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 0cbc784..125d08d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ -/liblangtag-0.6.4.tar.bz2 -/liblangtag-0.6.6.tar.bz2 -/liblangtag-0.6.7.tar.bz2 +/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 diff --git a/liblangtag-noparallel-gir.patch b/liblangtag-noparallel-gir.patch deleted file mode 100644 index d5b2bcf..0000000 --- a/liblangtag-noparallel-gir.patch +++ /dev/null @@ -1,8 +0,0 @@ -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 1e258ba..4007c6f 100644 --- a/liblangtag.spec +++ b/liblangtag.spec @@ -4,27 +4,22 @@ %global soversion_gobject 0 Name: liblangtag -Version: 0.6.7 -Release: 6%{?dist} +Version: 0.6.2 +Release: 8%{?dist} Summary: An interface library to access tags for identifying languages -License: LGPL-3.0-or-later OR MPL-2.0 -URL: https://bitbucket.org/tagoh/liblangtag/ +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) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: make -BuildRequires: gcc %description %{name} is an interface library to access tags for identifying @@ -47,7 +42,7 @@ Features: %package data Summary: %{name} data files -License: Unicode-DFS-2015 +License: UCD BuildArch: noarch %description data @@ -81,20 +76,16 @@ The %{name}-doc package contains documentation files for %{name}. %autosetup -p1 %build -%configure \ -%if 0%{?flatpak} - --disable-gtk-doc \ -%endif - --disable-silent-rules --disable-static --enable-shared --enable-introspection +%configure --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_build +make %{?_smp_mflags} %install -%make_install +make install DESTDIR=%{buildroot} rm -f %{buildroot}/%{_libdir}/*.la %{buildroot}/%{_libdir}/%{name}/*.la %ldconfig_scriptlets @@ -103,7 +94,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_build check +make %{?_smp_mflags} check %files %doc AUTHORS NEWS README @@ -134,71 +125,6 @@ export LD_LIBRARY_PATH=`pwd`/liblangtag/.libs:`pwd`/liblangtag-gobject/.libs${LD %{_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 diff --git a/plans/basic.fmf b/plans/basic.fmf deleted file mode 100644 index c1627f9..0000000 --- a/plans/basic.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Basic smoke test -discover: - how: fmf -execute: - how: tmt diff --git a/sources b/sources index 8039d41..3f32a8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (liblangtag-0.6.7.tar.bz2) = 3628728f46865507d8794c1e7286c6ca04fc49f905594ab76db7bd2c8d8f9fac1e33693314d56bca6fdd8f99b8d207e6e6d2f751474832ceb60a4cdbf10fed68 +284f120247323a35122ab32b4b359c45 liblangtag-0.6.2.tar.bz2 diff --git a/tests/main.fmf b/tests/main.fmf deleted file mode 100644 index b6b1bef..0000000 --- a/tests/main.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Basic test -require: - - liblangtag-gobject - - python3 - - python3-gobject -test: ./runtest.sh -framework: beakerlib diff --git a/tests/runtest.sh b/tests/runtest.sh deleted file mode 100755 index d80a05b..0000000 --- a/tests/runtest.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/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 deleted file mode 100644 index 71f1b38..0000000 --- a/tests/test.py +++ /dev/null @@ -1,12 +0,0 @@ -#! /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)