diff --git a/bitmap.spec b/bitmap.spec
index 5591c09..8f6842b 100644
--- a/bitmap.spec
+++ b/bitmap.spec
@@ -1,6 +1,6 @@
 Name: bitmap
 Version: 1.0.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Bitmap editor and converter utilities for the X Window System
 Group: User Interface/X
 Url: http://www.x.org
@@ -8,21 +8,13 @@ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.
 Source1: bitmap.desktop
 Source2: bitmap.png
 License: MIT
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# the bitmap-devel corresponds only with bitmap files. They are needed
-# by the base package, so this Provides is added
-Provides: %{name}-devel = %{version}-%{release}
-# other xorg apps are called like that
-Provides: xorg-x11-%{name} = %{version}-%{release}
-Provides: xorg-x11-%{name}-devel = %{version}-%{release}
 
 # libXaw-devel requires libXmu-devel 
 # libXmu-devel requires libX11-devel, libXt-devel, xorg-x11-util-macros
-BuildRequires: xbitmaps-devel libXaw-devel libXext-devel
+BuildRequires: xorg-x11-xbitmaps libXaw-devel libXext-devel
 BuildRequires: desktop-file-utils pkgconfig
 # also needed at runtime
-Requires: xbitmaps
+Requires: xorg-x11-xbitmaps
 
 %description
 Bitmap provides a bitmap editor and misc converter utilities for the X
@@ -41,7 +33,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 desktop-file-install --vendor fedora                            \
@@ -52,26 +43,17 @@ mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
 install -p -m644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post
-# update the icon cache, if it exists
-if [ -d %{_datadir}/icons/hicolor -a -x %{_bindir}/gtk-update-icon-cache ]
-then
-  touch %{_datadir}/icons/hicolor
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-# update the icon cache, if it exists
-if [ -d %{_datadir}/icons/hicolor -a -x %{_bindir}/gtk-update-icon-cache ]
-then
-  touch %{_datadir}/icons/hicolor
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,-)
@@ -87,6 +69,10 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon Sep 27 2010 Parag Nemade <paragn AT fedoraproject.org> - 1.0.3-8
+- Make sure this package follows current packaging guidelines.
+- Removed old provides.
+
 * Tue Dec 15 2009 Stepan Kasal <skasal@redhat.com> - 1.0.3-7
 - silence scriptlets