moving gems to -management spec file

bobmcwhirter · May 23, 2009 · 56daf32 · 56daf32
1 parent afa2b8c
commit 56daf32
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/specs/extras/jboss-cloud-environment.spec b/specs/extras/jboss-cloud-environment.spec
@@ -9,13 +9,9 @@ BuildArch:      noarch
 Group:          Applications/System
 Source0:        http://www.apache.org/dist/maven/binaries/apache-maven-2.1.0-bin.tar.gz
 Source1:        jboss-cloud-environment-sudo-oddthesis-user.patch
-Source2:        http://rubyforge.org/frs/download.php/52464/xml-simple-1.0.12.gem
-Source3:        http://rubyforge.org/frs/download.php/52548/mime-types-1.16.gem
-Source4:        http://rubyforge.org/frs/download.php/21724/builder-2.1.2.gem
 BuildRoot:      /tmp/%{name}
 Requires:       shadow-utils
 Requires:       git
-Requires:       rubygems
 
 %description
 JBoss-Cloud environment. Required tools and source code for building appliances.
@@ -32,13 +28,9 @@ cd $RPM_BUILD_ROOT/opt/jboss-cloud/sources
 
 mkdir -p $RPM_BUILD_ROOT/opt/jboss-cloud/tools/apache-maven-%{maven_version}
 mkdir -p $RPM_BUILD_ROOT/opt/jboss-cloud/patches
-mkdir -p $RPM_BUILD_ROOT/opt/jboss-cloud/tools/gems
 
 cp -R %{_topdir}/BUILD/apache-maven-%{maven_version} $RPM_BUILD_ROOT/opt/jboss-cloud/tools/
 cp %{SOURCE1} $RPM_BUILD_ROOT/opt/jboss-cloud/patches/
-cp %{SOURCE2} $RPM_BUILD_ROOT/opt/jboss-cloud/tools/gems/
-cp %{SOURCE3} $RPM_BUILD_ROOT/opt/jboss-cloud/tools/gems/
-cp %{SOURCE4} $RPM_BUILD_ROOT/opt/jboss-cloud/tools/gems/
 
 %clean
 rm -Rf $RPM_BUILD_ROOT
@@ -48,12 +40,6 @@ rm -Rf $RPM_BUILD_ROOT
 /usr/sbin/useradd -m -p '$1$rJT7v$rovvIw9nHJQdLZBvZJNPa0' oddthesis
 /bin/chown oddthesis:oddthesis /opt/jboss-cloud -R
 
-# install additional gems
-
-/usr/bin/gem install -q /opt/jboss-cloud/tools/gems/xml-simple-1.0.12.gem
-/usr/bin/gem install -q /opt/jboss-cloud/tools/gems/builder-2.1.2.gem
-/usr/bin/gem install -q /opt/jboss-cloud/tools/gems/mime-types-1.16.gem
-
 patch -s /etc/sudoers < /opt/jboss-cloud/patches/jboss-cloud-environment-sudo-oddthesis-user.patch
 
 /bin/echo "### JBoss Cloud Vars, do not modify this line! ###" >> /home/oddthesis/.bashrc

diff --git a/specs/extras/jboss-cloud-management.spec b/specs/extras/jboss-cloud-management.spec
@@ -6,7 +6,11 @@ License:        LGPL
 Requires:       git
 Requires:       shadow-utils
 Requires:       ruby
+Requires:       rubygems
 Source0:        thin-ruby-env.patch
+Source1:        http://rubyforge.org/frs/download.php/52464/xml-simple-1.0.12.gem
+Source2:        http://rubyforge.org/frs/download.php/52548/mime-types-1.16.gem
+Source3:        http://rubyforge.org/frs/download.php/21724/builder-2.1.2.gem
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -36,6 +40,13 @@ pushd $RPM_BUILD_ROOT/usr/share/%{name}/lib/thin/ext/thin_parser
 /usr/bin/make clean
 popd
 
+%install
+
+mkdir -p $RPM_BUILD_ROOT/usr/share/%{name}-gems
+cp %{SOURCE2} $RPM_BUILD_ROOT/usr/share/%{name}-gems
+cp %{SOURCE3} $RPM_BUILD_ROOT/usr/share/%{name}-gems
+cp %{SOURCE4} $RPM_BUILD_ROOT/usr/share/%{name}-gems
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -45,6 +56,12 @@ rm -rf $RPM_BUILD_ROOT
 /usr/sbin/useradd -m -r -g thin thin 2>/dev/null || :
 
 %post
+# install additional gems
+
+/usr/bin/gem install -q /usr/share/%{name}-gems/xml-simple-1.0.12.gem
+/usr/bin/gem install -q /usr/share/%{name}-gems/builder-2.1.2.gem
+/usr/bin/gem install -q /usr/share/%{name}-gems/mime-types-1.16.gem
+
 /bin/mkdir -p /var/log/jboss-cloud-management
 /bin/chown thin:thin /var/log/jboss-cloud-management
 echo "sh /usr/share/%{name}/src/network-setup.sh" >> /etc/rc.local