[rubygem-sqlite3] Rebuilt for Ruby 1.9.3. Drop ruby-sqlite3 subpackage.

Vít Ondruch vondruch at fedoraproject.org
Thu Jan 19 14:44:25 UTC 2012


commit d847f6ea63433e3d22fa026b87556fc754f90260
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Thu Jan 19 15:44:19 2012 +0100

    Rebuilt for Ruby 1.9.3.
    Drop ruby-sqlite3 subpackage.

 rubygem-sqlite3.spec |  160 ++++++++++++++------------------------------------
 1 files changed, 44 insertions(+), 116 deletions(-)
---
diff --git a/rubygem-sqlite3.spec b/rubygem-sqlite3.spec
index e501e96..1ba7f0b 100644
--- a/rubygem-sqlite3.spec
+++ b/rubygem-sqlite3.spec
@@ -1,173 +1,101 @@
-%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname sqlite3
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
+%global gem_name sqlite3
 
 Summary:        Allows Ruby scripts to interface with a SQLite3 database
-Name:           rubygem-%{gemname}
+Name:           rubygem-%{gem_name}
 Version:        1.3.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Group:          Development/Languages
 License:        BSD
 # It is not clear what is the official homepage. However, I have risen ticket
 # on upstream: https://github.com/luislavena/sqlite3-ruby/issues/issue/26
 URL:            http://sqlite-ruby.rubyforge.org/
-Source0:        http://rubygems.org/gems/%{gemname}-%{version}.gem
+Source0:        http://rubygems.org/gems/%{gem_name}-%{version}.gem
 # https://github.com/luislavena/sqlite3-ruby/issues/40
 Patch0:         %{name}-%{version}-big-endian.patch
-Requires:       rubygems
-Requires:       ruby(abi) = 1.8
-BuildRequires:  ruby(rubygems)
+Requires: ruby(rubygems)
+Requires:       ruby(abi) = 1.9.1
+BuildRequires: rubygems-devel
 BuildRequires:  ruby-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  rubygem(rake)
+BuildRequires:	rubygem(minitest)
 Obsoletes:      rubygem-sqlite3-ruby < 1.3.3
-Provides:       rubygem(%{gemname}) = %{version}-%{release}
+Obsoletes:      ruby-sqlite3 < 1.3.4-3
+Provides:       rubygem(%{gem_name}) = %{version}-%{release}
 
 %description
 SQLite3/Ruby is a module to allow Ruby scripts to interface with a SQLite3
 database.
 
-%package        -n ruby-sqlite3
-Summary:        A Ruby interface for the SQLite database engine
-Group:          Development/Languages
-Requires:       %{name} = %{version}-%{release}
-Provides:       ruby(sqlite3) = %{version}-%{release}
-
-%description    -n ruby-sqlite3
-Database driver to access SQLite v.3 databases from Ruby.
-
 %package doc
 Summary: Documentation for %{name}
 Group: Documentation
