Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6582
Modified Files:
actionmailer-rb.info actionpack-rb.info
actionwebservice-rb.info activerecord-rb.info
activeresource-rb.info activesupport-rb.info libgems-rb.info
libgems-rb.patch rails-rb.info sqlite3-rb.info
Log Message:
fix libgems to put libraries in the right place, also up the rev on things
needing gem 0.9.x
Index: activesupport-rb.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods/activesupport-rb.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- activesupport-rb.info 11 Dec 2007 03:58:16 -0000 1.7
+++ activesupport-rb.info 12 Dec 2007 21:56:39 -0000 1.8
@@ -1,7 +1,7 @@
Info2: <<
Package: activesupport-rb%type_pkg[ruby]
Version: 2.0.1
-Revision: 2
+Revision: 3
Type: ruby (1.8)
Description: Utility classes for Rails
License: BSD
@@ -9,11 +9,11 @@
# Dependencies:
Depends: <<
- libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+ libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
ruby%type_pkg[ruby]
<<
BuildDepends: <<
- rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+ rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
ruby%type_pkg[ruby]-dev
<<
Index: activerecord-rb.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods/activerecord-rb.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- activerecord-rb.info 11 Dec 2007 03:58:16 -0000 1.8
+++ activerecord-rb.info 12 Dec 2007 21:56:39 -0000 1.9
@@ -1,7 +1,7 @@
Info2: <<
Package: activerecord-rb%type_pkg[ruby]
Version: 2.0.1
-Revision: 2
+Revision: 3
Type: ruby (1.8)
Description: Object-Relational Mapper for Ruby
License: BSD
@@ -10,12 +10,12 @@
# Dependencies:
Depends: <<
activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
- libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+ libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
ruby%type_pkg[ruby]
<<
BuildDepends: <<
activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
- rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+ rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
ruby%type_pkg[ruby]-dev
<<
Index: libgems-rb.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods/libgems-rb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libgems-rb.patch 10 Dec 2007 02:31:46 -0000 1.2
+++ libgems-rb.patch 12 Dec 2007 21:56:40 -0000 1.3
@@ -1,6 +1,5 @@
-diff -uNr rubygems-0.9.5/lib/rubygems/source_index.rb
rubygems-0.9.5-new/lib/rubygems/source_index.rb
--- rubygems-0.9.5/lib/rubygems/source_index.rb 2007-11-17
01:23:34.000000000 -0500
-+++ rubygems-0.9.5-new/lib/rubygems/source_index.rb 2007-12-08
09:28:08.000000000 -0500
++++ rubygems-0.9.5-new/lib/rubygems/source_index.rb 2007-12-12
11:55:15.000000000 -0500
@@ -220,7 +220,7 @@
else
version_requirement = platform_only_or_version_req ||
@@ -10,9 +9,8 @@
end
unless Gem::Requirement === version_requirement then
-diff -uNr rubygems-0.9.5/lib/rubygems.rb rubygems-0.9.5-new/lib/rubygems.rb
--- rubygems-0.9.5/lib/rubygems.rb 2007-11-13 16:18:38.000000000 -0500
-+++ rubygems-0.9.5-new/lib/rubygems.rb 2007-12-08 09:29:21.000000000 -0500
++++ rubygems-0.9.5-new/lib/rubygems.rb 2007-12-12 11:55:15.000000000 -0500
@@ -531,7 +531,8 @@
if defined? RUBY_FRAMEWORK_VERSION
return File.join(File.dirname(Config::CONFIG["sitedir"]), "Gems",
Config::CONFIG['ruby_version'])
Index: actionwebservice-rb.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods/actionwebservice-rb.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- actionwebservice-rb.info 11 Dec 2007 03:58:16 -0000 1.9
+++ actionwebservice-rb.info 12 Dec 2007 21:56:39 -0000 1.10
@@ -1,7 +1,7 @@
Info2: <<
Package: actionwebservice-rb%type_pkg[ruby]
Version: 1.2.6
-Revision: 2
+Revision: 3
Type: ruby (1.8)
Description: SOAP and XML-RPC support for Rails
License: BSD
@@ -12,14 +12,14 @@
activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
actionpack-rb%type_pkg[ruby] (>= 2.0.1-1),
activerecord-rb%type_pkg[ruby] (>= 2.0.1-1),
- libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+ libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
ruby%type_pkg[ruby]
<<
BuildDepends: <<
activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
actionpack-rb%type_pkg[ruby] (>= 2.0.1-1),
activerecord-rb%type_pkg[ruby] (>= 2.0.1-1),
- rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+ rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
ruby%type_pkg[ruby]-dev
<<
Index: activeresource-rb.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods/activeresource-rb.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- activeresource-rb.info 11 Dec 2007 03:58:16 -0000 1.2
+++ activeresource-rb.info 12 Dec 2007 21:56:39 -0000 1.3
@@ -1,7 +1,7 @@
Info2: <<
Package: activeresource-rb%type_pkg[ruby]
Version: 2.0.1
-Revision: 2
+Revision: 3
Type: ruby (1.8)
Description: Object-Relational Mapper for Ruby
License: BSD
@@ -10,12 +10,12 @@
# Dependencies:
Depends: <<
activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
- libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+ libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
ruby%type_pkg[ruby]
<<
BuildDepends: <<
activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
- rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+ rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
ruby%type_pkg[ruby]-dev
<<
Index: sqlite3-rb.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods/sqlite3-rb.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sqlite3-rb.info 4 Sep 2007 14:25:25 -0000 1.9
+++ sqlite3-rb.info 12 Dec 2007 21:56:40 -0000 1.10
@@ -1,7 +1,7 @@
Info2: <<
Package: sqlite3-rb%type_pkg[ruby]
Version: 1.2.1
-Revision: 1021
+Revision: 1
Description: SQLite database interface for Ruby
Type: ruby (1.8)
License: BSD
Index: actionmailer-rb.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods/actionmailer-rb.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- actionmailer-rb.info 11 Dec 2007 03:58:15 -0000 1.9
+++ actionmailer-rb.info 12 Dec 2007 21:56:39 -0000 1.10
@@ -1,7 +1,7 @@
Info2: <<
Package: actionmailer-rb%type_pkg[ruby]
Version: 2.0.1
-Revision: 2
+Revision: 3
Type: ruby (1.8)
Description: Mail service classes
License: BSD
@@ -10,12 +10,12 @@
# Dependencies:
Depends: <<
actionpack-rb%type_pkg[ruby] (>= 2.0.1-1),
- libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+ libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
ruby%type_pkg[ruby]
<<
BuildDepends: <<
actionpack-rb%type_pkg[ruby] (>= 2.0.1-1),
- rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+ rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
ruby%type_pkg[ruby]-dev
<<
Index: actionpack-rb.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods/actionpack-rb.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- actionpack-rb.info 11 Dec 2007 03:58:15 -0000 1.9
+++ actionpack-rb.info 12 Dec 2007 21:56:39 -0000 1.10
@@ -1,7 +1,7 @@
Info2: <<
Package: actionpack-rb%type_pkg[ruby]
Version: 2.0.1
-Revision: 2
+Revision: 3
Type: ruby (1.8)
Description: Web request routing and handling
License: BSD
@@ -10,12 +10,12 @@
# Dependencies:
Depends: <<
activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
- libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+ libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
ruby%type_pkg[ruby]
<<
BuildDepends: <<
activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
- rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+ rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
ruby%type_pkg[ruby]-dev
<<
Index: libgems-rb.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods/libgems-rb.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libgems-rb.info 10 Dec 2007 02:31:46 -0000 1.5
+++ libgems-rb.info 12 Dec 2007 21:56:39 -0000 1.6
@@ -1,7 +1,7 @@
Info2: <<
Package: libgems-rb%type_pkg[ruby]
Version: 0.9.5
-Revision: 1
+Revision: 2
Type: ruby (1.6 1.8)
Description: Package management framework for Ruby
Homepage: http://rubygems.rubyforge.org/
@@ -19,15 +19,15 @@
# Patch Phase.
PatchScript: <<
#!/bin/sh -ex
- sed \
- -e 's|@PREFIX@|%p|g' \
- -e 's|@INSTALL_DIR@|%i|' %a/%{ni}.patch \
- > rubygems.patch
- patch -p1 < rubygems.patch
- rm rubygems.patch
+ sed \
+ -e 's|@PREFIX@|%p|g' \
+ -e 's|@INSTALL_DIR@|%i|' %a/%{ni}.patch \
+ > rubygems.patch
+ patch -p1 < rubygems.patch
+ rm rubygems.patch
- find . -type f -print0 \
- | xargs -0 perl -w -p -i -e 's:^#!.*ruby.*:#!%p/bin/ruby%type_raw[ruby]:'
+ find . -type f -print0 \
+ | xargs -0 perl -w -p -i -e
's:^#!.*ruby.*:#!%p/bin/ruby%type_raw[ruby]:'
<<
# Compile Phase.
@@ -36,70 +36,72 @@
# Install Phase.
InstallScript: <<
#!/bin/sh -ex
- RUBYLIBDIR=`%p/bin/ruby%type_raw[ruby] -rrbconfig -e "puts
Config::CONFIG['rubylibdir']"`
- mkdir -p %i/var/lib/gems/%type_raw[ruby]
- %p/bin/ruby%type_raw[ruby] -I lib setup.rb install --prefix "%i"
--sitelibdir "$RUBYLIBDIR"
- rm -f %i/bin/update_rubygems
+ RUBYLIBDIR=`%p/bin/ruby%type_raw[ruby] -rrbconfig -e "puts
Config::CONFIG['rubylibdir']"`
+ install -d "%i/var/lib/gems/%type_raw[ruby]"
+ install -d "%d$RUBYLIBDIR"
+ %p/bin/ruby%type_raw[ruby] -I lib setup.rb install --prefix "%i"
+ mv %i/lib/rbconfig* %i/lib/rubygems* %I/lib/ubygems* "%d$RUBYLIBDIR"
+ rm -f %i/bin/update_rubygems
- mkdir -p %i/share/%n/examples
- cp -R examples/ %i/share/%n/examples
+ mkdir -p %i/share/%n/examples
+ cp -R examples/ %i/share/%n/examples
<<
DocFiles: ChangeLog GPL* LICENSE* README TODO
SplitOff: <<
- Description: Package management framework for Ruby (binaries)
- Package: rubygems-rb%type_pkg[ruby]
- Depends: libgems-rb%type_pkg[ruby], ruby%type_pkg[ruby], (%type_raw[ruby] =
1.6) ruby (>= 1.6), (%type_raw[ruby] = 1.6) ruby (<< 1.7), (%type_raw[ruby] =
1.8) ruby (>= 1.8), (%type_raw[ruby] = 1.8) ruby (<< 1.9)
- Conflicts: rubygems-rb16, rubygems-rb18
- Replaces: rubygems-rb16, rubygems-rb18
- DocFiles: ChangeLog GPL* LICENSE* README TODO
- Files: bin
+ Description: Package management framework for Ruby (binaries)
+ Package: rubygems-rb%type_pkg[ruby]
+ Depends: libgems-rb%type_pkg[ruby], ruby%type_pkg[ruby],
(%type_raw[ruby] = 1.6) ruby (>= 1.6), (%type_raw[ruby] = 1.6) ruby (<< 1.7),
(%type_raw[ruby] = 1.8) ruby (>= 1.8), (%type_raw[ruby] = 1.8) ruby (<< 1.9)
+ Conflicts: rubygems-rb16, rubygems-rb18
+ Replaces: rubygems-rb16, rubygems-rb18
+ DocFiles: ChangeLog GPL* LICENSE* README TODO
+ Files: bin
<<
PreInstScript: <<
- LIBDIR=`%p/bin/ruby%type_raw[ruby] -rrbconfig -e "puts
Config::CONFIG['libdir']"`
- OLD_GEMS_DIR="$LIBDIR/ruby/gems"
- OLD_GEMS_AND_VER_DIR="$OLD_GEMS_DIR/%type_raw[ruby]"
- if test -d "$OLD_GEMS_AND_VER_DIR"; then
- echo ""
- echo "*******"
- echo "You currently have or had an older version of the"
- echo "rubygems-rb%type_pkg[ruby] package installed which stored the"
- echo "gems into $OLD_GEMS_AND_VER_DIR."
- echo ""
- echo "The new location of the gems is %p/var/lib/gems/%type_raw[ruby]."
- echo "The old gem directory and all of the contained gems"
- echo "are going to be removed now. You will need to reinstall"
- echo "all of your locally installed gems, which are:"
- echo ""
- /bin/ls -1 $OLD_GEMS_AND_VER_DIR/gems
- echo ""
- echo "Please make a note of this list so you can reinstall"
- echo "them. Note that the 'sources' gem does not need to"
- echo "be reinstalled, as it comes installed with the new"
- echo "package."
- echo ""
- echo "Press return to continue."
- echo "*******"
- read
- echo "Removing $OLD_GEMS_AND_VER_DIR"
- rm -frv $OLD_GEMS_AND_VER_DIR
- rmdir $OLD_GEMS_DIR 2>/dev/null
- fi
+ LIBDIR=`%p/bin/ruby%type_raw[ruby] -rrbconfig -e "puts
Config::CONFIG['libdir']"`
+ OLD_GEMS_DIR="$LIBDIR/ruby/gems"
+ OLD_GEMS_AND_VER_DIR="$OLD_GEMS_DIR/%type_raw[ruby]"
+ if test -d "$OLD_GEMS_AND_VER_DIR"; then
+ echo ""
+ echo "*******"
+ echo "You currently have or had an older version of the"
+ echo "rubygems-rb%type_pkg[ruby] package installed which stored
the"
+ echo "gems into $OLD_GEMS_AND_VER_DIR."
+ echo ""
+ echo "The new location of the gems is
%p/var/lib/gems/%type_raw[ruby]."
+ echo "The old gem directory and all of the contained gems"
+ echo "are going to be removed now. You will need to
reinstall"
+ echo "all of your locally installed gems, which are:"
+ echo ""
+ /bin/ls -1 $OLD_GEMS_AND_VER_DIR/gems
+ echo ""
+ echo "Please make a note of this list so you can reinstall"
+ echo "them. Note that the 'sources' gem does not need to"
+ echo "be reinstalled, as it comes installed with the new"
+ echo "package."
+ echo ""
+ echo "Press return to continue."
+ echo "*******"
+ read
+ echo "Removing $OLD_GEMS_AND_VER_DIR"
+ rm -frv $OLD_GEMS_AND_VER_DIR
+ rmdir $OLD_GEMS_DIR 2>/dev/null
+ fi
<<
PostRmScript: <<
- case "$1" in
- purge)
- rm -rf %p/var/lib/gems/%type_raw[ruby]
- ;;
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
- *)
- echo "postrm called with unknown argument '$1'" >&2
- exit 1
- ;;
- esac
+ case "$1" in
+ purge)
+ rm -rf %p/var/lib/gems/%type_raw[ruby]
+ ;;
+
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+ *)
+ echo "postrm called with unknown argument '$1'" >&2
+ exit 1
+ ;;
+ esac
<<
# Additional Documentation.
Index: rails-rb.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/rubymods/rails-rb.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- rails-rb.info 11 Dec 2007 03:58:16 -0000 1.10
+++ rails-rb.info 12 Dec 2007 21:56:40 -0000 1.11
@@ -1,7 +1,7 @@
Info2: <<
Package: rails-rb%type_pkg[ruby]
Version: 2.0.1
-Revision: 2
+Revision: 3
Type: ruby (1.8)
Description: MVC web application framework
License: BSD
@@ -15,7 +15,7 @@
activeresource-rb%type_pkg[ruby] (>= 2.0.1-1),
activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
rake-rb%type_pkg[ruby] (>= 0.7.3-1),
- libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+ libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
ruby%type_pkg[ruby]
<<
BuildDepends: <<
@@ -25,7 +25,7 @@
activerecord-rb%type_pkg[ruby] (>= 2.0.1-1),
activeresource-rb%type_pkg[ruby] (>= 2.0.1-1),
activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
- rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+ rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
rake-rb%type_pkg[ruby] (>= 0.7.3-1),
ruby%type_pkg[ruby]-dev
<<
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
