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 47333a2..d1ab039 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ /libdatrie-0.2.8.tar.xz +/libdatrie-0.2.9.tar.xz +/libdatrie-0.2.13.tar.xz +/libdatrie-0.2.14.tar.xz diff --git a/libdatrie-fixes-docs.patch b/libdatrie-fixes-docs.patch new file mode 100644 index 0000000..514d038 --- /dev/null +++ b/libdatrie-fixes-docs.patch @@ -0,0 +1,14 @@ +Index: libdatrie-0.2.9/configure.ac +=================================================================== +--- libdatrie-0.2.9.orig/configure.ac ++++ libdatrie-0.2.9/configure.ac +@@ -113,7 +113,8 @@ if test "x$enable_doxygen_doc" = "xyes"; + else + AC_MSG_CHECKING([doxygen >= $DOXYGEN_REQ_VER]) + DOXYGEN_VER=$($DOXYGEN --version) +- if expr $DOXYGEN_VER \< $DOXYGEN_REQ_VER > /dev/null; then ++ AS_VERSION_COMPARE($DOXYGEN_VER, $DOXYGEN_REQ_VER, [HAVE_DOXYGEN=0], [HAVE_DOXYGEN=1], [HAVE_DOXYGEN=1]) ++ if [test "$HAVE_DOXYGEN" = "0"]; then + AC_MSG_RESULT([$DOXYGEN_VER, no, documentation disabled]) + enable_doxygen_doc="no" + else diff --git a/libdatrie.spec b/libdatrie.spec index 1bf31bf..b975150 100644 --- a/libdatrie.spec +++ b/libdatrie.spec @@ -1,11 +1,14 @@ Name: libdatrie -Version: 0.2.8 -Release: 4%{?dist} +Version: 0.2.14 +Release: 1%{?dist} Summary: Implementation of Double-Array structure for representing trie -License: LGPLv2+ +License: LGPL-2.1-or-later URL: http://linux.thai.net/projects/datrie Source0: http://linux.thai.net/pub/thailinux/software/libthai/%{name}-%{version}.tar.xz +BuildRequires: autoconf, automake, libtool +BuildRequires: autoconf-archive BuildRequires: doxygen +BuildRequires: make %description datrie is an implementation of double-array structure for representing trie. @@ -29,12 +32,13 @@ developing applications that use %{name}. %setup -q %build +autoreconf -f -i -v #sed -i '/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64|' configure %configure --disable-static \ --with-html-docdir=%{_pkgdocdir}-devel sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} +%make_build %install %make_install @@ -42,14 +46,10 @@ rm -frv %{buildroot}%{_pkgdocdir} find %{buildroot} -name '*.*a' -delete -print %check -LD_LIBRARY_PATH=../datrie/.libs make check %{?_smp_mflags} - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +LD_LIBRARY_PATH=../datrie/.libs %make_build check %files -%doc COPYING +%license COPYING %{_libdir}/libdatrie.so.* %files devel @@ -58,9 +58,98 @@ LD_LIBRARY_PATH=../datrie/.libs make check %{?_smp_mflags} %{_libdir}/libdatrie.so %{_libdir}/pkgconfig/datrie-0.2.pc %{_bindir}/trietool* -%{_mandir}/man1/trietool*.1* +%{_mandir}/man1/trietool* +%{_pkgdocdir}-devel/*.{html,css,png,js,svg} %changelog +* Fri Nov 28 2025 Peng Wu - 0.2.14-1 +- Update to 0.2.14 +- Resolves: RHBZ#2416998 + +* Thu Jul 24 2025 Fedora Release Engineering - 0.2.13-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 17 2025 Fedora Release Engineering - 0.2.13-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 18 2024 Fedora Release Engineering - 0.2.13-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 0.2.13-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.2.13-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 0.2.13-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed May 17 2023 Peng Wu - 0.2.13-6 +- Migrate to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 0.2.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.2.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.2.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.2.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Feb 1 2021 Peng Wu - 0.2.13-1 +- Update to 0.2.13 + +* Tue Jan 26 2021 Fedora Release Engineering - 0.2.9-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Oct 14 2020 Peng Wu - 0.2.9-13 +- Fixes FTBFS + +* Tue Jul 28 2020 Fedora Release Engineering - 0.2.9-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.2.9-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0.2.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.2.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.2.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 0.2.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.2.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.2.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0.2.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Apr 6 2016 Peng Wu - 0.2.9-3 +- Fixes docs build + +* Thu Feb 04 2016 Fedora Release Engineering - 0.2.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jun 18 2015 Christopher Meng - 0.2.9-1 +- Update to 0.2.9 + +* Wed Jun 17 2015 Fedora Release Engineering - 0.2.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 0.2.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Jun 18 2014 Christopher Meng - 0.2.8-4 - Move docs to %%_pkgdocdir 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 c5c5d28..a14cd76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fc25a7bf5ec7405e30ae1512a8e2226c libdatrie-0.2.8.tar.xz +SHA512 (libdatrie-0.2.14.tar.xz) = c5df387a1c9b5fae65eff69102651f4f054d873194d97faa8e329282353156fa4fb41a1ea771b24ade3f0ad2a548d85d7950a4aa6ed4e5c356bc504720e792d1 diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..fa9a675 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,14 @@ +test: ./runtest.sh +duration: 50m +framework: beakerlib +require: + - make + - gcc + - autoconf + - autoconf-archive + - automake + - libtool + - doxygen + - libdatrie + - gnome-common + - rpm-build diff --git a/tests/runtest.sh b/tests/runtest.sh new file mode 100755 index 0000000..3d4a741 --- /dev/null +++ b/tests/runtest.sh @@ -0,0 +1,35 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlShowPackageVersion libdatrie + rlRun -t -l "VERSION=$(rpm -q libdatrie --queryformat='%{version}')" 0 "Get VERSION" + FEDORA_VERSION=$(rlGetDistroRelease) + rlLog "FEDORA_VERSION=${DISTRO_RELEASE}" + rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" + rlRun "pushd $tmp" + rlFetchSrcForInstalled "libdatrie" + rlRun "rpm --define '_topdir $tmp' -i *src.rpm" + rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory" + rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec" + if [ -d BUILD/libdatrie-${VERSION}-build ]; then + rlRun -t -l "pushd BUILD/libdatrie-${VERSION}-build/libdatrie-${VERSION}" + else + rlRun -t -l "pushd BUILD/libdatrie-${VERSION}" + fi + rlPhaseEnd + + rlPhaseStartTest + rlRun "set -o pipefail" + rlRun -t -l "NOCONFIGURE=1 gnome-autogen.sh" + rlRun -t -l "./configure" + rlRun -t -l "make" + rlRun -t -l "make check" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd; popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd