[Libstoragemgmt-devel] [PATCH 2/4] rpm spec: Use correct tmpfiles.d dir

[Tony Asleson]

Signed-off-by: Tony Asleson <***@redhat.com>
---
packaging/libstoragemgmt.spec.in | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packaging/libstoragemgmt.spec.in b/packaging/libstoragemgmt.spec.in
index 32125ee..fc4dcc4 100644
--- a/packaging/libstoragemgmt.spec.in
+++ b/packaging/libstoragemgmt.spec.in
@@ -148,7 +148,6 @@ the %{name}-rest package contains the http daemon for %{name} rest api.
%build
./autogen.sh

-#Tell the install program to preserve file date/timestamps
%configure \
%if 0%{?with_rest_api} != 1
--without-rest-api \
@@ -168,9 +167,9 @@ install -m644 packaging/daemon/libstoragemgmt.service \
%{buildroot}/%{_unitdir}/libstoragemgmt.service

#tempfiles.d configuration for /var/run
-mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
+mkdir -p %{buildroot}/%{_tmpfilesdir}
install -m 0644 packaging/daemon/lsm-tmpfiles.conf \
- %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+ %{buildroot}/%{_tmpfilesdir}/%{name}.conf
%else
#Need these to exist at install so we can start the daemon
mkdir -p %{buildroot}/etc/rc.d/init.d
@@ -280,7 +279,7 @@ fi
%dir %attr(0755, libstoragemgmt, libstoragemgmt) %{_localstatedir}/run/lsm/ipc

%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-%attr(0644, root, root) %{_sysconfdir}/tmpfiles.d/%{name}.conf
+%attr(0644, root, root) %{_tmpfilesdir}/%{name}.conf
%else
%attr(0755, root, root) /etc/rc.d/init.d/libstoragemgmtd
%endif

[Tony Asleson]

Later versions of Fedora and EL linux moved /lib to /usr/lib.

Signed-off-by: Tony Asleson <***@redhat.com>
---
packaging/libstoragemgmt.spec.in | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/packaging/libstoragemgmt.spec.in b/packaging/libstoragemgmt.spec.in
index bb30a3d..69f9a3e 100644
--- a/packaging/libstoragemgmt.spec.in
+++ b/packaging/libstoragemgmt.spec.in
@@ -40,6 +40,13 @@ Requires(preun): systemd-units
Requires(postun): systemd-units
%endif

+# Later versions moved /lib to /usr/lib
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+%define udev_dir /usr/lib
+%else
+%define udev_dir /lib
+%endif
+
%description
The libStorageMgmt library will provide a vendor agnostic open source storage
application programming interface (API) that will allow management of storage
@@ -180,11 +187,12 @@ install packaging/daemon/libstoragemgmtd \
#Need these to exist at install so we can start the daemon
mkdir -p %{buildroot}%{_localstatedir}/run/lsm/ipc

-mkdir -p %{buildroot}/lib/udev/rules.d
+#Files for udev handling
+mkdir -p %{buildroot}/%{udev_dir}/udev/rules.d
install -m 644 tools/udev/90-scsi-ua.rules \
- %{buildroot}/lib/udev/rules.d/90-scsi-ua.rules
+ %{buildroot}/%{udev_dir}/udev/rules.d/90-scsi-ua.rules
install -m 755 tools/udev/scan-scsi-target \
- %{buildroot}/lib/udev/scan-scsi-target
+ %{buildroot}/%{udev_dir}/udev/scan-scsi-target

%clean
rm -rf %{buildroot}
@@ -343,8 +351,8 @@ fi

%files udev
%defattr(-,root,root,-)
-/lib/udev/scan-scsi-target
-/lib/udev/rules.d/90-scsi-ua.rules
+%{udev_dir}/udev/scan-scsi-target
+%{udev_dir}/udev/rules.d/90-scsi-ua.rules

%if 0%{?with_rest_api}
%files rest

[Tony Asleson]

We cannot have files that have a py extension in packages that are
not in noarch rpm. This is to prevent a user from installing both
32bit and 64bit packages on the same system from having signature
conflicts for the compiled python files (pyc).

Signed-off-by: Tony Asleson <***@redhat.com>
---
packaging/libstoragemgmt.spec.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packaging/libstoragemgmt.spec.in b/packaging/libstoragemgmt.spec.in
index fc4dcc4..bb30a3d 100644
--- a/packaging/libstoragemgmt.spec.in
+++ b/packaging/libstoragemgmt.spec.in
@@ -267,9 +267,6 @@ fi
%{_bindir}/lsmcli
%{_bindir}/lsmd
%{_bindir}/simc_lsmplugin
-%{python_sitelib}/lsm/lsmcli/__init__.*
-%{python_sitelib}/lsm/lsmcli/data_display.*
-%{python_sitelib}/lsm/lsmcli/cmdline.*

%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
%{_unitdir}/*
@@ -306,6 +303,9 @@ fi
%{python_sitelib}/lsm/plugin/sim/__init__.*
%{python_sitelib}/lsm/plugin/sim/simulator.*
%{python_sitelib}/lsm/plugin/sim/simarray.*
+%{python_sitelib}/lsm/lsmcli/__init__.*
+%{python_sitelib}/lsm/lsmcli/data_display.*
+%{python_sitelib}/lsm/lsmcli/cmdline.*
%{_bindir}/sim_lsmplugin

%files smis-plugin