Hello community,

here is the log from the commit of package rubygem-gem2rpm for openSUSE:Factory 
checked in at 2013-06-11 06:38:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-gem2rpm (Old)
 and      /work/SRC/openSUSE:Factory/.rubygem-gem2rpm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "rubygem-gem2rpm"

Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-gem2rpm/rubygem-gem2rpm.changes  
2013-06-05 19:33:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-gem2rpm.new/rubygem-gem2rpm.changes     
2013-06-11 09:37:28.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Jun 10 10:04:12 UTC 2013 - [email protected]
+
+- make sure license.txt is also symlinked
+
+-------------------------------------------------------------------
+Sat Jun  8 06:42:37 UTC 2013 - [email protected]
+
+- integrate more of the version into the mod_weight to give
+  an easier job to update-alternatives
+- use --force in update-alternatives to replace (old) binaries
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------

++++++ gem2rpm-fix-opensuse-template.diff ++++++
--- /var/tmp/diff_new_pack.IfvusN/_old  2013-06-11 09:37:28.000000000 +0200
+++ /var/tmp/diff_new_pack.IfvusN/_new  2013-06-11 09:37:28.000000000 +0200
@@ -75,7 +75,7 @@
        begin
 diff -ru gem2rpm-0.9.2.orig/templates/opensuse.spec.erb 
gem2rpm-0.9.2/templates/opensuse.spec.erb
 --- gem2rpm-0.9.2.orig/templates/opensuse.spec.erb     2013-04-30 
13:31:08.586730796 +0200
-+++ gem2rpm-0.9.2/templates/opensuse.spec.erb  2013-05-25 22:59:55.229799605 
+0200
++++ gem2rpm-0.9.2/templates/opensuse.spec.erb  2013-06-10 12:04:00.205318552 
+0200
 @@ -1,7 +1,7 @@
  #
 -# spec file for package rubygem-<%= spec.name %> (Version <%= spec.version %>)
@@ -86,7 +86,7 @@
  #
  # All modifications and additions to the file contributed by third parties
  # remain the property of their copyright owners, unless otherwise agreed
-@@ -15,58 +15,162 @@
+@@ -15,58 +15,169 @@
  # Please submit bugfixes or comments via http://bugs.opensuse.org/
  #
  
@@ -101,6 +101,16 @@
 -License:        GPLv2+ or Ruby
 -#
 +%define mod_full_name %{mod_name}-%{version}
++<% unless spec.executables.empty? 
++   versions=spec.version.to_s.split('.')
++   begin v1=Integer(versions[0]) rescue v1=1 end
++   begin v2=Integer(versions[1]) rescue v2=0 end
++   begin v3=Integer(versions[2]) rescue v3=0 end 
++   weight=v1*10000+v2*100+v3
++   -%>
++%define mod_branch -%{version}
++%define mod_weight <%= weight %>
++<% end -%>
 +
  BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 -BuildRequires:  rubygems_with_buildroot_patch
@@ -116,9 +126,9 @@
 +<% unless req.empty? -%>
 +Requires:       ruby <%= req %>
 +BuildRequires:  ruby-devel <%= req %>
++<% end -%>
  <% end -%>
 -<% for d in spec.dependencies -%>
-+<% end -%>
 +<% for d in spec.runtime_dependencies -%>
 +<% if ['rdoc'].include? d.name.to_s -%>
 +# <%= d.name %> <%= d.__getobj__().requirement %>
@@ -148,15 +158,13 @@
 +<% end -%>
 +Group:          Development/Languages/Ruby
 +<% unless spec.executables.empty? -%>
-+%define mod_branch -%{version}
-+%define mod_weight <%= spec.version.to_s.split('.')[0] %>
 +PreReq:         update-alternatives
 +<% end -%>
 +
  %description
 -<%= spec.description %>
 +<%= spec.description -%>
-+
+ 
 +<% if spec.has_rdoc -%>
 +%package doc
 +Summary:        RDoc documentation for %{mod_name}
@@ -181,11 +189,10 @@
 +     %w(test spec).each { |framework|
 +       test_frameworks[framework] = 1 if path.index(framework + "/") == 0
 +     }
-+     %w(changes copying copying.txt history history.md history.txt legal.rdoc 
-+        license license.md license.rdoc mit-license changes.txt changes.md 
changelog.txt history.rdoc changelog.rdoc changelog.md
-+        mit-license.txt readme readme.md readme.rdoc readme.txt).each { |file|
-+  #   $stderr.puts "PATH #{path} #{file}"
-+      docdirfiles << path if path.downcase == file
++     %w(changes copying history legal license mit-license changelog 
readme).each { |file|
++      bpath = path.downcase.gsub(%r{\.rdoc$}, '').gsub(%r{\.txt$}, 
'').gsub(%r{\.md$}, '')
++      #$stderr.puts "PATH #{path} #{bpath} #{file}"
++      docdirfiles << path if bpath == file
 +     }
 +   end
 +   
@@ -199,7 +206,7 @@
 +
 +%description testsuite
 +Test::Unit or RSpec files, useful for developers.
- 
++
 +<% end -%>
  %prep
 +#gem_unpack
@@ -230,7 +237,7 @@
 +
 +%post
 +<% spec.executables.each do |executable| -%>
-+/usr/sbin/update-alternatives --install \
++/usr/sbin/update-alternatives --force --install \
 +    %{_bindir}/<%= executable %> <%= executable %> %{_bindir}/<%= executable 
%>%{mod_branch} %{mod_weight}
 +<% end -%>
  

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to