2:15 p.m.
Author: jem256
Update of /cvs/nonfree/rpms/mari0/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14330/devel
Modified Files:
.cvsignore mari0.spec sources
Log Message:
Update to work with love 0.9
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mari0/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 21 Jan 2013 21:06:23 -0000 1.2
+++ .cvsignore 29 Nov 2015 14:15:23 -0000 1.3
@@ -1 +1 @@
-mari0-source.zip
+mari0-fc23e18525c4d0c881e64268e56fd23773f006af.zip
Index: mari0.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mari0/devel/mari0.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mari0.spec 31 Aug 2014 20:43:01 -0000 1.2
+++ mari0.spec 29 Nov 2015 14:15:24 -0000 1.3
@@ -1,19 +1,23 @@
Name: mari0
Version: 1.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A recreation of the original Super Mario Bros with a portal gun
License: CC-BY-NC-SA
URL: http://stabyourself.net/mari0/
#Source0 is the upstream source:
-Source0: http://stabyourself.net/dl.php?file=%{name}-1006/%{name}-source.zip
+#Updated by hacktivista, see github for details:
+#https://github.com/Hacktivista/mari0
+#Download here:
+#https://github.com/Hacktivista/mari0/archive/fc23e18525c4d0c881e64268e56fd23773f006af.zip
+Source0: %{name}-fc23e18525c4d0c881e64268e56fd23773f006af.zip
#Source1 is just a Desktop file:
Source1: %{name}.desktop
-BuildRequires: ImageMagick
+#BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
BuildArch: noarch
-Requires: love >= 0.8.0
+Requires: love >= 0.9.0
#Reworded from the website (see URL above)
%description
@@ -24,49 +28,48 @@
everyone having their own Portal gun. This game is made with LOVE.
%prep
-%setup -q -c
-sed -i 's/\r//' readme.txt
-iconv -f iso8859-1 -t utf-8 readme.txt > readme.txt.conv && mv -f
readme.txt.conv readme.txt
+%setup -q -c -n %{name}-fc23e18525c4d0c881e64268e56fd23773f006af
#Execution Script:
echo -e "#!/bin/sh\nlove %{_datadir}/%{name}/%{name}.love\n" > %{name}
-unzip -p %{name}_%{version}.love graphics/SMB/title.png | convert - -crop 176x88+0+0
-gravity NorthWest %{name}.png
%build
#No Build Required
%install
-install -p -D -m 0644 %{name}_%{version}.love
%{buildroot}/%{_datadir}/%{name}/%{name}.love
+install -p -D -m 0644 %{name}-fc23e18525c4d0c881e64268e56fd23773f006af/%{name}.love
%{buildroot}/%{_datadir}/%{name}/%{name}.love
install -p -D -m 0755 %{name} %{buildroot}/%{_bindir}/%{name}
#Install desktop, icons:
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
-install -p -D -m 0644 %{name}.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png
+install -p -D -m 0644 "%{name}-fc23e18525c4d0c881e64268e56fd23773f006af/_DO NOT
INCLUDE/icon.png" %{buildroot}/%{_datadir}/pixmaps/%{name}.png
%files
-%doc readme.txt
%{_bindir}/%{name}
%{_datadir}/%{name}/%{name}.love
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%changelog
+* Sun Nov 29 2015 Jeremy Newton <alexjnewt at hotmail dot com> - 1.6-5
+- Update to work with love 0.9+
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 1.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-* Fri Aug 17 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.6-3
+* Fri Aug 17 2012 Jeremy Newton <alexjnewt at hotmail dot com> - 1.6-3
- Removed unnecessary unzip Build Require
- Simplified source files
- Fixed up desktop file
- Fixed inconsistent macros
-* Mon Jun 4 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.6-2
+* Mon Jun 4 2012 Jeremy Newton <alexjnewt at hotmail dot com> - 1.6-2
- Added missing Build Require
- Removed unnecessary scriptlets
-* Tue Apr 17 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.6-1
+* Tue Apr 17 2012 Jeremy Newton <alexjnewt at hotmail dot com> - 1.6-1
- Updated to 1.6
- Added a launcher and various improvements
-* Tue Mar 6 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 1.2-1
+* Tue Mar 6 2012 Jeremy Newton <alexjnewt at hotmail dot com> - 1.2-1
- Initial Package
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mari0/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 21 Jan 2013 21:06:23 -0000 1.2
+++ sources 29 Nov 2015 14:15:24 -0000 1.3
@@ -1 +1 @@
-22125f68ff41795fa8bafad5d1b1d1a9 mari0-source.zip
+9033ff81a8c007844f247cf932e55d6f mari0-fc23e18525c4d0c881e64268e56fd23773f006af.zip