From 5806964d82b6e72a8a49b0cb784ec136b54ab747 Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Sun, 13 Aug 2006 00:38:07 +0000
Subject: [PATCH] "DESTDIR" patch is no longer needed.

---
 docs/CHANGES.txt |  5 ++++-
 tuxpaint.spec    | 17 +++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index a4db3f00e..1a167d715 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -9,7 +9,7 @@ http://www.newbreedsoftware.com/tuxpaint/
 $Id$
 
 
-2006.July.11 (0.9.16)
+2006.August.12 (0.9.16)
   * Interface improvements:
     -----------------------
     * Modified "Text" tool so that it correctly handles the 16-bit unicode
@@ -130,6 +130,9 @@ $Id$
 
   * Compiling, porting and packaging updates:
     -----------------------------------------
+    * "DESTDIR" patch is no longer needed.
+      TOYAMA Shin-ichi <shin1@wmail.plala.or.jp>
+      
     * Split parts of "tuxpaint.c" into separate source files:
       + "compiler.h": Compiler-version-specific definitions.
       + "cursor.c/h": XBM bitmap cursor #includes and functions.
diff --git a/tuxpaint.spec b/tuxpaint.spec
index bded0ac54..f42018357 100644
--- a/tuxpaint.spec
+++ b/tuxpaint.spec
@@ -1,13 +1,12 @@
 Summary: A drawing program for young children
 Name: tuxpaint
-Version: 0.9.14
-Release: 0.lumen.0
+Version: 0.9.16
+Release: 1
 License: GPL
 Group: Multimedia/Graphics
 URL: http://www.newbreedsoftware.com/tuxpaint/
 Source0: %{name}-%{version}.tar.gz
-patch1:  tuxpaint-DESTDIR.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: SDL >= 1.2.4 SDL_image SDL_mixer SDL_ttf libpng zlib
 BuildRequires: SDL-devel >= 1.2.4 SDL_image-devel SDL_mixer-devel SDL_ttf-devel
 BuildRequires: libpng-devel zlib-devel gettext
@@ -25,7 +24,6 @@ such as sound effects.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 make PREFIX=%{_prefix}
@@ -36,12 +34,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-
-make PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT install
-mv $RPM_BUILD_ROOT/share/gnome/apps/Graphics/tuxpaint.desktop $RPM_BUILD_ROOT%{_datadir}/applications
-rm -R $RPM_BUILD_ROOT/share
 
+make PREFIX=%{_prefix} PKG_ROOT=$RPM_BUILD_ROOT install
 
 find $RPM_BUILD_ROOT -name tuxpaint.desktop | sort | \
     sed -e "s@$RPM_BUILD_ROOT@@g" > filelist.icons
@@ -73,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/*/man1/tuxpaint.1.gz
 
 %changelog
+* Mon Aug 07 2006  <shin1@wmail.plala.or.jp> -
+- "DESTDIR" patch is no longer needed.
+
 * Thu Nov 03 2005  Richard June <rjune[AT]lumensoftware.com - 0:0.9.14-0.lumen.0
 - Ported from CVS for 0.9.15
 - Replaced all instances of absolute paths with macro counterparts