Hello community,

here is the log from the commit of package golang-org-x-tools for 
openSUSE:Factory checked in at 2019-02-25 17:54:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/golang-org-x-tools (Old)
 and      /work/SRC/openSUSE:Factory/.golang-org-x-tools.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "golang-org-x-tools"

Mon Feb 25 17:54:48 2019 rev:3 rq:678322 version:1.9+git20170824.5d2fd3cc

Changes:
--------
--- /work/SRC/openSUSE:Factory/golang-org-x-tools/golang-org-x-tools.changes    
2018-06-29 22:36:55.737974294 +0200
+++ 
/work/SRC/openSUSE:Factory/.golang-org-x-tools.new.28833/golang-org-x-tools.changes
 2019-02-25 17:54:54.414485033 +0100
@@ -1,0 +2,5 @@
+Thu Feb 21 14:08:36 UTC 2019 - Dan Čermák <dcer...@suse.com>
+
+- Rename bundle to go-bundle & fix conflict with rubygem(bundler)
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ golang-org-x-tools.spec ++++++
--- /var/tmp/diff_new_pack.fLDT7T/_old  2019-02-25 17:54:55.150484081 +0100
+++ /var/tmp/diff_new_pack.fLDT7T/_new  2019-02-25 17:54:55.162484065 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package golang-org-x
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -59,7 +59,6 @@
 Summary:        Additional toolsgraphy libraries
 Group:          Development/Languages/Golang
 AutoReqProv:    Off
-Conflicts:      rubygem(bundler)
 
 %{?systemd_requires}
 %{go_exclusivearch}
@@ -96,6 +95,11 @@
 
 find . -name '*.1' -exec install -Dm644 {} %{buildroot}%{_mandir}/man1/{} \;
 
+# fix file conflicts with rubygem(bundler),
+# which is included in ruby as of ruby2.6
+mv %{buildroot}%{_bindir}/bundle %{buildroot}%{_bindir}/go-bundle
+mv %{buildroot}%{_mandir}/man1/bundle.1 %{buildroot}%{_mandir}/man1/go-bundle.1
+
 %pre -n go-tools
 %service_add_pre godoc.service
 
@@ -109,13 +113,18 @@
 %service_del_postun godoc.service
 
 %files -f file.lst
-%defattr(-,root,root,-)
-%doc README LICENSE PATENTS AUTHORS CONTRIBUTORS
+%doc README AUTHORS CONTRIBUTORS
+
+# /usr/share/licenses is not owned by any package on SLE 12 SP2 and older
+%if 0%{?sle_version} <= 120200 && !0%{?is_opensuse}
+%doc LICENSE PATENTS
+%else
+%license LICENSE PATENTS
+%endif
 
 %files -n go-tools
-%defattr(-,root,root)
 %{_bindir}/benchcmp
-%{_bindir}/bundle
+%{_bindir}/go-bundle
 %{_bindir}/callgraph
 %{_bindir}/compilebench
 %{_bindir}/digraph
@@ -141,7 +150,7 @@
 %{_bindir}/toolstash
 
 %{_mandir}/man1/benchcmp.1*
-%{_mandir}/man1/bundle.1*
+%{_mandir}/man1/go-bundle.1*
 %{_mandir}/man1/callgraph.1*
 %{_mandir}/man1/compilebench.1*
 %{_mandir}/man1/digraph.1*


Reply via email to