From f3840b136acd3a35a7a92e0340a8b0406d0ef247 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 28 Aug 2006 08:50:07 +0000 Subject: [PATCH] - New upstream release. - removed the unnecessary patches: - ruby-1.8.4-no-eaccess.patch - ruby-1.8.4-64bit-pack.patch - ruby-1.8.4-fix-insecure-dir-operation.patch - ruby-1.8.4-fix-insecure-regexp-modification.patch - ruby-1.8.4-fix-alias-safe-level.patch --- .cvsignore | 1 + ruby.spec | 37 +++++++++++++++++++------------------ sources | 2 +- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.cvsignore b/.cvsignore index d6ac41a..715106e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -9,3 +9,4 @@ ruby-1.8.3.tar.gz ruby-1.8.4-preview1.tar.gz ruby-1.8.4-preview2.tar.gz ruby-1.8.4.tar.gz +ruby-1.8.5.tar.gz diff --git a/ruby.spec b/ruby.spec index c07911b..d5da35c 100644 --- a/ruby.spec +++ b/ruby.spec @@ -4,8 +4,8 @@ %define sitedir2 %{_prefix}/lib/ruby/site_ruby Name: ruby -Version: 1.8.4 -Release: 12%{?dist} +Version: 1.8.5 +Release: 1%{?dist} License: Ruby License/GPL - see COPYING URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,11 +26,6 @@ Source5: irb.1 Source10: ruby-mode-init.el Patch1: ruby-1.8.2-deadcode.patch -Patch2: ruby-1.8.4-no-eaccess.patch -Patch3: ruby-1.8.4-64bit-pack.patch -Patch4: ruby-1.8.4-fix-insecure-dir-operation.patch -Patch5: ruby-1.8.4-fix-insecure-regexp-modification.patch -Patch6: ruby-1.8.4-fix-alias-safe-level.patch Patch20: ruby-rubyprefix.patch Patch21: ruby-deprecated-sitelib-search-path.patch Patch22: ruby-deprecated-search-path.patch @@ -147,11 +142,6 @@ tar fxz %{SOURCE2} popd pushd %{name}-%{version} %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %patch20 -p1 %patch21 -p1 %ifarch ppc64 s390x sparc64 x86_64 @@ -159,7 +149,7 @@ pushd %{name}-%{version} %patch23 -p1 %patch24 -p1 %endif -%patch25 -p1 +#%%patch25 -p1 popd %build @@ -174,17 +164,18 @@ export rb_cv_func_strtod CFLAGS="$RPM_OPT_FLAGS -Wall" export CFLAGS %configure \ + --datarootdir='$(DESTDIR)/%{_datadir}' \ --with-sitedir='%{sitedir}' \ --with-default-kcode=none \ --enable-shared \ --enable-ipv6 \ - --disable-pthread \ + --enable-pthread \ --with-lookup-order-hack=INET \ --disable-rpath \ --with-ruby-prefix=%{_prefix}/lib -cp Makefile Makefile.orig -sed -e 's/^EXTMK_ARGS[[:space:]].*=\(.*\) --$/EXTMK_ARGS=\1 --disable-tcl-thread --/' Makefile.orig > Makefile +#cp Makefile Makefile.orig +#sed -e 's/^EXTMK_ARGS[[:space:]].*=\(.*\) --$/EXTMK_ARGS=\1 --disable-tcl-thread --/' Makefile.orig > Makefile make RUBY_INSTALL_NAME=ruby %{?_smp_mflags} %ifarch ia64 # Miscompilation? Buggy code? @@ -297,7 +288,8 @@ _cpu=`echo %{_target_cpu} | sed 's/^ppc/powerpc/'` %{__mkdir_p} $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/$_cpu-%{_target_os} # generate ri doc -DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/ -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} +make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} DESTDIR=$RPM_BUILD_ROOT install-doc +#DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/ -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} # XXX: installing irb install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/ @@ -329,7 +321,7 @@ egrep '(\.[ah]|libruby\.so)$' ruby-all.files > ruby-devel.files # for ruby-tcltk.rpm cp /dev/null ruby-tcltk.files -for f in `find %{name}-%{version}/ext/tk/lib -type f; find %{name}-%{version}/ext/tk -type f -name '*.so'` +for f in `find %{name}-%{version}/ext/tk/lib -type f; find %{name}-%{version}/.ext -type f -name '*.so'` do egrep "tcl|tk" ruby-all.files | grep "/`basename $f`$" >> ruby-tcltk.files || : done @@ -452,6 +444,15 @@ rm -rf tmp-ruby-docs %endif %changelog +* Mon Aug 28 2006 Akira TAGOH - 1.8.5-1 +- New upstream release. +- removed the unnecessary patches: + - ruby-1.8.4-no-eaccess.patch + - ruby-1.8.4-64bit-pack.patch + - ruby-1.8.4-fix-insecure-dir-operation.patch + - ruby-1.8.4-fix-insecure-regexp-modification.patch + - ruby-1.8.4-fix-alias-safe-level.patch + * Mon Aug 7 2006 Akira TAGOH - 1.8.4-12 - owns sitearchdir. (#201208) diff --git a/sources b/sources index cc60eef..53c52a9 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ d65e3a216d6d345a2a6f1aa8758c2f75 ruby-refm-rdp-1.8.1-ja-html.tar.gz 7f3e181c0be9a1579e43a5a8b26372d6 rubyfaq-990927.tar.bz2 8aa2e2da327dc43ff6e46e634eb657b6 rubyfaq-jp-990927.tar.bz2 -bd8c2e593e1fa4b01fd98eaf016329bb ruby-1.8.4.tar.gz +3fbb02294a8ca33d4684055adba5ed6f ruby-1.8.5.tar.gz