rpms/ruby
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- exclude ppc64 to make ruby-mode package. right now emacs.ppc64 isn't

Browse Source 
provided and buildsys became much stricker.
- ruby-deprecated-sitelib-search-path.patch: applied to add more search
    path for backward compatiblity.
- added byacc to BuildReq. (#194161)
This commit is contained in:
Akira TAGOH 2006-06-07 07:32:39 +00:00
parent 77ae384250
commit f8e4dcc126
3 changed files with 78 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruby-deprecated-search-path.patch
View File

@ -1,8 +1,7 @@
バイナリー・ファイルruby-1.8.4.orig/.ruby.c.swpとruby-1.8.4/.ruby.c.swpは違います
diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
--- ruby-1.8.4.orig/configure.in 2006-04-20 12:53:38.000000000 +0900 --- ruby-1.8.4.orig/configure.in 2006-04-20 12:53:38.000000000 +0900
+++ ruby-1.8.4/configure.in 2006-04-20 13:06:07.000000000 +0900 +++ ruby-1.8.4/configure.in 2006-04-20 13:06:07.000000000 +0900
@@ -1472,10 +1472,14 @@ @@ -1472,12 +1472,16 @@
esac esac
RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}" RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}"
RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}" RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
@ -11,6 +10,8 @@ diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}") AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}") AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}") AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB, "${libdir}/site_ruby")
AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB2, "${libdir}/site_ruby/${MAJOR}.${MINOR}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_LIB, "${RUBY_LIB_PATH2}") +AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_LIB, "${RUBY_LIB_PATH2}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_SITE_LIB, "${SITE_DIR2}") +AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_SITE_LIB, "${SITE_DIR2}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_SITE_LIB2, "${RUBY_DEPRECATED_SITE_LIB_PATH}") +AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_SITE_LIB2, "${RUBY_DEPRECATED_SITE_LIB_PATH}")
@ -20,7 +21,7 @@ diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c
--- ruby-1.8.4.orig/ruby.c 2005-12-12 09:36:52.000000000 +0900 --- ruby-1.8.4.orig/ruby.c 2005-12-12 09:36:52.000000000 +0900
+++ ruby-1.8.4/ruby.c 2006-04-20 12:59:50.000000000 +0900 +++ ruby-1.8.4/ruby.c 2006-04-20 12:59:50.000000000 +0900
@@ -292,13 +292,22 @@ @@ -292,11 +292,17 @@
#endif #endif
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB2)); ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB2));
@ -35,6 +36,11 @@ diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c
+#ifdef RUBY_DEPRECATED_SITE_LIB +#ifdef RUBY_DEPRECATED_SITE_LIB
+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB)); + ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB));
+#endif +#endif
#ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB
ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB));
#endif
@@ -308,6 +314,9 @@
#endif
ruby_incpush(RUBY_RELATIVE(RUBY_LIB)); ruby_incpush(RUBY_RELATIVE(RUBY_LIB));
+#ifdef RUBY_DEPRECATED_LIB +#ifdef RUBY_DEPRECATED_LIB

39
ruby-deprecated-sitelib-search-path.patch Normal file
View File

@ -0,0 +1,39 @@
diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
--- ruby-1.8.4.orig/configure.in 2006-06-07 13:58:03.000000000 +0900
+++ ruby-1.8.4/configure.in 2006-06-07 15:54:36.000000000 +0900
@@ -1476,6 +1476,8 @@
AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB, "${libdir}/site_ruby")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB2, "${libdir}/site_ruby/${MAJOR}.${MINOR}")
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
@@ -1506,6 +1508,7 @@
AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH2}/${arch}")
AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH3}/${sitearch}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_ARCHLIB, "${libdir}/site_ruby/${MAJOR}.${MINOR}/${sitearch}")
AC_ARG_WITH(search-path,
[ --with-search-path=DIR specify the additional search path],
diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c
--- ruby-1.8.4.orig/ruby.c 2005-12-12 09:36:52.000000000 +0900
+++ ruby-1.8.4/ruby.c 2006-06-07 15:56:14.000000000 +0900
@@ -297,6 +297,15 @@
#endif
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
+#ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB
+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB));
+#endif
+#ifdef RUBY_DEPRECATED_OLD_SITE_LIB
+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB));
+#endif
+#ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
+#endif
ruby_incpush(RUBY_RELATIVE(RUBY_LIB));
#ifdef RUBY_THIN_ARCHLIB

39
ruby.spec
View File

