From 4bd10e9b1a1d8c4b75d762adbe47ed38eb53a0661b9181f14f07ec1f3f3c2458 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 26 Jan 2019 18:37:08 +0000 Subject: [PATCH] - Update to version 1.12.1.git.1520674574.9a2f53e: * update config.sub and config.guess * dictfmt: fix merge conflict * dictfmt: fix compilation failure on Solaris (alloca) * dictfmt: DICTFMT_SORT variable is used for setting sort(1) * Support for --use-dictorg was removed * Support for socks5 was removed * Clean-ups for autocrap build system (headers and types) * Clean-ups for autocrap build system (mbstate_t, wchar_t, wint_t, socklen_t, size_t, CODESET, alloca) * Use stable sort to ensure already-sorted input stays sorted. * Revert "Update tables for is{space,alnum}__ (report by michael72)" OBS-URL: https://build.opensuse.org/package/show/Education/dictd?expand=0&rev=9 --- _service | 16 +++++++ _service:obs_scm:_servicedata | 4 ++ ...ictd-1.12.1.git.1520674574.9a2f53e.obscpio | 3 ++ _service:obs_scm:dictd.obsinfo | 5 +++ _servicedata | 4 ++ dictd-1.12.1.tar.gz | 3 -- dictd.changes | 15 +++++++ dictd.obsinfo | 5 +++ dictd.spec | 45 +++++++++++++++---- 9 files changed, 89 insertions(+), 11 deletions(-) create mode 100644 _service create mode 100644 _service:obs_scm:_servicedata create mode 100644 _service:obs_scm:dictd-1.12.1.git.1520674574.9a2f53e.obscpio create mode 100644 _service:obs_scm:dictd.obsinfo create mode 100644 _servicedata delete mode 100644 dictd-1.12.1.tar.gz create mode 100644 dictd.obsinfo diff --git a/_service b/_service new file mode 100644 index 0000000..09019af --- /dev/null +++ b/_service @@ -0,0 +1,16 @@ + + + 1.12.1.git + https://github.com/cheusov/dictd + git + + + enable + + + + xz + *.tar + + + diff --git a/_service:obs_scm:_servicedata b/_service:obs_scm:_servicedata new file mode 100644 index 0000000..b5fe9dd --- /dev/null +++ b/_service:obs_scm:_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/cheusov/dictd + 9a2f53ec26ec7eb1880437f1cafae6291634c98d \ No newline at end of file diff --git a/_service:obs_scm:dictd-1.12.1.git.1520674574.9a2f53e.obscpio b/_service:obs_scm:dictd-1.12.1.git.1520674574.9a2f53e.obscpio new file mode 100644 index 0000000..b7b3404 --- /dev/null +++ b/_service:obs_scm:dictd-1.12.1.git.1520674574.9a2f53e.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f4dc2a825e2065c2f6b6ef3b1f5c960ebe75e91db11da26c484b1f77a9cad64 +size 2025484 diff --git a/_service:obs_scm:dictd.obsinfo b/_service:obs_scm:dictd.obsinfo new file mode 100644 index 0000000..181e1f8 --- /dev/null +++ b/_service:obs_scm:dictd.obsinfo @@ -0,0 +1,5 @@ +name: dictd +version: 1.12.1.git.1520674574.9a2f53e +mtime: 1520674574 +commit: 9a2f53ec26ec7eb1880437f1cafae6291634c98d + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..b5fe9dd --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/cheusov/dictd + 9a2f53ec26ec7eb1880437f1cafae6291634c98d \ No newline at end of file diff --git a/dictd-1.12.1.tar.gz b/dictd-1.12.1.tar.gz deleted file mode 100644 index c98ac2e..0000000 --- a/dictd-1.12.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a237f6ecdc854ab10de5145ed42eaa2d9b6d51ffdc495f7daee59b05cc363656 -size 423870 diff --git a/dictd.changes b/dictd.changes index c2d8a8f..248255f 100644 --- a/dictd.changes +++ b/dictd.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Jan 26 18:09:17 UTC 2019 - opensuse-packaging@opensuse.org + +- Update to version 1.12.1.git.1520674574.9a2f53e: + * update config.sub and config.guess + * dictfmt: fix merge conflict + * dictfmt: fix compilation failure on Solaris (alloca) + * dictfmt: DICTFMT_SORT variable is used for setting sort(1) + * Support for --use-dictorg was removed + * Support for socks5 was removed + * Clean-ups for autocrap build system (headers and types) + * Clean-ups for autocrap build system (mbstate_t, wchar_t, wint_t, socklen_t, size_t, CODESET, alloca) + * Use stable sort to ensure already-sorted input stays sorted. + * Revert "Update tables for is{space,alnum}__ (report by michael72)" + ------------------------------------------------------------------- Fri Oct 12 23:56:35 UTC 2012 - mailaender@opensuse.org diff --git a/dictd.obsinfo b/dictd.obsinfo new file mode 100644 index 0000000..181e1f8 --- /dev/null +++ b/dictd.obsinfo @@ -0,0 +1,5 @@ +name: dictd +version: 1.12.1.git.1520674574.9a2f53e +mtime: 1520674574 +commit: 9a2f53ec26ec7eb1880437f1cafae6291634c98d + diff --git a/dictd.spec b/dictd.spec index 12142d4..24a6ccc 100644 --- a/dictd.spec +++ b/dictd.spec @@ -18,19 +18,17 @@ Name: dictd -Version: 1.12.1 +Version: 1.12.1.git.1520674574.9a2f53e Release: 0 Summary: DICT protocol (RFC 2229) server and command-line client License: GPL-1.0-or-later AND Zlib AND MIT Group: Productivity/Office/Dictionary -URL: https://sourceforge.net/projects/dict/ -Source0: http://downloads.sourceforge.net/dict/%{name}-%{version}.tar.gz +URL: https://github.com/cheusov/dictd +Source0: %{name}-%{version}.tar.xz Source1: colorit.conf Source2: dictd.service Patch0: dictd-1.12.1-unused-return.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=198359 -# https://sourceforge.net/p/dict/feature-requests/4/ -# Patch1: dictd-1.9.15-ipv6.patch +BuildRequires: autoconf BuildRequires: bison BuildRequires: flex BuildRequires: gawk @@ -56,12 +54,30 @@ dictd for details. %prep %setup %autopatch -p1 +autoreconf -fv + +%package devel +Summary: Development files for dictd +Group: Development/Languages/C and C++ +Requires: %{name} = %{version} + +%description devel +This package contains two programs. With dict, you have access to +powerful electronic dictionaries on the Internet. With dictd, you can +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. + +This package contains development files for the dictd package. + %build export LDFLAGS="%{?__global_ldflags}" CPPFLAGS="$RPM_OPT_FLAGS -fPIC" -%configure --enable-dictorg --disable-plugin +%configure --enable-dictorg --with-plugin-dbi +# --disable-plugin make %{?_smp_mflags} + %install %make_install install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/colorit.conf @@ -84,6 +100,12 @@ install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/dictd.service ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcdictd +# Makefile doesn't work correctly with libdir +mkdir -p %{buildroot}%{_libdir}/ +mv -v %{buildroot}%{_libexecdir}/dictdplugin* %{buildroot}%{_libdir}/ +rm -fv %{buildroot}%{_libdir}/*.{la,a} + + %pre %service_add_pre dictd.service @@ -98,16 +120,23 @@ chmod 644 %{_localstatedir}/log/dictd %postun %service_del_postun dictd.service + %files %license COPYING -%doc ANNOUNCE ChangeLog NEWS README TODO example* +%doc ANNOUNCE NEWS README example* %doc doc/dicf.ms doc/rfc.ms doc/rfc2229.txt doc/security.doc %{_bindir}/* %{_sbindir}/* +%{_libdir}/* %{_mandir}/man1/* %{_mandir}/man8/* %attr(0644,root,root) %{_unitdir}/dictd.service %config(noreplace) %{_sysconfdir}/colorit.conf %config(noreplace) %{_sysconfdir}/dictd.conf +%files devel +%license COPYING +%doc ANNOUNCE README TODO +%{_includedir}/* + %changelog