From 56e20dd21f7a641502ff7880944df71731e76b64 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sat, 4 Jan 2020 23:51:35 +0900
Subject: [PATCH] Revert "- move pld macros from macros.d/pld to pld/macros"

This reverts commit d0291c6fe93a1bd8ae490b73dcbf4a9f6e8e7eb0.

We should install pld macros in the old place, but allow reading from new location
---
 rpm.spec         | 12 ++++--------
 vendor-pld.patch |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/rpm.spec b/rpm.spec
index 0f885db..2db8559 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -963,8 +963,7 @@ cd -
 
 %patch1050 -p1
 
-install -d pld
-install %{SOURCE2} pld/macros.in
+install %{SOURCE2} macros/pld.in
 install %{SOURCE11} scripts/perl.prov.in
 
 rm scripts/find-php*
@@ -1016,7 +1015,7 @@ sed -i \
 	--with-lua=%{!?with_system_lua:internal}%{?with_system_lua:external} \
 	--with-lzma=external \
 	--with-neon=%{?with_neon:external}%{!?with_neon:no} \
-	--with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/pld/macros:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \
+	--with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros' \
 	--without-path-versioned \
 	--with-pcre=%{!?with_system_pcre:internal}%{?with_system_pcre:external} \
 	--with-popt=external \
@@ -1052,7 +1051,7 @@ fi
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm} \
-	$RPM_BUILD_ROOT{/var/lib/banner,/var/cache/hrmib,/etc/pki/rpm-gpg,%{_rpmlibdir}/pld}
+	$RPM_BUILD_ROOT{/var/lib/banner,/var/cache/hrmib,/etc/pki/rpm-gpg}
 
 install %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
 
@@ -1060,8 +1059,6 @@ install %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key
 	pkgconfigdir=%{_pkgconfigdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -p pld/macros $RPM_BUILD_ROOT%{_rpmlibdir}/pld/macros
-
 # install platform macros
 for f in platform/*macros; do
 	bn=${f#*/}
@@ -1362,9 +1359,8 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_rpmlibdir}/qf
 %{_rpmlibdir}/rpmpopt*
 %{_rpmlibdir}/macros
-%dir %{_rpmlibdir}/pld
-%{_rpmlibdir}/pld/macros
 %dir %{_rpmlibdir}/macros.d
+%{_rpmlibdir}/macros.d/pld
 %{_rpmlibdir}/cpuinfo.yaml
 %{_rpmlibdir}/noarch-*
 %ifarch %{ix86} %{x8664} x32
diff --git a/vendor-pld.patch b/vendor-pld.patch
index 5230089..cd77531 100644
--- a/vendor-pld.patch
+++ b/vendor-pld.patch
@@ -15,7 +15,7 @@
      macros/macros macros/macros.rpmbuild
      macros/cmake macros/gstreamer macros/java macros/kernel macros/libtool
 -    macros/mandriva macros/suse macros/fedora macros/mono macros/perl macros/pkgconfig macros/php
-+    pld/macros macros/mandriva macros/suse macros/fedora macros/mono macros/perl macros/pkgconfig macros/php
++    macros/pld macros/mandriva macros/suse macros/fedora macros/mono macros/perl macros/pkgconfig macros/php
      macros/python macros/ruby macros/selinux macros/tcl
      doc/Makefile
      doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
@@ -26,7 +26,7 @@
  pkgcfg_DATA = \
  	macros/cmake macros/gstreamer macros/java macros/kernel macros/libtool \
 -	macros/mandriva macros/mono macros/perl macros/pkgconfig macros/php \
-+	macros/mono macros/perl macros/pkgconfig macros/php \
++	macros/pld macros/mono macros/perl macros/pkgconfig macros/php \
  	macros/python macros/ruby macros/selinux macros/tcl
  
  noinst_HEADERS = build.h debug.h system.h
-- 
2.44.0