[clamtk/f14: 4/4] Update to 4.33

[davem]

commit 1fd7ffa3be8e20d7eb0e1516b3ec1ade4d8ecc7c
Merge: 1f649ad 54dea54
Author: Dave M <dave.nerd at gmail.com>
Date:   Sat Jun 11 08:22:32 2011 -0500

    Update to 4.33

 .gitignore  |    5 +++++
 clamtk.spec |   12 +++++++++++-
 sources     |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 78dd2eb,7e7afe1..da3c1d0
--- a/.gitignore
+++ b/.gitignore
@@@ -3,7 -3,5 +3,12 @@@ clamtk-4.28.tar.g
  /clamtk-4.29.tar.gz
  /clamtk-4.30.tar.gz
  /clamtk-4.31.tar.gz
 +<<<<<<< HEAD
++<<<<<<< HEAD
++=======
++/clamtk-4.32.tar.gz
++>>>>>>> master
 +=======
  /clamtk-4.32.tar.gz
+ /clamtk-4.33.tar.gz
 +>>>>>>> master
diff --cc clamtk.spec
index c5e4967,22ca788..91e90da
--- a/clamtk.spec
+++ b/clamtk.spec
@@@ -26,8 -26,7 +26,12 @@@ It is meant to be lightweight and easy 
  %build
  
  %install
++<<<<<<< HEAD
 +rm -rf %{buildroot}
 +
++=======
+ rm -rf %{buildroot}/
++>>>>>>> master
  install -p -D -m0755 clamtk %{buildroot}/%{_bindir}/clamtk
  install -p -D -m0644 clamtk.png %{buildroot}/%{_datadir}/pixmaps/clamtk.png
  install -p -D -m0644 clamtk.1.gz %{buildroot}/%{_mandir}/man1/clamtk.1.gz