From efa351df5f05e473a5b724117ce934cd5a5abe0c2ce729d7881eb68d11fba0f6 Mon Sep 17 00:00:00 2001
From: Tim Hardeck <thardeck@suse.com>
Date: Wed, 18 Jan 2017 15:56:46 +0000
Subject: [PATCH] - update to version 6.23.1 - clean up doc file packaging -
 remove disabled checks and macros

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cf-cli?expand=0&rev=4
---
 0001-Use-plain-version-string.patch | 10 ----------
 cf-cli.changes                      |  7 +++++++
 cf-cli.spec                         | 31 +++++++++--------------------
 v6.22.2.tar.gz                      |  3 ---
 v6.23.1.tar.gz                      |  3 +++
 5 files changed, 19 insertions(+), 35 deletions(-)
 delete mode 100644 0001-Use-plain-version-string.patch
 delete mode 100644 v6.22.2.tar.gz
 create mode 100644 v6.23.1.tar.gz

diff --git a/0001-Use-plain-version-string.patch b/0001-Use-plain-version-string.patch
deleted file mode 100644
index d961ada..0000000
--- a/0001-Use-plain-version-string.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/cf/commands/version.go	2016-12-05 14:21:12.245009000 +0100
-+++ b/cf/commands/version.go	2016-12-05 14:21:43.708615000 +0100
-@@ -45,6 +45,6 @@
- }
- 
- func (cmd *Version) Execute(context flags.FlagContext) error {
--	cmd.ui.Say(fmt.Sprintf("%s version %s-%s", cf.Name, cf.Version, cf.BuiltOnDate))
-+	cmd.ui.Say(fmt.Sprintf("%s version 6.22.2", cf.Name))
- 	return nil
- }
diff --git a/cf-cli.changes b/cf-cli.changes
index 0365561..b269f56 100644
--- a/cf-cli.changes
+++ b/cf-cli.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jan 17 17:30:36 UTC 2017 - thardeck@suse.com
+
+- update to version 6.23.1
+- clean up doc file packaging
+- remove disabled checks and macros
+
 -------------------------------------------------------------------
 Tue Dec 20 15:18:09 CET 2016 - svollath@suse.de
 
diff --git a/cf-cli.spec b/cf-cli.spec
index 0bc19a0..9d7902f 100644
--- a/cf-cli.spec
+++ b/cf-cli.spec
@@ -11,14 +11,15 @@
 # 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/
-# 
+#
 
 %define import_path code.cloudfoundry.org/cli
+%define date_string %(date -u +"%Y-%m-%d")
 
 Name:           cf-cli
-Version:        6.22.2
+Version:        6.23.1
 Release:        0
 License:        Apache-2.0
 Summary:        Cloud Foundry command line client
@@ -26,8 +27,7 @@ Url:            https://github.com/cloudfoundry/cli
 Group:          System/Management
 Source0:        v%{version}.tar.gz
 Source1:        README
-Patch1:         0001-Use-plain-version-string.patch
-BuildRequires:  go >= 1.6.0
+BuildRequires:  go >= 1.7.0
 BuildRequires:  golang-packaging
 BuildRequires:  xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -40,42 +40,29 @@ This is the official command line client for Cloud Foundry.
 
 %prep
 %setup -q -n cli-%{version}
-%patch1 -p1
 
 %build
 cd %{_builddir}/cli-%{version}
+# show correct version instead of 0.0.0
+grep -rl "0.0.0-unknown-version" ./ | xargs sed -i 's/0.0.0-unknown-version/%{version}/g'
 %goprep %{import_path}
 %gobuild
 
 %install
 mkdir -p %{buildroot}/usr/bin
-mkdir -p %{buildroot}/usr/share/doc/packages/cf-cli
 cp ../go/bin/cli %{buildroot}/usr/bin/cf
-cp ../go/src/code.cloudfoundry.org/cli/{CHANGELOG.md,LICENSE,NOTICE} %{buildroot}/usr/share/doc/packages/cf-cli
-cp %{SOURCE1} %{buildroot}/usr/share/doc/packages/cf-cli
+cp %{SOURCE1} ./
 
-#%%goinstall
 %gosrc
 %go_filelist
 %go_filelist --source
 
-%check
-#1/9 test fails - disabled
-#%%gotest %%{import_path}
-
-#%%files -f file.lst
 %files
 /usr/bin/cf
-/usr/share/doc/packages/cf-cli
-/usr/share/doc/packages/cf-cli/CHANGELOG.md
-/usr/share/doc/packages/cf-cli/LICENSE
-/usr/share/doc/packages/cf-cli/NOTICE
-/usr/share/doc/packages/cf-cli/README
 %defattr(-,root,root,-)
-%doc CHANGELOG.md LICENSE NOTICE
+%doc CHANGELOG.md LICENSE NOTICE README
 
 %files source -f source.lst
 %defattr(-,root,root,-)
 
 %changelog
-
diff --git a/v6.22.2.tar.gz b/v6.22.2.tar.gz
deleted file mode 100644
index 2849230..0000000
--- a/v6.22.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa5254a6e7197d9de86f3f9e1084d1f51f04cfa201b27c85b467a3320dbecda6
-size 5399810
diff --git a/v6.23.1.tar.gz b/v6.23.1.tar.gz
new file mode 100644
index 0000000..36a5d78
--- /dev/null
+++ b/v6.23.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e0cce57fd2ba1a32e54c7e05b0cf35ba6d16960aa843b218c44efad513383a5
+size 5655471