update to latest upstream

This commit is contained in:
Lucian Langa 2016-03-13 01:17:05 +01:00
parent ffcfd508b9
commit e9bce51e41
4 changed files with 40 additions and 8 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ scummvm-tools-1.1.1.tar.bz2
/scummvm-tools-1.4.0.tar.bz2
/scummvm-tools-1.6.0.tar.bz2
/scummvm-tools-1.7.0.tar.bz2
/scummvm-tools-1.8.0.tar.bz2

View File

@ -0,0 +1,24 @@
diff -Naur scummvm-tools-1.8.0/configure scummvm-tools-1.8.0-mod/configure
--- scummvm-tools-1.8.0/configure 2016-02-27 10:09:38.000000000 +0100
+++ scummvm-tools-1.8.0-mod/configure 2016-03-13 00:58:56.095966071 +0100
@@ -1570,7 +1570,7 @@
return true;
}
EOF
- cc_check $_wxincludes $_wxlibs && has_wx_gui_dev=yes
+ cc_check $_wxincludes $_wxlibs -fPIC && has_wx_gui_dev=yes
if test "$has_wx_gui_dev" = no ; then
_wxincludes=""
diff -Naur scummvm-tools-1.8.0/Makefile scummvm-tools-1.8.0-mod/Makefile
--- scummvm-tools-1.8.0/Makefile 2016-02-27 10:09:38.000000000 +0100
+++ scummvm-tools-1.8.0-mod/Makefile 2016-03-13 01:10:13.488556748 +0100
@@ -47,6 +47,8 @@
CXXFLAGS+= -Wno-conversion -Wno-shorten-64-to-32 -Wno-sign-compare -Wno-four-char-constants
endif
+ CXXFLAGS+= -fPIC
+
#######################################################################
# Default commands - put the necessary replacements in config.mk #
#######################################################################

View File

@ -1,13 +1,14 @@
Name: scummvm-tools
Version: 1.7.0
Release: 9%{?dist}
Version: 1.8.0
Release: 1%{?dist}
Summary: Tools for scummVM / S.C.U.M.M scripting language
Group: Development/Tools
License: GPLv2+
URL: http://scummvm.sourceforge.net
URL: http://www.scummvm.org
Source0: http://downloads.sourceforge.net/scummvm/%{name}-%{version}.tar.bz2
Source0: http://www.scummvm.org/frs/%{name}/%{version}/%{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Patch0: scummvm-tools-1.8.0-fPIC.patch
BuildRequires: wxGTK-devel, libvorbis-devel, flac-devel, desktop-file-utils
BuildRequires: zlib-devel bzip2-devel
BuildRequires: libpng-devel freetype-devel boost-devel
@ -29,6 +30,7 @@ These tools are most useful to developers.
%prep
%setup -q
%patch0 -p1 -b .fpic
%build
# Update the various config.guess to upstream release for aarch64/ppc64le support
@ -61,6 +63,11 @@ desktop-file-install \
%changelog
* Sat Mar 12 2016 Lucian Langa <lucilanga@gnome.eu.org> - 1.8.0-1
- add patch to pass -fPIC to compile flags - fixes wxwidgets
- update url/download links
- update to latest upstream
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
@ -152,13 +159,13 @@ desktop-file-install \
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Fri Oct 30 2008 Lucian Langa <cooly@gnome.eu.org> - 0.12.0-5
* Thu Oct 30 2008 Lucian Langa <cooly@gnome.eu.org> - 0.12.0-5
- add desktop file
* Fri Oct 30 2008 Lucian Langa <cooly@gnome.eu.org> - 0.12.0-4
* Thu Oct 30 2008 Lucian Langa <cooly@gnome.eu.org> - 0.12.0-4
- use bz2 source
* Fri Oct 29 2008 Lucian Langa <cooly@gnome.eu.org> - 0.12.0-3
* Wed Oct 29 2008 Lucian Langa <cooly@gnome.eu.org> - 0.12.0-3
- prevent fedora optflags being overwritten
* Fri Oct 17 2008 Lucian Langa <cooly@gnome.eu.org> - 0.12.0-2

View File

@ -1 +1 @@
436a878bca3e9bbc2d33cadff0dda08c scummvm-tools-1.7.0.tar.bz2
eb68b4f4c66b1b93d6b2797a60d1f471 scummvm-tools-1.8.0.tar.bz2