rpms/gltron/devel gltron-0.70-no-use-misc.patch, NONE, 1.1 gltron.desktop, 1.1, 1.2 gltron.spec, 1.6, 1.7
Author: jwrdegoede
Update of /cvs/free/rpms/gltron/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13803
Modified Files:
gltron.desktop gltron.spec
Added Files:
gltron-0.70-no-use-misc.patch
Log Message:
* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.70-9
- Fix FTBFS (rf#3631)
gltron-0.70-no-use-misc.patch:
liolib.c | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE gltron-0.70-no-use-misc.patch ---
diff -up gltron-0.70/lua/src/lib/liolib.c~ gltron-0.70/lua/src/lib/liolib.c
--- gltron-0.70/lua/src/lib/liolib.c~ 2003-06-30 21:15:26.000000000 +0200
+++ gltron-0.70/lua/src/lib/liolib.c 2015-05-16 11:52:56.592817722 +0200
@@ -8,7 +8,6 @@
#include <ctype.h>
#include <stdio.h>
-#define __USE_MISC /* for mkstemp() */
#include <stdlib.h>
#include <string.h>
#include <time.h>
Index: gltron.desktop
===================================================================
RCS file: /cvs/free/rpms/gltron/devel/gltron.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gltron.desktop 3 Aug 2008 14:27:34 -0000 1.1
+++ gltron.desktop 16 May 2015 10:08:26 -0000 1.2
@@ -5,5 +5,4 @@
Icon=gltron.png
Terminal=false
Type=Application
-Encoding=UTF-8
Categories=Application;Game;ArcadeGame;
Index: gltron.spec
===================================================================
RCS file: /cvs/free/rpms/gltron/devel/gltron.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gltron.spec 31 Aug 2014 03:14:36 -0000 1.6
+++ gltron.spec 16 May 2015 10:08:26 -0000 1.7
@@ -1,6 +1,6 @@
Name: gltron
Version: 0.70
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A 3D game inspired by the movie TRON
Group: Amusements/Games
License: GPL
@@ -9,37 +9,34 @@
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: gltron-0.70-gcc.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Patch1: gltron-0.70-no-use-misc.patch
BuildRequires: SDL_sound-devel libpng-devel zlib-devel libGLU-devel
BuildRequires: desktop-file-utils
%description
%{summary}.
+
%prep
%setup -q
%patch0 -p0 -b .gcc~
+%patch1 -p1
+
%build
%configure --disable-warn
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps
-desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
- --vendor livna --mode=0644 --add-category=X-Livna %{SOURCE1}
+desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications %{SOURCE1}
-%clean
-rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,-)
%doc COPYING ChangeLog README
%{_bindir}/*
%{_datadir}/%{name}
@@ -47,6 +44,9 @@
%{_datadir}/pixmaps/*.png
%changelog
+* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.70-9
+- Fix FTBFS (rf#3631)
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 0.70-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild