Browse Source

rubygems: update to 1.6.2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3077 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 14 years ago
parent
commit
ee17f2157f
1 changed files with 22 additions and 16 deletions
  1. 22 16
      r/rubygems/rubygems-vl.spec

+ 22 - 16
r/rubygems/rubygems-vl.spec

@@ -5,17 +5,18 @@
 Summary: packaging system for Ruby application or library
 Summary(ja): Rubyアプリケーションやライブラリのためのパッケージシステム
 Name: rubygems
-Version: 1.3.7
+Version: 1.6.2
 Release: 1%{?_dist_release}
-License: distributable
+License: Ruby or GPLv2
 Group: Development/Tools
 Source0: rubygems-%{version}.tgz
-Patch1: rubygems-1.3.7-default-dir.patch
+Patch1: rubygems-1.6.2-default-dir.patch
 URL: http://www.rubygems.org/
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildPreReq: ruby ruby-devel rdoc
+BuildRequires: ruby ruby-devel rdoc
 Requires: ruby ruby-devel rdoc
+Requires(pre): shadow-utils
 
 %description
 RubyGems is the name of the project that developed the gem packaging
@@ -37,26 +38,26 @@ system and the gem command.
 
 %setup -q
 
-%patch1 -p1
+%patch1 -p1 -b .default-dir
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{rbindir}
-mkdir -p ${RPM_BUILD_ROOT}%{rlibdir}
+#mkdir -p ${RPM_BUILD_ROOT}%{rbindir}
+#mkdir -p ${RPM_BUILD_ROOT}%{rlibdir}
 
-#%{ruby} -I${RPM_BUILD_ROOT}%{rlibdir} \
-%{ruby} -I%{rlibdir} setup.rb install --destdir=${RPM_BUILD_ROOT}%{rlibdir} --prefix=/
+GEM_HOME=${RPM_BUILD_ROOT}%{gemdir} \
+  %{ruby} -I%{rlibdir} setup.rb install --destdir=${RPM_BUILD_ROOT}%{rlibdir} --prefix=/
 
 # fix install path
 mkdir -p %{buildroot}%{_bindir}
 mv %{buildroot}%{rlibdir}/bin/gem %{buildroot}%{_bindir}/gem
-rm -rf %{buildroot}%{rlibdir}/bin
+rmdir %{buildroot}%{rlibdir}/bin
 mv %{buildroot}%{rlibdir}/lib/* %{buildroot}%{rlibdir}/.
 
 %{rdoc} --op html \
-  --main README . README LICENSE.txt GPL.txt
+  --main README . README.rdoc UPGRADING.rdoc LICENSE.txt GPL.txt
 %{rdoc} --ri --op ${RPM_BUILD_ROOT}%{gemdir}/doc/%{name}-%{version} \
-  --main README . README LICENSE.txt GPL.txt
+  --main README . README.rdoc UPGRADING.rdoc LICENSE.txt GPL.txt
 rm -f ${RPM_BUILD_ROOT}%{gemdir}/doc/rubygems-%{version}/created.rid
 
 cd pkgs/sources
@@ -76,10 +77,7 @@ rm -rf ${RPM_BUILD_ROOT}
 rm -rf html
 
 %pre
-if [ `grep rubygems %{_sysconfdir}/group | wc -l` = 0 ]; then
-  %{_sbindir}/groupadd rubygems
-fi
-
+getent group rubygems >/dev/null || %{_sbindir}/groupadd rubygems
 
 %files
 %defattr(-, root, root)
@@ -95,6 +93,14 @@ fi
 %{gemdir}
 
 %changelog
+* Tue Mar 22 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.6.2-1
+- new upstream release
+- s/BuildPreReq/BuildRequires
+- add R(pre): shadow-utils
+- update default dir patch (Patch1)
+- use getent in %%pre script
+- update License: tag
+
 * Thu Sep 16 2010 IWAI, Masaharu <iwai@alib.jp> 1.3.7-1
 - new upstream release
 - update default dir patch (Patch1)