/[packages]/updates/1/ruby/current/SPECS/ruby.spec

Diff of /updates/1/ruby/current/SPECS/ruby.spec

Parent Directory | Revision Log | View Patch Patch

-revision 208291 by pterjan,
Sun Feb 12 23:15:31 2012 UTC
+revision 304644 by luigiwalser,
Thu Oct 11 12:54:46 2012 UTC
 Line 2
  %define rubyver 1.8.7
  %define patchversion p357
  %define rel 1
+ %define subrel 1
  Summary:        Object Oriented Script Language
  Name:           ruby
-Line 22 
 Obsoletes:     ruby-rexml
+Line 23 
 Obsoletes:     ruby-rexml
  Provides:       ruby-rexml
  # explicit file provides (since such requires are automatically added by find-requires)
  Provides: /usr/bin/ruby
- Provides: ruby(abi) = %subver
+ Provides: ruby(abi) = %{subver}
  Source0:        ftp://ftp.ruby-lang.org/pub/ruby/%{subver}/ruby-%{rubyver}-%{patchversion}.tar.bz2
  Source1:        http://www.rubycentral.com/faq/rubyfaqall.html.bz2
-Line 33 
 Patch1:                ruby-do-not-use-system-ruby-to-
+Line 34 
 Patch1:                ruby-do-not-use-system-ruby-to-
  Patch2:         ruby-add-old-os-to-search-path.patch
  Patch3:         ruby-do_not_propagate_no-undefined.patch
  Patch4:         110703_CVE-2011-0188.patch
+ Patch5:         ruby-1.8.7-p358-CVE-2012-4466-CVE-2012-4481.patch
  URL:            http://www.ruby-lang.org/
- Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  %define my_target_cpu %{_target_cpu}
  %ifarch ppc
-Line 105 
 This package contains the Tk extension f
+Line 106 
 This package contains the Tk extension f
  %patch2 -p2 -b .old
  %patch3 -p2 -b .undefined
  %patch4 -p1 -b .CVE-2011-0188
+ %patch5 -p1 -b .CVE-2012-4466-CVE-2012-4481
  autoreconf
-Line 117 
 echo '.text' | gcc -shared -o libdummy.s
+Line 119 
 echo '.text' | gcc -shared -o libdummy.s
    rm -f libdummy.so.0
  }
- CFLAGS=`echo %optflags | sed 's/-fomit-frame-pointer//'`
+ CFLAGS=`echo %{optflags} | sed 's/-fomit-frame-pointer//'`
  %configure2_5x --enable-shared --disable-rpath --enable-pthread \
-         --with-sitedir=%_prefix/lib/ruby/site_ruby \
+         --with-sitedir=%{_prefix}/lib/ruby/site_ruby \
-         --with-vendordir=%_prefix/lib/ruby/vendor_ruby \
+         --with-vendordir=%{_prefix}/lib/ruby/vendor_ruby \
          --with-old-os=linux-gnu
  %make
  %install
- rm -rf %buildroot
+ rm -rf %{buildroot}
  %makeinstall_std install-doc
