From a93a90b790cb2b3e25077c0377abc5f6f6cdfd1e69cfa5b2f712ce38fab2efa4 Mon Sep 17 00:00:00 2001
From: Christopher Childress <christopher.childress@dciinc.org>
Date: Wed, 21 Aug 2019 13:35:24 +0000
Subject: [PATCH] Accepting request 725058 from
 home:dancermak:branches:utilities

Rebase patches

OBS-URL: https://build.opensuse.org/request/show/725058
OBS-URL: https://build.opensuse.org/package/show/utilities/ack?expand=0&rev=32
---
 ack-add_spec.patch   | 2 +-
 ack-ignore-osc.patch | 6 +++---
 ack.changes          | 7 +++++++
 ack.spec             | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ack-add_spec.patch b/ack-add_spec.patch
index f555791..ea3c529 100644
--- a/ack-add_spec.patch
+++ b/ack-add_spec.patch
@@ -22,5 +22,5 @@ Index: ack-2.14/lib/App/Ack/ConfigDefault.pm
 +--type-add=rpm:ext:spec
 +
  # Ruby
- # http://www.ruby-lang.org/
+ # https://www.ruby-lang.org/
  --type-add=ruby:ext:rb,rhtml,rjs,rxml,erb,rake,spec
diff --git a/ack-ignore-osc.patch b/ack-ignore-osc.patch
index 9be2dfc..42bc6cb 100644
--- a/ack-ignore-osc.patch
+++ b/ack-ignore-osc.patch
@@ -15,14 +15,14 @@ Index: ack-v3.0.2/lib/App/Ack/ConfigDefault.pm
 --- ack-v3.0.2.orig/lib/App/Ack/ConfigDefault.pm
 +++ ack-v3.0.2/lib/App/Ack/ConfigDefault.pm
 @@ -70,6 +70,9 @@ sub _options_block {
- # http://mercurial.selenic.com/
+ # https://www.mercurial-scm.org/
  --ignore-directory=is:.hg
  
 +# openSUSE Commander
 +--ignore-directory=is:.osc
 +
- # quilt
- # http://directory.fsf.org/wiki/Quilt
+ # Quilt
+ # https://directory.fsf.org/wiki/Quilt
  --ignore-directory=is:.pc
 Index: ack-v3.0.2/t/ack-dump.t
 ===================================================================
diff --git a/ack.changes b/ack.changes
index a665982..8d93ab8 100644
--- a/ack.changes
+++ b/ack.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug 21 13:12:17 UTC 2019 - Dan Čermák <dcermak@suse.com>
+
+- Rebase patches:
+  * ack-add_spec.patch
+  * ack-ignore-osc.patch
+
 -------------------------------------------------------------------
 Wed Aug 21 12:11:56 UTC 2019 - Christopher Childress <christopher.childress@dciinc.org>
 
diff --git a/ack.spec b/ack.spec
index a0904ff..2c6ee20 100644
--- a/ack.spec
+++ b/ack.spec
@@ -30,7 +30,7 @@ Summary:        Grep-Like Text Finder
 License:        Artistic-2.0
 Group:          Productivity/Text/Utilities
 URL:            https://beyondgrep.com/
-Source:         http://cpan.metacpan.org/authors/id/P/PE/PETDANCE/ack-v%{version}.tar.gz
+Source:         https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/ack-v%{version}.tar.gz
 Patch1:         ack-ignore-osc.patch
 Patch3:         ack-add_spec.patch
 BuildRequires:  make