[virt-tools-list] [PATCH virt-viewer v2] Fixes to spec file
Eduardo Lima (Etrunko)
etrunko at redhat.com
Wed Nov 22 18:21:49 UTC 2017
- Use macros for paths instead of absolute paths.
- Fix scope of enable_autotools macro to avoid warning during build.
warning: Macro %enable_autotools defined but not used within scope
Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
---
virt-viewer.spec.in | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in
index 54e2121..23fb0e7 100644
--- a/virt-viewer.spec.in
+++ b/virt-viewer.spec.in
@@ -3,7 +3,7 @@
# Default to skipping autoreconf. Distros can change just this one line
# (or provide a command-line override) if they backport any patches that
# touch configure.ac or Makefile.am.
-%{!?enable_autotools:%define enable_autotools 0}
+%{!?enable_autotools:%global enable_autotools 0}
%define with_spice 0
%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
@@ -82,7 +82,7 @@ autoreconf -if
%define govirt_arg --with-ovirt
%endif
-%configure %{spice_arg} %{gtk_arg} %{govirt_arg} --with-buildid=%{release} --disable-update-mimedb
+%configure %{spice_arg} %{govirt_arg} --with-buildid=%{release} --disable-update-mimedb
%__make %{?_smp_mflags}
@@ -95,21 +95,22 @@ rm -rf $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT
%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
-/usr/bin/update-desktop-database -q %{_datadir}/applications
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+%{_bindir}/update-desktop-database -q %{_datadir}/applications
+%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
%postun
if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
-/usr/bin/update-desktop-database -q %{_datadir}/applications
+%{_bindir}/update-desktop-database -q %{_datadir}/applications
+%{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+%{_bindir}/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
--
2.13.6
More information about the virt-tools-list
mailing list