packages: yadex/yadex.spec, yadex/gcc.patch (NEW) - use system boost, gcc f...

[glen]

Author: glen                         Date: Thu Jan 20 02:02:45 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system boost, gcc fix, XFree86 includepath kill

---- Files affected:
packages/yadex:
   yadex.spec (1.11 -> 1.12) , gcc.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/yadex/yadex.spec
diff -u packages/yadex/yadex.spec:1.11 packages/yadex/yadex.spec:1.12
--- packages/yadex/yadex.spec:1.11	Mon Feb 12 23:09:25 2007
+++ packages/yadex/yadex.spec	Thu Jan 20 03:02:40 2011
@@ -4,15 +4,15 @@
 Name:		yadex
 Version:	1.7.0
 Release:	1
-Epoch:		0
 License:	GPL v2
 Group:		Applications/Games
 Source0:	http://www.teaser.fr/~amajorel/yadex/%{name}-%{version}.tar.gz
 # Source0-md5:	d341abe066525394082edfd520af86ae
 Patch0:		%{name}-typedef.patch
 Patch1:		http://glbsp.sourceforge.net/yadex/Yadex_170_ALL.diff
+BuildRequires:	boost-devel
+Patch2:		gcc.patch
 URL:		http://www.teaser.fr/~amajorel/yadex/
-BuildRequires:	FILLME
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/%{name}
@@ -46,6 +46,10 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+# use system boost
+rm -rf boost
 
 sed -i -e '/iwad/s/local\///' yadex.cfg
 
@@ -57,16 +61,17 @@
 	--cxx "%{__cxx}"
 
 %{__make} \
+	X11INCLUDEDIR=%{_includedir} \
 	X11LIBDIR=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man6,%{_datadir}}
 
-install obj/0/yadex $RPM_BUILD_ROOT%{_bindir}
-install ygd/* $RPM_BUILD_ROOT%{_datadir}
-install doc/yadex.6 $RPM_BUILD_ROOT%{_mandir}/man6
-install yadex.cfg $RPM_BUILD_ROOT%{_sysconfdir}
+install -p obj/0/yadex $RPM_BUILD_ROOT%{_bindir}
+cp -a ygd/* $RPM_BUILD_ROOT%{_datadir}
+cp -p doc/yadex.6 $RPM_BUILD_ROOT%{_mandir}/man6
+cp -p yadex.cfg $RPM_BUILD_ROOT%{_sysconfdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,6 +91,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2011/01/20 02:02:40  glen
+- use system boost, gcc fix, XFree86 includepath kill
+
 Revision 1.11  2007/02/12 22:09:25  glen
 - tabs in preamble
 

================================================================
Index: packages/yadex/gcc.patch
diff -u /dev/null packages/yadex/gcc.patch:1.1
--- /dev/null	Thu Jan 20 03:02:45 2011
+++ packages/yadex/gcc.patch	Thu Jan 20 03:02:40 2011
@@ -0,0 +1,11 @@
+--- yadex-1.7.0/src/gfx.cc~	2003-12-15 02:50:02.000000000 +0200
++++ yadex-1.7.0/src/gfx.cc	2011-01-20 04:54:48.337030025 +0200
+@@ -310,7 +310,7 @@
+     win_vis_id    = vis_info->visualid;
+ #if defined _cplusplus || defined __cplusplus
+     win_vis_class = vis_info->c_class;
+-#elif
++#else
+     win_vis_class = vis_info->class;
+ #endif
+     win_ncolours  = vis_info->colormap_size;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/yadex/yadex.spec?r1=1.11&r2=1.12&f=u