From 58b8681a168a1fd64e80cc3cf13eb6d533ba6692bdc498935f06d66bbcafd591 Mon Sep 17 00:00:00 2001
From: Mitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp>
Date: Sat, 6 Oct 2018 00:16:35 +0000
Subject: [PATCH] Accepting request 639554 from home:jengelh:branches:utilities

- Remove idempotent %if..%endif guards.
- Fix incorrect trailing slash in make install line.
- Update RPM group for bash-completion.

OBS-URL: https://build.opensuse.org/request/show/639554
OBS-URL: https://build.opensuse.org/package/show/utilities/etckeeper?expand=0&rev=21
---
 etckeeper.changes |  7 +++++++
 etckeeper.spec    | 10 +++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/etckeeper.changes b/etckeeper.changes
index 99b9aa4..cb347d5 100644
--- a/etckeeper.changes
+++ b/etckeeper.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct  2 09:38:10 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
+
+- Remove idempotent %if..%endif guards.
+- Fix incorrect trailing slash in make install line.
+- Update RPM group for bash-completion.
+
 -------------------------------------------------------------------
 Sun Sep 30 07:09:48 UTC 2018 - bkbin005@rinku.zaq.ne.jp
 
diff --git a/etckeeper.spec b/etckeeper.spec
index cee8607..b3abaf7 100644
--- a/etckeeper.spec
+++ b/etckeeper.spec
@@ -15,7 +15,7 @@
 # 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/
 #
 
 
@@ -84,7 +84,6 @@ is important for /etc, such as the permissions of /etc/shadow. It is
 quite modular and configurable, while also being simple to use if you
 understand the basics of working with version control.
 
-%if ! %{with systemd}
 %package cron
 Summary:        The etckeeper cron function
 Group:          System/Management
@@ -97,7 +96,6 @@ Requires:       cron
 
 %description cron
 The etckeeper-cron calls etckeeper from cron.
-%endif
 
 %package zypp-plugin
 Summary:        The etckeeper integration function with ZYpp
@@ -114,7 +112,6 @@ Provides:       etckeeper:%{_prefix}/lib/zypp/plugins/commit/zypper-etckeeper.py
 %description zypp-plugin
 The etckeeper-zypp-plugin calls etckeeper from ZYpp.
 
-%if %{with bzr}
 %package bzr
 Summary:        The etckeeper integration function with bzr
 Group:          System/Management
@@ -123,11 +120,10 @@ Requires:       etckeeper = %{version}-%{release}
 
 %description bzr
 The etckeeper integration function with bzr
-%endif
 
 %package bash-completion
 Summary:        The bash completion for etckeeper
-Group:          System/Management
+Group:          System/Shells
 Requires:       bash-completion
 Requires:       etckeeper = %{version}-%{release}
 
@@ -148,7 +144,7 @@ perl -p -i -e 's|%{_bindir}/python|%{_bindir}/%{python_versioned}|g' zypper-etck
 make %{?_smp_mflags} %{make_args}
 
 %install
-make install DESTDIR="%{buildroot}" %{make_args} \
+%make_install %{make_args}
 %if ! %{with systemd}
 install -D debian/cron.daily "%{buildroot}/etc/cron.daily/%{name}"
 %endif