[gxine/f16: 4/5] A little SPEC cleanup.

Martin Sourada mso at fedoraproject.org
Wed Jan 23 13:12:03 UTC 2013


commit 3d78dcc7ddec65e1bfc1f53664d014e96ced2812
Author: Martin Sourada <mso at fedoraproject.org>
Date:   Wed Jan 23 14:05:16 2013 +0100

    A little SPEC cleanup.

 gxine.spec |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/gxine.spec b/gxine.spec
index a22c8a7..8ccba43 100644
--- a/gxine.spec
+++ b/gxine.spec
@@ -3,11 +3,9 @@ Version:        0.5.907
 Release:        7%{?dist}
 Summary:        GTK frontend for the xine multimedia library
 
-Group:          Applications/Multimedia
 License:        GPLv2+
-URL:            http://xinehq.de/
+URL:            http://www.xine-project.org/home
 Source0:        http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:         gxine-0.5.902-non-separate-toolbar.patch
 # some multilib issues
@@ -80,7 +78,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 # Remove .las
 %{__rm} %{buildroot}%{_libdir}/gxine/*.la
@@ -96,20 +94,20 @@ desktop-file-install --vendor="fedora" --delete-original \
   --mode 0644                                            \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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 || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %dir %{_sysconfdir}/gxine/
 %config(noreplace) %{_sysconfdir}/gxine/gtkrc
@@ -126,7 +124,6 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_datadir}/applications/fedora-gxine.desktop
 
 %files mozplugin
-%defattr(-,root,root,-)
 %doc COPYING
 # RHEL does not seem to have mozilla-filesystem package
 %if 0%{?rhel}
@@ -137,6 +134,7 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %changelog
 * Wed Jan 23 2013 Martin Sourada <mso at fedoraproject.org> - 0.5.907-7
 - Switch build to mozjs185, hopefully it has more stable API
+- SPEC clean-up
 
 * Fri Aug 10 2012 Martin Sourada <mso at fedoraproject.org> - 0.5.907-6
 - Fix build


More information about the scm-commits mailing list