SPECS: cgikit.spec, ecasound.spec, fastcst.spec, gnome-art.spec, g...

glen glen at pld-linux.org
Tue Dec 27 00:50:18 CET 2005 

Author: glen                         Date: Mon Dec 26 23:50:18 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use system ruby macros; cleanups

---- Files affected:
SPECS:
   cgikit.spec (1.1 -> 1.2) , ecasound.spec (1.90 -> 1.91) , fastcst.spec (1.3 -> 1.4) , gnome-art.spec (1.2 -> 1.3) , gnustep-ruby.spec (1.12 -> 1.13) , iowa.spec (1.5 -> 1.6) , mysql-ruby.spec (1.13 -> 1.14) , pam-pam_ruby.spec (1.8 -> 1.9) , postgresql-module-plruby.spec (1.6 -> 1.7) , raggle.spec (1.9 -> 1.10) , rails.spec (1.15 -> 1.16) , rake.spec (1.16 -> 1.17) , rbbr.spec (1.3 -> 1.4) , redland-bindings.spec (1.24 -> 1.25) , rpa.spec (1.2 -> 1.3) , rubyrdf.spec (1.4 -> 1.5) , ruwiki.spec (1.7 -> 1.8) , setup.rb.spec (1.2 -> 1.3) , sqlite-ruby.spec (1.2 -> 1.3) , sqlite3-ruby.spec (1.3 -> 1.4) , tml.spec (1.8 -> 1.9) , wxruby.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/cgikit.spec
diff -u SPECS/cgikit.spec:1.1 SPECS/cgikit.spec:1.2
--- SPECS/cgikit.spec:1.1	Thu Dec 25 01:25:19 2003
+++ SPECS/cgikit.spec	Tue Dec 27 00:50:12 2005
@@ -6,12 +6,13 @@
 Version:	1.0b5
 Release:	1
 License:	GPL
+Group:		Development/Libraries
 Source0:	http://www.freepan.org/canon/s/su/SuzukiTetsuya/ruby/cgikit/%{name}-%{version}.tar.gz
 # Source0-md5:	268c4b807d983486ba54dded24b2c173
-Group:		Development/Libraries
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-BuildArch:	noarch
+BuildRequires:	rpmbuild(macros) >= 1.272
 BuildRequires:	ruby
+BuildArch:	noarch
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Ruby CGIKit Library
@@ -48,7 +49,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/12/26 23:50:12  glen
+- use system ruby macros; cleanups
+
 Revision 1.1  2003/12/25 00:25:19  aredridel
 - added
-
-

================================================================
Index: SPECS/ecasound.spec
diff -u SPECS/ecasound.spec:1.90 SPECS/ecasound.spec:1.91
--- SPECS/ecasound.spec:1.90	Sat Sep 17 12:22:58 2005
+++ SPECS/ecasound.spec	Tue Dec 27 00:50:12 2005
@@ -31,13 +31,10 @@
 BuildRequires:	python-modules >= 2.2
 BuildRequires:	readline-devel >= 5.0
 %{?with_ruby:BuildRequires:	ruby}
+%{?with_ruby:BuildRequires:	rpmbuild(macros) >= 1.272}
 Obsoletes:	libecasound
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%if %{with ruby}
-%define		ruby_sitelibdir	%(ruby -r rbconfig -e 'print Config::CONFIG["sitelibdir"]')
-%endif
-
 %description
 Ecasound is a software package designed for multitrack audio
 processing. It can be used for simple tasks like audio playback,
@@ -217,6 +214,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.91  2005/12/26 23:50:12  glen
+- use system ruby macros; cleanups
+
 Revision 1.90  2005/09/17 10:22:58  arekm
 - rebuild with readline 5.0
 
@@ -256,7 +256,7 @@
 - rel. 2
 
 Revision 1.78  2004/07/28 08:03:13  troll
-- removed %%include /usr/lib/rpm/macros.python
+- removed %include /usr/lib/rpm/macros.python
 
 Revision 1.77  2003/12/07 01:34:41  qboosh
 - ruby- and python- require base
