- use system boost, gcc fix, XFree86 includepath kill

Changed files:
    gcc.patch -> 1.1
    yadex.spec -> 1.12

diff --git a/gcc.patch b/gcc.patch
new file mode 100644 (file)
index 0000000..55b5c09
--- /dev/null
+++ b/gcc.patch
@@ -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;

diff --git a/yadex.spec b/yadex.spec
index 3dcd817b3a1a8a2a3d2b6e59593819934504d3b6..61aebdf541ae3dae82bd73403b7cb174be2ce5e8 100644 (file)
--- a/yadex.spec
+++ b/yadex.spec
@@ -3,15 +3,15 @@ Summary(pl.UTF-8):    Edytor poziomów Dooma (wad)
 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}
@@ -45,6 +45,10 @@ których nie miał DEU, a ułatwiających niektóre zadania.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+# use system boost
+rm -rf boost
 
 sed -i -e '/iwad/s/local\///' yadex.cfg
 
@@ -56,16 +60,17 @@ sed -i -e '/iwad/s/local\///' yadex.cfg
        --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