February 2019 - Arch-excludes - Fedora mailing-lists

Architecture specific change in rpms/wesnoth.git
by githook-noreply＠fedoraproject.org 26 Feb '19

26 Feb '19

The package rpms/wesnoth.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/wesnoth.git/commit/?id=9370e0a5f09c…. Change: -ExcludeArch: ppc64le Thanks. Full change: ============ commit 9370e0a5f09c59a41de5dd9ad550e63a6e3ef3ad Author: Kalev Lember <klember(a)redhat.com> Date: Wed Feb 27 03:05:23 2019 +0100 Enable ppc64le build again It seems to build fine now. diff --git a/wesnoth.spec b/wesnoth.spec index e7e73f5..32f9f13 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -12,8 +12,6 @@ Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 Source1: wesnothd.service Source2: %{name}.sysconfig -ExcludeArch: ppc64le - Requires: wesnoth-data = %{version} BuildRequires: gcc-c++ BuildRequires: SDL2_image-devel @@ -172,6 +170,7 @@ done %changelog * Tue Feb 26 2019 Kalev Lember <klember(a)redhat.com> - 1.14.6-1 - Update to 1.14.6 +- Enable ppc64le build again * Thu Feb 14 2019 Kalev Lember <klember(a)redhat.com> - 1.14.5-3 - Add missing dbus-devel and readline-devel BRs for optional features commit 71cc4d6b1a04c44ad6d95b747d378afe965f26a0 Author: Kalev Lember <klember(a)redhat.com> Date: Tue Feb 26 23:23:51 2019 +0100 Update to 1.14.6 diff --git a/.gitignore b/.gitignore index 740a576..6a6417a 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.14.3.tar.bz2 /wesnoth-1.14.4.tar.bz2 /wesnoth-1.14.5.tar.bz2 +/wesnoth-1.14.6.tar.bz2 diff --git a/sources b/sources index 206d636..c6bc2b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.14.5.tar.bz2) = 2653cfef45afe02215ddf03c549115e4de1516154d00fe82b8c58eb59bcbe8ee5e1ea8bd46333e3d6d8822a0e75ac9490844010afaaefb000260c1c8356e828d +SHA512 (wesnoth-1.14.6.tar.bz2) = edb38c907a98286c6865c9b4e18d1f6be41f7597d1124e7c352f9d7c4ab7300abb20d35bab9a7315cd37628777a41985bda579904a9dc1052083585035bd4e28 diff --git a/wesnoth-boost169.patch b/wesnoth-boost169.patch deleted file mode 100644 index 0c3ac2e..0000000 --- a/wesnoth-boost169.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c161d649cdacfba4b7d4597d0af0e07b3deda908 Mon Sep 17 00:00:00 2001 -From: Wedge009 <wedge009(a)wedge009.net> -Date: Thu, 27 Dec 2018 08:15:03 +1100 -Subject: [PATCH] Use explicit casts to accommodate changes to boost's tribool - in 1.69. - -(fixes #3646) ---- - src/units/frame.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/units/frame.cpp b/src/units/frame.cpp -index 8169c5f75785..271b8915d04c 100644 ---- a/src/units/frame.cpp -+++ b/src/units/frame.cpp -@@ -460,15 +460,15 @@ std::vector<std::string> frame_parsed_parameters::debug_strings() const - } - - if(!boost::indeterminate(auto_vflip_)) { -- v.emplace_back("auto_vflip=" + utils::bool_string(auto_vflip_)); -+ v.emplace_back("auto_vflip=" + utils::bool_string(static_cast<bool>(auto_vflip_))); - } - - if(!boost::indeterminate(auto_hflip_)) { -- v.emplace_back("auto_hflip=" + utils::bool_string(auto_hflip_)); -+ v.emplace_back("auto_hflip=" + utils::bool_string(static_cast<bool>(auto_hflip_))); - } - - if(!boost::indeterminate(primary_frame_)) { -- v.emplace_back("primary_frame=" + utils::bool_string(primary_frame_)); -+ v.emplace_back("primary_frame=" + utils::bool_string(static_cast<bool>(primary_frame_))); - } - - if(!drawing_layer_.get_original().empty()) { -@@ -772,7 +772,7 @@ const frame_parameters unit_frame::merge_parameters(int current_time, const fram - } - - // Convert the tribool to bool -- const bool primary = result.primary_frame == true || boost::logic::indeterminate(result.primary_frame); -+ const bool primary = static_cast<bool>(result.primary_frame) || boost::logic::indeterminate(result.primary_frame); - - /** The engine provides a default image to use for the unit when none is available */ - result.image = current_val.image.is_void() || current_val.image.get_filename().empty() diff --git a/wesnoth.spec b/wesnoth.spec index 034d9b1..e7e73f5 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,19 +2,15 @@ %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') Name: wesnoth -Version: 1.14.5 -Release: 3%{?dist} +Version: 1.14.6 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ URL: http://www.wesnoth.org Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 -#Source0: wesnoth-795624ab4e.tar.gz Source1: wesnothd.service Source2: %{name}.sysconfig -# Fix the build with boost 1.69 -# https://github.com/wesnoth/wesnoth/commit/c161d649cdacfba4b7d4597d0af0e07b3… -Patch0: wesnoth-boost169.patch ExcludeArch: ppc64le @@ -174,6 +170,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Feb 26 2019 Kalev Lember <klember(a)redhat.com> - 1.14.6-1 +- Update to 1.14.6 + * Thu Feb 14 2019 Kalev Lember <klember(a)redhat.com> - 1.14.5-3 - Add missing dbus-devel and readline-devel BRs for optional features - Fix dejavu font unbundling

1 0

Architecture specific change in rpms/wesnoth.git
by githook-noreply＠fedoraproject.org 26 Feb '19

26 Feb '19

The package rpms/wesnoth.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/wesnoth.git/commit/?id=9370e0a5f09c…. Change: -ExcludeArch: ppc64le Thanks. Full change: ============ commit 9370e0a5f09c59a41de5dd9ad550e63a6e3ef3ad Author: Kalev Lember <klember(a)redhat.com> Date: Wed Feb 27 03:05:23 2019 +0100 Enable ppc64le build again It seems to build fine now. diff --git a/wesnoth.spec b/wesnoth.spec index e7e73f5..32f9f13 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -12,8 +12,6 @@ Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 Source1: wesnothd.service Source2: %{name}.sysconfig -ExcludeArch: ppc64le - Requires: wesnoth-data = %{version} BuildRequires: gcc-c++ BuildRequires: SDL2_image-devel @@ -172,6 +170,7 @@ done %changelog * Tue Feb 26 2019 Kalev Lember <klember(a)redhat.com> - 1.14.6-1 - Update to 1.14.6 +- Enable ppc64le build again * Thu Feb 14 2019 Kalev Lember <klember(a)redhat.com> - 1.14.5-3 - Add missing dbus-devel and readline-devel BRs for optional features commit 71cc4d6b1a04c44ad6d95b747d378afe965f26a0 Author: Kalev Lember <klember(a)redhat.com> Date: Tue Feb 26 23:23:51 2019 +0100 Update to 1.14.6 diff --git a/.gitignore b/.gitignore index 740a576..6a6417a 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.14.3.tar.bz2 /wesnoth-1.14.4.tar.bz2 /wesnoth-1.14.5.tar.bz2 +/wesnoth-1.14.6.tar.bz2 diff --git a/sources b/sources index 206d636..c6bc2b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.14.5.tar.bz2) = 2653cfef45afe02215ddf03c549115e4de1516154d00fe82b8c58eb59bcbe8ee5e1ea8bd46333e3d6d8822a0e75ac9490844010afaaefb000260c1c8356e828d +SHA512 (wesnoth-1.14.6.tar.bz2) = edb38c907a98286c6865c9b4e18d1f6be41f7597d1124e7c352f9d7c4ab7300abb20d35bab9a7315cd37628777a41985bda579904a9dc1052083585035bd4e28 diff --git a/wesnoth-boost169.patch b/wesnoth-boost169.patch deleted file mode 100644 index 0c3ac2e..0000000 --- a/wesnoth-boost169.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c161d649cdacfba4b7d4597d0af0e07b3deda908 Mon Sep 17 00:00:00 2001 -From: Wedge009 <wedge009(a)wedge009.net> -Date: Thu, 27 Dec 2018 08:15:03 +1100 -Subject: [PATCH] Use explicit casts to accommodate changes to boost's tribool - in 1.69. - -(fixes #3646) ---- - src/units/frame.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/units/frame.cpp b/src/units/frame.cpp -index 8169c5f75785..271b8915d04c 100644 ---- a/src/units/frame.cpp -+++ b/src/units/frame.cpp -@@ -460,15 +460,15 @@ std::vector<std::string> frame_parsed_parameters::debug_strings() const - } - - if(!boost::indeterminate(auto_vflip_)) { -- v.emplace_back("auto_vflip=" + utils::bool_string(auto_vflip_)); -+ v.emplace_back("auto_vflip=" + utils::bool_string(static_cast<bool>(auto_vflip_))); - } - - if(!boost::indeterminate(auto_hflip_)) { -- v.emplace_back("auto_hflip=" + utils::bool_string(auto_hflip_)); -+ v.emplace_back("auto_hflip=" + utils::bool_string(static_cast<bool>(auto_hflip_))); - } - - if(!boost::indeterminate(primary_frame_)) { -- v.emplace_back("primary_frame=" + utils::bool_string(primary_frame_)); -+ v.emplace_back("primary_frame=" + utils::bool_string(static_cast<bool>(primary_frame_))); - } - - if(!drawing_layer_.get_original().empty()) { -@@ -772,7 +772,7 @@ const frame_parameters unit_frame::merge_parameters(int current_time, const fram - } - - // Convert the tribool to bool -- const bool primary = result.primary_frame == true || boost::logic::indeterminate(result.primary_frame); -+ const bool primary = static_cast<bool>(result.primary_frame) || boost::logic::indeterminate(result.primary_frame); - - /** The engine provides a default image to use for the unit when none is available */ - result.image = current_val.image.is_void() || current_val.image.get_filename().empty() diff --git a/wesnoth.spec b/wesnoth.spec index 034d9b1..e7e73f5 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,19 +2,15 @@ %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') Name: wesnoth -Version: 1.14.5 -Release: 3%{?dist} +Version: 1.14.6 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ URL: http://www.wesnoth.org Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 -#Source0: wesnoth-795624ab4e.tar.gz Source1: wesnothd.service Source2: %{name}.sysconfig -# Fix the build with boost 1.69 -# https://github.com/wesnoth/wesnoth/commit/c161d649cdacfba4b7d4597d0af0e07b3… -Patch0: wesnoth-boost169.patch ExcludeArch: ppc64le @@ -174,6 +170,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Feb 26 2019 Kalev Lember <klember(a)redhat.com> - 1.14.6-1 +- Update to 1.14.6 + * Thu Feb 14 2019 Kalev Lember <klember(a)redhat.com> - 1.14.5-3 - Add missing dbus-devel and readline-devel BRs for optional features - Fix dejavu font unbundling

1 0

Architecture specific change in rpms/delve.git
by githook-noreply＠fedoraproject.org 26 Feb '19

26 Feb '19

