3:09 p.m.
Author: musuruan
Update of /cvs/nonfree/rpms/frogatto/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28165
Modified Files:
.cvsignore frogatto.spec sources
Added Files:
frogatto-1.3-fonts.patch
Removed Files:
frogatto.xpm
Log Message:
* Wed Sep 25 2013 Andrea Musuruane <musuruan(a)gmail.com> - 1.3.3-1
- Updated to upstream v1.3.3 as of Aug 21, 2013
- Fixed crash when attempting to enter in editor mode (#2966)
- Used Mac OS X icons
- Removed Group tag
frogatto-1.3-fonts.patch:
font.cpp | 2 +-
vector_text.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE frogatto-1.3-fonts.patch ---
Description: Use FreeFont instead of the Ubuntu Font Family
Use the FreeFont instead of Ubuntu one, as the later one is not
compatible with DFSG (see e.g. #603157). This also fixes an issue
in loading the editor, as a relative path was hardcoded then.
Forwarded: no
Author: Martin Quinson <mquinson(a)debian.org>
Last-Update: 2013-01-26
Index: frogatto/src/font.cpp
===================================================================
--- frogatto.orig/src/font.cpp 2013-01-12 20:49:22.049472442 +0100
+++ frogatto/src/font.cpp 2013-01-26 22:44:45.390874240 +0100
@@ -20,7 +20,7 @@
#endif
namespace {
-const char* FontFile = "UbuntuMono-R.ttf";
+const char* FontFile = "/usr/share/fonts/gnu-free/FreeMono.ttf";
std::map<int, TTF_Font*> font_table;
Index: frogatto/src/vector_text.cpp
===================================================================
--- frogatto.orig/src/vector_text.cpp 2013-01-12 20:49:22.125473580 +0100
+++ frogatto/src/vector_text.cpp 2013-01-26 22:45:35.918522864 +0100
@@ -13,7 +13,7 @@
: text_(i18n::tr(node["text"].as_string())),
visible_(node["visible"].as_bool(true)),
size_(node["size"].as_int(12)),
- font_(node["font"].as_string_default("UbuntuMono-R"))
+ font_(node["font"].as_string_default("FreeMono"))
{
std::vector<int> r = node["rect"].as_list_int();
draw_area_ = rect(r[0], r[1], r[2], r[3]);
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 8 Apr 2013 10:25:26 -0000 1.7
+++ .cvsignore 2 Oct 2013 15:09:21 -0000 1.8
@@ -1 +1 @@
-1.3.1.tar.gz
+frogatto-1.3.3-a7ef3bf.tar.gz
Index: frogatto.spec
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/frogatto.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- frogatto.spec 26 Aug 2013 19:50:30 -0000 1.13
+++ frogatto.spec 2 Oct 2013 15:09:21 -0000 1.14
@@ -1,21 +1,24 @@
+%global commit a7ef3bfa0c32df4852bf057fab969c1a080edf4d
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
Name: frogatto
-Version: 1.3.1
-Release: 3%{?dist}
+Version: 1.3.3
+Release: 1%{?dist}
Summary: An old-school 2D platform game
-Group: Amusements/Games
# Artwork and music not released under an open license
License: GPLv3+ and proprietary
URL: http://www.frogatto.com/
-Source0: https://github.com/frogatto/frogatto/archive/1.3.1.tar.gz
+Source0:
https://github.com/frogatto/frogatto/archive/%{commit}/%{name}-%{version}...
Source1: %{name}.sh
Source2: %{name}.desktop
-Source3: %{name}.xpm
-Source4: %{name}.pod
+Source3: %{name}.pod
# Patch Makefile not to link lSDLmain
Patch0: %{name}-1.2-Makefile.patch
-# boost no longer has separate non mt and -mt variants of its libs
+# Boost no longer has separate non mt and -mt variants of its libs
Patch1: %{name}-1.3-no-boost-mt.patch
+# Use FreeFont instead of the Ubuntu Font Family
+Patch2: %{name}-1.3-fonts.patch
BuildRequires: SDL-devel >= 1.2.7
BuildRequires: SDL_image-devel
@@ -27,6 +30,8 @@
BuildRequires: ccache
BuildRequires: boost-devel
BuildRequires: perl-podlators
+BuildRequires: gnu-free-mono-fonts
+BuildRequires: libicns-utils
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -42,9 +47,10 @@
%prep
-%setup -q
+%setup -qn %{name}-%{commit}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
# Fix locale file path
sed -i 's!"./locale/"!"%{_datadir}/locale/"!' src/i18n.cpp
@@ -67,8 +73,8 @@
cp -pr data images music *.cfg \
%{buildroot}%{_datadir}/%{name}
pushd modules/%{name}
-cp -pr data images music sounds *.cfg \
- %{buildroot}%{_datadir}/%{name}/modules/%{name}
+ cp -pr data images music sounds *.cfg \
+ %{buildroot}%{_datadir}/%{name}/modules/%{name}
# Install translations
cp -pr locale %{buildroot}%{_datadir}
popd
@@ -79,9 +85,15 @@
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE2}
-# Install icon
-install -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
-install -m 644 -p %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+# Extract Mac OS X icons
+icns2png -x modules/%{name}/images/os/mac/icon.icns
+
+# Install icons
+for i in 16 32 128 256; do
+ install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+ install -m 644 icon_${i}x${i}x32.png \
+ %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+done
# Install man page
install -d %{buildroot}%{_mandir}/man6
@@ -89,7 +101,7 @@
-center="RPM Fusion contributed man pages" \
-release="%{name} %{version}" \
-date="July 13th, 2010" \
- %{SOURCE4} > %{buildroot}%{_mandir}/man6/%{name}.6
+ %{SOURCE3} > %{buildroot}%{_mandir}/man6/%{name}.6
%find_lang %{name}
@@ -114,12 +126,18 @@
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_libexecdir}/%{name}
-%{_datadir}/icons/hicolor/*/apps/%{name}.xpm
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man6/%{name}.6*
%changelog
+* Wed Sep 25 2013 Andrea Musuruane <musuruan(a)gmail.com> - 1.3.3-1
+- Updated to upstream v1.3.3 as of Aug 21, 2013
+- Fixed crash when attempting to enter in editor mode (#2966)
+- Used Mac OS X icons
+- Removed Group tag
+
* Mon Aug 26 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.3.1-3
- Rebuild for new boost
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 8 Apr 2013 10:25:26 -0000 1.7
+++ sources 2 Oct 2013 15:09:21 -0000 1.8
@@ -1 +1 @@
-f3206fbe1395ea2878092fbd4ed2c591 1.3.1.tar.gz
+d5b56bb9a6fa6bf6506e68a928fcc858 frogatto-1.3.3-a7ef3bf.tar.gz
--- frogatto.xpm DELETED ---