Architecture specific change in rpms/protobuf.git
by githook-noreply＠fedoraproject.org
The package rpms/protobuf.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/protobuf.git/commit/?id=fdc7a9390....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit fdc7a9390dd26edabc74257e4d85fedccf8350b2
Author: Orion Poplawski <orion(a)nwra.com>
Date: Thu Feb 28 07:58:58 2019 -0700
Update googletest to 1.8.1 to re-enable tests
diff --git a/.gitignore b/.gitignore
index de34522..b65267c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ protobuf-2.3.0.tar.bz2
/protobuf-3.4.1.tar.gz
/protobuf-3.5.0.tar.gz
/protobuf-3.6.1-all.tar.gz
+/googletest-1.8.1.tar.gz
diff --git a/protobuf.spec b/protobuf.spec
index 58fbb69..d1e2f6c 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -12,15 +12,14 @@
Summary: Protocol Buffers - Google's data interchange format
Name: protobuf
Version: 3.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
URL: https://github.com/protocolbuffers/protobuf
Source: https://github.com/protocolbuffers/protobuf/archive/v%{version}%{?rcver}/...
Source1: ftdetect-proto.vim
Source2: protobuf-init.el
# For tests
-Source3: https://github.com/google/googlemock/archive/release-1.7.0.tar.gz#/google...
-Source4: https://github.com/google/googletest/archive/release-1.7.0.tar.gz#/google...
+Source3: https://github.com/google/googletest/archive/release-1.8.1.tar.gz#/google...
BuildRequires: autoconf
BuildRequires: automake
@@ -214,10 +213,9 @@ Protocol Buffer Parent POM.
%endif
%prep
-%setup -q -n %{name}-%{version}%{?rcver} -a 3 -a 4
+%setup -q -n %{name}-%{version}%{?rcver} -a 3
%autopatch -p1
-mv googlemock-release-1.7.0 gmock
-mv googletest-release-1.7.0 gmock/gtest
+mv googletest-release-1.8.1/* third_party/googletest/
find -name \*.cc -o -name \*.h | xargs chmod -x
chmod 644 examples/*
%if %{with java}
@@ -250,7 +248,7 @@ export PTHREAD_LIBS="-lpthread"
./autogen.sh
%configure
-make %{?_smp_mflags}
+%make_build
%if %{with python}
pushd python
@@ -266,9 +264,13 @@ popd
emacs -batch -f batch-byte-compile editors/protobuf-mode.el
%check
-# TODO: failures; get them fixed and remove || :
-# https://github.com/google/protobuf/issues/631
-make %{?_smp_mflags} check || :
+# Java tests fail on s390x
+%ifarch s390x
+fail=0
+%else
+fail=1
+%endif
+make %{?_smp_mflags} check || exit $fail
%install
make %{?_smp_mflags} install DESTDIR=%{buildroot} STRIPBINARIES=no INSTALL="%{__install} -p" CPPROG="cp -p"
@@ -378,6 +380,9 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
%endif
%changelog
+* Wed Feb 27 2019 Orion Poplawski <orion(a)nwra.com> - 3.6.1-3
+- Update googletest to 1.8.1 to re-enable tests
+
* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index c2af151..5714cc7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
SHA512 (protobuf-3.6.1-all.tar.gz) = 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-SHA512 (googlemock-1.7.0.tar.gz) = adf33728dde55d95e1c65c38a10b0578dd63a44e6beeb550dc976dc134f83a3af8096094ae2258f16cd5bebe2326f344db8981f11088bac3ffe04b384d9d2f2d
-SHA512 (googletest-1.7.0.tar.gz) = c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc
+SHA512 (googletest-1.8.1.tar.gz) = e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
4 years, 9 months
Architecture specific change in rpms/delve.git
by githook-noreply＠fedoraproject.org
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=39cfa248f89a...
https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=8ec56186bf07...
https://src.fedoraproject.org/cgit/rpms/delve.git/commit/?id=baf961b7b960....
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)
4 years, 9 months
Architecture specific change in rpms/protobuf.git
by githook-noreply＠fedoraproject.org
The package rpms/protobuf.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/protobuf.git/commit/?id=fdc7a9390....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit fdc7a9390dd26edabc74257e4d85fedccf8350b2
Author: Orion Poplawski <orion(a)nwra.com>
Date: Thu Feb 28 07:58:58 2019 -0700
Update googletest to 1.8.1 to re-enable tests
diff --git a/.gitignore b/.gitignore
index de34522..b65267c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ protobuf-2.3.0.tar.bz2
/protobuf-3.4.1.tar.gz
/protobuf-3.5.0.tar.gz
/protobuf-3.6.1-all.tar.gz
+/googletest-1.8.1.tar.gz
diff --git a/protobuf.spec b/protobuf.spec
index 58fbb69..d1e2f6c 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -12,15 +12,14 @@
Summary: Protocol Buffers - Google's data interchange format
Name: protobuf
Version: 3.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: BSD
URL: https://github.com/protocolbuffers/protobuf
Source: https://github.com/protocolbuffers/protobuf/archive/v%{version}%{?rcver}/...
Source1: ftdetect-proto.vim
Source2: protobuf-init.el
# For tests
-Source3: https://github.com/google/googlemock/archive/release-1.7.0.tar.gz#/google...
-Source4: https://github.com/google/googletest/archive/release-1.7.0.tar.gz#/google...
+Source3: https://github.com/google/googletest/archive/release-1.8.1.tar.gz#/google...
BuildRequires: autoconf
BuildRequires: automake
@@ -214,10 +213,9 @@ Protocol Buffer Parent POM.
%endif
%prep
-%setup -q -n %{name}-%{version}%{?rcver} -a 3 -a 4
+%setup -q -n %{name}-%{version}%{?rcver} -a 3
%autopatch -p1
-mv googlemock-release-1.7.0 gmock
-mv googletest-release-1.7.0 gmock/gtest
+mv googletest-release-1.8.1/* third_party/googletest/
find -name \*.cc -o -name \*.h | xargs chmod -x
chmod 644 examples/*
%if %{with java}
@@ -250,7 +248,7 @@ export PTHREAD_LIBS="-lpthread"
./autogen.sh
%configure
-make %{?_smp_mflags}
+%make_build
%if %{with python}
pushd python
@@ -266,9 +264,13 @@ popd
emacs -batch -f batch-byte-compile editors/protobuf-mode.el
%check
-# TODO: failures; get them fixed and remove || :
-# https://github.com/google/protobuf/issues/631
-make %{?_smp_mflags} check || :
+# Java tests fail on s390x
+%ifarch s390x
+fail=0
+%else
+fail=1
+%endif
+make %{?_smp_mflags} check || exit $fail
%install
make %{?_smp_mflags} install DESTDIR=%{buildroot} STRIPBINARIES=no INSTALL="%{__install} -p" CPPROG="cp -p"
@@ -378,6 +380,9 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
%endif
%changelog
+* Wed Feb 27 2019 Orion Poplawski <orion(a)nwra.com> - 3.6.1-3
+- Update googletest to 1.8.1 to re-enable tests
+
* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index c2af151..5714cc7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
SHA512 (protobuf-3.6.1-all.tar.gz) = 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-SHA512 (googlemock-1.7.0.tar.gz) = adf33728dde55d95e1c65c38a10b0578dd63a44e6beeb550dc976dc134f83a3af8096094ae2258f16cd5bebe2326f344db8981f11088bac3ffe04b384d9d2f2d
-SHA512 (googletest-1.7.0.tar.gz) = c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc
+SHA512 (googletest-1.8.1.tar.gz) = e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
4 years, 9 months
Architecture specific change in rpms/smc-tools.git
by githook-noreply＠fedoraproject.org
The package rpms/smc-tools.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/smc-tools.git/commit/?id=ba80c5e2....
Change:
+%ifarch s390 s390x
Thanks.
Full change:
============
commit ba80c5e2f6f7d591281939f27c2ae1ae614817ad
Author: Dan Hork <dan(a)danny.cz>
Date: Thu Feb 28 12:07:58 2019 +0100
- update to 1.2.0
diff --git a/.gitignore b/.gitignore
index e58e962..7192fba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/smc-tools-1.0.0.tar.gz
/smc-tools-1.1.0.tar.gz
+/smc-tools-1.2.0.tar.gz
diff --git a/smc-tools-1.2.0-s390.patch b/smc-tools-1.2.0-s390.patch
new file mode 100644
index 0000000..4092114
--- /dev/null
+++ b/smc-tools-1.2.0-s390.patch
@@ -0,0 +1,15 @@
+diff -up smc-tools-1.2.0/Makefile.s390 smc-tools-1.2.0/Makefile
+--- smc-tools-1.2.0/Makefile.s390 2019-02-28 11:59:47.600106195 +0100
++++ smc-tools-1.2.0/Makefile 2019-02-28 11:59:58.758701108 +0100
+@@ -129,10 +129,10 @@ endif
+ install $(INSTALL_FLAGS_BIN) smc_dbg $(DESTDIR)$(BINDIR)
+ ifeq ($(shell uname -m | cut -c1-4),s390)
+ install $(INSTALL_FLAGS_BIN) smc_rnics $(DESTDIR)$(BINDIR)
++ install $(INSTALL_FLAGS_MAN) smc_rnics.8 $(DESTDIR)$(MANDIR)/man8
+ endif
+ install $(INSTALL_FLAGS_MAN) af_smc.7 $(DESTDIR)$(MANDIR)/man7
+ install $(INSTALL_FLAGS_MAN) smc_run.8 $(DESTDIR)$(MANDIR)/man8
+- install $(INSTALL_FLAGS_MAN) smc_rnics.8 $(DESTDIR)$(MANDIR)/man8
+ install $(INSTALL_FLAGS_MAN) smc_pnet.8 $(DESTDIR)$(MANDIR)/man8
+ install $(INSTALL_FLAGS_MAN) smcss.8 $(DESTDIR)$(MANDIR)/man8
+
diff --git a/smc-tools.spec b/smc-tools.spec
index ba89355..6e43ff9 100644
--- a/smc-tools.spec
+++ b/smc-tools.spec
@@ -1,11 +1,12 @@
Name: smc-tools
-Version: 1.1.0
-Release: 3%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
Summary: Shared Memory Communication Tools
License: EPL
URL: https://www.ibm.com/developerworks/linux/linux390/smc-tools.html
Source0: https://public.dhe.ibm.com/software/dw/linux390/ht_src/%{name}-%{version}...
+Patch0: %{name}-1.2.0-s390.patch
BuildRequires: gcc
BuildRequires: libnl3-devel
@@ -30,6 +31,7 @@ sockets in Linux.
%files
%license LICENSE
%doc README.smctools
+%{_bindir}/smc_dbg
%{_bindir}/smc_pnet
%{_bindir}/smc_run
%{_bindir}/smcss
@@ -38,9 +40,16 @@ sockets in Linux.
%{_mandir}/man8/smc_pnet.8*
%{_mandir}/man8/smc_run.8*
%{_mandir}/man8/smcss.8*
+%ifarch s390 s390x
+%{_bindir}/smc_rnics
+%{_mandir}/man8/smc_rnics.8*
+%endif
%changelog
+* Thu Feb 28 2019 Dan Hork <dan(a)danny.cz> - 1.2.0-1
+- update to 1.2.0
+
* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index d9ee8d5..3fbc429 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (smc-tools-1.1.0.tar.gz) = 6d57ca54d5bbdc9b691cd1f907f53624168a33f80c843bfaf170010bbd2d157d84c451f6a01478446bbe261a12f9f7d22c0daab0a865b7a39d2984359ebe4fa2
+SHA512 (smc-tools-1.2.0.tar.gz) = 6afb2c5f51cd9a826f1c5aeee8a41f5e59d8b6db0b7ee4c01ad630d9fe3b81c55dab33a4c8600252d5a97927a3e123100cabb27cb09a09c0baf50a9199210b2f
4 years, 9 months
Architecture specific change in rpms/smc-tools.git
by githook-noreply＠fedoraproject.org
The package rpms/smc-tools.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/smc-tools.git/commit/?id=ba80c5e2....
Change:
+%ifarch s390 s390x
Thanks.
Full change:
============
commit ba80c5e2f6f7d591281939f27c2ae1ae614817ad
Author: Dan Hork <dan(a)danny.cz>
Date: Thu Feb 28 12:07:58 2019 +0100
- update to 1.2.0
diff --git a/.gitignore b/.gitignore
index e58e962..7192fba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/smc-tools-1.0.0.tar.gz
/smc-tools-1.1.0.tar.gz
+/smc-tools-1.2.0.tar.gz
diff --git a/smc-tools-1.2.0-s390.patch b/smc-tools-1.2.0-s390.patch
new file mode 100644
index 0000000..4092114
--- /dev/null
+++ b/smc-tools-1.2.0-s390.patch
@@ -0,0 +1,15 @@
+diff -up smc-tools-1.2.0/Makefile.s390 smc-tools-1.2.0/Makefile
+--- smc-tools-1.2.0/Makefile.s390 2019-02-28 11:59:47.600106195 +0100
++++ smc-tools-1.2.0/Makefile 2019-02-28 11:59:58.758701108 +0100
+@@ -129,10 +129,10 @@ endif
+ install $(INSTALL_FLAGS_BIN) smc_dbg $(DESTDIR)$(BINDIR)
+ ifeq ($(shell uname -m | cut -c1-4),s390)
+ install $(INSTALL_FLAGS_BIN) smc_rnics $(DESTDIR)$(BINDIR)
++ install $(INSTALL_FLAGS_MAN) smc_rnics.8 $(DESTDIR)$(MANDIR)/man8
+ endif
+ install $(INSTALL_FLAGS_MAN) af_smc.7 $(DESTDIR)$(MANDIR)/man7
+ install $(INSTALL_FLAGS_MAN) smc_run.8 $(DESTDIR)$(MANDIR)/man8
+- install $(INSTALL_FLAGS_MAN) smc_rnics.8 $(DESTDIR)$(MANDIR)/man8
+ install $(INSTALL_FLAGS_MAN) smc_pnet.8 $(DESTDIR)$(MANDIR)/man8
+ install $(INSTALL_FLAGS_MAN) smcss.8 $(DESTDIR)$(MANDIR)/man8
+
diff --git a/smc-tools.spec b/smc-tools.spec
index ba89355..6e43ff9 100644
--- a/smc-tools.spec
+++ b/smc-tools.spec
@@ -1,11 +1,12 @@
Name: smc-tools
-Version: 1.1.0
-Release: 3%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
Summary: Shared Memory Communication Tools
License: EPL
URL: https://www.ibm.com/developerworks/linux/linux390/smc-tools.html
Source0: https://public.dhe.ibm.com/software/dw/linux390/ht_src/%{name}-%{version}...
+Patch0: %{name}-1.2.0-s390.patch
BuildRequires: gcc
BuildRequires: libnl3-devel
@@ -30,6 +31,7 @@ sockets in Linux.
%files
%license LICENSE
%doc README.smctools
+%{_bindir}/smc_dbg
%{_bindir}/smc_pnet
%{_bindir}/smc_run
%{_bindir}/smcss
@@ -38,9 +40,16 @@ sockets in Linux.
%{_mandir}/man8/smc_pnet.8*
%{_mandir}/man8/smc_run.8*
%{_mandir}/man8/smcss.8*
+%ifarch s390 s390x
+%{_bindir}/smc_rnics
+%{_mandir}/man8/smc_rnics.8*
+%endif
%changelog
+* Thu Feb 28 2019 Dan Hork <dan(a)danny.cz> - 1.2.0-1
+- update to 1.2.0
+
* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index d9ee8d5..3fbc429 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (smc-tools-1.1.0.tar.gz) = 6d57ca54d5bbdc9b691cd1f907f53624168a33f80c843bfaf170010bbd2d157d84c451f6a01478446bbe261a12f9f7d22c0daab0a865b7a39d2984359ebe4fa2
+SHA512 (smc-tools-1.2.0.tar.gz) = 6afb2c5f51cd9a826f1c5aeee8a41f5e59d8b6db0b7ee4c01ad630d9fe3b81c55dab33a4c8600252d5a97927a3e123100cabb27cb09a09c0baf50a9199210b2f
4 years, 9 months
Architecture specific change in rpms/cryptopp.git
by githook-noreply＠fedoraproject.org
The package rpms/cryptopp.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/cryptopp.git/commit/?id=28b77aff4....
Change:
-%ifarch %{power64}
Thanks.
Full change:
============
commit 3d505628635716daff68c17c8244d24d5f473f8f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 28 11:37:35 2019 +0100
Update changelog
diff --git a/cryptopp.spec b/cryptopp.spec
index 62159e7..52f18ab 100644
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -1,6 +1,6 @@
Name: cryptopp
Version: 8.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: C++ class library of cryptographic schemes
License: Boost
URL: http://www.cryptopp.com/
@@ -115,6 +115,11 @@ mv $RPM_BUILD_ROOT%{_bindir}/cryptest.exe \
%{_datadir}/%{name}
%changelog
+* Thu Feb 28 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 8.1.0-2
+- Improve how to set our flags
+- Remove ppc fixup
+- Backport patch to fix build
+
* Tue Feb 26 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 8.1.0-1
- Update to 8.1.0
commit 6af439d29aa670d55302aef1e2bfec70247e2188
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 28 11:36:20 2019 +0100
Improve how to set our flags
diff --git a/cryptopp.spec b/cryptopp.spec
index d1111d1..62159e7 100644
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -65,9 +65,9 @@ perl -pi -e 's/\r$//g' License.txt Readme.txt
./rdrand-nasm.sh
%endif
+%{set_build_flags}
%make_build -f GNUmakefile \
- CXXFLAGS="-DNDEBUG %{optflags} -fPIC -DPIC" \
- LDFLAGS="%{?__global_ldflags}" \
+ ZOPT='' \
shared cryptest.exe
doxygen
commit 28b77aff48ded5262e85e986887135c257cfa829
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 28 08:44:06 2019 +0100
Remove ppc fixup
diff --git a/cryptopp.spec b/cryptopp.spec
index c3bd79c..d1111d1 100644
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -59,11 +59,6 @@ This package contains programs for manipulating %{name} routines.
%autosetup -c -p1
perl -pi -e 's/\r$//g' License.txt Readme.txt
-# Prevent an error at aria-simd.cpp compile:
-# type_traits:347:39: error: '__float128' was not declared in this scope
-%ifarch %{power64}
-sed -i -e 's/-mcpu=power4//g' GNUmakefile
-%endif
%build
%ifarch i686 x86_64
commit 000b59d6171d4ff84dae7076a78f152ed33da23c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 28 08:43:36 2019 +0100
Backport patch to fix build
diff --git a/Remove-early-NEON-qualification-tests-from-Makefile-.patch b/Remove-early-NEON-qualification-tests-from-Makefile-.patch
new file mode 100644
index 0000000..6eed6e7
--- /dev/null
+++ b/Remove-early-NEON-qualification-tests-from-Makefile-.patch
@@ -0,0 +1,78 @@
+From 84ab1f3c66a579e317c9da440b347c6a47858a2e Mon Sep 17 00:00:00 2001
+From: Jeffrey Walton <noloader(a)gmail.com>
+Date: Wed, 27 Feb 2019 19:35:04 -0500
+Subject: [PATCH] Remove early NEON qualification tests from Makefile (GH #812,
+ GH #813)
+
+The makefile tries to pre-qualify NEON (for lack of a better term), and sets IS_NEON accordingly. If IS_NEON=1, then we go on to perform test compiles to see if -mfloat-abi=X -mfpu=neon (and friends) actually work. Effectively we are performing a test to see if we should perform another test.
+
+The IS_NEON flag predates our compile time feature tests. It was kind of helpful when we were trying to sort out if a platform and compiler options supported NEON without a compile test. That was an absolute mess and we quickly learned we needed a real compile time feature test (which we now have).
+
+Additionally, Debian and Fedora ARMEL builds are failing because we are misdetecting NEON availability. It looks like we fail to set IS_NEON properly, so we never get into the code paths that set either (1) -mfloat-abi=X -mfpu=neon or (2) -DCRYPTOPP_DISABLE_NEON or -DCRYPTOPP_DISABLE_ASM. Later, the makefile builds a *_simd.cpp and the result is an error that NEON needs to be activated (or disabled).
+
+This commit removes IS_NEON so we immediately move to compile time feature tests.
+---
+ GNUmakefile | 10 ++++------
+ GNUmakefile-cross | 2 +-
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 12b2edf5..f0dc5441 100755
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -53,8 +53,6 @@ IS_SPARC64 := $(shell echo "$(HOSTX)" | $(GREP) -i -c -E 'sun|sparc64')
+ IS_ARM32 := $(shell echo "$(HOSTX)" | $(GREP) -i -c -E 'arm|armhf|arm7l|eabihf')
+ IS_ARMV8 := $(shell echo "$(HOSTX)" | $(GREP) -i -c -E 'aarch32|aarch64|arm64|armv8')
+
+-IS_NEON := $(shell $(CXX) $(CXXFLAGS) -dumpmachine 2>/dev/null | $(GREP) -i -c -E 'armv7|armhf|arm7l|eabihf|armv8|aarch32|aarch64')
+-
+ # Attempt to determine platform
+ SYSTEMX := $(shell $(CXX) $(CXXFLAGS) -dumpmachine 2>/dev/null)
+ ifeq ($(SYSTEMX),)
+@@ -439,10 +437,10 @@ endif
+ ##### ARM A-32, Aach64 and NEON #####
+ ###########################################################
+
+-ifneq ($(IS_ARM32)$(IS_ARMV8)$(IS_NEON),000)
++ifneq ($(IS_ARM32)$(IS_ARMV8),00)
+ ifeq ($(DETECT_FEATURES),1)
+
+-ifeq ($(IS_ARM32)$(IS_NEON),11)
++ifneq ($(IS_ARM32),0)
+
+ TPROG = TestPrograms/test_arm_neon.cxx
+ TOPT = -march=armv7-a -mfloat-abi=$(FP_ABI) -mfpu=neon
+@@ -469,7 +467,7 @@ ifeq ($(IS_ARM32)$(IS_NEON),11)
+ CXXFLAGS += -DCRYPTOPP_DISABLE_ASM
+ endif
+
+-# IS_NEON
++# IS_ARM32
+ endif
+
+ ifeq ($(IS_ARMV8),1)
+@@ -567,7 +565,7 @@ endif
+ # DETECT_FEATURES
+ endif
+
+-# IS_ARM32, IS_ARMV8, IS_NEON
++# IS_ARM32, IS_ARMV8
+ endif
+
+ ###########################################################
+diff --git a/GNUmakefile-cross b/GNUmakefile-cross
+index c308c123..664a8447 100755
+--- a/GNUmakefile-cross
++++ b/GNUmakefile-cross
+@@ -384,7 +384,7 @@ ifeq ($(IS_ARM32),1)
+ SM4_FLAG = $(NEON_FLAG)
+ else
+ NEON_FLAG =
+- CXXFLAGS += -DCRYPTOPP_DISABLE_NEON
++ CXXFLAGS += -DCRYPTOPP_DISABLE_ASM
+ endif
+
+ # IS_NEON
+--
+2.17.2
+
diff --git a/cryptopp.spec b/cryptopp.spec
index e19c6dc..c3bd79c 100644
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -6,6 +6,7 @@ License: Boost
URL: http://www.cryptopp.com/
Source0: http://www.cryptopp.com/cryptopp810.zip
Source1: cryptopp.pc
+Patch0: Remove-early-NEON-qualification-tests-from-Makefile-.patch
BuildRequires: doxygen
BuildRequires: gcc-c++
commit 1eb048119291edad8eba35adb19a7e85a1d3ffcd
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Feb 26 16:38:13 2019 +0100
Update source
diff --git a/sources b/sources
index 4e3c805..30321d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cryptopp800.zip) = f4b14619d0b451a7d06881c39165a09a0e214912ef00292219d7274e878d0965832a5285277e8937257d9b1c8564033c63e552c9813b048da73817d5902d4035
+SHA512 (cryptopp810.zip) = 750da21eab5afe47b00196d874e242556561740d9108b562080dec6184142db039c709fec27ac4058bdcb69a1bbe973ed9fb95bde18db767ad14dfa9ca29dc36
commit 1ac1795da609972a0e18d2a22b6acf9e84b9c23b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Feb 26 16:31:55 2019 +0100
Update to 8.1.0
diff --git a/cryptopp.spec b/cryptopp.spec
index 09e53c6..e19c6dc 100644
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -1,10 +1,10 @@
Name: cryptopp
-Version: 8.0.0
+Version: 8.1.0
Release: 1%{?dist}
Summary: C++ class library of cryptographic schemes
License: Boost
URL: http://www.cryptopp.com/
-Source0: http://www.cryptopp.com/cryptopp800.zip
+Source0: http://www.cryptopp.com/cryptopp810.zip
Source1: cryptopp.pc
BuildRequires: doxygen
@@ -119,6 +119,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/cryptest.exe \
%{_datadir}/%{name}
%changelog
+* Tue Feb 26 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 8.1.0-1
+- Update to 8.1.0
+
* Thu Feb 14 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 8.0.0-1
- Update to 8.0.0
4 years, 9 months
Architecture specific change in rpms/cryptopp.git
by githook-noreply＠fedoraproject.org
The package rpms/cryptopp.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/cryptopp.git/commit/?id=28b77aff4....
Change:
-%ifarch %{power64}
Thanks.
Full change:
============
commit 3d505628635716daff68c17c8244d24d5f473f8f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 28 11:37:35 2019 +0100
Update changelog
diff --git a/cryptopp.spec b/cryptopp.spec
index 62159e7..52f18ab 100644
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -1,6 +1,6 @@
Name: cryptopp
Version: 8.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: C++ class library of cryptographic schemes
License: Boost
URL: http://www.cryptopp.com/
@@ -115,6 +115,11 @@ mv $RPM_BUILD_ROOT%{_bindir}/cryptest.exe \
%{_datadir}/%{name}
%changelog
+* Thu Feb 28 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 8.1.0-2
+- Improve how to set our flags
+- Remove ppc fixup
+- Backport patch to fix build
+
* Tue Feb 26 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 8.1.0-1
- Update to 8.1.0
commit 6af439d29aa670d55302aef1e2bfec70247e2188
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 28 11:36:20 2019 +0100
Improve how to set our flags
diff --git a/cryptopp.spec b/cryptopp.spec
index d1111d1..62159e7 100644
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -65,9 +65,9 @@ perl -pi -e 's/\r$//g' License.txt Readme.txt
./rdrand-nasm.sh
%endif
+%{set_build_flags}
%make_build -f GNUmakefile \
- CXXFLAGS="-DNDEBUG %{optflags} -fPIC -DPIC" \
- LDFLAGS="%{?__global_ldflags}" \
+ ZOPT='' \
shared cryptest.exe
doxygen
commit 28b77aff48ded5262e85e986887135c257cfa829
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 28 08:44:06 2019 +0100
Remove ppc fixup
diff --git a/cryptopp.spec b/cryptopp.spec
index c3bd79c..d1111d1 100644
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -59,11 +59,6 @@ This package contains programs for manipulating %{name} routines.
%autosetup -c -p1
perl -pi -e 's/\r$//g' License.txt Readme.txt
-# Prevent an error at aria-simd.cpp compile:
-# type_traits:347:39: error: '__float128' was not declared in this scope
-%ifarch %{power64}
-sed -i -e 's/-mcpu=power4//g' GNUmakefile
-%endif
%build
%ifarch i686 x86_64
commit 000b59d6171d4ff84dae7076a78f152ed33da23c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 28 08:43:36 2019 +0100
Backport patch to fix build
diff --git a/Remove-early-NEON-qualification-tests-from-Makefile-.patch b/Remove-early-NEON-qualification-tests-from-Makefile-.patch
new file mode 100644
index 0000000..6eed6e7
--- /dev/null
+++ b/Remove-early-NEON-qualification-tests-from-Makefile-.patch
@@ -0,0 +1,78 @@
+From 84ab1f3c66a579e317c9da440b347c6a47858a2e Mon Sep 17 00:00:00 2001
+From: Jeffrey Walton <noloader(a)gmail.com>
+Date: Wed, 27 Feb 2019 19:35:04 -0500
+Subject: [PATCH] Remove early NEON qualification tests from Makefile (GH #812,
+ GH #813)
+
+The makefile tries to pre-qualify NEON (for lack of a better term), and sets IS_NEON accordingly. If IS_NEON=1, then we go on to perform test compiles to see if -mfloat-abi=X -mfpu=neon (and friends) actually work. Effectively we are performing a test to see if we should perform another test.
+
+The IS_NEON flag predates our compile time feature tests. It was kind of helpful when we were trying to sort out if a platform and compiler options supported NEON without a compile test. That was an absolute mess and we quickly learned we needed a real compile time feature test (which we now have).
+
+Additionally, Debian and Fedora ARMEL builds are failing because we are misdetecting NEON availability. It looks like we fail to set IS_NEON properly, so we never get into the code paths that set either (1) -mfloat-abi=X -mfpu=neon or (2) -DCRYPTOPP_DISABLE_NEON or -DCRYPTOPP_DISABLE_ASM. Later, the makefile builds a *_simd.cpp and the result is an error that NEON needs to be activated (or disabled).
+
+This commit removes IS_NEON so we immediately move to compile time feature tests.
+---
+ GNUmakefile | 10 ++++------
+ GNUmakefile-cross | 2 +-
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 12b2edf5..f0dc5441 100755
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -53,8 +53,6 @@ IS_SPARC64 := $(shell echo "$(HOSTX)" | $(GREP) -i -c -E 'sun|sparc64')
+ IS_ARM32 := $(shell echo "$(HOSTX)" | $(GREP) -i -c -E 'arm|armhf|arm7l|eabihf')
+ IS_ARMV8 := $(shell echo "$(HOSTX)" | $(GREP) -i -c -E 'aarch32|aarch64|arm64|armv8')
+
+-IS_NEON := $(shell $(CXX) $(CXXFLAGS) -dumpmachine 2>/dev/null | $(GREP) -i -c -E 'armv7|armhf|arm7l|eabihf|armv8|aarch32|aarch64')
+-
+ # Attempt to determine platform
+ SYSTEMX := $(shell $(CXX) $(CXXFLAGS) -dumpmachine 2>/dev/null)
+ ifeq ($(SYSTEMX),)
+@@ -439,10 +437,10 @@ endif
+ ##### ARM A-32, Aach64 and NEON #####
+ ###########################################################
+
+-ifneq ($(IS_ARM32)$(IS_ARMV8)$(IS_NEON),000)
++ifneq ($(IS_ARM32)$(IS_ARMV8),00)
+ ifeq ($(DETECT_FEATURES),1)
+
+-ifeq ($(IS_ARM32)$(IS_NEON),11)
++ifneq ($(IS_ARM32),0)
+
+ TPROG = TestPrograms/test_arm_neon.cxx
+ TOPT = -march=armv7-a -mfloat-abi=$(FP_ABI) -mfpu=neon
+@@ -469,7 +467,7 @@ ifeq ($(IS_ARM32)$(IS_NEON),11)
+ CXXFLAGS += -DCRYPTOPP_DISABLE_ASM
+ endif
+
+-# IS_NEON
++# IS_ARM32
+ endif
+
+ ifeq ($(IS_ARMV8),1)
+@@ -567,7 +565,7 @@ endif
+ # DETECT_FEATURES
+ endif
+
+-# IS_ARM32, IS_ARMV8, IS_NEON
++# IS_ARM32, IS_ARMV8
+ endif
+
+ ###########################################################
+diff --git a/GNUmakefile-cross b/GNUmakefile-cross
+index c308c123..664a8447 100755
+--- a/GNUmakefile-cross
++++ b/GNUmakefile-cross
+@@ -384,7 +384,7 @@ ifeq ($(IS_ARM32),1)
+ SM4_FLAG = $(NEON_FLAG)
+ else
+ NEON_FLAG =
+- CXXFLAGS += -DCRYPTOPP_DISABLE_NEON
++ CXXFLAGS += -DCRYPTOPP_DISABLE_ASM
+ endif
+
+ # IS_NEON
+--
+2.17.2
+
diff --git a/cryptopp.spec b/cryptopp.spec
index e19c6dc..c3bd79c 100644
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -6,6 +6,7 @@ License: Boost
URL: http://www.cryptopp.com/
Source0: http://www.cryptopp.com/cryptopp810.zip
Source1: cryptopp.pc
+Patch0: Remove-early-NEON-qualification-tests-from-Makefile-.patch
BuildRequires: doxygen
BuildRequires: gcc-c++
4 years, 9 months
Architecture specific change in rpms/ceph.git
by githook-noreply＠fedoraproject.org
The package rpms/ceph.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/ceph.git/commit/?id=fa25767214fd8....
Change:
-%ifarch x86_64
Thanks.
Full change:
============
commit fa25767214fd86e46e4e5771b798457225f11e0b
Author: Boris Ranto <branto(a)redhat.com>
Date: Thu Feb 28 09:01:04 2019 +0100
Package libceph_crypto_* on all platforms
diff --git a/ceph.spec b/ceph.spec
index f840eaf..0b82750 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -1238,10 +1238,8 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
%dir %{_libdir}/ceph/compressor
%{_libdir}/ceph/compressor/libceph_*.so*
%{_unitdir}/ceph-crash.service
-%ifarch x86_64
%dir %{_libdir}/ceph/crypto
%{_libdir}/ceph/crypto/libceph_*.so*
-%endif
%if %{with lttng}
%{_libdir}/libos_tp.so*
%{_libdir}/libosd_tp.so*
4 years, 9 months
Architecture specific change in rpms/dpkg.git
by githook-noreply＠fedoraproject.org
The package rpms/dpkg.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/dpkg.git/commit/?id=67e96add9beee....
Change:
-ExcludeArch: ppc64
Thanks.
Full change:
============
commit 62a09e09e8902f1ed4f027b544f3e02d707a5668
Author: Srgio M. Basto <sergio(a)serjux.com>
Date: Thu Feb 28 05:46:33 2019 +0000
Requires perl(MIME::Lite) on dpkg-dev (rhbz #1678637)
Adds check section and performs unit tests but ignores failures
diff --git a/dpkg.spec b/dpkg.spec
index 269e379..0e54885 100644
--- a/dpkg.spec
+++ b/dpkg.spec
@@ -3,7 +3,7 @@
Name: dpkg
Version: 1.18.25
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Package maintenance system for Debian Linux
# The entire source code is GPLv2+ with exception of the following
# lib/dpkg/md5.c, lib/dpkg/md5.h - Public domain
@@ -43,6 +43,12 @@ BuildRequires: perl-podlators
%endif
# Needed for --clamp-mtime in dpkg-source -b.
#Requires: tar >= 2:1.28
+# Need by make check
+BuildRequires: perl(Test::More)
+BuildRequires: perl(IPC::Cmd)
+BuildRequires: perl(Digest::SHA)
+BuildRequires: perl(IO::String)
+BuildRequires: fakeroot
Requires(post): coreutils
@@ -79,7 +85,13 @@ at any time, use at your own risk.
%package dev
Summary: Debian package development tools
Requires: dpkg-perl = %{version}-%{release}
-Requires: patch, make, binutils, bzip2, lzma, xz
+Requires: patch
+Requires: make
+Requires: binutils
+Requires: bzip2
+Requires: lzma
+Requires: xz
+Requires: perl(MIME::Lite)
Obsoletes: dpkg-devel < 1.16
BuildArch: noarch
@@ -256,6 +268,10 @@ rm -rf %{buildroot}%{_mandir}/it/man5/
rm -rf %{buildroot}%{_mandir}/pl/man1/
%endif
+%check
+make VERBOSE=1 TESTSUITEFLAGS=--verbose \
+ TEST_PARALLEL=4 check || :
+
%post
# from dpkg.postinst
@@ -464,6 +480,10 @@ create_logfile
%changelog
+* Thu Feb 28 2019 Srgio Basto <sergio(a)serjux.com> - 1.18.25-8
+- Requires perl(MIME::Lite) on dpkg-dev (rhbz #1678637)
+- Adds check section and performs unit tests but ignores failures
+
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.18.25-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 9c69f22389cffad3cfd127b030f3c2ba6e2b573e
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 31 17:33:12 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/dpkg.spec b/dpkg.spec
index 244e7c6..269e379 100644
--- a/dpkg.spec
+++ b/dpkg.spec
@@ -3,7 +3,7 @@
Name: dpkg
Version: 1.18.25
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Package maintenance system for Debian Linux
# The entire source code is GPLv2+ with exception of the following
# lib/dpkg/md5.c, lib/dpkg/md5.h - Public domain
@@ -464,6 +464,9 @@ create_logfile
%changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.18.25-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Wed Jan 23 2019 Srgio Basto <sergio(a)serjux.com> - 1.18.25-6
- po4a is now available on ppc64 and we can build dpkg there
commit 3d2155306695a336e1c64cf569bf3106e4ab7c24
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jan 28 20:17:42 2019 +0100
Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
diff --git a/dpkg.spec b/dpkg.spec
index 07313da..244e7c6 100644
--- a/dpkg.spec
+++ b/dpkg.spec
@@ -5,7 +5,6 @@ Name: dpkg
Version: 1.18.25
Release: 6%{?dist}
Summary: Package maintenance system for Debian Linux
-Group: System Environment/Base
# The entire source code is GPLv2+ with exception of the following
# lib/dpkg/md5.c, lib/dpkg/md5.h - Public domain
# lib/dpkg/showpkg.c, dselect/methods/multicd, lib/dpkg/utils.c, lib/dpkg/showpkg.c - GPLv2
@@ -67,7 +66,6 @@ because packages dependencies will likely be unmet.
%package devel
Summary: Debian package management static library
-Group: Development/System
Provides: dpkg-static = %{version}-%{release}
%description devel
@@ -80,7 +78,6 @@ at any time, use at your own risk.
%package dev
Summary: Debian package development tools
-Group: Development/System
Requires: dpkg-perl = %{version}-%{release}
Requires: patch, make, binutils, bzip2, lzma, xz
Obsoletes: dpkg-devel < 1.16
@@ -95,7 +92,6 @@ for example, most packages need make and the C compiler gcc.
%package perl
Summary: Dpkg perl modules
-Group: System Environment/Base
Requires: dpkg = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: perl-TimeDate
@@ -150,7 +146,6 @@ modules.
%package -n dselect
Summary: Debian package management front-end
-Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
commit 67e96add9beeeae04bdced55b69bc440eaecebfe
Author: Srgio M. Basto <sergio(a)serjux.com>
Date: Wed Jan 23 02:03:10 2019 +0000
po4a is now available on ppc64 and we can build dpkg there
diff --git a/dpkg.spec b/dpkg.spec
index 5683ad8..07313da 100644
--- a/dpkg.spec
+++ b/dpkg.spec
@@ -3,7 +3,7 @@
Name: dpkg
Version: 1.18.25
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Package maintenance system for Debian Linux
Group: System Environment/Base
# The entire source code is GPLv2+ with exception of the following
@@ -47,10 +47,6 @@ BuildRequires: perl-podlators
Requires(post): coreutils
-#https://bugzilla.redhat.com/show_bug.cgi?id=1497544#c5
-%if 0%{?rhel}
-ExcludeArch: ppc64
-%endif
%description
This package provides the low-level infrastructure for handling the
@@ -473,6 +469,9 @@ create_logfile
%changelog
+* Wed Jan 23 2019 Srgio Basto <sergio(a)serjux.com> - 1.18.25-6
+- po4a is now available on ppc64 and we can build dpkg there
+
* Sun Sep 23 2018 Srgio Basto <sergio(a)serjux.com> - 1.18.25-5
- Revert "Bundle a version of tar to make it compatible in EL7"
- Keep BR: perl(Digest)
4 years, 9 months
Architecture specific change in rpms/dpkg.git
by githook-noreply＠fedoraproject.org
The package rpms/dpkg.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/dpkg.git/commit/?id=67e96add9beee....
Change:
-ExcludeArch: ppc64
Thanks.
Full change:
============
commit 62a09e09e8902f1ed4f027b544f3e02d707a5668
Author: Srgio M. Basto <sergio(a)serjux.com>
Date: Thu Feb 28 05:46:33 2019 +0000
Requires perl(MIME::Lite) on dpkg-dev (rhbz #1678637)
Adds check section and performs unit tests but ignores failures
diff --git a/dpkg.spec b/dpkg.spec
index 269e379..0e54885 100644
--- a/dpkg.spec
+++ b/dpkg.spec
@@ -3,7 +3,7 @@
Name: dpkg
Version: 1.18.25
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Package maintenance system for Debian Linux
# The entire source code is GPLv2+ with exception of the following
# lib/dpkg/md5.c, lib/dpkg/md5.h - Public domain
@@ -43,6 +43,12 @@ BuildRequires: perl-podlators
%endif
# Needed for --clamp-mtime in dpkg-source -b.
#Requires: tar >= 2:1.28
+# Need by make check
+BuildRequires: perl(Test::More)
+BuildRequires: perl(IPC::Cmd)
+BuildRequires: perl(Digest::SHA)
+BuildRequires: perl(IO::String)
+BuildRequires: fakeroot
Requires(post): coreutils
@@ -79,7 +85,13 @@ at any time, use at your own risk.
%package dev
Summary: Debian package development tools
Requires: dpkg-perl = %{version}-%{release}
-Requires: patch, make, binutils, bzip2, lzma, xz
+Requires: patch
+Requires: make
+Requires: binutils
+Requires: bzip2
+Requires: lzma
+Requires: xz
+Requires: perl(MIME::Lite)
Obsoletes: dpkg-devel < 1.16
BuildArch: noarch
@@ -256,6 +268,10 @@ rm -rf %{buildroot}%{_mandir}/it/man5/
rm -rf %{buildroot}%{_mandir}/pl/man1/
%endif
+%check
+make VERBOSE=1 TESTSUITEFLAGS=--verbose \
+ TEST_PARALLEL=4 check || :
+
%post
# from dpkg.postinst
@@ -464,6 +480,10 @@ create_logfile
%changelog
+* Thu Feb 28 2019 Srgio Basto <sergio(a)serjux.com> - 1.18.25-8
+- Requires perl(MIME::Lite) on dpkg-dev (rhbz #1678637)
+- Adds check section and performs unit tests but ignores failures
+
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.18.25-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 9c69f22389cffad3cfd127b030f3c2ba6e2b573e
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 31 17:33:12 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/dpkg.spec b/dpkg.spec
index 244e7c6..269e379 100644
--- a/dpkg.spec
+++ b/dpkg.spec
@@ -3,7 +3,7 @@
Name: dpkg
Version: 1.18.25
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Package maintenance system for Debian Linux
# The entire source code is GPLv2+ with exception of the following
# lib/dpkg/md5.c, lib/dpkg/md5.h - Public domain
@@ -464,6 +464,9 @@ create_logfile
%changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.18.25-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Wed Jan 23 2019 Srgio Basto <sergio(a)serjux.com> - 1.18.25-6
- po4a is now available on ppc64 and we can build dpkg there
commit 3d2155306695a336e1c64cf569bf3106e4ab7c24
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jan 28 20:17:42 2019 +0100
Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
diff --git a/dpkg.spec b/dpkg.spec
index 07313da..244e7c6 100644
--- a/dpkg.spec
+++ b/dpkg.spec
@@ -5,7 +5,6 @@ Name: dpkg
Version: 1.18.25
Release: 6%{?dist}
Summary: Package maintenance system for Debian Linux
-Group: System Environment/Base
# The entire source code is GPLv2+ with exception of the following
# lib/dpkg/md5.c, lib/dpkg/md5.h - Public domain
# lib/dpkg/showpkg.c, dselect/methods/multicd, lib/dpkg/utils.c, lib/dpkg/showpkg.c - GPLv2
@@ -67,7 +66,6 @@ because packages dependencies will likely be unmet.
%package devel
Summary: Debian package management static library
-Group: Development/System
Provides: dpkg-static = %{version}-%{release}
%description devel
@@ -80,7 +78,6 @@ at any time, use at your own risk.
%package dev
Summary: Debian package development tools
-Group: Development/System
Requires: dpkg-perl = %{version}-%{release}
Requires: patch, make, binutils, bzip2, lzma, xz
Obsoletes: dpkg-devel < 1.16
@@ -95,7 +92,6 @@ for example, most packages need make and the C compiler gcc.
%package perl
Summary: Dpkg perl modules
-Group: System Environment/Base
Requires: dpkg = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: perl-TimeDate
@@ -150,7 +146,6 @@ modules.
%package -n dselect
Summary: Debian package management front-end
-Group: System Environment/Base
Requires: %{name} = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
commit 67e96add9beeeae04bdced55b69bc440eaecebfe
Author: Srgio M. Basto <sergio(a)serjux.com>
Date: Wed Jan 23 02:03:10 2019 +0000
po4a is now available on ppc64 and we can build dpkg there
diff --git a/dpkg.spec b/dpkg.spec
index 5683ad8..07313da 100644
--- a/dpkg.spec
+++ b/dpkg.spec
@@ -3,7 +3,7 @@
Name: dpkg
Version: 1.18.25
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Package maintenance system for Debian Linux
Group: System Environment/Base
# The entire source code is GPLv2+ with exception of the following
@@ -47,10 +47,6 @@ BuildRequires: perl-podlators
Requires(post): coreutils
-#https://bugzilla.redhat.com/show_bug.cgi?id=1497544#c5
-%if 0%{?rhel}
-ExcludeArch: ppc64
-%endif
%description
This package provides the low-level infrastructure for handling the
@@ -473,6 +469,9 @@ create_logfile
%changelog
+* Wed Jan 23 2019 Srgio Basto <sergio(a)serjux.com> - 1.18.25-6
+- po4a is now available on ppc64 and we can build dpkg there
+
* Sun Sep 23 2018 Srgio Basto <sergio(a)serjux.com> - 1.18.25-5
- Revert "Bundle a version of tar to make it compatible in EL7"
- Keep BR: perl(Digest)
4 years, 9 months