Hello community,
here is the log from the commit of package telnet for openSUSE:Factory checked
in at 2014-10-06 22:04:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/telnet (Old)
and /work/SRC/openSUSE:Factory/.telnet.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telnet"
Changes:
--------
--- /work/SRC/openSUSE:Factory/telnet/telnet.changes 2013-04-05
17:13:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.telnet.new/telnet.changes 2014-10-06
22:04:46.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Oct 6 09:06:29 UTC 2014 - kstreit...@suse.com
+
+- url was repaired
+
+-------------------------------------------------------------------
+Fri Oct 3 18:26:38 UTC 2014 - kstreit...@suse.com
+
+- spec-cleaner used for cleaning the specfile up
+- "export NO_BRP_STRIP_DEBUG=true" removed from specfile
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ telnet.spec ++++++
--- /var/tmp/diff_new_pack.N76K4J/_old 2014-10-06 22:04:47.000000000 +0200
+++ /var/tmp/diff_new_pack.N76K4J/_new 2014-10-06 22:04:47.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package telnet
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,13 @@
Name: telnet
-Provides: nkitb:/usr/bin/telnet
Version: 1.2
Release: 0
Summary: A client program for the telnet remote login protocol
License: BSD-3-Clause
Group: Productivity/Networking/Other
-BuildRequires: ncurses-devel
-Requires: netcfg
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Url: http://ftp.suse.com/pub/people/kukuk/ipv6/
-Source:
http://ftp.suse.com/pub/people/kukuk/ipv6/telnet-bsd-%version.tar.bz2
+Url: http://svnweb.freebsd.org/base/head/contrib/telnet/
+Source:
http://ftp.suse.com/pub/people/kukuk/ipv6/telnet-bsd-%{version}.tar.bz2
Source1: telnet.xinetd
Source2: telnet.firewall
Patch1: telnet-bsd-1.2-suppress_hostname.patch
@@ -35,6 +31,10 @@
Patch3: telnet-bsd-1.2-no_gethostbyname.patch
#PATCH-FIX-UPSTREAM fix crash when using -b option bnc#700229
Patch4: telnet-bsd-1.2-hostalias.patch
+BuildRequires: ncurses-devel
+Requires: netcfg
+Provides: nkitb:%{_bindir}/telnet
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Telnet is an old protocol for logging into remote systems. It is
@@ -46,14 +46,12 @@
connects to the local smtp server, for example.
-
-
%package server
Summary: A Server Program for the Telnet Remote Login Protocol
Group: Productivity/Networking/Other
Requires: netcfg
Requires: xinetd
-Provides: nkitserv:/usr/sbin/in.telnetd
+Provides: nkitserv:%{_sbindir}/in.telnetd
Obsoletes: nkitserv
%description server
@@ -61,51 +59,45 @@
package provides the telnet daemon, which will allow remote logins into
this machine.
-
-
%prep
-%setup -q -n telnet-bsd-%version
+%setup -q -n telnet-bsd-%{version}
%patch1
%patch2
%patch3
%patch4 -p1
%build
-export CFLAGS="$RPM_OPT_FLAGS -fpie $(ncurses5-config --cflags)"
+export CFLAGS="%{optflags} -fpie $(ncurses5-config --cflags)"
export LDFLAGS="-pie $(ncurses5-config --libs)"
%configure
-%__make %{?jobs:-j%{jobs}}
+make %{?_smp_mflags}
%install
-export NO_BRP_STRIP_DEBUG=true
-install -d -m 755 $RPM_BUILD_ROOT/usr/bin
-install -d -m 755 $RPM_BUILD_ROOT/usr/sbin
-install -d -m 755 $RPM_BUILD_ROOT/etc/xinetd.d
-install -d -m 755 $RPM_BUILD_ROOT%_mandir/man1
-install -d -m 755 $RPM_BUILD_ROOT%_mandir/man5
-install -d -m 755 $RPM_BUILD_ROOT%_mandir/man8
-%makeinstall
-install -m 644 %{S:1} $RPM_BUILD_ROOT/etc/xinetd.d/telnet
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
-install -m 644 %{S:2}
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-server
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 %{buildroot}%{_prefix}/bin
+install -d -m 755 %{buildroot}%{_prefix}/sbin
+install -d -m 755 %{buildroot}%{_sysconfdir}/xinetd.d
+install -d -m 755 %{buildroot}%{_mandir}/man1
+install -d -m 755 %{buildroot}%{_mandir}/man5
+install -d -m 755 %{buildroot}%{_mandir}/man8
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xinetd.d/telnet
+install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/
+install -m 644 %{SOURCE2}
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-server
%files
%defattr(644,root,root,755)
%doc COPYING ChangeLog README NEWS
-%attr(755,root,root) /usr/bin/telnet
-%doc %_mandir/man1/telnet.1.gz
+%attr(755,root,root) %{_bindir}/telnet
+%doc %{_mandir}/man1/telnet.1.gz
%files server
%defattr(644,root,root,755)
%doc COPYING ChangeLog README NEWS
-%doc %_mandir/man8/in.telnetd.8.gz
-%doc %_mandir/man8/telnetd.8.gz
-%doc %_mandir/man5/issue.net.5.gz
-%config(noreplace) /etc/xinetd.d/telnet
-%attr(755,root,root) /usr/sbin/in.telnetd
+%doc %{_mandir}/man8/in.telnetd.8.gz
+%doc %{_mandir}/man8/telnetd.8.gz
+%doc %{_mandir}/man5/issue.net.5.gz
+%config(noreplace) %{_sysconfdir}/xinetd.d/telnet
+%attr(755,root,root) %{_sbindir}/in.telnetd
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-server
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
