[frozen-bubble] Update to 2.2.1-beta1
Petr Pisar
ppisar at fedoraproject.org
Fri Jul 13 13:43:13 UTC 2012
commit 278484a678b2bc73cf571000daea4ec7b5692d51
Author: Jitka Plesnikova <jplesnik at redhat.com>
Date: Fri Jul 13 15:18:11 2012 +0200
Update to 2.2.1-beta1
.gitignore | 1 +
frozen-bubble.spec | 112 +++++++++++++++++++++++-----------------------------
sources | 2 +-
3 files changed, 52 insertions(+), 63 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8967b41..89449eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
frozen-bubble-2.2.0.tar.bz2
+/frozen-bubble-2.2.1-beta1.tar.bz2
diff --git a/frozen-bubble.spec b/frozen-bubble.spec
index ddd5417..222065b 100644
--- a/frozen-bubble.spec
+++ b/frozen-bubble.spec
@@ -1,22 +1,38 @@
%define _hardened_build 1
Summary: Frozen Bubble arcade game
Name: frozen-bubble
-Version: 2.2.0
-Release: 13%{?dist}
+Version: 2.2.1
+Release: 1.beta1%{?dist}
License: GPLv2
Group: Amusements/Games
URL: http://www.frozen-bubble.org/
-Source0: http://www.frozen-bubble.org/data/frozen-bubble-%{version}.tar.bz2
+Source0: http://www.frozen-bubble.org/data/frozen-bubble-%{version}-beta1.tar.bz2
Source1: frozen-bubble.desktop
Source2: fb-server.service
-Patch0: frozen-bubble-2.1.0-bigendianaudio.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: perl(SDL) >= 2.1.3, SDL_mixer-devel, SDL_Pango-devel
-BuildRequires: glib2-devel, gettext, desktop-file-utils
-Requires: perl(SDL) >= 2.1.3
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: hicolor-icon-theme
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: glib2-devel
+BuildRequires: perl(Alien::SDL) >= 1.413
+BuildRequires: perl(autodie)
+BuildRequires: perl(ExtUtils::CBuilder)
+BuildRequires: perl(File::Slurp)
+BuildRequires: perl(File::Spec::Functions)
+BuildRequires: perl(IO::File)
+BuildRequires: perl(IPC::System::Simple)
+BuildRequires: perl(lib)
+BuildRequires: perl(Locale::Maketext::Extract)
+BuildRequires: perl(Module::Build) >= 0.36
+BuildRequires: perl(parent)
+BuildRequires: perl(SDL) >= 2.511
+BuildRequires: perl(Test::More)
+BuildRequires: SDL_mixer-devel
+BuildRequires: SDL_Pango-devel
+Requires: perl(SDL) >= 2.511
+Requires: perl(Alien::SDL) >= 1.413
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: hicolor-icon-theme
+
+%{?perl_default_filter}
%description
Full-featured, colorful animated penguin eyecandy, 100 levels of 1p game, hours
@@ -40,11 +56,7 @@ Frozen Bubble network game server.
%prep
-%setup -q
-%patch0 -p0
-# Add a directory to the module path for the app's private perl modules
-%{__sed} -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" \
- frozen-bubble frozen-bubble-editor
+%setup -q -n %{name}-%{version}-beta1
# Rename this README since the main server README has the same name
%{__mv} server/init/README server/README.init
# Change the example server configuration file to be a working one, which only
@@ -53,35 +65,17 @@ Frozen Bubble network game server.
%build
-%{__make} %{?_smp_mflags} \
- OPTIMIZE="%{optflags}" \
- CFLAGS="%{optflags} `pkg-config glib-2.0 --cflags`" \
- LIBS="`pkg-config glib-2.0 --libs`" \
- PREFIX=%{_prefix} \
- LIBDIR=%{_libexecdir} \
- DATADIR=%{_datadir} \
- INSTALLDIRS=vendor
-
+%{__perl} Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS"
+./Build
%install
-%{__rm} -rf %{buildroot}
-%{__make} install \
- PREFIX=%{_prefix} \
- LIBDIR=%{_libexecdir} \
- DATADIR=%{_datadir} \
- DESTDIR=%{buildroot}
-%find_lang %{name}
+./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
+#%%find_lang %{name}
# Clean up unneeded files
-%{__rm} -f `find %{buildroot} -name perllocal.pod`
-%{__chmod} -R u+w %{buildroot}/*
-%{__rm} -f %{buildroot}%{perl_vendorarch}/auto/fb_c_stuff/.packlist
-%{__rm} -f %{buildroot}%{perl_vendorarch}/auto/fb_c_stuff/fb_c_stuff.bs
-
-# Move some directories around
-%{__mkdir_p} %{buildroot}%{_libdir}/%{name}/perl
-%{__mv} %{buildroot}%{perl_vendorarch}/auto %{buildroot}%{_libdir}/%{name}/perl/
-%{__mv} %{buildroot}%{perl_vendorarch}/*.pm %{buildroot}%{_libdir}/%{name}/perl/
+find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} \;
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+%{_fixperms} $RPM_BUILD_ROOT/*
# Desktop file
%{__mkdir_p} %{buildroot}%{_datadir}/applications
@@ -91,12 +85,14 @@ desktop-file-install \
%{SOURCE1}
# Icons
-%{__install} -D -p -m 0644 icons/frozen-bubble-icon-16x16.png \
+%{__install} -D -p -m 0644 share/icons/frozen-bubble-icon-16x16.png \
%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-%{__install} -D -p -m 0644 icons/frozen-bubble-icon-32x32.png \
+%{__install} -D -p -m 0644 share/icons/frozen-bubble-icon-32x32.png \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%{__install} -D -p -m 0644 icons/frozen-bubble-icon-48x48.png \
+%{__install} -D -p -m 0644 share/icons/frozen-bubble-icon-48x48.png \
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{__install} -D -p -m 0644 share/icons/frozen-bubble-icon-64x64.png \
+ %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
# Install server init script and default configuration
%{__install} -D -p -m 0644 %{SOURCE2} \
@@ -104,15 +100,8 @@ desktop-file-install \
%{__install} -D -p -m 0644 server/init/fb-server.conf \
%{buildroot}%{_sysconfdir}/fb-server.conf
-# Duplicate the server (it's tiny) to be used in both the game and standalone
-# server package
-%{__cp} -a %{buildroot}%{_libexecdir}/%{name}/fb-server \
- %{buildroot}%{_bindir}/
-
-
-%clean
-%{__rm} -rf %{buildroot}
-
+%check
+./Build test
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -168,20 +157,16 @@ fi
/bin/systemctl try-restart fb-server.service >/dev/null 2>&1 || :
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README TIPS
+%files
+%doc AUTHORS COPYING Changes HISTORY README
%{_bindir}/%{name}*
-%{_libdir}/%{name}/
-%{_libexecdir}/%{name}/
+%{perl_vendorarch}/auto/*
+%{perl_vendorarch}/Games/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_datadir}/%{name}/
-# The Makefile "install"s these, so they end up executable... fix here
-%attr(0644,root,root) %{_mandir}/man6/%{name}*.6.gz
+%{_mandir}/man[13]/*
%files server
-%defattr(-,root,root,-)
%doc COPYING server/AUTHORS server/README*
%config(noreplace) %{_sysconfdir}/fb-server.conf
%{_unitdir}/fb-server.service
@@ -189,6 +174,9 @@ fi
%changelog
+* Wed Jul 04 2012 Jitka Plesnikova <jplesnik at redhat.com> - 2.2.1-1.beta1
+- Updated to 2.2.1-beta1
+
* Mon Jun 11 2012 Petr Pisar <ppisar at redhat.com> - 2.2.0-13
- Perl 5.16 rebuild
diff --git a/sources b/sources
index d118744..01391ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7987201470d6755ed309762d348e0dd frozen-bubble-2.2.0.tar.bz2
+825cc23ed806838b9d86de9982a5687a frozen-bubble-2.2.1-beta1.tar.bz2
More information about the scm-commits
mailing list