8 changed files with 20 additions and 2131 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -1,17 +1 @@
 /fribidi-0.19.7.tar.bz2
-/fribidi-1.0.1.tar.bz2
-/fribidi-1.0.2.tar.bz2
-/fribidi-1.0.3.tar.bz2
-/fribidi-1.0.4.tar.bz2
-/fribidi-1.0.5.tar.bz2
-/fribidi-1.0.6.tar.gz
-/fribidi-1.0.7.tar.bz2
-/fribidi-1.0.8.tar.bz2
-/fribidi-1.0.9.tar.xz
-/fribidi-1.0.10.tar.xz
-/fribidi-1.0.11.tar.xz
-/fribidi-1.0.12.tar.xz
-/fribidi-1.0.13.tar.xz
-/fribidi-1.0.14.tar.xz
-/fribidi-1.0.15.tar.xz
-/fribidi-1.0.16.tar.xz
--- a/fribidi-drop-bundled-gnulib.patch
+++ b/fribidi-drop-bundled-gnulib.patch
--- a/fribidi.spec
+++ b/fribidi.spec
@ -1,18 +1,11 @@
 Summary: Library implementing the Unicode Bidirectional Algorithm
 Name: fribidi
-Version: 1.0.16
-Release: 3%{?dist}
-URL: https://github.com/fribidi/fribidi/
-Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
-License: LGPL-2.1-or-later AND Unicode-DFS-2016
-BuildRequires: gcc
-%if 0%{?rhel} && 0%{?rhel} <= 8
-BuildRequires: automake autoconf libtool
-%else
-BuildRequires: meson
-%endif
-BuildRequires: make
-Patch0: fribidi-drop-bundled-gnulib.patch
+Version: 0.19.7
+Release: 5%{?dist}
+URL: http://fribidi.org
+Source: http://fribidi.org/download/%{name}-%{version}.tar.bz2
+License: LGPLv2+ and UCD
+Group: System Environment/Libraries

 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@ -21,6 +14,7 @@ is always written in logical order.

 %package devel
 Summary: Libraries and include files for FriBidi
+Group: System Environment/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}

 %description devel
@ -28,17 +22,9 @@ Include files and libraries needed for developing applications which use
 FriBidi.

 %prep
-%autosetup -p1
-%if 0%{?rhel} && 0%{?rhel} <= 8
-autoreconf -i
-%endif
-# Clean up older file in archive
-(cd lib;
- rm arabic-shaping.tab.i bidi-type.tab.i brackets*.tab.i joining-type.tab.i mirroring.tab.i fribidi-unicode-version.h
-)
+%setup -q

 %build
-%if 0%{?rhel} && 0%{?rhel} <= 8
 %if 0%{?el5}
 # FORTIFY_SOURCE=2 breaks EL-5 build
 export CFLAGS=`echo $RPM_OPT_FLAGS | sed -e 's|FORTIFY_SOURCE=2|FORTIFY_SOURCE=1|'`
@ -51,194 +37,31 @@ export CFLAGS="$CFLAGS -DPAGE_SIZE=4096"
 export CFLAGS="$RPM_OPT_FLAGS -DPAGE_SIZE=4096"
 %endif
 %endif
-%configure --disable-static --disable-docs
-make %{?_smp_mflags} V=1
-%else
-%meson -Ddocs=false
-%meson_build
-%endif
-
-%check
-%if 0%{?rhel} && 0%{?rhel} <= 8
-make check
-%else
-%meson_test
-%endif
+%configure --disable-static
+make %{?_smp_mflags}

 %install
-%if 0%{?rhel} && 0%{?rhel} <= 8
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL="install -p"
-%else
-%meson_install
-%endif
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# remove empty (compressed) man pages
+find $RPM_BUILD_ROOT%{_mandir}/man3 -type f -empty -exec rm {} \;

-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig

 %files
-%doc README AUTHORS ChangeLog THANKS NEWS TODO
-%license COPYING
+%doc README AUTHORS COPYING ChangeLog THANKS NEWS TODO
 %{_bindir}/fribidi
