diff --git a/_service b/_service new file mode 100644 index 0000000..00c9ae1 --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + 1.12.1+git + https://github.com/cheusov/dictd + git + .git* + enable + Matej Cepl <mcepl@cepl.eu> + + + xz + *.tar + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..a827dfc --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/cheusov/dictd + 1c167244d9227e7944f85dfc45bed613c07cefb5 \ No newline at end of file diff --git a/dictd-1.12.1+git.1555438032.190d8c6.tar.xz b/dictd-1.12.1+git.1555438032.190d8c6.tar.xz new file mode 100644 index 0000000..e678eaa --- /dev/null +++ b/dictd-1.12.1+git.1555438032.190d8c6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:865a0a82472c9ef5691231d23c2ff8ae0b90636671be377b63bc70e5319621e0 +size 237680 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..8797d67 100644 --- a/dictd.changes +++ b/dictd.changes @@ -1,3 +1,57 @@ +------------------------------------------------------------------- +Wed Jun 5 15:29:38 UTC 2019 - Dominique Leuenberger + +- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to + make the build dep chain cheaper by using systemd-mini. +- USe systemd_ordering instead of systemd_requires: only ask for + systemd to be early in the transaction, but don't forcibly + require systemd to be present. + +------------------------------------------------------------------- +Wed Apr 24 12:04:26 CEST 2019 - Matej Cepl + +- Update to 1.12.1+git.1555438032.190d8c6: + - Remove --enable-dictorg from dict(1) +- Stop using obs_scm, it doesn't work, use tar_scm instead. +- Use tighter globs in %%files to make debuginfo generator happy. +- Clean up SPEC using spec-cleaner. + +------------------------------------------------------------------- +Wed Apr 24 10:00:52 UTC 2019 - Matej Cepl + +- Update to version 1.12.1+git.1555438032.190d8c6: + * Remove --enable-dictorg from dict(1) + * 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) + * Use stable sort to ensure already-sorted input stays sorted. + * Revert "Update tables for is{space,alnum}__ (report by michael72)" + +------------------------------------------------------------------- +Mon Feb 4 18:59:56 UTC 2019 - Jan Engelhardt + +- Trim filler wording from description. +- Retire old $RPM_* shell vars. + +------------------------------------------------------------------- +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..5e29df5 100644 --- a/dictd.spec +++ b/dictd.spec @@ -1,7 +1,7 @@ # # spec file for package dictd # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,21 +16,18 @@ # - Name: dictd -Version: 1.12.1 +Version: 1.12.1+git.1555438032.190d8c6 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 @@ -38,34 +35,51 @@ BuildRequires: gcc BuildRequires: libdbi-devel BuildRequires: libmaa-devel BuildRequires: libtool -BuildRequires: systemd +BuildRequires: pkgconfig(systemd) BuildRequires: zlib-devel # libtool-ltdl-devel byacc %if 0%{?suse_version} -BuildRequires: systemd-rpm-macros -%{?systemd_requires} +BuildRequires: systemd-rpm-macros +%{?systemd_ordering} %endif %description -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 +This package contains two programs. dict gives access to +electronic dictionaries on the Internet. With dictd, one can +set up a custom dictionary. To look up, for example, the word "grunt", +execute `dict grunt` at a command line. See the man pages of dict and dictd for details. %prep -%setup +%setup -q %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. dict gives access to +electronic dictionaries on the Internet. With dictd, one can +set up a custom dictionary. To look up, for example, the word "grunt", +execute `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 +export LDFLAGS="%{?__global_ldflags}" CPPFLAGS="%{optflags} -fPIC" +%configure --enable-dictorg --with-plugin-dbi +# --disable-plugin make %{?_smp_mflags} %install %make_install install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/colorit.conf -cat < $RPM_BUILD_ROOT/%{_sysconfdir}/dictd.conf +cat <%{buildroot}/%{_sysconfdir}/dictd.conf global { #syslog #syslog_facility daemon @@ -82,7 +96,14 @@ EOF install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/dictd.service -ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcdictd +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcdictd + +# Makefile doesn't work correctly with libdir +if [ "x%{_libdir}" != "x%{_libexecdir}" ] ; then + mkdir -p %{buildroot}%{_libdir}/ + mv -v %{buildroot}%{_libexecdir}/dictdplugin* %{buildroot}%{_libdir}/ +fi +rm -fv %{buildroot}%{_libdir}/*.{la,a} %pre %service_add_pre dictd.service @@ -100,14 +121,22 @@ chmod 644 %{_localstatedir}/log/dictd %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}/* -%{_mandir}/man1/* -%{_mandir}/man8/* +%{_bindir}/dict* +%{_bindir}/colorit +%{_sbindir}/*dictd +%{_libdir}/dictdplugin_dbi.so* +%{_mandir}/man1/colorit* +%{_mandir}/man1/dict* +%{_mandir}/man8/dict* %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