SPECS (DEVEL): ruby1.9.spec - up to 1.9.0 patchlevel 4 - with/without emacs...

twittner twittner at pld-linux.org
Sun Sep 14 12:07:10 CEST 2008 

Author: twittner                     Date: Sun Sep 14 10:07:10 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- up to 1.9.0 patchlevel 4
- with/without emacs fixes
- introduce %_suffix macro to help build binaries & packages
  with/without version suffix added to their base names

---- Files affected:
SPECS:
   ruby1.9.spec (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: SPECS/ruby1.9.spec
diff -u SPECS/ruby1.9.spec:1.1.2.2 SPECS/ruby1.9.spec:1.1.2.3
--- SPECS/ruby1.9.spec:1.1.2.2	Sat Aug 16 22:49:03 2008
+++ SPECS/ruby1.9.spec	Sun Sep 14 12:07:04 2008
@@ -11,6 +11,8 @@
 %bcond_without	emacs	# skip building package with ruby-mode for emacs
 %bcond_without	tk	# skip building package with Tk bindings
 #
+#%%define		_suffix	%{?!suffix:1.9}%{?suffix} - unfortunately, expands to 9 when --define 'suffix %{nil}' is passed 
+%define		_suffix	1.9
 %define		ruby_ver	1.9.0
 %define		ruby_ridir	%{_datadir}/ri/%{ruby_ver}/system
 Summary:	Ruby - interpreted scripting language
@@ -18,21 +20,21 @@
 Summary(pl.UTF-8):	Ruby - interpretowany język skryptowy
 Summary(pt_BR.UTF-8):	Linguagem de script orientada a objeto
 Summary(zh_CN.UTF-8):	ruby - 一种快速高效的面向对象脚本编程语言
-%define patchlevel 2
-Name:		ruby1.9
+%define patchlevel 4
+Name:		ruby%{_suffix}
 Version:	%{ruby_ver}.%{patchlevel}
 Release:	0.1
 Epoch:		1
 License:	The Ruby License
 Group:		Development/Languages
 Source0: ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-%{ruby_ver}-%{patchlevel}.tar.bz2
-# Source0-md5:	600349ecf5af7bf7900823cb185c371d
+# Source0-md5:	429cf38c075332118860f58152291954
 Source4:	irb.1
 Source8:	erb.1
 Source9:	rdoc.1
 Source10:	ri.1
 Source11:	testrb.1
-Source12:	%{name}-mode-init.el
+Source12:	ruby-mode-init.el
 #Patch0:		%{name}-info.patch
 #Patch1:		%{name}-LIB_PREFIX.patch
 #Patch2:		%{name}-mkmf-shared.patch
@@ -59,6 +61,9 @@
 Obsoletes:	ruby-REXML
 Obsoletes:	ruby-doc < 1.8.4
 Obsoletes:	ruby-fastthread
+%if "%{_suffix}" == ""
+Obsoletes:	ruby
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # bleh, some nasty (gcc or ruby) bug still not fixed
@@ -105,6 +110,9 @@
 Group:		Development/Languages
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	ruby-modules(ver) = %{ruby_ver}
+%if "%{_suffix}" == ""
+Obsoletes:	ruby-modules
+%endif
 
 %description modules
 Ruby standard modules and utilities:
@@ -139,6 +147,9 @@
 Summary(pl.UTF-8):	Biblioteki programistyczne interpretera języka Ruby
 Group:		Development/Languages
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+%if "%{_suffix}" == ""
+Obsoletes:	ruby-devel
+%endif
 
 %description devel
 Ruby development libraries.
@@ -151,6 +162,9 @@
 Summary(pl.UTF-8):	Biblioteki statyczne Ruby
 Group:		Development/Languages
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+%if "%{_suffix}" == ""
+Obsoletes:	ruby-static
+%endif
 
 %description static
 Ruby static libraries.
@@ -162,6 +176,9 @@
 Summary:	Ruby HTML documentation
 Summary(pl.UTF-8):	Dokumentacja HTML do Ruby
 Group:		Documentation
+%if "%{_suffix}" == ""
+Obsoletes:	ruby-doc
+%endif
 
 %description doc
 Ruby HTML documentation: FAQ, guide, core and standard library.
@@ -175,6 +192,9 @@
 Summary(pl.UTF-8):	Dokumentacja Ruby w formacie ri
 Group:		Documentation
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+%if "%{_suffix}" == ""
+Obsoletes:	ruby-doc-ri
+%endif
 
 %description doc-ri
 Ruby ri documentation.
@@ -186,6 +206,9 @@
 Summary:	Ruby examples
 Summary(pl.UTF-8):	Przykłady dla języka Ruby
 Group:		Development/Languages
+%if "%{_suffix}" == ""
+Obsoletes:	ruby-examples
+%endif
 
 %description examples
 Ruby examples.
@@ -199,6 +222,9 @@
 Group:		Development/Tools
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Requires:	emacs-common
+%if "%{_suffix}" == ""
+Obsoletes:	ruby-emacs-mode
+%endif
 
 %description emacs-mode
 Ruby mode and debugger for Emacs.
@@ -223,7 +249,7 @@
 
 %{__autoconf}
 %configure \
-	--program-suffix=1.9 \
+	--program-suffix=%{_suffix} \
 	--enable-shared \
 	--enable-pthread
 
@@ -236,7 +262,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_infodir},%{_mandir}/man1,%{_examplesdir}/ruby-%{version},%{ruby_ridir}}
-install -d $RPM_BUILD_ROOT{%{_datadir}/ruby,%{_emacs_lispdir}/{ruby-mode,site-start.d}}
 
 %{__make} %{?with_doc:install}%{!?with_doc:install-nodoc} \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -257,6 +282,7 @@
 
 # ruby emacs mode - borrowed from FC-4
 %if %{with emacs}
