diff --git a/.cvsignore b/.cvsignore index 7364708..0c2b086 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -uget-1.4.7.tar.gz +uget-1.4.8.1.tar.gz diff --git a/sources b/sources index 2a90ba3..0325a3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e2bb31a1e1064db59ce7f341b9d7b013 uget-1.4.7.tar.gz +1174f1b9688cde2a75a3fd557ded0fca uget-1.4.8.1.tar.gz diff --git a/uget.desktop b/uget.desktop deleted file mode 100644 index c792a09..0000000 --- a/uget.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Uget Download Manager -Comment=Download files from the internet -Comment[de]=Dateien aus dem Internet herunterladen -GenericName=Download Manager -Exec=uget-gtk -Icon=document-save -Terminal=false -Type=Application -Categories=GTK;Network;FileTransfer; diff --git a/uget.spec b/uget.spec index b3b9697..b4a7315 100644 --- a/uget.spec +++ b/uget.spec @@ -1,13 +1,12 @@ Name: uget -Version: 1.4.7 -Release: 2%{?dist} +Version: 1.4.8.1 +Release: 1%{?dist} Summary: Download manager using GTK+ and libcurl Group: Applications/Internet License: LGPLv2+ URL: http://urlget.sourceforge.net/ Source0: http://downloads.sourceforge.net/urlget/%{name}-%{version}.tar.gz -Source1: uget.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -30,6 +29,9 @@ Uget is the successor of urlgfe, which was called URLget before. %prep %setup -q chmod 0644 [A-Z]* +sed -i.png \ + -e 's|^Icon=.*$|Icon=uget-icon|' \ + %{name}-gtk.desktop %build %configure @@ -42,20 +44,51 @@ make install \ INSTALL="install -p" desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE1} + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-gtk.desktop + +for s in 16 32 +do + subdir=icons/hicolor/${s}x${s}/apps + mkdir -p $RPM_BUILD_ROOT%{_datadir}/${subdir} + mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}-icon-${s}x${s}.png \ + $RPM_BUILD_ROOT%{_datadir}/${subdir}/%{name}-icon.png + ln -sf ../${subdir}/%{name}-icon.png \ + $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}-icon-${s}x${s}.png +done %clean rm -rf $RPM_BUILD_ROOT +%post +touch --no-create %{_datadir}/icons/hicolor +exit 0 + +%postun +[ $1 -eq 0 ] || exit 0 +touch --no-create %{_datadir}/icons/hicolor +gtk-update-icon-cache -q %{_datadir}/icons/hicolor +exit 0 + +%posttrans +gtk-update-icon-cache -q %{_datadir}/icons/hicolor +exit 0 + %files %defattr(-,root,root,-) %doc COPYING %doc ChangeLog %doc README %{_bindir}/%{name}-gtk -%{_datadir}/applications/%{name}.desktop + +%{_datadir}/applications/%{name}-gtk.desktop +%{_datadir}/icons/hicolor/??x??/apps/%{name}-icon.png +%{_datadir}/pixmaps/%{name}-icon-*.png %changelog +* Thu May 14 2009 Mamoru Tasaka - 1.4.8.1-1 +- 1.4.8.1 + * Mon May 4 2009 Mamoru Tasaka - 1.4.7-2 - More detailed summary/description suggested by Christoph Wickert