@ -5,11 +5,11 @@
Name: ruby Name: ruby
Version: 1.8.4 Version: 1.8.4
Release: 6.fc6 Release: 7.fc6
License: Ruby License/GPL - see COPYING License: Ruby License/GPL - see COPYING
URL: http://www.ruby-lang.org/ URL: http://www.ruby-lang.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel emacs BuildRequires: readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel emacs byacc
Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{name}-%{version}.tar.gz Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{name}-%{version}.tar.gz
##Source1: ftp://ftp.ruby-lang.org/pub/%{name}/doc/%{name}-man-%{manver}.tar.gz ##Source1: ftp://ftp.ruby-lang.org/pub/%{name}/doc/%{name}-man-%{manver}.tar.gz
@ -25,10 +25,11 @@ Source10: ruby-mode-init.el
Patch1: ruby-1.8.2-deadcode.patch Patch1: ruby-1.8.2-deadcode.patch
Patch2: ruby-1.8.4-no-eaccess.patch Patch2: ruby-1.8.4-no-eaccess.patch
Patch3: ruby-rubyprefix.patch Patch3: ruby-rubyprefix.patch
Patch4: ruby-deprecated-search-path.patch Patch4: ruby-deprecated-sitelib-search-path.patch
Patch5: ruby-multilib.patch Patch5: ruby-deprecated-search-path.patch
Patch6: ruby-tcltk-multilib.patch Patch6: ruby-multilib.patch
Patch7: ruby-1.8.4-64bit-pack.patch Patch7: ruby-tcltk-multilib.patch
Patch8: ruby-1.8.4-64bit-pack.patch
Summary: An interpreter of object-oriented scripting language Summary: An interpreter of object-oriented scripting language
Group: Development/Languages Group: Development/Languages
@ -105,6 +106,7 @@ Group: Documentation
Manuals and FAQs for the object-oriented scripting language Ruby. Manuals and FAQs for the object-oriented scripting language Ruby.
%ifnarch ppc64
%package mode %package mode
Summary: Emacs Lisp ruby-mode for the scripting language Ruby Summary: Emacs Lisp ruby-mode for the scripting language Ruby
Group: Applications/Editors Group: Applications/Editors
@ -112,6 +114,7 @@ Requires: emacs-common
%description mode %description mode
Emacs Lisp ruby-mode for the object-oriented scripting language Ruby. Emacs Lisp ruby-mode for the object-oriented scripting language Ruby.
%endif
%package ri %package ri
@ -139,11 +142,12 @@ pushd %{name}-%{version}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%ifarch ppc64 s390x sparc64 x86_64
%patch4 -p1 %patch4 -p1
%ifarch ppc64 s390x sparc64 x86_64
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1
%endif %endif
popd popd
@ -185,10 +189,12 @@ popd
%install %install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
%ifnarch ppc64
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/xemacs/xemacs-packages/lisp/ruby-mode #%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/xemacs/xemacs-packages/lisp/ruby-mode
%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/xemacs/xemacs-packages/lisp/site-start.d #%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/xemacs/xemacs-packages/lisp/site-start.d
%endif
# installing documents and exapmles... # installing documents and exapmles...
mkdir tmp-ruby-docs mkdir tmp-ruby-docs
@ -285,6 +291,7 @@ DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROO
# XXX: installing irb # XXX: installing irb
install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/ install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/
%ifnarch ppc64
# installing ruby-mode # installing ruby-mode
cd %{name}-%{version} cd %{name}-%{version}
cp misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode cp misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
@ -301,6 +308,7 @@ install -m 644 %{SOURCE10} \
$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
cd .. cd ..
%endif
# listing all files in ruby-all.files # listing all files in ruby-all.files
(find $RPM_BUILD_ROOT -type f -o -type l) | (find $RPM_BUILD_ROOT -type f -o -type l) |
@ -337,9 +345,13 @@ cp /dev/null ruby-libs.files
fgrep -h '%{_prefix}/lib' ruby-devel.files ruby-tcltk.files irb.files ri.files rdoc.files) | egrep -v "elc?$" | \ fgrep -h '%{_prefix}/lib' ruby-devel.files ruby-tcltk.files irb.files ri.files rdoc.files) | egrep -v "elc?$" | \
sort | uniq -u > ruby-libs.files sort | uniq -u > ruby-libs.files
%ifnarch ppc64
# for ruby-mode # for ruby-mode
cp /dev/null ruby-mode.files cp /dev/null ruby-mode.files
fgrep '.el' ruby-all.files >> ruby-mode.files fgrep '.el' ruby-all.files >> ruby-mode.files
%else
touch ruby-mode.files
%endif
# for ruby.rpm # for ruby.rpm
sort ruby-all.files \ sort ruby-all.files \
@ -427,12 +439,21 @@ rm -rf tmp-ruby-docs
%doc tmp-ruby-docs/ruby-docs/* %doc tmp-ruby-docs/ruby-docs/*
%doc tmp-ruby-docs/ruby-libs/* %doc tmp-ruby-docs/ruby-libs/*
%ifnarch ppc64
%files mode -f ruby-mode.files %files mode -f ruby-mode.files
%defattr(-, root, root) %defattr(-, root, root)
%doc %{name}-%{version}/misc/README %doc %{name}-%{version}/misc/README
%dir %{_datadir}/emacs/site-lisp/ruby-mode %dir %{_datadir}/emacs/site-lisp/ruby-mode
%endif
%changelog %changelog
* Wed Jun 7 2006 Akira TAGOH <tagoh@redhat.com> - 1.8.4-7
- exclude ppc64 to make ruby-mode package. right now emacs.ppc64 isn't provided
and buildsys became much stricker.
- ruby-deprecated-sitelib-search-path.patch: applied to add more search path
for backward compatiblity.
- added byacc to BuildReq. (#194161)
* Wed May 17 2006 Akira TAGOH <tagoh@redhat.com> - 1.8.4-6 * Wed May 17 2006 Akira TAGOH <tagoh@redhat.com> - 1.8.4-6
- ruby-deprecated-search-path.patch: added the deprecated installation paths - ruby-deprecated-search-path.patch: added the deprecated installation paths
to the search path for the backward compatibility. to the search path for the backward compatibility.