From 89f7fbb7dad91062f7e0b155c2365c2796d6a228f60b411c026cea9343234068 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 8 Dec 2008 14:54:42 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/open-iscsi?expand=0&rev=13

---
 open-iscsi-remove-trailing-tilde | 24 ++++++++++++++++++++++++
 open-iscsi.changes               |  5 +++++
 open-iscsi.spec                  |  6 +++++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 open-iscsi-remove-trailing-tilde

diff --git a/open-iscsi-remove-trailing-tilde b/open-iscsi-remove-trailing-tilde
new file mode 100644
index 0000000..8d8818f
--- /dev/null
+++ b/open-iscsi-remove-trailing-tilde
@@ -0,0 +1,24 @@
+commit b6b41fcd43f7426ef6b10cf4faf0f50d3a4bbe54
+Author: Hannes Reinecke <hare@suse.de>
+Date:   Wed Dec 3 16:11:03 2008 +0100
+
+    Remove trailing tilde from iface.example
+    
+    There was a stale tilde in iface.example, causing the iscsiadm
+    to barf.
+    
+    References: 450870
+    
+    Signed-off-by: Hannes Reinecke <hare@suse.de>
+
+diff --git a/etc/iface.example b/etc/iface.example
+index 020b002..aa41ce7 100644
+--- a/etc/iface.example
++++ b/etc/iface.example
+@@ -60,5 +60,5 @@
+ #    the same subnet.
+ # iface.net_ifacename = eth0
+ # iface.ipaddress = 102.50.50.101
+-~
++
+ 
diff --git a/open-iscsi.changes b/open-iscsi.changes
index bf7afee..ca7f459 100644
--- a/open-iscsi.changes
+++ b/open-iscsi.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec  8 15:43:29 CET 2008 - hare@suse.de
+
+- Remove trailing tilde from /etc/iscsi/ifaces.example (bnc#450870)
+
 -------------------------------------------------------------------
 Fri Dec  5 09:19:25 CET 2008 - hare@suse.de
 
diff --git a/open-iscsi.spec b/open-iscsi.spec
index ebef8fa..e59e310 100644
--- a/open-iscsi.spec
+++ b/open-iscsi.spec
@@ -26,7 +26,7 @@ Group:          Productivity/Networking/Other
 PreReq:         %fillup_prereq %insserv_prereq
 AutoReqProv:    on
 Version:        2.0.870
-Release:        22
+Release:        23
 Provides:       linux-iscsi
 Obsoletes:      linux-iscsi
 %define iscsi_release 865
@@ -60,6 +60,7 @@ Patch24:        %{name}-fw-crash-on-ppc
 Patch25:        %{name}-fixup-onboot-for-loginall
 Patch26:        %{name}-remove-dump-char
 Patch27:        %{name}-load-ibft-before-reading-sys-firmware
+Patch28:        %{name}-remove-trailing-tilde
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -116,6 +117,7 @@ Authors:
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
 
 %build
 %{__make} OPTFLAGS="${RPM_OPT_FLAGS} -DLOCK_DIR=\\\"/etc/iscsi\\\""
@@ -163,6 +165,8 @@ fi
 %doc %{_mandir}/man8/*
 
 %changelog
+* Mon Dec 08 2008 hare@suse.de
+- Remove trailing tilde from /etc/iscsi/ifaces.example (bnc#450870)
 * Fri Dec 05 2008 hare@suse.de
 - Fixup 'onboot' for loginall (bnc#449108)
 - Remove unused 'dump_char' definition in log.c