-%{_libdir}/libfribidi.so.0*
+%{_libdir}/libfribidi.so.*

 %files devel
 %{_includedir}/fribidi
 %{_libdir}/libfribidi.so
 %{_libdir}/pkgconfig/*.pc
-#%%{_mandir}/man3/*.gz
+%{_mandir}/man3/%{name}_*.gz

 %changelog
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.16-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Sep 27 2024 Akira TAGOH <tagoh@redhat.com> - 1.0.16-1
- New upstream release.
-  Resolves: rhbz#2314907
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jun 10 2024 Akira TAGOH <tagoh@redhat.com> - 1.0.15-1
- New upstream release.
-  Resolves: rhbz#2291030
-
-* Wed Jun  5 2024 Akira TAGOH <tagoh@redhat.com> - 1.0.14-2
- Fix broken data in fribidi.
-  Resolves: rhbz#2279842
-
-* Tue May  7 2024 Akira TAGOH <tagoh@redhat.com> - 1.0.14-1
- New upstream release.
-  Resolves: rhbz#2277227
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.13-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed May 17 2023 Akira TAGOH <tagoh@redhat.com> - 1.0.13-1
- New upstream release.
-  Resolves: rhbz#2207796
-
-* Fri Feb 24 2023 Caolán McNamara <caolanm@redhat.com> - 1.0.12-4
- migrated to SPDX license
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Apr 21 2022 Akira TAGOH <tagoh@redhat.com> - 1.0.12-1
- New upstream release.
-  Resolves: rhbz#2077311
-
-* Fri Apr  1 2022 Akira TAGOH <tagoh@redhat.com> - 1.0.11-3
- Fix security issues, CVE-2022-25308, CVE-2022-25309, CVE-2022-25310.
-  Resolves: rhbz#2067039, rhbz#2067043, rhbz#2067045
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Sep 24 2021 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 1.0.11-1
- Update to 1.0.11 (#2007504)
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul  7 2020 Akira TAGOH <tagoh@redhat.com> - 1.0.10-2
- Update the patch to drop bundled gnulib.
-
-* Mon Jul  6 2020 Akira TAGOH <tagoh@redhat.com> - 1.0.10-1
- New upstream release.
-  Resolves: rhbz#1853939
-
-* Thu Mar 05 2020 Akira TAGOH <tagoh@redhat.com> - 1.0.9-1
- New upstream release.
-  Resolves: rhbz#1809478
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jan 15 2020 Akira TAGOH <tagoh@redhat.com> - 1.0.8-2
- Restore the deprecated API that was accidentally removed in the previous release.
-  Resolves: rhbz#1787293
-
-* Fri Dec 13 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.8-1
- New upstream release.
-  Resolves: rhbz#1783205
-
-* Wed Dec 11 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.7-2
- Fix CVE-2019-18397
-  Resolves: rhbz#1781218
-
-* Mon Sep 30 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.7-1
- New upstream release.
-  Resolves: rhbz#1756434
-
-* Fri Sep 27 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.6-1
- New upstream release.
-  Resolves: rhbz#1756212
- Use meson to build.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jul 23 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.5-3
- Backport upstream patch to remove HAVE_CONFIG_H from public API.
-  Fixes rhbz#1730516
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Aug 06 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.5-1
- New upstream release. (#1609080)
-
-* Thu Jul 26 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-6
- Drop bundled gnulib code.
-
-* Tue Jul 17 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-5
- Add BR: gcc.
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jul 12 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-3
- Modernize spec file.
-
-* Fri Jun 29 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-2
- Use ldconfig rpm macro.
-
-* Fri Jun 08 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.4-1
- New upstream release. (#1587985)
-
-* Thu May 31 2018 Akira TAGOH <tagoh@redhat.com> - 1.0.3-1
- New upstream release. (#1584541)
-
-* Fri May 04 2018 Caolán McNamara <caolanm@redhat.com> - 1.0.2-1
- Resolves: rhbz#1574858 latest version, --disable-docs because there's no c2man
-
-* Wed Feb 28 2018 Caolán McNamara <caolanm@redhat.com> - 1.0.1-1
- Resolves: rhbz#1549934 latest version
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Oct 16 2017 Caolán McNamara <caolanm@redhat.com> - 0.19.7-6
- Resolves: rhbz#1502675 enable make check
-
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

@ -389,3 +212,4 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

 * Fri May 16 2003 Jeremy Katz <katzj@redhat.com> 0.10.4-2
 - Initial build in Red Hat Linux
+
--- a/plans/basic.fmf
+++ b/plans/basic.fmf
@ -1,11 +0,0 @@
-summary: Basic smoke test
-discover:
-    how: fmf
-    dist-git-source: true
-prepare:
-    name: tmt
-    how: install
-    package:
-      - fribidi
-execute:
-    how: tmt
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (fribidi-1.0.16.tar.xz) = e3a56f36155f6813e3609473639fc533de742309f561c463012dc90b412a1ac7694b765d92669b2cbfaee973ca0e92fa5e926e68a1a078921f26ef17d82ab651
+6c7e7cfdd39c908f7ac619351c1c5c23  fribidi-0.19.7.tar.bz2
--- a/tests/basic/main.fmf
+++ b/tests/basic/main.fmf
@ -1,3 +0,0 @@
-summary: Basic test
-test: ./test.sh
-framework: beakerlib
--- a/tests/basic/test.sh
+++ b/tests/basic/test.sh
@ -1,31 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-. /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 "BUILD_PATH=$(rpm -q --qf '%{NAME}-%{VERSION}' fribidi)" 0 "Get the build path"
-        if test -d $TMT_SOURCE_DIR/$BUILD_PATH; then
-            for f in $TMT_SOURCE_DIR/$BUILD_PATH/test/*.input; do
-                ref=${f/.input/.reference}
-                cs=$(echo $f|cut -d_ -f2)
-                name=$(basename $f)
-                rlRun "fribidi -t -c $cs $f | tee output" 0 "Check $name for $cs"
-                rlRun "diff -U 0 output $ref" 0 "Check diff for $name"
-            done
-        else
-            rlDie "No build directory"
-        fi
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $tmp" 0 "Remove tmp directory"
-    rlPhaseEnd
-rlJournalEnd