rgem2rpm 1.4.6 → 1.4.7

data/lib/rgem2rpm/gem.rb

@@ -23,17 +23,8 @@ class RGem2Rpm::Gem
     @installdir = "#{@spec[:installname]}-#{@spec[:version]}"
     # install gem
     Gem::Installer.new(@filename, :env_shebang => true, :ignore_dependencies => true, :install_dir => @installdir, :bin_dir => "#{@installdir}/bin", :wrappers => true).install
-    # clean build if gem has extensions
-    @spec[:extensions].each do |extension|
-      Dir.chdir(File.dirname("#{@installdir}/gems/#{@filename[0, @filename.size-4]}/#{extension}")) do |path|
-        # delete intermediate build files
-        system "make clean"
-        # delete makefile
-        FileUtils.rm_rf("#{path}/Makefile")
-      end
-    end
-    # delete directories
-    Dir["#{@installdir}/*"].each {|name| FileUtils.rm_rf(name) unless name =~ /bin|gems|specifications/ }
+    # install build files
+    install_build_files
     # get file list
     files
     # build tar.gz
@@ -138,4 +129,20 @@ class RGem2Rpm::Gem
       # clean temporary files
       FileUtils.rm_rf @installdir
     end
+    
+    def install_build_files
+      # get current directory
+      pwd = FileUtils.pwd
+      # clean build if gem has extensions
+      @spec[:extensions].each { |extension|
+        path = File.dirname("#{pwd}/#{@installdir}/gems/#{@filename[0, @filename.size-4]}/#{extension}")
+        FileUtils.cp_r "#{path}/#{@installdir}", "#{pwd}/"
+        FileUtils.rm_rf "#{path}/#{@installdir}"
+        FileUtils.rm_rf Dir.glob("#{path}/*.o")
+        FileUtils.rm_rf Dir.glob("#{path}/*.so")
+        FileUtils.rm_rf "#{path}/Makefile"
+      }
+      # delete directories
+      Dir["#{@installdir}/*"].each {|name| FileUtils.rm_rf(name) unless name =~ /bin|gems|specifications/ }
+    end
 end

data/lib/rgem2rpm/rpm.rb

@@ -58,15 +58,16 @@ class RGem2Rpm::Rpm
   def filelist
     files_str = StringIO.new
     files_str << "%defattr(0644,#{@osuser},#{@osgroup},0755)\n"
+    
     files_str << "%dir %{prefix}\n"
-    files_str << "%dir %{prefix}/bin\n"
-    files_str << "%dir %{prefix}/gems\n"
-    files_str << "%dir %{prefix}/#{@files[:gempath]}\n"
-    files_str << "%dir %{prefix}/specifications\n"
-    files_str << "%{prefix}/#{@files[:specification]}\n"
+    @files[:directories].each { |file|
+      escaped_str = file.gsub(/%/, '?')
+      files_str << "%dir \"%{prefix}/#{escaped_str}\"\n"
+    }
     
+    files_str << "%{prefix}/#{@files[:specification]}\n"
     @files[:files].each { |file|
-      escaped_str = file.gsub(/%/, '*')
+      escaped_str = file.gsub(/%/, '?')
       files_str << "\"%{prefix}/#{escaped_str}\"\n"
     }
     

data/lib/rgem2rpm/version.rb

@@ -1,3 +1,3 @@
 module RGem2Rpm
-  VERSION = '1.4.6'
+  VERSION = '1.4.7'
 end

metadata

@@ -2,7 +2,7 @@
 name: rgem2rpm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors: 
   - Joao Peixoto
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-09 00:00:00 Z
+date: 2012-11-16 00:00:00 Z
 dependencies: []
 
 description: Application that enables conversion of rubygems to rpms.