From 905b8bae645aea4b7d9ce988689d60eaf7f07b9a Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Thu, 15 Dec 2016 13:05:41 -0600 Subject: [PATCH] Add macros.vpath from FPC ticket 655 https://fedorahosted.org/fpc/ticket/655 --- macros.vpath | 7 +++++++ redhat-rpm-config.spec | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 macros.vpath diff --git a/macros.vpath b/macros.vpath new file mode 100644 index 0000000..a37f1f9 --- /dev/null +++ b/macros.vpath @@ -0,0 +1,7 @@ +# ---- VPATH default settings + +# directory where CMakeLists.txt/meson.build/etc. are placed +%_vpath_srcdir . + +# directory (doesn't need to exist) where all generated build files will be placed +%_vpath_builddir %_target_platform diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 162735d..bf6fc18 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 61 +Version: 62 Release: 1%{?dist} # No version specified. License: GPL+ @@ -35,6 +35,7 @@ Source105: macros.valgrind-srpm # Other misc macros Source150: macros.dwz Source151: macros.kmp +Source152: macros.vpath # Dependency generator scripts (deprecated) Source300: find-provides @@ -127,6 +128,7 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov %{_rpmconfigdir}/kmod.prov %{_rpmconfigdir}/macros.d/macros.*-srpm %{_rpmconfigdir}/macros.d/macros.dwz +%{_rpmconfigdir}/macros.d/macros.vpath %files -n kernel-rpm-macros %dir %{rrcdir}/find-provides.d @@ -140,6 +142,9 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Thu Dec 15 2016 Jason L Tibbitts III - 62-1 +- Add macros.vpath (https://fedorahosted.org/fpc/attachment/ticket/655) + * Tue Dec 06 2016 Adam Williamson - 61-1 - revert changes from 60, they break far too much stuff (#1401231)