X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=frozen-bubble.spec;h=3d915dbf92c6ddf7bd02afbf265826b648271b66;hb=92d6d3b6871917d569ffb53f6781d3a0da7f0526;hp=483689cc5a445e471bcf5c578ce6d25d30cf7309;hpb=b67dbf1af571c186ce8e8910eff0e5c350c69d9c;p=packages%2Ffrozen-bubble.git

diff --git a/frozen-bubble.spec b/frozen-bubble.spec
index 483689c..3d915db 100644
--- a/frozen-bubble.spec
+++ b/frozen-bubble.spec
@@ -1,25 +1,26 @@
 %include	/usr/lib/rpm/macros.perl
 Summary:	Frozen Bubble arcade game
-Summary(pl):	Gra zrêczno¶ciowa Frozen Bubble
+Summary(pl.UTF-8):	Gra zręcznościowa Frozen Bubble
 Name:		frozen-bubble
-Version:	2.0.0
-Release:	2
+Version:	2.2.0
+Release:	6
 License:	GPL
 Group:		X11/Applications/Games
 Source0:	http://www.frozen-bubble.org/data/%{name}-%{version}.tar.bz2
-# Source0-md5:	9fdd84f56e5221e6c58c12eab72459d9
+# Source0-md5:	f7987201470d6755ed309762d348e0dd
 Source1:	%{name}.desktop
 Patch0:		%{name}-make.patch
-Patch1:		%{name}-sdl-2.0.5.patch
-#Icon:		%{name}.xpm
+Patch1:		%{name}-kill-warning.patch
 URL:		http://www.frozen-bubble.org/
-BuildRequires:	SDL_mixer-devel >= 1.2.2
 BuildRequires:	SDL_Pango-devel
+BuildRequires:	SDL_mixer-devel >= 1.2.2
+BuildRequires:	gettext-tools
 BuildRequires:	perl-SDL >= 2.1.0
 BuildRequires:	perl-devel
+BuildRequires:	pkgconfig
 BuildRequires:	rpm-perlprov >= 3.0.3-18
 BuildRequires:	smpeg-devel
-Requires:	perl(Locale::gettext) >= 1.04
+Requires:	perl-Locale-gettext >= 1.04
 Requires:	perl-SDL >= 2.1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -31,22 +32,28 @@ game, hours and hours of 2p game, 3 professional quality 20-channels
 musics, 15 stereo sound effects, 7 unique graphical transition
 effects.
 
-%description -l pl
-Gra o wielu mo¿liwo¶ciach, z kolorowymi animacjami, 50-ma poziomami
-dla jednego gracza, wieloma godzinami zabawy dla dwóch graczy, 3-ma
-profesjonalnej jako¶ci 20-kana³owymi muzyczkami, 15-ma
-stereofonicznymi efektami d¼wiêkowymi, 7-ma unikalnymi graficznymi
-efektami przej¶æ.
+%description -l pl.UTF-8
+Gra o wielu możliwościach, z kolorowymi animacjami, 50-ma poziomami
+dla jednego gracza, wieloma godzinami zabawy dla dwóch graczy, 3-ma
+profesjonalnej jakości 20-kanałowymi muzyczkami, 15-ma
+stereofonicznymi efektami dźwiękowymi, 7-ma unikalnymi graficznymi
+efektami przejść.
 
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
+
+%{__sed} -i -e 's/-Werror//' server/Makefile
 
 %build
 %{__make} \
 	OPTIMIZE="%{rpmcflags} -Wall" \
+	LDFLAGS="%{rpmldflags}" \
+	CC="%{__cc}" \
+	CPP="%{__cc} -E" \
 	PREFIX="%{_prefix}" \
+	LIBDIR="%{_libdir}" \
 	INSTALLDIRS=vendor
 
 %install
@@ -54,7 +61,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir},%{_pixmapsdir},%{_desktopdir}}
 
 %{__make} install \
-	PREFIX=%{_prefix} \
+	PREFIX="%{_prefix}" \
+	LIBDIR="%{_libdir}" \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install icons/%{name}-icon-48x48.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
@@ -70,10 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README AUTHORS
 %attr(755,root,root) %{_bindir}/*
+%dir %{_libdir}/frozen-bubble
 %attr(755,root,root) %{_libdir}/frozen-bubble/fb-server
 %{_datadir}/%{name}
 %dir %{perl_vendorarch}/auto/fb_c_stuff
-%{perl_vendorarch}/auto/fb_c_stuff/fb_c_stuff.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/fb_c_stuff/fb_c_stuff.so
 %{perl_vendorarch}/*.pm
 %{_pixmapsdir}/*.png