From 96ca9aad0865143264e90f367994cfe66b8da6cc58dccdaed529fe3390cbb964 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Wed, 15 Feb 2012 21:44:00 +0000 Subject: [PATCH] - update dictd to 1.12.0: + New script dict_lookup for translating words and phrases + dictfmt: Internal buffer size was increased from 10240 to 102400 bytes + dictfmt: superfluous spaces are removed not only from the beginng and the end of a headword but also inside a multiword headwords. + dictfmt spawns sort command to sort the index. When there are several entries for the same headword, they get sorted BY OFFSET AND SIZE (in addition to headwords). As a result, the order of identical headwords is messed up. To fix these problem -k1,3 option is replaced with -k1,1. + FIX: When search is handled by dict_search_bmh() function, the first character from the first entry in the index file is missing. Usually this is some of 00-database-* entries. + Other minor fixes and cleanups - update libmaa to 1.3.1: + Build failure with gcc-4.6 was fixed + Only maa's symbols are exported from libmaa shared library ^^ INCLUDES ABI INCOMPATIBILITIES + For better conformance with POSIX/SUS xmalloc, xrealloc and xcalloc functions take 'size_t' args, not 'unsigned int'. - small init script beaufify - split out devel package OBS-URL: https://build.opensuse.org/package/show/Education/dictd?expand=0&rev=2 --- dictd-1.11.1.tar.bz2 | 3 --- dictd-1.11.1.patch => dictd-1.12.0.patch | 0 dictd-1.12.0.tar.bz2 | 3 +++ dictd.changes | 27 ++++++++++++++++++++++++ dictd.init | 19 +++++++++++------ dictd.spec | 21 ++++++++++++------ libmaa-1.1.1.tar.bz2 | 3 --- libmaa-1.1.1.patch => libmaa-1.3.1.patch | 0 libmaa-1.3.1.tar.bz2 | 3 +++ 9 files changed, 60 insertions(+), 19 deletions(-) delete mode 100644 dictd-1.11.1.tar.bz2 rename dictd-1.11.1.patch => dictd-1.12.0.patch (100%) create mode 100644 dictd-1.12.0.tar.bz2 delete mode 100644 libmaa-1.1.1.tar.bz2 rename libmaa-1.1.1.patch => libmaa-1.3.1.patch (100%) create mode 100644 libmaa-1.3.1.tar.bz2 diff --git a/dictd-1.11.1.tar.bz2 b/dictd-1.11.1.tar.bz2 deleted file mode 100644 index 626694f..0000000 --- a/dictd-1.11.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82a15a86f16779044af18333beacab68eba254b3c1dd2779a830e34ab201fecc -size 328064 diff --git a/dictd-1.11.1.patch b/dictd-1.12.0.patch similarity index 100% rename from dictd-1.11.1.patch rename to dictd-1.12.0.patch diff --git a/dictd-1.12.0.tar.bz2 b/dictd-1.12.0.tar.bz2 new file mode 100644 index 0000000..88828de --- /dev/null +++ b/dictd-1.12.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1686e5c1670b595a419a075355d17fd7fb1652c1efe05b3991b7eb07d0f6bdf4 +size 332700 diff --git a/dictd.changes b/dictd.changes index 0e10c25..b0e6092 100644 --- a/dictd.changes +++ b/dictd.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Wed Feb 15 21:35:28 UTC 2012 - lars@linux-schulserver.de + +- update dictd to 1.12.0: + + New script dict_lookup for translating words and phrases + + dictfmt: Internal buffer size was increased from 10240 to + 102400 bytes + + dictfmt: superfluous spaces are removed not only from the beginng + and the end of a headword but also inside a multiword headwords. + + dictfmt spawns sort command to sort the index. When there are + several entries for the same headword, they get sorted BY OFFSET + AND SIZE (in addition to headwords). As a result, the order of + identical headwords is messed up. To fix these problem -k1,3 + option is replaced with -k1,1. + + FIX: When search is handled by dict_search_bmh() function, the + first character from the first entry in the index file is + missing. Usually this is some of 00-database-* entries. + + Other minor fixes and cleanups +- update libmaa to 1.3.1: + + Build failure with gcc-4.6 was fixed + + Only maa's symbols are exported from libmaa shared library + ^^ INCLUDES ABI INCOMPATIBILITIES + + For better conformance with POSIX/SUS xmalloc, xrealloc and + xcalloc functions take 'size_t' args, not 'unsigned int'. +- small init script beaufify +- split out devel package + ------------------------------------------------------------------- Mon Mar 2 12:44:09 CET 2009 - prusnak@suse.cz diff --git a/dictd.init b/dictd.init index 45b9e83..42bbadf 100644 --- a/dictd.init +++ b/dictd.init @@ -3,23 +3,28 @@ # # Author: Uwe Drechsel # -# init.d/dictd +# /etc/init.d/dictd # # and symbolic its link # -# /sbin/rcdictd +# /usr/sbin/rcdictd # ### BEGIN INIT INFO # Provides: dictd # Required-Start: $remote_fs $syslog +# Should-Start: $network # Required-Stop: $remote_fs $syslog +# Should-Stop: $network # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Description: Start dictd server to provide dictionaries +# Short-Description: Electronic Online Dictionaries ### END INIT INFO DICTD_BIN=/usr/sbin/dictd -test -x $DICTD_BIN || exit 5 +test -x $DICTD_BIN || { echo "$DICTD_BIN not installed"; + if [ "$1" = "stop" ]; then exit 0; + else exit 5; fi; } # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status @@ -52,7 +57,7 @@ rc_reset case "$1" in start) - echo -n "Starting DICTD" + echo -n "Starting dictd " ## Start daemon with startproc(8). If this fails ## the echo return value is set appropriate. @@ -64,7 +69,7 @@ case "$1" in rc_status -v ;; stop) - echo -n "Shutting down DICTD" + echo -n "Shutting down dictd " ## Stop daemon with killproc(8) and if this fails ## set echo the echo return value. @@ -96,7 +101,7 @@ case "$1" in ## do this on signal 1 (SIGHUP). ## If it does not support it, restart. - echo -n "Reload service dictd" + echo -n "Reload service dictd " ## if it supports it: killproc -HUP $DICTD_BIN #touch /var/run/dictd.pid @@ -111,7 +116,7 @@ case "$1" in ## signalling, do nothing (!) # If it supports signalling: - echo -n "Reload service dictd" + echo -n "Reload service dictd " killproc -HUP $DICTD_BIN #touch /var/run/dictd.pid rc_status -v diff --git a/dictd.spec b/dictd.spec index 2a4d283..a924c40 100644 --- a/dictd.spec +++ b/dictd.spec @@ -2,10 +2,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define maa_ver 1.1.1 +%define maa_ver 1.3.1 Name: dictd -Version: 1.11.1 +Version: 1.12.0 Release: 1 License: GPLv2+ Summary: Electronic Online Dictionaries @@ -33,6 +33,14 @@ set up your own dictionary. To look up, for example, the word 'grunt', just type "dict grunt" at a command line. See the man pages of dict and dictd for details. +%package devel +Summary: Development files for dictd +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} + +%description devel +Development files for dictd (header files). + %if %{separate_maa} %package -n libmaa1 Version: %{maa_ver} @@ -61,9 +69,9 @@ Development files for libmaa %prep %setup -q -a 1 -%patch0 +%patch0 -p0 cd libmaa-%{maa_ver} -%patch1 +%patch1 -p0 %build cd libmaa-%{maa_ver} @@ -122,10 +130,12 @@ rm -rf %{_localstatedir}/log/dictd %{_mandir}/man8/* %config(noreplace) %{_sysconfdir}/colorit.conf %config %{_sysconfdir}/init.d/dictd + +%files devel +%defattr(-,root,root) %{_includedir}/dict* %if %{separate_maa} - %files -n libmaa1 %defattr(-,root,root) %{_libdir}/*.so.* @@ -134,7 +144,6 @@ rm -rf %{_localstatedir}/log/dictd %defattr(-,root,root) %{_includedir}/maa* %{_libdir}/*.so - %endif %changelog diff --git a/libmaa-1.1.1.tar.bz2 b/libmaa-1.1.1.tar.bz2 deleted file mode 100644 index a44b3b8..0000000 --- a/libmaa-1.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1db2f2b7f36ff286d0fcf938b1f8ac474c91125aba995e0dadfdc2ef47332b9 -size 248451 diff --git a/libmaa-1.1.1.patch b/libmaa-1.3.1.patch similarity index 100% rename from libmaa-1.1.1.patch rename to libmaa-1.3.1.patch diff --git a/libmaa-1.3.1.tar.bz2 b/libmaa-1.3.1.tar.bz2 new file mode 100644 index 0000000..e402995 --- /dev/null +++ b/libmaa-1.3.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fadc9bb8093a8fa2e8f5b4e5bed39ae465e0ead385fd84ba88f67f9e29586798 +size 253164