hal-rootstrap-checker: Fix install path of hal-rootstrap-checker-rpmmacros

Instead of making symlink of hal-rootstrap-checker-rpmmacros to the
rpm macro lookup path, /etc/rpm/macros.*, install the file on the
lookup path. Moveover, changed the filename to the rpmbuild identifiable
format, macros.hal-rootstrap-checker.

Change-Id: I53c0a15333bd110b11d1fe2fd6c596924f86952c
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/packaging/hal-rootstrap-checker-rpmmacros b/packaging/hal-rootstrap-checker-rpmmacros
deleted file mode 100644 (file)
index 77a7054..0000000
--- a/packaging/hal-rootstrap-checker-rpmmacros
+++ /dev/null
@@ -1,3 +0,0 @@
-%__hal_rootstrap_checker_install_post \
-    /etc/hal/rootstrap/hal-rootstrap-checker.sh %{!?disable_hal_rootstrap_checker:0}%{?disable_hal_rootstrap_checker} %{_sourcedir} \
-%{nil}

diff --git a/packaging/hal-rootstrap.spec b/packaging/hal-rootstrap.spec
index 35f4c5ec91084af01bd9cbb751b2c3a94e0f4f9f..9f86a6e183bdec66d50d9b211fae15339fb64bb9 100644 (file)
--- a/packaging/hal-rootstrap.spec
+++ b/packaging/hal-rootstrap.spec
@@ -15,7 +15,7 @@ License:      Apache-2.0
 Source0:       %{name}-%{version}.tar.gz
 Source1:       hal-rootstrap-checker.sh
 Source2:       hal-rootstrap-checker.yaml
-Source3:       hal-rootstrap-checker-rpmmacros
+Source3:       macros.hal-rootstrap-checker
 AutoReqProv:    no
 
 BuildRequires: cmake
@@ -89,13 +89,9 @@ rm -f "%{buildroot}%{hal_rootstrap_headed_install_path}/%{_libdir}/pkgconfig/*.p
 mkdir -p %{buildroot}%{_sysconfdir}/hal/rootstrap
 install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/hal/rootstrap
 install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/hal/rootstrap
-install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/hal/rootstrap
 
-%post checker
-ln -sf %{_sysconfdir}/hal/rootstrap/hal-rootstrap-checker-rpmmacros %{_sysconfdir}/rpm/macros.hal-rootstrap-checker
-
-%postun checker
-rm -f %{_sysconfdir}/rpm/macros.hal-rootstrap-checker
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm
 
 %files
 %{hal_rootstrap_install_path}
@@ -119,4 +115,4 @@ rm -f %{_sysconfdir}/rpm/macros.hal-rootstrap-checker
 %defattr(-,root,root,-)
 %{_sysconfdir}/hal/rootstrap/hal-rootstrap-checker.sh
 %{_sysconfdir}/hal/rootstrap/hal-rootstrap-checker.yaml
-%{_sysconfdir}/hal/rootstrap/hal-rootstrap-checker-rpmmacros
+%{_sysconfdir}/rpm/macros.hal-rootstrap-checker

diff --git a/packaging/macros.hal-rootstrap-checker b/packaging/macros.hal-rootstrap-checker
new file mode 100644 (file)
index 0000000..77a7054
--- /dev/null
+++ b/packaging/macros.hal-rootstrap-checker
@@ -0,0 +1,3 @@
+%__hal_rootstrap_checker_install_post \
+    /etc/hal/rootstrap/hal-rootstrap-checker.sh %{!?disable_hal_rootstrap_checker:0}%{?disable_hal_rootstrap_checker} %{_sourcedir} \
+%{nil}