-Requires:%{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
 
 %description doc
 Documentation for %{name}
 
 %prep
 %setup -q -c -T
-mkdir -p ./%{gemdir}
+mkdir -p ./%{gem_dir}
 export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
 gem install \
         --local \
-        --install-dir ./%{gemdir} \
+        --install-dir ./%{gem_dir} \
         -V --force \
         %{SOURCE0}
 
 # Permission
 find . -name \*.rb -or -name \*.gem | xargs chmod 0644
 
-pushd .%{geminstdir}
+pushd .%{gem_instdir}
 %patch0 -p1
 popd
 
 %build
 
 %install
-mkdir -p %{buildroot}%{gemdir}
-cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
-
-install -d -m0755 %{buildroot}%{ruby_sitearch}/sqlite3
-mv %{buildroot}%{geminstdir}/lib/sqlite3/sqlite3_native.so %{buildroot}%{ruby_sitearch}/sqlite3
-
-# The following method is completely copied from rubygem-gettext
-# spec file
-#
-# Create symlinks
-##
-## Note that before switching to gem %%{ruby_sitelib}/sqlite3
-## already existed as a directory, so this cannot be replaced
-## by symlink (cpio fails)
-## Similarly, all directories under %%{ruby_sitelib} cannot be
-## replaced by symlink
-#
-
-create_symlink_rec(){
-
-ORIGBASEDIR=$1
-TARGETBASEDIR=$2
-
-## First calculate relative path of ORIGBASEDIR 
-## from TARGETBASEDIR
-TMPDIR=$TARGETBASEDIR
-BACKDIR=
-DOWNDIR=
-num=0
-nnum=0
-while true
-do
-        num=$((num+1))
-        TMPDIR=$(echo $TMPDIR | sed -e 's|/[^/][^/]*$||')
-        DOWNDIR=$(echo $ORIGBASEDIR | sed -e "s|^$TMPDIR||")
-        if [ x$DOWNDIR != x$ORIGBASEDIR ]
-        then
-                nnum=0
-                while [ $nnum -lt $num ]
-                do
-                        BACKDIR="../$BACKDIR"
-                        nnum=$((nnum+1))
-                done
-                break
-        fi
-done
-
-RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | sed -e 's|//*|/|g' )
-
-## Next actually create symlink
-pushd %{buildroot}/$ORIGBASEDIR
-find . -type f | while read f
-do
-        DIRNAME=$(dirname $f)
-        BACK2DIR=$(echo $DIRNAME | sed -e 's|/[^/][^/]*|/..|g')
-        mkdir -p %{buildroot}${TARGETBASEDIR}/$DIRNAME
-        LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \
-                sed -e 's|^\./||' | sed -e 's|//|/|g' | \
-                sed -e 's|/\./|/|' )
-        ln -s -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f
-done
-popd
+mkdir -p %{buildroot}%{gem_dir}
+mkdir -p %{buildroot}%{gem_extdir}/lib/sqlite3
+cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/
 
-}
-
-create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
+mv %{buildroot}%{gem_libdir}/sqlite3/sqlite3_native.so %{buildroot}%{gem_extdir}/lib/sqlite3
 
 %check
-pushd .%{geminstdir}
-RUBYOPT="I%{buildroot}%{ruby_sitearch} Ilib" testrb test/test_*.rb
+pushd .%{gem_instdir}
+testrb -Ilib test/test_*.rb
 popd
 
 %files
-%{ruby_sitearch}/sqlite3
-
-%dir %{geminstdir}
-%exclude %{geminstdir}/.gemtest
-%doc %{geminstdir}/README.rdoc
-%doc %{geminstdir}/LICENSE
-%exclude %{geminstdir}/ext
-%{geminstdir}/lib/
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-
-%files -n ruby-sqlite3
-%{ruby_sitelib}/sqlite3.rb
-%{ruby_sitelib}/sqlite3/
+%{gem_extdir}
+%dir %{gem_instdir}
+%exclude %{gem_instdir}/.gemtest
+%doc %{gem_instdir}/README.rdoc
+%doc %{gem_instdir}/LICENSE
+%exclude %{gem_instdir}/ext
+%{gem_libdir}/
+%{gem_cache}
+%{gem_spec}
 
 %files doc
-%doc %{geminstdir}/API_CHANGES.rdoc
-%doc %{geminstdir}/CHANGELOG.rdoc
-%doc %{geminstdir}/ChangeLog.cvs
-%doc %{geminstdir}/Manifest.txt
-%{geminstdir}/Rakefile
-%{geminstdir}/setup.rb
-%doc %{gemdir}/doc/%{gemname}-%{version}
-%doc %{geminstdir}/faq/
-%{geminstdir}/tasks/
-%{geminstdir}/test/
+%doc %{gem_instdir}/API_CHANGES.rdoc
+%doc %{gem_instdir}/CHANGELOG.rdoc
+%doc %{gem_instdir}/ChangeLog.cvs
+%doc %{gem_instdir}/Manifest.txt
+%{gem_instdir}/Rakefile
+%{gem_instdir}/setup.rb
+%doc %{gem_docdir}
+%doc %{gem_instdir}/faq/
+%{gem_instdir}/tasks/
+%{gem_instdir}/test/
 
 
 %changelog
+* Thu Jan 19 2012 Vít Ondruch <vondruch at redhat.com> - 1.3.4-3
+- Rebuilt for Ruby 1.9.3.
+- Drop ruby-sqlite3 subpackage.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list