packages: ruby/ruby-mkmf-shared.patch, ruby/ruby.spec - started update to 1...
baggins
baggins at pld-linux.org
Fri Feb 26 11:41:41 CET 2010
Author: baggins Date: Fri Feb 26 10:41:41 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- started update to 1.9.1
---- Files affected:
packages/ruby:
ruby-mkmf-shared.patch (1.3 -> 1.4) , ruby.spec (1.198 -> 1.199)
---- Diffs:
================================================================
Index: packages/ruby/ruby-mkmf-shared.patch
diff -u packages/ruby/ruby-mkmf-shared.patch:1.3 packages/ruby/ruby-mkmf-shared.patch:1.4
--- packages/ruby/ruby-mkmf-shared.patch:1.3 Mon Dec 10 23:36:30 2007
+++ packages/ruby/ruby-mkmf-shared.patch Fri Feb 26 11:41:35 2010
@@ -2,14 +2,11 @@
--- ruby-1.8.6-p111-o/lib/mkmf.rb 2007-12-07 17:41:05.000000000 -0700
+++ ruby-1.8.6-p111/lib/mkmf.rb 2007-12-07 17:47:44.000000000 -0700
@@ -275,7 +275,7 @@
- 'LDFLAGS' => "#$LDFLAGS #{ldflags}",
- 'LIBPATH' => libpathflag(libpath),
- 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
-- 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")
-+ 'LIBS' => "#$LIBRUBYARG_SHARED #{opt} #$LIBS")
- Config::expand(TRY_LINK.dup, conf)
+ 'LDFLAGS' => "#$LDFLAGS #{ldflags}",
+ 'LIBPATH' => libpathflag(libpath),
+ 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
+- 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS")
++ 'LIBS' => "#$LIBRUBYARG_SHARED #{opt} #$LIBS")
+ RbConfig::expand(TRY_LINK.dup, conf)
end
-Only in ruby-1.8.6-p111/lib: mkmf.rb~
-Only in ruby-1.8.6-p111/lib: mkmf.rb.orig
-Only in ruby-1.8.6-p111/lib: mkmf.rb.rej~
================================================================
Index: packages/ruby/ruby.spec
diff -u packages/ruby/ruby.spec:1.198 packages/ruby/ruby.spec:1.199
--- packages/ruby/ruby.spec:1.198 Thu Jan 14 17:40:21 2010
+++ packages/ruby/ruby.spec Fri Feb 26 11:41:35 2010
@@ -4,14 +4,13 @@
%bcond_without doc # skip generating docs (which is time-consuming). Intended for speed up test builds
%bcond_without emacs # skip building package with ruby-mode for emacs
%bcond_without tk # skip building package with Tk bindings
-%bcond_with onigurma
#
-%define ruby_ver 1.8
+%define ruby_ver 1.9
%define ruby_ridir %{_datadir}/ri/%{ruby_ver}/system
%define ruby_rdocdir %{_datadir}/rdoc
%define stdlibdoc_version 0.10.1
-%define patchlevel 249
-%define basever 1.8.7
+%define patchlevel 378
+%define basever 1.9.1
Summary: Ruby - interpreted scripting language
Summary(ja.UTF-8): オブジェクト指向言語Rubyインタプリタ
Summary(pl.UTF-8): Ruby - interpretowany język skryptowy
@@ -19,34 +18,21 @@
Summary(zh_CN.UTF-8): ruby - 一种快速高效的面向对象脚本编程语言
Name: ruby
Version: %{basever}.%{patchlevel}
-Release: 2
+Release: 0.1
Epoch: 1
License: The Ruby License
Group: Development/Languages
Source0: ftp://ftp.ruby-lang.org/pub/ruby/%{name}-%{basever}-p%{patchlevel}.tar.bz2
-# Source0-md5: 37200cc956a16996bbfd25bb4068f242
-Source1: http://www.ibiblio.org/pub/languages/ruby/doc/%{name}-texi-1.4-en.tar.gz
-# Source1-md5: 839fda4af52b5c5c6d21f879f7fc62bf
-Source2: http://www.math.sci.hokudai.ac.jp/~gotoken/ruby/%{name}-uguide-981227.tar.gz
-# Source2-md5: 24eadcd067278901da9ad70efb146b07
-Source3: http://www.ibiblio.org/pub/languages/ruby/doc/%{name}faq-990927.tar.gz
-# Source3-md5: 634c25b14e19925d10af3720d72e8741
-Source4: irb.1
-Source5: http://www.geocities.jp/kosako3/oniguruma/archive/onigd2_5_9.tar.gz
-# Source5-md5: 7e4c2b197387232afd9a11378feeb246
-Source6: http://www.ruby-doc.org/download/stdlib/%{name}-doc-stdlib-%{stdlibdoc_version}.tgz
-# Source6-md5: 5437c281b44e7a4af142d2bd35eba407
-Source7: http://www.ruby-doc.org/download/Ruby-1.8.1_ri_data.zip
-# Source7-md5: 96e97cdfa55ed197e0e6c39159394c82
-Source8: erb.1
-Source9: rdoc.1
-Source10: ri.1
-Source11: testrb.1
-Source12: %{name}-mode-init.el
-Patch0: %{name}-info.patch
-Patch1: %{name}-mkmf-shared.patch
-Patch2: %{name}-require-rubygems-version.patch
-Patch3: %{name}-lib64.patch
+# Source0-md5: 5922459622a23612eb9b68a3586cb5f8
+Source1: http://www.ruby-doc.org/download/%{name}-doc-bundle.tar.gz
+# Source1-md5: 24eadcd067278901da9ad70efb146b07
+Source2: http://www.ruby-doc.org/download/stdlib/%{name}-doc-stdlib-%{stdlibdoc_version}.tgz
+# Source2-md5: 5437c281b44e7a4af142d2bd35eba407
+Source3: rdoc.1
+Source4: testrb.1
+Source5: %{name}-mode-init.el
+Patch0: %{name}-mkmf-shared.patch
+Patch1: %{name}-lib64.patch
URL: http://www.ruby-lang.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -216,11 +202,9 @@
Tryb Ruby i debugger dla Emacsa.
%prep
-%setup -q -n %{name}-%{basever}-p%{patchlevel} -a1 -a2 -a3 -a5 -a6 -a7
+%setup -q -n %{name}-%{basever}-p%{patchlevel} -a1 -a2
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
find -type f '(' -name '*.rb' -o -name '*.cgi' -o -name '*.test' -o -name 'ruby.1' \
-o -name 'ruby.info*' -o -name '*.html' -o -name '*.tcl' -o -name '*.texi' ')' \
@@ -229,14 +213,6 @@
%build
cp -f /usr/share/automake/config.sub .
-%if %{with onigurma}
-cd oniguruma
-%configure \
- --with-rubydir=..
-%{__make} 18
-cd ..
-%endif
-
%{__autoconf}
%configure \
--enable-shared \
@@ -244,6 +220,7 @@
--enable-pthread
%{__make}
+exit
%{__make} clean -C %{name}-texi-1.4-en
%{__make} info -C %{name}-texi-1.4-en
@@ -290,14 +267,11 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-
+exit
cp -Rf sample/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
cp -a %{name}-texi-1.4-en/ruby.info* $RPM_BUILD_ROOT%{_infodir}
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1
cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1
-cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_mandir}/man1
-cp -a %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man1
-cp -a %{SOURCE10} $RPM_BUILD_ROOT%{_mandir}/man1
-cp -a %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1
cp -Rf ruby-uguide guide
cp -Rf rubyfaq faq
@@ -309,7 +283,7 @@
install -d $RPM_BUILD_ROOT%{_emacs_lispdir}/{%{name}-mode,site-start.d}
cp -a misc/*.el $RPM_BUILD_ROOT%{_emacs_lispdir}/%{name}-mode
rm -f $RPM_BUILD_ROOT%{_emacs_lispdir}/%{name}-mode/rubydb2x.el*
-install -p %{SOURCE12} $RPM_BUILD_ROOT%{_emacs_lispdir}/site-start.d
+install -p %{SOURCE5} $RPM_BUILD_ROOT%{_emacs_lispdir}/site-start.d
cat << 'EOF' > path.el
(setq load-path (cons "." load-path) byte-compile-warnings nil)
EOF
@@ -459,6 +433,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.199 2010/02/26 10:41:35 baggins
+- started update to 1.9.1
+
Revision 1.198 2010/01/14 16:40:21 glen
- release 2
@@ -536,7 +513,8 @@
- avoid creating junk %{buildroot}ERROR tree when building without emacs
Revision 1.176 2008/08/15 19:57:51 arekm
-- up to 1.8.7p22; lib_prefix and vendordir seems to be merged in some form; onigurma doesn't build so bcond off it; probably several CVE fixed
+- up to 1.8.7p22; lib_prefix and vendordir seems to be merged in some form;
+- onigurma doesn't build so bcond off it; probably several CVE fixed
Revision 1.175 2008/06/14 10:12:08 arekm
- rel 6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby/ruby-mkmf-shared.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby/ruby.spec?r1=1.198&r2=1.199&f=u
More information about the pld-cvs-commit
mailing list