The package rpms/delve.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=39cfa248f89aa6… https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=8ec56186bf0751… https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=baf961b7b960dd…. Change: +ExclusiveArch: x86_64 +ExcludeArch: i686 +ExcludeArch: armv7hl Thanks. Full change: ============ commit 866ba589069390e0eb52d68b391b5e1fd86d25b6 Author: Derek Parker <deparker(a)redhat.com> Date: Tue Feb 26 16:02:11 2019 -0800 Use custom check section diff --git a/delve.spec b/delve.spec index 2b58de7..f1b891c 100644 --- a/delve.spec +++ b/delve.spec @@ -79,7 +79,19 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %if %{with check} %check -%gochecks +export GO111MODULE=off +export GOPATH=%{buildroot}/%{gopath}:%{gopath} + +delvepath=%{buildroot}/%{gopath}/src/%{goipath} +cp -r _fixtures $delvepath +cp -r pkg/dwarf/line/_testdata $delvepath/pkg/dwarf/line +pushd $delvepath +for d in $(go list ./... | grep -v cmd | grep -v scripts); do + %gotest ${d} +done +rm -rf $delvepath/_fixtures +rm -rf $delvepath/pkg/dwarf/line/_testdata +popd %endif commit baf961b7b960dd8025602db8db4211423015e9ce Author: Derek Parker <deparker(a)redhat.com> Date: Mon Feb 25 10:18:40 2019 -0800 Exclude armv7hl diff --git a/delve.spec b/delve.spec index ce5dade..2b58de7 100644 --- a/delve.spec +++ b/delve.spec @@ -28,6 +28,7 @@ ExcludeArch: ppc64le ExcludeArch: s390x ExcludeArch: aarch64 ExcludeArch: i686 +ExcludeArch: armv7hl Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch commit 8ec56186bf07517e8266ed3bef02d5e3eea8bc84 Author: Derek Parker <deparker(a)redhat.com> Date: Mon Feb 25 10:09:57 2019 -0800 Exclude non-supported arches diff --git a/delve.spec b/delve.spec index b175ad4..ce5dade 100644 --- a/delve.spec +++ b/delve.spec @@ -22,7 +22,12 @@ Summary: A debugger for the Go programming language License: MIT URL: %{gourl} Source0: %{gosource} -ExclusiveArch: x86_64 + +# Currently Delve only supports x86_64 +ExcludeArch: ppc64le +ExcludeArch: s390x +ExcludeArch: aarch64 +ExcludeArch: i686 Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch commit 39cfa248f89aa69b377aede2ba07c76df8fe0552 Author: Derek Parker <deparker(a)redhat.com> Date: Fri Feb 22 13:02:51 2019 -0800 Add ExclusiveArch diff --git a/delve.spec b/delve.spec index 8777d2e..b175ad4 100644 --- a/delve.spec +++ b/delve.spec @@ -22,6 +22,7 @@ Summary: A debugger for the Go programming language License: MIT URL: %{gourl} Source0: %{gosource} +ExclusiveArch: x86_64 Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch commit c22c3edb1c567b0446b5788b77b8a9ea891f839b Author: Derek Parker <deparker(a)redhat.com> Date: Fri Feb 22 12:54:49 2019 -0800 Add sources file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9cdee55 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/delve-1.2.0.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..e33a23b --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (delve-1.2.0.tar.gz) = 8a19decbb47952671e5b73f6ec1707e318259376b02268509374e101cd9ee54c279fac0655885be6095e7cc82bfb09082cfe557f763475a2cd2f1f572f1a300e commit 43d2ad259c07bf87f266d97f27e3d744be14d950 Author: Derek Parker <deparker(a)redhat.com> Date: Thu Feb 21 16:50:11 2019 -0800 Add patch to remove empty doc file diff --git a/clean-empty-doc.patch b/clean-empty-doc.patch new file mode 100644 index 0000000..4c12416 --- /dev/null +++ b/clean-empty-doc.patch @@ -0,0 +1,16 @@ +From 9cb76893334154001489fb1bbd19fe926f0249e7 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Thu, 21 Feb 2019 12:15:37 -0800 +Subject: [PATCH] Documentation: Remove empty doc file + +--- + Documentation/usage/commands.md | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + delete mode 100644 Documentation/usage/commands.md + +diff --git a/Documentation/usage/commands.md b/Documentation/usage/commands.md +deleted file mode 100644 +index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 +-- +2.16.5 + diff --git a/delve.spec b/delve.spec index a8202df..8777d2e 100644 --- a/delve.spec +++ b/delve.spec @@ -25,6 +25,7 @@ Source0: %{gosource} Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch +Patch3: ./clean-empty-doc.patch BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) commit 5ccb3d6f3f0b901a068ca41dc2c4e397f7a47270 Author: Derek Parker <deparker(a)redhat.com> Date: Wed Feb 20 14:30:38 2019 -0800 Switch back to using gochecks diff --git a/delve.spec b/delve.spec index 82a4361..a8202df 100644 --- a/delve.spec +++ b/delve.spec @@ -71,17 +71,7 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %if %{with check} %check -# Copy to $GOPATH since modules aren't supported. -export GOPATH=%{gopath} -export GO111MODULE=off -mkdir -p %{gopath}/src/$(dirname %{goipath}) -ln -s $(pwd)/. %{gopath}/src/%{goipath} -cd %{gopath}/src/%{goipath} -for i in $(go list ./... | grep -v scripts | grep -v cmd); do - pushd .${i##%{goipath}} - %{gotest} - popd -done +%gochecks %endif commit 6a24acf8d595cc52f18ca8eac331f8caae22e0bc Author: Derek Parker <deparker(a)redhat.com> Date: Wed Feb 20 14:10:25 2019 -0800 Fix spec file and patch tests to run in package build diff --git a/delve.spec b/delve.spec index 0b40524..82a4361 100644 --- a/delve.spec +++ b/delve.spec @@ -23,6 +23,9 @@ License: MIT URL: %{gourl} Source0: %{gosource} +Patch1: ./disable-default-compression-dwz-test.patch +Patch2: ./integration-test-symlinks.patch + BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) BuildRequires: golang(github.com/peterh/liner) @@ -68,7 +71,17 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %if %{with check} %check -%gochecks +# Copy to $GOPATH since modules aren't supported. +export GOPATH=%{gopath} +export GO111MODULE=off +mkdir -p %{gopath}/src/$(dirname %{goipath}) +ln -s $(pwd)/. %{gopath}/src/%{goipath} +cd %{gopath}/src/%{goipath} +for i in $(go list ./... | grep -v scripts | grep -v cmd); do + pushd .${i##%{goipath}} + %{gotest} + popd +done %endif diff --git a/disable-default-compression-dwz-test.patch b/disable-default-compression-dwz-test.patch new file mode 100644 index 0000000..244e4c8 --- /dev/null +++ b/disable-default-compression-dwz-test.patch @@ -0,0 +1,36 @@ +From 1f9597d3ca2e7d3497f9d28046bbae5522742306 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Wed, 20 Feb 2019 13:26:18 -0800 +Subject: [PATCH] pkg/proc: Disable default compression on DWZ test + +When compression is applied by default running the DWZ tool on the +resulting binary will crash. + +The actual default compression code will look and see if compression +makes any difference and if so replace the normal `.debug_*` section +with `.zdebug_*`. This is why it may not have been hit before. On one of +my workstations I build with 1.12rc1 and no compression happens, but on +a Fedora VM I build and the binary results in compressed DWARF sections. + +Adding this flag will make this test more consistent overall. +--- + pkg/proc/test/support.go | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go +index 9e09da861ec53657bfa0fb9cf76620a4fcd485dc..ccfc1c4939ef6e9c8abbbc67f4fbeaaf0e623de1 100644 +--- a/pkg/proc/test/support.go ++++ b/pkg/proc/test/support.go +@@ -125,6 +125,9 @@ func BuildFixture(name string, flags BuildFlags) Fixture { + if flags&BuildModePIE != 0 { + buildFlags = append(buildFlags, "-buildmode=pie") + } ++ if flags&EnableDWZCompression != 0 { ++ buildFlags = append(buildFlags, "-ldflags=-compressdwarf=false") ++ } + if path != "" { + buildFlags = append(buildFlags, name+".go") + } +-- +2.16.5 + diff --git a/integration-test-symlinks.patch b/integration-test-symlinks.patch new file mode 100644 index 0000000..94e2545 --- /dev/null +++ b/integration-test-symlinks.patch @@ -0,0 +1,27 @@ +From c4a4e442e2eee35bc26674cb1d2cb28336780891 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Wed, 20 Feb 2019 14:01:13 -0800 +Subject: [PATCH] service/test: Follow symlinks in integration tests + +--- + service/test/common_test.go | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/service/test/common_test.go b/service/test/common_test.go +index 2b58e371a12472c71beaad0790b001cf4258934c..ee56a53350a45ab790229dd359c472f2c9a952b0 100644 +--- a/service/test/common_test.go ++++ b/service/test/common_test.go +@@ -52,6 +52,10 @@ func testProgPath(t *testing.T, name string) string { + t.Fatal(err) + } + } ++ sympath, err := filepath.EvalSymlinks(fp) ++ if err == nil { ++ fp = strings.Replace(sympath, "\\", "/", -1) ++ } + return fp + } + +-- +2.16.5 + commit c3ae28ead26d7fa3af8c3f1d221dbc44acc8a4fb Author: Derek Parker <deparker(a)redhat.com> Date: Tue Feb 19 11:50:30 2019 -0800 Update spec for v1.2.0 diff --git a/delve.spec b/delve.spec index 46d6ce3..0b40524 100644 --- a/delve.spec +++ b/delve.spec @@ -1,9 +1,9 @@ # Run tests in check section %bcond_without check -# https://github.com/derekparker/delve -%global goipath github.com/derekparker/delve -Version: 1.1.0 +# https://github.com/go-delve/delve +%global goipath github.com/go-delve/delve +Version: 1.2.0 %global common_description %{expand: Delve is a debugger for the Go programming language. The goal of the project @@ -23,10 +23,6 @@ License: MIT URL: %{gourl} Source0: %{gosource} -Patch1: ./eval-symlink-in-test.patch -Patch2: ./test-fixture-vendor-to-internal.patch -Patch3: ./doc-location.patch - BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) BuildRequires: golang(github.com/peterh/liner) @@ -88,5 +84,5 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %changelog -* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.1.0-1 +* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.2.0-1 - First package for Fedora diff --git a/doc-location.patch b/doc-location.patch deleted file mode 100644 index 79a5f46..0000000 --- a/doc-location.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0d98c57cd3276667655d3b23f8268f1249a9994d Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Mon, 4 Feb 2019 01:49:43 -0800 -Subject: [PATCH] Update doc location for RPM package - ---- - pkg/terminal/command.go | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/pkg/terminal/command.go b/pkg/terminal/command.go -index 2927365447575b9a00418f72bdde87c5b58b9682..80d0df131613636c28800b5951f4bb5efba509f4 100644 ---- a/pkg/terminal/command.go -+++ b/pkg/terminal/command.go -@@ -105,14 +105,14 @@ Type "help" followed by the name of a command for more information about it.`}, - - break [name] <linespec> - --See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. -+See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. - - See also: "help on", "help cond" and "help clear"`}, - {aliases: []string{"trace", "t"}, cmdFn: tracepoint, helpMsg: `Set tracepoint. - - trace [name] <linespec> - --A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. -+A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. - - See also: "help on", "help cond" and "help clear"`}, - {aliases: []string{"restart", "r"}, cmdFn: restart, helpMsg: `Restart process. -@@ -182,7 +182,7 @@ Called with more arguments it will execute a command on the specified goroutine. - - [goroutine <n>] [frame <m>] print <expression> - --See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions.`}, -+See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions.`}, - {aliases: []string{"whatis"}, cmdFn: whatisCommand, helpMsg: `Prints type of an expression. - - whatis <expression>.`}, -@@ -190,7 +190,7 @@ See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a des - - [goroutine <n>] [frame <m>] set <variable> = <value> - --See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, -+See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, - {aliases: []string{"sources"}, cmdFn: sources, helpMsg: `Print list of source files. - - sources [<regex>] --- -2.16.5 - diff --git a/eval-symlink-in-test.patch b/eval-symlink-in-test.patch deleted file mode 100644 index 58aa079..0000000 --- a/eval-symlink-in-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -From de6682d29149cc8f2131d295d68a5e3d65102590 Mon Sep 17 00:00:00 2001 -From: Derek Parker <parkerderek86(a)gmail.com> -Date: Fri, 4 Jan 2019 02:03:16 -0800 -Subject: [PATCH] pkg/proc/test: Eval symlinks for test source (#1452) - -Some build environments (such as when building RPMs) enjoy symlinking -things. This unfortunately causes our tests to fail as we record the -path of fixtures and use that when looking up file:line information. -However, the debug info in the binary records the original file -location, not the location of the symlink. ---- - pkg/proc/test/support.go | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go -index 733bad85..5f4a4127 100644 ---- a/pkg/proc/test/support.go -+++ b/pkg/proc/test/support.go -@@ -150,6 +150,10 @@ func BuildFixture(name string, flags BuildFlags) Fixture { - - source, _ := filepath.Abs(path) - source = filepath.ToSlash(source) -+ sympath, err := filepath.EvalSymlinks(source) -+ if err == nil { -+ source = strings.Replace(sympath, "\\", "/", -1) -+ } - - fixture := Fixture{Name: name, Path: tmpfile, Source: source} - diff --git a/test-fixture-vendor-to-internal.patch b/test-fixture-vendor-to-internal.patch deleted file mode 100644 index 774de87..0000000 --- a/test-fixture-vendor-to-internal.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 73d636f7d7adf159e26f35f37aba514f647492ce Mon Sep 17 00:00:00 2001 -From: aarzilli <alessandro.arzilli(a)gmail.com> -Date: Tue, 6 Nov 2018 12:11:51 +0100 -Subject: [PATCH] tests: rename _fixtures/vendor to _fixtures/internal - -Some tests used a fake vendor directory placed inside _fixtures to -import some support packages. -In go.mod mode vendor directory are only supported on the root of the -project, which breaks some of our tests. -Since vendor directories outside the root of the project are so rare -anyway it's possible that a future version of go will stop supporting -it even in GOPATH mode. -Also it was weird and unnecessary in the first place anyawy. ---- - _fixtures/consts.go | 2 +- - _fixtures/dotpackagesiface.go | 4 ++-- - _fixtures/{vendor => internal}/dir.io/dir.go | 0 - .../{vendor => internal}/dir.io/io.io/io.go | 0 - .../{vendor => internal}/dir0/pkg/main.go | 0 - .../dir0/renamedpackage/main.go | 0 - .../{vendor => internal}/dir1/pkg/main.go | 0 - _fixtures/pkgrenames.go | 6 ++--- - service/test/variables_test.go | 24 +++++++++---------- - 9 files changed, 18 insertions(+), 18 deletions(-) - rename _fixtures/{vendor => internal}/dir.io/dir.go (100%) - rename _fixtures/{vendor => internal}/dir.io/io.io/io.go (100%) - rename _fixtures/{vendor => internal}/dir0/pkg/main.go (100%) - rename _fixtures/{vendor => internal}/dir0/renamedpackage/main.go (100%) - rename _fixtures/{vendor => internal}/dir1/pkg/main.go (100%) - -diff --git a/_fixtures/consts.go b/_fixtures/consts.go -index 531a27db..54bfa8b2 100644 ---- a/_fixtures/consts.go -+++ b/_fixtures/consts.go -@@ -1,8 +1,8 @@ - package main - - import ( -- "dir0/pkg" - "fmt" -+ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" - "runtime" - ) - -diff --git a/_fixtures/dotpackagesiface.go b/_fixtures/dotpackagesiface.go -index 5ad147c2..5952ebeb 100644 ---- a/_fixtures/dotpackagesiface.go -+++ b/_fixtures/dotpackagesiface.go -@@ -1,9 +1,9 @@ - package main - - import ( -- "dir.io" -- "dir.io/io.io" - "fmt" -+ "github.com/derekparker/delve/_fixtures/internal/dir.io" -+ "github.com/derekparker/delve/_fixtures/internal/dir.io/io.io" - "runtime" - ) - -diff --git a/_fixtures/vendor/dir.io/dir.go b/_fixtures/internal/dir.io/dir.go -similarity index 100% -rename from _fixtures/vendor/dir.io/dir.go -rename to _fixtures/internal/dir.io/dir.go -diff --git a/_fixtures/vendor/dir.io/io.io/io.go b/_fixtures/internal/dir.io/io.io/io.go -similarity index 100% -rename from _fixtures/vendor/dir.io/io.io/io.go -rename to _fixtures/internal/dir.io/io.io/io.go -diff --git a/_fixtures/vendor/dir0/pkg/main.go b/_fixtures/internal/dir0/pkg/main.go -similarity index 100% -rename from _fixtures/vendor/dir0/pkg/main.go -rename to _fixtures/internal/dir0/pkg/main.go -diff --git a/_fixtures/vendor/dir0/renamedpackage/main.go b/_fixtures/internal/dir0/renamedpackage/main.go -similarity index 100% -rename from _fixtures/vendor/dir0/renamedpackage/main.go -rename to _fixtures/internal/dir0/renamedpackage/main.go -diff --git a/_fixtures/vendor/dir1/pkg/main.go b/_fixtures/internal/dir1/pkg/main.go -similarity index 100% -rename from _fixtures/vendor/dir1/pkg/main.go -rename to _fixtures/internal/dir1/pkg/main.go -diff --git a/_fixtures/pkgrenames.go b/_fixtures/pkgrenames.go -index d315e6b7..6e0882dc 100644 ---- a/_fixtures/pkgrenames.go -+++ b/_fixtures/pkgrenames.go -@@ -8,9 +8,9 @@ import ( - pkg1 "go/ast" - pkg2 "net/http" - -- "dir0/pkg" -- "dir0/renamedpackage" -- dir1pkg "dir1/pkg" -+ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" -+ "github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage" -+ dir1pkg "github.com/derekparker/delve/_fixtures/internal/dir1/pkg" - ) - - func main() { -diff --git a/service/test/variables_test.go b/service/test/variables_test.go -index 83fb6e7a..0e29202a 100644 ---- a/service/test/variables_test.go -+++ b/service/test/variables_test.go -@@ -978,20 +978,20 @@ func TestPackageRenames(t *testing.T) { - {"amap", true, "interface {}(map[go/ast.BadExpr]net/http.Request) [{From: 2, To: 3}: *{Method: \"othermethod\", ", "", "interface {}", nil}, - - // Package name that doesn't match import path -- {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, -+ {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, - - // Interfaces to anonymous types - {"amap2", true, "interface {}(*map[go/ast.BadExpr]net/http.Request) *[{From: 2, To: 3}: *{Method: \"othermethod\", ", "", "interface {}", nil}, -- {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, -- {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, -- {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, -- {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, -- {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, -- {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, -- {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, -- {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, -- {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, -- {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, -+ {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, -+ {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, -+ {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, -+ {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, -+ {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, -+ {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, -+ {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, -+ {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, -+ {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, -+ {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, - - {`"dir0/pkg".A`, false, "0", "", "int", nil}, - {`"dir1/pkg".A`, false, "1", "", "int", nil}, -@@ -1010,7 +1010,7 @@ func TestPackageRenames(t *testing.T) { - if ver.Major > 0 && !ver.AfterOrEqual(goversion.GoVersion{1, 9, -1, 0, 0, ""}) { - // before 1.9 embedded struct field have fieldname == type - if tc.name == "astruct2" { -- tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` -+ tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` - } - } - variable, err := evalVariable(p, tc.name, pnormalLoadConfig) commit da74eae497435bb41a624c5c4f15876502585917 Author: Derek Parker <deparker(a)redhat.com> Date: Mon Feb 4 01:52:04 2019 -0800 Update doc location output, cleanup spec diff --git a/delve.spec b/delve.spec index bddcced..46d6ce3 100644 --- a/delve.spec +++ b/delve.spec @@ -25,6 +25,7 @@ Source0: %{gosource} Patch1: ./eval-symlink-in-test.patch Patch2: ./test-fixture-vendor-to-internal.patch +Patch3: ./doc-location.patch BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) @@ -54,10 +55,7 @@ building other packages which use import path with %prep -%forgesetup - -%patch1 -p1 -%patch2 -p1 +%forgeautosetup -p1 rm -rf vendor/ diff --git a/doc-location.patch b/doc-location.patch new file mode 100644 index 0000000..79a5f46 --- /dev/null +++ b/doc-location.patch @@ -0,0 +1,51 @@ +From 0d98c57cd3276667655d3b23f8268f1249a9994d Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Mon, 4 Feb 2019 01:49:43 -0800 +Subject: [PATCH] Update doc location for RPM package + +--- + pkg/terminal/command.go | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pkg/terminal/command.go b/pkg/terminal/command.go +index 2927365447575b9a00418f72bdde87c5b58b9682..80d0df131613636c28800b5951f4bb5efba509f4 100644 +--- a/pkg/terminal/command.go ++++ b/pkg/terminal/command.go +@@ -105,14 +105,14 @@ Type "help" followed by the name of a command for more information about it.`}, + + break [name] <linespec> + +-See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. ++See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. + + See also: "help on", "help cond" and "help clear"`}, + {aliases: []string{"trace", "t"}, cmdFn: tracepoint, helpMsg: `Set tracepoint. + + trace [name] <linespec> + +-A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. ++A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. + + See also: "help on", "help cond" and "help clear"`}, + {aliases: []string{"restart", "r"}, cmdFn: restart, helpMsg: `Restart process. +@@ -182,7 +182,7 @@ Called with more arguments it will execute a command on the specified goroutine. + + [goroutine <n>] [frame <m>] print <expression> + +-See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions.`}, ++See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions.`}, + {aliases: []string{"whatis"}, cmdFn: whatisCommand, helpMsg: `Prints type of an expression. + + whatis <expression>.`}, +@@ -190,7 +190,7 @@ See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a des + + [goroutine <n>] [frame <m>] set <variable> = <value> + +-See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, ++See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, + {aliases: []string{"sources"}, cmdFn: sources, helpMsg: `Print list of source files. + + sources [<regex>] +-- +2.16.5 + commit 1881006b0f0a31290a6d11aeb4228e1d6e2da1c0 Author: Derek Parker <deparker(a)redhat.com> Date: Thu Nov 1 13:37:02 2018 -0700 Initial spec file diff --git a/delve.spec b/delve.spec new file mode 100644 index 0000000..bddcced --- /dev/null +++ b/delve.spec @@ -0,0 +1,94 @@ +# Run tests in check section +%bcond_without check + +# https://github.com/derekparker/delve +%global goipath github.com/derekparker/delve +Version: 1.1.0 + +%global common_description %{expand: +Delve is a debugger for the Go programming language. The goal of the project +is to provide a simple, full featured debugging tool for Go. Delve should be +easy to invoke and easy to use. Chances are if you're using a debugger, things +aren't going your way. With that in mind, Delve should stay out of your way as +much as possible.} + +%gometa + +Name: delve +Release: 1%{?dist} +Summary: A debugger for the Go programming language +# Detected licences +# - Expat License at 'LICENSE' +License: MIT +URL: %{gourl} +Source0: %{gosource} + +Patch1: ./eval-symlink-in-test.patch +Patch2: ./test-fixture-vendor-to-internal.patch + +BuildRequires: golang(github.com/cosiner/argv) +BuildRequires: golang(github.com/mattn/go-isatty) +BuildRequires: golang(github.com/peterh/liner) +BuildRequires: golang(github.com/pkg/profile) +BuildRequires: golang(github.com/sirupsen/logrus) +BuildRequires: golang(github.com/spf13/cobra) +BuildRequires: golang(golang.org/x/arch/x86/x86asm) +BuildRequires: golang(golang.org/x/sys/unix) +BuildRequires: golang(golang.org/x/sys/windows) +BuildRequires: golang(gopkg.in/yaml.v2) + +%description +%{common_description} + + +%package -n %{goname}-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{goname}-devel +%{common_description} + +This package contains library source intended for +building other packages which use import path with +%{goipath} prefix. + + +%prep +%forgesetup + +%patch1 -p1 +%patch2 -p1 + +rm -rf vendor/ + + +%build +%gobuildroot +%gobuild -o _bin/dlv %{goipath}/cmd/dlv + + +%install +%goinstall +install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv + + +%if %{with check} +%check +%gochecks +%endif + + +%files +%license LICENSE +%doc CONTRIBUTING.md CHANGELOG.md +%doc Documentation/* +%{_bindir}/dlv + + +%files -n %{goname}-devel -f devel.file-list +%license LICENSE + + +%changelog +* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.1.0-1 +- First package for Fedora diff --git a/eval-symlink-in-test.patch b/eval-symlink-in-test.patch new file mode 100644 index 0000000..58aa079 --- /dev/null +++ b/eval-symlink-in-test.patch @@ -0,0 +1,29 @@ +From de6682d29149cc8f2131d295d68a5e3d65102590 Mon Sep 17 00:00:00 2001 +From: Derek Parker <parkerderek86(a)gmail.com> +Date: Fri, 4 Jan 2019 02:03:16 -0800 +Subject: [PATCH] pkg/proc/test: Eval symlinks for test source (#1452) + +Some build environments (such as when building RPMs) enjoy symlinking +things. This unfortunately causes our tests to fail as we record the +path of fixtures and use that when looking up file:line information. +However, the debug info in the binary records the original file +location, not the location of the symlink. +--- + pkg/proc/test/support.go | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go +index 733bad85..5f4a4127 100644 +--- a/pkg/proc/test/support.go ++++ b/pkg/proc/test/support.go +@@ -150,6 +150,10 @@ func BuildFixture(name string, flags BuildFlags) Fixture { + + source, _ := filepath.Abs(path) + source = filepath.ToSlash(source) ++ sympath, err := filepath.EvalSymlinks(source) ++ if err == nil { ++ source = strings.Replace(sympath, "\\", "/", -1) ++ } + + fixture := Fixture{Name: name, Path: tmpfile, Source: source} + diff --git a/test-fixture-vendor-to-internal.patch b/test-fixture-vendor-to-internal.patch new file mode 100644 index 0000000..774de87 --- /dev/null +++ b/test-fixture-vendor-to-internal.patch @@ -0,0 +1,142 @@ +From 73d636f7d7adf159e26f35f37aba514f647492ce Mon Sep 17 00:00:00 2001 +From: aarzilli <alessandro.arzilli(a)gmail.com> +Date: Tue, 6 Nov 2018 12:11:51 +0100 +Subject: [PATCH] tests: rename _fixtures/vendor to _fixtures/internal + +Some tests used a fake vendor directory placed inside _fixtures to +import some support packages. +In go.mod mode vendor directory are only supported on the root of the +project, which breaks some of our tests. +Since vendor directories outside the root of the project are so rare +anyway it's possible that a future version of go will stop supporting +it even in GOPATH mode. +Also it was weird and unnecessary in the first place anyawy. +--- + _fixtures/consts.go | 2 +- + _fixtures/dotpackagesiface.go | 4 ++-- + _fixtures/{vendor => internal}/dir.io/dir.go | 0 + .../{vendor => internal}/dir.io/io.io/io.go | 0 + .../{vendor => internal}/dir0/pkg/main.go | 0 + .../dir0/renamedpackage/main.go | 0 + .../{vendor => internal}/dir1/pkg/main.go | 0 + _fixtures/pkgrenames.go | 6 ++--- + service/test/variables_test.go | 24 +++++++++---------- + 9 files changed, 18 insertions(+), 18 deletions(-) + rename _fixtures/{vendor => internal}/dir.io/dir.go (100%) + rename _fixtures/{vendor => internal}/dir.io/io.io/io.go (100%) + rename _fixtures/{vendor => internal}/dir0/pkg/main.go (100%) + rename _fixtures/{vendor => internal}/dir0/renamedpackage/main.go (100%) + rename _fixtures/{vendor => internal}/dir1/pkg/main.go (100%) + +diff --git a/_fixtures/consts.go b/_fixtures/consts.go +index 531a27db..54bfa8b2 100644 +--- a/_fixtures/consts.go ++++ b/_fixtures/consts.go +@@ -1,8 +1,8 @@ + package main + + import ( +- "dir0/pkg" + "fmt" ++ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" + "runtime" + ) + +diff --git a/_fixtures/dotpackagesiface.go b/_fixtures/dotpackagesiface.go +index 5ad147c2..5952ebeb 100644 +--- a/_fixtures/dotpackagesiface.go ++++ b/_fixtures/dotpackagesiface.go +@@ -1,9 +1,9 @@ + package main + + import ( +- "dir.io" +- "dir.io/io.io" + "fmt" ++ "github.com/derekparker/delve/_fixtures/internal/dir.io" ++ "github.com/derekparker/delve/_fixtures/internal/dir.io/io.io" + "runtime" + ) + +diff --git a/_fixtures/vendor/dir.io/dir.go b/_fixtures/internal/dir.io/dir.go +similarity index 100% +rename from _fixtures/vendor/dir.io/dir.go +rename to _fixtures/internal/dir.io/dir.go +diff --git a/_fixtures/vendor/dir.io/io.io/io.go b/_fixtures/internal/dir.io/io.io/io.go +similarity index 100% +rename from _fixtures/vendor/dir.io/io.io/io.go +rename to _fixtures/internal/dir.io/io.io/io.go +diff --git a/_fixtures/vendor/dir0/pkg/main.go b/_fixtures/internal/dir0/pkg/main.go +similarity index 100% +rename from _fixtures/vendor/dir0/pkg/main.go +rename to _fixtures/internal/dir0/pkg/main.go +diff --git a/_fixtures/vendor/dir0/renamedpackage/main.go b/_fixtures/internal/dir0/renamedpackage/main.go +similarity index 100% +rename from _fixtures/vendor/dir0/renamedpackage/main.go +rename to _fixtures/internal/dir0/renamedpackage/main.go +diff --git a/_fixtures/vendor/dir1/pkg/main.go b/_fixtures/internal/dir1/pkg/main.go +similarity index 100% +rename from _fixtures/vendor/dir1/pkg/main.go +rename to _fixtures/internal/dir1/pkg/main.go +diff --git a/_fixtures/pkgrenames.go b/_fixtures/pkgrenames.go +index d315e6b7..6e0882dc 100644 +--- a/_fixtures/pkgrenames.go ++++ b/_fixtures/pkgrenames.go +@@ -8,9 +8,9 @@ import ( + pkg1 "go/ast" + pkg2 "net/http" + +- "dir0/pkg" +- "dir0/renamedpackage" +- dir1pkg "dir1/pkg" ++ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" ++ "github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage" ++ dir1pkg "github.com/derekparker/delve/_fixtures/internal/dir1/pkg" + ) + + func main() { +diff --git a/service/test/variables_test.go b/service/test/variables_test.go +index 83fb6e7a..0e29202a 100644 +--- a/service/test/variables_test.go ++++ b/service/test/variables_test.go +@@ -978,20 +978,20 @@ func TestPackageRenames(t *testing.T) { + {"amap", true, "interface {}(map[go/ast.BadExpr]net/http.Request) [{From: 2, To: 3}: *{Method: \"othermethod\", ", "", "interface {}", nil}, + + // Package name that doesn't match import path +- {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, ++ {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, + + // Interfaces to anonymous types + {"amap2", true, "interface {}(*map[go/ast.BadExpr]net/http.Request) *[{From: 2, To: 3}: *{Method: \"othermethod\", ", "", "interface {}", nil}, +- {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, +- {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, +- {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, +- {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, +- {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, +- {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, +- {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, +- {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, +- {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, +- {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, ++ {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, ++ {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, ++ {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, ++ {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, ++ {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, ++ {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, ++ {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, ++ {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, ++ {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, ++ {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, + + {`"dir0/pkg".A`, false, "0", "", "int", nil}, + {`"dir1/pkg".A`, false, "1", "", "int", nil}, +@@ -1010,7 +1010,7 @@ func TestPackageRenames(t *testing.T) { + if ver.Major > 0 && !ver.AfterOrEqual(goversion.GoVersion{1, 9, -1, 0, 0, ""}) { + // before 1.9 embedded struct field have fieldname == type + if tc.name == "astruct2" { +- tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` ++ tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` + } + } + variable, err := evalVariable(p, tc.name, pnormalLoadConfig)

