diff --git a/ruby-pedantic-headers.diff b/ruby-pedantic-headers.diff new file mode 100644 index 0000000..d9f8208 --- /dev/null +++ b/ruby-pedantic-headers.diff @@ -0,0 +1,11 @@ +--- node.h ++++ node.h +@@ -394,7 +394,7 @@ enum rb_thread_status { + THREAD_TO_KILL, + THREAD_RUNNABLE, + THREAD_STOPPED, +- THREAD_KILLED, ++ THREAD_KILLED + }; + + typedef struct rb_thread *rb_thread_t; diff --git a/ruby.changes b/ruby.changes index 65e27c0..72c6b5d 100644 --- a/ruby.changes +++ b/ruby.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 11 11:56:16 CEST 2007 - dmueller@suse.de + +- fix headers to be compileable with -pedantic + ------------------------------------------------------------------- Mon Aug 6 03:11:29 CEST 2007 - mrueckert@suse.de diff --git a/ruby.spec b/ruby.spec index de6fc48..ab33e20 100644 --- a/ruby.spec +++ b/ruby.spec @@ -12,12 +12,12 @@ Name: ruby Version: 1.8.6.p36 -Release: 1 +Release: 24 %define pkg_version 1.8.6 %define patch_level p36 %define rb_ver %(echo %{pkg_version} | sed -e 's/\\\.[0-9]\\\+$//') # -License: GPL v2 or later, http://www.ruby-lang.org/en/LICENSE.txt +License: GPL v2 or later Group: Development/Languages/Ruby # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,7 +35,7 @@ BuildRequires: xorg-x11-devel xorg-x11-fonts-scalable %endif Provides: /usr/bin/ruby # -URL: http://www.ruby-lang.org/ +Url: http://www.ruby-lang.org/ Source: ftp://ftp.ruby-lang.org/pub/ruby/ruby-%{pkg_version}-%{patch_level}.tar.bz2 Source1: irb.1 Source2: ruby-doc-bundle.tar.bz2 @@ -47,6 +47,7 @@ Patch4: ruby-1.8.6.p36_thread_prototype_and_testsuite.patch # vendor ruby files taken from: # http://svn.macports.org/repository/macports/trunk/dports/lang/ruby/ Patch5: ruby-1.8.6.p36_vendor_ruby.patch +Patch6: ruby-pedantic-headers.diff Source3: site-specific.rb Source4: vendor-specific.rb # @@ -205,6 +206,7 @@ Authors: %patch3 %patch4 %patch5 +%patch6 find . -type f | xargs -n 1 sed -i "s@#!\s*/usr/local/bin/ruby@#!/usr/bin/ruby@" touch parse.y @@ -299,7 +301,6 @@ sed -i "s@#!\s*\./miniruby@#!/usr/bin/ruby@" runruby.rb %{__cp} -r test/ runruby.rb %{buildroot}%{_docdir}/%{name}-test-suite/ %{__ln_s} -f %{_bindir}/%{name} %{buildroot}%{_docdir}/%{name}-test-suite/%{name} %if 0%{?use_fdupes} - %fdupes %{buildroot} %endif @@ -472,8 +473,9 @@ sed -i "s@#!\s*\./miniruby@#!/usr/bin/ruby@" runruby.rb %files examples %defattr(-,root,root) %doc %{_docdir}/%{name}/examples - %changelog +* Thu Oct 11 2007 - dmueller@suse.de +- fix headers to be compileable with -pedantic * Mon Aug 06 2007 - mrueckert@suse.de - added ruby-1.8.6.p36_thread_prototype_and_testsuite.patch: pulled two fixes from the 1.8.6 branch: