scourge.spec

[lisu]

Tak, juz widze :) Pare glupich bledow porobilem. Dzieki za
naprowadzenie. Teraz powinno byc ok.
-------------- next part --------------
--- scourge.spec.old	2006-08-24 00:01:59.000000000 +0200
+++ scourge.spec	2006-08-28 14:10:27.000000000 +0200
@@ -2,13 +2,14 @@
 Summary:	Rogue-like game with a 3D user interface
 Summary(pl):	Tekstowa gra RPG z trójwymiarowym interfejsem użytkownika
 Name:		scourge
-Version:	0.11
+Version:	0.15
 Release:	1
 License:	GPL v2
 Group:		X11/Applications/Games
 Source0:	http://dl.sourceforge.net/scourge/%{name}-%{version}.tar.gz
-# Source0-md5:	d214ceeceb3ed8bdf72360dccc0a870f
+# Source0-md5:	026b91d015865455a3dde7643ae74098
 Source1:	%{name}.desktop
+Patch0:		%{name}-configure.patch
 URL:		http://scourge.sourceforge.net/
 BuildRequires:	OpenGL-devel
 BuildRequires:	SDL-devel >= 1.2.7
@@ -17,6 +18,7 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libstdc++-devel
+BuildRequires:	wxGTK2-devel
 Requires:	SDL >= 1.2.7
 Requires:	SDL_mixer >= 1.2
 Requires:	SDL_net >= 1.2
@@ -34,15 +36,16 @@
 zdobywanie poziomów doświadczenia, itp.
 
 %prep
-%setup -q -n %{name}
+%setup -q
+%patch0 -p1
 
 %build
+cd %{name}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-
-%configure \
+%configure WXWIDGET=wx-gtk2-ansi-config \
 	--with-data-dir=%{_datadir}/%{name}
 %{__make}
 
@@ -51,20 +54,20 @@
 install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_desktopdir}}
 install -d $RPM_BUILD_ROOT%{_pixmapsdir}
 
-%{__make} install \
+%{__make} -C %{name} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cp -rf data/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -rf %{name}_data/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install assets/%{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{name}/assets/%{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README
+%doc scourge/{AUTHORS,README,ChangeLog}
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
 %{_desktopdir}/%{name}.desktop
-------------- next part --------------
--- scourge-0.15/scourge/configure.in~	2006-08-18 06:26:43.000000000 +0200
+++ scourge-0.15/scourge/configure.in	2006-08-28 14:06:12.000000000 +0200
@@ -336,14 +336,14 @@
 	
 	AC_MSG_CHECKING([for wx-config library])
 	
-	AC_PATH_PROG(WXWIDGET, wx-config, no)
+	AC_PATH_PROG(WXWIDGET,$WXWIDGET, no)
 	
 	if test "$WXWIDGET" = "no"; then
 	  AC_MSG_ERROR(Cannot find wxwidget: Will not build editor)
 	  have_WXWIDGET=no
 	else
-	  WXWIDGET_CFLAGS=`wx-config --cflags`
-	  WXWIDGET_LIBS=`wx-config --libs`
+	  WXWIDGET_CFLAGS=`$WXWIDGET --cflags`
+	  WXWIDGET_LIBS=`$WXWIDGET --libs`
 	  have_WXWIDGET=yes
 	fi