packages: armagetronad/armagetronad.spec - comment out many things to fine ...

[lisu]

Author: lisu                         Date: Mon Jan  3 19:38:01 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- comment out many things to fine the good way for build workaround
- fix build with libpng >= 2:1.4.0
- BR: libjpeg-devel
- disable server for now
- proper configure options (nfy)
- start fixing %%files
- NFY

---- Files affected:
packages/armagetronad:
   armagetronad.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/armagetronad/armagetronad.spec
diff -u packages/armagetronad/armagetronad.spec:1.4 packages/armagetronad/armagetronad.spec:1.5
--- packages/armagetronad/armagetronad.spec:1.4	Sat Jan  1 21:24:51 2011
+++ packages/armagetronad/armagetronad.spec	Mon Jan  3 20:37:56 2011
@@ -18,17 +18,13 @@
 BuildRequires:	OpenGL-devel
 BuildRequires:	SDL_image-devel
 BuildRequires:	SDL_mixer-devel
+BuildRequires:	libjpeg-devel
 BuildRequires:	libxml2-devel
+BuildRequires:	libpng-devel >= 2:1.4.0
 BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# it installs data in %{_prefix}/games, so...
-%define		_bindir			/usr/bin
-%define		_prefix			/usr/%{_lib}
-#define		_sysconfdir		/etc/%{name}
-%define		_sysconfdir_server 	/etc/%{name}-server
-
 %description
 In Armagetron, you ride a lightcycle around the game grid. You can
 only make sharp turns of 90 degrees and a wall constantly builds up
@@ -74,16 +70,25 @@
 %prep
 %setup -q -a3
 
+# fix build with libpng >= 2:1.4.0
+%{__sed} -i 's/png_check_sig/png_sig_cmp/' configure.ac
 #sed -i -e 's@/usr/lib@/usr/%{_lib}@;s at X11R6/lib@%{_lib}@' configure.in
 
 %build
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-	--disable-glout \
-	--enable-games \
-	--enable-main \
-	--enable-master \
-	--enable-music \
-	--disable-initscripts
+	--disable-sysinstall \
+	--disable-uninstall
+#	--disable-glout \
+#	--enable-games \
+#	--enable-main \
+#	--enable-master \
+#	--enable-music \
+#	--disable-initscripts \
+#	--disable-useradd
 
 %{__make}
 
@@ -110,11 +115,41 @@
 
 %files
 %defattr(644,root,root,755)
-#%doc CHANGELOG doc/*.html doc/net
-#%dir %{_sysconfdir}
+%doc AUTHORS ChangeLog NEWS src/doc/{*.html,net}
+%dir %{_sysconfdir}/games
+%dir %{_sysconfdir}/games/%{name}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/games/%{name}/*.cfg
 #%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.cfg
 #%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.srv
-#%attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_bindir}/%{name}
+%dir %{_prefix}/share
+%dir %{_prefix}/share/games
+%dir %{_prefix}/share/games/armagetronad
+%dir %{_prefix}/share/games/armagetronad/language
+%{_prefix}/share/games/armagetronad/language/*.txt
+%dir %{_prefix}/share/games/armagetronad/models
+%{_prefix}/share/games/armagetronad/models/*.mod
+%dir %{_prefix}/share/games/armagetronad/resource
+%dir %{_prefix}/share/games/armagetronad/resource/included
+%{_prefix}/share/games/armagetronad/resource/included/*.dtd
+%dir %{_prefix}/share/games/armagetronad/resource/included/AATeam
+%{_prefix}/share/games/armagetronad/resource/included/AATeam/*.dtd
+%dir %{_prefix}/share/games/armagetronad/resource/included/Anonymous
+%dir %{_prefix}/share/games/armagetronad/resource/included/Anonymous/polygon
+%dir %{_prefix}/share/games/armagetronad/resource/included/Anonymous/polygon/regular
+%{_prefix}/share/games/armagetronad/resource/included/Anonymous/polygon/regular/*.xml
+%dir %{_prefix}/share/games/armagetronad/resource/included/Your_mom
+%dir %{_prefix}/share/games/armagetronad/resource/included/Your_mom/clever
+%{_prefix}/share/games/armagetronad/resource/included/Your_mom/clever/*.xml
+%dir %{_prefix}/share/games/armagetronad/resource/included/Z-Man
+%dir %{_prefix}/share/games/armagetronad/resource/included/Z-Man/fortress
+%{_prefix}/share/games/armagetronad/resource/included/Z-Man/fortress/*.xml
+%dir %{_prefix}/share/games/armagetronad/sound
+%{_prefix}/share/games/armagetronad/sound/*.wav
+%dir %{_prefix}/share/games/armagetronad/textures
+%{_prefix}/share/games/armagetronad/textures/*.jpg
+%{_prefix}/share/games/armagetronad/textures/*.png
+%if 0
 #%attr(755,root,root) %{_bindir}/%{name}-stat
 #%dir %{_prefix}/games/%{name}
 #%{_prefix}/games/%{name}/arenas
@@ -129,14 +164,16 @@
 #%{_prefix}/games/%{name}/textures
 #%{_desktopdir}/*.desktop
 #%{_pixmapsdir}/*
+%endif
 
 %files moviepack
 %defattr(644,root,root,755)
-%doc moviepack/art_read_me.txt
-%{_prefix}/games/%{name}/moviepack
+#%%doc moviepack/art_read_me.txt
+#%%{_prefix}/games/%{name}/moviepack
 
 %files server
 %defattr(644,root,root,755)
+%if 0
 %attr(755,root,root) %{_bindir}/armagetronad-dedicated
 %dir %{_prefix}/games/armagetronad-dedicated
 %{_datadir}/games/armagetronad-dedicated/bin
@@ -146,6 +183,7 @@
 %dir %{_sysconfdir_server}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir_server}/*.cfg
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir_server}/*.srv
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -153,6 +191,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/01/03 19:37:56  lisu
+- comment out many things to fine the good way for build workaround
+- fix build with libpng >= 2:1.4.0
+- BR: libjpeg-devel
+- disable server for now
+- proper configure options (nfy)
+- start fixing %%files
+- NFY
+
 Revision 1.4  2011/01/01 20:24:51  lisu
 - auto generated Makefile break install. drop autotools
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/armagetronad/armagetronad.spec?r1=1.4&r2=1.5&f=u