SPECS: ruby-ActionMailer.spec, ruby-ActionPack.spec, ruby-ActionWe...

glen glen at pld-linux.org
Sat Nov 19 14:32:35 CET 2005


Author: glen                         Date: Sat Nov 19 13:32:35 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use system ruby macros
- cleanups, corrections, cosmetics

---- Files affected:
SPECS:
   ruby-ActionMailer.spec (1.10 -> 1.11) , ruby-ActionPack.spec (1.16 -> 1.17) , ruby-ActionWebService.spec (1.7 -> 1.8) , ruby-ActiveRecord.spec (1.25 -> 1.26) , ruby-ActiveSupport.spec (1.9 -> 1.10) , ruby-arrayfields.spec (1.3 -> 1.4) , ruby-bdb.spec (1.3 -> 1.4) , ruby-Borges.spec (1.5 -> 1.6) , ruby-breakpoint.spec (1.2 -> 1.3) , ruby-Criteria.spec (1.5 -> 1.6) , ruby-DBI.spec (1.9 -> 1.10) , ruby-DelimScanner.spec (1.5 -> 1.6) , ruby-dev-utils.spec (1.3 -> 1.4) , ruby-dict.spec (1.2 -> 1.3) , ruby-Diff-LCS.spec (1.6 -> 1.7) , ruby-dl2.spec (1.2 -> 1.3) , ruby-ecore.spec (1.3 -> 1.4) , ruby-edje.spec (1.3 -> 1.4) , ruby-eet.spec (1.1 -> 1.2) , ruby-epeg.spec (1.4 -> 1.5) , ruby-epsilon.spec (1.3 -> 1.4) , ruby-ERuby.spec (1.4 -> 1.5) , ruby-esmart.spec (1.2 -> 1.3) , ruby-evas.spec (1.4 -> 1.5) , ruby-exif.spec (1.2 -> 1.3) , ruby-extensions.spec (1.4 -> 1.5) , ruby-facets.spec (1.5 -> 1.6) , ruby-Fam.spec (1.5 -> 1.6) , ruby-fcgi.spec (1.6 -> 1.7) , ruby-Gen.spec (1.2 -> 1.3) , ruby-gettext.spec (1.2 -> 1.3) , ruby-Glue.spec (1.13 -> 1.14) , ruby-gnome2.spec (1.33 -> 1.34) , ruby-gtkmozembed.spec (1.3 -> 1.4) , ruby-guid.spec (1.2 -> 1.3) , ruby-Iowa.spec (1.3 -> 1.4) , ruby-jabber4r.spec (1.4 -> 1.5) , ruby-jabber-rpc.spec (1.4 -> 1.5) , ruby-json.spec (1.3 -> 1.4) , ruby-kansas.spec (1.2 -> 1.3) , ruby-levenshtein.spec (1.2 -> 1.3) , ruby-libexif.spec (1.1 -> 1.2) , ruby-LOG4R.spec (1.4 -> 1.5) , ruby-Multiton.spec (1.3 -> 1.4) , ruby-mysql.spec (1.20 -> 1.21) , ruby-NArray.spec (1.2 -> 1.3) , ruby-Ncurses.spec (1.6 -> 1.7) , ruby-Needle.spec (1.2 -> 1.3) , ruby-Net-SFTP.spec (1.3 -> 1.4) , ruby-Net-SSH.spec (1.4 -> 1.5) , ruby-Nitro.spec (1.12 -> 1.13) , ruby-odbc.spec (1.4 -> 1.5) , ruby-Og.spec (1.22 -> 1.23) , ruby-open4.spec (1.2 -> 1.3) , ruby-OrderedHash.spec (1.2 -> 1.3) , ruby-PageTemplate.spec (1.2 -> 1.3) , ruby-PAM.spec (1.6 -> 1.7) , ruby-pluginfactory.spec (1.3 -> 1.4) , ruby-Postgres.spec (1.5 -> 1.6) , ruby-Quanty.spec (1.2 -> 1.3) , ruby-Racc.spec (1.6 -> 1.7) , ruby-rbogl.spec (1.7 -> 1
.8) , ruby-rcairo.spec (1.7 -> 1.8) , ruby-rdf-redland.spec (1.3 -> 1.4) , ruby-redcloth.spec (1.5 -> 1.6) , ruby-rena.spec (1.3 -> 1.4) , ruby-RMagick.spec (1.21 -> 1.22) , ruby-RMail.spec (1.14 -> 1.15) , ruby-rockit.spec (1.10 -> 1.11) , ruby-RubyGems.spec (1.3 -> 1.4) , ruby-runt.spec (1.7 -> 1.8) , ruby-sqlite.spec (1.5 -> 1.6) , ruby-syntax.spec (1.3 -> 1.4) , ruby-Text-Format.spec (1.4 -> 1.5) , ruby-TMail.spec (1.5 -> 1.6) , ruby-transaction-simple.spec (1.2 -> 1.3) , ruby-web.spec (1.3 -> 1.4) , ruby-wikify.spec (1.5 -> 1.6) , ruby-vorbisfile.spec (1.4 -> 1.5) , ruby-xattr.spec (1.5 -> 1.6) , ruby-xhtmldiff.spec (1.6 -> 1.7) , ruby-XTemplate.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/ruby-ActionMailer.spec
diff -u SPECS/ruby-ActionMailer.spec:1.10 SPECS/ruby-ActionMailer.spec:1.11
--- SPECS/ruby-ActionMailer.spec:1.10	Tue Oct 25 18:25:57 2005
+++ SPECS/ruby-ActionMailer.spec	Sat Nov 19 14:32:04 2005
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-%define	ruby_rubylibdir	%(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-%define	ruby_ridir	%(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")')
-%define	ruby_version	%(ruby -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
 Summary:	Mail generator library for Ruby
 Summary(pl):	Biblioteka do generowania listów w języku Ruby
 Name:		ruby-ActionMailer
@@ -13,6 +10,7 @@
 Source0:	http://rubyforge.org/download.php/6575/%{tarname}-%{version}.tgz
 # Source0-md5:	3649c201096d5e4d0a45f34ddd253c60
 URL:		http://actionpack.rubyonrails.org/
+BuildRequires:	rpmbuild(macros) >= 1.263
 BuildRequires:	ruby
 Requires:	ruby
 Requires:	ruby-ActionPack >= 1.7.0
@@ -57,6 +55,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/11/19 13:32:04  glen
+- use system ruby macros
+- cleanups, corrections, cosmetics
+
 Revision 1.10  2005/10/25 16:25:57  aredridel
 - up to 1.1.1
 

================================================================
Index: SPECS/ruby-ActionPack.spec
diff -u SPECS/ruby-ActionPack.spec:1.16 SPECS/ruby-ActionPack.spec:1.17
--- SPECS/ruby-ActionPack.spec:1.16	Tue Oct 25 18:06:45 2005
+++ SPECS/ruby-ActionPack.spec	Sat Nov 19 14:32:04 2005
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-%define	ruby_rubylibdir	%(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-%define	ruby_ridir	%(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")')
-%define	ruby_version	%(ruby -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
 Summary:	Object-Relational mapping library for Ruby
 Summary(pl):	Biblioteka odwzorowań obiektowo-relacyjnych dla Ruby
 Name:		ruby-ActionPack
@@ -13,6 +10,7 @@
 Source0:	http://rubyforge.org/download.php/6572/%{tarname}-%{version}.tgz
 # Source0-md5:	e20151363f754692c68519b13c1a4377
 URL:		http://actionpack.rubyonrails.org/
+BuildRequires:	rpmbuild(macros) >= 1.263
 BuildRequires:	ruby
 Requires:	ruby
 #BuildArch:	noarch
@@ -64,6 +62,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2005/11/19 13:32:04  glen
+- use system ruby macros
+- cleanups, corrections, cosmetics
+
 Revision 1.16  2005/10/25 16:06:45  aredridel
 - up to 1.10.1
 

================================================================
Index: SPECS/ruby-ActionWebService.spec
diff -u SPECS/ruby-ActionWebService.spec:1.7 SPECS/ruby-ActionWebService.spec:1.8
--- SPECS/ruby-ActionWebService.spec:1.7	Tue Oct 25 19:52:55 2005
+++ SPECS/ruby-ActionWebService.spec	Sat Nov 19 14:32:04 2005
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-%define	ruby_rubylibdir	%(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-%define	ruby_ridir	%(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")')
-%define	ruby_version	%(ruby -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
 Summary:	Web Services libraries for Ruby on Rails
 Summary(pl):	Biblioteki usług WWW dla Ruby on Rails
 Name:		ruby-ActionWebService
@@ -13,6 +10,7 @@
 Source0:	http://rubyforge.org/frs/download.php/6578/%{tarname}-%{version}.tgz
 # Source0-md5:	56d75b6e8b8cc5eee38446c56888f16f
 URL:		http://www.rubyonrails.com/
+BuildRequires:	rpmbuild(macros) >= 1.263
 BuildRequires:	ruby
 Requires:	ruby
 #BuildArch:	noarch
@@ -52,6 +50,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2005/11/19 13:32:04  glen
+- use system ruby macros
+- cleanups, corrections, cosmetics
+
 Revision 1.7  2005/10/25 17:52:55  aredridel
 - up to 0.9.1
 

================================================================
Index: SPECS/ruby-ActiveRecord.spec
diff -u SPECS/ruby-ActiveRecord.spec:1.25 SPECS/ruby-ActiveRecord.spec:1.26
--- SPECS/ruby-ActiveRecord.spec:1.25	Tue Oct 25 17:55:04 2005
+++ SPECS/ruby-ActiveRecord.spec	Sat Nov 19 14:32:04 2005
@@ -3,9 +3,6 @@
 # TODO
 # - rip out vendor libraries: mysql.rb, sqlite.rb, simple.rb
 #
-%define	ruby_rubylibdir	%(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-%define	ruby_ridir	%(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"])')
-%define	ruby_version	%(ruby -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
 Summary:	Object-Relational mapping library for Ruby
 Summary(pl):	Biblioteka odwzorowań obiektowo-relacyjnych dla Ruby
 Name:		ruby-ActiveRecord
@@ -18,6 +15,7 @@
 # Source0-md5:	225d3df8fe7a554dfea1a75e91e2605d
 Patch0:		%{name}-sanity.patch
 URL:		http://activerecord.rubyonrails.org/
+BuildRequires:	rpmbuild(macros) >= 1.263
 BuildRequires:	ruby
 Requires:	ruby
 Requires:	ruby-ActiveSupport
@@ -26,7 +24,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-This pachage contains Object-Relational mapping library for Ruby.
+This package contains Object-Relational mapping library for Ruby.
 
 %description -l pl
 Ten pakiet zawiera bibliotekę odwzorowań obiektowo-relacyjnych dla
@@ -35,9 +33,9 @@
 %prep
 %setup -q -n %{tarname}-%{version}
 %patch0 -p1
+rm -r lib/active_record/vendor
 
 %build
-rm lib/active_record/vendor -r
 rdoc --ri --op ri lib
 rdoc --op rdoc lib
 
@@ -62,6 +60,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2005/11/19 13:32:04  glen
+- use system ruby macros
+- cleanups, corrections, cosmetics
+
 Revision 1.25  2005/10/25 15:55:04  aredridel
 - up to 1.12.1
 

================================================================
Index: SPECS/ruby-ActiveSupport.spec
diff -u SPECS/ruby-ActiveSupport.spec:1.9 SPECS/ruby-ActiveSupport.spec:1.10
--- SPECS/ruby-ActiveSupport.spec:1.9	Tue Oct 25 19:35:53 2005
+++ SPECS/ruby-ActiveSupport.spec	Sat Nov 19 14:32:04 2005
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-%define	ruby_rubylibdir	%(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-%define	ruby_ridir	%(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")')
-%define	ruby_version	%(ruby -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
 Summary:	Mail generator library for Ruby
 Summary(pl):	Biblioteka do generowania listów w języku Ruby
 Name:		ruby-ActiveSupport
@@ -13,6 +10,7 @@
 Source0:	http://rubyforge.org/frs/download.php/6566/%{tarname}-%{version}.tgz
 # Source0-md5:	f97e2493a25df6d8901b1c0d9be79ed3
 URL:		http://www.rubyonrails.com/
+BuildRequires:	rpmbuild(macros) >= 1.263
 BuildRequires:	ruby
 Requires:	ruby
 Requires:	ruby-breakpoint
@@ -53,6 +51,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/11/19 13:32:04  glen
+- use system ruby macros
+- cleanups, corrections, cosmetics
+
 Revision 1.9  2005/10/25 17:35:53  aredridel
 - up to 1.2.1
 

================================================================
Index: SPECS/ruby-arrayfields.spec
diff -u SPECS/ruby-arrayfields.spec:1.3 SPECS/ruby-arrayfields.spec:1.4
--- SPECS/ruby-arrayfields.spec:1.3	Wed May 11 21:41:02 2005
+++ SPECS/ruby-arrayfields.spec	Sat Nov 19 14:32:04 2005
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-%define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-%define	ruby_ridir	%(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")')
 Summary:	Hashlike access to arrays
 Summary(pl):	Dostęp do tablic w sposób podobny do tablic asocjacyjnych
 Name:		ruby-arrayfields
@@ -12,6 +10,7 @@
 # Source0-md5:	537e835998e20d019ac33e1bb5503f64
 Source1:	setup.rb
 URL:		http://raa.ruby-lang.org/project/arrayfields/
+BuildRequires:	rpmbuild(macros) >= 1.263
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
 Requires:	ruby
@@ -26,9 +25,9 @@
 
 %prep
 %setup -q -n arrayfields-%{version}
+install %{SOURCE1} setup.rb
 
 %build
-%{__install} %SOURCE1 setup.rb
 ruby setup.rb config \
 	--siterubyver=%{ruby_rubylibdir}
 
@@ -62,6 +61,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/11/19 13:32:04  glen
+- use system ruby macros
+- cleanups, corrections, cosmetics
+
 Revision 1.3  2005/05/11 19:41:02  aredridel
 - corrected setup.rb parameters for new version of setup.rb
 

================================================================
Index: SPECS/ruby-bdb.spec
diff -u SPECS/ruby-bdb.spec:1.3 SPECS/ruby-bdb.spec:1.4
--- SPECS/ruby-bdb.spec:1.3	Mon Jul  4 23:53:08 2005
+++ SPECS/ruby-bdb.spec	Sat Nov 19 14:32:04 2005
@@ -1,11 +1,5 @@
 # $Revision$, $Date$
-%define		ruby_archdir	%(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
-%define		ruby_rubylibdir	%(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-%define		ruby_ridir	%(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")')
-%define		ruby_version	%(ruby -r rbconfig -e 'print Config::CONFIG["ruby_version"]')
-
 %define		tarname		bdb
-
 Summary:	An interface to Berkeley DB
 Summary(pl):	Interfejs do Berkeley DB
 Name:		ruby-bdb
@@ -18,6 +12,7 @@
 URL:		http://moulon.inra.fr/ruby/bdb.html
 BuildRequires:	db-devel
 BuildRequires:	make
+BuildRequires:	rpmbuild(macros) >= 1.263
 BuildRequires:	ruby-devel
 Requires:	ruby
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -35,7 +30,7 @@
 ruby extconf.rb
 %{__make}
 
-rdoc --ri --op ri src 
+rdoc --ri --op ri src
 rdoc --op rdoc src
 
 %install
@@ -65,6 +60,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/11/19 13:32:04  glen
+- use system ruby macros
+- cleanups, corrections, cosmetics
+
 Revision 1.3  2005/07/04 21:53:08  qboosh
 - pl, unified examples dir
 

================================================================
Index: SPECS/ruby-Borges.spec
diff -u SPECS/ruby-Borges.spec:1.5 SPECS/ruby-Borges.spec:1.6
--- SPECS/ruby-Borges.spec:1.5	Thu Aug 26 18:20:59 2004
+++ SPECS/ruby-Borges.spec	Sat Nov 19 14:32:04 2005
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-%define	ruby_archdir	%(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
-%define	ruby_ridir	%(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")')
-%define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
 Summary:	Continuation-based web application framework
 Summary(pl):	Szkielet aplikacji WWW oparty na kontynuacji
 Name:		ruby-Borges
@@ -12,6 +9,7 @@
 Source0:	http://rubyforge.org/frs/download.php/574/borges-%{version}.tar.gz
 # Source0-md5:	16b448d727a2647cf1dadfed22b5a02f
 URL:		http://borges.rubyforge.org/
+BuildRequires:	rpmbuild(macros) >= 1.263
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
 Requires:	ruby
@@ -39,19 +37,17 @@
 %prep
 %setup -q -n borges-%{version}
 
-%build
-
 find lib/ -name 'Test*' -type f -print0 | xargs -0 rm -v
 find lib/ -name 'Test*' -type d -print0 | xargs -0 rm -v -r
+mv data/doc/ruby/Borges/{RDoc,rdoc}
 
+%build
 ruby setup.rb config \
 	--rb-dir=%{ruby_rubylibdir} \
 	--so-dir=%{ruby_archdir}
 
 ruby setup.rb setup
 
-mv data/doc/ruby/Borges/RDoc data/doc/ruby/Borges/rdoc
-
 rdoc --ri --op ri lib
 
 %install
@@ -81,7 +77,6 @@
 %doc data/doc/ruby/Borges/*
 %{ruby_rubylibdir}/Borges.rb
 %{ruby_rubylibdir}/Borges
-%{_examplesdir}/*
 %{ruby_ridir}/Borges
 %{ruby_ridir}/Array/render_on-i.yaml
 %{ruby_ridir}/HtmlRendererProfiler
@@ -97,6 +92,7 @@
 %{ruby_ridir}/String/print_html_on-i.yaml
 %{ruby_ridir}/String/render_on_indent-i.yaml
 %{ruby_ridir}/Weak
+%{_examplesdir}/*
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -104,6 +100,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/11/19 13:32:04  glen
+- use system ruby macros
+- cleanups, corrections, cosmetics
+
 Revision 1.5  2004/08/26 16:20:59  havner
 - rel 2
 

================================================================
Index: SPECS/ruby-breakpoint.spec
diff -u SPECS/ruby-breakpoint.spec:1.2 SPECS/ruby-breakpoint.spec:1.3
--- SPECS/ruby-breakpoint.spec:1.2	Mon Apr  4 20:55:37 2005
+++ SPECS/ruby-breakpoint.spec	Sat Nov 19 14:32:04 2005
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-%define	ruby_archdir	%(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
-%define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-%define	ruby_ridir	%(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")')
 Summary:	Module that lets you inspect and modify state at run time
 Summary(pl):	Moduł pozwalający na sprawdzanie i zmianę stanu programu w czasie działania
 Name:		ruby-breakpoint
@@ -12,6 +9,7 @@
 Source0:	http://rubyforge.org/frs/download.php/3302/%{name}-%{version}.tgz
 # Source0-md5:	c7ca9db1f1ae105c99ddd945d8c55c20
 URL:		http://ruby-breakpoint.rubyforge.org/
+BuildRequires:	rpmbuild(macros) >= 1.263
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
 Requires:	ruby
@@ -65,6 +63,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2005/11/19 13:32:04  glen
+- use system ruby macros
+- cleanups, corrections, cosmetics
+
 Revision 1.2  2005/04/04 18:55:37  qboosh
 - pl
 

================================================================
Index: SPECS/ruby-Criteria.spec
diff -u SPECS/ruby-Criteria.spec:1.5 SPECS/ruby-Criteria.spec:1.6
--- SPECS/ruby-Criteria.spec:1.5	Thu Aug 26 18:21:40 2004
+++ SPECS/ruby-Criteria.spec	Sat Nov 19 14:32:04 2005
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-%define	ruby_archdir	%(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
-%define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-%define	ruby_ridir	%(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")')
 Summary:	Criteria abstract queries
 Summary(pl):	Criteria - abstrakcyjne zapytania
 Name:		ruby-Criteria
@@ -12,6 +9,7 @@
 Source0:	http://mephle.org/Criteria/criteria-%{version}.tar.gz
 # Source0-md5:	a39482fdf7bae7639791444dfb4d91ce
 URL:		http://www.mephle.org/Criteria/
+BuildRequires:	rpmbuild(macros) >= 1.263
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
 Requires:	ruby
@@ -66,6 +64,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/11/19 13:32:04  glen
+- use system ruby macros
+- cleanups, corrections, cosmetics
+
 Revision 1.5  2004/08/26 16:21:40  havner
 - rel 2
 

================================================================
Index: SPECS/ruby-DBI.spec
diff -u SPECS/ruby-DBI.spec:1.9 SPECS/ruby-DBI.spec:1.10
--- SPECS/ruby-DBI.spec:1.9	Sun Jun 12 03:50:38 2005
+++ SPECS/ruby-DBI.spec	Sat Nov 19 14:32:04 2005
@@ -1,11 +1,8 @@
 # $Revision$, $Date$
-%define	ruby_archdir	%(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
-%define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-%define	ruby_ridir	%(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")')
+%define tarname ruby-dbi
 Summary:	DataBase Interface for Ruby
 Summary(pl):	Interfejs do baz danych dla języka Ruby
 Name:		ruby-DBI
-%define tarname ruby-dbi
 Version:	0.0.21
 Release:	5
 License:	GPL
@@ -15,10 +12,11 @@
 Patch0:		%{name}-prefix.patch
 Patch1:		%{name}-timestamps.patch
 Patch2:		%{name}-warning.patch
+BuildRequires:	rpmbuild(macros) >= 1.263
 BuildRequires:	ruby
-BuildRequires:	ruby-mysql
 BuildRequires:	ruby-Postgres
 BuildRequires:	ruby-devel
+BuildRequires:	ruby-mysql
 BuildRequires:	sqlite-devel
 Obsoletes:	ruby-dbi
 Requires:	ruby
@@ -74,9 +72,9 @@
 %patch1 -p1
 %patch2 -p1
 
-%build
 find lib -type d -name 'test*' | xargs rm -r -v
 
+%build
 # dbd_sybase requires TDS API update
 ruby setup.rb config \
 	--with=dbi,dbd_mysql,dbd_proxy,dbd_pg,dbd_sqlite,dbd_sqlrelay \
@@ -133,6 +131,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/11/19 13:32:04  glen
+- use system ruby macros
+- cleanups, corrections, cosmetics
+
 Revision 1.9  2005/06/12 01:50:38  aredridel
 - rel 5 for rebuild
 - STBR

================================================================
Index: SPECS/ruby-DelimScanner.spec
diff -u SPECS/ruby-DelimScanner.spec:1.5 SPECS/ruby-DelimScanner.spec:1.6
--- SPECS/ruby-DelimScanner.spec:1.5	Sun Jul 24 13:08:49 2005
+++ SPECS/ruby-DelimScanner.spec	Sat Nov 19 14:32:04 2005
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-%define	ruby_rubylibdir	%(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-%define	ruby_ridir	%(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")')
 Summary:	A loose Ruby port of Text::Balanced
 Summary(pl):	Swobodny port Text::Balanced dla języka Ruby
 Name:		ruby-DelimScanner
@@ -10,7 +8,9 @@
 Group:		Development/Libraries
 Source0:	http://dev.faeriemud.org/~deveiant/RecDescentParser/lib/DelimScanner.rb?dl=1
 # NoSource0-md5:	0b117164a34732e950713b60bc4a722e
-URL:	http://dev.faeriemud.org/~deveiant/RecDescentParser/lib/DelimScanner.rb
+NoSource:	0
+URL:		http://dev.faeriemud.org/~deveiant/RecDescentParser/lib/DelimScanner.rb
+BuildRequires:	rpmbuild(macros) >= 1.263
 BuildRequires:	ruby
 #BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -26,10 +26,10 @@
 Text::Balanced Damiana Conwaya.
 
 %prep
-%setup -c -T
+%setup -q -cT
+cp %{SOURCE0} DelimScanner.rb
 
 %build
-cp %{SOURCE0} DelimScanner.rb
 rdoc -o rdoc DelimScanner.rb
 rdoc --ri -o ri DelimScanner.rb
 
@@ -58,6 +58,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/11/19 13:32:04  glen
+- use system ruby macros
+- cleanups, corrections, cosmetics
+
 Revision 1.5  2005/07/24 11:08:49  darekr
 - kill setting perms in %install
 

================================================================
Index: SPECS/ruby-dev-utils.spec
diff -u SPECS/ruby-dev-utils.spec:1.3 SPECS/ruby-dev-utils.spec:1.4
--- SPECS/ruby-dev-utils.spec:1.3	Sat Oct 30 14:12:23 2004
+++ SPECS/ruby-dev-utils.spec	Sat Nov 19 14:32:04 2005
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-%define	ruby_archdir	%(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
-%define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-%define	ruby_ridir	%(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")')
 Summary:	Tools to aid Ruby development
 Summary(pl):	Narzędzia pomagające przy programowaniu w języku Ruby
 Name:		ruby-dev-utils
@@ -12,6 +9,7 @@
 Source0:	http://rubyforge.org/frs/download.php/1678/dev-utils-%{version}.tgz
 # Source0-md5:	4869bdb1d0f72ab015110797e691a530
 URL:		http://dev-utils.rubyforge.org/
+BuildRequires:	rpmbuild(macros) >= 1.263
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
 Requires:	ruby
@@ -64,6 +62,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/11/19 13:32:04  glen
+- use system ruby macros
+- cleanups, corrections, cosmetics
+
 Revision 1.3  2004/10/30 12:12:23  qboosh
 - pl
 

================================================================
Index: SPECS/ruby-dict.spec
diff -u SPECS/ruby-dict.spec:1.2 SPECS/ruby-dict.spec:1.3
--- SPECS/ruby-dict.spec:1.2	Wed Apr 13 20:14:15 2005
+++ SPECS/ruby-dict.spec	Sat Nov 19 14:32:04 2005
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-%define	ruby_archdir	%(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
-%define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-%define	ruby_ridir	%(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")')
 Summary:	Ruby client for RFC2229 "Dict" protocol
 Summary(pl):	Klient protokołu Dict (RFC 2229) w języku Ruby
 Name:		ruby-dict
@@ -12,6 +9,7 @@
 Source0:	http://www.caliban.org/files/ruby/%{name}-%{version}.tar.gz
 # Source0-md5:	cb6a68464d8e12a88f592be00bf5d7ca
 URL:		http://www.caliban.org/ruby/
+BuildRequires:	rpmbuild(macros) >= 1.263
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
 Requires:	ruby
@@ -24,7 +22,7 @@
 databases.
 
 In addition, rdict, a command-line based dictionary client built on
-Ruby/DICT, is included. 
+Ruby/DICT, is included.
 
 %description -l pl
 Ruby/DICT to zgodna z RFC 2229 biblioteka implementująca część
@@ -37,12 +35,10 @@
 
 %prep
 %setup -q
-
-%build
-
 mkdir bin
 mv rdict bin
 
+%build
 ruby install.rb config \
 	--rb-dir=%{ruby_rubylibdir} \
 	--so-dir=%{ruby_archdir}
@@ -77,6 +73,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2005/11/19 13:32:04  glen
+- use system ruby macros
+- cleanups, corrections, cosmetics
+
 Revision 1.2  2005/04/13 18:14:15  qboosh
 - pl
 

================================================================
Index: SPECS/ruby-Diff-LCS.spec
diff -u SPECS/ruby-Diff-LCS.spec:1.6 SPECS/ruby-Diff-LCS.spec:1.7
--- SPECS/ruby-Diff-LCS.spec:1.6	Wed May 11 21:41:02 2005
+++ SPECS/ruby-Diff-LCS.spec	Sat Nov 19 14:32:04 2005
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ruby-ActionMailer.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/ruby-ActionPack.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/ruby-ActionWebService.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/ruby-ActiveRecord.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/ruby-ActiveSupport.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/ruby-arrayfields.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-bdb.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Borges.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/ruby-breakpoint.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Criteria.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/ruby-DBI.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/ruby-DelimScanner.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/ruby-dev-utils.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-dict.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Diff-LCS.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/ruby-dl2.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-ecore.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-edje.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-eet.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/ruby-epeg.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/ruby-epsilon.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-ERuby.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/ruby-esmart.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-evas.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/ruby-exif.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-extensions.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/ruby-facets.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Fam.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/ruby-fcgi.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Gen.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-gettext.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Glue.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/ruby-gnome2.spec?r1=1.33&r2=1.34&f=u
    http://cvs.pld-linux.org/SPECS/ruby-gtkmozembed.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-guid.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Iowa.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-jabber4r.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/ruby-jabber-rpc.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/ruby-json.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-kansas.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-levenshtein.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-libexif.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/ruby-LOG4R.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Multiton.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-mysql.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/ruby-NArray.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Ncurses.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Needle.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Net-SFTP.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Net-SSH.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Nitro.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/ruby-odbc.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Og.spec?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/SPECS/ruby-open4.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-OrderedHash.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-PageTemplate.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-PAM.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/ruby-pluginfactory.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Postgres.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Quanty.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Racc.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/ruby-rbogl.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/ruby-rcairo.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/ruby-rdf-redland.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-redcloth.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/ruby-rena.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-RMagick.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/ruby-RMail.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/ruby-rockit.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/ruby-RubyGems.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-runt.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/ruby-sqlite.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/ruby-syntax.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-Text-Format.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/ruby-TMail.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/ruby-transaction-simple.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/ruby-web.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/ruby-wikify.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/ruby-vorbisfile.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/ruby-xattr.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/ruby-xhtmldiff.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/ruby-XTemplate.spec?r1=1.4&r2=1.5&f=u




More information about the pld-cvs-commit mailing list