From d5fdc881ed5042fe80a62f7fefc4688db7a70d5f Mon Sep 17 00:00:00 2001
From: pertusus <pertusus@fedoraproject.org>
Date: Dec 17 2007 22:13:15 +0000
Subject: sync with devel


---

diff --git a/.cvsignore b/.cvsignore
index 57f1de7..b90b562 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bitmap-1.0.2.tar.bz2
+bitmap-1.0.3.tar.bz2
diff --git a/bitmap.desktop b/bitmap.desktop
index d78fd2d..20bb6f7 100644
--- a/bitmap.desktop
+++ b/bitmap.desktop
@@ -4,7 +4,7 @@ Name=Bitmap
 GenericName=X Window Bitmaps Editor
 Comment=xBitmap editor for the X Window System
 Exec=bitmap
-Icon=bitmap.png
+Icon=bitmap
 Terminal=false
 Type=Application
-Categories=Application;Utility;
+Categories=Utility;
diff --git a/bitmap.spec b/bitmap.spec
index b19bb48..b2109d4 100644
--- a/bitmap.spec
+++ b/bitmap.spec
@@ -1,5 +1,5 @@
 Name: bitmap
-Version: 1.0.2
+Version: 1.0.3
 Release: 3%{?dist}
 Summary: Bitmap editor and converter utilities for the X Window System
 Group: User Interface/X
@@ -42,15 +42,14 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 desktop-file-install --vendor fedora                            \
         --dir %{buildroot}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         %{SOURCE1}
 
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
-install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
+install -p -m644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
 
 
 %clean
@@ -80,6 +79,12 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon Dec 17 2007 Patrice Dumas <pertusus@free.fr> 1.0.3-3
+- keep timestamps
+
+* Mon Jan 29 2007 Patrice Dumas <pertusus@free.fr> 1.0.3-2
+- update to 1.0.3
+
 * Tue Oct 10 2006 Patrice Dumas <pertusus@free.fr> 1.0.2-3
 - use consistently %%{buildroot}
 - provides xorg-x11-%%{name}-devel
diff --git a/sources b/sources
index c2f5048..01e9f8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78e8ab5c1830e2cdfbff7a952162a5a7  bitmap-1.0.2.tar.bz2
+98200c358e5401d648b980564d9ae39d  bitmap-1.0.3.tar.bz2