rpms/tuxpaint/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tuxpaint.desktop, 1.1, 1.2 tuxpaint.spec, 1.8, 1.9
Steven Pritchard (steve)
fedora-extras-commits at redhat.com
Sat Jun 3 18:10:17 UTC 2006
- Previous message: rpms/tuxpaint/devel .cvsignore,1.4,1.5 sources,1.4,1.5
- Next message: 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: steve
Update of /cvs/extras/rpms/tuxpaint/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13469
Modified Files:
.cvsignore sources tuxpaint.desktop tuxpaint.spec
Log Message:
Sync with devel.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 13 Mar 2006 18:04:17 -0000 1.4
+++ .cvsignore 3 Jun 2006 18:10:17 -0000 1.5
@@ -1 +1 @@
-tuxpaint-0.9.15.tar.gz
+tuxpaint-0.9.15b.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 13 Mar 2006 18:04:17 -0000 1.4
+++ sources 3 Jun 2006 18:10:17 -0000 1.5
@@ -1 +1 @@
-4431d1381712cbf3ade566aa47cb3cab tuxpaint-0.9.15.tar.gz
+04995631e0922570a0d5c2216d943941 tuxpaint-0.9.15b.tar.gz
Index: tuxpaint.desktop
===================================================================
RCS file: /cvs/extras/rpms/tuxpaint/FC-5/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:10:17 -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-5/tuxpaint.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tuxpaint.spec 13 Mar 2006 18:04:17 -0000 1.8
+++ tuxpaint.spec 3 Jun 2006 18:10:17 -0000 1.9
@@ -1,5 +1,5 @@
Name: tuxpaint
-Version: 0.9.15
+Version: 0.9.15b
Release: 1%{?dist}
Epoch: 1
@@ -8,13 +8,17 @@
Group: Applications/Multimedia
License: GPL
URL: http://www.newbreedsoftware.com/tuxpaint/
-Source0: http://dl.sf.net/tuxpaint/tuxpaint-0.9.15.tar.gz
+Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
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,6 +28,8 @@
%prep
%setup -q
+sed -i -e '/\/gnome\/apps\/Graphics/d' Makefile
+
%build
make %{?_smp_mflags} PREFIX=/usr
@@ -31,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 PKG_ROOT=$RPM_BUILD_ROOT PREFIX=%{_usr} \
- X11_ICON_PREFIX=$RPM_BUILD_ROOT%{_datadir}/pixmaps/
+ 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}
@@ -43,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
@@ -54,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/*
@@ -64,6 +69,15 @@
%{_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
- Previous message: rpms/tuxpaint/devel .cvsignore,1.4,1.5 sources,1.4,1.5
- Next message: 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list