From cdc084905315d3f9d770b474b37fc819af7d862524361fd61cf33d4172df94d7 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 20 Feb 2009 20:28:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netcat-openbsd?expand=0&rev=3 --- netcat-openbsd.changes | 5 +++++ netcat-openbsd.spec | 21 +++++++++++++++------ netcat-openbsd_1.89-2ubuntu1.diff.bz2 | 3 --- netcat-openbsd_1.89-3ubuntu1.diff.bz2 | 3 +++ 4 files changed, 23 insertions(+), 9 deletions(-) delete mode 100644 netcat-openbsd_1.89-2ubuntu1.diff.bz2 create mode 100644 netcat-openbsd_1.89-3ubuntu1.diff.bz2 diff --git a/netcat-openbsd.changes b/netcat-openbsd.changes index 216efdd..7472040 100644 --- a/netcat-openbsd.changes +++ b/netcat-openbsd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 20 15:19:28 CET 2009 - crrodriguez@suse.de + +- sync most recent bugfixes from debian/Ubuntu + ------------------------------------------------------------------- Sat Jul 5 19:30:39 CEST 2008 - crrodriguez@suse.de diff --git a/netcat-openbsd.spec b/netcat-openbsd.spec index f64d0ca..322b25d 100644 --- a/netcat-openbsd.spec +++ b/netcat-openbsd.spec @@ -1,10 +1,17 @@ # # spec file for package netcat-openbsd (Version 1.89) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -14,7 +21,7 @@ Url: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/ Name: netcat-openbsd Version: 1.89 -Release: 21 +Release: 66 License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake glib2-devel quilt @@ -22,7 +29,7 @@ Group: Productivity/Networking/Other Summary: TCP/IP swiss army knife Source: %{name}-%{version}.tar.bz2 Source1: CMakeLists.txt -Patch0: netcat-openbsd_1.89-2ubuntu1.diff.bz2 +Patch0: netcat-openbsd_1.89-3ubuntu1.diff.bz2 %description A simple Unix utility which reads and writes data across network @@ -52,7 +59,7 @@ QUILT_PATCHES=debian/patches quilt push -a %build export CFLAGS="%{optflags}" cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} . -make +%{__make} %{?jobs:-j%jobs} %install %makeinstall @@ -66,6 +73,8 @@ rm -rf "$RPM_BUILD_ROOT" %{_mandir}/man1/nc.1.gz %changelog +* Fri Feb 20 2009 crrodriguez@suse.de +- sync most recent bugfixes from debian/Ubuntu * Sat Jul 05 2008 crrodriguez@suse.de - netcat-openbsd conflicts with netcat but it should not [BNC#406581] * Sun Apr 13 2008 crrodriguez@suse.de diff --git a/netcat-openbsd_1.89-2ubuntu1.diff.bz2 b/netcat-openbsd_1.89-2ubuntu1.diff.bz2 deleted file mode 100644 index 10ca76a..0000000 --- a/netcat-openbsd_1.89-2ubuntu1.diff.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b02226166dd9e6a32630f2c9f6e90a29631f610d32c622d1d349f8222551bf25 -size 27511 diff --git a/netcat-openbsd_1.89-3ubuntu1.diff.bz2 b/netcat-openbsd_1.89-3ubuntu1.diff.bz2 new file mode 100644 index 0000000..76e676a --- /dev/null +++ b/netcat-openbsd_1.89-3ubuntu1.diff.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4616bec647bd12534c95ece839b83f79763fb28b153e299a88b13bea70a1d589 +size 28420