From 897106fb2ee808f4fa80b3ef41e751151b1f9695e158903131b9b4e3cac5484c Mon Sep 17 00:00:00 2001
From: Simon Lees <simonf.lees@suse.com>
Date: Mon, 2 Apr 2018 01:11:51 +0000
Subject: [PATCH] Accepting request 592803 from home:avindra

- Update to 2.7.1
  * macos specific fix for iTerm2
- cleanup with spec-cleaner
- use https URL
- rpmlint: fix E: devel-file-in-non-devel-package
- rpmlint: fix E: env-script-interpreter

OBS-URL: https://build.opensuse.org/request/show/592803
OBS-URL: https://build.opensuse.org/package/show/shells/fish?expand=0&rev=33
---
 fish-2.7.0.tar.gz |  3 ---
 fish-2.7.1.tar.gz |  3 +++
 fish.changes      | 10 ++++++++++
 fish.spec         | 25 ++++++++++++++++++-------
 4 files changed, 31 insertions(+), 10 deletions(-)
 delete mode 100644 fish-2.7.0.tar.gz
 create mode 100644 fish-2.7.1.tar.gz

diff --git a/fish-2.7.0.tar.gz b/fish-2.7.0.tar.gz
deleted file mode 100644
index ebf1e91..0000000
--- a/fish-2.7.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a76b7cae92f9f88863c35c832d2427fb66082f98e92a02203dc900b8fa87bcb
-size 5760470
diff --git a/fish-2.7.1.tar.gz b/fish-2.7.1.tar.gz
new file mode 100644
index 0000000..05f261b
--- /dev/null
+++ b/fish-2.7.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e42bb19c7586356905a58578190be792df960fa81de35effb1ca5a5a981f0c5a
+size 5760550
diff --git a/fish.changes b/fish.changes
index 605bdfe..0c938b2 100644
--- a/fish.changes
+++ b/fish.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Mar 31 23:37:20 UTC 2018 - avindra@opensuse.org
+
+- Update to 2.7.1
+  * macos specific fix for iTerm2
+- cleanup with spec-cleaner
+- use https URL
+- rpmlint: fix E: devel-file-in-non-devel-package
+- rpmlint: fix E: env-script-interpreter
+
 -------------------------------------------------------------------
 Fri Jan  5 01:05:21 UTC 2018 - sflees@suse.de
 
diff --git a/fish.spec b/fish.spec
index 98d5b66..ad45f8b 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fish
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,12 +17,12 @@
 
 
 Name:           fish
-Version:        2.7.0
+Version:        2.7.1
 Release:        0
 Summary:        A user friendly interactive shell
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          System/Shells
-Url:            http://fishshell.com/
+Url:            https://fishshell.com/
 Source:         https://github.com/fish-shell/fish-shell/releases/download/%{version}/fish-%{version}.tar.gz
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
@@ -35,7 +35,6 @@ BuildRequires:  python
 Requires:       bc
 Requires:       man
 Recommends:     terminfo
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 fish is a user friendly command line shell for UNIX-like operating systems
@@ -45,9 +44,19 @@ It's geared towards interactive use and its features are focused on user
 friendlieness and discoverability. The language syntax is simple but
 incompatible with other shell languages.
 
+%package devel
+Summary:        Devel files for the fish shell
+Group:          Development/Libraries/C and C++
+
+%description devel
+This package contains development files for the fish shell.
+
 %prep
 %setup -q
 
+# fix E: env-script-interpreter
+find ./share/tools -type f -name *.py -exec sed -i -r '1s|^#!%{_bindir}/env |#!%{_bindir}/|' {} \;
+
 %build
 %configure \
   --without-included-pcre2
@@ -55,6 +64,7 @@ make %{?_smp_mflags}
 
 %install
 %make_install
+
 %find_lang %{name}
 
 %post
@@ -71,13 +81,14 @@ if [ "$1" = 0 ]; then
 fi
 
 %files -f %{name}.lang
-%defattr(-,root,root)
 %dir %{_sysconfdir}/fish
 %config(noreplace) %{_sysconfdir}/%{name}/*
 %{_bindir}/*
 %{_datadir}/doc/%{name}
 %{_datadir}/%{name}
+%{_mandir}/man1/*.1%{?ext_man}
+
+%files devel
 %{_datadir}/pkgconfig/fish.pc
-%{_mandir}/man1/*
 
 %changelog