rpms/tuxpaint/devel tuxpaint-0.9.20-fix-desktop-file.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tuxpaint.spec, 1.20, 1.21

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/tuxpaint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20718

Modified Files:
	.cvsignore sources tuxpaint.spec 
Added Files:
	tuxpaint-0.9.20-fix-desktop-file.patch 
Log Message:
update to 0.9.20

tuxpaint-0.9.20-fix-desktop-file.patch:

--- NEW FILE tuxpaint-0.9.20-fix-desktop-file.patch ---
diff -up tuxpaint-0.9.20/src/tuxpaint.desktop.fixdesktopfile tuxpaint-0.9.20/src/tuxpaint.desktop
--- tuxpaint-0.9.20/src/tuxpaint.desktop.fixdesktopfile	2008-09-08 20:45:08.000000000 -0400
+++ tuxpaint-0.9.20/src/tuxpaint.desktop	2008-09-08 20:45:22.000000000 -0400
@@ -74,7 +74,7 @@ Type=Application
 Exec=tuxpaint
 Icon=tuxpaint
 Terminal=false
-Categories=Education; Art;
+Categories=Education;Graphics;
 GenericName=Drawing program
 GenericName[af]=Tekenprogram
 GenericName[ar]=برنامج رسم
diff -up tuxpaint-0.9.20/src/tuxpaint.desktop.in.fixdesktopfile tuxpaint-0.9.20/src/tuxpaint.desktop.in
--- tuxpaint-0.9.20/src/tuxpaint.desktop.in.fixdesktopfile	2008-04-03 12:48:50.000000000 -0400
+++ tuxpaint-0.9.20/src/tuxpaint.desktop.in	2008-09-08 20:45:30.000000000 -0400
@@ -5,6 +5,6 @@ Type=Application
 Exec=tuxpaint
 Icon=tuxpaint
 Terminal=false
-Categories=Education; Art;
+Categories=Education;Graphics;
 _GenericName=Drawing program
 _Comment=A drawing program for children.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuxpaint/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Jul 2007 02:39:58 -0000	1.7
+++ .cvsignore	9 Sep 2008 02:51:57 -0000	1.8
@@ -1 +1 @@
-tuxpaint-0.9.17.tar.gz
+tuxpaint-0.9.20.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuxpaint/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Jul 2007 02:39:58 -0000	1.7
+++ sources	9 Sep 2008 02:51:57 -0000	1.8
@@ -1 +1 @@
-e98e4f1b3421ffcb0e1a1cbbf7c93dc4  tuxpaint-0.9.17.tar.gz
+87d335ee1193b516d3cd50546ce2bf1b  tuxpaint-0.9.20.tar.gz


Index: tuxpaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxpaint/devel/tuxpaint.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- tuxpaint.spec	8 Sep 2008 22:07:58 -0000	1.20
+++ tuxpaint.spec	9 Sep 2008 02:51:57 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           tuxpaint
-Version:        0.9.17
-Release:        4%{?dist}
+Version:        0.9.20
+Release:        1%{?dist}
 
 Epoch:          1
 Summary:        Drawing program designed for young children
@@ -9,14 +9,15 @@
 License:        GPLv2+
 URL:            http://www.tuxpaint.org/
 Source0:        http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
-Source1:        %{name}.desktop
 Patch0:         tuxpaint-utf8.patch
+Patch1:         tuxpaint-0.9.20-fix-desktop-file.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2.4
 BuildRequires:  SDL_image-devel
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_ttf-devel
+BuildRequires:  SDL_Pango-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  freetype-devel >= 2.0
 BuildRequires:  gettext
@@ -34,19 +35,30 @@
 (kids ages 3 and up). It has a simple, easy-to-use interface,
 fun sound effects, and a cartoon mascot who helps you along.
 
+%package devel
+Summary:	Development files for tuxpaint extensions/plugins
+Group:		Development/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description devel
+Development files for tuxpaint extensions/plugins
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .fixdesktopfile
 
 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 {} \;
 
+make PREFIX=/usr MAGIC_PREFIX=%{_libdir}/tuxpaint/plugins tp-magic-config
+
 %build
 make %{?_smp_mflags} \
     PREFIX=/usr \
-    ARCH_LINKS="$( libpng-config --libs )" \
-    CFLAGS="$RPM_OPT_FLAGS -I%{_libdir}/glib-2.0/include"
+    CFLAGS="$RPM_OPT_FLAGS" \
+    MAGIC_PREFIX=%{_libdir}/tuxpaint/plugins
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -56,14 +68,16 @@
     X11_ICON_PREFIX=$RPM_BUILD_ROOT%{_datadir}/pixmaps/ \
     GNOME_PREFIX=/usr \
     KDE_PREFIX="" \
-    KDE_ICON_PREFIX=/usr/share/icons
+    KDE_ICON_PREFIX=/usr/share/icons \
+    MAGIC_PREFIX=$RPM_BUILD_ROOT%{_libdir}/tuxpaint/plugins
 find $RPM_BUILD_ROOT -type d|xargs chmod 0755
 %find_lang %{name}
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
     --vendor fedora \
     --add-category KidsGame \
-    %{SOURCE1}
+    --delete-original \
+    $RPM_BUILD_ROOT%{_datadir}/applications/tuxpaint.desktop
 
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
@@ -80,10 +94,19 @@
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/*/*/apps/*
+%{_libdir}/%{name}/
 %{_mandir}/man1/*
 %{_mandir}/*/man1/*
 
+%files devel
+%defattr(-,root,root,-)
+%doc %{_datadir}/doc/%{name}-dev/
+%{_includedir}/tuxpaint/
+
 %changelog
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.9.20-1
+- update to 0.9.20
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1:0.9.17-4
 - fix license tag