From 4be37b014244bed1e05806029a27a19413c64ca77995c608c1303d1b2199fb5c Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrown@suse.com>
Date: Wed, 7 Feb 2018 13:58:48 +0000
Subject: [PATCH] Accepting request 573617 from home:dimstar:Factory

- Update %remove_and_set: This macro needs no fallback to
  /var/adm/fillup-templates, as it does not work on files provided
  by the packages, but rather constructs temporary files inside
  fillup_dir.

OBS-URL: https://build.opensuse.org/request/show/573617
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=436
---
 rpm-suse_macros | 4 ----
 rpm.changes     | 8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/rpm-suse_macros b/rpm-suse_macros
index f7f273e..d681c28 100644
--- a/rpm-suse_macros
+++ b/rpm-suse_macros
@@ -199,10 +199,6 @@
     %{-n:PNAME=%{-n*}}%{!-n:PNAME=%{name}} \
     DEF_VAL=%{-y:"yes"}%{!-y:"no"} \
     DEL_TEMPL=%{_fillupdir}/$PNAME.del \
-    # If template not in new location, fallback to old location \
-    if [ ! -f $DEL_TEMPL ] ; then \
-        DEL_TEMPL=/var/adm/fillup-templates/$PNAME.del \
-    fi \
     rm -f $DEL_TEMPL \
     for var in %{?*} ; do \
 	echo -e "#\\n$var=$DEF_VAL\\n" >> $DEL_TEMPL \
diff --git a/rpm.changes b/rpm.changes
index 2a40dae..e3b532b 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb  7 09:13:41 UTC 2018 - dimstar@opensuse.org
+
+- Update %remove_and_set: This macro needs no fallback to
+  /var/adm/fillup-templates, as it does not work on files provided
+  by the packages, but rather constructs temporary files inside
+  fillup_dir.
+
 -------------------------------------------------------------------
 Mon Feb  5 11:08:12 CET 2018 - mls@suse.de