From 6bf3400dad396c3d2603f4855f1a76ecf5e5e1d2daea5446e277f7cf4792ad3f Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Tue, 5 May 2020 14:37:00 +0000 Subject: [PATCH] Accepting request 800365 from home:dimstar:Factory - Use %{_rpmmacrodir} instead of %{_libexecdir}/rpm/macros.d: this just happens to overlap in some distros. OBS-URL: https://build.opensuse.org/request/show/800365 OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=69 --- javapackages-tools.changes | 6 ++++++ javapackages-tools.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 0442da4..b87b482 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 5 12:32:03 UTC 2020 - Dominique Leuenberger + +- Use %{_rpmmacrodir} instead of %{_libexecdir}/rpm/macros.d: this + just happens to overlap in some distros. + ------------------------------------------------------------------- Sat Apr 6 07:15:46 UTC 2019 - Fridrich Strba diff --git a/javapackages-tools.spec b/javapackages-tools.spec index ac7804b..3d3ac6a 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,7 +1,7 @@ # # spec file for package javapackages-tools # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -167,8 +167,8 @@ files=" %{_datadir}/java-utils/java-functions %{_datadir}/java-utils/java-wrapper %{_datadir}/java-utils/scl-enable -%{_libexecdir}/rpm/macros.d/macros.jpackage -%{_libexecdir}/rpm/macros.d/macros.javapackages-filesystem +%{_rpmmacrodir}/macros.jpackage +%{_rpmmacrodir}/macros.javapackages-filesystem %{_mandir}/man1/build-classpath.1 %{_mandir}/man1/build-jar-repository.1 %{_mandir}/man1/diff-jars.1