rpms/tuxpaint/FC-6 tuxpaint-utf8.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tuxpaint.spec, 1.12, 1.13

[Steven Pritchard (steve)]

Author: steve

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

Modified Files:
	.cvsignore sources tuxpaint.spec 
Added Files:
	tuxpaint-utf8.patch 
Log Message:
Sync with devel branch.

tuxpaint-utf8.patch:

--- NEW FILE tuxpaint-utf8.patch ---
--- tuxpaint-0.9.16/src/manpage/tuxpaint.1.orig	2006-10-11 13:37:04.000000000 -0500
+++ tuxpaint-0.9.16/src/manpage/tuxpaint.1	2007-01-30 13:23:42.000000000 -0600
@@ -635,12 +635,12 @@
 Juan Irigoien,
 Dmitriy Ivanov,
 Mogens Jaeger,
-Lis Gøthe í Jákupsstovu,
+Lis Gøthe í Jákupsstovu,
 Nedjeljko Jedvaj,
 Aleksandar Jelenak,
 Rasmus Erik Voel Jensen,
 Wang Jian,
-Amed Ç. Jiyan,
+Amed Ç. Jiyan,
 Petri Jooste,
 Andrej Kacian,
 Kazuhiko,


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Jun 2006 17:54:54 -0000	1.5
+++ .cvsignore	31 Jan 2007 00:47:37 -0000	1.6
@@ -1 +1 @@
-tuxpaint-0.9.15b.tar.gz
+tuxpaint-0.9.16.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jun 2006 17:54:54 -0000	1.5
+++ sources	31 Jan 2007 00:47:37 -0000	1.6
@@ -1 +1 @@
-04995631e0922570a0d5c2216d943941  tuxpaint-0.9.15b.tar.gz
+467ef64c7f81f9f3755ae2ceebe97f48  tuxpaint-0.9.16.tar.gz


Index: tuxpaint.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/FC-6/tuxpaint.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tuxpaint.spec	4 Oct 2006 22:31:35 -0000	1.12
+++ tuxpaint.spec	31 Jan 2007 00:47:37 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           tuxpaint
-Version:        0.9.15b
+Version:        0.9.16
 Release:        4%{?dist}
 
 Epoch:          1
@@ -10,6 +10,7 @@
 URL:            http://www.tuxpaint.org/
 Source0:        http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
+Patch0:         tuxpaint-utf8.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2.4, SDL_image-devel, SDL_ttf-devel
@@ -27,13 +28,17 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 sed -i -e '/\/gnome\/apps\/Graphics/d' Makefile
+find docs -type f -exec perl -pi -e 's/\r\n/\n/' {} \;
+find docs -type f -perm +100 -exec chmod a-x {} \;
 
 %build
 make %{?_smp_mflags} \
     PREFIX=/usr \
-    ARCH_LINKS="$( libpng-config --libs )"
+    ARCH_LINKS="$( libpng-config --libs )" \
+    CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,9 +53,9 @@
 %find_lang %{name}
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-	--vendor fedora \
-	--add-category X-Fedora \
-	%{SOURCE1}
+    --vendor fedora \
+    --add-category KidsGame \
+    %{SOURCE1}
 
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
@@ -71,6 +76,23 @@
 %{_mandir}/*/man1/*
 
 %changelog
+* Tue Jan 30 2007 Steven Pritchard <steve at kspei.com> 1:0.9.16-4
+- Honor $RPM_OPT_FLAGS.
+- Fix various rpmlint warnings:
+  - Expand tabs in spec.
+  - Convert tuxpaint.1 to UTF-8.
+  - Get rid of DOS line endings in docs.
+  - Nothing in docs should be executable.
+
+* Fri Oct 27 2006 Steven Pritchard <steve at kspei.com> 1:0.9.16-3
+- Fix category in tuxpaint.desktop.
+
+* Thu Oct 26 2006 Steven Pritchard <steve at kspei.com> 1:0.9.16-2
+- Drop "--add-category X-Fedora".
+
+* Tue Oct 24 2006 Steven Pritchard <steve at kspei.com> 1:0.9.16-1
+- Update to 0.9.16.
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9.15b-4
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21