1 0

Architecture specific change in rpms/delve.git
by githook-noreply＠fedoraproject.org 26 Feb '19

26 Feb '19

The package rpms/delve.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=39cfa248f89aa6… https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=8ec56186bf0751… https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=baf961b7b960dd…. Change: +ExclusiveArch: x86_64 +ExcludeArch: i686 +ExcludeArch: armv7hl Thanks. Full change: ============ commit 866ba589069390e0eb52d68b391b5e1fd86d25b6 Author: Derek Parker <deparker(a)redhat.com> Date: Tue Feb 26 16:02:11 2019 -0800 Use custom check section diff --git a/delve.spec b/delve.spec index 2b58de7..f1b891c 100644 --- a/delve.spec +++ b/delve.spec @@ -79,7 +79,19 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %if %{with check} %check -%gochecks +export GO111MODULE=off +export GOPATH=%{buildroot}/%{gopath}:%{gopath} + +delvepath=%{buildroot}/%{gopath}/src/%{goipath} +cp -r _fixtures $delvepath +cp -r pkg/dwarf/line/_testdata $delvepath/pkg/dwarf/line +pushd $delvepath +for d in $(go list ./... | grep -v cmd | grep -v scripts); do + %gotest ${d} +done +rm -rf $delvepath/_fixtures +rm -rf $delvepath/pkg/dwarf/line/_testdata +popd %endif commit baf961b7b960dd8025602db8db4211423015e9ce Author: Derek Parker <deparker(a)redhat.com> Date: Mon Feb 25 10:18:40 2019 -0800 Exclude armv7hl diff --git a/delve.spec b/delve.spec index ce5dade..2b58de7 100644 --- a/delve.spec +++ b/delve.spec @@ -28,6 +28,7 @@ ExcludeArch: ppc64le ExcludeArch: s390x ExcludeArch: aarch64 ExcludeArch: i686 +ExcludeArch: armv7hl Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch commit 8ec56186bf07517e8266ed3bef02d5e3eea8bc84 Author: Derek Parker <deparker(a)redhat.com> Date: Mon Feb 25 10:09:57 2019 -0800 Exclude non-supported arches diff --git a/delve.spec b/delve.spec index b175ad4..ce5dade 100644 --- a/delve.spec +++ b/delve.spec @@ -22,7 +22,12 @@ Summary: A debugger for the Go programming language License: MIT URL: %{gourl} Source0: %{gosource} -ExclusiveArch: x86_64 + +# Currently Delve only supports x86_64 +ExcludeArch: ppc64le +ExcludeArch: s390x +ExcludeArch: aarch64 +ExcludeArch: i686 Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch commit 39cfa248f89aa69b377aede2ba07c76df8fe0552 Author: Derek Parker <deparker(a)redhat.com> Date: Fri Feb 22 13:02:51 2019 -0800 Add ExclusiveArch diff --git a/delve.spec b/delve.spec index 8777d2e..b175ad4 100644 --- a/delve.spec +++ b/delve.spec @@ -22,6 +22,7 @@ Summary: A debugger for the Go programming language License: MIT URL: %{gourl} Source0: %{gosource} +ExclusiveArch: x86_64 Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch commit c22c3edb1c567b0446b5788b77b8a9ea891f839b Author: Derek Parker <deparker(a)redhat.com> Date: Fri Feb 22 12:54:49 2019 -0800 Add sources file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9cdee55 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/delve-1.2.0.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..e33a23b --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (delve-1.2.0.tar.gz) = 8a19decbb47952671e5b73f6ec1707e318259376b02268509374e101cd9ee54c279fac0655885be6095e7cc82bfb09082cfe557f763475a2cd2f1f572f1a300e commit 43d2ad259c07bf87f266d97f27e3d744be14d950 Author: Derek Parker <deparker(a)redhat.com> Date: Thu Feb 21 16:50:11 2019 -0800 Add patch to remove empty doc file diff --git a/clean-empty-doc.patch b/clean-empty-doc.patch new file mode 100644 index 0000000..4c12416 --- /dev/null +++ b/clean-empty-doc.patch @@ -0,0 +1,16 @@ +From 9cb76893334154001489fb1bbd19fe926f0249e7 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Thu, 21 Feb 2019 12:15:37 -0800 +Subject: [PATCH] Documentation: Remove empty doc file + +--- + Documentation/usage/commands.md | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + delete mode 100644 Documentation/usage/commands.md + +diff --git a/Documentation/usage/commands.md b/Documentation/usage/commands.md +deleted file mode 100644 +index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 +-- +2.16.5 + diff --git a/delve.spec b/delve.spec index a8202df..8777d2e 100644 --- a/delve.spec +++ b/delve.spec @@ -25,6 +25,7 @@ Source0: %{gosource} Patch1: ./disable-default-compression-dwz-test.patch Patch2: ./integration-test-symlinks.patch +Patch3: ./clean-empty-doc.patch BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) commit 5ccb3d6f3f0b901a068ca41dc2c4e397f7a47270 Author: Derek Parker <deparker(a)redhat.com> Date: Wed Feb 20 14:30:38 2019 -0800 Switch back to using gochecks diff --git a/delve.spec b/delve.spec index 82a4361..a8202df 100644 --- a/delve.spec +++ b/delve.spec @@ -71,17 +71,7 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %if %{with check} %check -# Copy to $GOPATH since modules aren't supported. -export GOPATH=%{gopath} -export GO111MODULE=off -mkdir -p %{gopath}/src/$(dirname %{goipath}) -ln -s $(pwd)/. %{gopath}/src/%{goipath} -cd %{gopath}/src/%{goipath} -for i in $(go list ./... | grep -v scripts | grep -v cmd); do - pushd .${i##%{goipath}} - %{gotest} - popd -done +%gochecks %endif commit 6a24acf8d595cc52f18ca8eac331f8caae22e0bc Author: Derek Parker <deparker(a)redhat.com> Date: Wed Feb 20 14:10:25 2019 -0800 Fix spec file and patch tests to run in package build diff --git a/delve.spec b/delve.spec index 0b40524..82a4361 100644 --- a/delve.spec +++ b/delve.spec @@ -23,6 +23,9 @@ License: MIT URL: %{gourl} Source0: %{gosource} +Patch1: ./disable-default-compression-dwz-test.patch +Patch2: ./integration-test-symlinks.patch + BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) BuildRequires: golang(github.com/peterh/liner) @@ -68,7 +71,17 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %if %{with check} %check -%gochecks +# Copy to $GOPATH since modules aren't supported. +export GOPATH=%{gopath} +export GO111MODULE=off +mkdir -p %{gopath}/src/$(dirname %{goipath}) +ln -s $(pwd)/. %{gopath}/src/%{goipath} +cd %{gopath}/src/%{goipath} +for i in $(go list ./... | grep -v scripts | grep -v cmd); do + pushd .${i##%{goipath}} + %{gotest} + popd +done %endif diff --git a/disable-default-compression-dwz-test.patch b/disable-default-compression-dwz-test.patch new file mode 100644 index 0000000..244e4c8 --- /dev/null +++ b/disable-default-compression-dwz-test.patch @@ -0,0 +1,36 @@ +From 1f9597d3ca2e7d3497f9d28046bbae5522742306 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Wed, 20 Feb 2019 13:26:18 -0800 +Subject: [PATCH] pkg/proc: Disable default compression on DWZ test + +When compression is applied by default running the DWZ tool on the +resulting binary will crash. + +The actual default compression code will look and see if compression +makes any difference and if so replace the normal `.debug_*` section +with `.zdebug_*`. This is why it may not have been hit before. On one of +my workstations I build with 1.12rc1 and no compression happens, but on +a Fedora VM I build and the binary results in compressed DWARF sections. + +Adding this flag will make this test more consistent overall. +--- + pkg/proc/test/support.go | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go +index 9e09da861ec53657bfa0fb9cf76620a4fcd485dc..ccfc1c4939ef6e9c8abbbc67f4fbeaaf0e623de1 100644 +--- a/pkg/proc/test/support.go ++++ b/pkg/proc/test/support.go +@@ -125,6 +125,9 @@ func BuildFixture(name string, flags BuildFlags) Fixture { + if flags&BuildModePIE != 0 { + buildFlags = append(buildFlags, "-buildmode=pie") + } ++ if flags&EnableDWZCompression != 0 { ++ buildFlags = append(buildFlags, "-ldflags=-compressdwarf=false") ++ } + if path != "" { + buildFlags = append(buildFlags, name+".go") + } +-- +2.16.5 + diff --git a/integration-test-symlinks.patch b/integration-test-symlinks.patch new file mode 100644 index 0000000..94e2545 --- /dev/null +++ b/integration-test-symlinks.patch @@ -0,0 +1,27 @@ +From c4a4e442e2eee35bc26674cb1d2cb28336780891 Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Wed, 20 Feb 2019 14:01:13 -0800 +Subject: [PATCH] service/test: Follow symlinks in integration tests + +--- + service/test/common_test.go | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/service/test/common_test.go b/service/test/common_test.go +index 2b58e371a12472c71beaad0790b001cf4258934c..ee56a53350a45ab790229dd359c472f2c9a952b0 100644 +--- a/service/test/common_test.go ++++ b/service/test/common_test.go +@@ -52,6 +52,10 @@ func testProgPath(t *testing.T, name string) string { + t.Fatal(err) + } + } ++ sympath, err := filepath.EvalSymlinks(fp) ++ if err == nil { ++ fp = strings.Replace(sympath, "\\", "/", -1) ++ } + return fp + } + +-- +2.16.5 + commit c3ae28ead26d7fa3af8c3f1d221dbc44acc8a4fb Author: Derek Parker <deparker(a)redhat.com> Date: Tue Feb 19 11:50:30 2019 -0800 Update spec for v1.2.0 diff --git a/delve.spec b/delve.spec index 46d6ce3..0b40524 100644 --- a/delve.spec +++ b/delve.spec @@ -1,9 +1,9 @@ # Run tests in check section %bcond_without check -# https://github.com/derekparker/delve -%global goipath github.com/derekparker/delve -Version: 1.1.0 +# https://github.com/go-delve/delve +%global goipath github.com/go-delve/delve +Version: 1.2.0 %global common_description %{expand: Delve is a debugger for the Go programming language. The goal of the project @@ -23,10 +23,6 @@ License: MIT URL: %{gourl} Source0: %{gosource} -Patch1: ./eval-symlink-in-test.patch -Patch2: ./test-fixture-vendor-to-internal.patch -Patch3: ./doc-location.patch - BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) BuildRequires: golang(github.com/peterh/liner) @@ -88,5 +84,5 @@ install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv %changelog -* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.1.0-1 +* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.2.0-1 - First package for Fedora diff --git a/doc-location.patch b/doc-location.patch deleted file mode 100644 index 79a5f46..0000000 --- a/doc-location.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0d98c57cd3276667655d3b23f8268f1249a9994d Mon Sep 17 00:00:00 2001 -From: Derek Parker <deparker(a)redhat.com> -Date: Mon, 4 Feb 2019 01:49:43 -0800 -Subject: [PATCH] Update doc location for RPM package - ---- - pkg/terminal/command.go | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/pkg/terminal/command.go b/pkg/terminal/command.go -index 2927365447575b9a00418f72bdde87c5b58b9682..80d0df131613636c28800b5951f4bb5efba509f4 100644 ---- a/pkg/terminal/command.go -+++ b/pkg/terminal/command.go -@@ -105,14 +105,14 @@ Type "help" followed by the name of a command for more information about it.`}, - - break [name] <linespec> - --See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. -+See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. - - See also: "help on", "help cond" and "help clear"`}, - {aliases: []string{"trace", "t"}, cmdFn: tracepoint, helpMsg: `Set tracepoint. - - trace [name] <linespec> - --A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. -+A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. - - See also: "help on", "help cond" and "help clear"`}, - {aliases: []string{"restart", "r"}, cmdFn: restart, helpMsg: `Restart process. -@@ -182,7 +182,7 @@ Called with more arguments it will execute a command on the specified goroutine. - - [goroutine <n>] [frame <m>] print <expression> - --See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions.`}, -+See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions.`}, - {aliases: []string{"whatis"}, cmdFn: whatisCommand, helpMsg: `Prints type of an expression. - - whatis <expression>.`}, -@@ -190,7 +190,7 @@ See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a des - - [goroutine <n>] [frame <m>] set <variable> = <value> - --See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, -+See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, - {aliases: []string{"sources"}, cmdFn: sources, helpMsg: `Print list of source files. - - sources [<regex>] --- -2.16.5 - diff --git a/eval-symlink-in-test.patch b/eval-symlink-in-test.patch deleted file mode 100644 index 58aa079..0000000 --- a/eval-symlink-in-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -From de6682d29149cc8f2131d295d68a5e3d65102590 Mon Sep 17 00:00:00 2001 -From: Derek Parker <parkerderek86(a)gmail.com> -Date: Fri, 4 Jan 2019 02:03:16 -0800 -Subject: [PATCH] pkg/proc/test: Eval symlinks for test source (#1452) - -Some build environments (such as when building RPMs) enjoy symlinking -things. This unfortunately causes our tests to fail as we record the -path of fixtures and use that when looking up file:line information. -However, the debug info in the binary records the original file -location, not the location of the symlink. ---- - pkg/proc/test/support.go | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go -index 733bad85..5f4a4127 100644 ---- a/pkg/proc/test/support.go -+++ b/pkg/proc/test/support.go -@@ -150,6 +150,10 @@ func BuildFixture(name string, flags BuildFlags) Fixture { - - source, _ := filepath.Abs(path) - source = filepath.ToSlash(source) -+ sympath, err := filepath.EvalSymlinks(source) -+ if err == nil { -+ source = strings.Replace(sympath, "\\", "/", -1) -+ } - - fixture := Fixture{Name: name, Path: tmpfile, Source: source} - diff --git a/test-fixture-vendor-to-internal.patch b/test-fixture-vendor-to-internal.patch deleted file mode 100644 index 774de87..0000000 --- a/test-fixture-vendor-to-internal.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 73d636f7d7adf159e26f35f37aba514f647492ce Mon Sep 17 00:00:00 2001 -From: aarzilli <alessandro.arzilli(a)gmail.com> -Date: Tue, 6 Nov 2018 12:11:51 +0100 -Subject: [PATCH] tests: rename _fixtures/vendor to _fixtures/internal - -Some tests used a fake vendor directory placed inside _fixtures to -import some support packages. -In go.mod mode vendor directory are only supported on the root of the -project, which breaks some of our tests. -Since vendor directories outside the root of the project are so rare -anyway it's possible that a future version of go will stop supporting -it even in GOPATH mode. -Also it was weird and unnecessary in the first place anyawy. ---- - _fixtures/consts.go | 2 +- - _fixtures/dotpackagesiface.go | 4 ++-- - _fixtures/{vendor => internal}/dir.io/dir.go | 0 - .../{vendor => internal}/dir.io/io.io/io.go | 0 - .../{vendor => internal}/dir0/pkg/main.go | 0 - .../dir0/renamedpackage/main.go | 0 - .../{vendor => internal}/dir1/pkg/main.go | 0 - _fixtures/pkgrenames.go | 6 ++--- - service/test/variables_test.go | 24 +++++++++---------- - 9 files changed, 18 insertions(+), 18 deletions(-) - rename _fixtures/{vendor => internal}/dir.io/dir.go (100%) - rename _fixtures/{vendor => internal}/dir.io/io.io/io.go (100%) - rename _fixtures/{vendor => internal}/dir0/pkg/main.go (100%) - rename _fixtures/{vendor => internal}/dir0/renamedpackage/main.go (100%) - rename _fixtures/{vendor => internal}/dir1/pkg/main.go (100%) - -diff --git a/_fixtures/consts.go b/_fixtures/consts.go -index 531a27db..54bfa8b2 100644 ---- a/_fixtures/consts.go -+++ b/_fixtures/consts.go -@@ -1,8 +1,8 @@ - package main - - import ( -- "dir0/pkg" - "fmt" -+ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" - "runtime" - ) - -diff --git a/_fixtures/dotpackagesiface.go b/_fixtures/dotpackagesiface.go -index 5ad147c2..5952ebeb 100644 ---- a/_fixtures/dotpackagesiface.go -+++ b/_fixtures/dotpackagesiface.go -@@ -1,9 +1,9 @@ - package main - - import ( -- "dir.io" -- "dir.io/io.io" - "fmt" -+ "github.com/derekparker/delve/_fixtures/internal/dir.io" -+ "github.com/derekparker/delve/_fixtures/internal/dir.io/io.io" - "runtime" - ) - -diff --git a/_fixtures/vendor/dir.io/dir.go b/_fixtures/internal/dir.io/dir.go -similarity index 100% -rename from _fixtures/vendor/dir.io/dir.go -rename to _fixtures/internal/dir.io/dir.go -diff --git a/_fixtures/vendor/dir.io/io.io/io.go b/_fixtures/internal/dir.io/io.io/io.go -similarity index 100% -rename from _fixtures/vendor/dir.io/io.io/io.go -rename to _fixtures/internal/dir.io/io.io/io.go -diff --git a/_fixtures/vendor/dir0/pkg/main.go b/_fixtures/internal/dir0/pkg/main.go -similarity index 100% -rename from _fixtures/vendor/dir0/pkg/main.go -rename to _fixtures/internal/dir0/pkg/main.go -diff --git a/_fixtures/vendor/dir0/renamedpackage/main.go b/_fixtures/internal/dir0/renamedpackage/main.go -similarity index 100% -rename from _fixtures/vendor/dir0/renamedpackage/main.go -rename to _fixtures/internal/dir0/renamedpackage/main.go -diff --git a/_fixtures/vendor/dir1/pkg/main.go b/_fixtures/internal/dir1/pkg/main.go -similarity index 100% -rename from _fixtures/vendor/dir1/pkg/main.go -rename to _fixtures/internal/dir1/pkg/main.go -diff --git a/_fixtures/pkgrenames.go b/_fixtures/pkgrenames.go -index d315e6b7..6e0882dc 100644 ---- a/_fixtures/pkgrenames.go -+++ b/_fixtures/pkgrenames.go -@@ -8,9 +8,9 @@ import ( - pkg1 "go/ast" - pkg2 "net/http" - -- "dir0/pkg" -- "dir0/renamedpackage" -- dir1pkg "dir1/pkg" -+ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" -+ "github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage" -+ dir1pkg "github.com/derekparker/delve/_fixtures/internal/dir1/pkg" - ) - - func main() { -diff --git a/service/test/variables_test.go b/service/test/variables_test.go -index 83fb6e7a..0e29202a 100644 ---- a/service/test/variables_test.go -+++ b/service/test/variables_test.go -@@ -978,20 +978,20 @@ func TestPackageRenames(t *testing.T) { - {"amap", true, "interface {}(map[go/ast.BadExpr]net/http.Request) [{From: 2, To: 3}: *{Method: \"othermethod\", ", "", "interface {}", nil}, - - // Package name that doesn't match import path -- {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, -+ {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, - - // Interfaces to anonymous types - {"amap2", true, "interface {}(*map[go/ast.BadExpr]net/http.Request) *[{From: 2, To: 3}: *{Method: \"othermethod\", ", "", "interface {}", nil}, -- {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, -- {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, -- {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, -- {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, -- {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, -- {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, -- {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, -- {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, -- {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, -- {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, -+ {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, -+ {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, -+ {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, -+ {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, -+ {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, -+ {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, -+ {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, -+ {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, -+ {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, -+ {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, - - {`"dir0/pkg".A`, false, "0", "", "int", nil}, - {`"dir1/pkg".A`, false, "1", "", "int", nil}, -@@ -1010,7 +1010,7 @@ func TestPackageRenames(t *testing.T) { - if ver.Major > 0 && !ver.AfterOrEqual(goversion.GoVersion{1, 9, -1, 0, 0, ""}) { - // before 1.9 embedded struct field have fieldname == type - if tc.name == "astruct2" { -- tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` -+ tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` - } - } - variable, err := evalVariable(p, tc.name, pnormalLoadConfig) commit da74eae497435bb41a624c5c4f15876502585917 Author: Derek Parker <deparker(a)redhat.com> Date: Mon Feb 4 01:52:04 2019 -0800 Update doc location output, cleanup spec diff --git a/delve.spec b/delve.spec index bddcced..46d6ce3 100644 --- a/delve.spec +++ b/delve.spec @@ -25,6 +25,7 @@ Source0: %{gosource} Patch1: ./eval-symlink-in-test.patch Patch2: ./test-fixture-vendor-to-internal.patch +Patch3: ./doc-location.patch BuildRequires: golang(github.com/cosiner/argv) BuildRequires: golang(github.com/mattn/go-isatty) @@ -54,10 +55,7 @@ building other packages which use import path with %prep -%forgesetup - -%patch1 -p1 -%patch2 -p1 +%forgeautosetup -p1 rm -rf vendor/ diff --git a/doc-location.patch b/doc-location.patch new file mode 100644 index 0000000..79a5f46 --- /dev/null +++ b/doc-location.patch @@ -0,0 +1,51 @@ +From 0d98c57cd3276667655d3b23f8268f1249a9994d Mon Sep 17 00:00:00 2001 +From: Derek Parker <deparker(a)redhat.com> +Date: Mon, 4 Feb 2019 01:49:43 -0800 +Subject: [PATCH] Update doc location for RPM package + +--- + pkg/terminal/command.go | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pkg/terminal/command.go b/pkg/terminal/command.go +index 2927365447575b9a00418f72bdde87c5b58b9682..80d0df131613636c28800b5951f4bb5efba509f4 100644 +--- a/pkg/terminal/command.go ++++ b/pkg/terminal/command.go +@@ -105,14 +105,14 @@ Type "help" followed by the name of a command for more information about it.`}, + + break [name] <linespec> + +-See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. ++See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. + + See also: "help on", "help cond" and "help clear"`}, + {aliases: []string{"trace", "t"}, cmdFn: tracepoint, helpMsg: `Set tracepoint. + + trace [name] <linespec> + +-A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/locspec.md for the syntax of linespec. ++A tracepoint is a breakpoint that does not stop the execution of the program, instead when the tracepoint is hit a notification is displayed. See /usr/share/doc/delve/Documentation/cli/locspec.md for the syntax of linespec. + + See also: "help on", "help cond" and "help clear"`}, + {aliases: []string{"restart", "r"}, cmdFn: restart, helpMsg: `Restart process. +@@ -182,7 +182,7 @@ Called with more arguments it will execute a command on the specified goroutine. + + [goroutine <n>] [frame <m>] print <expression> + +-See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions.`}, ++See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions.`}, + {aliases: []string{"whatis"}, cmdFn: whatisCommand, helpMsg: `Prints type of an expression. + + whatis <expression>.`}, +@@ -190,7 +190,7 @@ See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a des + + [goroutine <n>] [frame <m>] set <variable> = <value> + +-See $GOPATH/src/github.com/derekparker/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, ++See /usr/share/doc/delve/Documentation/cli/expr.md for a description of supported expressions. Only numerical variables and pointers can be changed.`}, + {aliases: []string{"sources"}, cmdFn: sources, helpMsg: `Print list of source files. + + sources [<regex>] +-- +2.16.5 + commit 1881006b0f0a31290a6d11aeb4228e1d6e2da1c0 Author: Derek Parker <deparker(a)redhat.com> Date: Thu Nov 1 13:37:02 2018 -0700 Initial spec file diff --git a/delve.spec b/delve.spec new file mode 100644 index 0000000..bddcced --- /dev/null +++ b/delve.spec @@ -0,0 +1,94 @@ +# Run tests in check section +%bcond_without check + +# https://github.com/derekparker/delve +%global goipath github.com/derekparker/delve +Version: 1.1.0 + +%global common_description %{expand: +Delve is a debugger for the Go programming language. The goal of the project +is to provide a simple, full featured debugging tool for Go. Delve should be +easy to invoke and easy to use. Chances are if you're using a debugger, things +aren't going your way. With that in mind, Delve should stay out of your way as +much as possible.} + +%gometa + +Name: delve +Release: 1%{?dist} +Summary: A debugger for the Go programming language +# Detected licences +# - Expat License at 'LICENSE' +License: MIT +URL: %{gourl} +Source0: %{gosource} + +Patch1: ./eval-symlink-in-test.patch +Patch2: ./test-fixture-vendor-to-internal.patch + +BuildRequires: golang(github.com/cosiner/argv) +BuildRequires: golang(github.com/mattn/go-isatty) +BuildRequires: golang(github.com/peterh/liner) +BuildRequires: golang(github.com/pkg/profile) +BuildRequires: golang(github.com/sirupsen/logrus) +BuildRequires: golang(github.com/spf13/cobra) +BuildRequires: golang(golang.org/x/arch/x86/x86asm) +BuildRequires: golang(golang.org/x/sys/unix) +BuildRequires: golang(golang.org/x/sys/windows) +BuildRequires: golang(gopkg.in/yaml.v2) + +%description +%{common_description} + + +%package -n %{goname}-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{goname}-devel +%{common_description} + +This package contains library source intended for +building other packages which use import path with +%{goipath} prefix. + + +%prep +%forgesetup + +%patch1 -p1 +%patch2 -p1 + +rm -rf vendor/ + + +%build +%gobuildroot +%gobuild -o _bin/dlv %{goipath}/cmd/dlv + + +%install +%goinstall +install -Dpm 0755 _bin/dlv %{buildroot}%{_bindir}/dlv + + +%if %{with check} +%check +%gochecks +%endif + + +%files +%license LICENSE +%doc CONTRIBUTING.md CHANGELOG.md +%doc Documentation/* +%{_bindir}/dlv + + +%files -n %{goname}-devel -f devel.file-list +%license LICENSE + + +%changelog +* Fri Nov 2 2018 Derek Parker <deparker(a)redhat.com> - 1.1.0-1 +- First package for Fedora diff --git a/eval-symlink-in-test.patch b/eval-symlink-in-test.patch new file mode 100644 index 0000000..58aa079 --- /dev/null +++ b/eval-symlink-in-test.patch @@ -0,0 +1,29 @@ +From de6682d29149cc8f2131d295d68a5e3d65102590 Mon Sep 17 00:00:00 2001 +From: Derek Parker <parkerderek86(a)gmail.com> +Date: Fri, 4 Jan 2019 02:03:16 -0800 +Subject: [PATCH] pkg/proc/test: Eval symlinks for test source (#1452) + +Some build environments (such as when building RPMs) enjoy symlinking +things. This unfortunately causes our tests to fail as we record the +path of fixtures and use that when looking up file:line information. +However, the debug info in the binary records the original file +location, not the location of the symlink. +--- + pkg/proc/test/support.go | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go +index 733bad85..5f4a4127 100644 +--- a/pkg/proc/test/support.go ++++ b/pkg/proc/test/support.go +@@ -150,6 +150,10 @@ func BuildFixture(name string, flags BuildFlags) Fixture { + + source, _ := filepath.Abs(path) + source = filepath.ToSlash(source) ++ sympath, err := filepath.EvalSymlinks(source) ++ if err == nil { ++ source = strings.Replace(sympath, "\\", "/", -1) ++ } + + fixture := Fixture{Name: name, Path: tmpfile, Source: source} + diff --git a/test-fixture-vendor-to-internal.patch b/test-fixture-vendor-to-internal.patch new file mode 100644 index 0000000..774de87 --- /dev/null +++ b/test-fixture-vendor-to-internal.patch @@ -0,0 +1,142 @@ +From 73d636f7d7adf159e26f35f37aba514f647492ce Mon Sep 17 00:00:00 2001 +From: aarzilli <alessandro.arzilli(a)gmail.com> +Date: Tue, 6 Nov 2018 12:11:51 +0100 +Subject: [PATCH] tests: rename _fixtures/vendor to _fixtures/internal + +Some tests used a fake vendor directory placed inside _fixtures to +import some support packages. +In go.mod mode vendor directory are only supported on the root of the +project, which breaks some of our tests. +Since vendor directories outside the root of the project are so rare +anyway it's possible that a future version of go will stop supporting +it even in GOPATH mode. +Also it was weird and unnecessary in the first place anyawy. +--- + _fixtures/consts.go | 2 +- + _fixtures/dotpackagesiface.go | 4 ++-- + _fixtures/{vendor => internal}/dir.io/dir.go | 0 + .../{vendor => internal}/dir.io/io.io/io.go | 0 + .../{vendor => internal}/dir0/pkg/main.go | 0 + .../dir0/renamedpackage/main.go | 0 + .../{vendor => internal}/dir1/pkg/main.go | 0 + _fixtures/pkgrenames.go | 6 ++--- + service/test/variables_test.go | 24 +++++++++---------- + 9 files changed, 18 insertions(+), 18 deletions(-) + rename _fixtures/{vendor => internal}/dir.io/dir.go (100%) + rename _fixtures/{vendor => internal}/dir.io/io.io/io.go (100%) + rename _fixtures/{vendor => internal}/dir0/pkg/main.go (100%) + rename _fixtures/{vendor => internal}/dir0/renamedpackage/main.go (100%) + rename _fixtures/{vendor => internal}/dir1/pkg/main.go (100%) + +diff --git a/_fixtures/consts.go b/_fixtures/consts.go +index 531a27db..54bfa8b2 100644 +--- a/_fixtures/consts.go ++++ b/_fixtures/consts.go +@@ -1,8 +1,8 @@ + package main + + import ( +- "dir0/pkg" + "fmt" ++ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" + "runtime" + ) + +diff --git a/_fixtures/dotpackagesiface.go b/_fixtures/dotpackagesiface.go +index 5ad147c2..5952ebeb 100644 +--- a/_fixtures/dotpackagesiface.go ++++ b/_fixtures/dotpackagesiface.go +@@ -1,9 +1,9 @@ + package main + + import ( +- "dir.io" +- "dir.io/io.io" + "fmt" ++ "github.com/derekparker/delve/_fixtures/internal/dir.io" ++ "github.com/derekparker/delve/_fixtures/internal/dir.io/io.io" + "runtime" + ) + +diff --git a/_fixtures/vendor/dir.io/dir.go b/_fixtures/internal/dir.io/dir.go +similarity index 100% +rename from _fixtures/vendor/dir.io/dir.go +rename to _fixtures/internal/dir.io/dir.go +diff --git a/_fixtures/vendor/dir.io/io.io/io.go b/_fixtures/internal/dir.io/io.io/io.go +similarity index 100% +rename from _fixtures/vendor/dir.io/io.io/io.go +rename to _fixtures/internal/dir.io/io.io/io.go +diff --git a/_fixtures/vendor/dir0/pkg/main.go b/_fixtures/internal/dir0/pkg/main.go +similarity index 100% +rename from _fixtures/vendor/dir0/pkg/main.go +rename to _fixtures/internal/dir0/pkg/main.go +diff --git a/_fixtures/vendor/dir0/renamedpackage/main.go b/_fixtures/internal/dir0/renamedpackage/main.go +similarity index 100% +rename from _fixtures/vendor/dir0/renamedpackage/main.go +rename to _fixtures/internal/dir0/renamedpackage/main.go +diff --git a/_fixtures/vendor/dir1/pkg/main.go b/_fixtures/internal/dir1/pkg/main.go +similarity index 100% +rename from _fixtures/vendor/dir1/pkg/main.go +rename to _fixtures/internal/dir1/pkg/main.go +diff --git a/_fixtures/pkgrenames.go b/_fixtures/pkgrenames.go +index d315e6b7..6e0882dc 100644 +--- a/_fixtures/pkgrenames.go ++++ b/_fixtures/pkgrenames.go +@@ -8,9 +8,9 @@ import ( + pkg1 "go/ast" + pkg2 "net/http" + +- "dir0/pkg" +- "dir0/renamedpackage" +- dir1pkg "dir1/pkg" ++ "github.com/derekparker/delve/_fixtures/internal/dir0/pkg" ++ "github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage" ++ dir1pkg "github.com/derekparker/delve/_fixtures/internal/dir1/pkg" + ) + + func main() { +diff --git a/service/test/variables_test.go b/service/test/variables_test.go +index 83fb6e7a..0e29202a 100644 +--- a/service/test/variables_test.go ++++ b/service/test/variables_test.go +@@ -978,20 +978,20 @@ func TestPackageRenames(t *testing.T) { + {"amap", true, "interface {}(map[go/ast.BadExpr]net/http.Request) [{From: 2, To: 3}: *{Method: \"othermethod\", ", "", "interface {}", nil}, + + // Package name that doesn't match import path +- {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, ++ {"iface3", true, `interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/renamedpackage.SomeType) *{A: true}`, "", "interface {}", nil}, + + // Interfaces to anonymous types + {"amap2", true, "interface {}(*map[go/ast.BadExpr]net/http.Request) *[{From: 2, To: 3}: *{Method: \"othermethod\", ", "", "interface {}", nil}, +- {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, +- {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, +- {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, +- {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, +- {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, +- {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, +- {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, +- {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, +- {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, +- {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/vendor/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, ++ {"dir0someType", true, "interface {}(*github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) *{X: 3}", "", "interface {}", nil}, ++ {"dir1someType", true, "interface {}(github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) {X: 1, Y: 2}", "", "interface {}", nil}, ++ {"amap3", true, "interface {}(map[github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType]github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType) [{X: 4}: {X: 5, Y: 6}, ]", "", "interface {}", nil}, ++ {"anarray", true, `interface {}([2]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 1},{X: 2}]`, "", "interface {}", nil}, ++ {"achan", true, `interface {}(chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) chan github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType 0/0`, "", "interface {}", nil}, ++ {"aslice", true, `interface {}([]github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType) [{X: 3},{X: 4}]`, "", "interface {}", nil}, ++ {"afunc", true, `interface {}(func(github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType, github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType)) main.main.func1`, "", "interface {}", nil}, ++ {"astruct", true, `interface {}(*struct { A github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; B github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType }) *{A: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, B: github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 3}}`, "", "interface {}", nil}, ++ {"astruct2", true, `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}`, "", "interface {}", nil}, ++ {"iface2iface", true, `interface {}(*interface { AMethod(int) int; AnotherMethod(int) int }) **github.com/derekparker/delve/_fixtures/internal/dir0/pkg.SomeType {X: 4}`, "", "interface {}", nil}, + + {`"dir0/pkg".A`, false, "0", "", "int", nil}, + {`"dir1/pkg".A`, false, "1", "", "int", nil}, +@@ -1010,7 +1010,7 @@ func TestPackageRenames(t *testing.T) { + if ver.Major > 0 && !ver.AfterOrEqual(goversion.GoVersion{1, 9, -1, 0, 0, ""}) { + // before 1.9 embedded struct field have fieldname == type + if tc.name == "astruct2" { +- tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/vendor/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` ++ tc.value = `interface {}(*struct { github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType; X int }) *{github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType: github.com/derekparker/delve/_fixtures/internal/dir1/pkg.SomeType {X: 1, Y: 2}, X: 10}` + } + } + variable, err := evalVariable(p, tc.name, pnormalLoadConfig)

