Accepting request 544816 from home:RBrownSUSE:branches:system:packagemanager

Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544816
OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/patch2mail?expand=0&rev=14

patch2mail.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:52:29 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Fri Nov 27 18:56:57 UTC 2015 - opensuse@cboltz.de
 

patch2mail.spec

@@ -1,6 +1,7 @@
 #
 # spec file for package patch2mail
 #
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2008-2015 Christian Boltz
 #
 # All modifications and additions to the file contributed by third parties
@@ -16,17 +17,22 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 Name:           patch2mail
 Version:        1.1.2
 Release:        0
 #
 #
 Summary:        Patch and package update notification via mail
-License:        GPL-2.0+
-Group:          System/Packages
 #BuildRequires: bash
 #
 #Url:            http://blog.cboltz.de/plugin/tag/patch2mail
+License:        GPL-2.0+
+Group:          System/Packages
 Url:            https://github.com/openSUSE/zypp-utils/tree/master/patch2mail
 Source:         %{name}-%{version}.tar.bz2
 #
@@ -60,7 +66,7 @@ if any patches or updated packages (configureable) are available.
 %install
 %{__install} -d -m 0755 %{buildroot}%{_datadir}/%{name}
 %{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/cron.daily
-%{__install} -d -m 0755 %{buildroot}%{_localstatedir}/adm/fillup-templates/
+%{__install} -d -m 0755 %{buildroot}%{_fillupdir}/
 
 %{__install} -m 0644 patch2mail.xsl %{buildroot}%{_datadir}/%{name}/patch2mail.xsl
 %if 0%{?suse_version} < 1030
@@ -74,7 +80,7 @@ if any patches or updated packages (configureable) are available.
 %if 0%{?suse_version} < 1100
 	%{__install} -m 0755 patch2mail_10.3 %{buildroot}%{_sysconfdir}/cron.daily/patch2mail
 %endif
-%{__install} -m 0644 patch2mail.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.patch2mail
+%{__install} -m 0644 patch2mail.sysconfig %{buildroot}%{_fillupdir}/sysconfig.patch2mail
 
 echo ==== Buildroot: %{buildroot} ====
 find %{buildroot}
@@ -90,7 +96,7 @@ echo ================================
 %defattr(-,root,root)
 %{_sysconfdir}/cron.daily/%{name}
 %{_datadir}/%{name}
-%{_localstatedir}/adm/fillup-templates/sysconfig.patch2mail
+%{_fillupdir}/sysconfig.patch2mail
 %doc README COPYING
 
 %changelog