[snap/f16] update to upstream 0.6 release

[Mo Morsi]

commit 2a184c52dffb37d0c068e25a5f4ae31344ff9d67
Author: Mo Morsi <mmorsi at redhat.com>
Date:   Tue Dec 20 10:14:49 2011 -0500

    update to upstream 0.6 release

 .gitignore |    1 +
 snap.spec  |   36 +++++++++++++++++++++++++++++++-----
 sources    |    2 +-
 3 files changed, 33 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4798789..bbf778c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /snap-0.5.tgz
+/snap-0.6.tgz
diff --git a/snap.spec b/snap.spec
index 313128f..e9d9bb0 100644
--- a/snap.spec
+++ b/snap.spec
@@ -1,16 +1,20 @@
 # these don't seem to be defined on f16+
+%global _icons16dir    %{_datadir}/icons/hicolor/16x16/apps
+%global _icons22dir    %{_datadir}/icons/hicolor/22x22/apps
+%global _icons24dir    %{_datadir}/icons/hicolor/24x24/apps
+%global _icons32dir    %{_datadir}/icons/hicolor/32x32/apps
 %global _icons48dir    %{_datadir}/icons/hicolor/48x48/apps
 %global _iconsscaldir  %{_datadir}/icons/hicolor/scalable/apps
 
 Name:         snap
-Version:      0.5
-Release:      7%{?dist}
+Version:      0.6
+Release:      1%{?dist}
 Summary:      A modular system backup/restore utility
 
 Group:       Applications/System
 License:     GPLv3
 URL:         http://projects.morsi.org/snap
-Source0:     http://mo.morsi.org/files/snap/snap-0.5.tgz
+Source0:     http://mo.morsi.org/files/snap/snap-0.6.tgz
 
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
@@ -56,13 +60,23 @@ make %{?_smp_mflags}
 #%%{__python} test/run.py
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 \
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1  \
          $RPM_BUILD_ROOT%{_iconsscaldir} \
-         $RPM_BUILD_ROOT%{_icons48dir}
+         $RPM_BUILD_ROOT%{_icons16dir}   \
+         $RPM_BUILD_ROOT%{_icons22dir}   \
+         $RPM_BUILD_ROOT%{_icons24dir}   \
+         $RPM_BUILD_ROOT%{_icons32dir}   \
+         $RPM_BUILD_ROOT%{_icons48dir}   \
+         $RPM_BUILD_ROOT%{_datadir}/pixmaps
 make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications resources/snap.desktop
 cp resources/gsnap.svg    $RPM_BUILD_ROOT/%{_iconsscaldir}/gsnap.svg
+cp resources/gsnap-16.png $RPM_BUILD_ROOT/%{_icons16dir}/gsnap.png
+cp resources/gsnap-22.png $RPM_BUILD_ROOT/%{_icons22dir}/gsnap.png
+cp resources/gsnap-24.png $RPM_BUILD_ROOT/%{_icons24dir}/gsnap.png
+cp resources/gsnap-32.png $RPM_BUILD_ROOT/%{_icons32dir}/gsnap.png
 cp resources/gsnap-48.png $RPM_BUILD_ROOT/%{_icons48dir}/gsnap.png
+cp resources/gsnap-16.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/gsnap.png
 
 pushd $RPM_BUILD_ROOT/%{_mandir}/man1
 ln -s snap.1.gz snaptool.1.gz
@@ -80,10 +94,22 @@ ln -s snap.1.gz snaptool.1.gz
 %files gtk
 %{_bindir}/gsnap
 %{_datadir}/applications/snap.desktop
+%{_datadir}/pixmaps/gsnap.png
 %{_iconsscaldir}/gsnap.svg
+%{_icons16dir}/gsnap.png
+%{_icons22dir}/gsnap.png
+%{_icons24dir}/gsnap.png
+%{_icons32dir}/gsnap.png
 %{_icons48dir}/gsnap.png
 
 %changelog
+* Mon Dec 19 2011 Mo Morsi <mo at morsi.org> 0.6-1
+- new upstream release
+
+* Sat Dec 10 2011 Mo Morsi <mo at morsi.org> 0.5-8
+- include additional sized icons
+- include pixmap file
+
 * Thu Dec 08 2011 Mo Morsi <mo at morsi.org> 0.5-7
 - more updates to conform to fedora guidelines
 - conditionalize python2/3-devel dependency
diff --git a/sources b/sources
index 56c1298..1b6822a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c5317bfb3b503345abdd3ec21e1d4c4  snap-0.5.tgz
+c644522b4bec5cf1e76690208700d435  snap-0.6.tgz