rgem2rpm 1.4.5 → 1.4.6

data/conf/template.spec

@@ -5,6 +5,7 @@
 	/usr/lib/rpm/brp-strip-comment-note %{__strip} %{__objdump} \
 %{nil}
 
+%define _binaries_in_noarch_packages_terminate_build 0
 %define distnum %{expand:%%(/usr/lib/rpm/redhat/dist.sh --distnum)}
 %define disttype %{expand:%%(/usr/lib/rpm/redhat/dist.sh --disttype)}
 %define name <%=name%>

data/lib/rgem2rpm/gem.rb

@@ -36,8 +36,6 @@ class RGem2Rpm::Gem
     Dir["#{@installdir}/*"].each {|name| FileUtils.rm_rf(name) unless name =~ /bin|gems|specifications/ }
     # get file list
     files
-    # alter executables first line
-    shebang
     # build tar.gz
     build_source
   end
@@ -106,7 +104,7 @@ class RGem2Rpm::Gem
         @spec[:files][:directories] << 'bin'
         # get files and directories
         Dir.glob("gems/**/*") do |file|
-          key = File.directory?(file) ? :directories : :files
+          key = File.directory?(file) ? :directories : (File.executable?(file) || file.end_with?('.sh') ? :executables : :files)
           @spec[:files][key] << file
         end
         # get gem path
@@ -120,19 +118,16 @@ class RGem2Rpm::Gem
         # get executable files
         Dir.glob("bin/*") do |file|
           @spec[:files][:executables] << file
+          shebang(file)
         end
       end
     end
     
-    def shebang
-      # check if gem has executables
-      return if @spec[:executables].nil? or @spec[:executables].empty?
+    def shebang(filename)
       # alter first line of all executables
-      @spec[:executables].each do |file|
-        file_arr = File.readlines("#{@installdir}/bin/#{file}")
-        file_arr[0] = "#!/usr/bin/env #{@platform}\n"
-        File.open("#{@installdir}/bin/#{file}", 'w') { |f| f.write(file_arr.join) }
-      end
+      file_arr = File.readlines(filename)
+      file_arr[0] = "#!/usr/bin/env #{@platform}\n"
+      File.open(filename, 'w') { |f| f.write(file_arr.join) }
     end
     
     def build_source

data/lib/rgem2rpm/rpm.rb

@@ -35,26 +35,21 @@ class RGem2Rpm::Rpm
     install_str << "rm -rf %{buildroot}\n"
     # get directories
     @files[:directories].each { |directory|
-      directory.gsub!(/%/, '%%')
-      install_str << "install -d \"#{directory}\" %{buildroot}%{prefix}/\"#{directory}\"\n"
+      escaped_str = directory.gsub(/%/, '%%')
+      install_str << "install -d \"#{escaped_str}\" %{buildroot}%{prefix}/\"#{escaped_str}\"\n"
     }
     # get files
     @files[:files].each { |file|
-      if file.end_with?('.sh')
-        @files[:files].delete(file)
-        @files[:executables] << file
-      else
-        file.gsub!(/%/, '%%')
-        install_str << "install -m 644 \"#{file}\" %{buildroot}%{prefix}/\"#{file}\"\n"
-      end
+      escaped_str = file.gsub(/%/, '%%')
+      install_str << "install -m 644 \"#{escaped_str}\" %{buildroot}%{prefix}/\"#{escaped_str}\"\n"
     }
     # get specification
-    specfile = @files[:specification].gsub(/%/, '%%')
-    install_str << "install -m 644 \"#{specfile}\" %{buildroot}%{prefix}/\"#{specfile}\"\n"
+    escaped_str = @files[:specification].gsub(/%/, '%%')
+    install_str << "install -m 644 \"#{escaped_str}\" %{buildroot}%{prefix}/\"#{escaped_str}\"\n"
     # get executables
     @files[:executables].each { |executable|
-      executable.gsub!(/%/, '%%')
-      install_str << "install -m 0755 \"#{executable}\" %{buildroot}%{prefix}/\"#{executable}\"\n"
+      escaped_str = executable.gsub(/%/, '%%')
+      install_str << "install -m 0755 \"#{escaped_str}\" %{buildroot}%{prefix}/\"#{escaped_str}\"\n"
     }
     # return install string
     install_str.string
@@ -69,7 +64,11 @@ class RGem2Rpm::Rpm
     files_str << "%dir %{prefix}/#{@files[:gempath]}\n"
     files_str << "%dir %{prefix}/specifications\n"
     files_str << "%{prefix}/#{@files[:specification]}\n"
-    files_str << "%{prefix}/#{@files[:gempath]}/*\n" unless @files[:files].empty?
+    
+    @files[:files].each { |file|
+      escaped_str = file.gsub(/%/, '*')
+      files_str << "\"%{prefix}/#{escaped_str}\"\n"
+    }
     
     # get executables
     @files[:executables].each { |executable|

data/lib/rgem2rpm/version.rb

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

metadata

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