+install -d $RPM_BUILD_ROOT{%{_datadir}/ruby,%{_emacs_lispdir}/{ruby-mode,site-start.d}}
 install misc/*.el $RPM_BUILD_ROOT%{_emacs_lispdir}/ruby-mode
 rm -f $RPM_BUILD_ROOT%{_emacs_lispdir}/ruby-mode/rubydb2x.el
 install %{SOURCE12} $RPM_BUILD_ROOT%{_emacs_lispdir}/site-start.d
@@ -281,7 +307,7 @@
 %files
 %defattr(644,root,root,755)
 %doc README README.EXT ChangeLog ToDo
-%attr(755,root,root) %{_bindir}/ruby1.9
+%attr(755,root,root) %{_bindir}/ruby%{_suffix}
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
 #%{_mandir}/man1/ruby.1*
 #%{_infodir}/*.info*
@@ -320,13 +346,13 @@
 
 %files modules
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/erb1.9
-%attr(755,root,root) %{_bindir}/gem1.9
-%attr(755,root,root) %{_bindir}/irb1.9
-%attr(755,root,root) %{_bindir}/rake1.9
-%attr(755,root,root) %{_bindir}/rdoc1.9
-%attr(755,root,root) %{_bindir}/ri1.9
-%attr(755,root,root) %{_bindir}/testrb1.9
+%attr(755,root,root) %{_bindir}/erb%{_suffix}
+%attr(755,root,root) %{_bindir}/gem%{_suffix}
+%attr(755,root,root) %{_bindir}/irb%{_suffix}
+%attr(755,root,root) %{_bindir}/rake%{_suffix}
+%attr(755,root,root) %{_bindir}/rdoc%{_suffix}
+%attr(755,root,root) %{_bindir}/ri%{_suffix}
+%attr(755,root,root) %{_bindir}/testrb%{_suffix}
 %{_libdir}/ruby/%{ruby_ver}/bigdecimal
 %{_libdir}/ruby/%{ruby_ver}/cgi
 %{_libdir}/ruby/%{ruby_ver}/date
@@ -413,6 +439,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.3  2008/09/14 10:07:04  twittner
+- up to 1.9.0 patchlevel 4
+- with/without emacs fixes
+- introduce %_suffix macro to help build binaries & packages
+  with/without version suffix added to their base names
+
 Revision 1.1.2.2  2008/08/16 20:49:03  twittner
 - fix doc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ruby1.9.spec?r1=1.1.2.2&r2=1.1.2.3&f=u

More information about the pld-cvs-commit mailing list