diff --git a/.gitignore b/.gitignore index 9e9a693..ba327f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /orthorobot-84c2c96.tar.gz +/orthorobot-1.1.1.tar.gz diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..ad1989f --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,13 @@ + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + + Copyright (C) 2004 Sam Hocevar + + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. You just DO WHAT THE FUCK YOU WANT TO. \ No newline at end of file diff --git a/copying b/copying deleted file mode 100644 index ee7d6a5..0000000 --- a/copying +++ /dev/null @@ -1,14 +0,0 @@ - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 - - Copyright (C) 2004 Sam Hocevar - - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. - diff --git a/orthorobot-appdata.patch b/orthorobot-appdata.patch index 84145d0..1cd97e5 100644 --- a/orthorobot-appdata.patch +++ b/orthorobot-appdata.patch @@ -34,11 +34,12 @@ +.BR love(6) --- a/appdata/orthorobot.appdata.xml +++ b/appdata/orthorobot.appdata.xml -@@ -0,0 +1,27 @@ +@@ -0,0 +1,41 @@ + ++ + + orthorobot.desktop -+ WTFPL ++ CC-BY-SA-3.0 + WTFPL + Ortho Robot + A perspective based puzzle game @@ -55,12 +56,25 @@ + The main menu + + ++ http://stabyourself.net/images/screenshots/orthorobot-2.png ++ Gameplay instructions ++ ++ ++ http://stabyourself.net/images/screenshots/orthorobot-3.png ++ Level selection ++ ++ + http://stabyourself.net/images/screenshots/orthorobot-4.png -+ Example gameplay ++ Example gameplay 1 ++ ++ ++ http://stabyourself.net/images/screenshots/orthorobot-5.png ++ Example gameplay 2 + + + http://stabyourself.net/orthorobot/ + http://github.com/Stabyourself/orthorobot/issues ++ alexjnewt_at_hotmail.com + --- a/appdata/orthorobot.desktop +++ b/appdata/orthorobot.desktop diff --git a/orthorobot-love010support.patch b/orthorobot-love010support.patch deleted file mode 100644 index d941c6a..0000000 --- a/orthorobot-love010support.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff --git a/game.lua b/game.lua -index 2b53dbb..9d1ff60 100644 ---- a/game.lua -+++ b/game.lua -@@ -1163,7 +1163,7 @@ function game_mousepressed(x, y, button) - end - - print(fadegoal) -- if button == "r" or button == "l" and (not gamepaused and fadegoal ~= "menu") then -+ if button == rbutton or button == lbutton and (not gamepaused and fadegoal ~= "menu") then - updateperspective("none") - rotatedrag = true - rotatedragX = x -@@ -1175,7 +1175,7 @@ function game_mousepressed(x, y, button) - end - - function game_mousereleased(x, y, button) -- if (button == "r" or button == "l") and love.mouse.isDown("l") == false and love.mouse.isDown("r") == false and fadegoal ~= "menu" then -+ if (button == rbutton or button == lbutton) and love.mouse.isDown(lbutton) == false and love.mouse.isDown(rbutton) == false and fadegoal ~= "menu" then - rotatedrag = false - if won == false then - --check if current pitch is good -@@ -1226,4 +1226,4 @@ function game_mousereleased(x, y, button) - end - end - end --end -\ No newline at end of file -+end -diff --git a/levelbutton.lua b/levelbutton.lua -index 9fcd861..67ec5a4 100644 ---- a/levelbutton.lua -+++ b/levelbutton.lua -@@ -184,7 +184,7 @@ function levelbutton:draw() - end - - function levelbutton:mousepressed(x, y, button) -- if self.unlocked and self.active and button == "l" then -+ if self.unlocked and self.active and button == lbutton then - if self:gethighlight(x, y) then - for i, v in pairs(levelbuttons) do - v.active = false -@@ -202,4 +202,4 @@ function levelbutton:gethighlight(x, y) - return true - end - return false --end -\ No newline at end of file -+end -diff --git a/main.lua b/main.lua -index 04bc223..8422b31 100644 ---- a/main.lua -+++ b/main.lua -@@ -27,7 +27,15 @@ - 0. You just DO WHAT THE FUCK YOU WANT TO. - ]] - ----0.9.0 stuff -+--Version compatibility stuff -+major, minor, revision, codename = love.getVersion() -+if major == 0 and minor <= 9 then -+ lbutton = "l" -+ rbutton = "r" -+else -+ lbutton = 1 -+ rbutton = 2 -+end - math.mod = math.fmod - if not love.graphics.drawq then - love.graphics.drawq = love.graphics.draw -@@ -890,4 +898,4 @@ function playsound(sound) - sound:stop() - sound:play() - end --end -\ No newline at end of file -+end -diff --git a/menubutton.lua b/menubutton.lua -index a9a2ec6..93a73d3 100644 ---- a/menubutton.lua -+++ b/menubutton.lua -@@ -58,7 +58,7 @@ function menubutton:draw() - end - - function menubutton:mousepressed(x, y, button) -- if self.active and button == "l" then -+ if self.active and button == lbutton then - if self:gethighlight(x, y) then - self:func() - return true -@@ -72,4 +72,4 @@ function menubutton:gethighlight(x, y) - return true - end - return false --end -\ No newline at end of file -+end -diff --git a/pausebutton.lua b/pausebutton.lua -index 6997a61..6d98584 100644 ---- a/pausebutton.lua -+++ b/pausebutton.lua -@@ -76,7 +76,7 @@ end - - function pausebutton:mousepressed(x, y, button) - if self.active then -- if button == "l" then -+ if button == lbutton then - if self:gethighlight(x, y) then - self:func() - end -@@ -90,4 +90,4 @@ function pausebutton:gethighlight(x, y) - return true - end - return false --end -\ No newline at end of file -+end diff --git a/orthorobot.spec b/orthorobot.spec index 3436f95..5b126bf 100644 --- a/orthorobot.spec +++ b/orthorobot.spec @@ -1,21 +1,16 @@ -%global githash 84c2c9672181e7ef6b9dd573cf4be301d7a77691 -%global shortcommit %(c=%{githash}; echo ${c:0:7}) - Name: orthorobot -Version: 1.1 -Release: 6%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: A perspective based puzzle game License: WTFPL URL: http://stabyourself.net/orthorobot/ -Source0: https://github.com/Stabyourself/%{name}/archive/%{githash}.tar.gz#/%{name}-%{shortcommit}.tar.gz -#Source1 is a copy of the license, straight from wtfpl.net -Source1: http://www.wtfpl.net/txt/copying +Source0: https://github.com/Stabyourself/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +#Source1 is a copy of the license, which was added after v1.1.1: +#https://github.com/Stabyourself/orthorobot/commit/48f07423950b29a94b04aefe268f2f951f55b62e +Source1: https://raw.githubusercontent.com/Stabyourself/%{name}/48f07423950b29a94b04aefe268f2f951f55b62e/LICENSE.txt #Patch for appdata, manpage, execution script, and desktop file Patch0: %{name}-appdata.patch -#Submitted upstream: -#https://github.com/Stabyourself/orthorobot/pull/2 -Patch1: %{name}-love010support.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -34,14 +29,15 @@ perspective based puzzle game, where you flatten the view to move across gaps. This game is made with LOVE. %prep -%autosetup -p1 -n %{name}-%{githash} -#Fix line encoding for license file: -sed 's/\r$//' %{SOURCE1} > ./LICENSE +%autosetup -p1 +#Copy LICENSE, fixed after v1.1.1 +cp -f %{SOURCE1} ./LICENSE.txt +#Change version in appdata sed -i 's/VERSION/%{version}/g' appdata/%{name}.6 %build -#love "binary" files are just zipped sources, but should exclude appdata -zip -r %{name}.love . -x appdata +#love "binary" files are just zipped sources +zip -r %{name}.love . -x appdata -x README.md -x LICENSE.txt %install #Install love file @@ -66,7 +62,7 @@ install -p -D -m 0644 helpplayer.png \ %{buildroot}/%{_datadir}/pixmaps/%{name}.png %files -%license LICENSE +%license LICENSE.txt %{_mandir}/man6/%{name}.* %{_bindir}/%{name} %{_datadir}/%{name}/ @@ -75,6 +71,11 @@ install -p -D -m 0644 helpplayer.png \ %{_datadir}/appdata/*.appdata.xml %changelog +* Tue Dec 20 2016 Jeremy Newton - 1.1.1-1 +- Fix LICENSE issues +- Update to 1.1.1 +- Appdata fixes + * Sat Nov 19 2016 Jeremy Newton - 1.1-6 - love 0.10.* fixes (a bit late, just noticed this issue) diff --git a/sources b/sources index c2460dd..957dd0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1302a5d0ee36cc8095de018b2180efe4 orthorobot-84c2c96.tar.gz +SHA512 (orthorobot-1.1.1.tar.gz) = 54c61024fce1895b4706d0ef84377a17446c3c392243c0ee0214d7c60ab255beb20d5b569bb26ff2f9ff5f6973c2f8a32df8eeb2390596b17585e7a96ddfdbff