[bouml] remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247

[Rahul Sundaram]

commit 69cc7e143dede1a39d40944da6afebf4349f4112
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Thu Feb 14 02:10:24 2013 -0500

    remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
    
    - clean up spec to follow current guidelines

 bouml.spec |   41 +++++++++++++++++++----------------------
 1 files changed, 19 insertions(+), 22 deletions(-)
---
diff --git a/bouml.spec b/bouml.spec
index aec61d7..0b7e8a1 100644
--- a/bouml.spec
+++ b/bouml.spec
@@ -1,14 +1,12 @@
 Summary:	UML2 tool box for C++, Java, IDL, PHP and Python
 Name:		bouml
 Version:	4.21
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://bouml.free.fr/
 Source0:	http://downloads.sourceforge.net/bouml/%{name}_%{version}.tar.gz
 
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
 Requires:	hicolor-icon-theme
 
 BuildRequires:	desktop-file-utils
@@ -33,10 +31,9 @@ The documentation for this package is in %{name}-doc.
 make %{?_smp_mflags} BOUML_LIB=%{_libdir}/%{name}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 
 # To prevent failure on ppc64 and x86_64.
-make install BOUML_LIB=%{_libdir}/%{name} DESTDIR=$RPM_BUILD_ROOT
+%make_install BOUML_LIB=%{_libdir}/%{name}
 
 # Symlinks need to be relative.
 pushd $RPM_BUILD_ROOT%{_bindir}
@@ -46,43 +43,39 @@ pushd $RPM_BUILD_ROOT%{_bindir}
   ln -s ../%{_lib}/%{name}/projectSynchro projectSynchro
 popd
 
-desktop-file-install --remove-key Encoding --vendor fedora --delete-original \
+desktop-file-install --remove-key Encoding \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-desktop-file-install --remove-key Encoding --vendor fedora --delete-original \
+desktop-file-install --remove-key Encoding \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/projectControl.desktop
 
-desktop-file-install --remove-key Encoding --vendor fedora --delete-original \
+desktop-file-install --remove-key Encoding \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/projectSynchro.desktop
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_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
-%defattr(-,root,root,-)
 %doc historic.html
 %doc licence.txt
 %{_bindir}/%{name}
 %{_bindir}/projectControl
 %{_bindir}/projectSynchro
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/applications/fedora-projectControl.desktop
-%{_datadir}/applications/fedora-projectSynchro.desktop
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/projectControl.desktop
+%{_datadir}/applications/projectSynchro.desktop
 %{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 %{_datadir}/icons/hicolor/16x16/apps/projectControl.png
 %{_datadir}/icons/hicolor/16x16/apps/projectSynchro.png
@@ -100,6 +93,10 @@ fi
 %{_libdir}/%{name}/*
 
 %changelog
+* Thu Feb 14 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 4.21-6
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- clean up spec to follow current guidelines
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.21-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild