rpms/csmash/devel csmash-0.6.6-datadir.patch, NONE, 1.1 csmash-64x64.png, NONE, 1.1 csmash.desktop, NONE, 1.1 csmash.spec, 1.15, 1.16
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Wed Jun 20 10:55:36 UTC 2007
Author: thias
Update of /cvs/extras/rpms/csmash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2132
Modified Files:
csmash.spec
Added Files:
csmash-0.6.6-datadir.patch csmash-64x64.png csmash.desktop
Log Message:
Moderate cleanups.
csmash-0.6.6-datadir.patch:
--- NEW FILE csmash-0.6.6-datadir.patch ---
diff -Naupr csmash-0.6.6.orig/images/Makefile.am csmash-0.6.6/images/Makefile.am
--- csmash-0.6.6.orig/images/Makefile.am 2003-08-02 18:45:57.000000000 +0200
+++ csmash-0.6.6/images/Makefile.am 2007-06-20 12:40:01.000000000 +0200
@@ -1,4 +1,4 @@
-pkgdatadir = $(datadir)/games/@PACKAGE@/images
+pkgdatadir = $(datadir)/@PACKAGE@/images
pkgdata_ppm = Bad.ppm Keyboard.ppm Nice.ppm Title.ppm \
eight.ppm five.ppm four.ppm nine.ppm one.ppm seven.ppm \
diff -Naupr csmash-0.6.6.orig/images/Makefile.in csmash-0.6.6/images/Makefile.in
--- csmash-0.6.6.orig/images/Makefile.in 2003-08-16 07:55:01.000000000 +0200
+++ csmash-0.6.6/images/Makefile.in 2007-06-20 12:40:06.000000000 +0200
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
-pkgdatadir = $(datadir)/games/@PACKAGE@/images
+pkgdatadir = $(datadir)/@PACKAGE@/images
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
diff -Naupr csmash-0.6.6.orig/Makefile.am csmash-0.6.6/Makefile.am
--- csmash-0.6.6.orig/Makefile.am 2003-01-10 16:02:49.000000000 +0100
+++ csmash-0.6.6/Makefile.am 2007-06-20 12:39:19.000000000 +0200
@@ -1,4 +1,4 @@
-pkgdatadir = $(datadir)/games/@PACKAGE@
+pkgdatadir = $(datadir)/@PACKAGE@
localedir = $(prefix)/share/locale
bin_PROGRAMS = csmash
diff -Naupr csmash-0.6.6.orig/Makefile.in csmash-0.6.6/Makefile.in
--- csmash-0.6.6.orig/Makefile.in 2003-08-16 07:54:30.000000000 +0200
+++ csmash-0.6.6/Makefile.in 2007-06-20 12:39:25.000000000 +0200
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
-pkgdatadir = $(datadir)/games/@PACKAGE@
+pkgdatadir = $(datadir)/@PACKAGE@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
diff -Naupr csmash-0.6.6.orig/Parts/Bcut/Makefile.am csmash-0.6.6/Parts/Bcut/Makefile.am
--- csmash-0.6.6.orig/Parts/Bcut/Makefile.am 2003-08-02 18:08:39.000000000 +0200
+++ csmash-0.6.6/Parts/Bcut/Makefile.am 2007-06-20 12:46:20.000000000 +0200
@@ -1,4 +1,4 @@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Bcut
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Bcut
pkgdata_src = Bcut-Lankle.affine Bcut-Lankle01.dat \
Bcut-Larm.affine Bcut-Larm01.dat \
diff -Naupr csmash-0.6.6.orig/Parts/Bcut/Makefile.in csmash-0.6.6/Parts/Bcut/Makefile.in
--- csmash-0.6.6.orig/Parts/Bcut/Makefile.in 2003-08-16 07:54:53.000000000 +0200
+++ csmash-0.6.6/Parts/Bcut/Makefile.in 2007-06-20 12:47:23.000000000 +0200
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Bcut
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Bcut
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
diff -Naupr csmash-0.6.6.orig/Parts/Bnormal/Makefile.am csmash-0.6.6/Parts/Bnormal/Makefile.am
--- csmash-0.6.6.orig/Parts/Bnormal/Makefile.am 2003-08-02 18:09:01.000000000 +0200
+++ csmash-0.6.6/Parts/Bnormal/Makefile.am 2007-06-20 12:46:43.000000000 +0200
@@ -1,4 +1,4 @@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Bnormal
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Bnormal
pkgdata_src = Bnormal-Lankle.affine Bnormal-Lankle01.dat \
Bnormal-Larm.affine Bnormal-Larm01.dat \
diff -Naupr csmash-0.6.6.orig/Parts/Bnormal/Makefile.in csmash-0.6.6/Parts/Bnormal/Makefile.in
--- csmash-0.6.6.orig/Parts/Bnormal/Makefile.in 2003-08-16 07:54:54.000000000 +0200
+++ csmash-0.6.6/Parts/Bnormal/Makefile.in 2007-06-20 12:47:26.000000000 +0200
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Bnormal
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Bnormal
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
diff -Naupr csmash-0.6.6.orig/Parts/Bpeck/Makefile.am csmash-0.6.6/Parts/Bpeck/Makefile.am
--- csmash-0.6.6.orig/Parts/Bpeck/Makefile.am 2003-08-02 18:09:13.000000000 +0200
+++ csmash-0.6.6/Parts/Bpeck/Makefile.am 2007-06-20 12:46:48.000000000 +0200
@@ -1,4 +1,4 @@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Bpeck
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Bpeck
pkgdata_src = Bpeck-Larm.affine Bpeck-Larm01.dat \
Bpeck-Lelbow.affine Bpeck-Lelbow01.dat \
diff -Naupr csmash-0.6.6.orig/Parts/Bpeck/Makefile.in csmash-0.6.6/Parts/Bpeck/Makefile.in
--- csmash-0.6.6.orig/Parts/Bpeck/Makefile.in 2003-08-16 07:54:55.000000000 +0200
+++ csmash-0.6.6/Parts/Bpeck/Makefile.in 2007-06-20 12:47:30.000000000 +0200
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Bpeck
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Bpeck
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
diff -Naupr csmash-0.6.6.orig/Parts/Fcut/Makefile.am csmash-0.6.6/Parts/Fcut/Makefile.am
--- csmash-0.6.6.orig/Parts/Fcut/Makefile.am 2003-08-02 18:10:00.000000000 +0200
+++ csmash-0.6.6/Parts/Fcut/Makefile.am 2007-06-20 12:46:51.000000000 +0200
@@ -1,4 +1,4 @@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Fcut
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Fcut
pkgdata_src = Fcut-Lankle.affine Fcut-Lankle01.dat \
Fcut-Larm.affine Fcut-Larm01.dat \
diff -Naupr csmash-0.6.6.orig/Parts/Fcut/Makefile.in csmash-0.6.6/Parts/Fcut/Makefile.in
--- csmash-0.6.6.orig/Parts/Fcut/Makefile.in 2003-08-16 07:54:56.000000000 +0200
+++ csmash-0.6.6/Parts/Fcut/Makefile.in 2007-06-20 12:47:33.000000000 +0200
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Fcut
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Fcut
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
diff -Naupr csmash-0.6.6.orig/Parts/Fdrive/Makefile.am csmash-0.6.6/Parts/Fdrive/Makefile.am
--- csmash-0.6.6.orig/Parts/Fdrive/Makefile.am 2003-08-02 18:10:08.000000000 +0200
+++ csmash-0.6.6/Parts/Fdrive/Makefile.am 2007-06-20 12:46:55.000000000 +0200
@@ -1,4 +1,4 @@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Fdrive
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Fdrive
pkgdata_src = Fdrive-Lankle.affine Fdrive-Lankle01.dat \
Fdrive-Larm.affine Fdrive-Larm01.dat \
diff -Naupr csmash-0.6.6.orig/Parts/Fdrive/Makefile.in csmash-0.6.6/Parts/Fdrive/Makefile.in
--- csmash-0.6.6.orig/Parts/Fdrive/Makefile.in 2003-08-16 07:54:57.000000000 +0200
+++ csmash-0.6.6/Parts/Fdrive/Makefile.in 2007-06-20 12:47:36.000000000 +0200
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Fdrive
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Fdrive
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
diff -Naupr csmash-0.6.6.orig/Parts/Fnormal/Makefile.am csmash-0.6.6/Parts/Fnormal/Makefile.am
--- csmash-0.6.6.orig/Parts/Fnormal/Makefile.am 2003-08-02 18:10:19.000000000 +0200
+++ csmash-0.6.6/Parts/Fnormal/Makefile.am 2007-06-20 12:47:01.000000000 +0200
@@ -1,4 +1,4 @@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Fnormal
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Fnormal
pkgdata_src = Fnormal-Lankle.affine Fnormal-Lankle01.dat \
Fnormal-Larm.affine Fnormal-Larm01.dat \
diff -Naupr csmash-0.6.6.orig/Parts/Fnormal/Makefile.in csmash-0.6.6/Parts/Fnormal/Makefile.in
--- csmash-0.6.6.orig/Parts/Fnormal/Makefile.in 2003-08-16 07:54:58.000000000 +0200
+++ csmash-0.6.6/Parts/Fnormal/Makefile.in 2007-06-20 12:47:39.000000000 +0200
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Fnormal
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Fnormal
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
diff -Naupr csmash-0.6.6.orig/Parts/Fpeck/Makefile.am csmash-0.6.6/Parts/Fpeck/Makefile.am
--- csmash-0.6.6.orig/Parts/Fpeck/Makefile.am 2003-08-02 18:10:31.000000000 +0200
+++ csmash-0.6.6/Parts/Fpeck/Makefile.am 2007-06-20 12:47:06.000000000 +0200
@@ -1,4 +1,4 @@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Fpeck
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Fpeck
pkgdata_src = Fpeck-Lankle.affine Fpeck-Lankle01.dat \
Fpeck-Larm.affine Fpeck-Larm01.dat \
diff -Naupr csmash-0.6.6.orig/Parts/Fpeck/Makefile.in csmash-0.6.6/Parts/Fpeck/Makefile.in
--- csmash-0.6.6.orig/Parts/Fpeck/Makefile.in 2003-08-16 07:54:59.000000000 +0200
+++ csmash-0.6.6/Parts/Fpeck/Makefile.in 2007-06-20 12:47:42.000000000 +0200
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Fpeck
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Fpeck
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
diff -Naupr csmash-0.6.6.orig/Parts/Fsmash/Makefile.am csmash-0.6.6/Parts/Fsmash/Makefile.am
--- csmash-0.6.6.orig/Parts/Fsmash/Makefile.am 2003-08-02 18:10:38.000000000 +0200
+++ csmash-0.6.6/Parts/Fsmash/Makefile.am 2007-06-20 12:47:15.000000000 +0200
@@ -1,4 +1,4 @@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Fsmash
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Fsmash
pkgdata_src = Fsmash-Larm.affine Fsmash-Larm01.dat \
Fsmash-Lelbow.affine Fsmash-Lelbow01.dat \
diff -Naupr csmash-0.6.6.orig/Parts/Fsmash/Makefile.in csmash-0.6.6/Parts/Fsmash/Makefile.in
--- csmash-0.6.6.orig/Parts/Fsmash/Makefile.in 2003-08-16 07:55:00.000000000 +0200
+++ csmash-0.6.6/Parts/Fsmash/Makefile.in 2007-06-20 12:47:48.000000000 +0200
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
-pkgdatadir = $(datadir)/games/@PACKAGE@/Parts/Fsmash
+pkgdatadir = $(datadir)/@PACKAGE@/Parts/Fsmash
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
diff -Naupr csmash-0.6.6.orig/wav/Makefile.am csmash-0.6.6/wav/Makefile.am
--- csmash-0.6.6.orig/wav/Makefile.am 2002-01-21 18:31:27.000000000 +0100
+++ csmash-0.6.6/wav/Makefile.am 2007-06-20 12:40:13.000000000 +0200
@@ -1,3 +1,3 @@
-pkgdatadir = $(datadir)/games/@PACKAGE@/wav
+pkgdatadir = $(datadir)/@PACKAGE@/wav
pkgdata_DATA = $(wildcard *.wav)
EXTRA_DIST = $(pkgdata_DATA)
diff -Naupr csmash-0.6.6.orig/wav/Makefile.in csmash-0.6.6/wav/Makefile.in
--- csmash-0.6.6.orig/wav/Makefile.in 2003-08-16 07:55:02.000000000 +0200
+++ csmash-0.6.6/wav/Makefile.in 2007-06-20 12:40:24.000000000 +0200
@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
-pkgdatadir = $(datadir)/games/@PACKAGE@/wav
+pkgdatadir = $(datadir)/@PACKAGE@/wav
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
--- NEW FILE csmash.desktop ---
[Desktop Entry]
Name=Cannon Smash
Comment=3D tabletennis game
Exec=csmash
Icon=csmash
Terminal=false
Type=Application
Categories=Game;
Encoding=UTF-8
Index: csmash.spec
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- csmash.spec 6 Feb 2007 09:50:15 -0000 1.15
+++ csmash.spec 20 Jun 2007 10:55:01 -0000 1.16
@@ -1,24 +1,25 @@
Summary: 3D tabletennis game
Name: csmash
Version: 0.6.6
-Release: 14%{?dist}
+Release: 15%{?dist}
License: GPL
Group: Amusements/Games
URL: http://cannonsmash.sourceforge.net/
-Source: http://dl.sf.net/cannonsmash/csmash-%{version}.tar.gz
+Source0: http://dl.sf.net/cannonsmash/csmash-%{version}.tar.gz
+Source1: csmash-64x64.png
+Source2: csmash.desktop
Patch0: csmash-0.6.6-64bit-gcc4-fixes.patch
Patch1: csmash-0.6.6-extraqualif.patch
Patch2: csmash-0.6.6-configure.patch
+Patch3: csmash-0.6.6-datadir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gtk2-devel, libjpeg-devel, zlib-devel
+BuildRequires: gtk2-devel, libjpeg-devel, zlib-devel, gettext
BuildRequires: SDL-devel >= 1.2.0, SDL_mixer-devel, SDL_image-devel
BuildRequires: desktop-file-utils
-# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
-%if %{!?fedora:6}%{?fedora} >= 5
-BuildRequires: libX11-devel, libGL-devel, libGLU-devel
-%else
-BuildRequires: xorg-x11-devel, Mesa-devel
-%endif
+BuildRequires: libXmu-devel, libXt-devel, libICE-devel, libX11-devel
+BuildRequires: libGL-devel, libGLU-devel
+# Required for autoreconf
+BuildRequires: autoconf, automake, gettext-devel
%description
CannonSmash is a 3D tabletennis game. The goal of this project is to
@@ -28,13 +29,12 @@
%prep
-%setup
+%setup -q
%patch0 -p1 -b .64bit-gcc4
%patch1 -p1 -b .extraqualif
-# Hack to not have to re-run autotools
-touch -r configure.in configure.in.stamp
%patch2 -p1 -b .configure
-touch -r configure.in.stamp configure.in
+%patch3 -p1 -b .datadir
+autoreconf --force --install -Im4
%build
@@ -44,42 +44,52 @@
%install
%{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
%find_lang %{name}
+# Install the menu entry icon
+%{__install} -D -p -m 0644 %{SOURCE1} \
+ %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/csmash.png
-# Create the system menu entry
-%{__cat} > %{name}.desktop << EOF
-[Desktop Entry]
-Name=Cannon Smash
-Comment=3D tabletennis game
-Exec=csmash
-Icon=%{_datadir}/games/%{name}/images/PenAttack.jpg
-Terminal=false
-Type=Application
-Categories=Application;Game;
-Encoding=UTF-8
-EOF
-
+# Now the menu entry
%{__mkdir_p} %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install \
+ --vendor "" \
--dir %{buildroot}%{_datadir}/applications \
- %{name}.desktop
+ %{SOURCE2}
%clean
%{__rm} -rf %{buildroot}
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+
%files -f %{name}.lang
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
%doc AUTHORS COPYING CREDITS ChangeLog README README.en
-%{_bindir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/games/%{name}
+%{_bindir}/csmash
+%{_datadir}/applications/csmash.desktop
+%{_datadir}/icons/hicolor/64x64/apps/csmash.png
+%{_datadir}/csmash/
%changelog
+* Wed Jun 20 2007 Matthias Saou <http://freshrpms.net/> 0.6.6-15
+- Switch to use DESTDIR install method.
+- Run autoreconf since gcc gets passed "NONE" otherwise and configure fails.
+- Add all searched libX* build requirements.
+- Include a home made table tennis racket icon, in hicolor with scriplets.
+- Split out the desktop file as its own source.
+- Include patch to move data from datadir/games/ to datadir/.
+
* Tue Feb 6 2007 Matthias Saou <http://freshrpms.net/> 0.6.6-14
- Fix to use CFLAGS and don't re-run autotools (#227379, Ville Skyttä).
More information about the fedora-extras-commits
mailing list