[rubygem-zoom] Simplify packaging

Mamoru Tasaka mtasaka at fedoraproject.org
Sun Jun 5 08:28:28 UTC 2011


commit de767a8e0e0d3bde7dfa748221c85bf49a2435c8
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Jun 5 17:28:13 2011 +0900

    Simplify packaging

 rubygem-zoom.spec |  101 ++++++++++++++---------------------------------------
 1 files changed, 26 insertions(+), 75 deletions(-)
---
diff --git a/rubygem-zoom.spec b/rubygem-zoom.spec
index ac496df..1ebe605 100644
--- a/rubygem-zoom.spec
+++ b/rubygem-zoom.spec
@@ -10,14 +10,13 @@
 
 Name:		rubygem-%{gemname}
 Version:	0.4.1
-Release:	10%{?dist}
+Release:	11%{?dist}
 Group:		Development/Languages
 Summary:	Ruby binding to ZOOM
 
 License:	LGPLv2+
 URL:		http://ruby-zoom.rubyforge.org/
-Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{gemname}-%{version}.gem
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	rubygem(rake)
@@ -27,10 +26,7 @@ BuildRequires:	libgcrypt-devel
 BuildRequires:	libgpg-error-devel
 BuildRequires:	libxslt-devel
 BuildRequires:	libyaz-devel
-BuildRequires:	tcp_wrappers
-%if 0%{?fedora} >= 7
 BuildRequires:	tcp_wrappers-devel
-%endif
 
 Requires:	ruby(abi) = %{rubyabi}
 Requires:	ruby(rubygems)
@@ -56,105 +52,60 @@ This package contains documentation for %{name}.
 
 
 %prep
-%setup -q -c
-%{__gzip} -dc data.tar.gz | %{__tar} -x -f -
+%setup -q -c -T
 
-# Cleanup
-%{__rm} -rf */CVS/
-find . -type f -print0 | xargs -0 touch -r %{SOURCE0}
-
-# Repackage to split out unneeded files
-# So unpack source again
-%{__mkdir} Repackage
-cd Repackage
-%{__gzip} -dc ../data.tar.gz | %{__tar} -x -f -
-cd ..
-
-# Permission
-find . -type f -print0 | xargs -0 %{__chmod} 0644
-
-%build
-# Repackage gem
-cd Repackage
-%{__rm} -rf \
-	sample/ \
-	test/ \
-
-rake gem
-%{__mv} pkg/*.gem ..
-cd ..
-
-%install
-%{__rm} -rf %{buildroot}
-
-# 1. gem install
-##
-##  First install gem files under %%builddir (not %%buildroot),
-##  then copy (not move) whole tree to %%buildroot.
-##
-##  Otherwise check-buildroot will complain for ruby
-##  C extention because C extention compilation is done
-##  under %%buildroot.
-##  Also when we "move" whole tree (not copy) to
-##  %%buildroot debuginfo.sh will complain that the sources
-##  are missing.
-##
-%{__rm} -rf ./tmpinstdir
-
-%{__mkdir_p} ./tmpinstdir/%{gemdir}
-%{__mkdir_p} %{buildroot}%{gemdir}
-
-# Set CFLAGS
 export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
 gem install \
 	-V \
 	--local \
-	--install-dir ./tmpinstdir/%{gemdir} \
+	--install-dir ./%{gemdir} \
 	--force \
-	*.gem
-%{__cp} -a ./tmpinstdir/%{gemdir}/* %{buildroot}%{gemdir}/
+	%{SOURCE0}
+
+chmod 0644 ./%{gemdir}/cache/%{gemname}-%{version}.gem
+
+%build
+
+%install
+# 1. copy all
+mkdir -p %{buildroot}%{_prefix}
+cp -a .%{_prefix}/* %{buildroot}%{_prefix}/
 
 # 2. move ruby C extention
-%{__mkdir_p} %{buildroot}%{ruby_sitearch}
-%{__mv} -f %{buildroot}%{geminstdir}/lib/*.so \
+mkdir -p %{buildroot}%{ruby_sitearch}
+mv -f %{buildroot}%{geminstdir}/lib/*.so \
 	%{buildroot}%{ruby_sitearch}/
 
 # 3. Cleanups
-%{__rm} -rf %{buildroot}%{geminstdir}/lib/
-pushd %{buildroot}%{geminstdir}/src/
-%{__rm} -f \
-	*.{so,o} \
-	Makefile \
-	mkmf.log
-popd
+# Use rmdir, to check if any files are left under lib/
+rmdir %{buildroot}%{geminstdir}/lib/
+rm -rf %{buildroot}%{geminstdir}/src/
 
 %check
 # Net connection needed, disabling now.
 exit 0
 rake test
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
 %defattr(-, root, root,-)
 %{ruby_sitearch}/%{gemname}.so
 
-%{geminstdir}/
-%exclude %{geminstdir}/src/
-%exclude %{geminstdir}/Rakefile
+%dir %{geminstdir}/
+%doc %{geminstdir}/[A-Z]*
 
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %files doc
 %defattr(-,root,root,-)
-%doc sample/
-%doc test/
-%{geminstdir}/src/
 %{geminstdir}/Rakefile
+%{geminstdir}/sample/
+%{geminstdir}/test/
 
 %changelog
+* Sun Jun 05 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.4.1-11
+- Simplify packaging
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list