pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 573617 from home:dimstar:Factory

Browse Source 
- 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
This commit is contained in:
Richard Brown 2018-02-07 13:58:48 +00:00 committed by Git OBS Bridge
parent 4fe9a12454
commit 4be37b0142
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpm-suse_macros
View File

@ -199,10 +199,6 @@
%{-n:PNAME=%{-n*}}%{!-n:PNAME=%{name}} \ %{-n:PNAME=%{-n*}}%{!-n:PNAME=%{name}} \
DEF_VAL=%{-y:"yes"}%{!-y:"no"} \ DEF_VAL=%{-y:"yes"}%{!-y:"no"} \
DEL_TEMPL=%{_fillupdir}/$PNAME.del \ 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 \ rm -f $DEL_TEMPL \
for var in %{?*} ; do \ for var in %{?*} ; do \
echo -e "#\\n$var=$DEF_VAL\\n" >> $DEL_TEMPL \ echo -e "#\\n$var=$DEF_VAL\\n" >> $DEL_TEMPL \

8
rpm.changes
View File

@ -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 Mon Feb 5 11:08:12 CET 2018 - mls@suse.de