@@ -385,12 +385,12 @@
 - 2.1dev9
 
 Revision 1.54  2002/05/21 23:12:58  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.53  2002/04/25 16:14:14  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.52  2002/04/11 14:01:05  wrobell
 - rel. 3, stb
@@ -399,7 +399,7 @@
 - use pyrequires_eq instead of requires_eq macro (massive attack!)
 
 Revision 1.50  2002/04/02 18:36:15  kloczek
-- removed using %%{__install} macro.
+- removed using %{__install} macro.
 
 Revision 1.49  2002/03/24 23:28:15  kloczek
 - perl -pi -e "s/^automake -a -c$/automake -a -c -f/"
@@ -431,7 +431,7 @@
 - rebuild against python 2.2.
 
 Revision 1.41  2002/01/18 02:12:47  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.40  2001/11/24 01:33:07  kloczek
 - :!sort BuildRequires rules.
@@ -457,7 +457,7 @@
 
 Revision 1.33  2001/07/31 16:48:45  qboosh
 - BuildRequires: libstdc++-devel
-- fixed python stuff in %%install and %%files
+- fixed python stuff in %install and %files
 - base package Requires: libecasound
 
 Revision 1.32  2001/06/29 08:49:28  wrobell
@@ -476,10 +476,10 @@
 - more fixes in python related %files lists.
 
 Revision 1.28  2001/04/22 23:57:50  kloczek
-- added %%python_lib-dynloadir macro.
+- added %python_lib-dynloadir macro.
 
 Revision 1.27  2001/04/22 23:24:27  kloczek
-- make %%{_libdir}/python2.0/site-packages missing directoty in %install.
+- make %{_libdir}/python2.0/site-packages missing directoty in %install.
 
 Revision 1.26  2001/04/22 23:04:05  kloczek
 - finaly fixed compilation against readline 4.2 (added realine patch).

================================================================
Index: SPECS/fastcst.spec
diff -u SPECS/fastcst.spec:1.3 SPECS/fastcst.spec:1.4
--- SPECS/fastcst.spec:1.3	Wed Mar 30 00:17:29 2005
+++ SPECS/fastcst.spec	Tue Dec 27 00:50:12 2005
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-%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"]')
-%define	ruby_archdir	%(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
 Summary:	Fast Changeset Tool
 Summary(pl):	Fast Changeset Tool - narzędzie do zestawów zmian
 Name:		fastcst
@@ -12,12 +9,13 @@
 Source0:	http://www.zedshaw.com/projects/fastcst/%{name}-%{version}.tar.bz2
 # Source0-md5:	6efc500b9692eb4f70b9e28fe96ddb33
 URL:		http://www.zedshaw.com/projects/fastcst/
+BuildRequires:	rpmbuild(macros) >= 1.272
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
 Requires:	ruby
 Requires:	ruby-RMail
-Requires:	ruby-pluginfactory
 Requires:	ruby-guid
+Requires:	ruby-pluginfactory
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,7 +29,6 @@
 %setup -q
 
 %build
-
 ruby setup.rb config \
 	--rbdir=%{ruby_rubylibdir} \
 	--sodir=%{ruby_archdir}
@@ -46,7 +43,6 @@
 install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir}}
 
 ruby setup.rb install --prefix=$RPM_BUILD_ROOT
-
 cp -a ri/ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 
 %clean
@@ -67,6 +63,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/12/26 23:50:12  glen
+- use system ruby macros; cleanups
+
 Revision 1.3  2005/03/29 22:17:29  aredridel
 - up to 0.6.5
 

