Mailinglist Archive: opensuse-commit (1318 mails)
| < Previous | Next > |
commit frisk
- From: root@xxxxxxx (h_root)
- Date: Sun, 6 Aug 2006 21:39:13 +0200 (CEST)
- Message-id: <20060806193913.7F5CE950F7@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package frisk
checked in at Sun Aug 6 21:39:13 CEST 2006.
--------
--- frisk/frisk.changes 2006-01-25 21:36:03.000000000 +0100
+++ frisk/frisk.changes 2006-08-04 12:09:41.000000000 +0200
@@ -1,0 +2,17 @@
+Thu Aug 3 17:46:50 CEST 2006 - lmichnovic@xxxxxxx
+
+- update to version 1.3rc1
+ - using GNU autoconf and automake for build configuration now
+ - Fixed: two memory leaks
+ scrollbars in the color dialog should work now
+ potential crashes in message handling system
+ the clicking X kills parent bug is fixed
+- obsoletes makefile.patch prefix.patch ia64.patch
+- fix of uninitialized variable (uninitialized.patch)
+
+-------------------------------------------------------------------
+Thu Aug 3 16:14:06 CEST 2006 - lmichnovic@xxxxxxx
+
+- builds also with new X.org 7.x, checks the prefix in X.org
+
+-------------------------------------------------------------------
Old:
----
XFrisk-1.2.tar.gz
frisk-1.2-makefile.dif
frisk-1.2-prefix.dif
frisk-ia64.dif
New:
----
frisk-1.3rc1-uninitialized.patch
xfrisk-1.3-rc1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ frisk.spec ++++++
--- /var/tmp/diff_new_pack.fhQl8i/_old 2006-08-06 21:38:03.000000000 +0200
+++ /var/tmp/diff_new_pack.fhQl8i/_new 2006-08-06 21:38:03.000000000 +0200
@@ -1,34 +1,59 @@
#
-# spec file for package frisk (Version 1.2 )
+# spec file for package frisk (Version 1.3rc1 )
#
-# Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
-# usedforbuild aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kbd less libacl libattr libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-devel pam-modules patch permissions popt ps rcs readline sed sendmail shadow strace syslogd sysvinit tar texinfo timezone unzip util-linux vim zlib zlib-devel XFree86 XFree86-devel XFree86-libs autoconf automake binutils cracklib expat fontconfig fontconfig-devel gcc gdbm gettext libtool perl rpm xaw3d
Name: frisk
BuildRequires: xaw3d xorg-x11 xorg-x11-devel
License: GPL
Group: Amusements/Games/Strategy/Other
Autoreqprov: on
-Version: 1.2
-Release: 743
+Version: 1.3rc1
+Release: 1
Summary: X Window System Risk
-Source: http://cvs.morphy.iki.fi/xfrisk/XFrisk-%{version}.tar.gz
-Patch: frisk-%{version}-makefile.dif
-Patch1: frisk-ia64.dif
-Patch2: frisk-%{version}-prefix.dif
-URL: http://cvs.morphy.iki.fi/xfrisk/
+Source: xfrisk-1.3-rc1.tar.gz
+Patch: frisk-1.3rc1-uninitialized.patch
+URL: http://tuxick.net/xfrisk/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if "%(xft-config --prefix)" == "/usr"
+%define _xorg7libs %_lib
+%define _xorg7libs32 lib
+%define _xorg7bin bin
+%define _xorg7_mandir %_mandir
+%define _xorg7pixmaps include
+%define _xorg7libshare share
+%define _xorg7_xkb /usr/share/X11/xkb
+%define _xorg7_termcap /usr/lib/X11/etc
+%define _xorg7_serverincl /usr/include/xorg
+%define _xorg7_fonts /usr/share/fonts
+#%define _xorg7_config /usr/share/X11/config #use libshare macro
+%define _xorg7_prefix /usr
+%else
+%define _xorg7libs X11R6/%_lib
+%define _xorg7libs32 X11R6/lib
+%define _xorg7bin X11R6/bin
+%define _xorg7_mandir /usr/X11R6/man
+%define _xorg7pixmaps X11R6/include
+%define _xorg7libshare X11R6/lib/
+%define _xorg7_xkb /etc/X11/xkb
+%define _xorg7_termcap /usr/X11R6/lib/X11/etc
+%define _xorg7_serverincl /usr/X11R6/lib/Server/include
+%define _xorg7_fonts /usr/X11R6/lib/X11/fonts
+#%define _xorg7_config /usr/X11R6/lib/X11/config #use libshare macro
+%define _xorg7_prefix /usr/X11R6
+%endif
%description
-Documentation: /usr/share/doc/packages/frisk, as well as extensive
-online help.
+XFrisk is a computer version of the classic Risk board game. It is a
+multiplayer game played on a TCP/IP network, uses the X11 window system
+for graphics and runs on most UNIX and UNIX-like platforms.
@@ -37,31 +62,47 @@
Elan Feingold <feingold@xxxxxxxxxxx>
%prep
-%setup -n XFrisk
+%setup -n xfrisk-1.3-rc1
%patch
-%patch1
-%patch2
%build
-make BINDIR=/usr/X11R6/bin LIBNAME=%{_lib}
+./configure \
+ --prefix=%{_prefix} \
+ --bindir=/usr/%{_xorg7bin} \
+ --libdir=%{_prefix}/%{_lib} \
+ --mandir=%{_mandir} \
+ CPPFLAGS="$RPM_OPT_FLAGS" \
+ CFLAGS="$RPM_OPT_FLAGS"
+make
%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/{X11R6/{bin/,lib/X11/app-defaults/},%{_lib}/frisk}
-install XFrisk.ad $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/XFrisk
-make install BINDIR=/usr/X11R6/bin PREFIX=%{_prefix} LIBNAME=%{_lib} DESTDIR=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/usr/{%{_xorg7bin}/,%{_xorg7libshare}/X11/app-defaults/}
+install Xfrisk.ad $RPM_BUILD_ROOT/usr/%{_xorg7libshare}/X11/app-defaults/XFrisk
+make install BINDIR=/usr/%{_xorg7bin} PREFIX=%{_prefix} LIBNAME=%{_lib} DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%doc BUGS ChangeLog FAQ README.NEW TODO
-%config /usr/X11R6/lib/X11/app-defaults/XFrisk
-/usr/X11R6/bin/*
-%{_libdir}/frisk/
+%doc BUGS ChangeLog FAQ README TODO
+%config /usr/%{_xorg7libshare}/X11/app-defaults/XFrisk
+/usr/%{_xorg7bin}/*
+%dir /usr/share/xfrisk
+/usr/share/xfrisk/*
%changelog -n frisk
+* Thu Aug 03 2006 - lmichnovic@xxxxxxx
+- update to version 1.3rc1
+- using GNU autoconf and automake for build configuration now
+- Fixed: two memory leaks
+ scrollbars in the color dialog should work now
+ potential crashes in message handling system
+ the clicking X kills parent bug is fixed
+- obsoletes makefile.patch prefix.patch ia64.patch
+- fix of uninitialized variable (uninitialized.patch)
+* Thu Aug 03 2006 - lmichnovic@xxxxxxx
+- builds also with new X.org 7.x, checks the prefix in X.org
* Wed Jan 25 2006 - mls@xxxxxxx
- converted neededforbuild to BuildRequires
* Sun Jan 11 2004 - adrian@xxxxxxx
++++++ frisk-1.3rc1-uninitialized.patch ++++++
--- aiClientMain.c
+++ aiClientMain.c
@@ -579,9 +579,9 @@
break;
case MSG_ENDOFMISSION:
- assert( iWinner >= -1 && iWinner < MAX_PLAYERS );
iWinner = pMessage->msgEndOfMission.iWinner;
+ assert( iWinner >= -1 && iWinner < MAX_PLAYERS );
if ( RISK_GetClientOfPlayer( iWinner ) == CLNT_GetThisClientID( ) )
{
if ( RISK_GetNumLivePlayers( ) <= 1 )
@@ -596,9 +596,9 @@
break;
case MSG_VICTORY:
- assert( iWinner >= -1 && iWinner < MAX_PLAYERS );
iWinner = pMessage->msgVictory.iWinner;
+ assert( iWinner >= -1 && iWinner < MAX_PLAYERS );
if ( RISK_GetClientOfPlayer( iWinner ) == CLNT_GetThisClientID( ) )
{
fGameStarted = FALSE;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
| < Previous | Next > |