[love/f20] Update to 0.9.0

mystro256 mystro256 at fedoraproject.org
Mon Jan 6 00:10:15 UTC 2014


commit 17f6732f9b6712552b4b7d7848a82794b3359429
Author: alexjnewt at hotmail.com <alexjnewt at hotmail.com>
Date:   Sun Jan 5 19:09:51 2014 -0500

    Update to 0.9.0

 .gitignore                 |    1 +
 love-optional_mpg123.patch |   92 --------------------------------------------
 love.spec                  |   76 ++++++++++++++++++++++--------------
 sources                    |    3 +-
 4 files changed, 49 insertions(+), 123 deletions(-)
---
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.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 <alexjnewt at hotmail.com> - 0.8.0-6
-- Temporary fix to love to get it build before 0.9.0
+* Sun Jan 5 2014 Jeremy Newton <alexjnewt at hotmail.com> - 0.9.0-2
+- Use repo version, fixes opengl issue
+
+* Wed Jan 1 2014 Jeremy Newton <alexjnewt at hotmail.com> - 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 <rel-eng at lists.fedoraproject.org> - 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


More information about the scm-commits mailing list