1 0

Architecture specific change in rpms/xen.git
by githook-noreply＠fedoraproject.org 26 Feb '19

26 Feb '19

The package rpms/xen.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/xen.git/commit/?id=bf40b8fe93b48656…. Change: +%ifarch %{ix86} Thanks. Full change: ============ commit bf40b8fe93b4865670f817e0640d934845744335 Author: Michael Young <m.a.young(a)durham.ac.uk> Date: Wed Feb 27 00:06:55 2019 +0000 update to xen-4.10.3 diff --git a/.gitignore b/.gitignore index 078e8eb..3ebc00b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,4 @@ lwip-1.3.0.tar.gz pciutils-2.2.9.tar.bz2 zlib-1.2.3.tar.gz polarssl-1.1.4-gpl.tgz -/xen-4.10.2.tar.gz +/xen-4.10.3.tar.gz diff --git a/sources b/sources index 532fa04..865ad13 100644 --- a/sources +++ b/sources @@ -4,4 +4,4 @@ SHA512 (newlib-1.16.0.tar.gz) = 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77 SHA512 (zlib-1.2.3.tar.gz) = 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e SHA512 (polarssl-1.1.4-gpl.tgz) = 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad SHA512 (pciutils-2.2.9.tar.bz2) = 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 -SHA512 (xen-4.10.2.tar.gz) = 2e301b4d6eb106fcb52203bc1208c8fd1fc7bb5d795166c0f86e4085227050301f7daa6f21db440c47bc2ca2c7f87d9b96753cfdf3fa724e0416b5679b84c163 +SHA512 (xen-4.10.3.tar.gz) = 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412 diff --git a/xen.fedora.efi.build.patch b/xen.fedora.efi.build.patch index a531445..36f9608 100644 --- a/xen.fedora.efi.build.patch +++ b/xen.fedora.efi.build.patch @@ -1,50 +1,3 @@ ---- xen-4.8.0/xen/arch/x86/Makefile.orig 2016-12-05 12:03:27.000000000 +0000 -+++ xen-4.8.0/xen/arch/x86/Makefile 2017-02-28 00:02:27.989589825 +0000 -@@ -73,6 +73,7 @@ - efi-y := $(shell if [ ! -r $(BASEDIR)/include/xen/compile.h -o \ - -O $(BASEDIR)/include/xen/compile.h ]; then \ - echo '$(TARGET).efi'; fi) -+LD_EFI ?= $(LD) - - ifneq ($(build_id_linker),) - notes_phdrs = --notes -@@ -173,20 +174,20 @@ - - $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o $(BASEDIR)/common/symbols-dummy.o efi/mkreloc - $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ -- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ -+ $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ - $(BASEDIR)/common/symbols-dummy.o $(note_file) -o $(@D)/.$(@F).$(base).0 &&) : - $(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S - $(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ - | $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S - $(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o - $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ -- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ -+ $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ - $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file) -o $(@D)/.$(@F).$(base).1 &&) : - $(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S - $(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ - | $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S - $(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o -- $(guard) $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ -+ $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ - $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file) -o $@ - if $(guard) false; then rm -f $@; echo 'EFI support disabled'; \ - else $(NM) -pa --format=sysv $(@D)/$(@F) \ ---- xen-4.9.0-rc1.2/xen/arch/x86/efi/Makefile.orig 2017-04-12 16:18:57.000000000 +0100 -+++ xen-4.9.0-rc1.2/xen/arch/x86/efi/Makefile 2017-04-13 21:05:54.170387130 +0100 -@@ -1,8 +1,9 @@ - CFLAGS += -fshort-wchar -+LD_EFI ?= $(LD) - - efi := y$(shell rm -f disabled) - efi := $(if $(efi),$(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c check.c 2>disabled && echo y)) --efi := $(if $(efi),$(shell $(LD) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y)) -+efi := $(if $(efi),$(shell $(LD_EFI) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y)) - efi := $(if $(efi),$(shell rm disabled)y) - - %.o: %.ihex --- xen-4.8.0/xen/Makefile.orig 2016-12-05 12:03:27.000000000 +0000 +++ xen-4.8.0/xen/Makefile 2017-02-28 00:02:54.080529810 +0000 @@ -20,6 +20,7 @@ diff --git a/xen.spec b/xen.spec index 45954c2..8580dab 100644 --- a/xen.spec +++ b/xen.spec @@ -36,7 +36,8 @@ # --without efi %define build_efi %{?_without_efi: 0} %{?!_without_efi: 1} # xen only supports efi boot images on x86_64 or aarch64 -%ifnarch x86_64 aarch64 +# i686 builds a x86_64 hypervisor so add that as well +%ifnarch x86_64 aarch64 %{ix86} %define build_efi 0 %endif %if %build_efi && "%dist" < ".fc26" @@ -59,8 +60,8 @@ Summary: Xen is a virtual machine monitor Name: xen -Version: 4.10.2 -Release: 4%{?dist} +Version: 4.10.3 +Release: 1%{?dist} Group: Development/Libraries License: GPLv2+ and LGPLv2+ and BSD URL: http://xen.org/ @@ -118,14 +119,6 @@ Patch39: qemu.trad.CVE-2017-9330.patch Patch40: xen.ocaml.safe-strings.patch Patch45: xen.gcc8.fix.patch Patch51: xen.gcc8.temp.fix.patch -Patch52: xsa278-4.11.patch -Patch53: xsa282-4.11-1.patch -Patch54: xsa282-2.patch -Patch55: xsa275-4.11-1.patch -Patch56: xsa275-4.11-2.patch -Patch57: xsa279.patch -Patch58: xsa280-1.patch -Patch59: xsa280-4.10-2.patch %if %build_qemutrad @@ -335,14 +328,6 @@ manage Xen virtual machines. %patch3 -p1 %patch45 -p1 %patch51 -p1 -%patch52 -p1 -%patch53 -p1 -%patch54 -p1 -%patch55 -p1 -%patch56 -p1 -%patch57 -p1 -%patch58 -p1 -%patch59 -p1 # qemu-xen-traditional patches pushd tools/qemu-xen-traditional @@ -498,6 +483,9 @@ rm -rf %{buildroot}/%{_libdir}/*.a %if %build_efi # clean up extra efi files rm -rf %{buildroot}/%{_libdir}/efi +%ifarch %{ix86} +rm -rf %{buildroot}/usr/lib64/efi +%endif %endif %if ! %build_ocaml @@ -880,6 +868,12 @@ fi %endif %changelog +* Tue Feb 26 2019 Michael Young <m.a.young(a)durham.ac.uk> - 4.10.3-1 +- update to xen-4.10.3 + adjust xen.use.fedora.ipxe.patch + drop most of xen.fedora.efi.build.patch and let efi build on i686 + remove patches for issues now fixed upstream + * Tue Nov 20 2018 Michael Young <m.a.young(a)durham.ac.uk> - 4.10.2-4 - insufficient TLB flushing / improper large page mappings with AMD IOMMUs [XSA-275, CVE-2018-19961, CVE-2018-19962] (#1651665) diff --git a/xen.use.fedora.ipxe.patch b/xen.use.fedora.ipxe.patch index 11a7173..3537ec3 100644 --- a/xen.use.fedora.ipxe.patch +++ b/xen.use.fedora.ipxe.patch @@ -19,7 +19,7 @@ +ETHERBOOT_NICS ?= 10ec8139 8086100e - QEMU_TRADITIONAL_REVISION ?= xen-4.10.2 + QEMU_TRADITIONAL_REVISION ?= xen-4.10.3 --- xen-4.2.0/tools/firmware/Makefile.orig 2012-05-27 21:57:04.480812871 +0100 +++ xen-4.2.0/tools/firmware/Makefile 2012-06-02 19:03:52.254691484 +0100 @@ -10,7 +10,7 @@

1 0

Architecture specific change in rpms/binutils.git
by githook-noreply＠fedoraproject.org 26 Feb '19

26 Feb '19

The package rpms/binutils.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/binutils.git/commit/?id=0c37d8745b5…. Change: -%ifarch %gold_arches Thanks. Full change: ============ commit 0c37d8745b5c0487e62b84f3d50ee12ead5f6a6c Author: Nick Clifton <nickc(a)redhat.com> Date: Tue Feb 26 14:48:06 2019 +0000 Move GOLD into a sub-package of BINUTILS. diff --git a/binutils.spec b/binutils.spec index cab8998..e9ec20a 100644 --- a/binutils.spec +++ b/binutils.spec @@ -28,6 +28,11 @@ # relocations against absolute symbols. %define default_generate_notes 0 +# Use "--without gold" to exclude the gold linker. +# The default is to include it. +# Note - in the future the gold linker may become deprecated. +%bcond_without gold + # Enable thread support in the GOLD linker. This is particularly # important if plugins to the linker intend to use threads themselves. # See BZ 1636479 for more details. This option is made configurable @@ -75,7 +80,7 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} Version: 2.32 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ URL: https://sourceware.org/binutils @@ -192,16 +197,13 @@ Patch17: binutils-CVE-2019-9077.patch Provides: bundled(libiberty) -%define gold_arches %{ix86} x86_64 %{arm} aarch64 %{power64} s390x - -%if %{with bootstrap} -%define build_gold no -%else -%ifarch %gold_arches -%define build_gold both -%else -%define build_gold no -%endif +%if %{with gold} +# For now we make the binutils package require the gold sub-package. +# That way other packages that have a requirement on "binutils" but +# actually want gold will not have to be changed. In the future, if +# we decide to deprecate gold, we can remove this requirement, and +# then update other packages as necessary. +Requires: binutils-gold = %{version} %endif %if %{with debug} @@ -214,12 +216,6 @@ Provides: bundled(libiberty) # Perl, sed and touch are all used in the %%prep section of this spec file. BuildRequires: gcc, perl, sed, coreutils -# Gold needs bison in order to build gold/yyscript.c. -# Bison needs m4. -%if "%{build_gold}" == "both" -BuildRequires: bison, m4, gcc-c++ -%endif - %if %{without bootstrap} BuildRequires: gettext, flex, zlib-devel %endif @@ -237,22 +233,6 @@ BuildRequires: findutils %if %{with testsuite} # relro_test.sh uses dc which is part of the bc rpm, hence its inclusion here. BuildRequires: dejagnu, zlib-static, glibc-static, sharutils, bc -%if "%{build_gold}" == "both" -# The GOLD testsuite needs a static libc++ -BuildRequires: libstdc++-static -%endif -%endif - -Conflicts: gcc-c++ < 4.0.0 - -# The higher of these two numbers determines the default ld. -%{!?ld_bfd_priority: %global ld_bfd_priority 50} -%{!?ld_gold_priority:%global ld_gold_priority 30} - -%if "%{build_gold}" == "both" -Requires(post): coreutils -Requires(post): %{_sbindir}/alternatives -Requires(preun): %{_sbindir}/alternatives %endif # On ARM EABI systems, we do want -gnueabi to be part of the @@ -281,8 +261,6 @@ converting addresses to file and line). %package devel Summary: BFD and opcodes static and dynamic libraries and header files Provides: binutils-static = %{version}-%{release} -%if %{with docs} -%endif Requires: zlib-devel Requires: binutils = %{version}-%{release} # BZ 1215242: We need touch... @@ -304,6 +282,39 @@ using libelf instead of BFD. #---------------------------------------------------------------------------- +%if %{with gold} + +%package gold +Summary: The GOLD linker, a faster alternative to the BFD linker +Provides: gold = %{version}-%{release} +Requires: binutils = %{version}-%{release} + +%description gold +This package provides the GOLD linker, which can be used as an alternative to +the default binutils linker (ld.bfd). The GOLD is generally faster than the +BFD linker, and it supports features such as Identical Code Folding and +Incremental linking. Unfortunately it is not as well maintained as the BFD +linker, and it may become deprecated in the future. + +# Gold needs bison in order to build gold/yyscript.c. +BuildRequires: bison, m4, gcc-c++ +# The GOLD testsuite needs a static libc++ +BuildRequires: libstdc++-static + +Conflicts: gcc-c++ < 4.0.0 + +# The higher of these two numbers determines the default ld. +%{!?ld_bfd_priority: %global ld_bfd_priority 50} +%{!?ld_gold_priority:%global ld_gold_priority 30} + +Requires(post): coreutils +Requires(post): %{_sbindir}/alternatives +Requires(preun): %{_sbindir}/alternatives + +%endif # with gold + +#---------------------------------------------------------------------------- + %prep %setup -q -n binutils-%{version} %patch01 -p1 @@ -424,13 +435,10 @@ export LDFLAGS=$RPM_LD_FLAGS --quiet \ --build=%{_target_platform} --host=%{_target_platform} \ --target=%{binutils_target} \ -%ifarch %gold_arches -%if "%{build_gold}" == "both" - --enable-gold=default --enable-ld \ -%else - --enable-gold \ -%endif +%if %{with gold} + --enable-gold=default \ %endif + --enable-ld \ %if %{isnative} --with-sysroot=/ \ %else @@ -485,7 +493,7 @@ echo ====================TESTSUITE DISABLED========================= make -k check < /dev/null || : echo ====================TESTING========================= cat {gas/testsuite/gas,ld/ld,binutils/binutils}.sum -%if "%{build_gold}" == "both" +%if %{with gold} if [ -f gold/test-suite.log ]; then cat gold/test-suite.log fi @@ -501,14 +509,14 @@ done tar cjf binutils-%{_target_platform}.tar.xz binutils-%{_target_platform}-*.{sum,log} uuencode binutils-%{_target_platform}.tar.xz binutils-%{_target_platform}.tar.xz rm -f binutils-%{_target_platform}.tar.xz binutils-%{_target_platform}-*.{sum,log} -%if "%{build_gold}" == "both" +%if %{with gold} if [ -f gold/testsuite/test-suite.log ]; then tar cjf binutils-%{_target_platform}-gold.log.tar.xz gold/testsuite/*.log uuencode binutils-%{_target_platform}-gold.log.tar.xz binutils-%{_target_platform}-gold.log.tar.xz rm -f binutils-%{_target_platform}-gold.log.tar.xz fi %endif -%endif +%endif # with testsuite #---------------------------------------------------------------------------- @@ -640,7 +648,7 @@ fi #---------------------------------------------------------------------------- %post -%if "%{build_gold}" == "both" +%if %{with gold} %__rm -f %{_bindir}/%{?cross}ld %{_sbindir}/alternatives --install %{_bindir}/%{?cross}ld %{?cross}ld \ %{_bindir}/%{?cross}ld.bfd %{ld_bfd_priority} @@ -648,23 +656,23 @@ fi %{_bindir}/%{?cross}ld.gold %{ld_gold_priority} # Do not run "alternatives --auto ld" here. Leave the setting to # however the user previously had it set. See BZ 1592069 for more details. -%endif # both ld.gold and ld.bfd +%endif %if %{isnative} -/sbin/ldconfig -%endif # isnative +%ldconfig_post +%endif exit 0 #---------------------------------------------------------------------------- %preun -%if "%{build_gold}" == "both" +%if %{with gold} if [ $1 = 0 ]; then %{_sbindir}/alternatives --remove %{?cross}ld %{_bindir}/%{?cross}ld.bfd %{_sbindir}/alternatives --remove %{?cross}ld %{_bindir}/%{?cross}ld.gold fi -%endif # both ld.gold and ld.bfd +%endif exit 0 @@ -672,8 +680,8 @@ exit 0 %if %{isnative} %postun -/sbin/ldconfig -%endif # isnative +%ldconfig_postun +%endif #---------------------------------------------------------------------------- @@ -682,12 +690,11 @@ exit 0 %doc README %{_bindir}/%{?cross}[!l]* -%if "%{build_gold}" == "both" -%{_bindir}/%{?cross}ld.* -%ghost %{_bindir}/%{?cross}ld -%else +%if %{with gold} %{_bindir}/%{?cross}ld* -%endif # both ld.gold and ld.bfd +%else +%{_bindir}/%{?cross}ld.bfd +%endif %if %{with docs} %{_mandir}/man1/* @@ -695,20 +702,21 @@ exit 0 %{_infodir}/binutils.info.gz %{_infodir}/gprof.info.gz %{_infodir}/ld.info.gz -%endif # with docs +%endif %if %{enable_shared} %{_libdir}/lib*.so %exclude %{_libdir}/libbfd.so %exclude %{_libdir}/libopcodes.so -%endif # enable_shared +%endif %if %{isnative} %if %{with docs} %{_infodir}/[^b]*info* %{_infodir}/binutils*info* -%endif # with docs +%{_infodir}/bfd*info* +%endif %files devel %{_prefix}/include/* @@ -716,14 +724,19 @@ exit 0 %{_libdir}/libbfd.so %{_libdir}/libopcodes.so -%if %{with docs} -%{_infodir}/bfd*info* -%endif # with docs - %endif # isnative +%if %{with gold} +%files gold +%{_bindir}/%{?cross}ld.gold +%ghost %{_bindir}/%{?cross}ld +%endif + #---------------------------------------------------------------------------- %changelog +* Tue Feb 26 2019 Nick Clifton <nickc(a)redhat.com> - 2.32-7 +- Move GOLD into a sub-package of BINUTILS. + * Tue Feb 26 2019 Nick Clifton <nickc(a)redhat.com> - 2.32-6 - Stop potential illegal memory access when parsing a corrupt MIPS binary. (#1680676)

1 0

Architecture specific change in rpms/fts-rest.git
by githook-noreply＠fedoraproject.org 26 Feb '19

26 Feb '19

The package rpms/fts-rest.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/fts-rest.git/commit/?id=7bb5ce23f1f…. Change: -ExcludeArch: ppc64le Thanks. Full change: ============ commit d6bc8ada3a268424f595162a19ddc6adce5756d3 Author: andreamanzi <andrea.manzi(a)gmail.com> Date: Tue Feb 26 12:51:24 2019 +0100 new upstream release diff --git a/fts-rest.spec b/fts-rest.spec index 130ec35..1ff5a9a 100644 --- a/fts-rest.spec +++ b/fts-rest.spec @@ -4,8 +4,8 @@ %{!?nosetest_path: %global nosetest_path "/tmp"} Name: fts-rest -Version: 3.7.1 -Release: 4%{?dist} +Version: 3.8.3 +Release: 1%{?dist} BuildArch: noarch Summary: FTS3 Rest Interface License: ASL 2.0 @@ -60,6 +60,17 @@ Requires: python-requests %description This package provides the FTS3 REST interface +%if %{?rhel}%{!?rhel:0} >= 7 +%package firewalld +Summary: FTS3 Rest Firewalld +Group: Applications/Internet + +Requires: firewalld-filesystem + +%description firewalld +FTS3 Rest firewalld. +%endif + %package cloud-storage Summary: FTS3 Rest Cloud Storage extensions Requires: fts-rest = %{version}-%{release} @@ -183,7 +194,9 @@ popd %install mkdir -p %{buildroot} make install DESTDIR=%{buildroot} - +%if %{?rhel}%{!?rhel:0} == 6 +rm -rf %{buildroot}/%{_prefix}/lib/firewalld/services/fts3rest.xml +%endif mkdir -p %{buildroot}/%{_var}/cache/fts3rest/ mkdir -p %{buildroot}/%{_var}/log/fts3rest/ @@ -260,6 +273,11 @@ EOF %doc docs/install.md %doc docs/api.md +%if %{?rhel}%{!?rhel:0} >= 7 +%files firewalld +%config(noreplace) %{_prefix}/lib/firewalld/services/fts3rest.xml +%endif + %files cloud-storage %{python2_sitelib}/fts3rest/config/routing/cstorage.py* %{python2_sitelib}/fts3rest/controllers/cloudStorage.py* @@ -299,6 +317,9 @@ EOF %doc LICENSE %changelog +* Tue Feb 26 2019 Alejandro Alvarez Ayllon <aalvarez(a)cern.ch> - 3.8.3-1 +- Update for new upstream release + * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.7.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index d539211..421fe0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fts-rest-3.7.1.tar.gz) = cc0cf9764ae7d0080c8c98bd633f8773eb831047dc244ee4da0d593e434363ad0c3289b64e87190bedf9c692156001fe6dbff7dc0cdc0c90f895a1a2385b87ae +SHA512 (fts-rest-3.8.3.tar.gz) = 8967a92ac95e572427ce08818da634ea9c5eb3db0b20a8cfeb4f9ef782cc359c3264adf7b081d30ebb45829c2c1bf87963891f45501d05d44bd03b4e663cab2b commit 27b440aeb107de0b61913255cc303703e6852283 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Thu Jan 31 20:17:05 2019 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/fts-rest.spec b/fts-rest.spec index f0c24bc..130ec35 100644 --- a/fts-rest.spec +++ b/fts-rest.spec @@ -5,7 +5,7 @@ Name: fts-rest Version: 3.7.1 -Release: 3%{?dist} +Release: 4%{?dist} BuildArch: noarch Summary: FTS3 Rest Interface License: ASL 2.0 @@ -299,6 +299,9 @@ EOF %doc LICENSE %changelog +* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.7.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Aug 23 2018 Peter Robinson <pbrobinson(a)fedoraproject.org> 3.7.1-3 - Build on ppc64le (all deps now present) - Drop package groups commit 7bb5ce23f1f1bc3398a1ef0740e93ad67e2db597 Author: Peter Robinson <pbrobinson(a)gmail.com> Date: Thu Aug 23 14:43:50 2018 +0100 Build on ppc64le (all deps now present), Drop package groups diff --git a/fts-rest.spec b/fts-rest.spec index e0e1d5a..f0c24bc 100644 --- a/fts-rest.spec +++ b/fts-rest.spec @@ -5,10 +5,9 @@ Name: fts-rest Version: 3.7.1 -Release: 2%{?dist} +Release: 3%{?dist} BuildArch: noarch Summary: FTS3 Rest Interface -Group: System Environment/Daemon License: ASL 2.0 URL: http://fts3-service.web.cern.ch/ # git clone https://gitlab.cern.ch/fts/fts-rest.git --depth 1 -b master fts-rest-3.7.1 @@ -17,8 +16,6 @@ URL: http://fts3-service.web.cern.ch/ # cd .. # tar vczf fts-rest-3.7.1.tar.gz --exclude-vcs fts-rest-3.7.1 Source0: %{name}-%{version}.tar.gz -# Due to missing dependencies -ExcludeArch: ppc64le BuildRequires: gcc BuildRequires: gcc-c++ @@ -65,8 +62,6 @@ This package provides the FTS3 REST interface %package cloud-storage Summary: FTS3 Rest Cloud Storage extensions -Group: Applications/Internet - Requires: fts-rest = %{version}-%{release} %description cloud-storage @@ -74,8 +69,6 @@ FTS3 Rest Cloud Storage extensions. Includes support for Dropbox %package oauth2 Summary: FTS3 Rest OAuth2 provider -Group: Applications/Internet - Requires: fts-rest = %{version}-%{release} %description oauth2 @@ -83,8 +76,6 @@ FTS3 Rest OAuth2 provider %package http-authz-signed-cert Summary: FTS3 Rest HTTP_AUTHORIZATION signed-cert method -Group: Application/Internet - Requires: python-dateutil Requires: python-m2ext Requires: fts-rest = %{version}-%{release} @@ -94,8 +85,6 @@ FTS3 Rest HTTP_AUTHORIZATION signed-cert method %package cli Summary: FTS3 Rest Interface CLI -Group: Applications/Internet - Requires: python-fts = %{version}-%{release} Requires: python-m2ext @@ -104,8 +93,6 @@ Command line utilities for the FTS3 REST interface %package selinux Summary: SELinux support for fts-rest -Group: Applications/Internet - Requires: %{name} = %{version}-%{release} %description selinux @@ -118,7 +105,6 @@ SELinux support for fts-rest %package -n python-fts %endif Summary: FTS3 database model -Group: Applications/Internet Requires: m2crypto Requires: python-pycurl %if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7 @@ -313,6 +299,10 @@ EOF %doc LICENSE %changelog +* Thu Aug 23 2018 Peter Robinson <pbrobinson(a)fedoraproject.org> 3.7.1-3 +- Build on ppc64le (all deps now present) +- Drop package groups + * Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild commit 801fe5e175b0a47498f379be562bd05209968645 Author: andreamanzi <andrea.manzi(a)gmail.com> Date: Thu Aug 16 13:22:18 2018 +0200 fix for python2 changes in f29 diff --git a/fts-rest.spec b/fts-rest.spec index f5dc5c4..e0e1d5a 100644 --- a/fts-rest.spec +++ b/fts-rest.spec @@ -1,5 +1,5 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")} +%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} +%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")} %{!?nosetest_path: %global nosetest_path "/tmp"} @@ -178,7 +178,7 @@ if [ "$fts_api_ver" != "$fts_spec_ver" ]; then exit 1 fi -%cmake . -DCMAKE_INSTALL_PREFIX=/ -DPYTHON_SITE_PACKAGES=%{python_sitelib} +%cmake . -DCMAKE_INSTALL_PREFIX=/ -DPYTHON_SITE_PACKAGES=%{python2_sitelib} make %{?_smp_mflags} %if %{?fedora}%{!?fedora:0} < 28 || %{?rhel}%{!?rhel:0} >= 6 @@ -201,9 +201,9 @@ make install DESTDIR=%{buildroot} mkdir -p %{buildroot}/%{_var}/cache/fts3rest/ mkdir -p %{buildroot}/%{_var}/log/fts3rest/ -cp --preserve=timestamps -r src/fts3 %{buildroot}/%{python_sitelib} +cp --preserve=timestamps -r src/fts3 %{buildroot}/%{python2_sitelib} -cat > %{buildroot}/%{python_sitelib}/fts3.egg-info <<EOF +cat > %{buildroot}/%{python2_sitelib}/fts3.egg-info <<EOF Metadata-Version: 1.0 Name: fts3 Version: %{version} @@ -215,7 +215,7 @@ License: Apache2 EOF %files -%dir %{python_sitelib}/fts3rest/ +%dir %{python2_sitelib}/fts3rest/ %{python2_sitelib}/fts3rest.egg-info/* commit 1bf815e77458bf98292ddba89fe437ebf778a6b2 Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> Date: Sun Jul 29 23:11:41 2018 +0200 %{python_sitelib} %{python2_sitelib} Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> diff --git a/fts-rest.spec b/fts-rest.spec index 3021e34..f5dc5c4 100644 --- a/fts-rest.spec +++ b/fts-rest.spec @@ -217,52 +217,52 @@ EOF %files %dir %{python_sitelib}/fts3rest/ -%{python_sitelib}/fts3rest.egg-info/* - -%{python_sitelib}/fts3rest/__init__.py* -%{python_sitelib}/fts3rest/websetup.py* - -%{python_sitelib}/fts3rest/config/*.py* -%{python_sitelib}/fts3rest/config/routing/__init__.py* -%{python_sitelib}/fts3rest/config/routing/base.py* - -%{python_sitelib}/fts3rest/controllers/api.py* -%{python_sitelib}/fts3rest/controllers/archive.py* -%{python_sitelib}/fts3rest/controllers/autocomplete.py* -%{python_sitelib}/fts3rest/controllers/banning.py* -%{python_sitelib}/fts3rest/controllers/config/*.py* -%{python_sitelib}/fts3rest/controllers/datamanagement.py* -%{python_sitelib}/fts3rest/controllers/delegation.py* -%{python_sitelib}/fts3rest/controllers/error.py* -%{python_sitelib}/fts3rest/controllers/__init__.py* -%{python_sitelib}/fts3rest/controllers/files.py* -%{python_sitelib}/fts3rest/controllers/jobs.py* -%{python_sitelib}/fts3rest/controllers/optimizer.py* -%{python_sitelib}/fts3rest/controllers/serverstatus.py* - -%{python_sitelib}/fts3rest/lib/api/ -%{python_sitelib}/fts3rest/lib/app_globals.py* -%{python_sitelib}/fts3rest/lib/base.py* -%{python_sitelib}/fts3rest/lib/gfal2_wrapper.py* -%{python_sitelib}/fts3rest/lib/heartbeat.py* -%{python_sitelib}/fts3rest/lib/helpers/ -%{python_sitelib}/fts3rest/lib/http_exceptions.py* -%{python_sitelib}/fts3rest/lib/__init__.py* -%{python_sitelib}/fts3rest/lib/JobBuilder.py* -%{python_sitelib}/fts3rest/lib/middleware/*.py* -%{python_sitelib}/fts3rest/lib/middleware/fts3auth/*.py* -%{python_sitelib}/fts3rest/lib/middleware/fts3auth/methods/__init__.py* -%{python_sitelib}/fts3rest/lib/middleware/fts3auth/methods/ssl.py* -%{python_sitelib}/fts3rest/lib/scheduler/schd.py* -%{python_sitelib}/fts3rest/lib/scheduler/db.py* -%{python_sitelib}/fts3rest/lib/scheduler/Cache.py* -%{python_sitelib}/fts3rest/lib/scheduler/__init__.py* - -%{python_sitelib}/fts3rest/model/ - -%{python_sitelib}/fts3rest/public/ -%{python_sitelib}/fts3rest/templates/delegation.html -%{python_sitelib}/fts3rest/templates/config/ +%{python2_sitelib}/fts3rest.egg-info/* + +%{python2_sitelib}/fts3rest/__init__.py* +%{python2_sitelib}/fts3rest/websetup.py* + +%{python2_sitelib}/fts3rest/config/*.py* +%{python2_sitelib}/fts3rest/config/routing/__init__.py* +%{python2_sitelib}/fts3rest/config/routing/base.py* + +%{python2_sitelib}/fts3rest/controllers/api.py* +%{python2_sitelib}/fts3rest/controllers/archive.py* +%{python2_sitelib}/fts3rest/controllers/autocomplete.py* +%{python2_sitelib}/fts3rest/controllers/banning.py* +%{python2_sitelib}/fts3rest/controllers/config/*.py* +%{python2_sitelib}/fts3rest/controllers/datamanagement.py* +%{python2_sitelib}/fts3rest/controllers/delegation.py* +%{python2_sitelib}/fts3rest/controllers/error.py* +%{python2_sitelib}/fts3rest/controllers/__init__.py* +%{python2_sitelib}/fts3rest/controllers/files.py* +%{python2_sitelib}/fts3rest/controllers/jobs.py* +%{python2_sitelib}/fts3rest/controllers/optimizer.py* +%{python2_sitelib}/fts3rest/controllers/serverstatus.py* + +%{python2_sitelib}/fts3rest/lib/api/ +%{python2_sitelib}/fts3rest/lib/app_globals.py* +%{python2_sitelib}/fts3rest/lib/base.py* +%{python2_sitelib}/fts3rest/lib/gfal2_wrapper.py* +%{python2_sitelib}/fts3rest/lib/heartbeat.py* +%{python2_sitelib}/fts3rest/lib/helpers/ +%{python2_sitelib}/fts3rest/lib/http_exceptions.py* +%{python2_sitelib}/fts3rest/lib/__init__.py* +%{python2_sitelib}/fts3rest/lib/JobBuilder.py* +%{python2_sitelib}/fts3rest/lib/middleware/*.py* +%{python2_sitelib}/fts3rest/lib/middleware/fts3auth/*.py* +%{python2_sitelib}/fts3rest/lib/middleware/fts3auth/methods/__init__.py* +%{python2_sitelib}/fts3rest/lib/middleware/fts3auth/methods/ssl.py* +%{python2_sitelib}/fts3rest/lib/scheduler/schd.py* +%{python2_sitelib}/fts3rest/lib/scheduler/db.py* +%{python2_sitelib}/fts3rest/lib/scheduler/Cache.py* +%{python2_sitelib}/fts3rest/lib/scheduler/__init__.py* + +%{python2_sitelib}/fts3rest/model/ + +%{python2_sitelib}/fts3rest/public/ +%{python2_sitelib}/fts3rest/templates/delegation.html +%{python2_sitelib}/fts3rest/templates/config/ %{_libexecdir}/fts3 %config(noreplace) %{_sysconfdir}/fts3/fts3rest.ini @@ -275,26 +275,26 @@ EOF %doc docs/api.md %files cloud-storage -%{python_sitelib}/fts3rest/config/routing/cstorage.py* -%{python_sitelib}/fts3rest/controllers/cloudStorage.py* -%{python_sitelib}/fts3rest/controllers/CSdropbox.py* -%{python_sitelib}/fts3rest/controllers/CSInterface.py* +%{python2_sitelib}/fts3rest/config/routing/cstorage.py* +%{python2_sitelib}/fts3rest/controllers/cloudStorage.py* +%{python2_sitelib}/fts3rest/controllers/CSdropbox.py* +%{python2_sitelib}/fts3rest/controllers/CSInterface.py* %files oauth2 -%{python_sitelib}/fts3rest/config/routing/oauth2.py* -%{python_sitelib}/fts3rest/controllers/oauth2.py* -%{python_sitelib}/fts3rest/lib/oauth2lib/ -%{python_sitelib}/fts3rest/lib/oauth2provider.py* -%{python_sitelib}/fts3rest/lib/middleware/fts3auth/methods/oauth2.py* -%{python_sitelib}/fts3rest/templates/app.html -%{python_sitelib}/fts3rest/templates/app_register.html -%{python_sitelib}/fts3rest/templates/apps.html -%{python_sitelib}/fts3rest/templates/authz_confirm.html -%{python_sitelib}/fts3rest/templates/authz_failure.html -%{python_sitelib}/fts3rest/templates/authz_noredirect.html +%{python2_sitelib}/fts3rest/config/routing/oauth2.py* +%{python2_sitelib}/fts3rest/controllers/oauth2.py* +%{python2_sitelib}/fts3rest/lib/oauth2lib/ +%{python2_sitelib}/fts3rest/lib/oauth2provider.py* +%{python2_sitelib}/fts3rest/lib/middleware/fts3auth/methods/oauth2.py* +%{python2_sitelib}/fts3rest/templates/app.html +%{python2_sitelib}/fts3rest/templates/app_register.html +%{python2_sitelib}/fts3rest/templates/apps.html +%{python2_sitelib}/fts3rest/templates/authz_confirm.html +%{python2_sitelib}/fts3rest/templates/authz_failure.html +%{python2_sitelib}/fts3rest/templates/authz_noredirect.html %files http-authz-signed-cert -%{python_sitelib}/fts3rest/lib/middleware/fts3auth/methods/http.py* +%{python2_sitelib}/fts3rest/lib/middleware/fts3auth/methods/http.py* %files cli %{_bindir}/fts-rest-* @@ -308,8 +308,8 @@ EOF %else %files -n python-fts %endif -%{python_sitelib}/fts3 -%{python_sitelib}/fts3.egg-info +%{python2_sitelib}/fts3 +%{python2_sitelib}/fts3.egg-info %doc LICENSE %changelog commit 9afe46b288a5dffeea126ed02a54ec57f046f392 Author: andreamanzi <andrea.manzi(a)gmail.com> Date: Tue Jul 17 21:53:43 2018 +0200 use python2 diff --git a/fts-rest.spec b/fts-rest.spec index 6380adb..3021e34 100644 --- a/fts-rest.spec +++ b/fts-rest.spec @@ -1,5 +1,5 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")} +%{!?python_sitelib: %global python_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")} %{!?nosetest_path: %global nosetest_path "/tmp"} commit d0ca99862575a51df7e6f3553db9bb6ce6769c70 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Fri Jul 13 00:55:48 2018 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/fts-rest.spec b/fts-rest.spec index 175a802..6380adb 100644 --- a/fts-rest.spec +++ b/fts-rest.spec @@ -5,7 +5,7 @@ Name: fts-rest Version: 3.7.1 -Release: 1%{?dist} +Release: 2%{?dist} BuildArch: noarch Summary: FTS3 Rest Interface Group: System Environment/Daemon @@ -313,6 +313,9 @@ EOF %doc LICENSE %changelog +* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild commit b5d77e323912dda901d22c8a22f24ba2c9a36921 Author: Igor Gnatenko <ignatenko(a)redhat.com> Date: Mon Jul 9 19:06:44 2018 +0200 add BuildRequires: gcc-c++,gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot diff --git a/fts-rest.spec b/fts-rest.spec index c42fff4..175a802 100644 --- a/fts-rest.spec +++ b/fts-rest.spec @@ -20,6 +20,8 @@ Source0: %{name}-%{version}.tar.gz # Due to missing dependencies ExcludeArch: ppc64le +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: gfal2-python BuildRequires: gfal2-plugin-mock BuildRequires: cmake

1 0

Architecture specific change in rpms/golang-github-chaseadamsio-goorgeous.git
by githook-noreply＠fedoraproject.org 26 Feb '19

26 Feb '19

The package rpms/golang-github-chaseadamsio-goorgeous.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/golang-github-chaseadamsio-goorgeou…. Change: -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} Thanks. Full change: ============ commit afd745a3f6c4c5339367f3ec2634e306f06a9ecb Author: Robert-Andr Mauchin <zebob.m(a)gmail.com> Date: Tue Feb 26 04:17:30 2019 -0500 Change Blackfriday import path to V1 instead of V2. diff --git a/golang-github-chaseadamsio-goorgeous.spec b/golang-github-chaseadamsio-goorgeous.spec index be06307..315be65 100644 --- a/golang-github-chaseadamsio-goorgeous.spec +++ b/golang-github-chaseadamsio-goorgeous.spec @@ -21,7 +21,7 @@ Emacs. Summary: %{summary} BuildArch: noarch -BuildRequires: golang(github.com/russross/blackfriday) +BuildRequires: golang(gopkg.in/russross/blackfriday.v1) BuildRequires: golang(github.com/shurcooL/sanitized_anchor_name) %description devel @@ -33,6 +33,9 @@ which use import path with %{goipath} prefix. %prep %forgeautosetup -p1 +# Replace blackfriday import path to avoid conflict with v2 +sed -i 's|"github.com/russross/blackfriday|"gopkg.in/russross/blackfriday.v1|' $(find . -name '*.go') + # Blackfriday removed the footnotes features. # We need to remove such feature from goorgeous upstream as well # Until then, we skip this feature test @@ -52,6 +55,9 @@ sed -i '431s/Errorf/Skipf/' goorgeous_test.go %changelog +* Tue Feb 26 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 2.0.0-6 +- Fix build against to use old Blackfriday + * Tue Feb 26 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 2.0.0-6 - Rewrite spec using new template commit 29e7e4d4d19022dcc52e34a68e0af130b1a6a4b3 Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> Date: Tue Feb 26 04:05:45 2019 -0500 Rewrite spec using new template. diff --git a/.gitignore b/.gitignore index 7d60130..2e658e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /goorgeous-054aba6.tar.gz /goorgeous-e0b2cd6.tar.gz +/goorgeous-2.0.0.tar.gz diff --git a/golang-github-chaseadamsio-goorgeous.spec b/golang-github-chaseadamsio-goorgeous.spec index 2d8b543..be06307 100644 --- a/golang-github-chaseadamsio-goorgeous.spec +++ b/golang-github-chaseadamsio-goorgeous.spec @@ -1,177 +1,60 @@ -# Generate devel rpm -%global with_devel 1 -# Build project from bundled dependencies -%global with_bundled 0 -# Build with debug info rpm -%global with_debug 0 -# Run tests in check section -%global with_check 1 -# Generate unit-test rpm -%global with_unit_test 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - - -%global provider github -%global provider_tld com -%global project chaseadamsio -%global repo goorgeous # https://github.com/chaseadamsio/goorgeous -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit e0b2cd6d4e7abdf9a33f017bcc97df2242e05572 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: golang-%{provider}-%{project}-%{repo} +%global goipath github.com/chaseadamsio/goorgeous Version: 2.0.0 -Release: 5%{dist} -Summary: Org to HTML Parser written in Go -License: MIT -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz - -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +%gometa +Name: %{goname} +Release: 6%{?dist} +Summary: Org to HTML Parser written in Go +License: MIT +URL: %{gourl} +Source0: %{gosource} %description The purpose of this package is to come as close as possible as parsing an *.org document into HTML, the same way one might publish with org-publish-html from Emacs. -%if 0%{?with_devel} + %package devel Summary: %{summary} BuildArch: noarch -%if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/russross/blackfriday) BuildRequires: golang(github.com/shurcooL/sanitized_anchor_name) -%endif - -Requires: golang(github.com/russross/blackfriday) -Requires: golang(github.com/shurcooL/sanitized_anchor_name) - -Provides: golang(%{import_path}) = %{version}-%{release} %description devel %{summary} -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%if 0%{?with_check} && ! 0%{?with_bundled} -%endif - - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif +This package contains library source intended for building other packages +which use import path with %{goipath} prefix. %prep -%setup -q -n %{repo}-%{commit} +%forgeautosetup -p1 + # Blackfriday removed the footnotes features. # We need to remove such feature from goorgeous upstream as well # Until then, we skip this feature test sed -i '431s/Errorf/Skipf/' goorgeous_test.go -%build -%install -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . $ -iname "*.go" -or -iname "*.s" $ \! -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -# install data used for tests -cp -pav ./testdata %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%{gopath}/src/%%{import_path}/testdata" >> unit-test-devel.file-list - -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif - -%check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -# No dependency directories so far -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%endif - -%if ! 0%{?gotest:1} -%global gotest go test -%endif +%install +%goinstall -%gotest %{import_path} -%endif -#define license tag if not already defined -%{!?_licensedir:%global license %doc} +%check +%gochecks -%if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%endif %changelog +* Tue Feb 26 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 2.0.0-6 +- Rewrite spec using new template + * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -206,4 +89,3 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath} * Sat Feb 25 2017 Athos Ribeiro <athoscr(a)fedoraproject.org> - 0-0.1.git054aba6 - Initial package - diff --git a/sources b/sources index 7c9ed81..5982705 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (goorgeous-e0b2cd6.tar.gz) = d5c39c4f6bcfb250f7b98f60042f3c23a7151a5bfb79528379d554028f92b5412911ef9497cb1fd4f74f75c2fc77aa7f65a42ae1dd353b8a9d2f57909c63257f +SHA512 (goorgeous-2.0.0.tar.gz) = 94b9c76b70a26bba520b7f0e800591bbc377408f397e2a9c42a3b3b4b0d6f984e69070b7a2421a1bbba56ef47cb152b8acfd975e8cfea210f9e40b15ef476607 commit 9ccdb3e50d704a4f76cc2849a1dfe8ef90cfb927 Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Thu Jan 31 23:49:53 2019 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/golang-github-chaseadamsio-goorgeous.spec b/golang-github-chaseadamsio-goorgeous.spec index 3d48fb6..2d8b543 100644 --- a/golang-github-chaseadamsio-goorgeous.spec +++ b/golang-github-chaseadamsio-goorgeous.spec @@ -28,7 +28,7 @@ Name: golang-%{provider}-%{project}-%{repo} Version: 2.0.0 -Release: 4%{dist} +Release: 5%{dist} Summary: Org to HTML Parser written in Go License: MIT URL: https://%{provider_prefix} @@ -172,6 +172,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath} %endif %changelog +* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

1 0

Architecture specific change in rpms/golang-github-chaseadamsio-goorgeous.git
by githook-noreply＠fedoraproject.org 26 Feb '19

26 Feb '19

The package rpms/golang-github-chaseadamsio-goorgeous.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/golang-github-chaseadamsio-goorgeou…. Change: -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} Thanks. Full change: ============ commit afd745a3f6c4c5339367f3ec2634e306f06a9ecb Author: Robert-Andr Mauchin <zebob.m(a)gmail.com> Date: Tue Feb 26 04:17:30 2019 -0500 Change Blackfriday import path to V1 instead of V2. diff --git a/golang-github-chaseadamsio-goorgeous.spec b/golang-github-chaseadamsio-goorgeous.spec index be06307..315be65 100644 --- a/golang-github-chaseadamsio-goorgeous.spec +++ b/golang-github-chaseadamsio-goorgeous.spec @@ -21,7 +21,7 @@ Emacs. Summary: %{summary} BuildArch: noarch -BuildRequires: golang(github.com/russross/blackfriday) +BuildRequires: golang(gopkg.in/russross/blackfriday.v1) BuildRequires: golang(github.com/shurcooL/sanitized_anchor_name) %description devel @@ -33,6 +33,9 @@ which use import path with %{goipath} prefix. %prep %forgeautosetup -p1 +# Replace blackfriday import path to avoid conflict with v2 +sed -i 's|"github.com/russross/blackfriday|"gopkg.in/russross/blackfriday.v1|' $(find . -name '*.go') + # Blackfriday removed the footnotes features. # We need to remove such feature from goorgeous upstream as well # Until then, we skip this feature test @@ -52,6 +55,9 @@ sed -i '431s/Errorf/Skipf/' goorgeous_test.go %changelog +* Tue Feb 26 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 2.0.0-6 +- Fix build against to use old Blackfriday + * Tue Feb 26 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 2.0.0-6 - Rewrite spec using new template commit 29e7e4d4d19022dcc52e34a68e0af130b1a6a4b3 Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> Date: Tue Feb 26 04:05:45 2019 -0500 Rewrite spec using new template. diff --git a/.gitignore b/.gitignore index 7d60130..2e658e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /goorgeous-054aba6.tar.gz /goorgeous-e0b2cd6.tar.gz +/goorgeous-2.0.0.tar.gz diff --git a/golang-github-chaseadamsio-goorgeous.spec b/golang-github-chaseadamsio-goorgeous.spec index 2d8b543..be06307 100644 --- a/golang-github-chaseadamsio-goorgeous.spec +++ b/golang-github-chaseadamsio-goorgeous.spec @@ -1,177 +1,60 @@ -# Generate devel rpm -%global with_devel 1 -# Build project from bundled dependencies -%global with_bundled 0 -# Build with debug info rpm -%global with_debug 0 -# Run tests in check section -%global with_check 1 -# Generate unit-test rpm -%global with_unit_test 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - - -%global provider github -%global provider_tld com -%global project chaseadamsio -%global repo goorgeous # https://github.com/chaseadamsio/goorgeous -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit e0b2cd6d4e7abdf9a33f017bcc97df2242e05572 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: golang-%{provider}-%{project}-%{repo} +%global goipath github.com/chaseadamsio/goorgeous Version: 2.0.0 -Release: 5%{dist} -Summary: Org to HTML Parser written in Go -License: MIT -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz - -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +%gometa +Name: %{goname} +Release: 6%{?dist} +Summary: Org to HTML Parser written in Go +License: MIT +URL: %{gourl} +Source0: %{gosource} %description The purpose of this package is to come as close as possible as parsing an *.org document into HTML, the same way one might publish with org-publish-html from Emacs. -%if 0%{?with_devel} + %package devel Summary: %{summary} BuildArch: noarch -%if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/russross/blackfriday) BuildRequires: golang(github.com/shurcooL/sanitized_anchor_name) -%endif - -Requires: golang(github.com/russross/blackfriday) -Requires: golang(github.com/shurcooL/sanitized_anchor_name) - -Provides: golang(%{import_path}) = %{version}-%{release} %description devel %{summary} -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%if 0%{?with_check} && ! 0%{?with_bundled} -%endif - - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif +This package contains library source intended for building other packages +which use import path with %{goipath} prefix. %prep -%setup -q -n %{repo}-%{commit} +%forgeautosetup -p1 + # Blackfriday removed the footnotes features. # We need to remove such feature from goorgeous upstream as well # Until then, we skip this feature test sed -i '431s/Errorf/Skipf/' goorgeous_test.go -%build -%install -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . $ -iname "*.go" -or -iname "*.s" $ \! -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -# install data used for tests -cp -pav ./testdata %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%{gopath}/src/%%{import_path}/testdata" >> unit-test-devel.file-list - -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif - -%check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -# No dependency directories so far -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%endif - -%if ! 0%{?gotest:1} -%global gotest go test -%endif +%install +%goinstall -%gotest %{import_path} -%endif -#define license tag if not already defined -%{!?_licensedir:%global license %doc} +%check +%gochecks -%if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%endif %changelog +* Tue Feb 26 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 2.0.0-6 +- Rewrite spec using new template + * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -206,4 +89,3 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath} * Sat Feb 25 2017 Athos Ribeiro <athoscr(a)fedoraproject.org> - 0-0.1.git054aba6 - Initial package - diff --git a/sources b/sources index 7c9ed81..5982705 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (goorgeous-e0b2cd6.tar.gz) = d5c39c4f6bcfb250f7b98f60042f3c23a7151a5bfb79528379d554028f92b5412911ef9497cb1fd4f74f75c2fc77aa7f65a42ae1dd353b8a9d2f57909c63257f +SHA512 (goorgeous-2.0.0.tar.gz) = 94b9c76b70a26bba520b7f0e800591bbc377408f397e2a9c42a3b3b4b0d6f984e69070b7a2421a1bbba56ef47cb152b8acfd975e8cfea210f9e40b15ef476607

