Hello community, here is the log from the commit of package enchant for openSUSE:Factory checked in at 2019-10-30 14:38:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enchant (Old) and /work/SRC/openSUSE:Factory/.enchant.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "enchant" Wed Oct 30 14:38:35 2019 rev:35 rq:742518 version:2.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/enchant/enchant.changes 2019-07-29 17:23:31.774365773 +0200 +++ /work/SRC/openSUSE:Factory/.enchant.new.2990/enchant.changes 2019-10-30 14:38:40.665598733 +0100 @@ -1,0 +2,11 @@ +Mon Oct 21 01:11:27 UTC 2019 - Yifan Jiang <[email protected]> + +- Disable aspell support on SLE. + +------------------------------------------------------------------- +Fri Oct 18 02:09:57 UTC 2019 - Yifan Jiang <[email protected]> + +- Redownload the 2.2.5 tarball to reflect the consistent upstream + release provided in Source. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enchant.spec ++++++ --- /var/tmp/diff_new_pack.NuRg0P/_old 2019-10-30 14:38:41.345599457 +0100 +++ /var/tmp/diff_new_pack.NuRg0P/_new 2019-10-30 14:38:41.349599461 +0100 @@ -25,7 +25,9 @@ URL: https://abiword.github.io/enchant/ Source: https://github.com/AbiWord/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: baselibs.conf +%if 0%{?is_opensuse} BuildRequires: aspell-devel +%endif BuildRequires: dbus-1-glib-devel BuildRequires: gcc-c++ BuildRequires: glib2-devel @@ -58,6 +60,7 @@ This package provides data/configuration files for libenchant. +%if 0%{?is_opensuse} %package -n enchant-2-backend-aspell Summary: Aspell backend for the Enchant spell checking library Group: Productivity/Text/Spell @@ -68,6 +71,7 @@ Aspell plugin for enchant, a library providing an efficient extensible abstraction for dealing with different spell checking libraries. +%endif %package -n enchant-2-backend-hunspell Summary: Hunspell backend for the Enchant spell checking library @@ -119,8 +123,12 @@ %build %configure \ +%if 0%{?is_opensuse} --disable-static \ --with-aspell +%else + --disable-static +%endif make %{?_smp_mflags} %install @@ -142,9 +150,11 @@ %{_libdir}/*.so.* %dir %{_libdir}/enchant-2 +%if 0%{?is_opensuse} %files -n enchant-2-backend-aspell %dir %{_libdir}/enchant-2 %{_libdir}/enchant-2/enchant_aspell.so +%endif %files -n enchant-2-backend-hunspell %dir %{_libdir}/enchant-2 ++++++ enchant-2.2.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enchant-2.2.5/HACKING new/enchant-2.2.5/HACKING --- old/enchant-2.2.5/HACKING 2018-10-30 22:33:52.000000000 +0100 +++ new/enchant-2.2.5/HACKING 2019-09-01 17:34:55.000000000 +0200 @@ -6,6 +6,10 @@ To build from git, or without relying on the generated files in a source release, automake, autoconf, libtool, pkg-config and git must be installed. + +(Note, the exact packages needed for certain distros may be found in +.travis.yml and appveyor.yml.) + Run ./bootstrap && ./configure --enable-relocatable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enchant-2.2.5/src/pwl.c new/enchant-2.2.5/src/pwl.c --- old/enchant-2.2.5/src/pwl.c 2017-12-17 21:08:34.000000000 +0100 +++ new/enchant-2.2.5/src/pwl.c 2019-09-01 17:34:55.000000000 +0200 @@ -207,7 +207,7 @@ { g_return_val_if_fail (file != NULL, NULL); - FILE* fd = g_fopen(file, "a+b"); + FILE* fd = g_fopen(file, "a+"); if(fd == NULL) return NULL; fclose(fd); @@ -232,7 +232,7 @@ g_hash_table_destroy (pwl->words_in_trie); pwl->words_in_trie = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - FILE *f = g_fopen(pwl->filename, "rb"); + FILE *f = g_fopen(pwl->filename, "r"); if (!f) return; @@ -248,10 +248,7 @@ if(line_number == 1 && BOM == g_utf8_get_char(line)) line = g_utf8_next_char(line); - size_t l = strlen(line)-1; - if (line[l]=='\n') - line[l] = '\0'; - else if(!feof(f)) /* ignore lines longer than BUFSIZ. */ + if(line[strlen(line)-1] != '\n' && !feof(f)) /* ignore lines longer than BUFSIZ. */ { g_warning ("Line too long (ignored) in %s at line:%zu\n", pwl->filename, line_number); while (NULL != (fgets (buffer, sizeof (buffer), f))) @@ -261,7 +258,8 @@ } continue; } - + + g_strchomp(line); if( line[0] && line[0] != '#') { if(g_utf8_validate(line, -1, NULL)) @@ -323,7 +321,7 @@ if (pwl->filename != NULL) { - FILE *f = g_fopen(pwl->filename, "a+b"); + FILE *f = g_fopen(pwl->filename, "a+"); if (f) { /* Since this function does not signal I/O diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enchant-2.2.5/tests/Makefile.am new/enchant-2.2.5/tests/Makefile.am --- old/enchant-2.2.5/tests/Makefile.am 2018-10-30 22:33:52.000000000 +0100 +++ new/enchant-2.2.5/tests/Makefile.am 2019-09-01 17:34:55.000000000 +0200 @@ -15,7 +15,7 @@ export ENCHANT_CONFIG_DIR=$(ENCHANT_CONFIG_DIR); \ if test -n "$(VALGRIND)"; then export VALGRIND='$(VALGRIND) --suppressions=$(top_srcdir)/lib/relocatable.valgrind'; fi; \ export LIBTOOL=$(top_builddir)/libtool; \ - rm -rf test.pwl; \ + rm -f test.pwl; \ $(MAKE) libenchant-copy; \ cp $(srcdir)/test.pwl.orig $(builddir)/test.pwl; \ cp $(builddir)/@objdir@/*@shlibext@ .; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enchant-2.2.5/tests/Makefile.in new/enchant-2.2.5/tests/Makefile.in --- old/enchant-2.2.5/tests/Makefile.in 2019-07-01 12:30:17.000000000 +0200 +++ new/enchant-2.2.5/tests/Makefile.in 2019-09-01 17:35:01.000000000 +0200 @@ -1029,7 +1029,7 @@ export ENCHANT_CONFIG_DIR=$(ENCHANT_CONFIG_DIR); \ if test -n "$(VALGRIND)"; then export VALGRIND='$(VALGRIND) --suppressions=$(top_srcdir)/lib/relocatable.valgrind'; fi; \ export LIBTOOL=$(top_builddir)/libtool; \ - rm -rf test.pwl; \ + rm -f test.pwl; \ $(MAKE) libenchant-copy; \ cp $(srcdir)/test.pwl.orig $(builddir)/test.pwl; \ cp $(builddir)/@objdir@/*@shlibext@ .; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enchant-2.2.5/tests/pwl/enchant_pwl_tests.cpp new/enchant-2.2.5/tests/pwl/enchant_pwl_tests.cpp --- old/enchant-2.2.5/tests/pwl/enchant_pwl_tests.cpp 2017-12-12 13:22:28.000000000 +0100 +++ new/enchant-2.2.5/tests/pwl/enchant_pwl_tests.cpp 2019-09-01 17:34:55.000000000 +0200 @@ -160,9 +160,6 @@ for(std::vector<std::string>::const_iterator itWord = sNewWords.begin(); itWord != sNewWords.end(); ++itWord){ CHECK( IsWordInDictionary(*itWord) ); - if(!IsWordInDictionary(*itWord)){ - testResults_.OnTestFailure(UnitTest::TestDetails(m_details, __LINE__), itWord->c_str()); - } } }
