Hello community,
here is the log from the commit of package talk for openSUSE:Factory checked in
at 2017-06-20 09:39:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/talk (Old)
and /work/SRC/openSUSE:Factory/.talk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "talk"
Tue Jun 20 09:39:20 2017 rev:20 rq:503972 version:0.17
Changes:
--------
--- /work/SRC/openSUSE:Factory/talk/talk.changes 2017-02-19
01:03:27.255166508 +0100
+++ /work/SRC/openSUSE:Factory/.talk.new/talk.changes 2017-06-20
09:39:20.600967560 +0200
@@ -1,0 +2,6 @@
+Thu Jun 15 14:54:03 UTC 2017 - aliouli...@suse.com
+
+- Removed xinetd service
+- Added ntalk.service and ntalk.socket
+
+-------------------------------------------------------------------
Old:
----
ntalk.xinetd
talk.xinetd
New:
----
ntalk.service
ntalk.socket
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ talk.spec ++++++
--- /var/tmp/diff_new_pack.4UKAZl/_old 2017-06-20 09:39:21.320866061 +0200
+++ /var/tmp/diff_new_pack.4UKAZl/_new 2017-06-20 09:39:21.324865497 +0200
@@ -16,8 +16,9 @@
#
+%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
+%global ncursesw_config %(set -- %{_bindir}/ncursesw*-config; echo
${1})
Name: talk
-%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
Version: 0.17
Release: 0
Summary: Talk Client for Chatting with Another User
@@ -25,10 +26,10 @@
Group: Productivity/Networking/Talk/Clients
Url: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
Source: netkit-ntalk-%{version}.tar.bz2
-Source1: talk.xinetd
-Source2: ntalk.xinetd
Source3: talkd.fw
-Patch: netkit-ntalk-%{version}.dif
+Source4: ntalk.service
+Source5: ntalk.socket
+Patch0: netkit-ntalk-%{version}.dif
Patch1: netkit-ntalk-multibyte.diff
Patch2: netkit-ntalk-%{version}-alt-talkd.patch
Patch3: netkit-ntalk-%{version}-strip.diff
@@ -37,18 +38,16 @@
# PATCH-FIX-UPSTREAM netkit-ntalk-0.17-close_file_on_failure.patch
Patch6: netkit-ntalk-0.17-close_file_on_failure.patch
Patch7: netkit-ntalk-curses-lvalue.patch
-%global ncursesw_config %(set -- %{_bindir}/ncursesw*-config; echo
${1})
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ncurses-devel
-Provides: nkitb:/usr/bin/talk
+Provides: nkitb:%{_bindir}/talk
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: systemd-rpm-macros
%description
This package contains the talk client, which allows you to chat with
another user on a different system. Talk is a communication program
which copies lines from one terminal to that of another user.
-
-
%package server
Version: 0.17
Release: 0
@@ -56,18 +55,17 @@
Group: Productivity/Networking/Talk/Servers
Requires: net-tools
Requires: netcfg
-Provides: nkitserv:/usr/sbin/in.talkd
+Provides: nkitserv:%{_sbindir}/in.talkd
+%{?systemd_requires}
%description server
This package contains the talk daemon, which allows you to chat with
another user on a different system. Talk is a communication program
which copies lines from one terminal to the terminal of another user.
-
-
%prep
-%setup -n netkit-ntalk-%{version}
-%patch
+%setup -q -n netkit-ntalk-%{version}
+%patch0
%patch1 -p1 -b .mb
%patch2 -p1
%patch3
@@ -77,40 +75,52 @@
%patch7 -p1
%build
-CFLAGS="$RPM_OPT_FLAGS" ./configure
+# Not autotools configure macro
+CFLAGS="%{optflags}" ./configure
cat <<-EOF >> MCONFIG
LIBCURSES=$(%{ncursesw_config} --libs)
CFLAGS += -D_GNU_SOURCE -fPIE $(%{ncursesw_config} --cflags)
LDFLAGS += -pie
EOF
-make
+make %{?_smp_mflags}
%install
-install -d -m 755 $RPM_BUILD_ROOT/etc/xinetd.d
-install -d -m 755 $RPM_BUILD_ROOT/usr/{bin,sbin}
-install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man{1,8}
-make install INSTALLROOT=$RPM_BUILD_ROOT
-install -m 644 %{S:1} $RPM_BUILD_ROOT/etc/xinetd.d/talk
-install -m 644 %{S:2} $RPM_BUILD_ROOT/etc/xinetd.d/ntalk
+install -d -m 755 %{buildroot}%{_prefix}/{bin,sbin}
+install -d -m 755 %{buildroot}%{_mandir}/man{1,8}
+make install INSTALLROOT=%{buildroot}
#install firewall definitions format is described here:
#/usr/share/SuSEfirewall2/services/TEMPLATE
-mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir}
-install -m 755 %{S:3} $RPM_BUILD_ROOT/%{_fwdefdir}/talkd
+mkdir -p %{buildroot}/%{_fwdefdir}
+install -m 644 %{SOURCE3} %{buildroot}/%{_fwdefdir}/talkd
+install -D -m 644 %{SOURCE4} %{buildroot}/%{_unitdir}/ntalk.service
+install -D -m 644 %{SOURCE5} %{buildroot}/%{_unitdir}/ntalk.socket
%files
%defattr(-,root,root)
%doc BUGS ChangeLog
-/usr/bin/talk
-%doc %{_mandir}/man1/*
+%{_bindir}/talk
+%{_mandir}/man1/*
+
+%pre server
+%service_add_pre ntalk.socket
+
+%post server
+%service_add_post ntalk.socket
+
+%preun server
+%service_del_preun ntalk.socket
+
+%postun server
+%service_del_postun ntalk.socket
%files server
%defattr(-,root,root)
%doc BUGS ChangeLog
-%doc %{_mandir}/man8/*
-/usr/sbin/in.ntalkd
-/usr/sbin/in.talkd
-%config(noreplace) /etc/xinetd.d/talk
-%config(noreplace) /etc/xinetd.d/ntalk
+%{_mandir}/man8/*
+%{_sbindir}/in.ntalkd
+%{_sbindir}/in.talkd
%{_fwdefdir}/talkd
+%{_unitdir}/ntalk.socket
+%{_unitdir}/ntalk.service
%changelog
++++++ ntalk.service ++++++
[Unit]
Description=NTalk Server
Documentation=man:ntalkd(8) man:talk(1)
[Service]
User=nobody
Group=tty
ExecStart=/usr/sbin/in.ntalkd
StandardInput=socket
[Install]
Also=ntalk.socket
Alias=talk.service
++++++ ntalk.socket ++++++
[Unit]
Description=Talk Server Activation Socket
Documentation=man:ntalkd(8) man:talk(1)
[Socket]
ListenDatagram=0.0.0.0:518
[Install]
WantedBy=sockets.target
