Fix building with ruby 1.9
- Rebuilt for new GLEW
This commit is contained in:
parent
81c02ffafa
commit
c06f3fabc7
2 changed files with 39 additions and 1 deletions
32
sdljava-0.9.1-ruby19.patch
Normal file
32
sdljava-0.9.1-ruby19.patch
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
--- sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/post-process.rb~ 2005-02-20 23:19:13.000000000 +0100
|
||||
+++ sdljava-0.9.1/src/org/gljava/opengl/native/ftgl/post-process.rb 2012-07-26 12:45:18.738168697 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/ruby -w
|
||||
|
||||
require "find"
|
||||
-require "ftools"
|
||||
+require "fileutils"
|
||||
|
||||
# temporary hack until I can figure out a better way to do this
|
||||
# process the given files, change the methods names to start
|
||||
@@ -101,16 +101,16 @@ Find.find(".") do |path|
|
||||
|
||||
f = File.new("#{path}.tmp", "w+")
|
||||
|
||||
- f << lines
|
||||
+ f.puts(lines)
|
||||
|
||||
- f << post if not post == nil
|
||||
+ f.puts(post) if not post == nil
|
||||
|
||||
- f << "\n}"
|
||||
+ f.puts("\n}")
|
||||
|
||||
f.close
|
||||
|
||||
# move it to the actual file now
|
||||
- File.move("#{path}.tmp", path)
|
||||
+ FileUtils.move("#{path}.tmp", path)
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
Name: sdljava
|
||||
Version: 0.9.1
|
||||
Release: 18%{?dist}
|
||||
Release: 19%{?dist}
|
||||
Summary: Java binding to the SDL API
|
||||
Group: System Environment/Libraries
|
||||
License: LGPLv2+
|
||||
|
|
@ -18,6 +18,7 @@ Source0: %{name}-%{version}.tar.gz
|
|||
Source1: %{name}-runtest.sh
|
||||
Patch0: sdljava-0.9.1-regen.patch
|
||||
Patch1: sdljava-0.9.1-ftgl213.patch
|
||||
Patch2: sdljava-0.9.1-ruby19.patch
|
||||
BuildRequires: ftgl-devel glew-devel SDL-devel SDL_gfx-devel SDL_image-devel
|
||||
BuildRequires: SDL_mixer-devel SDL_ttf-devel java-devel jpackage-utils
|
||||
BuildRequires: java-javadoc ant xml-commons-apis swig bsh jdom ruby
|
||||
|
|
@ -60,6 +61,7 @@ Demonstrations and samples for %{name}.
|
|||
%setup -q
|
||||
%patch0 -p1 -z .regen
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
# Newer ftgl no longer exports the FTFace class
|
||||
rm src/org/gljava/opengl/ftgl/FTFace.java
|
||||
iconv -f ISO_8859-2 -t UTF8 docs/CHANGES_0_9_1 > docs/CHANGES_0_9_1.tmp
|
||||
|
|
@ -192,6 +194,10 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Jul 26 2012 Hans de Goede <hdegoede@redhat.com> - 0.9.1-19
|
||||
- Fix building with ruby 1.9
|
||||
- Rebuilt for new GLEW
|
||||
|
||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue