SPECS: quake2.spec - server.cfg moved to quake2 user homedir

[glen]

Author: glen                         Date: Sat Feb 24 15:03:34 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- server.cfg moved to quake2 user homedir

---- Files affected:
SPECS:
   quake2.spec (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: SPECS/quake2.spec
diff -u SPECS/quake2.spec:1.64 SPECS/quake2.spec:1.65
--- SPECS/quake2.spec:1.64	Sat Feb 24 15:33:54 2007
+++ SPECS/quake2.spec	Sat Feb 24 16:03:29 2007
@@ -6,7 +6,7 @@
 Summary(pt_BR.UTF-8):	Quake2 para Linux
 Name:		quake2
 Version:	0.3
-Release:	3.2
+Release:	3.3
 Epoch:		1
 License:	GPL (for code only)
 Group:		X11/Applications/Games
@@ -38,6 +38,7 @@
 
 %define		_gamelibdir	%{_libdir}/games/%{name}
 %define		_gamedatadir	%{_datadir}/games/%{name}
+%define		_gamehomedir	/var/games/%{name}
 
 %description
 Quake2 for linux!
@@ -62,6 +63,7 @@
 Requires(pre):	/usr/sbin/useradd
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	rc-scripts
+Requires:	screen
 Provides:	group(quake2)
 Provides:	user(quake2)
 
@@ -241,7 +243,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_gamedatadir}/baseq2,/etc/rc.d/init.d} \
+install -d $RPM_BUILD_ROOT{{%{_gamedatadir},%{_gamehomedir}}/baseq2,/etc/rc.d/init.d} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
 
 #$RPM_BUILD_ROOT%{_gamedir}/baseq2/players/{crakhor,cyborg,female,male}
@@ -251,7 +253,7 @@
 #done
 #install baseq2/pak2.pak        $RPM_BUILD_ROOT%{_gamedir}/quake2/baseq2
 
-install %{SOURCE2} $RPM_BUILD_ROOT%{_gamedatadir}/baseq2/server.cfg
+install %{SOURCE2} $RPM_BUILD_ROOT%{_gamehomedir}/baseq2/server.cfg
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d
 install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
@@ -265,14 +267,12 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/games/quake2/{baseq2,ctf}/game.la
 rm -f $RPM_BUILD_ROOT%{_gamedatadir}/baseq2/config.cfg
 
-install -d $RPM_BUILD_ROOT/var/games/quake2
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre server
 %groupadd -P %{name}-server -g 170 quake2
-%useradd -P %{name}-server -u 170 -d /var/games/quake2 -s /bin/sh -c "Quake 2" -g quake2 quake2
+%useradd -P %{name}-server -u 170 -d %{_gamehomedir} -s /bin/sh -c "Quake 2" -g quake2 quake2
 
 %post server
 /sbin/chkconfig --add quake2-server
@@ -290,6 +290,12 @@
 	%groupremove quake2
 fi
 
+%triggerpostun server -- %{name}-server < 1:0.3-3.3
+if [ -f %{_gamedatadir}/baseq2/server.cfg.rpmsave ]; then
+	mv -f %{_gamehomedir}/baseq2/server.cfg{,.rpmnew}
+	mv -f %{_gamedatadir}/baseq2/server.cfg.rpmsave %{_gamehomedir}/baseq2/server.cfg
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS HACKING README TODO _doc/*
@@ -309,8 +315,9 @@
 %files server
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/quake2-server
-%config(noreplace) %verify(not md5 mtime size) %{_gamedatadir}/baseq2/server.cfg
-%attr(770,root,quake2) /var/games/quake2
+%dir %attr(770,root,quake2) %{_gamehomedir}
+%dir %attr(770,root,quake2) %{_gamehomedir}/baseq2
+%config(noreplace) %verify(not md5 mtime size) %{_gamehomedir}/baseq2/server.cfg
 
 %files 3dfx
 %defattr(644,root,root,755)
@@ -359,6 +366,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2007/02/24 15:03:29  glen
+- server.cfg moved to quake2 user homedir
+
 Revision 1.64  2007/02/24 14:33:54  glen
 - drop -static
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/quake2.spec?r1=1.64&r2=1.65&f=u