From d5d6785c855f35cc585e433b7ba4e4eb354dd0c958e3b56745692f90a18077d7 Mon Sep 17 00:00:00 2001
From: Olav Reinert <seroton10@gmail.com>
Date: Sat, 16 May 2020 12:02:07 +0000
Subject: [PATCH] - Upgrade to version 2.0.0:   * Breaking: Moved
 ./bin/homeshick.csh to ./homeshick.csh   * Speed up refresh operation by
 reducing exec calls   * Fix some path quoting issues

OBS-URL: https://build.opensuse.org/package/show/utilities/homeshick?expand=0&rev=15
---
 homeshick.changes    |  8 ++++++++
 homeshick.spec       | 15 +++++++--------
 suse-packaging.patch | 12 ++++++------
 v1.1.0.tar.gz        |  3 ---
 v2.0.0.tar.gz        |  3 +++
 5 files changed, 24 insertions(+), 17 deletions(-)
 delete mode 100644 v1.1.0.tar.gz
 create mode 100644 v2.0.0.tar.gz

diff --git a/homeshick.changes b/homeshick.changes
index b744d58..b1ca129 100644
--- a/homeshick.changes
+++ b/homeshick.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat May 16 11:59:00 UTC 2020 - Olav Reinert <seroton10@gmail.com>
+
+- Upgrade to version 2.0.0:
+  * Breaking: Moved ./bin/homeshick.csh to ./homeshick.csh
+  * Speed up refresh operation by reducing exec calls
+  * Fix some path quoting issues
+
 -------------------------------------------------------------------
 Thu Jun  7 19:47:32 UTC 2018 - seroton10@gmail.com
 
diff --git a/homeshick.spec b/homeshick.spec
index e35ea54..78e3f76 100644
--- a/homeshick.spec
+++ b/homeshick.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package homeshick
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,17 +12,17 @@
 # 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           homeshick
-Version:        1.1.0
+Version:        2.0.0
 Release:        0
 Summary:        Dotfile synchronizer based on Git and Bash
 License:        MIT
 Group:          Productivity/File utilities
-Url:            https://github.com/andsens/homeshick
+URL:            https://github.com/andsens/homeshick
 Source0:        https://github.com/andsens/homeshick/archive/v%{version}.tar.gz
 Source1:        README-openSUSE.md
 Source99:       homeshick.rpmlintrc
@@ -33,10 +33,10 @@ BuildRequires:  iputils
 BuildRequires:  tcsh
 Requires:       bash >= 3
 Requires:       git >= 1.5
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 %if 0%{?is_opensuse}
 BuildRequires:  bats
+BuildRequires:  dash
 BuildRequires:  fish
 %endif
 
@@ -50,14 +50,14 @@ plugins without clutter. It also makes it easy to install large external
 frameworks, such as oh-my-zsh, found on sites like https://dotfiles.github.io/.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1
 
 %build
 
 %install
 mkdir -p %{buildroot}%{_datadir}/%{name}
-mv %{name}.sh %{name}.fish bin lib completions %{buildroot}%{_datadir}/%{name}
+mv %{name}.sh %{name}.fish %{name}.csh bin lib completions %{buildroot}%{_datadir}/%{name}
 mkdir -p %{buildroot}%{_bindir}
 ln -s %{_datadir}/%{name}/bin/homeshick %{buildroot}%{_bindir}/%{name}
 cp %{SOURCE1} .
@@ -69,7 +69,6 @@ if type bats &>/dev/null; then
 fi
 
 %files
-%defattr(-,root,root)
 %doc README.md README-openSUSE.md CONTRIBUTING.md
 %license LICENSE
 %{_datadir}/%{name}
diff --git a/suse-packaging.patch b/suse-packaging.patch
index 95aafa7..754ba94 100644
--- a/suse-packaging.patch
+++ b/suse-packaging.patch
@@ -12,14 +12,14 @@ diff -r -u homeshick-1.1.0-orig/bin/homeshick homeshick-1.1.0/bin/homeshick
  # On travis-ci exit_status for some reason errors out, ignore it
  # shellcheck disable=SC1090
  source "$homeshick/lib/exit_status.sh"
-diff -r -u homeshick-1.1.0-orig/bin/homeshick.csh homeshick-1.1.0/bin/homeshick.csh
---- homeshick-1.1.0-orig/bin/homeshick.csh	2018-04-12 21:52:30.000000000 +0200
-+++ homeshick-1.1.0/bin/homeshick.csh	2018-06-07 21:35:03.398240964 +0200
+diff -r -u homeshick-1.1.0-orig/homeshick.csh homeshick-1.1.0/homeshick.csh
+--- homeshick-1.1.0-orig/homeshick.csh	2018-04-12 21:52:30.000000000 +0200
++++ homeshick-1.1.0/homeshick.csh	2018-06-07 21:35:03.398240964 +0200
 @@ -1,6 +1,6 @@
  # This helper script should be sourced via an alias, e.g.
  #
--#   alias homeshick "source $HOME/.homesick/repos/homeshick/bin/homeshick.csh"
-+#   alias homeshick "source /usr/share/homeshick/bin/homeshick.csh"
+-#   alias homeshick "source $HOME/.homesick/repos/homeshick/homeshick.csh"
++#   alias homeshick "source /usr/share/homeshick/homeshick.csh"
  #
  if ( "$1" == "cd" && "x$2" != "x" ) then
      if ( -d "$HOME/.homesick/repos/$2/home" ) then
@@ -55,7 +55,7 @@ diff -r -u homeshick-1.1.0-orig/homeshick.sh homeshick-1.1.0/homeshick.sh
 @@ -1,6 +1,5 @@
 -#!/usr/bin/env sh
  # This script should be sourced in the context of your shell like so:
--# source $HOME/.homeshick/repos/.homeshick/homeshick.sh
+-# source $HOME/.homesick/repos/.homeshick/homeshick.sh
 +# source /usr/share/homeshick/homeshick.sh
  # Once the homeshick() function is defined, you can type
  # "homeshick cd CASTLE" to enter a castle.
diff --git a/v1.1.0.tar.gz b/v1.1.0.tar.gz
deleted file mode 100644
index bf77a81..0000000
--- a/v1.1.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1894675f4f2ab002a97574445c03c7c7336c996c01023b7fc5e6668dce7d5a3c
-size 33345
diff --git a/v2.0.0.tar.gz b/v2.0.0.tar.gz
new file mode 100644
index 0000000..45383e1
--- /dev/null
+++ b/v2.0.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14a538bfc2e7cb6bfd35c984cdedbf3d3293413a70cc67f685dbfbd33ce64fdd
+size 33094