Accepting request 52446 from games

Accepted submit request 52446 from user prusnak OBS-URL: https://build.opensuse.org/request/show/52446 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/csmash?expand=0&rev=12
2010-11-10 20:00:53 +00:00 · 2010-11-10 20:00:53 +00:00 · 7fb8bd93c5
commit 7fb8bd93c5
parent fd9fc3f3e7
9 changed files with 179 additions and 121 deletions
--- a/csmash-0.6.6-datadir.diff
+++ b/csmash-0.6.6-datadir.diff
@ -1,14 +1,18 @@
--- csmash-0.6.6/Makefile.am
-+++ csmash-0.6.6/Makefile.am
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
+++ Makefile.am
@@ -1,4 +1,4 @@
 -pkgdatadir = $(datadir)/games/@PACKAGE@
 +pkgdatadir = $(datadir)/@PACKAGE@
 localedir = $(prefix)/share/locale
 
 bin_PROGRAMS = csmash
--- csmash-0.6.6/Makefile.in
-+++ csmash-0.6.6/Makefile.in
-@@ -35,7 +35,7 @@
+Index: Makefile.in
+===================================================================
+--- Makefile.in.orig
+++ Makefile.in
+@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
@ -17,17 +21,21 @@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
--- csmash-0.6.6/Parts/Bcut/Makefile.am
-+++ csmash-0.6.6/Parts/Bcut/Makefile.am
+Index: Parts/Bcut/Makefile.am
+===================================================================
+--- Parts/Bcut/Makefile.am.orig
+++ Parts/Bcut/Makefile.am
@@ -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 \
--- csmash-0.6.6/Parts/Bcut/Makefile.in
-+++ csmash-0.6.6/Parts/Bcut/Makefile.in
-@@ -35,7 +35,7 @@
+Index: Parts/Bcut/Makefile.in
+===================================================================
+--- Parts/Bcut/Makefile.in.orig
+++ Parts/Bcut/Makefile.in
+@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
@ -36,17 +44,21 @@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
--- csmash-0.6.6/Parts/Bnormal/Makefile.am
-+++ csmash-0.6.6/Parts/Bnormal/Makefile.am
+Index: Parts/Bnormal/Makefile.am
+===================================================================
+--- Parts/Bnormal/Makefile.am.orig
+++ Parts/Bnormal/Makefile.am
@@ -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 \
--- csmash-0.6.6/Parts/Bnormal/Makefile.in
-+++ csmash-0.6.6/Parts/Bnormal/Makefile.in
-@@ -35,7 +35,7 @@
+Index: Parts/Bnormal/Makefile.in
+===================================================================
+--- Parts/Bnormal/Makefile.in.orig
+++ Parts/Bnormal/Makefile.in
+@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
@ -55,17 +67,21 @@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
--- csmash-0.6.6/Parts/Bpeck/Makefile.am
-+++ csmash-0.6.6/Parts/Bpeck/Makefile.am
+Index: Parts/Bpeck/Makefile.am
+===================================================================
+--- Parts/Bpeck/Makefile.am.orig
+++ Parts/Bpeck/Makefile.am
@@ -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 \
--- csmash-0.6.6/Parts/Bpeck/Makefile.in
-+++ csmash-0.6.6/Parts/Bpeck/Makefile.in
-@@ -35,7 +35,7 @@
+Index: Parts/Bpeck/Makefile.in
+===================================================================
+--- Parts/Bpeck/Makefile.in.orig
+++ Parts/Bpeck/Makefile.in
+@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
@ -74,17 +90,21 @@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
--- csmash-0.6.6/Parts/Fcut/Makefile.am
-+++ csmash-0.6.6/Parts/Fcut/Makefile.am
+Index: Parts/Fcut/Makefile.am
+===================================================================
+--- Parts/Fcut/Makefile.am.orig
+++ Parts/Fcut/Makefile.am
@@ -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 \
--- csmash-0.6.6/Parts/Fcut/Makefile.in
-+++ csmash-0.6.6/Parts/Fcut/Makefile.in
-@@ -35,7 +35,7 @@
+Index: Parts/Fcut/Makefile.in
+===================================================================
+--- Parts/Fcut/Makefile.in.orig
+++ Parts/Fcut/Makefile.in
+@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
@ -93,17 +113,21 @@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
--- csmash-0.6.6/Parts/Fdrive/Makefile.am
-+++ csmash-0.6.6/Parts/Fdrive/Makefile.am
+Index: Parts/Fdrive/Makefile.am
+===================================================================
+--- Parts/Fdrive/Makefile.am.orig
+++ Parts/Fdrive/Makefile.am
@@ -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 \
--- csmash-0.6.6/Parts/Fdrive/Makefile.in
-+++ csmash-0.6.6/Parts/Fdrive/Makefile.in
-@@ -35,7 +35,7 @@
+Index: Parts/Fdrive/Makefile.in
+===================================================================
+--- Parts/Fdrive/Makefile.in.orig
+++ Parts/Fdrive/Makefile.in
+@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
@ -112,17 +136,21 @@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
--- csmash-0.6.6/Parts/Fnormal/Makefile.am
-+++ csmash-0.6.6/Parts/Fnormal/Makefile.am
+Index: Parts/Fnormal/Makefile.am
+===================================================================
+--- Parts/Fnormal/Makefile.am.orig
+++ Parts/Fnormal/Makefile.am
@@ -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 \
--- csmash-0.6.6/Parts/Fnormal/Makefile.in
-+++ csmash-0.6.6/Parts/Fnormal/Makefile.in
-@@ -35,7 +35,7 @@
+Index: Parts/Fnormal/Makefile.in
+===================================================================
+--- Parts/Fnormal/Makefile.in.orig
+++ Parts/Fnormal/Makefile.in
+@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
@ -131,17 +159,21 @@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
--- csmash-0.6.6/Parts/Fpeck/Makefile.am
-+++ csmash-0.6.6/Parts/Fpeck/Makefile.am
+Index: Parts/Fpeck/Makefile.am
+===================================================================
+--- Parts/Fpeck/Makefile.am.orig
+++ Parts/Fpeck/Makefile.am
@@ -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 \
--- csmash-0.6.6/Parts/Fpeck/Makefile.in
-+++ csmash-0.6.6/Parts/Fpeck/Makefile.in
-@@ -35,7 +35,7 @@
+Index: Parts/Fpeck/Makefile.in
+===================================================================
+--- Parts/Fpeck/Makefile.in.orig
+++ Parts/Fpeck/Makefile.in
+@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
@ -150,17 +182,21 @@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
--- csmash-0.6.6/Parts/Fsmash/Makefile.am
-+++ csmash-0.6.6/Parts/Fsmash/Makefile.am
+Index: Parts/Fsmash/Makefile.am
+===================================================================
+--- Parts/Fsmash/Makefile.am.orig
+++ Parts/Fsmash/Makefile.am
@@ -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 \
--- csmash-0.6.6/Parts/Fsmash/Makefile.in
-+++ csmash-0.6.6/Parts/Fsmash/Makefile.in
-@@ -35,7 +35,7 @@
+Index: Parts/Fsmash/Makefile.in
+===================================================================
+--- Parts/Fsmash/Makefile.in.orig
+++ Parts/Fsmash/Makefile.in
+@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
@ -169,17 +205,21 @@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
--- csmash-0.6.6/images/Makefile.am
-+++ csmash-0.6.6/images/Makefile.am
+Index: images/Makefile.am
+===================================================================
+--- images/Makefile.am.orig
+++ images/Makefile.am
@@ -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 \
--- csmash-0.6.6/images/Makefile.in
-+++ csmash-0.6.6/images/Makefile.in
-@@ -35,7 +35,7 @@
+Index: images/Makefile.in
+===================================================================
+--- images/Makefile.in.orig
+++ images/Makefile.in
+@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
@ -188,16 +228,20 @@
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
--- csmash-0.6.6/wav/Makefile.am
-+++ csmash-0.6.6/wav/Makefile.am
+Index: wav/Makefile.am
+===================================================================
+--- wav/Makefile.am.orig
+++ wav/Makefile.am
@@ -1,3 +1,3 @@
 -pkgdatadir = $(datadir)/games/@PACKAGE@/wav
 +pkgdatadir = $(datadir)/@PACKAGE@/wav
 pkgdata_DATA = $(wildcard *.wav)
 EXTRA_DIST = $(pkgdata_DATA)
--- csmash-0.6.6/wav/Makefile.in
-+++ csmash-0.6.6/wav/Makefile.in
-@@ -35,7 +35,7 @@
+Index: wav/Makefile.in
+===================================================================
+--- wav/Makefile.in.orig
+++ wav/Makefile.in
+@@ -35,7 +35,7 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_triplet = @host@
--- a/csmash-0.6.6-definitions.diff
+++ b/csmash-0.6.6-definitions.diff
@ -1,6 +1,8 @@
--- MultiPlay.cpp
+Index: MultiPlay.cpp
+===================================================================
+--- MultiPlay.cpp.orig
 +++ MultiPlay.cpp
-@@ -42,7 +42,9 @@
+@@ -43,7 +43,9 @@ typedef int socklen_t;		/* mimic Penguin
 
 #else	/* ! WIN32 */
 
@ -10,9 +12,11 @@
 
 #endif
 
--- Network.cpp
+Index: Network.cpp
+===================================================================
+--- Network.cpp.orig
 +++ Network.cpp
-@@ -41,7 +41,9 @@
+@@ -42,7 +42,9 @@ typedef int socklen_t;		/* mimic Penguin
 
 #else	/* ! WIN32 */
 
--- a/csmash-0.6.6-qualification.diff
+++ b/csmash-0.6.6-qualification.diff
@ -1,6 +1,8 @@
--- BallView.h
+Index: BallView.h
+===================================================================
+--- BallView.h.orig
 +++ BallView.h
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ public:
 
   static GLuint m_number[10];
 private:
--- a/csmash-0.6.6-return_value.diff
+++ b/csmash-0.6.6-return_value.diff
@ -1,6 +1,8 @@
--- Network.cpp
+Index: Network.cpp
+===================================================================
+--- Network.cpp.orig
 +++ Network.cpp
-@@ -750,6 +750,7 @@
+@@ -750,6 +750,7 @@ ConnectToServer() {
     throw NetworkError();
   }
 #endif
--- a/csmash-0.6.6-uninitialized.diff
+++ b/csmash-0.6.6-uninitialized.diff
@ -1,4 +1,6 @@
--- Event.cpp
+Index: Event.cpp
+===================================================================
+--- Event.cpp.orig
 +++ Event.cpp
@@ -16,6 +16,7 @@
 // along with this program; if not, write to the Free Software
@ -8,7 +10,7 @@
 #include "ttinc.h"
 #include "Event.h"
 #include "Control.h"
-@@ -140,6 +141,7 @@
+@@ -140,6 +141,7 @@ Event::IdleFunc() {
 #ifdef WIN32
   ftime( &tb );
 #else
--- a/csmash-0.6.6.diff
+++ b/csmash-0.6.6.diff
@ -1,6 +1,8 @@
--- loadparts.cpp
+Index: loadparts.cpp
+===================================================================
+--- loadparts.cpp.orig
 +++ loadparts.cpp
-@@ -245,7 +245,7 @@
+@@ -245,7 +245,7 @@ bool parts::loadfile(const char *str)
 
 	while ('\\' == line[l-1]) {
             // concat next line(s)
@ -9,9 +11,11 @@
 	    fgets(&line[l-2], bufsize, fp);
 	    if (feof((FILE*)fp)) break;
 	    l = strlen(line);
--- main.cpp
+Index: main.cpp
+===================================================================
+--- main.cpp.orig
 +++ main.cpp
-@@ -179,7 +179,7 @@
+@@ -179,7 +179,7 @@ int main(int argc, char** argv) {
         switch (c) {
         case 'h':
 	    // brief help
@ -20,7 +24,9 @@
 	    return 0;
 	case 's':
 	    // Server mode
--- matrix
+Index: matrix
+===================================================================
+--- matrix.orig
 +++ matrix
@@ -42,7 +42,7 @@
 
--- a/csmash.changes
+++ b/csmash.changes
@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Nov  8 17:42:22 UTC 2010 - prusnak@opensuse.org
+
+- spec cleanup
+
+-------------------------------------------------------------------
+Mon Nov  8 12:46:41 UTC 2010 - coolo@novell.com
+
+- remove support for pre-9.1
+
 -------------------------------------------------------------------
 Sat Jan  2 17:09:03 CET 2010 - vuntz@opensuse.org

--- a/csmash.desktop
+++ b/csmash.desktop
@ -2,3 +2,4 @@
 Type=Application
 Name=Cannon Smash
 Exec=csmash
+Categories=Game;SportsGame;
--- a/csmash.spec
+++ b/csmash.spec
@ -15,83 +15,70 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

-# norootforbuild
-
-
 Name:           csmash
-BuildRequires:  SDL_image-devel SDL_mixer-devel fdupes gcc-c++ gtk2-devel libdrm-devel update-desktop-files xorg-x11-devel
-License:        GPLv2+
-Group:          Amusements/Games/3D/Other
-AutoReqProv:    on
 Version:        0.6.6
 Release:        246
+License:        GPLv2+
+Summary:        3D Table Tennis Game
+Url:            http://cannonsmash.sourceforge.net/
+Group:          Amusements/Games/3D/Other
 Source:         %{name}-%{version}.tar.bz2
 Source1:        danslatristesse2-48.ogg
-Source2:        %name.desktop
-Patch:          %{name}-%{version}.diff
-Patch2:         %{name}-%{version}-datadir.diff
-Patch3:         %{name}-%{version}-return_value.diff
-Patch4:         %{name}-%{version}-qualification.diff
-Patch5:         %{name}-%{version}-definitions.diff
-Patch6:         %{name}-%{version}-uninitialized.diff
-Url:            http://cannonsmash.sourceforge.net/
+Source2:        %{name}.desktop
+Patch0:         %{name}-%{version}.diff
+Patch1:         %{name}-%{version}-datadir.diff
+Patch2:         %{name}-%{version}-return_value.diff
+Patch3:         %{name}-%{version}-qualification.diff
+Patch4:         %{name}-%{version}-definitions.diff
+Patch5:         %{name}-%{version}-uninitialized.diff
+BuildRequires:  SDL-devel
+BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_mixer-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  fdupes
+BuildRequires:  gcc-c++
+BuildRequires:  gtk2-devel
+BuildRequires:  libdrm-devel
+BuildRequires:  xorg-x11-devel
+BuildRequires:  Mesa-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary:        3D Table Tennis Game

 %description
 CannonSmash is a 3D table tennis game. The goal of this project is to
 represent various table tennis strategies in a computer game.

-
-
-Authors:
--------
-    nan@utmc.or.jp
-
 %prep
-%setup
-%patch
-%patch2 -p1
+%setup -q
+%patch0
+%patch1
+%patch2
 %patch3
 %patch4
 %patch5
-%patch6
 mv README README.jp
-cp README.en README
-%{?suse_update_config:%{suse_update_config -f}}
+mv README.en README

 %build
-gettextize -f
-aclocal -I m4
-autoreconf --force --install
-automake
-export CXXFLAGS="$RPM_OPT_FLAGS" 
-%if "%(xft-config --prefix)" == "/usr"
-./configure --prefix=%{_prefix} --datadir=%{_datadir} --bindir=%{_bindir} \
--x-includes=/usr/include --x-libraries=/usr/%_lib
-%else
-./configure --prefix=%{_prefix} --datadir=%{_datadir} --bindir=%{_bindir}
-%endif
-# it is needed to call CXXFLAGS together with make
-# it is not sufficient to export them only
-make %{?jobs:-j%jobs} CXXFLAGS="-I/usr/include -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT $RPM_OPT_FLAGS"
+%configure \
+  --x-includes=%{_includedir} \
+  --x-libraries=%{_libdir}
+make %{?_smp_mflags}

 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/csmash
-%suse_update_desktop_file -i %name Game SportsGame
-%fdupes -s  $RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} install
+cp %{SOURCE1} %{buildroot}%{_datadir}/csmash
+%fdupes %{buildroot}%{_datadir}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
 %find_lang %{name}

 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}

 %files -f %{name}.lang
 %defattr(-,root,root,755)
-%{_bindir}/csmash
-#%{_datadir}/locale/*/LC_MESSAGES/csmash.mo
-%{_datadir}/csmash
 %doc README README.jp AUTHORS COPYING CREDITS ChangeLog
-%{_datadir}/applications/%name.desktop
+%{_bindir}/csmash
+%{_datadir}/csmash/
+%{_datadir}/applications/%{name}.desktop

 %changelog