1 0

Architecture specific change in rpms/golang-github-chaseadamsio-goorgeous.git
by githook-noreply＠fedoraproject.org 26 Feb '19

26 Feb '19

The package rpms/golang-github-chaseadamsio-goorgeous.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/golang-github-chaseadamsio-goorgeou…. Change: -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} Thanks. Full change: ============ commit afd745a3f6c4c5339367f3ec2634e306f06a9ecb Author: Robert-Andr Mauchin <zebob.m(a)gmail.com> Date: Tue Feb 26 04:17:30 2019 -0500 Change Blackfriday import path to V1 instead of V2. diff --git a/golang-github-chaseadamsio-goorgeous.spec b/golang-github-chaseadamsio-goorgeous.spec index be06307..315be65 100644 --- a/golang-github-chaseadamsio-goorgeous.spec +++ b/golang-github-chaseadamsio-goorgeous.spec @@ -21,7 +21,7 @@ Emacs. Summary: %{summary} BuildArch: noarch -BuildRequires: golang(github.com/russross/blackfriday) +BuildRequires: golang(gopkg.in/russross/blackfriday.v1) BuildRequires: golang(github.com/shurcooL/sanitized_anchor_name) %description devel @@ -33,6 +33,9 @@ which use import path with %{goipath} prefix. %prep %forgeautosetup -p1 +# Replace blackfriday import path to avoid conflict with v2 +sed -i 's|"github.com/russross/blackfriday|"gopkg.in/russross/blackfriday.v1|' $(find . -name '*.go') + # Blackfriday removed the footnotes features. # We need to remove such feature from goorgeous upstream as well # Until then, we skip this feature test @@ -52,6 +55,9 @@ sed -i '431s/Errorf/Skipf/' goorgeous_test.go %changelog +* Tue Feb 26 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 2.0.0-6 +- Fix build against to use old Blackfriday + * Tue Feb 26 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 2.0.0-6 - Rewrite spec using new template commit 29e7e4d4d19022dcc52e34a68e0af130b1a6a4b3 Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> Date: Tue Feb 26 04:05:45 2019 -0500 Rewrite spec using new template. diff --git a/.gitignore b/.gitignore index 7d60130..2e658e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /goorgeous-054aba6.tar.gz /goorgeous-e0b2cd6.tar.gz +/goorgeous-2.0.0.tar.gz diff --git a/golang-github-chaseadamsio-goorgeous.spec b/golang-github-chaseadamsio-goorgeous.spec index 2d8b543..be06307 100644 --- a/golang-github-chaseadamsio-goorgeous.spec +++ b/golang-github-chaseadamsio-goorgeous.spec @@ -1,177 +1,60 @@ -# Generate devel rpm -%global with_devel 1 -# Build project from bundled dependencies -%global with_bundled 0 -# Build with debug info rpm -%global with_debug 0 -# Run tests in check section -%global with_check 1 -# Generate unit-test rpm -%global with_unit_test 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - - -%global provider github -%global provider_tld com -%global project chaseadamsio -%global repo goorgeous # https://github.com/chaseadamsio/goorgeous -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit e0b2cd6d4e7abdf9a33f017bcc97df2242e05572 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: golang-%{provider}-%{project}-%{repo} +%global goipath github.com/chaseadamsio/goorgeous Version: 2.0.0 -Release: 5%{dist} -Summary: Org to HTML Parser written in Go -License: MIT -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz - -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +%gometa +Name: %{goname} +Release: 6%{?dist} +Summary: Org to HTML Parser written in Go +License: MIT +URL: %{gourl} +Source0: %{gosource} %description The purpose of this package is to come as close as possible as parsing an *.org document into HTML, the same way one might publish with org-publish-html from Emacs. -%if 0%{?with_devel} + %package devel Summary: %{summary} BuildArch: noarch -%if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/russross/blackfriday) BuildRequires: golang(github.com/shurcooL/sanitized_anchor_name) -%endif - -Requires: golang(github.com/russross/blackfriday) -Requires: golang(github.com/shurcooL/sanitized_anchor_name) - -Provides: golang(%{import_path}) = %{version}-%{release} %description devel %{summary} -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%if 0%{?with_check} && ! 0%{?with_bundled} -%endif - - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif +This package contains library source intended for building other packages +which use import path with %{goipath} prefix. %prep -%setup -q -n %{repo}-%{commit} +%forgeautosetup -p1 + # Blackfriday removed the footnotes features. # We need to remove such feature from goorgeous upstream as well # Until then, we skip this feature test sed -i '431s/Errorf/Skipf/' goorgeous_test.go -%build -%install -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . $ -iname "*.go" -or -iname "*.s" $ \! -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -# install data used for tests -cp -pav ./testdata %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%{gopath}/src/%%{import_path}/testdata" >> unit-test-devel.file-list - -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif - -%check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -# No dependency directories so far -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%endif - -%if ! 0%{?gotest:1} -%global gotest go test -%endif +%install +%goinstall -%gotest %{import_path} -%endif -#define license tag if not already defined -%{!?_licensedir:%global license %doc} +%check +%gochecks -%if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%endif %changelog +* Tue Feb 26 2019 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 2.0.0-6 +- Rewrite spec using new template + * Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -206,4 +89,3 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath} * Sat Feb 25 2017 Athos Ribeiro <athoscr(a)fedoraproject.org> - 0-0.1.git054aba6 - Initial package - diff --git a/sources b/sources index 7c9ed81..5982705 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (goorgeous-e0b2cd6.tar.gz) = d5c39c4f6bcfb250f7b98f60042f3c23a7151a5bfb79528379d554028f92b5412911ef9497cb1fd4f74f75c2fc77aa7f65a42ae1dd353b8a9d2f57909c63257f +SHA512 (goorgeous-2.0.0.tar.gz) = 94b9c76b70a26bba520b7f0e800591bbc377408f397e2a9c42a3b3b4b0d6f984e69070b7a2421a1bbba56ef47cb152b8acfd975e8cfea210f9e40b15ef476607

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes February 2019