- install -d %buildroot%{_docdir}/%{name}-%{version}
+ install -d %{buildroot}%{_docdir}/%{name}-%{version}
- cp -a COPYING* ChangeLog README* ToDo sample %buildroot%{_docdir}/%{name}-%{version}
+ cp -a COPYING* ChangeLog README* ToDo sample %{buildroot}%{_docdir}/%{name}-%{version}
- bzcat %{SOURCE1} > %buildroot%{_docdir}/%{name}-%{version}/FAQ.html
+ bzcat %{SOURCE1} > %{buildroot}%{_docdir}/%{name}-%{version}/FAQ.html
- install -d %buildroot%{_datadir}/emacs/site-lisp
+ install -d %{buildroot}%{_datadir}/emacs/site-lisp
- cp -a misc/ruby-mode.el %buildroot%{_datadir}/emacs/site-lisp
+ cp -a misc/ruby-mode.el %{buildroot}%{_datadir}/emacs/site-lisp
- install -d %buildroot%{_sysconfdir}/emacs/site-start.d
+ install -d %{buildroot}%{_sysconfdir}/emacs/site-start.d
- cat <<EOF >%buildroot%{_sysconfdir}/emacs/site-start.d/%{name}.el
+ cat <<EOF >%{buildroot}%{_sysconfdir}/emacs/site-start.d/%{name}.el
  (autoload 'ruby-mode "ruby-mode" "Ruby editing mode." t)
  (add-to-list 'auto-mode-alist '("\\\\.rb$" . ruby-mode))
  (add-to-list 'interpreter-mode-alist '("ruby" . ruby-mode))
  EOF
- (cd %buildroot%{_docdir}/%{name}-%{version} ; tar xfj %{SOURCE2} ; cd Pro*; mv -f html/* . ; rm -rf html xml)
+ (cd %{buildroot}%{_docdir}/%{name}-%{version} ; tar xfj %{SOURCE2} ; cd Pro*; mv -f html/* . ; rm -rf html xml)
  # Make the file/dirs list, filtering out tcl/tk and devel files
- ( cd %buildroot \
+ ( cd %{buildroot} \
    && find usr/lib/ruby/%{subver} \
            \( -not -type d -printf "/%%p\n" \) \
            -or \( -type d -printf "%%%%dir /%%p\n" \) \
  ) | egrep -v '/(tcl)?tk|(%{my_target_cpu}-%{_target_os}%{abi}/.*[ha]$)' > %{name}.list
  # Fix scripts permissions and location
- find %buildroot sample -type f | file -i -f - | grep text | cut -d: -f1 >text.list
+ find %{buildroot} sample -type f | file -i -f - | grep text | cut -d: -f1 >text.list
  cat text.list | xargs chmod 0644
  #  Magic grepping to get only files with '#!' in the first line
  cat text.list | xargs grep -n '^#!' | grep ':1:#!' | cut -d: -f1 >shebang.list
-Line 163 
 cat shebang.list | xargs chmod 0755
+Line 165 
 cat shebang.list | xargs chmod 0755
  # Install the rpm macros
- mkdir -p %buildroot%{_sysconfdir}/rpm/macros.d
+ mkdir -p %{buildroot}%{_sysconfdir}/rpm/macros.d
- cp %{SOURCE3} %buildroot%{_sysconfdir}/rpm/macros.d
+ cp %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.d
  %check
  make test
  %clean
- rm -rf %buildroot
+ rm -rf %{buildroot}
  %files -f %{name}.list
- %defattr(-, root, root)
  %dir %{_docdir}/%{name}-%{version}
  %{_docdir}/%{name}-%{version}/README
  %{_bindir}/*
-Line 185 
 rm -rf %buildroot
+Line 186 
 rm -rf %buildroot
  %{_sysconfdir}/rpm/macros.d/%{name}.macros
  %files doc
- %defattr(-, root, root)
  %{_datadir}/ri
  %dir %{_docdir}/%{name}-%{version}
  %{_docdir}/%{name}-%{version}/COPYING*
 Line 197 
 rm -rf %buildroot
  %{_docdir}/%{name}-%{version}/ProgrammingRuby*
  %files devel
- %defattr(-, root, root)
  %{_prefix}/lib/%{name}/%{subver}/%{my_target_cpu}-%{_target_os}%{abi}/*.[ah]
  %{_libdir}/libruby-static.a
  %{_libdir}/libruby.so
  %files tk
- %defattr(-, root, root)
  %{_prefix}/lib/%{name}/%{subver}/%{my_target_cpu}-%{_target_os}%{abi}/tcltk*
  %{_prefix}/lib/%{name}/%{subver}/%{my_target_cpu}-%{_target_os}%{abi}/tk*
  %{_prefix}/lib/%{name}/%{subver}/tcltk*
  %{_prefix}/lib/%{name}/%{subver}/tk*
  %{_prefix}/lib/%{name}/%{subver}/test/unit/ui/tk

 Legend:



Removed from v.208291
 


changed lines


 
Added in v.304644
 Legend:



Removed from v.208291
 


changed lines


 
Added in v.304644
-Removed from v.208291
+Added in v.304644

	ViewVC Help
Powered by ViewVC 1.1.30