From d1108dce30aae3a2355dacc52c35f25e35810e9b Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Feb 15 2013 17:19:04 +0000 Subject: remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 - clean up spec to follow current guidelines --- diff --git a/clusterssh-3.28.tar.gz b/clusterssh-3.28.tar.gz deleted file mode 100644 index 402b848..0000000 Binary files a/clusterssh-3.28.tar.gz and /dev/null differ diff --git a/clusterssh.spec b/clusterssh.spec index b48c1b4..b450498 100644 --- a/clusterssh.spec +++ b/clusterssh.spec @@ -1,13 +1,12 @@ Name: clusterssh Version: 3.28 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Secure concurrent multiple server terminal control Group: Applications/Productivity License: GPLv2+ URL: http://clusterssh.sourceforge.net -Source0: http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: desktop-file-utils @@ -26,12 +25,10 @@ cluster. Not limited to use with clusters, however. make %{?_smp_mflags} %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%make_install mkdir -p %{buildroot}%{_datadir}/applications -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ %{name}.desktop mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ install -p -m 644 %{name}-48x48.png \ @@ -44,29 +41,29 @@ install -p -m 644 %{name}-24x24.png \ %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{name}.png %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 -%clean -rm -rf %{buildroot} +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -%defattr(-,root,root,-) %doc COPYING AUTHORS README NEWS THANKS ChangeLog %{_bindir}/cssh %{_mandir}/man1/*.1* %{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/%{name}.desktop %changelog +* Fri Feb 15 2013 Rahul Sundaram - 3.28-7 +- 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 - 3.28-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild