From 4bd10e9b1a1d8c4b75d762adbe47ed38eb53a0661b9181f14f07ec1f3f3c2458 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 26 Jan 2019 18:37:08 +0000 Subject: [PATCH 1/8] - 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 From decdb6a956ae807bf467061ef42954a212eadacd7052d646863fdfa0cdf65da0 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 26 Jan 2019 18:45:33 +0000 Subject: [PATCH 2/8] Make building work on platforms without separate _libdir OBS-URL: https://build.opensuse.org/package/show/Education/dictd?expand=0&rev=10 --- dictd.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dictd.spec b/dictd.spec index 24a6ccc..c039d5e 100644 --- a/dictd.spec +++ b/dictd.spec @@ -101,8 +101,10 @@ 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}/ +if [ "x%{_libdir}" != "x%{_libexecdir}" ] ; then + mkdir -p %{buildroot}%{_libdir}/ + mv -v %{buildroot}%{_libexecdir}/dictdplugin* %{buildroot}%{_libdir}/ +fi rm -fv %{buildroot}%{_libdir}/*.{la,a} From c9de9e5f2dba62fc58a40852a7ac7f4da1439bc2de54d8af4e5875279dd6ec5a Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 26 Jan 2019 18:57:03 +0000 Subject: [PATCH 3/8] Move also debuginfo files OBS-URL: https://build.opensuse.org/package/show/Education/dictd?expand=0&rev=11 --- dictd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dictd.spec b/dictd.spec index c039d5e..1f54204 100644 --- a/dictd.spec +++ b/dictd.spec @@ -104,6 +104,7 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcdictd if [ "x%{_libdir}" != "x%{_libexecdir}" ] ; then mkdir -p %{buildroot}%{_libdir}/ mv -v %{buildroot}%{_libexecdir}/dictdplugin* %{buildroot}%{_libdir}/ + mv -v %{buildroot}%{_libexecdir}/debug/{lib,%{_lib}} fi rm -fv %{buildroot}%{_libdir}/*.{la,a} From 7c203c4ff3b47e98204c284687a867b90c1cce56da661568b8e9c137e198f903 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 26 Jan 2019 20:03:38 +0000 Subject: [PATCH 4/8] That didn't work as expected OBS-URL: https://build.opensuse.org/package/show/Education/dictd?expand=0&rev=12 --- dictd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dictd.spec b/dictd.spec index 1f54204..c039d5e 100644 --- a/dictd.spec +++ b/dictd.spec @@ -104,7 +104,6 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcdictd if [ "x%{_libdir}" != "x%{_libexecdir}" ] ; then mkdir -p %{buildroot}%{_libdir}/ mv -v %{buildroot}%{_libexecdir}/dictdplugin* %{buildroot}%{_libdir}/ - mv -v %{buildroot}%{_libexecdir}/debug/{lib,%{_lib}} fi rm -fv %{buildroot}%{_libdir}/*.{la,a} From 1cfb5ead2217dc1c5b06d3fdb9bc881caa7c206fe55af898c66ae28df3b786b6 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 26 Jan 2019 20:11:32 +0000 Subject: [PATCH 5/8] autopatch requires empty line OBS-URL: https://build.opensuse.org/package/show/Education/dictd?expand=0&rev=13 --- dictd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dictd.spec b/dictd.spec index c039d5e..ec1c416 100644 --- a/dictd.spec +++ b/dictd.spec @@ -54,6 +54,7 @@ dictd for details. %prep %setup %autopatch -p1 + autoreconf -fv %package devel From 39275d823544f8c69efa88cf16ed040b19c53c690cfd9a0d956a7fbd2e074aa9 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 5 Feb 2019 07:26:08 +0000 Subject: [PATCH 6/8] Accepting request 671205 from home:jengelh:branches:Education - Trim filler wording from description. - Retire old $RPM_* shell vars. OBS-URL: https://build.opensuse.org/request/show/671205 OBS-URL: https://build.opensuse.org/package/show/Education/dictd?expand=0&rev=14 --- dictd.changes | 6 ++++++ dictd.spec | 21 ++++++++++----------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dictd.changes b/dictd.changes index 248255f..ff9d4a5 100644 --- a/dictd.changes +++ b/dictd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/dictd.spec b/dictd.spec index ec1c416..deb1a74 100644 --- a/dictd.spec +++ b/dictd.spec @@ -45,10 +45,10 @@ BuildRequires: systemd-rpm-macros %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 @@ -63,17 +63,16 @@ 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 +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" +export LDFLAGS="%{?__global_ldflags}" CPPFLAGS="%{optflags} -fPIC" %configure --enable-dictorg --with-plugin-dbi # --disable-plugin make %{?_smp_mflags} @@ -82,7 +81,7 @@ 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 From 25977c9b9d8e981a52906bea4a7aa08c85b4852929a1770bf9abf4eee8011081 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 24 Apr 2019 10:17:05 +0000 Subject: [PATCH 7/8] - 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. - 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)" OBS-URL: https://build.opensuse.org/package/show/Education/dictd?expand=0&rev=16 --- _service | 13 +++++----- _service:obs_scm:_servicedata | 4 --- ...ictd-1.12.1.git.1520674574.9a2f53e.obscpio | 3 --- _service:obs_scm:dictd.obsinfo | 5 ---- _servicedata | 2 +- dictd-1.12.1+git.1555438032.190d8c6.tar.xz | 3 +++ dictd.changes | 24 +++++++++++++++++ dictd.spec | 26 +++++++++---------- 8 files changed, 46 insertions(+), 34 deletions(-) delete mode 100644 _service:obs_scm:_servicedata delete mode 100644 _service:obs_scm:dictd-1.12.1.git.1520674574.9a2f53e.obscpio delete mode 100644 _service:obs_scm:dictd.obsinfo create mode 100644 dictd-1.12.1+git.1555438032.190d8c6.tar.xz diff --git a/_service b/_service index 09019af..00c9ae1 100644 --- a/_service +++ b/_service @@ -1,16 +1,15 @@ - - 1.12.1.git + + 1.12.1+git https://github.com/cheusov/dictd git - - + .git* enable + Matej Cepl <mcepl@cepl.eu> - - + xz *.tar - + diff --git a/_service:obs_scm:_servicedata b/_service:obs_scm:_servicedata deleted file mode 100644 index b5fe9dd..0000000 --- a/_service:obs_scm:_servicedata +++ /dev/null @@ -1,4 +0,0 @@ - - - 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 deleted file mode 100644 index b7b3404..0000000 --- a/_service:obs_scm:dictd-1.12.1.git.1520674574.9a2f53e.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 181e1f8..0000000 --- a/_service:obs_scm:dictd.obsinfo +++ /dev/null @@ -1,5 +0,0 @@ -name: dictd -version: 1.12.1.git.1520674574.9a2f53e -mtime: 1520674574 -commit: 9a2f53ec26ec7eb1880437f1cafae6291634c98d - diff --git a/_servicedata b/_servicedata index b5fe9dd..a827dfc 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/cheusov/dictd - 9a2f53ec26ec7eb1880437f1cafae6291634c98d \ No newline at end of file + 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.changes b/dictd.changes index ff9d4a5..f3aa508 100644 --- a/dictd.changes +++ b/dictd.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +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 diff --git a/dictd.spec b/dictd.spec index deb1a74..79d1ef9 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,9 +16,8 @@ # - Name: dictd -Version: 1.12.1.git.1520674574.9a2f53e +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 @@ -40,7 +39,7 @@ BuildRequires: systemd BuildRequires: zlib-devel # libtool-ltdl-devel byacc %if 0%{?suse_version} -BuildRequires: systemd-rpm-macros +BuildRequires: systemd-rpm-macros %{?systemd_requires} %endif @@ -52,7 +51,7 @@ 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 @@ -77,7 +76,6 @@ export LDFLAGS="%{?__global_ldflags}" CPPFLAGS="%{optflags} -fPIC" # --disable-plugin make %{?_smp_mflags} - %install %make_install install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/colorit.conf @@ -98,7 +96,7 @@ 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 @@ -107,7 +105,6 @@ if [ "x%{_libdir}" != "x%{_libexecdir}" ] ; then fi rm -fv %{buildroot}%{_libdir}/*.{la,a} - %pre %service_add_pre dictd.service @@ -122,16 +119,17 @@ chmod 644 %{_localstatedir}/log/dictd %postun %service_del_postun dictd.service - %files %license COPYING %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/* +%{_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 From aba9ef7b74341d383dfe4306ee98c1d8e0052a7b3a78ce20848c803b2b06d0ad Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Wed, 5 Jun 2019 22:42:49 +0000 Subject: [PATCH 8/8] Accepting request 707878 from home:dimstar:Factory - 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. OBS-URL: https://build.opensuse.org/request/show/707878 OBS-URL: https://build.opensuse.org/package/show/Education/dictd?expand=0&rev=17 --- dictd.changes | 9 +++++++++ dictd.spec | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dictd.changes b/dictd.changes index f3aa508..8797d67 100644 --- a/dictd.changes +++ b/dictd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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 diff --git a/dictd.spec b/dictd.spec index 79d1ef9..5e29df5 100644 --- a/dictd.spec +++ b/dictd.spec @@ -35,12 +35,12 @@ 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} +%{?systemd_ordering} %endif %description