From 055cfd5a71b84198bebeba58e5724aab0793c39ae6a8160132b624b06a0c009f Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 28 May 2010 17:00:01 +0000
Subject: [PATCH] Accepting request 40822 from network:utilities

Copy from network:utilities/netcat-openbsd based on submit request 40822 from user elvigia

OBS-URL: https://build.opensuse.org/request/show/40822
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netcat-openbsd?expand=0&rev=6
---
 netcat-openbsd.changes                | 10 ++++++++++
 netcat-openbsd.spec                   | 16 ++++++----------
 netcat-openbsd_1.89-3ubuntu1.diff.bz2 |  3 ---
 netcat-openbsd_1.89-3ubuntu2.diff.gz  |  3 +++
 4 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 100644 netcat-openbsd_1.89-3ubuntu1.diff.bz2
 create mode 100644 netcat-openbsd_1.89-3ubuntu2.diff.gz

diff --git a/netcat-openbsd.changes b/netcat-openbsd.changes
index 7472040..84eb185 100644
--- a/netcat-openbsd.changes
+++ b/netcat-openbsd.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri May 28 16:27:34 UTC 2010 - cristian.rodriguez@opensuse.org
+
+- Obsolete nc6 
+
+-------------------------------------------------------------------
+Tue May 18 18:10:16 UTC 2010 - cristian.rodriguez@opensuse.org
+
+- sync recent bugfixes from Ubuntu 
+
 -------------------------------------------------------------------
 Fri Feb 20 15:19:28 CET 2009 - crrodriguez@suse.de
 
diff --git a/netcat-openbsd.spec b/netcat-openbsd.spec
index 322b25d..3c0a813 100644
--- a/netcat-openbsd.spec
+++ b/netcat-openbsd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package netcat-openbsd (Version 1.89)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -21,15 +21,17 @@ Url:            http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/
 
 Name:           netcat-openbsd
 Version:        1.89
-Release:        66
-License:        BSD 3-Clause
+Release:        67
+License:        BSD3c
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake glib2-devel quilt
 Group:          Productivity/Networking/Other
 Summary:        TCP/IP swiss army knife
 Source:         %{name}-%{version}.tar.bz2
 Source1:        CMakeLists.txt
-Patch0:         netcat-openbsd_1.89-3ubuntu1.diff.bz2
+Patch0:         netcat-openbsd_1.89-3ubuntu2.diff.gz
+Provides:       nc6 = %{version}
+Obsoletes:      nc6 <= 1.0
 
 %description
 A simple Unix utility which reads and writes data across network
@@ -73,9 +75,3 @@ 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
-- initial version for the OBS
diff --git a/netcat-openbsd_1.89-3ubuntu1.diff.bz2 b/netcat-openbsd_1.89-3ubuntu1.diff.bz2
deleted file mode 100644
index 76e676a..0000000
--- a/netcat-openbsd_1.89-3ubuntu1.diff.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4616bec647bd12534c95ece839b83f79763fb28b153e299a88b13bea70a1d589
-size 28420
diff --git a/netcat-openbsd_1.89-3ubuntu2.diff.gz b/netcat-openbsd_1.89-3ubuntu2.diff.gz
new file mode 100644
index 0000000..d6f103e
--- /dev/null
+++ b/netcat-openbsd_1.89-3ubuntu2.diff.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d8675094ddff72ff17a866357428d645f422f89e1cee8c065aa05362dbf7af2
+size 31074