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

[Rahul Sundaram]

commit ec74fc082ad2ed7dc929223d8c991a1ed695b208
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Tue Feb 19 19:30:21 2013 -0500

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

 conduit.spec |   40 ++++++++++++++++------------------------
 1 files changed, 16 insertions(+), 24 deletions(-)
---
diff --git a/conduit.spec b/conduit.spec
index 892e454..69acc15 100644
--- a/conduit.spec
+++ b/conduit.spec
@@ -1,8 +1,6 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
 Name:           conduit
 Version:        0.3.17
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A synchronization solution for GNOME
 
 Group:          Applications/Productivity
@@ -10,8 +8,6 @@ License:        GPLv2+
 URL:            http://www.conduit-project.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/conduit/0.3/%{name}-%{version}.tar.bz2
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  python2-devel, pkgconfig, dbus-python >= 0.80, desktop-file-utils
 BuildRequires:  gtk2-devel >= 2.10, pygtk2-devel >= 2.10
@@ -78,17 +74,16 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 # conduit wrapper is unneeded because we're using WebKit and not mozembed
 (cd $RPM_BUILD_ROOT%{_bindir} && mv conduit.real conduit)
 
 # Remove broken modules
-#(cd $RPM_BUILD_ROOT/%{python_sitelib}/%{name}/modules && \
+#(cd $RPM_BUILD_ROOT/%%{python_sitelib}/%%{name}/modules && \
 # rm -rf iPodModule N800Module)
 
-desktop-file-install --delete-original --vendor="fedora"   \
+desktop-file-install \
   --remove-category Application                            \
   --dir=$RPM_BUILD_ROOT/%{_datadir}/applications           \
   $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
@@ -98,30 +93,24 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/%{name}.pc
 rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/lib/scrollkeeper
 
 %find_lang %{name}
- 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post
-scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
-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
-scrollkeeper-update -q || :
-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 -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
 %{python_sitelib}/%{name}
 %{_bindir}/*
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}
 %{_datadir}/dbus-1/services/org.conduit.service
 %{_datadir}/gnome/help/conduit
@@ -134,8 +123,11 @@ fi
 %{_datadir}/icons/hicolor/scalable/*/conduit*
 %{_datadir}/omf/conduit/conduit-*.omf
 
-
 %changelog
+* Tue Feb 19 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 0.3.17-8
+- 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> - 0.3.17-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild