diff --git a/.gitignore b/.gitignore index 5b69626..a73b0b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /love-extra.tar.xz /rude-love-e0f98d53debb.tar.gz +/0.9.0.tar.gz diff --git a/love-optional_mpg123.patch b/love-optional_mpg123.patch deleted file mode 100644 index d122dc5..0000000 --- a/love-optional_mpg123.patch +++ /dev/null @@ -1,92 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -34,7 +34,7 @@ AC_SEARCH_LIBS([ilInit], [IL], [], AC_MS - AC_SEARCH_LIBS([FT_Load_Glyph], [freetype], [], AC_MSG_ERROR([Can't LÖVE without FreeType])) - AC_SEARCH_LIBS([PHYSFS_init], [physfs], [], AC_MSG_ERROR([Can't LÖVE without PhysicsFS])) - AC_SEARCH_LIBS([ModPlug_Load], [modplug], [], AC_MSG_ERROR([Can't LÖVE without ModPlug])) --AC_SEARCH_LIBS([mpg123_open_feed], [mpg123], [], AC_MSG_ERROR([Can't LÖVE without Mpg123])) -+AC_SEARCH_LIBS([mpg123_open_feed], [mpg123], [AC_DEFINE([WITH_MPG123], [], [Description for mpg123])], AC_MSG_WARN([Mpg123 is not available])) - AC_SEARCH_LIBS([mpg123_seek_64], [mpg123], AC_SUBST([FILE_OFFSET],[-D_FILE_OFFSET_BITS=64]), AC_SUBST([FILE_OFFSET],[])) - AC_SEARCH_LIBS([ov_open], [vorbisfile], [], AC_MSG_ERROR([Can't LÖVE without VorbisFile])) - AC_ARG_ENABLE([headless], -Index: src/modules/sound/lullaby/Mpg123Decoder.cpp -=================================================================== ---- src/modules/sound/lullaby/Mpg123Decoder.cpp.orig -+++ src/modules/sound/lullaby/Mpg123Decoder.cpp -@@ -18,6 +18,10 @@ - * 3. This notice may not be removed or altered from any source distribution. - **/ - -+#include "../config.h" -+ -+#ifdef WITH_MPG123 -+ - #include "Mpg123Decoder.h" - - #include -@@ -227,3 +231,4 @@ namespace lullaby - } // lullaby - } // sound - } // love -+#endif -Index: src/modules/sound/lullaby/Mpg123Decoder.h -=================================================================== ---- src/modules/sound/lullaby/Mpg123Decoder.h.orig -+++ src/modules/sound/lullaby/Mpg123Decoder.h -@@ -17,7 +17,9 @@ - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - **/ -+#include "../config.h" - -+#ifdef WITH_MPG123 - #ifndef LOVE_SOUND_LULLABY_LIBMPG123_DECODER_H - #define LOVE_SOUND_LULLABY_LIBMPG123_DECODER_H - -@@ -77,3 +79,4 @@ namespace lullaby - } // love - - #endif // LOVE_SOUND_LULLABY_LIBMPG123_DECODER_H -+#endif -Index: src/modules/sound/lullaby/Sound.cpp -=================================================================== ---- src/modules/sound/lullaby/Sound.cpp.orig -+++ src/modules/sound/lullaby/Sound.cpp -@@ -18,10 +18,14 @@ - * 3. This notice may not be removed or altered from any source distribution. - **/ - -+#include "../config.h" -+ - #include "Sound.h" - - #include "ModPlugDecoder.h" -+#ifdef WITH_MPG123 - #include "Mpg123Decoder.h" -+#endif - #include "VorbisDecoder.h" - //#include "FLACDecoder.h" - -@@ -37,7 +41,9 @@ namespace lullaby - - Sound::~Sound() - { -+ #ifdef WITH_MPG123 - Mpg123Decoder::quit(); -+ #endif - } - - const char * Sound::getName() const -@@ -55,8 +61,10 @@ namespace lullaby - // Find a suitable decoder here, and return it. - if (ModPlugDecoder::accepts(ext)) - decoder = new ModPlugDecoder(data, ext, bufferSize); -+ #ifdef WITH_MPG123 - else if (Mpg123Decoder::accepts(ext)) - decoder = new Mpg123Decoder(data, ext, bufferSize); -+ #endif - else if (VorbisDecoder::accepts(ext)) - decoder = new VorbisDecoder(data, ext, bufferSize); - /*else if (FLACDecoder::accepts(ext)) diff --git a/love.spec b/love.spec index dfc8a53..d486880 100644 --- a/love.spec +++ b/love.spec @@ -1,28 +1,21 @@ Name: love -Version: 0.8.0 -Release: 6%{?dist} +Version: 0.9.0 +Release: 2%{?dist} Summary: A free 2D game engine which enables easy game creation in Lua #All is licensed as zlib with one exception: #SOURCE/platform/unix/ltmain.sh is public domain License: zlib and Public Domain URL: http://love2d.org -#Only available download link at the moment: -#https://bitbucket.org/rude/love/get/e0f98d53debb.tar.gz -Source0: rude-%{name}-e0f98d53debb.tar.gz -#Source1 currently only contains a custom man page: -#Upstream Bug: https://bitbucket.org/rude/love/issue/405/include-extras-desktop-mime-etc-files-for -Source1: %{name}-extra.tar.xz -#Patch0 makes the mpg123 requirement optional (modified for 0.8.0 from openSUSE) -#Upstream Bug: https://bitbucket.org/rude/love/issue/404/make-mpg123-optional -Patch0: %{name}-optional_mpg123.patch +Source0: https://bitbucket.org/rude/%{name}/get/%{version}.tar.gz BuildRequires: DevIL-devel +BuildRequires: mesa-libGL BuildRequires: libtiff-devel BuildRequires: freetype-devel BuildRequires: luajit-devel BuildRequires: physfs-devel -BuildRequires: SDL-devel +BuildRequires: SDL2-devel BuildRequires: openal-soft-devel BuildRequires: libogg-devel BuildRequires: libvorbis-devel @@ -31,15 +24,25 @@ BuildRequires: libmodplug-devel BuildRequires: libmng-devel BuildRequires: desktop-file-utils BuildRequires: libtool +Requires: lib%{name}%{?_isa} = %{version}-%{release} +Requires: hicolor-icon-theme %description LOVE is an open source, cross platform 2D game engine which uses the Lua scripting language. LOVE can be used to make games of any license allowing it to be used for both free and non-free projects. +%package -n lib%{name} +Summary: Library for Love, A free 2D game engine + +%description -n lib%{name} +This package includes the library files for LOVE. +LOVE is an open source, cross platform 2D game engine which uses the +Lua scripting language. LOVE can be used to make games of any license +allowing it to be used for both free and non-free projects. + %prep -%setup -q -a 1 -n rude-%{name}-e0f98d53debb -%patch0 +%setup -q -n rude-%{name}-38c00c788bcb #Fixing line encoding: sed -i 's/\r//' license.txt src/libraries/Box2D/*/*.* src/libraries/Box2D/*/*/*.* #Fixing permissions: @@ -47,26 +50,25 @@ chmod -x license.txt src/libraries/*/*/*.* src/libraries/Box2D/*/*/*.* %build platform/unix/automagic -%configure --prefix=/usr --with-luajit -make +%configure --prefix=/usr --disable-mpg123 --enable-static=no +make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} -#Install desktop, icons, and mime info: -desktop-file-install \ - --dir %{buildroot}%{_datadir}/applications \ - platform/unix/%{name}.desktop -install -p -D -m 0644 platform/unix/app.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg -install -p -D -m 0644 platform/unix/game.svg %{buildroot}/%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-%{name}-game.svg -install -p -D -m 0644 platform/unix/%{name}.xml %{buildroot}%{_datadir}/mime/packages/%{name}.xml -install -p -D -m 0644 %{name}-extra/%{name}.1 %{buildroot}/%{_mandir}/man1/%{name}.1 +make %{?_smp_mflags} install DESTDIR=%{buildroot} +#Check Desktop file +desktop-file-validate \ + %{buildroot}%{_datadir}/applications/%{name}.desktop +#This seems to be built, despite disabling static libraries +rm -f %{buildroot}%{_libdir}/lib%{name}.la %post +/sbin/ldconfig /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : /usr/bin/update-desktop-database &> /dev/null || : %postun +/sbin/ldconfig if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -76,18 +78,34 @@ fi %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - + +%post -n lib%{name} -p /sbin/ldconfig + +%postun -n lib%{name} -p /sbin/ldconfig + %files %doc changes.txt license.txt readme.md %{_bindir}/%{name} -%{_datadir}/icons/hicolor/scalable/*/*.svg +%{_datadir}/pixmaps/%{name}.svg +%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-%{name}-game.svg %{_datadir}/applications/%{name}.desktop %{_datadir}/mime/packages/%{name}.xml %{_mandir}/man1/%{name}.* + +%files -n lib%{name} +%doc changes.txt license.txt readme.md +#Note that liblove.so is just a symlink, so a devel package is useless +%{_libdir}/lib%{name}.* %changelog -* Sun Jan 5 2014 Jeremy Newton - 0.8.0-6 -- Temporary fix to love to get it build before 0.9.0 +* Sun Jan 5 2014 Jeremy Newton - 0.9.0-2 +- Use repo version, fixes opengl issue + +* Wed Jan 1 2014 Jeremy Newton - 0.9.0-1 +- New upstream 0.9.0 +- Removed all patches/sources (all fixed in 0.9.0) +- Add disable-mpg123 flag and enable-static=no +- Split into 2 packages, love and liblove * Sat Aug 03 2013 Fedora Release Engineering - 0.8.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index e2a32dd..94eea2f 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -f40f8afd39a0ed8b234865aeee84b3ac love-extra.tar.xz -90026e3884c3c593b868f41cb62a0ab1 rude-love-e0f98d53debb.tar.gz +0376a06ac0065b7862c156c462449f72 0.9.0.tar.gz