From: djurban <djurban@pld-linux.org>
Date: Thu, 17 Jun 2004 16:03:17 +0000 (+0000)
Subject: - rel. 1 killed /usr/local
X-Git-Tag: auto/ac/Mliteraki-1_0-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2FMliteraki.git;a=commitdiff_plain;h=a3e49cffee346ba847a9da76b30efbe3ec988888

- rel. 1 killed /usr/local

Changed files:
    Mliteraki.spec -> 1.7
---

diff --git a/Mliteraki.spec b/Mliteraki.spec
index a61921c..641048e 100644
--- a/Mliteraki.spec
+++ b/Mliteraki.spec
@@ -3,12 +3,12 @@ Summary:	Polish version of Mliteraki game
 Summary(pl):	Polska wersja gry Mliteraki
 Name:		Mliteraki
 Version:	1.0
-Release:	0.3
+Release:	1
 License:	GPL v2
 Group:		X11/Applications/Games
 Source0:	%{name}_pl-%{version}.tar.gz
 # Source0-md5:	91d5372cce673c4b9270f838fcf1b7c6
-Patch0:		%{name}_pl_config.patch
+Patch0:		%{name}_pl-fixes.patch
 URL:		http://www.mardo.prv.pl
 Requires:	wxGTK
 BuildRequires:	wxGTK-devel
@@ -23,37 +23,28 @@ Mliteraki jest gr
 popularnej gry scrabble. Zosta³a napisana przez Tomasza Mularczyka na
 konkurs organizowany w portalu kurnik.pl. Jest to polska wersja gry.
 
-%define  _instdir  /usr/local/
-
 %prep
 %setup -q -n Mliteraki
-%patch0 -p1
+%patch0 -p0
 
 %build
-%{__make}
+%{__cxx} `wxgtk-2.4-config --cflags` `wxgtk-2.4-config --libs` -o Mliter Mliter.cpp
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/{%{_instdir}/bin,%{%_instdir}/games/Mliter_pl}
-
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT$/%{_instdir}
+install -d $RPM_BUILD_ROOT/{%{_bindir},%{_datadir}/games/Mliter_pl}
+cp -r dane $RPM_BUILD_ROOT%{_datadir}/games/Mliter_pl
+cp -r graf $RPM_BUILD_ROOT%{_datadir}/games/Mliter_pl
+cp -r html $RPM_BUILD_ROOT%{_datadir}/games/Mliter_pl
+cp -r slowniki  $RPM_BUILD_ROOT%{_datadir}/games/Mliter_pl
+install Mliter $RPM_BUILD_ROOT%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%dir %{_instdir}/games/Mliter_pl/
-%dir %{_instdir}/games/Mliter_pl/dane/
-%dir %{_instdir}/games/Mliter_pl/graf/
-%dir %{_instdir}/games/Mliter_pl/html/
-%dir %{_instdir}/games/Mliter_pl/slowniki/
-%{_instdir}/games/Mliter_pl/*.txt
-%{_instdir}/games/Mliter_pl/dane/*
-%{_instdir}/games/Mliter_pl/graf/*
-%{_instdir}/games/Mliter_pl/html/*
-%{_instdir}/games/Mliter_pl/slowniki/*
-%attr(755,root,root) %{_instdir}/games/Mliter_pl/Mliter
-%attr(755,root,root) %{_instdir}/bin/*
+%doc czytaj.txt
+%attr(755,root,root) %{_bindir}/*
+%{_datadir}/games/Mliter_pl