rpms/tuxpaint/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tuxpaint.desktop, 1.1, 1.2 tuxpaint.spec, 1.7, 1.8

[Steven Pritchard (steve)]

Author: steve

Update of /cvs/extras/rpms/tuxpaint/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13647

Modified Files:
	.cvsignore sources tuxpaint.desktop tuxpaint.spec 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 05:29:43 -0000	1.3
+++ .cvsignore	3 Jun 2006 18:48:03 -0000	1.4
@@ -1 +1 @@
-tuxpaint-0.9.13.tar.gz
+tuxpaint-0.9.15b.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:29:43 -0000	1.3
+++ sources	3 Jun 2006 18:48:03 -0000	1.4
@@ -1 +1 @@
-580ed290af35c34a33f2206f7f36e489  tuxpaint-0.9.13.tar.gz
+04995631e0922570a0d5c2216d943941  tuxpaint-0.9.15b.tar.gz


Index: tuxpaint.desktop
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/FC-4/tuxpaint.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tuxpaint.desktop	8 Nov 2004 05:29:43 -0000	1.1
+++ tuxpaint.desktop	3 Jun 2006 18:48:03 -0000	1.2
@@ -6,12 +6,13 @@
 Terminal=false
 Comment=Tux Paint: a drawing program for children.
 Comment[ca]=Tux Paint: un programa de dibuix per a nens petits.
-Comment[de]=Tux Paint: ein Malprogramm für (kleine) Kinder.
-Comment[es]=Tux Paint: un programa de dibujo para niños chicos.
+Comment[de]=Tux Paint: ein Malprogramm für (kleine) Kinder.
+Comment[es]=Tux Paint: un programa de dibujo para niños chicos.
 Comment[fi]=Tux Paint: on piirto-ohjelma pienille lapsille.
 Comment[fr]=Tux Paint: est un programme de dessin pour les jeunes enfants.
 Comment[hu]=Tux Paint: rajzprogram gyermekeknek.
 Comment[nl]=Tux Paint: een tekenprogramma voor kinderen.
-Comment[pt]=Tux Paint: um programa de desenho para crianças.
-Comment[sv]=Tux Paint: ett ritprogram för yngre barn.
+Comment[pt]=Tux Paint: um programa de desenho para crianças.
+Comment[sv]=Tux Paint: ett ritprogram för yngre barn.
 Categories=Education;Graphics;Application;
+Encoding=UTF-8


Index: tuxpaint.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/FC-4/tuxpaint.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tuxpaint.spec	22 May 2005 23:41:22 -0000	1.7
+++ tuxpaint.spec	3 Jun 2006 18:48:03 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           tuxpaint
-Version:        0.9.13
-Release: 3
+Version:        0.9.15b
+Release:        1%{?dist}
 
 Epoch:          1
 Summary:        Drawing program designed for young children
@@ -8,14 +8,17 @@
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.newbreedsoftware.com/tuxpaint/
-Source0:        http://dl.sf.net/tuxpaint/tuxpaint-0.9.13.tar.gz
+Source0:        http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
-Patch0:         %{name}-%{version}-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2.4, SDL_image-devel, SDL_ttf-devel
 BuildRequires:  SDL_mixer-devel, libpng-devel, freetype-devel >= 2.0, gettext
-BuildRequires:  netpbm-devel, gnome-libs-devel, kdelibs, desktop-file-utils
+BuildRequires:  netpbm-devel, desktop-file-utils
+
+# This should guarantee the proper permissions on
+# all of the /usr/share/icons/hicolor/* directories.
+Requires:       /usr/share/icons/hicolor/scalable
 
 %description
 "Tux Paint" is a free drawing program designed for young children
@@ -24,7 +27,8 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .destdir
+
+sed -i -e '/\/gnome\/apps\/Graphics/d' Makefile
 
 %build
 make %{?_smp_mflags} PREFIX=/usr
@@ -33,10 +37,11 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applnk/Graphics
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/{16x16,32x32,48x48}/apps/
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_usr} \
-	X11_ICON_PREFIX=%{_datadir}/pixmaps/
+make install PKG_ROOT=$RPM_BUILD_ROOT PREFIX=%{_usr} \
+    X11_ICON_PREFIX=$RPM_BUILD_ROOT%{_datadir}/pixmaps/ \
+    GNOME_PREFIX=/usr \
+    KDE_PREFIX="" \
+    KDE_ICON_PREFIX=/usr/share/icons
 find $RPM_BUILD_ROOT -type d|xargs chmod 0755
 %find_lang %{name}
 
@@ -45,9 +50,7 @@
 	--add-category X-Fedora \
 	%{SOURCE1}
 
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/gnome/
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/applnk/
-find $RPM_BUILD_ROOT -name "*CVS*" | xargs rm -rf
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,8 +59,8 @@
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%doc docs
 %{_bindir}/*
-%{_docdir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
@@ -66,6 +69,19 @@
 %{_mandir}/*/man1/*
 
 %changelog
+* Fri Jun 02 2006 Steven Pritchard <steve at kspei.com> 1:0.9.15b-1
+- Update to 0.9.15b
+- Convert tuxpaint.desktop to UTF-8
+- Drop gnome-libs-devel and kdelibs build dependencies by providing
+  appropriate variables to "make install"
+- Add docs properly
+- Indirectly require hicolor-icon-theme (so that directories are
+  owned and have proper permissions)
+
+* Mon Mar 13 2006 Steven Pritchard <steve at kspei.com> 1:0.9.15-1
+- Update to 0.9.15
+- Drop destdir patch
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1:0.9.13-3
 - rebuild on all arches