[Tux4kids-commits] r1663 - tuxtype/trunk
David Bruce
dbruce-guest at alioth.debian.org
Fri Nov 20 02:30:34 UTC 2009
Author: dbruce-guest
Date: 2009-11-20 02:30:34 +0000 (Fri, 20 Nov 2009)
New Revision: 1663
Modified:
tuxtype/trunk/tuxtype.spec.in
tuxtype/trunk/tuxtype_preview.spec.in
Log:
Update of spec.in files
Modified: tuxtype/trunk/tuxtype.spec.in
===================================================================
--- tuxtype/trunk/tuxtype.spec.in 2009-11-19 23:45:43 UTC (rev 1662)
+++ tuxtype/trunk/tuxtype.spec.in 2009-11-20 02:30:34 UTC (rev 1663)
@@ -1,8 +1,8 @@
-## tuxtype.spec.in - process with configure to substitute in PACKAGE
-## VERSION strings
+## tuxtype.spec.in - process with configure to fill in current
+## PACKAGE and VERSION strings
#
#
-# spec file for package tuxtype
+# spec file for package tuxtype
#
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
@@ -11,15 +11,16 @@
# norootforbuild
Name: @PACKAGE@
-Obsoletes: tuxtype_preview <= @VERSION@
-Provides: tuxtype_preview = @VERSION@
+Version: @VERSION@
+Obsoletes: tuxtype_preview <= @VERSION@
+Provides: tuxtype_preview = @VERSION@
+%define realname @PACKAGE@
+%define progname @PACKAGE@
+
Summary: Typing tutor for children
Url: http://alioth.debian.org/projects/tux4kids/
-%define realname @PACKAGE@
-%define progname @PACKAGE@
-License: GNU General Public License (GPL) v2, Open Font License v1.1, free (BSD-like) license
+License: GNU General Public License (GPL) v2, Creative Commons Attribution ShareAlike 3.0, Public Domain
Group: Amusements/Teaching/Language
-Version: @VERSION@
Release: 1
Vendor: openSUSE-Education
@@ -29,12 +30,13 @@
#BuildRequires: SDL_ttf-devel > 2.0.8
BuildRequires: SDL-devel
BuildRequires: SDL_mixer-devel
+#BuildRequires: SDL_net-devel
BuildRequires: SDL_Pango-devel
-BuildRequires: librsvg2-devel
+#BuildRequires: librsvg2-devel
BuildRequires: ImageMagick
%if 0%{?suse_version}
-BuildRequires: update-desktop-files
+BuildRequires: update-desktop-files
BuildRequires: fdupes
%endif
@@ -51,8 +53,8 @@
BuildRequires: pulseaudio-esound-compat
%endif
+BuildRoot: %{_tmppath}/%{progname}-%{version}-build
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Tux Typing is an educational typing tutor game starring Tux, the Linux
@@ -67,15 +69,19 @@
Current maintainer and programming lead:
David Bruce <davidstuartbruce at gmail.com>
+ Holger Levsen <holger at debian.org>
Jesse Andrews <jdandr2 at uky.edu>
Calvin Arndt <calarndt at tux4kids.org>
- Sam Hart <hart at geekcomix.com> --- Sam started it all with TuxType 1!!!
+ Sam Hart <hart at geekcomix.com>
Jacob Greig <bombastic at firstlinux.net>
Sreyas Kurumanghat <k.sreyas at gmail.com>
Sreerenj Balachandran <bsreerenj at gmail.com>
Vimal Ravi <vimal_ravi at rediff.com>
Prince K. Antony <prince.kantony at gmail.com>
Mobin Mohan <mobinmohan at gmail.com>
+ Matthew Trey <tux4kids at treyhome.com>
+ Sarah Frisk <ssfrisk at gmail.com>
+ Caroline Ford <secretlondon at googlemail.com>
# prep section: ---------------------------------------------------------
@@ -93,10 +99,9 @@
%build
%configure --disable-rpath \
--prefix=%_prefix \
- --localstatedir=%_localstatedir \
+ --localstatedir=%_localstatedir/lib \
--sysconfdir=%_sysconfdir \
--without-rsvg
-
make %{?jobs:-j %jobs}
@@ -104,7 +109,12 @@
# install section: ---------------------------------------------------------
%install
-install -d %buildroot/{%_bindir,%_datadir/pixmaps,%_datadir/applications,%_datadir/%progname,%_defaultdocdir/%progname}
+install -d %buildroot/%_bindir
+install -d %buildroot/%_datadir/pixmaps
+install -d %buildroot/%_datadir/applications
+install -d %buildroot/%_datadir/%progname
+install -d %buildroot/%_defaultdocdir/%progname
+
make DESTDIR=%{buildroot} install
install -m 644 data/images/icons/icon.png %buildroot%_datadir/pixmaps/%progname.png
@@ -154,9 +164,9 @@
%_datadir/pixmaps/*
%_datadir/applications/*
%_datadir/%progname
-%attr(766, root, root) %_localstatedir/%progname
-%attr(766, root, root) %_localstatedir/%progname/words
-%attr(766, root, root) %_sysconfdir/%progname
+%attr(755, root, root) %_localstatedir/lib/%progname
+%attr(755, root, root) %_localstatedir/lib/%progname/words
+%attr(755, root, root) %_sysconfdir/%progname
%changelog
Modified: tuxtype/trunk/tuxtype_preview.spec.in
===================================================================
--- tuxtype/trunk/tuxtype_preview.spec.in 2009-11-19 23:45:43 UTC (rev 1662)
+++ tuxtype/trunk/tuxtype_preview.spec.in 2009-11-20 02:30:34 UTC (rev 1663)
@@ -1,5 +1,5 @@
-## tuxtype_preview.spec.in - process with configure to substitute in PACKAGE
-## VERSION strings
+## tuxtype_preview.spec.in - process with configure to fill in current
+## PACKAGE and VERSION strings
#
#
# spec file for package tuxtype_preview
@@ -16,15 +16,15 @@
# norootforbuild
Name: @PACKAGE at _preview
-Obsoletes: tuxtype <= @VERSION@
-Provides: tuxtype = @VERSION@
+Obsoletes: tuxtype <= @VERSION@
+Provides: tuxtype = @VERSION@
+%define realname @PACKAGE@
+%define progname @PACKAGE@
+
Summary: Typing tutor for children
Url: http://alioth.debian.org/projects/tux4kids/
-%define realname @PACKAGE@
-%define progname @PACKAGE@
-License: GNU General Public License (GPL) v2, Open Font License v1.1, free (BSD-like) license
+License: GNU General Public License (GPL) v2, Creative Commons Attribution ShareAlike 3.0, Public Domain
Group: Amusements/Teaching/Language
-Version: @VERSION@
Release: 1
Vendor: openSUSE-Education
@@ -36,7 +36,7 @@
BuildRequires: SDL_mixer-devel
#BuildRequires: SDL_net-devel
BuildRequires: SDL_Pango-devel
-BuildRequires: librsvg2-devel
+#BuildRequires: librsvg2-devel
BuildRequires: ImageMagick
%if 0%{?suse_version}
@@ -73,15 +73,19 @@
Current maintainer and programming lead:
David Bruce <davidstuartbruce at gmail.com>
+ Holger Levsen <holger at debian.org>
Jesse Andrews <jdandr2 at uky.edu>
Calvin Arndt <calarndt at tux4kids.org>
- Sam Hart <hart at geekcomix.com> --- Sam started it all with TuxType 1!!!
+ Sam Hart <hart at geekcomix.com>
Jacob Greig <bombastic at firstlinux.net>
Sreyas Kurumanghat <k.sreyas at gmail.com>
Sreerenj Balachandran <bsreerenj at gmail.com>
Vimal Ravi <vimal_ravi at rediff.com>
Prince K. Antony <prince.kantony at gmail.com>
Mobin Mohan <mobinmohan at gmail.com>
+ Matthew Trey <tux4kids at treyhome.com>
+ Sarah Frisk <ssfrisk at gmail.com>
+ Caroline Ford <secretlondon at googlemail.com>
# prep section: ---------------------------------------------------------
@@ -99,7 +103,7 @@
%build
%configure --disable-rpath \
--prefix=%_prefix \
- --localstatedir=%_localstatedir \
+ --localstatedir=%_localstatedir/lib \
--sysconfdir=%_sysconfdir \
--without-rsvg
make %{?jobs:-j %jobs}
@@ -164,9 +168,9 @@
%_datadir/pixmaps/*
%_datadir/applications/*
%_datadir/%progname
-%attr(766, root, root) %_localstatedir/%progname
-%attr(766, root, root) %_localstatedir/%progname/words
-%attr(766, root, root) %_sysconfdir/%progname
+%attr(755, root, root) %_localstatedir/lib/%progname
+%attr(755, root, root) %_localstatedir/lib/%progname/words
+%attr(755, root, root) %_sysconfdir/%progname
%changelog
More information about the Tux4kids-commits
mailing list