From 2206cd941b048dda2406d2f1346ae655883470faf74a1b2f8bf5e747ec0069fb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 30 Jun 2021 16:04:08 +0000 Subject: [PATCH] Accepting request 903230 from home:dimstar:Factory - Move macros.mozaddon from /etc/rpm to %_rpmmacrodir (boo#1185657). OBS-URL: https://build.opensuse.org/request/show/903230 OBS-URL: https://build.opensuse.org/package/show/mozilla:addons/mozaddon-devel?expand=0&rev=7 --- mozaddon-devel.changes | 6 ++++++ mozaddon-devel.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mozaddon-devel.changes b/mozaddon-devel.changes index f78900e..8ca935a 100644 --- a/mozaddon-devel.changes +++ b/mozaddon-devel.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 30 12:34:29 UTC 2021 - Dominique Leuenberger + +- Move macros.mozaddon from /etc/rpm to %_rpmmacrodir + (boo#1185657). + ------------------------------------------------------------------- Wed Aug 5 09:41:47 UTC 2015 - jengelh@inai.de diff --git a/mozaddon-devel.spec b/mozaddon-devel.spec index a4612b5..23137d9 100644 --- a/mozaddon-devel.spec +++ b/mozaddon-devel.spec @@ -1,7 +1,7 @@ # # spec file for package mozaddon-devel # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,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/ # @@ -41,13 +41,13 @@ addons for the Mozilla suite. %install b="%buildroot"; -mkdir -p "$b/%_bindir" "$b/%_sysconfdir/rpm"; +mkdir -p "$b/%_bindir" "$b/%_rpmmacrodir"; install -pm0755 "%{S:2}" "$b/%_bindir/"; -install -pm0644 "%{S:3}" "$b/%_sysconfdir/rpm/"; +install -pm0644 "%{S:3}" "$b/%_rpmmacrodir/"; %files %defattr(-,root,root) -%config %_sysconfdir/rpm/ +%_rpmmacrodir/macros.mozaddon %_bindir/moz* %changelog