================================================================
Index: SPECS/gnome-art.spec
diff -u SPECS/gnome-art.spec:1.2 SPECS/gnome-art.spec:1.3
--- SPECS/gnome-art.spec:1.2	Sun Apr 24 10:35:42 2005
+++ SPECS/gnome-art.spec	Tue Dec 27 00:50:12 2005
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-#
-%define	ruby_rubylibdir	%(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
-#
 Summary:	A frontend for art.gnome.org
 Summary(pl):	Frontend do art.gnome.org
 Name:		gnome-art
@@ -11,9 +8,10 @@
 Group:		Applications
 Source0:	http://www.miketech.net/gnome-art/download/%{name}-%{version}.tar.gz
 # Source0-md5:	4dd59ba8a84efe8dcb5637ba051394e7
-Source1:	gnome-art.desktop
+Source1:	%{name}.desktop
 Source2:	gnome-splashscreen-manager.desktop
 URL:		http://www.miketech.net/gnome-art/
+BuildRequires:	rpmbuild(macros) >= 1.272
 BuildRequires:	ruby >= 1.8.2
 Requires:	ruby-gnome2 >= 0.12.0
 Requires:	ruby-rbogl
@@ -108,8 +106,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2005/12/26 23:50:12  glen
+- use system ruby macros; cleanups
+
 Revision 1.2  2005/04/24 08:35:42  qboosh
 - pl
 
 Revision 1.1  2005/04/23 18:41:55  speedy
-- initial pld spec.
+- initial pld spec

================================================================
Index: SPECS/gnustep-ruby.spec
diff -u SPECS/gnustep-ruby.spec:1.12 SPECS/gnustep-ruby.spec:1.13
--- SPECS/gnustep-ruby.spec:1.12	Wed Mar  9 22:06:56 2005
+++ SPECS/gnustep-ruby.spec	Tue Dec 27 00:50:12 2005
@@ -14,6 +14,7 @@
 URL:		http://www.gnustep.org/experience/RIGS.html
 BuildRequires:	gnustep-base-devel >= 1.7.1
 BuildRequires:	gnustep-gui-devel >= 0.8.6
+BuildRequires:	rpmbuild(macros) >= 1.272
 BuildRequires:	ruby-devel >= 1:1.6.4
 Requires:	gnustep-base >= 1.7.1
 Requires:	gnustep-gui >= 0.8.6
@@ -31,9 +32,6 @@
 %define		gscpu		%(echo %{_target_cpu} | sed -e 's/amd64/x86_64/;s/ppc/powerpc/')
 %endif
 
-%define		ruby_sitelibdir		%(ruby -rrbconfig -e 'print Config::CONFIG["sitelibdir"]')
-%define		ruby_sitearchdir	%(ruby -rrbconfig -e 'print Config::CONFIG["sitearchdir"]')
-
 %description
 RIGS stands for Ruby Interface for GNUstep. It is a package allowing
 integration between Ruby and Objective-C/GNUstep. The main purpose of
@@ -88,6 +86,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2005/12/26 23:50:12  glen
+- use system ruby macros; cleanups
+
 Revision 1.12  2005/03/09 21:06:56  qboosh
 - updated link patch, removed obsolete update patch
 

================================================================
Index: SPECS/iowa.spec
diff -u SPECS/iowa.spec:1.5 SPECS/iowa.spec:1.6
--- SPECS/iowa.spec:1.5	Thu Nov 18 22:37:51 2004
+++ SPECS/iowa.spec	Tue Dec 27 00:50:12 2005
@@ -1,6 +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"]')
 Summary:	IOWA mail library
 Summary(pl):	IOWA - biblioteka do obsługi poczty
 Name:		iowa
@@ -12,6 +10,7 @@
 # Source0-md5:	cb27f0baa555c9e4f55ebb4a4a593c0a
 Source1:	setup.rb
 URL:		http://enigo.com/projects/iowa/
+BuildRequires:	rpmbuild(macros) >= 1.272
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
 Requires:	ruby
@@ -20,9 +19,9 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Iowa is a framework, written in the Ruby programming language, for
-the development of both web based applications and more general
-dynamic web content. 
+Iowa is a framework, written in the Ruby programming language, for the
+development of both web based applications and more general dynamic
+web content.
 
 %description -l pl
 Iowa to napisany w języku programowania Ruby szkielet do tworzenia
@@ -31,14 +30,13 @@
 
 %prep
 %setup -q -n %{name}_%{version}
-
-%build
 cp %{SOURCE1} .
 mkdir -p lib/{iowa,apache}
 mv src/*.rb lib/iowa
 mv mod_iowa.rb lib/apache
 mv iowa*.rb lib/
 
+%build
 ruby setup.rb config \
 	--rb-dir=%{ruby_rubylibdir} \
 	--so-dir=%{ruby_archdir}
@@ -60,8 +58,8 @@
 
 %files
 %defattr(644,root,root,755)
-%doc rdoc/* CONTRIBUTORS README-CGI VERSIONS ChangeLog README-FCGI 
-%doc INSTALL README-MOD_RUBY README-WEBRICK README ToDo 
+%doc rdoc/* CONTRIBUTORS README-CGI VERSIONS ChangeLog README-FCGI
+%doc INSTALL README-MOD_RUBY README-WEBRICK README ToDo
 %{ruby_rubylibdir}/iowa
 %{ruby_rubylibdir}/apache/*
 %{ruby_rubylibdir}/*.rb
@@ -73,6 +71,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/12/26 23:50:12  glen
+- use system ruby macros; cleanups
+
 Revision 1.5  2004/11/18 21:37:51  qboosh
 - pl desc
 

================================================================
Index: SPECS/mysql-ruby.spec
diff -u SPECS/mysql-ruby.spec:1.13 SPECS/mysql-ruby.spec:1.14
--- SPECS/mysql-ruby.spec:1.13	Sat Oct 29 21:57:32 2005
+++ SPECS/mysql-ruby.spec	Tue Dec 27 00:50:12 2005
@@ -1,6 +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")')
 Summary:	MySQL module for Ruby
 Summary(pl):	Moduł MySQL dla języka Ruby
 Name:		mysql-ruby
@@ -10,14 +8,16 @@
 Group:		Development/Languages
 Source0:	http://tmtm.org/downloads/mysql/ruby/%{name}-%{version}.tar.gz
 # Source0-md5:	c6668900e68f0d6a137612c818d5fd01
-Patch0: 	mysql-ruby-amd64.patch
+Patch0:		%{name}-amd64.patch
 URL:		http://www.tmtm.org/mysql/ruby/
 BuildRequires:	mysql-devel
+BuildRequires:	rpmbuild(macros) >= 1.272
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
 Requires:	ruby
 Provides:	ruby-mysql-library
 Obsoletes:	ruby-Mysql
+# FIXME: obsolete or conflict, not both
 Obsoletes:	ruby-mysql
 Conflicts:	ruby-mysql
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -67,6 +67,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2005/12/26 23:50:12  glen
+- use system ruby macros; cleanups
+
 Revision 1.13  2005/10/29 19:57:32  aredridel
 - rel 2 for rebuild
 - STBR
@@ -84,7 +87,7 @@
 - up to 2.6
 
 Revision 1.8  2005/02/12 22:46:25  arekm
-rel ++
+- rel ++
 
 Revision 1.7  2004/11/08 19:48:45  aredridel
 - update for ruby-mysql alternatives
@@ -149,5 +152,5 @@
 - spec adapterized and few cosmetics.
 
 Revision 1.1  2002/02/02 22:49:19  lukasz
--  2.4.2
--  initial release
+- 2.4.2
+- initial release

================================================================
Index: SPECS/pam-pam_ruby.spec
diff -u SPECS/pam-pam_ruby.spec:1.8 SPECS/pam-pam_ruby.spec:1.9
--- SPECS/pam-pam_ruby.spec:1.8	Tue Sep 21 20:31:10 2004
+++ SPECS/pam-pam_ruby.spec	Tue Dec 27 00:50:12 2005
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-%define		ruby_sitearchdir	%(ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
 %define		rubypamversion	1.5.0
 %define		modulename	pam_ruby
 Summary:	PAM module to authenticate via a Ruby script
@@ -18,6 +17,7 @@
 URL:		http://ruby-pam.sourceforge.net/pam-ruby.html
 BuildRequires:	autoconf
 BuildRequires:	pam-devel
+BuildRequires:	rpmbuild(macros) >= 1.272
 BuildRequires:	ruby-devel
 Requires:	pam
 Requires:	ruby-PAM = %{rubypamversion}
@@ -66,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/12/26 23:50:12  glen
+- use system ruby macros; cleanups
+
 Revision 1.8  2004/09/21 18:31:10  havner
 - proper R
 - rel 4

================================================================
Index: SPECS/postgresql-module-plruby.spec
diff -u SPECS/postgresql-module-plruby.spec:1.6 SPECS/postgresql-module-plruby.spec:1.7
--- SPECS/postgresql-module-plruby.spec:1.6	Tue May 17 01:09:02 2005
+++ SPECS/postgresql-module-plruby.spec	Tue Dec 27 00:50:12 2005
@@ -1,21 +1,19 @@
 # $Revision$, $Date$
-#
-%define		postgresql_version	8.0.3
-%define		postgresql_release	2
-%define		ruby_archdir		%(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
-
+# TODO
+# - doesn't build
 Summary:	PL/Ruby - PostgreSQL procedural language
 Summary(pl):	PL/Ruby - język proceduralny bazy danych PostgreSQL
 Name:		postgresql-module-plruby
 Version:	0.4.3
-Release:	1
+Release:	0.1
 License:	Ruby's
 Group:		Applications/Databases
 Source0:	ftp://moulon.inra.fr/pub/ruby/plruby.tar.gz
 # Source0-md5:	0711a9da6154942ed898ccf67f5dd6c7
-BuildRequires:	ruby-devel
 BuildRequires:	postgresql-backend-devel
-Requires:	postgresql = %{postgresql_version}-%{postgresql_release}
+BuildRequires:	rpmbuild(macros) >= 1.272
+BuildRequires:	ruby-devel
+%requires_eq_to postgresql postgresql-backend-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -74,11 +72,15 @@
 %dir %{ruby_archdir}/plruby
 %attr(755,root,root) %{ruby_archdir}/plruby/*.so
 
+%define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/12/26 23:50:12  glen
+- use system ruby macros; cleanups
+
 Revision 1.6  2005/05/16 23:09:02  aredridel
 - build against 8.0.3-2
 

================================================================
Index: SPECS/raggle.spec
diff -u SPECS/raggle.spec:1.9 SPECS/raggle.spec:1.10
--- SPECS/raggle.spec:1.9	Mon Jul 25 12:04:29 2005
+++ SPECS/raggle.spec	Tue Dec 27 00:50:12 2005
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-%define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
 Summary:	Console RSS reader
 Summary(pl):	Konsolowy czytnik RSS
 Name:		raggle
@@ -10,6 +9,7 @@
 Source0:	http://www.raggle.org/files/%{name}-%{version}.tar.gz
 # Source0-md5:	95c41b6d516996845519c5b073d75f49
 URL:		http://www.raggle.org/
+BuildRequires:	rpmbuild(macros) >= 1.272
 BuildRequires:	ruby
 Requires:	ruby-Ncurses
 BuildArch:	noarch
@@ -33,13 +33,12 @@
 
 %prep
 %setup -q
+find . -type d -name CVS | xargs rm -rf
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/{extras,themes},%{_mandir}/man1}
 
-find . -type d -name CVS | xargs rm -rf
-
 cp -a extras/web_ui $RPM_BUILD_ROOT%{_datadir}/%{name}/extras
 install extras/*.rb $RPM_BUILD_ROOT%{_datadir}/%{name}/extras
 install themes/*.yaml $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
@@ -67,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/12/26 23:50:12  glen
+- use system ruby macros; cleanups
+
 Revision 1.9  2005/07/25 10:04:29  havner
 - 0.4.1, tested
 

================================================================
Index: SPECS/rails.spec
diff -u SPECS/rails.spec:1.15 SPECS/rails.spec:1.16
--- SPECS/rails.spec:1.15	Tue Oct 25 20:46:27 2005
+++ SPECS/rails.spec	Tue Dec 27 00:50:12 2005
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 # TODO
-# - error: php-pear-Text_Highlighter-0.6.5-1 (cnfl rails = 0.12.1-1) conflicts with installed rails-0.12.1-1
-%define	ruby_archdir	%(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
-%define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
+# - error:php-pear-Text_Highlighter-0.6.5-1 (cnfl rails = 0.12.1-1) conflicts with installed rails-0.12.1-1
 Summary:	Ruby on Rails setup scripts
 Summary(pl):	Skrypty instalacyjne Ruby on Rails
 Name:		rails
@@ -15,19 +13,20 @@
 Source1:	%{name}-replacement-generate
 Patch0:		%{name}-sanity.patch
 URL:		http://www.rubyonrails.com/
+BuildRequires:	rpmbuild(macros) >= 1.272
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
 Requires:	rake >= 0.5.4
+Requires:	ruby >= 1.8.2-4
 Requires:	ruby-ActionMailer >= 1.1.1
 Requires:	ruby-ActionPack >= 1.10.1
+Requires:	ruby-ActionWebService >= 0.9.1
 Requires:	ruby-ActiveRecord >= 1.12.0
 Requires:	ruby-ActiveSupport >= 1.2.0
-Requires:	ruby-ActionWebService >= 0.9.1
+Requires:	ruby-TMail
+Requires:	ruby-Text-Format
 Requires:	ruby-dev-utils >= 1.0.1
 Requires:	ruby-extensions >= 0.6.0
-Requires:	ruby-Text-Format
-Requires:	ruby-TMail
-Requires:	ruby >= 1.8.2-4
 Obsoletes:	railties
 Obsoletes:	ruby-Rails
 #BuildArch:	noarch
@@ -52,9 +51,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd vendor/rails/railties
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/bin,%{ruby_rubylibdir}/railties}
 
+cd vendor/rails/railties
 cp -a configs fresh_rakefile dispatches  environments  helpers html\
 	$RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a bin/* \
@@ -82,6 +81,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2005/12/26 23:50:12  glen
+- use system ruby macros; cleanups
+
 Revision 1.15  2005/10/25 18:46:27  aredridel
 - updated deps
 

================================================================
Index: SPECS/rake.spec
diff -u SPECS/rake.spec:1.16 SPECS/rake.spec:1.17
--- SPECS/rake.spec:1.16	Sat Oct  8 07:33:21 2005
+++ SPECS/rake.spec	Tue Dec 27 00:50:12 2005
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-%define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
 Summary:	Ruby program like Make
 Summary(pl):	Program typu Make dla języka Ruby
 Name:		rake
@@ -11,6 +10,7 @@
 # Source0-md5:	9813cf922ef8fc08b96f880faf883e5e
 Patch0:		%{name}-libdir.patch
 URL:		http://rake.rubyforge.org/
+BuildRequires:	rpmbuild(macros) >= 1.272
 #BuildRequires:	ruby
 Requires:	ruby
 #BuildArch:	noarch
@@ -20,8 +20,8 @@
 Rake is a simple Ruby build program with capabilities similar to make.
 It has the following features:
 - Rakefiles (rake's version of Makefiles) are completely defined in
-  standard Ruby syntax. No XML files to edit. No quirky Makefile
-  syntax to worry about (is that a tab or a space?)
+  standard Ruby syntax. No XML files to edit. No quirky Makefile syntax
+  to worry about (is that a tab or a space?)
 - Users can specify tasks with prerequisites.
 - Rake supports rule patterns to synthesize implicit tasks.
 - Rake is lightweight. It can be distributed with other projects as a
@@ -32,9 +32,9 @@
 Rake to prosty program do budowania w języku Ruby o możliwościach
 podobnych do make. Ma następujące cechy:
 - Pliki Rakefile (rake'owa odmiana plików Makefile) są definiowane
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cgikit.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/ecasound.spec?r1=1.90&r2=1.91&f=u
    http://cvs.pld-linux.org/SPECS/fastcst.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/gnome-art.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/gnustep-ruby.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/iowa.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/mysql-ruby.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/pam-pam_ruby.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/postgresql-module-plruby.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/raggle.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/rails.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/rake.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/rbbr.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/redland-bindings.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/SPECS/rpa.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/rubyrdf.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/ruwiki.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/setup.rb.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/sqlite-ruby.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/sqlite3-ruby.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/tml.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/wxruby.spec?r1=1.5&r2=1.6&f=u

More information about the pld-cvs-commit mailing list