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 742086d..0aba3eb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,9 @@ m17n-lib-1.6.1.tar.gz /m17n-lib-1.7.0.tar.gz /m17n-lib-1.8.0RC.tar.gz /m17n-lib-1.8.0.tar.gz +/m17n-lib-1.8.1.tar.gz +/m17n-lib-1.8.2.tar.gz +/m17n-lib-1.8.3.tar.gz +/m17n-lib-1.8.4.tar.gz +/m17n-lib-1.8.5.tar.gz +/m17n-lib-1.8.6.tar.gz diff --git a/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch b/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch deleted file mode 100644 index 3a25ea1..0000000 --- a/Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4d815754f9f32c54ec47f9e323940f6332a7cb5d Mon Sep 17 00:00:00 2001 -From: Mike FABIAN -Date: Tue, 30 Apr 2019 10:32:13 +0200 -Subject: [PATCH] Fix segmentation fault when using ibus-m17n with vi-telex in - gedit in Gnome Wayland - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1704156 ---- - src/m17n-core.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/m17n-core.c b/src/m17n-core.c -index fe5aa77..642dfee 100644 ---- a/src/m17n-core.c -+++ b/src/m17n-core.c -@@ -930,6 +930,8 @@ m17n_object_unref (void *object) - M17NObjectRecord *record; - unsigned *count; - -+ if (object == NULL) -+ return -1; - if (! obj->ref_count_extended) - { - if (! --obj->ref_count) --- -2.20.1 - diff --git a/changelog b/changelog new file mode 100644 index 0000000..c27694a --- /dev/null +++ b/changelog @@ -0,0 +1,280 @@ +* Thu Jan 25 2024 Fedora Release Engineering - 1.8.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Aug 23 2023 Mike FABIAN - 1.8.4-1 +- Update to 1.8.4 +- Fixes “typedef in m17n-core.h causing error when compiling with C++ code” + (Resolves: https://savannah.nongnu.org/bugs/index.php?64566) + +* Wed Jul 26 2023 Björn Esser - 1.8.3-2 +- Rebuild(libotf) + +* Tue Jul 25 2023 Mike FABIAN - 1.8.3-1 +- Update to 1.8.3 +- Fixes to be able to create m17n-docs-1.8.3: Fix doxygen tags, change all EUC-JP files to UTF-8 + +* Thu Jul 20 2023 Fedora Release Engineering - 1.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue May 09 2023 Mike FABIAN - 1.8.2-1 +- Update to 1.8.2 +- Fix parallel builds by switching from absolute to relative paths + (Resolves: https://savannah.nongnu.org/bugs/index.php?61377) +- enable parallel builds in the spec file + +- Update to 1.8.1 +- Remove m17n-lib-c99.patch (included upstream) +- Remove Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch + (included upstream) + +* Tue Apr 25 2023 Florian Weimer - 1.8.0-16 +- Fix C99 compatibility issue in example code + +* Thu Jan 19 2023 Fedora Release Engineering - 1.8.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Nov 30 2022 Mike FABIAN - 1.8.0-14 +- Migrate license tag to SPDX + +* Thu Jul 21 2022 Fedora Release Engineering - 1.8.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.8.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.8.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Parag Nemade - 1.8.0-10 +- Add conditional for anthy module subpackage + +* Tue Jan 26 2021 Fedora Release Engineering - 1.8.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.8.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 1.8.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Apr 30 2019 Mike FABIAN - 1.8.0-5 +- Fix segmentation fault when using ibus-m17n with vi-telex in gedit in Gnome Wayland +- Resolves: rhbz#1704156 + +* Fri Feb 01 2019 Fedora Release Engineering - 1.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Nov 26 2018 Parag Nemade - 1.8.0-3 +- Added Provides: bundled(gnulib) + +* Fri Jul 13 2018 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sat Feb 10 2018 Parag Nemade - 1.8.0-1 +- Update to 1.8.0 version (#1543670) + +* Thu Feb 08 2018 Fedora Release Engineering - 1.8.0-0.2.RC1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 03 2018 Parag Nemade - 1.8.0-0.1.RC1 +- Update to 1.8.0 (#1523968) + +* Thu Aug 03 2017 Fedora Release Engineering - 1.7.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.7.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.7.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1.7.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Aug 26 2015 Mike FABIAN - 1.7.0-4 +- Fix "Transliteration not working on Marathi language" (it crashed). +- Resolves: rhbz#1256244 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.7.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Feb 21 2015 Till Maas - 1.7.0-2 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Mon Dec 22 2014 Parag Nemade - 1.7.0-1 +- update to 1.7.0 +- Drop aarch64 patch and use autoreconf + +* Sun Aug 17 2014 Fedora Release Engineering - 1.6.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Aug 07 2014 Parag Nemade - 1.6.4-12 +- Resolves:rh#1127583 - Add missing BuildRequires + +* Sat Jun 07 2014 Fedora Release Engineering - 1.6.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 1.6.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jun 11 2013 Remi Collet - 1.6.4-9 +- rebuild for new GD 2.1.0 + +* Sun Mar 24 2013 Parag Nemade - 1.6.4-8 +- Resolves:rh#926108 - Does not support aarch64 in f19 and rawhide + +* Thu Mar 14 2013 Hans de Goede - 1.6.4-7 +- Fix m17n-config not working on non x86_* archs (rh#921189) + +* Mon Mar 11 2013 Parag Nemade - 1.6.4-6 +- Resolves:rh#907488 - shell syntax error in m17n-config + +* Thu Feb 14 2013 Fedora Release Engineering - 1.6.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Nov 30 2012 Parag Nemade - 1.6.4-4 +- Resolves:rh#880957 - m17n-lib doesn't uninstall properly + +* Tue Nov 20 2012 Parag Nemade - 1.6.4-3 +- m17n-lib to own %%{_libdir}/m17n + +* Tue Nov 20 2012 Parag Nemade - 1.6.4-2 +- Resolves:rh#877925 - drop m17n-lib-flt provides +- Fix bogus date in %%changelog +- Make sure not to attempt to use parallel make as it fails the build + +* Tue Sep 18 2012 Parag Nemade - 1.6.4-1 +- update to 1.6.4 + +* Thu Jul 19 2012 Fedora Release Engineering - 1.6.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 1.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Oct 11 2011 Parag Nemade - 1.6.3-1 +- update to 1.6.3 + +* Tue Mar 22 2011 Parag Nemade - 1.6.2-3 +- Resolves: rh#680363 - Remove m17n-lib-ispell subpackage +- Resolves: rh#677866 - m17n*.pc reports wrong moduledir on x86_64 system + +* Tue Feb 08 2011 Fedora Release Engineering - 1.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Oct 06 2010 Parag Nemade - 1.6.2-1 +- update to new upstream release 1.6.2 + +* Mon Sep 13 2010 Parag Nemade - 1.6.1-5 +- Fix some packaging issue +- Change Requires: m17n-db-datafiles to m17n-db-extras + +* Fri Sep 10 2010 Daiki Ueno - 1.6.1-4 +- supply libotf cflags/libs manually, since the current libotf package + does not ship with "libotf-config" and m17n-lib cannot detect those + values +- fix paths for modules used by GUI support + +* Wed Aug 11 2010 Adam Jackson 1.6.1-3 +- Fix Obsoletes: so upgrades actually work (1.5.5-3 < 1.5.5-3.fc13) + +* Wed Jul 07 2010 Parag Nemade - 1.6.1-2 +- Resolves: rh#602029:-m17n-lib-devel multilib conflict +- Fix rpmlint rpath error. + +* Tue Apr 27 2010 Parag Nemade - 1.6.1-1 +- update to new upstream release 1.6.1 + +* Wed Apr 07 2010 Parag Nemade - 1.6.0-1 +- update to new upstream release 1.6.0 + +* Wed Dec 23 2009 Jens Petersen - 1.5.5-2 +- add bcond for otf, anthy, and gui +- subpackage flt for emacs, etc +- add subpackages for anthy and ispell modules +- disable new gui subpackage (and hence ispell) + +* Mon Aug 17 2009 Parag Nemade - 1.5.5-1 +- update to new upstream release 1.5.5 + +* Sat Jul 25 2009 Fedora Release Engineering - 1.5.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Mar 03 2009 Parag Nemade -1.5.4-1 +- Update to new upstream release 1.5.4 + +* Wed Feb 25 2009 Fedora Release Engineering - 1.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Oct 21 2008 Parag Nemade -1.5.3-1.fc10 +- Update to new upstream release 1.5.3 + +* Thu Jul 03 2008 Parag Nemade -1.5.2-1 +- Update to new upstream release 1.5.2 + +* Thu Feb 07 2008 Parag Nemade -1.5.1-1.fc9 +- Update to new upstream release 1.5.1 + +* Fri Dec 28 2007 Parag Nemade -1.5.0-1.fc9 +- Update to new upstream release 1.5.0 +- Added missing internal-flt.h file as Source1 + +* Wed Aug 22 2007 Parag Nemade - 1.4.0-2 +- rebuild against new rpm package +- update license tag + +* Thu Jul 19 2007 Jens Petersen +- buildrequire and require m17n-db >= 1.4.0 + +* Thu Jul 19 2007 Parag Nemade - 1.4.0-1 +- Updated to new upstream release 1.4.0 + +* Wed Jan 10 2007 Mayank Jain - 1.3.4-1.1.fc7 +- rebuild for m17n-lib-1.3.4 version +- Updated m17n-lib-nobuild-examples.patch + +* Wed Jul 12 2006 Jesse Keating - 1.3.3-1.1.fc6 +- rebuild + +* Wed Jul 12 2006 Mayank Jain - 1.3.3-1.fc6 +- Updated spec file for changes mentioned in RH bug 193524, comment 4 +- Thanks to Mamoru Tasaka + +* Thu Mar 2 2006 Jens Petersen - 1.3.3-1 +- update to 1.3.3 minor bugfix release + +* Fri Feb 10 2006 Jesse Keating - 1.3.2-1.1 +- bump again for double-long bug on ppc(64) + +* Fri Feb 10 2006 Jens Petersen - 1.3.2-1 +- update to 1.3.2 bugfix release + - m17n-lib-no-gui-headers.patch is now upstream + +* Tue Feb 07 2006 Jesse Keating - 1.3.1-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Thu Feb 2 2006 Jens Petersen - 1.3.1-1 +- update to 1.3.1 release + - rename use_otf and use_anthy macros to with_gui and with_examples + - build --with-gui=no and replace m17n-lib-1.2.0-core-libs-only.patch + with m17n-lib-no-gui-headers.patch and m17n-lib-nobuild-examples.patch + +* Fri Dec 16 2005 Jens Petersen - 1.2.0-2 +- import to Fedora Core +- buildrequire autoconf + +* Thu Nov 10 2005 Jens Petersen - 1.2.0-1 +- do not build static lib and .la files (Warren Togami) + +* Wed Oct 5 2005 Jens Petersen +- initial packaging for Fedora Extras + +* Sat Jan 15 2005 UTUMI Hirosi +- modify spec for fedora diff --git a/m17n-lib.spec b/m17n-lib.spec index 5163946..58c646a 100644 --- a/m17n-lib.spec +++ b/m17n-lib.spec @@ -6,15 +6,14 @@ %endif Name: m17n-lib -Version: 1.8.0 -Release: 12%{?dist} +Version: 1.8.6 +Release: %autorelease Summary: Multilingual text library -License: LGPLv2+ +License: LGPL-2.1-or-later URL: http://www.nongnu.org/m17n/ Source0: http://download.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz Patch0: %{name}-1.8.0-multilib.patch -Patch1: Fix-segmentation-fault-when-using-ibus-m17n-with-vi-telex-in-gedit-in-wayland.patch BuildRequires: make BuildRequires: m17n-db-devel libthai-devel @@ -30,7 +29,7 @@ BuildRequires: automake libtool Provides: bundled(gnulib) %if %{with anthy} -BuildRequires: anthy-devel +BuildRequires: anthy-unicode-devel %endif Requires: m17n-db @@ -76,8 +75,7 @@ Tools to test M17n GUI widget library. 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 -# parallel make usage with make command fails build on koji -make +%{make_build} %install make install DESTDIR=%{buildroot} INSTALL="install -p" @@ -122,244 +120,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_bindir}/m17n-dump %{_bindir}/m17n-edit %{_bindir}/m17n-view +%{_bindir}/m17n-input-test %{_libdir}/m17n/1.0/libm17n-X.so %{_libdir}/m17n/1.0/libm17n-gd.so %{_libdir}/libm17n-gui.so.* %changelog -* Thu Jan 20 2022 Fedora Release Engineering - 1.8.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.8.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Parag Nemade - 1.8.0-10 -- Add conditional for anthy module subpackage - -* Tue Jan 26 2021 Fedora Release Engineering - 1.8.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1.8.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 1.8.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1.8.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Apr 30 2019 Mike FABIAN - 1.8.0-5 -- Fix segmentation fault when using ibus-m17n with vi-telex in gedit in Gnome Wayland -- Resolves: rhbz#1704156 - -* Fri Feb 01 2019 Fedora Release Engineering - 1.8.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Nov 26 2018 Parag Nemade - 1.8.0-3 -- Added Provides: bundled(gnulib) - -* Fri Jul 13 2018 Fedora Release Engineering - 1.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Feb 10 2018 Parag Nemade - 1.8.0-1 -- Update to 1.8.0 version (#1543670) - -* Thu Feb 08 2018 Fedora Release Engineering - 1.8.0-0.2.RC1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 03 2018 Parag Nemade - 1.8.0-0.1.RC1 -- Update to 1.8.0 (#1523968) - -* Thu Aug 03 2017 Fedora Release Engineering - 1.7.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.7.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.7.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 1.7.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Aug 26 2015 Mike FABIAN - 1.7.0-4 -- Fix "Transliteration not working on Marathi language" (it crashed). -- Resolves: rhbz#1256244 - -* Wed Jun 17 2015 Fedora Release Engineering - 1.7.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Feb 21 2015 Till Maas - 1.7.0-2 -- Rebuilt for Fedora 23 Change - https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code - -* Mon Dec 22 2014 Parag Nemade - 1.7.0-1 -- update to 1.7.0 -- Drop aarch64 patch and use autoreconf - -* Sun Aug 17 2014 Fedora Release Engineering - 1.6.4-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Aug 07 2014 Parag Nemade - 1.6.4-12 -- Resolves:rh#1127583 - Add missing BuildRequires - -* Sat Jun 07 2014 Fedora Release Engineering - 1.6.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 1.6.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jun 11 2013 Remi Collet - 1.6.4-9 -- rebuild for new GD 2.1.0 - -* Sun Mar 24 2013 Parag Nemade - 1.6.4-8 -- Resolves:rh#926108 - Does not support aarch64 in f19 and rawhide - -* Thu Mar 14 2013 Hans de Goede - 1.6.4-7 -- Fix m17n-config not working on non x86_* archs (rh#921189) - -* Mon Mar 11 2013 Parag Nemade - 1.6.4-6 -- Resolves:rh#907488 - shell syntax error in m17n-config - -* Thu Feb 14 2013 Fedora Release Engineering - 1.6.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Nov 30 2012 Parag Nemade - 1.6.4-4 -- Resolves:rh#880957 - m17n-lib doesn't uninstall properly - -* Tue Nov 20 2012 Parag Nemade - 1.6.4-3 -- m17n-lib to own %%{_libdir}/m17n - -* Tue Nov 20 2012 Parag Nemade - 1.6.4-2 -- Resolves:rh#877925 - drop m17n-lib-flt provides -- Fix bogus date in %%changelog -- Make sure not to attempt to use parallel make as it fails the build - -* Tue Sep 18 2012 Parag Nemade - 1.6.4-1 -- update to 1.6.4 - -* Thu Jul 19 2012 Fedora Release Engineering - 1.6.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 1.6.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Oct 11 2011 Parag Nemade - 1.6.3-1 -- update to 1.6.3 - -* Tue Mar 22 2011 Parag Nemade - 1.6.2-3 -- Resolves: rh#680363 - Remove m17n-lib-ispell subpackage -- Resolves: rh#677866 - m17n*.pc reports wrong moduledir on x86_64 system - -* Tue Feb 08 2011 Fedora Release Engineering - 1.6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Oct 06 2010 Parag Nemade - 1.6.2-1 -- update to new upstream release 1.6.2 - -* Mon Sep 13 2010 Parag Nemade - 1.6.1-5 -- Fix some packaging issue -- Change Requires: m17n-db-datafiles to m17n-db-extras - -* Fri Sep 10 2010 Daiki Ueno - 1.6.1-4 -- supply libotf cflags/libs manually, since the current libotf package - does not ship with "libotf-config" and m17n-lib cannot detect those - values -- fix paths for modules used by GUI support - -* Wed Aug 11 2010 Adam Jackson 1.6.1-3 -- Fix Obsoletes: so upgrades actually work (1.5.5-3 < 1.5.5-3.fc13) - -* Wed Jul 07 2010 Parag Nemade - 1.6.1-2 -- Resolves: rh#602029:-m17n-lib-devel multilib conflict -- Fix rpmlint rpath error. - -* Tue Apr 27 2010 Parag Nemade - 1.6.1-1 -- update to new upstream release 1.6.1 - -* Wed Apr 07 2010 Parag Nemade - 1.6.0-1 -- update to new upstream release 1.6.0 - -* Wed Dec 23 2009 Jens Petersen - 1.5.5-2 -- add bcond for otf, anthy, and gui -- subpackage flt for emacs, etc -- add subpackages for anthy and ispell modules -- disable new gui subpackage (and hence ispell) - -* Mon Aug 17 2009 Parag Nemade - 1.5.5-1 -- update to new upstream release 1.5.5 - -* Sat Jul 25 2009 Fedora Release Engineering - 1.5.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Mar 03 2009 Parag Nemade -1.5.4-1 -- Update to new upstream release 1.5.4 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.5.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Oct 21 2008 Parag Nemade -1.5.3-1.fc10 -- Update to new upstream release 1.5.3 - -* Thu Jul 03 2008 Parag Nemade -1.5.2-1 -- Update to new upstream release 1.5.2 - -* Thu Feb 07 2008 Parag Nemade -1.5.1-1.fc9 -- Update to new upstream release 1.5.1 - -* Fri Dec 28 2007 Parag Nemade -1.5.0-1.fc9 -- Update to new upstream release 1.5.0 -- Added missing internal-flt.h file as Source1 - -* Wed Aug 22 2007 Parag Nemade - 1.4.0-2 -- rebuild against new rpm package -- update license tag - -* Thu Jul 19 2007 Jens Petersen -- buildrequire and require m17n-db >= 1.4.0 - -* Thu Jul 19 2007 Parag Nemade - 1.4.0-1 -- Updated to new upstream release 1.4.0 - -* Wed Jan 10 2007 Mayank Jain - 1.3.4-1.1.fc7 -- rebuild for m17n-lib-1.3.4 version -- Updated m17n-lib-nobuild-examples.patch - -* Wed Jul 12 2006 Jesse Keating - 1.3.3-1.1.fc6 -- rebuild - -* Wed Jul 12 2006 Mayank Jain - 1.3.3-1.fc6 -- Updated spec file for changes mentioned in RH bug 193524, comment 4 -- Thanks to Mamoru Tasaka - -* Thu Mar 2 2006 Jens Petersen - 1.3.3-1 -- update to 1.3.3 minor bugfix release - -* Fri Feb 10 2006 Jesse Keating - 1.3.2-1.1 -- bump again for double-long bug on ppc(64) - -* Fri Feb 10 2006 Jens Petersen - 1.3.2-1 -- update to 1.3.2 bugfix release - - m17n-lib-no-gui-headers.patch is now upstream - -* Tue Feb 07 2006 Jesse Keating - 1.3.1-1.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Thu Feb 2 2006 Jens Petersen - 1.3.1-1 -- update to 1.3.1 release - - rename use_otf and use_anthy macros to with_gui and with_examples - - build --with-gui=no and replace m17n-lib-1.2.0-core-libs-only.patch - with m17n-lib-no-gui-headers.patch and m17n-lib-nobuild-examples.patch - -* Fri Dec 16 2005 Jens Petersen - 1.2.0-2 -- import to Fedora Core -- buildrequire autoconf - -* Thu Nov 10 2005 Jens Petersen - 1.2.0-1 -- do not build static lib and .la files (Warren Togami) - -* Wed Oct 5 2005 Jens Petersen -- initial packaging for Fedora Extras - -* Sat Jan 15 2005 UTUMI Hirosi -- modify spec for fedora +%autochangelog 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 9fbb7b6..2a38cb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m17n-lib-1.8.0.tar.gz) = 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd +SHA512 (m17n-lib-1.8.6.tar.gz) = 4fe3e9d2f88a90e8e9b30ee53a71612f937ab3d4c5243075f39de13818522e5c595840f67b3411b03d403affeafeb1802158b6ae8ddf80a1e695d1105b595a59 diff --git a/tests/smoke/hello.txt b/tests/hello.txt similarity index 100% rename from tests/smoke/hello.txt rename to tests/hello.txt diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..f5d562e --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,15 @@ +test: ./runtest.sh +duration: 10m +framework: beakerlib +require: + - m17n-lib + - m17n-lib-devel + - m17n-lib-tools + - glibc-locale-source + - rpm-build + - autoconf + - automake + - libtool + - make + - gettext-devel + - gcc diff --git a/tests/smoke/old.png b/tests/old.png similarity index 100% rename from tests/smoke/old.png rename to tests/old.png diff --git a/tests/runtest.sh b/tests/runtest.sh new file mode 100755 index 0000000..8032650 --- /dev/null +++ b/tests/runtest.sh @@ -0,0 +1,60 @@ +#!/bin/bash +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +NAME=m17n-lib + +rlJournalStart + rlPhaseStartSetup + rlAssertRpm ${NAME} + rlAssertRpm ${NAME}-devel + rlAssertRpm glibc-locale-source + rlShowPackageVersion ${NAME} + rlRun -t -l "VERSION=$(rpm -q ${NAME} --queryformat='%{version}')" 0 "Get VERSION" + FEDORA_VERSION=$(rlGetDistroRelease) + rlLog "FEDORA_VERSION=${DISTRO_RELEASE}" + rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" + rlRun "cp hello.txt old.png $tmp" 0 "Copy files needed for tests" + rlRun "pushd $tmp" + rlFetchSrcForInstalled "${NAME}" + 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/${NAME}-${VERSION}-build ]; then + rlRun -t -l "pushd BUILD/${NAME}-${VERSION}-build/${NAME}-${VERSION}" + else + rlRun -t -l "pushd BUILD/${NAME}-${VERSION}" + fi + rlRun "set -o pipefail" + rlRun -t -l "./bootstrap.sh" + rlRun -t -l "./configure --prefix=/usr" + rlRun -t -l "make check" + rlPhaseEnd + + rlPhaseStartTest + rlRun "pushd $tmp" + rlGetTestState + rlLog "Number of failed asserts so far: ${ECODE}" + rlRun -t -l "OLD_SIZE=$(stat -c \"%s\" old.png)" \ + 0 "Get size of old.png" + rlLog "Old size is ${OLD_SIZE}" + rlRun -t -l "m17n-dump hello.txt" \ + 0 "Create a new png" + rlFileSubmit hello.txt.png + rlRun -t -l "NEW_SIZE=$(stat -c \"%s\" hello.txt.png)" \ + 0 "Get size of hello.txt.png" + rlLog "New size is ${NEW_SIZE}" + rlRun -t -l "file old.png hello.txt.png" \ + 0 "Log output of file command" + rlRun -t -l "echo $(fc-match)" \ + 0 "Show which font was used" + rlAssertGreater "New size should be greater than 1000" ${NEW_SIZE} 1000 + rlGetTestState + rlLog "Number of failed asserts so far: ${ECODE}" + rlRun "popd" 0 + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh deleted file mode 100644 index 1b982f5..0000000 --- a/tests/smoke/runtest.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -# If one of the commands below returns non-zero then exit immediately -set -e - -echo "Testing m17n-dump tool" -old_size=`stat -c "%s" old.png` -echo "old_size is $old_size" - -m17n-dump hello.txt -new_size=`stat -c "%s" hello.txt.png` -echo "new_size is $new_size" -file old.png hello.txt.png -echo "Using font `fc-match`" - -if [ $old_size -ne $new_size ]; then - echo "m17n-dump generated different png file" -else - echo "m17n-dump generated same png file" -fi diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 43337e6..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-basic - tests: - - smoke - required_packages: - - m17n-lib-tools - - m17n-lib-devel