Architecture specific change in rpms/nodejs-istanbul-lib-hook.git
by githook-noreply@fedoraproject.org
The package rpms/nodejs-istanbul-lib-hook.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/nodejs-istanbul-lib-hook.git/comm....
Change:
+ExclusiveArch: %{nodejs_arches} noarch
Thanks.
Full change:
============
commit a05132400a0585612f45f0c442f92df7d42117d5
Author: Jared Smith <jsmith(a)fedoraproject.org>
Date: Wed May 9 10:09:25 2018 -0400
Initial packaging
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..26910c4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/istanbul-lib-hook-1.1.0.tgz
+/istanbul-lib-hook-tests-1.1.0.tar.bz2
diff --git a/README.md b/README.md
deleted file mode 100644
index dc958c0..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# nodejs-istanbul-lib-hook
-
-'Hooks for require, vm and script used in istanbul'
\ No newline at end of file
diff --git a/dl-istanbul-tests.sh b/dl-istanbul-tests.sh
new file mode 100755
index 0000000..67a4df1
--- /dev/null
+++ b/dl-istanbul-tests.sh
@@ -0,0 +1,133 @@
+#!/bin/bash
+
+tag=$(rpmspec -q --qf="%{version}\n" --srpm ./*.spec)
+url=$(rpmspec -q --qf="%{url}\n" --srpm ./*.spec)
+pkgdir=$(rpmspec -q --qf="%{name}" --srpm ./*.spec | sed -e 's/^nodejs-//')
+
+echo "tag: $tag"
+echo "URL: $url"
+echo "pkgdir: $pkgdir"
+
+set -e
+
+tmp=$(mktemp -d)
+
+trap cleanup EXIT
+cleanup() {
+ echo Cleaning up...
+ set +e
+ [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
+}
+
+unset CDPATH
+pwd=$(pwd)
+
+pushd "$tmp"
+git clone https://github.com/istanbuljs/istanbuljs
+newdir=packages/$pkgdir
+cd istanbuljs
+echo Finding git tag
+gittag=$(git show-ref --tags | cut -d' ' -f2 | grep "${pkgdir}@${tag}$" | head -n1 || git show-ref --tags | cut -d' ' -f2 | sort -Vr | head -n1)
+if [ -z $gittag ]; then
+ gittag=tags/$tag
+ echo "Could not find tag $tag, using $gittag instead"
+fi
+echo "Git Tag: $gittag"
+if [ -d "$newdir/test" ]; then
+ git archive --prefix='test/' --format=tar ${gittag}:$newdir/test/ \
+ | bzip2 > "$pwd"/$pkgdir-tests-${tag}.tar.bz2
+elif [ -d "$newdir/tests" ]; then
+ git archive --prefix='tests/' --format=tar ${gittag}:$newdir/tests/ \
+ | bzip2 > "$pwd"/$pkgdir-tests-${tag}.tar.bz2
+elif [ -d "$newdir/spec" ]; then
+ git archive --prefix='spec/' --format=tar ${gittag}:$newdir/spec/ \
+ | bzip2 > "$pwd"/$pkgdir-tests-${tag}.tar.bz2
+else
+ echo "No test directory found for tag ${gittag}"
+fi
+if [ -d "$newdir/support" ]; then
+ git archive --prefix='support/' --format=tar ${gittag}:$newdir/support/ \
+ | bzip2 > "$pwd"/$pkgdir-support-${tag}.tar.bz2
+fi
+if [ -d "$newdir/fixture" ]; then
+ git archive --prefix='fixture/' --format=tar ${gittag}:$newdir/fixture/ \
+ | bzip2 > "$pwd"/$pkgdir-fixture-${tag}.tar.bz2
+fi
+if [ -d "$newdir/examples" ]; then
+ git archive --prefix='examples/' --format=tar ${gittag}:$newdir/examples/ \
+ | bzip2 > "$pwd"/$pkgdir-examples-${tag}.tar.bz2
+elif [ -d "$newdir/example" ]; then
+ git archive --prefix='example/' --format=tar ${gittag}:$newdir/example/ \
+ | bzip2 > "$pwd"/$pkgdir-examples-${tag}.tar.bz2
+fi
+if [ -d "$newdir/tasks" ]; then
+ git archive --prefix='tasks/' --format=tar ${gittag}:$newdir/tasks/ \
+ | bzip2 > "$pwd"/$pkgdir-tasks-${tag}.tar.bz2
+fi
+if [ -d "$newdir/docs" ]; then
+ git archive --prefix='docs/' --format=tar ${gittag}:$newdir/docs/ \
+ | bzip2 > "$pwd"/$pkgdir-docs-${tag}.tar.bz2
+elif [ -d "$newdir/doc" ]; then
+ git archive --prefix='doc/' --format=tar ${gittag}:$newdir/doc/ \
+ | bzip2 > "$pwd"/$pkgdir-docs-${tag}.tar.bz2
+fi
+if [ -d "$newdir/src" ]; then
+ git archive --prefix='src/' --format=tar ${gittag}:$newdir/src/ \
+ | bzip2 > "$pwd"/$pkgdir-src-${tag}.tar.bz2
+elif [ -d "$newdir/source" ]; then
+ git archive --prefix='source/' --format=tar ${gittag}:$newdir/source/ \
+ | bzip2 > "$pwd"/$pkgdir-source-${tag}.tar.bz2
+fi
+if [ -d "$newdir/tools" ]; then
+ git archive --prefix='tools/' --format=tar ${gittag}:$newdir/tools/ \
+ | bzip2 > "$pwd"/$pkgdir-tools-${tag}.tar.bz2
+fi
+if [ -d "$newdir/scripts" ]; then
+ git archive --prefix='scripts/' --format=tar ${gittag}:$newdir/scripts/ \
+ | bzip2 > "$pwd"/$pkgdir-scripts-${tag}.tar.bz2
+fi
+if [ -d "$newdir/modules" ]; then
+ git archive --prefix='modules/' --format=tar ${gittag}:$newdir/modules/ \
+ | bzip2 > "$pwd"/$pkgdir-modules-${tag}.tar.bz2
+fi
+if [ -d "$newdir/ts" ]; then
+ git archive --prefix='ts/' --format=tar ${gittag}:$newdir/ts/ \
+ | bzip2 > "$pwd"/$pkgdir-ts-${tag}.tar.bz2
+fi
+if [ -d "$newdir/build" ]; then
+ git archive --prefix='build/' --format=tar ${gittag}:$newdir/build/ \
+ | bzip2 > "$pwd"/$pkgdir-build-${tag}.tar.bz2
+fi
+if [ -d "$newdir/fixtures" ]; then
+ git archive --prefix='fixtures/' --format=tar ${gittag}:$newdir/fixtures/ \
+ | bzip2 > "$pwd"/$pkgdir-fixtures-${tag}.tar.bz2
+fi
+if [ -d "$newdir/mocks" ]; then
+ git archive --prefix='mocks/' --format=tar ${gittag}:$newdir/mocks/ \
+ | bzip2 > "$pwd"/$pkgdir-mocks-${tag}.tar.bz2
+fi
+if [ -d "$newdir/typings" ]; then
+ git archive --prefix='typings/' --format=tar ${gittag}:$newdir/typings/ \
+ | bzip2 > "$pwd"/$pkgdir-typings-${tag}.tar.bz2
+fi
+if [ -d "$newdir/templates" ]; then
+ git archive --prefix='templates/' --format=tar ${gittag}:$newdir/templates/ \
+ | bzip2 > "$pwd"/$pkgdir-templates-${tag}.tar.bz2
+fi
+if [ -d "$newdir/benchmark" ]; then
+ git archive --prefix='benchmark/' --format=tar ${gittag}:$newdir/benchmark/ \
+ | bzip2 > "$pwd"/$pkgdir-benchmark-${tag}.tar.bz2
+fi
+if [ -d "$newdir/vendor" ]; then
+ git archive --prefix='vendor/' --format=tar ${gittag}:$newdir/vendor/ \
+ | bzip2 > "$pwd"/$pkgdir-vendor-${tag}.tar.bz2
+fi
+if [ -d "$newdir/packages" ]; then
+ git archive --prefix='packages/' --format=tar ${gittag}:$newdir/packages/ \
+ | bzip2 > "$pwd"/$pkgdir-packages-${tag}.tar.bz2
+fi
+if [ -d "$newdir/rollup" ]; then
+ git archive --prefix='rollup/' --format=tar ${gittag}:$newdir/rollup/ \
+ | bzip2 > "$pwd"/$pkgdir-rollup-${tag}.tar.bz2
+fi
+popd
diff --git a/nodejs-istanbul-lib-hook.spec b/nodejs-istanbul-lib-hook.spec
new file mode 100644
index 0000000..454db7b
--- /dev/null
+++ b/nodejs-istanbul-lib-hook.spec
@@ -0,0 +1,68 @@
+%{?nodejs_find_provides_and_requires}
+
+%global packagename istanbul-lib-hook
+%global enable_tests 1
+
+Name: nodejs-istanbul-lib-hook
+Version: 1.1.0
+Release: 1%{?dist}
+Summary: Hooks for require, vm and script used in istanbul
+
+License: BSD
+URL: https://github.com/istanbuljs/istanbuljs.git
+Source0: https://registry.npmjs.org/%{packagename}/-/%{packagename}-%{version}.tgz
+# The test files are not included in the npm tarball.
+# Source{1-9} are generated by running Source10, which pulls from the upstream
+# version control repository.
+Source1: %{packagename}-tests-%{version}.tar.bz2
+Source10: dl-istanbul-tests.sh
+
+
+BuildArch: noarch
+ExclusiveArch: %{nodejs_arches} noarch
+
+BuildRequires: nodejs-packaging
+BuildRequires: npm(append-transform)
+
+%if 0%{?enable_tests}
+BuildRequires: mocha
+BuildRequires: npm(chai)
+%endif
+
+%description
+Hooks for require, vm and script used in istanbul
+
+
+%prep
+%autosetup -n package
+# setup the tests
+%autosetup -T -D -a 1 -n package
+
+
+%build
+# nothing to do
+
+%install
+mkdir -p %{buildroot}%{nodejs_sitelib}/%{packagename}
+cp -pr package.json *.js lib/ \
+ %{buildroot}%{nodejs_sitelib}/%{packagename}
+
+%nodejs_symlink_deps
+
+%check
+%nodejs_symlink_deps --check
+%{__nodejs} -e 'require("./")'
+%if 0%{?enable_tests}
+NODE_ENV=test %{_bindir}/mocha -R spec
+%else
+%{_bindir}/echo -e "\e[101m -=#=- Tests disabled -=#=- \e[0m"
+%endif
+
+%files
+%doc *.md
+%license LICENSE
+%{nodejs_sitelib}/%{packagename}
+
+%changelog
+* Thu Apr 26 2018 Jared K. Smith <jsmith(a)fedoraproject.org> - 1.1.0-1
+- Initial packaging
diff --git a/sources b/sources
new file mode 100644
index 0000000..858b0c1
--- /dev/null
+++ b/sources
@@ -0,0 +1,2 @@
+SHA512 (istanbul-lib-hook-1.1.0.tgz) = 537a8483054351ead9d1bb7c71f9777523f74baa290683ad93744e3b97f611f06bfd24620fd150ab3c1a641a85391bbc5bb3b4117a5a8be93b9311cad776de46
+SHA512 (istanbul-lib-hook-tests-1.1.0.tar.bz2) = 85364c9a5aae39b529ef9297cb385382ca94f18ce089763386883ebb891ee7a47430964555a20e35eae364c3f64aab6dafe31d8dab418a7d7de67e59fa4170cf
6 years
Architecture specific change in rpms/golang-google-golangorg-cloud.git
by githook-noreply@fedoraproject.org
The package rpms/golang-google-golangorg-cloud.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-google-golangorg-cloud.git....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 36b4a98da9a437142d3d93436a8ab36eced1eb80
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed May 9 14:59:07 2018 +0200
Bootstrap needed to avoid circular dep with golang.org/x/build
diff --git a/golang-google-golangorg-cloud.spec b/golang-google-golangorg-cloud.spec
index 29ff4fb..dceddb7 100644
--- a/golang-google-golangorg-cloud.spec
+++ b/golang-google-golangorg-cloud.spec
@@ -1,3 +1,5 @@
+# Bootstrap needed to avoid circular dep with golang.org/x/build
+%bcond_without bootstrap
# Run tests in check
# Disabled for bootstrapping of golang-googlecode-goauth2
%bcond_with check
@@ -44,9 +46,11 @@ BuildRequires: golang(go.opencensus.io/stats)
BuildRequires: golang(go.opencensus.io/stats/view)
BuildRequires: golang(go.opencensus.io/tag)
BuildRequires: golang(go.opencensus.io/trace)
+%if %{without bootstrap}
BuildRequires: golang(golang.org/x/build/kubernetes)
BuildRequires: golang(golang.org/x/build/kubernetes/api)
BuildRequires: golang(golang.org/x/build/kubernetes/gke)
+%endif
BuildRequires: golang(golang.org/x/debug)
BuildRequires: golang(golang.org/x/debug/local)
BuildRequires: golang(golang.org/x/net/context)
commit 7b2ed5d46213eeef1c1d5d8b75782b2561998246
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed May 9 13:36:34 2018 +0200
Upload tarball
diff --git a/.gitignore b/.gitignore
index c34e48d..ff50124 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/google-cloud-go-872c736.tar.gz
+/google-cloud-go-0.21.0.tar.gz
diff --git a/sources b/sources
index 155ffb3..b801ef7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (google-cloud-go-872c736.tar.gz) = 032f83a570301a745eb0803447dfa8cd9007fba5627ff602cffd5c38aaa78be3d2696cc5fd1075dede3e1498f9ae68aa8c5b2afdaaaaeee8920144e0f1885854
+SHA512 (google-cloud-go-0.21.0.tar.gz) = 914c6096d07f9cd64149ab972d0fd8fe0d3bc458b9e3c32d1d3239255967be648e8f1bf67351f4b4144da37363a73477e84879ffde7c0925cd1a35806e16c5cd
commit 7c55b5bd2e9a3cdc2fd8fd2220d6b329304791c8
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed May 9 12:25:22 2018 +0200
Upload the patch
diff --git a/Increase-license-check-header-size-to-200.patch b/Increase-license-check-header-size-to-200.patch
new file mode 100644
index 0000000..6850a14
--- /dev/null
+++ b/Increase-license-check-header-size-to-200.patch
@@ -0,0 +1,25 @@
+From 2bd30663482cb1e1e2a76d35b84f035d707e9932 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup(a)redhat.com>
+Date: Wed, 9 May 2018 12:04:59 +0200
+Subject: [PATCH] Increase license check header size to 200
+
+---
+ license_test.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/license_test.go b/license_test.go
+index f93e9e0..6b1a64c 100644
+--- a/license_test.go
++++ b/license_test.go
+@@ -53,7 +53,7 @@ func TestLicense(t *testing.T) {
+ if err != nil {
+ return nil
+ }
+- src = src[:140] // Ensure all of the sentinel values are at the top of the file.
++ src = src[:200] // Ensure all of the sentinel values are at the top of the file.
+
+ // Find license
+ for _, sentinel := range sentinels {
+--
+2.7.5
+
commit b4ec79eb86750de6263838a399777da6c05e9e8b
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed May 9 12:25:22 2018 +0200
Update to v0.21.0
Change import path prefix to cloud.google.com/go
- resolves: #1558755
diff --git a/golang-google-golangorg-cloud.spec b/golang-google-golangorg-cloud.spec
index b20b658..29ff4fb 100644
--- a/golang-google-golangorg-cloud.spec
+++ b/golang-google-golangorg-cloud.spec
@@ -1,211 +1,161 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
-
-# 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
-# Cyclic deps among cloud, grpc and oauth2
-%global with_check 0
-# 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
+# Run tests in check
+# Disabled for bootstrapping of golang-googlecode-goauth2
+%bcond_with check
+
+# http://github.com/GoogleCloudPlatform/google-cloud-go
+%global forgeurl https://github.com/GoogleCloudPlatform/google-cloud-go
+%global goipath cloud.google.com/go
+%global gcommit 29f476ffa9c4cd4fd14336b6043090ac1ad76733
-%global provider github
-%global provider_tld com
-%global project GoogleCloudPlatform
-%global repo google-cloud-go
-# https://github.com/GoogleCloudPlatform/google-cloud-go
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path google.golang.org/cloud
-%global commit 872c736f496c2ba12786bedbb8325576bbdb33cf
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+Version: 0.21.0
+
+%gometa
Name: golang-google-golangorg-cloud
-Version: 0
-Release: 0.14.git%{shortcommit}%{?dist}
+Release: 1%{?dist}
Summary: Google Cloud Platform APIs related types and common functions
License: ASL 2.0
-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}
+URL: %{gourl}
+Source0: %{gosource}
+Patch0: Increase-license-check-header-size-to-200.patch
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
+BuildRequires: golang(github.com/golang/mock/gomock)
BuildRequires: golang(github.com/golang/protobuf/proto)
+BuildRequires: golang(github.com/golang/protobuf/ptypes)
+BuildRequires: golang(github.com/golang/protobuf/ptypes/any)
+BuildRequires: golang(github.com/golang/protobuf/ptypes/duration)
+BuildRequires: golang(github.com/golang/protobuf/ptypes/empty)
+BuildRequires: golang(github.com/golang/protobuf/ptypes/struct)
+BuildRequires: golang(github.com/golang/protobuf/ptypes/timestamp)
+BuildRequires: golang(github.com/golang/protobuf/ptypes/wrappers)
+BuildRequires: golang(github.com/google/btree)
+BuildRequires: golang(github.com/google/go-cmp/cmp)
+BuildRequires: golang(github.com/google/pprof/profile)
+BuildRequires: golang(github.com/googleapis/gax-go)
+BuildRequires: golang(go.opencensus.io/plugin/ocgrpc)
+BuildRequires: golang(go.opencensus.io/stats)
+BuildRequires: golang(go.opencensus.io/stats/view)
+BuildRequires: golang(go.opencensus.io/tag)
+BuildRequires: golang(go.opencensus.io/trace)
+BuildRequires: golang(golang.org/x/build/kubernetes)
+BuildRequires: golang(golang.org/x/build/kubernetes/api)
+BuildRequires: golang(golang.org/x/build/kubernetes/gke)
+BuildRequires: golang(golang.org/x/debug)
+BuildRequires: golang(golang.org/x/debug/local)
BuildRequires: golang(golang.org/x/net/context)
-# cyclic deps among cloud, grpc and oauth2
+BuildRequires: golang(golang.org/x/net/context/ctxhttp)
BuildRequires: golang(golang.org/x/oauth2)
BuildRequires: golang(golang.org/x/oauth2/google)
+BuildRequires: golang(golang.org/x/oauth2/jwt)
+BuildRequires: golang(golang.org/x/sync/errgroup)
+BuildRequires: golang(golang.org/x/sync/semaphore)
+BuildRequires: golang(golang.org/x/text/language)
+BuildRequires: golang(golang.org/x/time/rate)
BuildRequires: golang(google.golang.org/api/bigquery/v2)
+BuildRequires: golang(google.golang.org/api/cloudbuild/v1)
+BuildRequires: golang(google.golang.org/api/clouddebugger/v2)
+BuildRequires: golang(google.golang.org/api/cloudresourcemanager/v1)
+BuildRequires: golang(google.golang.org/api/cloudtrace/v1)
+BuildRequires: golang(google.golang.org/api/compute/v1)
BuildRequires: golang(google.golang.org/api/container/v1)
+BuildRequires: golang(google.golang.org/api/gensupport)
BuildRequires: golang(google.golang.org/api/googleapi)
-BuildRequires: golang(google.golang.org/api/logging/v1beta3)
-BuildRequires: golang(google.golang.org/api/pubsub/v1)
+BuildRequires: golang(google.golang.org/api/iterator)
+BuildRequires: golang(google.golang.org/api/option)
BuildRequires: golang(google.golang.org/api/storage/v1)
-BuildRequires: golang(google.golang.org/appengine)
-BuildRequires: golang(google.golang.org/appengine/file)
-BuildRequires: golang(google.golang.org/appengine/log)
+BuildRequires: golang(google.golang.org/api/support/bundler)
+BuildRequires: golang(google.golang.org/api/transport)
+BuildRequires: golang(google.golang.org/api/transport/grpc)
+BuildRequires: golang(google.golang.org/api/transport/http)
+BuildRequires: golang(google.golang.org/genproto/googleapis/api/label)
+BuildRequires: golang(google.golang.org/genproto/googleapis/api/metric)
+BuildRequires: golang(google.golang.org/genproto/googleapis/api/monitoredres)
+BuildRequires: golang(google.golang.org/genproto/googleapis/appengine/logging/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/bigtable/admin/v2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/bigtable/v2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/audit)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/dataproc/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/language/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/language/v1beta2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/oslogin/common)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/oslogin/v1beta)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/speech/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/speech/v1beta1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/videointelligence/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/videointelligence/v1be...
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/videointelligence/v1be...
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/vision/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/container/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/datastore/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/devtools/clouddebugger/v2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/devtools/clouderrorreporting...
+BuildRequires: golang(google.golang.org/genproto/googleapis/devtools/cloudprofiler/v2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/devtools/cloudtrace/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/devtools/cloudtrace/v2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/firestore/v1beta1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/iam/admin/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/iam/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/logging/type)
+BuildRequires: golang(google.golang.org/genproto/googleapis/logging/v2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/longrunning)
+BuildRequires: golang(google.golang.org/genproto/googleapis/monitoring/v3)
+BuildRequires: golang(google.golang.org/genproto/googleapis/privacy/dlp/v2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/privacy/dlp/v2beta1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/privacy/dlp/v2beta2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/pubsub/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/code)
+BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/errdetails)
+BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/status)
+BuildRequires: golang(google.golang.org/genproto/googleapis/spanner/admin/database/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/spanner/admin/instance/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/spanner/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/type/latlng)
+BuildRequires: golang(google.golang.org/genproto/protobuf/field_mask)
BuildRequires: golang(google.golang.org/grpc)
+BuildRequires: golang(google.golang.org/grpc/codes)
BuildRequires: golang(google.golang.org/grpc/credentials)
-BuildRequires: golang(google.golang.org/grpc/credentials/oauth)
-%endif
-
-Requires: golang(github.com/golang/protobuf/proto)
-Requires: golang(golang.org/x/net/context)
-# cyclic deps among cloud, grpc and oauth2
-Requires: golang(golang.org/x/oauth2)
-Requires: golang(golang.org/x/oauth2/google)
-Requires: golang(google.golang.org/api/bigquery/v2)
-Requires: golang(google.golang.org/api/container/v1)
-Requires: golang(google.golang.org/api/googleapi)
-Requires: golang(google.golang.org/api/logging/v1beta3)
-Requires: golang(google.golang.org/api/pubsub/v1)
-Requires: golang(google.golang.org/api/storage/v1)
-Requires: golang(google.golang.org/appengine)
-Requires: golang(google.golang.org/appengine/file)
-Requires: golang(google.golang.org/appengine/log)
-Requires: golang(google.golang.org/grpc)
-Requires: golang(google.golang.org/grpc/credentials)
-Requires: golang(google.golang.org/grpc/credentials/oauth)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/bigquery) = %{version}-%{release}
-Provides: golang(%{import_path}/bigtable) = %{version}-%{release}
-Provides: golang(%{import_path}/bigtable/bttest) = %{version}-%{release}
-Provides: golang(%{import_path}/compute/metadata) = %{version}-%{release}
-Provides: golang(%{import_path}/container) = %{version}-%{release}
-Provides: golang(%{import_path}/datastore) = %{version}-%{release}
-Provides: golang(%{import_path}/examples/storage/appengine) = %{version}-%{release}
-Provides: golang(%{import_path}/logging) = %{version}-%{release}
-Provides: golang(%{import_path}/pubsub) = %{version}-%{release}
-Provides: golang(%{import_path}/storage) = %{version}-%{release}
+BuildRequires: golang(google.golang.org/grpc/keepalive)
+BuildRequires: golang(google.golang.org/grpc/metadata)
+BuildRequires: golang(google.golang.org/grpc/status)
%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}
-%package unit-test
-Summary: Unit tests for %{name} package
-
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{goipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup -q
+%patch0 -p1
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-%endif
+%goinstall
+%if %{with check}
%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
-
-gotest %{import_path}
-gotest %{import_path}/bigquery
-gotest %{import_path}/bigtable
-gotest %{import_path}/datastore
-gotest %{import_path}/pubsub
-gotest %{import_path}/storage
+%gochecks
%endif
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md CONTRIBUTING.md AUTHORS CONTRIBUTORS
-%dir %{gopath}/src/google.golang.org
-%dir %{gopath}/src/%{import_path}
-%endif
-
-%if 0%{?with_unit_test}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md CONTRIBUTING.md AUTHORS CONTRIBUTORS
-%endif
%changelog
+* Wed May 09 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0.21.0-1
+- Update to v0.21.0
+ Change import path prefix to cloud.google.com/go
+ resolves: #1558755
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.14.git872c736
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years
Architecture specific change in rpms/eccodes.git
by githook-noreply@fedoraproject.org
The package rpms/eccodes.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/eccodes.git/commit/?id=33d19907f1...
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=9cab2c2bc3...
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=56ad6fdf07...
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=9b16b23603....
Change:
-ExcludeArch: ppc64
-ExcludeArch: armv7hl
+ExcludeArch: ppc64
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 9b16b23603aad46f5206650db104ace47b38c097
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed May 9 13:07:10 2018 +0200
reactivate the excludearch lines
diff --git a/eccodes.spec b/eccodes.spec
index fa49e86..3f03f0f 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -98,13 +98,13 @@ Requires: %{name}-data = %{version}-%{release}
Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
-#ExcludeArch: i686
+ExcludeArch: i686
# as explained in bugzilla #1562071
-#ExcludeArch: ppc64
+ExcludeArch: ppc64
# as explained in bugzilla #1562076
-#ExcludeArch: s390x
+ExcludeArch: s390x
# as explained in bugzilla #1562084
-#ExcludeArch: armv7hl
+ExcludeArch: armv7hl
%description
ecCodes is a package developed by ECMWF which provides an application
@@ -356,7 +356,6 @@ ctest -V %{?_smp_mflags}
* Tue May 08 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.3-1
- Upgrade to version 2.7.3
- adjust latest grib_api version to 1.26.1-1
-- for now, try to disable ExcludeArch statements to see what happens
* Thu Mar 29 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.0-2
- added ExcludeArch statements for the failing architectures
commit d241e7e09088ee86f24ee566e232823e65b6d87a
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed May 9 12:04:28 2018 +0200
reinsert the data package in the sources list
diff --git a/sources b/sources
index f1bdd17..1449418 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (eccodes-2.7.3-Source.tar.gz) = a6ac6dae5a785a14e2b69ecc698e72f4173c96655c8944f6e6f1c530e72a078036c2fd76d77473e17b33be606ec36f8236a0efa22afc8b4d7760d88a053902f4
+SHA512 (eccodes_test_data.tar.gz) = b0baa0867ac583ec9000e21b2653d11c26333a50bb817a41cad0ebc30b445fc9295f7b5cbc6908364aed502bfc4786929f2dcd0526b6540b26c1c024c90ede6a
commit 75a9b2b9f9f068c17aecdf52f8dfc194888ca420
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed May 9 11:39:41 2018 +0200
add tar file for updated version 2.7.3
diff --git a/.gitignore b/.gitignore
index d15f2b0..c9bee99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/eccodes-2.7.0-Source.tar.gz
/eccodes_test_data.tar.gz
+/eccodes-2.7.3-Source.tar.gz
diff --git a/sources b/sources
index 27a0e6e..f1bdd17 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (eccodes-2.7.0-Source.tar.gz) = 6b65902e0e82a038e6c705c68a5947ceef4f6950d83bdfcc78ec83b60bdcbc2b56a62971c5aa40c91b749c224ffa8ef120e9b72bf168032ffef9096207234103
-SHA512 (eccodes_test_data.tar.gz) = b0baa0867ac583ec9000e21b2653d11c26333a50bb817a41cad0ebc30b445fc9295f7b5cbc6908364aed502bfc4786929f2dcd0526b6540b26c1c024c90ede6a
+SHA512 (eccodes-2.7.3-Source.tar.gz) = a6ac6dae5a785a14e2b69ecc698e72f4173c96655c8944f6e6f1c530e72a078036c2fd76d77473e17b33be606ec36f8236a0efa22afc8b4d7760d88a053902f4
commit 9cab2c2bc3bb59f3a04a624da6ca4d03e60731b2
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed May 9 11:35:07 2018 +0200
upgrade to version 2.7.3
diff --git a/eccodes.spec b/eccodes.spec
index 0ccf629..fa49e86 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -1,16 +1,17 @@
Name: eccodes
-Version: 2.7.0
-Release: 2%{?dist}
+Version: 2.7.3
+Release: 1%{?dist}
Summary: WMO data format decoding and encoding
# force the shared libraries to have these so versions
%global so_version 0.1
%global so_version_f90 0.1
-# latest rawhide grib_api version is 1.25.0-4
+# latest rawhide grib_api version is 1.26.1-1
# but this version number is to be updated as soon as we know
# what the final release of grib_api by upstream will be.
-%global final_grib_api_version 1.25.0-4
+# latest upstream grib_api release is 1.26.1 (08-May-2018)
+%global final_grib_api_version 1.26.1-1
# license remarks:
# most of eccodes is licensed ASL 2.0 but some special cases must be noted.
@@ -36,6 +37,7 @@ URL: https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home
Source0: https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-%{v...
# note: this data package is unversioned upstream but still it is updated
# now and then. The current copy was downloaded 03-Jan-2018
+# (it was still the same on 08-May-2018)
Source1: http://download.ecmwf.org/test-data/grib_api/eccodes_test_data.tar.gz
# Support 32-bit
# https://software.ecmwf.int/issues/browse/SUP-1813
@@ -96,13 +98,13 @@ Requires: %{name}-data = %{version}-%{release}
Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
-ExcludeArch: i686
+#ExcludeArch: i686
# as explained in bugzilla #1562071
-ExcludeArch: ppc64
+#ExcludeArch: ppc64
# as explained in bugzilla #1562076
-ExcludeArch: s390x
+#ExcludeArch: s390x
# as explained in bugzilla #1562084
-ExcludeArch: armv7hl
+#ExcludeArch: armv7hl
%description
ecCodes is a package developed by ECMWF which provides an application
@@ -138,7 +140,7 @@ and behaviour. A significant difference compared with GRIB-API tools is that
bufr_dump produces output in JSON format suitable for many web based
applications.
-
+#####################################################
%package devel
Summary: Contains ecCodes development files
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -150,7 +152,7 @@ Obsoletes: grib_api-devel < %{final_grib_api_version}
%description devel
Header files and libraries for ecCodes.
-# note: python3 is not yet supported by eccodes
+#####################################################
%package -n python2-%{name}
Summary: A python2 interface to ecCodes
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -163,6 +165,10 @@ Requires: jasper-devel%{?_isa}
%description -n python2-%{name}
A python2 interface to ecCodes. Also a legacy interface to gribapi is provided.
+#####################################################
+# note: python3 is not yet supported by eccodes
+
+#####################################################
%package data
Summary: Data needed by the eccodes library and tools
BuildArch: noarch
@@ -173,6 +179,7 @@ to encode and decode grib and bufr files, and includes
both the official WMO tables and a number of often used
local definitions by ECMWF and other meteorological centers.
+#####################################################
%package doc
Summary: Documentation and example code
BuildArch: noarch
@@ -185,6 +192,7 @@ This package contains the html documentation for ecCodes
and a fair number of example programs and scripts to use it
in C, Fortran 90, and Python.
+#####################################################
%prep
%autosetup -n %{name}-%{version}-Source -p1
@@ -345,6 +353,11 @@ ctest -V %{?_smp_mflags}
%doc %{_datadir}/doc/%{name}/
%changelog
+* Tue May 08 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.3-1
+- Upgrade to version 2.7.3
+- adjust latest grib_api version to 1.26.1-1
+- for now, try to disable ExcludeArch statements to see what happens
+
* Thu Mar 29 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.0-2
- added ExcludeArch statements for the failing architectures
commit 56ad6fdf070973d3705c549a7f99e02b3d0cee01
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Mon Apr 23 09:36:05 2018 +0200
add rpmlintrc and disable manual test runs
diff --git a/eccodes.rpmlintrc b/eccodes.rpmlintrc
new file mode 100644
index 0000000..60064d2
--- /dev/null
+++ b/eccodes.rpmlintrc
@@ -0,0 +1,56 @@
+# use like this:
+# rpmlint --file eccodes.rpmlintrc *.rpm
+# example: addFilter ("^foo-.*regex-match-for-rpmlint-warning")
+
+# these are invalid spelling warnings. GRIB and BUFR are correct, since these are
+# the names of the data files that this software handles.
+# the description itself is a 1-to-1 copy of what the (UK-based) upstream
+# writes, and I am not going to translate this to US spelling ...
+addFilter ("W: spelling-error %description -l en_US behaviour -> behavior")
+addFilter ("W: spelling-error %description -l en_US grib ->")
+addFilter ("W: spelling-error %description -l en_US bufr ->")
+
+# this data file with wrong line ending has been added to the software on purpose
+# for testing purposes, so this is no mistake
+addFilter ("eccodes-doc.noarch: W: wrong-file-end-of-line-encoding /usr/share/doc/eccodes/examples/python/flight_data.csv")
+
+# these data files are no scripts. The dataformat just has an unfortunate first line
+# starting with #! so it resembles a shebang line.
+# see also comment #3 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("^eccodes-data.noarch: E: wrong-script-interpreter /usr/share/eccodes/definitions/grib1/local.82.0.def")
+addFilter ("^eccodes-data.noarch: E: non-executable-script /usr/share/eccodes/definitions/grib1/local.82.0.def")
+addFilter ("^eccodes-data.noarch: E: wrong-script-interpreter /usr/share/eccodes/definitions/grib1/local.82.83.def")
+addFilter ("^eccodes-data.noarch: E: non-executable-script /usr/share/eccodes/definitions/grib1/local.82.83.def")
+
+# this is a false error (its an rpmlint bug).
+# the spec file now uses %ldconfig_scriptlets in stead of the old ldconfig-postin/postun
+# see also comment #18 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postin /usr/lib64/libeccodes.so.0.1")
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postun /usr/lib64/libeccodes.so.0.1")
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postin /usr/lib64/libeccodes_f90.so.0.1")
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postun /usr/lib64/libeccodes_f90.so.0.1")
+
+# this is an rpmlint bug
+# see also comment #8 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("eccodes-debuginfo.x86_64: E: useless-provides debuginfo\(build-id\)")
+
+# there is no full compatibility between the old grib_api and the new eccodes
+# so only obsoletes can be used bu no provides.
+# see also comment #21 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("^eccodes.x86_64: W: obsolete-not-provided grib_api")
+addFilter ("^eccodes-devel.x86_64: W: obsolete-not-provided grib_api-devel")
+addFilter ("^eccodes-devel.x86_64: W: only-non-binary-in-usr-lib")
+
+# documentation is in a dedicated doc subpackage,
+# so these warnings have no merit
+addFilter ("python2-eccodes.x86_64: W: no-documentation")
+addFilter ("eccodes-debugsource.x86_64: W: no-documentation")
+addFilter ("eccodes-devel.x86_64: W: no-documentation")
+addFilter ("eccodes-data.noarch: W: no-documentation")
+
+# temporary disable the man page warning, since it obscures other problems that
+# may be more important, and it has already been reported upstream
+# see also comment #3 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("eccodes.x86_64: W: no-manual-page-for-binary")
+
+# addFilter ("")
diff --git a/eccodes.spec b/eccodes.spec
index 48678b0..0ccf629 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -98,7 +98,7 @@ Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
ExcludeArch: i686
# as explained in bugzilla #1562071
-# ExcludeArch: ppc64
+ExcludeArch: ppc64
# as explained in bugzilla #1562076
ExcludeArch: s390x
# as explained in bugzilla #1562084
@@ -236,7 +236,6 @@ cd build
-DECCODES_SOVERSION_F90=%{so_version_f90} \
-DPYTHON_EXECUTABLE=%{_bindir}/python2 \
..
-# or: -DCMAKE_SKIP_RPATH=ON ??
%make_build
@@ -313,29 +312,9 @@ cd build
# so a patch has been added to solve this for now.
# See: https://software.ecmwf.int/issues/browse/SUP-1812
# (unfortunately this issue is not public)
-#LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-#LIBRARY_PATH=%{buildroot}/%{_libdir} \
-# ctest -V %{?_smp_mflags}
-
-# manually run some problematic tests for ppc64:
-#echo "================================="
-#echo "================================="
-#echo "================================="
-#echo "output for: ctest -VV -R t_optimize_scaling_sh"
-#echo "================================="
-#LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-#LIBRARY_PATH=%{buildroot}/%{_libdir} \
-#ctest -VV -R t_optimize_scaling_sh
-echo "================================="
-echo "================================="
-echo "================================="
-echo "output for: ctest -VV -R t_bufr_dump_encode_fortran"
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -VV -R t_bufr_dump_encode_fortran
-echo "================================="
-echo "================================="
-echo "================================="
+ctest -V %{?_smp_mflags}
%files
%license LICENSE
commit c1a58927ef8d1c24cbea38b1673c6a8912df14e8
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Apr 19 17:11:34 2018 +0200
now run the second failing ppc test case
diff --git a/eccodes.spec b/eccodes.spec
index 246aafc..48678b0 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -318,21 +318,21 @@ cd build
# ctest -V %{?_smp_mflags}
# manually run some problematic tests for ppc64:
-echo "================================="
-echo "================================="
-echo "================================="
-echo "output for: ctest -VV -R t_optimize_scaling_sh"
-echo "================================="
-LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -VV -R t_optimize_scaling_sh; echo 'dummy'
+#echo "================================="
+#echo "================================="
+#echo "================================="
+#echo "output for: ctest -VV -R t_optimize_scaling_sh"
+#echo "================================="
+#LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
+#LIBRARY_PATH=%{buildroot}/%{_libdir} \
+#ctest -VV -R t_optimize_scaling_sh
echo "================================="
echo "================================="
echo "================================="
echo "output for: ctest -VV -R t_bufr_dump_encode_fortran"
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -VV -R t_bufr_dump_encode_fortran; echo 'dummy'
+ctest -VV -R t_bufr_dump_encode_fortran
echo "================================="
echo "================================="
echo "================================="
commit 2c7cee4496dbf037422cc52b76eadd7201d8d990
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Apr 19 16:53:57 2018 +0200
correct stupid library path mistake
diff --git a/eccodes.spec b/eccodes.spec
index c9c017a..246aafc 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -313,8 +313,8 @@ cd build
# so a patch has been added to solve this for now.
# See: https://software.ecmwf.int/issues/browse/SUP-1812
# (unfortunately this issue is not public)
-LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-LIBRARY_PATH=%{buildroot}/%{_libdir} \
+#LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
+#LIBRARY_PATH=%{buildroot}/%{_libdir} \
# ctest -V %{?_smp_mflags}
# manually run some problematic tests for ppc64:
@@ -323,11 +323,15 @@ echo "================================="
echo "================================="
echo "output for: ctest -VV -R t_optimize_scaling_sh"
echo "================================="
+LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
+LIBRARY_PATH=%{buildroot}/%{_libdir} \
ctest -VV -R t_optimize_scaling_sh; echo 'dummy'
echo "================================="
echo "================================="
echo "================================="
echo "output for: ctest -VV -R t_bufr_dump_encode_fortran"
+LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
+LIBRARY_PATH=%{buildroot}/%{_libdir} \
ctest -VV -R t_bufr_dump_encode_fortran; echo 'dummy'
echo "================================="
echo "================================="
commit 8f492aa41e94be95db7ed691f711f04584409ead
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Apr 19 16:40:19 2018 +0200
disable the full test suite, since otherwise the individual tests are not executed
diff --git a/eccodes.spec b/eccodes.spec
index a8404c4..c9c017a 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -315,7 +315,7 @@ cd build
# (unfortunately this issue is not public)
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -V %{?_smp_mflags}; echo 'dummy'
+# ctest -V %{?_smp_mflags}
# manually run some problematic tests for ppc64:
echo "================================="
commit c7b500b2a0ff17eeaf39c0ecd58fbb9cb26ad684
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Apr 19 16:22:37 2018 +0200
add echo statements behind the failing tests to let the code continue
diff --git a/eccodes.spec b/eccodes.spec
index 3c23d94..a8404c4 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -315,7 +315,7 @@ cd build
# (unfortunately this issue is not public)
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -V %{?_smp_mflags}
+ctest -V %{?_smp_mflags}; echo 'dummy'
# manually run some problematic tests for ppc64:
echo "================================="
@@ -323,12 +323,12 @@ echo "================================="
echo "================================="
echo "output for: ctest -VV -R t_optimize_scaling_sh"
echo "================================="
-ctest -VV -R t_optimize_scaling_sh
+ctest -VV -R t_optimize_scaling_sh; echo 'dummy'
echo "================================="
echo "================================="
echo "================================="
echo "output for: ctest -VV -R t_bufr_dump_encode_fortran"
-ctest -VV -R t_bufr_dump_encode_fortran
+ctest -VV -R t_bufr_dump_encode_fortran; echo 'dummy'
echo "================================="
echo "================================="
echo "================================="
commit 33d19907f1b1f28d060caad5d81266f47b35ea10
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Apr 19 16:01:20 2018 +0200
undo the ppc64 exclude
diff --git a/eccodes.spec b/eccodes.spec
index 7b0e536..3c23d94 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -98,7 +98,7 @@ Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
ExcludeArch: i686
# as explained in bugzilla #1562071
-ExcludeArch: ppc64
+# ExcludeArch: ppc64
# as explained in bugzilla #1562076
ExcludeArch: s390x
# as explained in bugzilla #1562084
commit 9c52eec8a7ff51b07c10e93cca3c1a367041541e
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Apr 19 15:51:14 2018 +0200
add running some problematic tests in verbose mode
diff --git a/eccodes.spec b/eccodes.spec
index 0ccf629..7b0e536 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -236,6 +236,7 @@ cd build
-DECCODES_SOVERSION_F90=%{so_version_f90} \
-DPYTHON_EXECUTABLE=%{_bindir}/python2 \
..
+# or: -DCMAKE_SKIP_RPATH=ON ??
%make_build
@@ -316,6 +317,22 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
ctest -V %{?_smp_mflags}
+# manually run some problematic tests for ppc64:
+echo "================================="
+echo "================================="
+echo "================================="
+echo "output for: ctest -VV -R t_optimize_scaling_sh"
+echo "================================="
+ctest -VV -R t_optimize_scaling_sh
+echo "================================="
+echo "================================="
+echo "================================="
+echo "output for: ctest -VV -R t_bufr_dump_encode_fortran"
+ctest -VV -R t_bufr_dump_encode_fortran
+echo "================================="
+echo "================================="
+echo "================================="
+
%files
%license LICENSE
%doc README ChangeLog AUTHORS
6 years
Architecture specific change in rpms/eccodes.git
by githook-noreply@fedoraproject.org
The package rpms/eccodes.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/eccodes.git/commit/?id=9b16b23603....
Change:
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 9b16b23603aad46f5206650db104ace47b38c097
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed May 9 13:07:10 2018 +0200
reactivate the excludearch lines
diff --git a/eccodes.spec b/eccodes.spec
index fa49e86..3f03f0f 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -98,13 +98,13 @@ Requires: %{name}-data = %{version}-%{release}
Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
-#ExcludeArch: i686
+ExcludeArch: i686
# as explained in bugzilla #1562071
-#ExcludeArch: ppc64
+ExcludeArch: ppc64
# as explained in bugzilla #1562076
-#ExcludeArch: s390x
+ExcludeArch: s390x
# as explained in bugzilla #1562084
-#ExcludeArch: armv7hl
+ExcludeArch: armv7hl
%description
ecCodes is a package developed by ECMWF which provides an application
@@ -356,7 +356,6 @@ ctest -V %{?_smp_mflags}
* Tue May 08 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.3-1
- Upgrade to version 2.7.3
- adjust latest grib_api version to 1.26.1-1
-- for now, try to disable ExcludeArch statements to see what happens
* Thu Mar 29 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.0-2
- added ExcludeArch statements for the failing architectures
6 years
Architecture specific change in rpms/eccodes.git
by githook-noreply@fedoraproject.org
The package rpms/eccodes.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/eccodes.git/commit/?id=9cab2c2bc3...
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=56ad6fdf07....
Change:
-ExcludeArch: armv7hl
+ExcludeArch: ppc64
Thanks.
Full change:
============
commit 75a9b2b9f9f068c17aecdf52f8dfc194888ca420
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed May 9 11:39:41 2018 +0200
add tar file for updated version 2.7.3
diff --git a/.gitignore b/.gitignore
index d15f2b0..c9bee99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/eccodes-2.7.0-Source.tar.gz
/eccodes_test_data.tar.gz
+/eccodes-2.7.3-Source.tar.gz
diff --git a/sources b/sources
index 27a0e6e..f1bdd17 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (eccodes-2.7.0-Source.tar.gz) = 6b65902e0e82a038e6c705c68a5947ceef4f6950d83bdfcc78ec83b60bdcbc2b56a62971c5aa40c91b749c224ffa8ef120e9b72bf168032ffef9096207234103
-SHA512 (eccodes_test_data.tar.gz) = b0baa0867ac583ec9000e21b2653d11c26333a50bb817a41cad0ebc30b445fc9295f7b5cbc6908364aed502bfc4786929f2dcd0526b6540b26c1c024c90ede6a
+SHA512 (eccodes-2.7.3-Source.tar.gz) = a6ac6dae5a785a14e2b69ecc698e72f4173c96655c8944f6e6f1c530e72a078036c2fd76d77473e17b33be606ec36f8236a0efa22afc8b4d7760d88a053902f4
commit 9cab2c2bc3bb59f3a04a624da6ca4d03e60731b2
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed May 9 11:35:07 2018 +0200
upgrade to version 2.7.3
diff --git a/eccodes.spec b/eccodes.spec
index 0ccf629..fa49e86 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -1,16 +1,17 @@
Name: eccodes
-Version: 2.7.0
-Release: 2%{?dist}
+Version: 2.7.3
+Release: 1%{?dist}
Summary: WMO data format decoding and encoding
# force the shared libraries to have these so versions
%global so_version 0.1
%global so_version_f90 0.1
-# latest rawhide grib_api version is 1.25.0-4
+# latest rawhide grib_api version is 1.26.1-1
# but this version number is to be updated as soon as we know
# what the final release of grib_api by upstream will be.
-%global final_grib_api_version 1.25.0-4
+# latest upstream grib_api release is 1.26.1 (08-May-2018)
+%global final_grib_api_version 1.26.1-1
# license remarks:
# most of eccodes is licensed ASL 2.0 but some special cases must be noted.
@@ -36,6 +37,7 @@ URL: https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home
Source0: https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-%{v...
# note: this data package is unversioned upstream but still it is updated
# now and then. The current copy was downloaded 03-Jan-2018
+# (it was still the same on 08-May-2018)
Source1: http://download.ecmwf.org/test-data/grib_api/eccodes_test_data.tar.gz
# Support 32-bit
# https://software.ecmwf.int/issues/browse/SUP-1813
@@ -96,13 +98,13 @@ Requires: %{name}-data = %{version}-%{release}
Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
-ExcludeArch: i686
+#ExcludeArch: i686
# as explained in bugzilla #1562071
-ExcludeArch: ppc64
+#ExcludeArch: ppc64
# as explained in bugzilla #1562076
-ExcludeArch: s390x
+#ExcludeArch: s390x
# as explained in bugzilla #1562084
-ExcludeArch: armv7hl
+#ExcludeArch: armv7hl
%description
ecCodes is a package developed by ECMWF which provides an application
@@ -138,7 +140,7 @@ and behaviour. A significant difference compared with GRIB-API tools is that
bufr_dump produces output in JSON format suitable for many web based
applications.
-
+#####################################################
%package devel
Summary: Contains ecCodes development files
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -150,7 +152,7 @@ Obsoletes: grib_api-devel < %{final_grib_api_version}
%description devel
Header files and libraries for ecCodes.
-# note: python3 is not yet supported by eccodes
+#####################################################
%package -n python2-%{name}
Summary: A python2 interface to ecCodes
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -163,6 +165,10 @@ Requires: jasper-devel%{?_isa}
%description -n python2-%{name}
A python2 interface to ecCodes. Also a legacy interface to gribapi is provided.
+#####################################################
+# note: python3 is not yet supported by eccodes
+
+#####################################################
%package data
Summary: Data needed by the eccodes library and tools
BuildArch: noarch
@@ -173,6 +179,7 @@ to encode and decode grib and bufr files, and includes
both the official WMO tables and a number of often used
local definitions by ECMWF and other meteorological centers.
+#####################################################
%package doc
Summary: Documentation and example code
BuildArch: noarch
@@ -185,6 +192,7 @@ This package contains the html documentation for ecCodes
and a fair number of example programs and scripts to use it
in C, Fortran 90, and Python.
+#####################################################
%prep
%autosetup -n %{name}-%{version}-Source -p1
@@ -345,6 +353,11 @@ ctest -V %{?_smp_mflags}
%doc %{_datadir}/doc/%{name}/
%changelog
+* Tue May 08 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.3-1
+- Upgrade to version 2.7.3
+- adjust latest grib_api version to 1.26.1-1
+- for now, try to disable ExcludeArch statements to see what happens
+
* Thu Mar 29 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.0-2
- added ExcludeArch statements for the failing architectures
commit 56ad6fdf070973d3705c549a7f99e02b3d0cee01
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Mon Apr 23 09:36:05 2018 +0200
add rpmlintrc and disable manual test runs
diff --git a/eccodes.rpmlintrc b/eccodes.rpmlintrc
new file mode 100644
index 0000000..60064d2
--- /dev/null
+++ b/eccodes.rpmlintrc
@@ -0,0 +1,56 @@
+# use like this:
+# rpmlint --file eccodes.rpmlintrc *.rpm
+# example: addFilter ("^foo-.*regex-match-for-rpmlint-warning")
+
+# these are invalid spelling warnings. GRIB and BUFR are correct, since these are
+# the names of the data files that this software handles.
+# the description itself is a 1-to-1 copy of what the (UK-based) upstream
+# writes, and I am not going to translate this to US spelling ...
+addFilter ("W: spelling-error %description -l en_US behaviour -> behavior")
+addFilter ("W: spelling-error %description -l en_US grib ->")
+addFilter ("W: spelling-error %description -l en_US bufr ->")
+
+# this data file with wrong line ending has been added to the software on purpose
+# for testing purposes, so this is no mistake
+addFilter ("eccodes-doc.noarch: W: wrong-file-end-of-line-encoding /usr/share/doc/eccodes/examples/python/flight_data.csv")
+
+# these data files are no scripts. The dataformat just has an unfortunate first line
+# starting with #! so it resembles a shebang line.
+# see also comment #3 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("^eccodes-data.noarch: E: wrong-script-interpreter /usr/share/eccodes/definitions/grib1/local.82.0.def")
+addFilter ("^eccodes-data.noarch: E: non-executable-script /usr/share/eccodes/definitions/grib1/local.82.0.def")
+addFilter ("^eccodes-data.noarch: E: wrong-script-interpreter /usr/share/eccodes/definitions/grib1/local.82.83.def")
+addFilter ("^eccodes-data.noarch: E: non-executable-script /usr/share/eccodes/definitions/grib1/local.82.83.def")
+
+# this is a false error (its an rpmlint bug).
+# the spec file now uses %ldconfig_scriptlets in stead of the old ldconfig-postin/postun
+# see also comment #18 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postin /usr/lib64/libeccodes.so.0.1")
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postun /usr/lib64/libeccodes.so.0.1")
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postin /usr/lib64/libeccodes_f90.so.0.1")
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postun /usr/lib64/libeccodes_f90.so.0.1")
+
+# this is an rpmlint bug
+# see also comment #8 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("eccodes-debuginfo.x86_64: E: useless-provides debuginfo\(build-id\)")
+
+# there is no full compatibility between the old grib_api and the new eccodes
+# so only obsoletes can be used bu no provides.
+# see also comment #21 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("^eccodes.x86_64: W: obsolete-not-provided grib_api")
+addFilter ("^eccodes-devel.x86_64: W: obsolete-not-provided grib_api-devel")
+addFilter ("^eccodes-devel.x86_64: W: only-non-binary-in-usr-lib")
+
+# documentation is in a dedicated doc subpackage,
+# so these warnings have no merit
+addFilter ("python2-eccodes.x86_64: W: no-documentation")
+addFilter ("eccodes-debugsource.x86_64: W: no-documentation")
+addFilter ("eccodes-devel.x86_64: W: no-documentation")
+addFilter ("eccodes-data.noarch: W: no-documentation")
+
+# temporary disable the man page warning, since it obscures other problems that
+# may be more important, and it has already been reported upstream
+# see also comment #3 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("eccodes.x86_64: W: no-manual-page-for-binary")
+
+# addFilter ("")
diff --git a/eccodes.spec b/eccodes.spec
index 48678b0..0ccf629 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -98,7 +98,7 @@ Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
ExcludeArch: i686
# as explained in bugzilla #1562071
-# ExcludeArch: ppc64
+ExcludeArch: ppc64
# as explained in bugzilla #1562076
ExcludeArch: s390x
# as explained in bugzilla #1562084
@@ -236,7 +236,6 @@ cd build
-DECCODES_SOVERSION_F90=%{so_version_f90} \
-DPYTHON_EXECUTABLE=%{_bindir}/python2 \
..
-# or: -DCMAKE_SKIP_RPATH=ON ??
%make_build
@@ -313,29 +312,9 @@ cd build
# so a patch has been added to solve this for now.
# See: https://software.ecmwf.int/issues/browse/SUP-1812
# (unfortunately this issue is not public)
-#LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-#LIBRARY_PATH=%{buildroot}/%{_libdir} \
-# ctest -V %{?_smp_mflags}
-
-# manually run some problematic tests for ppc64:
-#echo "================================="
-#echo "================================="
-#echo "================================="
-#echo "output for: ctest -VV -R t_optimize_scaling_sh"
-#echo "================================="
-#LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-#LIBRARY_PATH=%{buildroot}/%{_libdir} \
-#ctest -VV -R t_optimize_scaling_sh
-echo "================================="
-echo "================================="
-echo "================================="
-echo "output for: ctest -VV -R t_bufr_dump_encode_fortran"
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -VV -R t_bufr_dump_encode_fortran
-echo "================================="
-echo "================================="
-echo "================================="
+ctest -V %{?_smp_mflags}
%files
%license LICENSE
6 years
Architecture specific change in rpms/rust-take_mut.git
by githook-noreply@fedoraproject.org
The package rpms/rust-take_mut.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/rust-take_mut.git/commit/?id=fb16....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit fb1685b529a5c25188f198a8c46b26c7d590c2e1
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Wed May 9 10:45:19 2018 +0200
initial import
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6a26898
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/take_mut-0.2.2.crate
diff --git a/rust-take_mut.spec b/rust-take_mut.spec
new file mode 100644
index 0000000..af04176
--- /dev/null
+++ b/rust-take_mut.spec
@@ -0,0 +1,55 @@
+# Generated by rust2rpm
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate take_mut
+
+Name: rust-%{crate}
+Version: 0.2.2
+Release: 1%{?dist}
+Summary: Take a T from a &mut T temporarily
+
+License: MIT
+URL: https://crates.io/crates/take_mut
+Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging
+
+%description
+%{summary}.
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel
+Take a T from a &mut T temporarily.
+
+This package contains library source intended for building other packages
+which use %{crate} from crates.io.
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%files devel
+%license LICENSE
+%doc README.md
+%{cargo_registry}/%{crate}-%{version}/
+
+%changelog
+* Thu Apr 26 2018 Igor Gnatenko <ignatenko(a)redhat.com> - 0.2.2-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..59870e8
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (take_mut-0.2.2.crate) = f75a5ce723e710809130878b0ff5df368f5929201e557661dd0154f3b31ea58d7d30d84672ca5a684fbfcae5f82ab2c21b1b5d9edc4c67d08c221228bd9de814
6 years
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=b79737d3dfe89....
Change:
-%ifnarch armv7hl
Thanks.
Full change:
============
commit b79737d3dfe8949eee6764ee6298ee6a715a3042
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Tue May 8 11:57:37 2018 -0400
New release (1:13.1.0-1)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/0001-9df56dc509a6cbb7c1da8073e82fc1d2a284418d.patch b/0001-9df56dc509a6cbb7c1da8073e82fc1d2a284418d.patch
new file mode 100644
index 0000000..ffc38da
--- /dev/null
+++ b/0001-9df56dc509a6cbb7c1da8073e82fc1d2a284418d.patch
@@ -0,0 +1,165 @@
+--- ceph-13.1.0/src/mon/LogMonitor.cc.orig 2018-05-08 08:12:50.101933925 -0400
++++ ceph-13.1.0/src/mon/LogMonitor.cc 2018-05-08 08:12:59.470933925 -0400
+@@ -62,7 +62,6 @@
+ {
+ dout(10) << "create_initial -- creating initial map" << dendl;
+ LogEntry e;
+- memset(&e.who, 0, sizeof(e.who));
+ e.name = g_conf->name;
+ e.stamp = ceph_clock_now();
+ e.prio = CLOG_INFO;
+--- ceph-13.1.0/src/mon/MonMap.h.orig 2018-05-08 08:13:08.173933925 -0400
++++ ceph-13.1.0/src/mon/MonMap.h 2018-05-08 08:13:17.391933925 -0400
+@@ -118,7 +118,6 @@
+
+ MonMap()
+ : epoch(0) {
+- memset(&fsid, 0, sizeof(fsid));
+ }
+
+ uuid_d& get_fsid() { return fsid; }
+--- ceph-13.1.0/src/os/filestore/HashIndex.h.orig 2018-05-08 08:13:35.377933925 -0400
++++ ceph-13.1.0/src/os/filestore/HashIndex.h 2018-05-08 08:13:59.853933925 -0400
+@@ -395,7 +395,7 @@
+
+ struct CmpPairBitwise {
+ bool operator()(const pair<string, ghobject_t>& l,
+- const pair<string, ghobject_t>& r)
++ const pair<string, ghobject_t>& r) const
+ {
+ if (l.first < r.first)
+ return true;
+@@ -408,7 +408,7 @@
+ };
+
+ struct CmpHexdigitStringBitwise {
+- bool operator()(const string& l, const string& r) {
++ bool operator()(const string& l, const string& r) const {
+ return reverse_hexdigit_bits_string(l) < reverse_hexdigit_bits_string(r);
+ }
+ };
+--- ceph-13.1.0/src/os/filestore/LFNIndex.h.orig 2018-05-08 08:14:06.721933925 -0400
++++ ceph-13.1.0/src/os/filestore/LFNIndex.h 2018-05-08 08:14:34.671933925 -0400
+@@ -63,7 +63,7 @@
+ out: \
+ complete_inject_failure(); \
+ return r; \
+- } catch (RetryException) { \
++ } catch (RetryException&) { \
+ failed = true; \
+ } catch (...) { \
+ ceph_abort(); \
+--- ceph-13.1.0/src/client/Inode.h.orig 2018-05-08 08:08:26.305933925 -0400
++++ ceph-13.1.0/src/client/Inode.h 2018-05-08 08:08:38.029933925 -0400
+@@ -279,7 +279,6 @@
+ _ref(0), ll_ref(0)
+ {
+ memset(&dir_layout, 0, sizeof(dir_layout));
+- memset("a, 0, sizeof(quota));
+ }
+ ~Inode();
+
+--- ceph-13.1.0/src/osd/OSDMap.h.orig 2018-05-08 08:14:51.066933925 -0400
++++ ceph-13.1.0/src/osd/OSDMap.h 2018-05-08 08:15:14.148933925 -0400
+@@ -427,7 +427,6 @@
+ encode_features(0),
+ epoch(e), new_pool_max(-1), new_flags(-1), new_max_osd(-1),
+ have_crc(false), full_crc(0), inc_crc(0) {
+- memset(&fsid, 0, sizeof(fsid));
+ }
+ explicit Incremental(bufferlist &bl) {
+ bufferlist::iterator p = bl.begin();
+@@ -607,7 +606,6 @@
+ cached_up_osd_features(0),
+ crc_defined(false), crc(0),
+ crush(std::make_shared<CrushWrapper>()) {
+- memset(&fsid, 0, sizeof(fsid));
+ }
+
+ private:
+--- ceph-13.1.0/src/common/cmdparse.h.orig 2018-05-08 08:09:17.772933925 -0400
++++ ceph-13.1.0/src/common/cmdparse.h 2018-05-08 08:09:36.500933925 -0400
+@@ -54,7 +54,7 @@
+ try {
+ val = boost::get<T>(cmdmap.find(k)->second);
+ return true;
+- } catch (boost::bad_get) {
++ } catch (boost::bad_get&) {
+ handle_bad_get(cct, k, typeid(T).name());
+ }
+ }
+--- ceph-13.1.0/src/messages/MClientReply.h.orig 2018-05-08 08:10:22.281933925 -0400
++++ ceph-13.1.0/src/messages/MClientReply.h 2018-05-08 08:10:46.660933925 -0400
+@@ -187,7 +187,7 @@
+ if (features & CEPH_FEATURE_MDS_QUOTA)
+ decode(quota, p);
+ else
+- memset("a, 0, sizeof(quota));
++ quota = quota_info_t{};
+
+ if ((features & CEPH_FEATURE_FS_FILE_LAYOUT_V2))
+ decode(layout.pool_ns, p);
+--- ceph-13.1.0/src/messages/MMonSubscribeAck.h.orig 2018-05-08 08:10:58.478933925 -0400
++++ ceph-13.1.0/src/messages/MMonSubscribeAck.h 2018-05-08 08:11:17.484933925 -0400
+@@ -23,7 +23,6 @@
+
+ MMonSubscribeAck() : Message(CEPH_MSG_MON_SUBSCRIBE_ACK),
+ interval(0) {
+- memset(&fsid, 0, sizeof(fsid));
+ }
+ MMonSubscribeAck(uuid_d& f, int i) : Message(CEPH_MSG_MON_SUBSCRIBE_ACK),
+ interval(i), fsid(f) { }
+--- ceph-13.1.0/src/mgr/DaemonState.h.orig 2018-05-08 08:12:16.521933925 -0400
++++ ceph-13.1.0/src/mgr/DaemonState.h 2018-05-08 08:12:40.995933925 -0400
+@@ -130,7 +130,7 @@
+ auto p = config_defaults_bl.begin();
+ try {
+ decode(config_defaults, p);
+- } catch (buffer::error e) {
++ } catch (buffer::error& e) {
+ }
+ }
+ return config_defaults;
+--- ceph-13.1.0/cmake/modules/BuildDPDK.cmake.orig 2018-05-08 08:41:02.168933925 -0400
++++ ceph-13.1.0/cmake/modules/BuildDPDK.cmake 2018-05-08 08:41:47.411933925 -0400
+@@ -71,7 +71,7 @@
+ BUILD_IN_SOURCE 1
+ INSTALL_COMMAND "true")
+ ExternalProject_Add_Step(dpdk-ext patch-config
+- COMMAND ${CMAKE_MODULE_PATH}/patch-dpdk-conf.sh ${dpdk_dir} ${machine}
++ COMMAND ${CMAKE_MODULE_PATH}/patch-dpdk-conf.sh ${dpdk_dir} ${machine} ${arch}
+ DEPENDEES configure
+ DEPENDERS build)
+ # easier to adjust the config
+@@ -86,7 +86,7 @@
+ # target
+ file(MAKE_DIRECTORY ${DPDK_INCLUDE_DIR})
+ foreach(c
+- pci bus_pci
++ bus_pci pci
+ eal
+ mempool mempool_ring mempool_stack ring)
+ add_library(dpdk::${c} STATIC IMPORTED)
+--- ceph-13.1.0/cmake/modules/patch-dpdk-conf.sh.orig 2018-05-08 08:42:01.089933925 -0400
++++ ceph-13.1.0/cmake/modules/patch-dpdk-conf.sh 2018-05-08 08:43:11.781933925 -0400
+@@ -15,8 +15,12 @@
+ shift
+ machine=$1
+ shift
++arch=$1
++shift
+
+ setconf CONFIG_RTE_MACHINE "${machine}"
++setconf CONFIG_RTE_ARCH "${arch}"
++
+ # Disable experimental features
+ setconf CONFIG_RTE_NEXT_ABI n
+ setconf CONFIG_RTE_LIBRTE_MBUF_OFFLOAD n
+@@ -38,6 +42,7 @@
+ setconf CONFIG_RTE_LIBRTE_VMXNET3_PMD n
+ setconf CONFIG_RTE_LIBRTE_PMD_VHOST n
+ setconf CONFIG_RTE_APP_EVENTDEV n
++setconf CONFIG_RTE_MAX_VFIO_GROUPS 64
+
+ # no test
+ setconf CONFIG_RTE_APP_TEST n
diff --git a/0001-src-rocksdb-util-murmurhash.patch b/0001-src-rocksdb-util-murmurhash.patch
deleted file mode 100644
index f67a0ff..0000000
--- a/0001-src-rocksdb-util-murmurhash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ceph-12.1.1.orig/src/rocksdb/util/murmurhash.cc 2017-04-27 01:13:46.000000000 +0100
-+++ ceph-12.1.1.orig/src/rocksdb/util/murmurhash.cc 2017-07-25 11:37:28.910266684 +0100
-@@ -113,8 +113,8 @@ unsigned int MurmurHash2 ( const void *
-
- switch(len)
- {
-- case 3: h ^= data[2] << 16;
-- case 2: h ^= data[1] << 8;
-+ case 3: h ^= data[2] << 16; // fallthrough
-+ case 2: h ^= data[1] << 8; // fallthrough
- case 1: h ^= data[0];
- h *= m;
- };
diff --git a/0002-cmake-Support-ppc64.patch b/0002-cmake-Support-ppc64.patch
deleted file mode 100644
index 6b09549..0000000
--- a/0002-cmake-Support-ppc64.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 2f0a7153460acc3f21462236f470ec3471fa2ee1 Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto(a)redhat.com>
-Date: Mon, 31 Jul 2017 19:50:23 +0200
-Subject: [PATCH] cmake: Support ppc64
-
-The ppc64 support requires a couple of changes:
-- adding the ppc64 support to cmake
-- changing optimized crc32 code to compile on ppc64le only
-- moving ifdef condition before crc32_align to avoid defined but not
-used warning
-
-Signed-off-by: Boris Ranto <branto(a)redhat.com>
----
- cmake/modules/SIMDExt.cmake | 15 ++++++++++++++-
- src/CMakeLists.txt | 4 +++-
- src/arch/ppc.c | 8 ++++----
- src/common/crc32c_ppc.c | 6 +++---
- 4 files changed, 24 insertions(+), 9 deletions(-)
-
-diff --git a/cmake/modules/SIMDExt.cmake b/cmake/modules/SIMDExt.cmake
-index 5330835..c47667d 100644
---- a/cmake/modules/SIMDExt.cmake
-+++ b/cmake/modules/SIMDExt.cmake
-@@ -109,7 +109,20 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64")
- endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64")
- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(powerpc|ppc)64le")
- set(HAVE_PPC64LE 1)
-- message(STATUS " we are ppc64le")
-+ message(STATUS " we are ppc64")
-+ CHECK_C_COMPILER_FLAG("-maltivec" HAS_ALTIVEC)
-+ if(HAS_ALTIVEC)
-+ message(STATUS " HAS_ALTIVEC yes")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maltivec")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -maltivec")
-+ endif()
-+ CHECK_C_COMPILER_FLAG("-mcpu=power8" HAVE_POWER8)
-+ if(HAVE_POWER8)
-+ message(STATUS " HAVE_POWER8 yes")
-+ endif()
-+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(power|ppc)64")
-+ set(HAVE_PPC64 1)
-+ message(STATUS " we are ppc64")
- CHECK_C_COMPILER_FLAG("-maltivec" HAS_ALTIVEC)
- if(HAS_ALTIVEC)
- message(STATUS " HAS_ALTIVEC yes")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 66f0c14..38d1913 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -568,7 +568,9 @@ if(HAVE_INTEL)
- endif(HAVE_GOOD_YASM_ELF64)
- elseif(HAVE_POWER8)
- list(APPEND libcommon_files
-- common/crc32c_ppc.c
-+ common/crc32c_ppc.c)
-+elseif(HAVE_PPC64LE)
-+ list(APPEND libcommon_files
- common/crc32c_ppc_asm.S
- common/crc32c_ppc_fast_zero_asm.S)
- endif(HAVE_INTEL)
-diff --git a/src/arch/ppc.c b/src/arch/ppc.c
-index f21e2fe..11d3a49 100644
---- a/src/arch/ppc.c
-+++ b/src/arch/ppc.c
-@@ -14,10 +14,10 @@ int ceph_arch_ppc_crc32 = 0;
-
- #include <stdio.h>
-
--#if __linux__ && __powerpc64__
-+#ifdef HAVE_PPC64LE
- #include <sys/auxv.h>
- #include <asm/cputable.h>
--#endif /* __linux__ && __powerpc64__ */
-+#endif /* HAVE_PPC64LE */
-
- #ifndef PPC_FEATURE2_VEC_CRYPTO
- #define PPC_FEATURE2_VEC_CRYPTO 0x02000000
-@@ -31,9 +31,9 @@ int ceph_arch_ppc_probe(void)
- {
- ceph_arch_ppc_crc32 = 0;
-
--#if __linux__ && __powerpc64__
-+#ifdef HAVE_PPC64LE
- if (getauxval(AT_HWCAP2) & PPC_FEATURE2_VEC_CRYPTO) ceph_arch_ppc_crc32 = 1;
--#endif /* __linux__ && __powerpc64__ */
-+#endif /* HAVE_PPC64LE */
-
- return 0;
- }
-diff --git a/src/common/crc32c_ppc.c b/src/common/crc32c_ppc.c
-index 43756e2..52fd1c4 100644
---- a/src/common/crc32c_ppc.c
-+++ b/src/common/crc32c_ppc.c
-@@ -20,6 +20,7 @@
- #define VMX_ALIGN 16
- #define VMX_ALIGN_MASK (VMX_ALIGN-1)
-
-+#ifdef HAVE_PPC64LE
- #ifdef REFLECT
- static unsigned int crc32_align(unsigned int crc, unsigned char const *p,
- unsigned long len)
-@@ -38,7 +39,6 @@ static unsigned int crc32_align(unsigned int crc, unsigned char const *p,
- }
- #endif
-
--#ifdef HAVE_POWER8
- static inline unsigned long polynomial_multiply(unsigned int a, unsigned int b) {
- vector unsigned int va = {a, 0, 0, 0};
- vector unsigned int vb = {b, 0, 0, 0};
-@@ -134,7 +134,7 @@ uint32_t ceph_crc32c_ppc(uint32_t crc, unsigned char const *data, unsigned len)
- return crc;
- }
-
--#else /* HAVE_POWER8 */
-+#else /* HAVE_PPC64LE */
-
- /* This symbol has to exist on non-ppc architectures (and on legacy
- * ppc systems using power7 or below) in order to compile properly
-@@ -145,4 +145,4 @@ uint32_t ceph_crc32c_ppc(uint32_t crc, unsigned char const *data, unsigned len)
- return 0;
- }
-
--#endif /* HAVE_POWER8 */
-+#endif /* HAVE_PPC64LE */
---
-2.9.4
-
diff --git a/0003-librbd-Conditionally-import-TrimRequest.cc.patch b/0003-librbd-Conditionally-import-TrimRequest.cc.patch
deleted file mode 100644
index 2f02efb..0000000
--- a/0003-librbd-Conditionally-import-TrimRequest.cc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 74a754690736f6608b0d4d9c807df0bd777a129d Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto(a)redhat.com>
-Date: Fri, 8 Dec 2017 00:21:38 +0100
-Subject: [PATCH] librbd: Conditionally import TrimRequest.cc
-
-We include TrimRequest.cc in librbd tests at two places:
- - operation/test_mock_TrimRequest.cc
- - operation/test_mock_ResizeRequest.cc
-
-That causes linking errors when doing the builds because some of the
-structures are defined twice.
-
-Signed-off-by: Boris Ranto <branto(a)redhat.com>
----
- src/librbd/operation/TrimRequest.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/librbd/operation/TrimRequest.cc b/src/librbd/operation/TrimRequest.cc
-index 28f2deb..929ca51 100644
---- a/src/librbd/operation/TrimRequest.cc
-+++ b/src/librbd/operation/TrimRequest.cc
-@@ -362,4 +362,6 @@ void TrimRequest<I>::send_finish(int r) {
- } // namespace operation
- } // namespace librbd
-
-+#ifndef TEST_F
- template class librbd::operation::TrimRequest<librbd::ImageCtx>;
-+#endif
---
-2.9.5
-
diff --git a/0004-cmake-modules-BuildBoost.cmake.patch b/0004-cmake-modules-BuildBoost.cmake.patch
deleted file mode 100644
index 644a6c4..0000000
--- a/0004-cmake-modules-BuildBoost.cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ceph-12.2.3/cmake/modules/BuildBoost.cmake.orig 2018-02-21 14:13:32.527899631 -0500
-+++ ceph-12.2.3/cmake/modules/BuildBoost.cmake 2018-02-21 14:14:04.796899631 -0500
-@@ -75,7 +75,7 @@
- set(install_command
- ${b2} install)
- set(boost_root_dir "${CMAKE_BINARY_DIR}/boost")
-- if(EXISTS "${PROJECT_SOURCE_DIR}/src/boost/libs/config/include/boost/config.hpp")
-+ if(EXISTS "${PROJECT_SOURCE_DIR}/src/boost/boost/config.hpp")
- message(STATUS "boost already in src")
- set(source_dir
- SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost")
diff --git a/0005-src-rocksdb-table-block.h.patch b/0005-src-rocksdb-table-block.h.patch
deleted file mode 100644
index 8acb401..0000000
--- a/0005-src-rocksdb-table-block.h.patch
+++ /dev/null
@@ -1,155 +0,0 @@
---- ceph-12.2.3/src/rocksdb/table/block.h.orig 2018-02-22 07:49:38.044899631 -0500
-+++ ceph-12.2.3/src/rocksdb/table/block.h 2018-02-22 07:58:55.855899631 -0500
-@@ -65,7 +65,8 @@
-
- // Create bitmap and set all the bits to 0
- bitmap_ = new std::atomic<uint32_t>[bitmap_size];
-- memset(bitmap_, 0, bitmap_size * kBytesPersEntry);
-+ // memset(bitmap_, 0, bitmap_size * kBytesPersEntry);
-+ { unsigned i = 0; for (; i < bitmap_size;) bitmap_[i++] = 0; }
-
- RecordTick(GetStatistics(), READ_AMP_TOTAL_READ_BYTES,
- num_bits_needed << bytes_per_bit_pow_);
---- ceph-12.2.3/src/rocksdb/db/c.cc.orig 2018-02-22 08:14:56.033899631 -0500
-+++ ceph-12.2.3/src/rocksdb/db/c.cc 2018-02-22 10:06:39.759899631 -0500
-@@ -1322,11 +1322,6 @@
- b->rep.PutLogData(Slice(blob, len));
- }
-
--void rocksdb_writebatch_iterate(
-- rocksdb_writebatch_t* b,
-- void* state,
-- void (*put)(void*, const char* k, size_t klen, const char* v, size_t vlen),
-- void (*deleted)(void*, const char* k, size_t klen)) {
- class H : public WriteBatch::Handler {
- public:
- void* state_;
-@@ -1339,6 +1334,12 @@
- (*deleted_)(state_, key.data(), key.size());
- }
- };
-+
-+void rocksdb_writebatch_iterate(
-+ rocksdb_writebatch_t* b,
-+ void* state,
-+ void (*put)(void*, const char* k, size_t klen, const char* v, size_t vlen),
-+ void (*deleted)(void*, const char* k, size_t klen)) {
- H handler;
- handler.state_ = state;
- handler.put_ = put;
-@@ -1579,18 +1580,6 @@
- void* state,
- void (*put)(void*, const char* k, size_t klen, const char* v, size_t vlen),
- void (*deleted)(void*, const char* k, size_t klen)) {
-- class H : public WriteBatch::Handler {
-- public:
-- void* state_;
-- void (*put_)(void*, const char* k, size_t klen, const char* v, size_t vlen);
-- void (*deleted_)(void*, const char* k, size_t klen);
-- virtual void Put(const Slice& key, const Slice& value) override {
-- (*put_)(state_, key.data(), key.size(), value.data(), value.size());
-- }
-- virtual void Delete(const Slice& key) override {
-- (*deleted_)(state_, key.data(), key.size());
-- }
-- };
- H handler;
- handler.state_ = state;
- handler.put_ = put;
-@@ -2532,13 +2521,9 @@
- delete filter;
- }
-
--rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_format(int bits_per_key, bool original_format) {
-- // Make a rocksdb_filterpolicy_t, but override all of its methods so
-- // they delegate to a NewBloomFilterPolicy() instead of user
-- // supplied C functions.
-- struct Wrapper : public rocksdb_filterpolicy_t {
-+ struct WrapperFP : public rocksdb_filterpolicy_t {
- const FilterPolicy* rep_;
-- ~Wrapper() { delete rep_; }
-+ ~WrapperFP() { delete rep_; }
- const char* Name() const override { return rep_->Name(); }
- void CreateFilter(const Slice* keys, int n,
- std::string* dst) const override {
-@@ -2549,11 +2534,16 @@
- }
- static void DoNothing(void*) { }
- };
-- Wrapper* wrapper = new Wrapper;
-+
-+rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_format(int bits_per_key, bool original_format) {
-+ // Make a rocksdb_filterpolicy_t, but override all of its methods so
-+ // they delegate to a NewBloomFilterPolicy() instead of user
-+ // supplied C functions.
-+ WrapperFP* wrapper = new WrapperFP;
- wrapper->rep_ = NewBloomFilterPolicy(bits_per_key, original_format);
- wrapper->state_ = nullptr;
- wrapper->delete_filter_ = nullptr;
-- wrapper->destructor_ = &Wrapper::DoNothing;
-+ wrapper->destructor_ = &WrapperFP::DoNothing;
- return wrapper;
- }
-
-@@ -2889,10 +2879,9 @@
- delete st;
- }
-
--rocksdb_slicetransform_t* rocksdb_slicetransform_create_fixed_prefix(size_t prefixLen) {
-- struct Wrapper : public rocksdb_slicetransform_t {
-+ struct WrapperST : public rocksdb_slicetransform_t {
- const SliceTransform* rep_;
-- ~Wrapper() { delete rep_; }
-+ ~WrapperST() { delete rep_; }
- const char* Name() const override { return rep_->Name(); }
- Slice Transform(const Slice& src) const override {
- return rep_->Transform(src);
-@@ -2903,31 +2892,20 @@
- bool InRange(const Slice& src) const override { return rep_->InRange(src); }
- static void DoNothing(void*) { }
- };
-- Wrapper* wrapper = new Wrapper;
-+
-+rocksdb_slicetransform_t* rocksdb_slicetransform_create_fixed_prefix(size_t prefixLen) {
-+ WrapperST* wrapper = new WrapperST;
- wrapper->rep_ = rocksdb::NewFixedPrefixTransform(prefixLen);
- wrapper->state_ = nullptr;
-- wrapper->destructor_ = &Wrapper::DoNothing;
-+ wrapper->destructor_ = &WrapperST::DoNothing;
- return wrapper;
- }
-
- rocksdb_slicetransform_t* rocksdb_slicetransform_create_noop() {
-- struct Wrapper : public rocksdb_slicetransform_t {
-- const SliceTransform* rep_;
-- ~Wrapper() { delete rep_; }
-- const char* Name() const override { return rep_->Name(); }
-- Slice Transform(const Slice& src) const override {
-- return rep_->Transform(src);
-- }
-- bool InDomain(const Slice& src) const override {
-- return rep_->InDomain(src);
-- }
-- bool InRange(const Slice& src) const override { return rep_->InRange(src); }
-- static void DoNothing(void*) { }
-- };
-- Wrapper* wrapper = new Wrapper;
-+ WrapperST* wrapper = new WrapperST;
- wrapper->rep_ = rocksdb::NewNoopTransform();
- wrapper->state_ = nullptr;
-- wrapper->destructor_ = &Wrapper::DoNothing;
-+ wrapper->destructor_ = &WrapperST::DoNothing;
- return wrapper;
- }
-
---- ceph-12.2.3/src/rocksdb/memtable/inlineskiplist.h.orig 2018-02-22 10:34:06.918899631 -0500
-+++ ceph-12.2.3/src/rocksdb/memtable/inlineskiplist.h 2018-02-22 10:34:44.145899631 -0500
-@@ -279,7 +279,7 @@
- // next_[0]. This is used for passing data from AllocateKey to Insert.
- void StashHeight(const int height) {
- assert(sizeof(int) <= sizeof(next_[0]));
-- memcpy(&next_[0], &height, sizeof(int));
-+ memcpy(static_cast<void*>(&next_[0]), &height, sizeof(int));
- }
-
- // Retrieves the value passed to StashHeight. Undefined after a call
diff --git a/ceph.spec b/ceph.spec
index 9017056..1fa45d7 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -17,57 +17,56 @@
%global _hardened_build 1
%bcond_without ocf
-%ifnarch armv7hl
-%bcond_without cephfs_java
-%else
-%bcond_with cephfs_java
-%endif
-%if 0%{?suse_version}
-%bcond_with ceph_test_package
-%else
-%bcond_without ceph_test_package
-%endif
%bcond_with make_check
%ifarch s390 s390x
%bcond_with tcmalloc
%else
%bcond_without tcmalloc
%endif
-%ifnarch armv7hl
-%bcond_with lowmem_builder
-%else
-%if 0%{?rhel}
-%ifnarch ppc64le
-%bcond_with lowmem_builder
-%else
-%bcond_without lowmem_builder
-%endif
-%else
-%bcond_without lowmem_builder
-%endif
-%endif
%if 0%{?fedora} || 0%{?rhel}
%bcond_without selinux
+%bcond_without ceph_test_package
+%bcond_without cephfs_java
+%bcond_without lttng
%endif
%if 0%{?suse_version}
%bcond_with selinux
+%bcond_with ceph_test_package
+%bcond_with cephfs_java
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+%global _fillupdir /var/adm/fillup-templates
%endif
-
-# LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE)
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%if ! 0%{?is_opensuse}
+%if 0%{?is_opensuse}
+%bcond_without lttng
+%else
+%ifarch x86_64 aarch64
%bcond_without lttng
+%else
+%bcond_with lttng
%endif
%endif
+%endif
+%if 0%{?suse_version} >= 1500
+%bcond_with python2
+%else
+%bcond_without python2
+%endif
+%if 0%{without python2}
+%global _defined_if_python2_absent 1
+%endif
%if %{with selinux}
# get selinux policy version
-%{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null || echo 0.0.0)}
+%{!?_selinux_policy_version: %global _selinux_policy_version 0.0.0}
%endif
%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
%{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create}
%{!?python3_pkgversion: %global python3_pkgversion 3}
+# define _python_buildid macro which will expand to the empty string when
+# building with python2
+%global _python_buildid %{?_defined_if_python2_absent:%{python3_pkgversion}}
# unify libexec for all targets
%global _libexecdir %{_exec_prefix}/lib
@@ -85,7 +84,7 @@
# main package definition
#################################################################################
Name: ceph
-Version: 12.2.5
+Version: 13.1.0
Release: 1%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
@@ -102,12 +101,14 @@ Group: System/Filesystems
URL: http://ceph.com/
Source0: http://download.ceph.com/tarballs/%{name}-%{version}.tar.gz
# https://bugzilla.redhat.com/show_bug.cgi?id=1474773
-Patch001: 0001-src-rocksdb-util-murmurhash.patch
+Patch001: 0001-9df56dc509a6cbb7c1da8073e82fc1d2a284418d.patch
+#Patch001: 0001-src-rocksdb-util-murmurhash.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1474774
-Patch002: 0002-cmake-Support-ppc64.patch
-Patch003: 0003-librbd-Conditionally-import-TrimRequest.cc.patch
-Patch005: 0005-src-rocksdb-table-block.h.patch
+#Patch002: 0002-cmake-Support-ppc64.patch
+#Patch003: 0003-librbd-Conditionally-import-TrimRequest.cc.patch
+#Patch005: 0005-src-rocksdb-table-block.h.patch
%if 0%{?suse_version}
+# _insert_obs_source_lines_here
%if 0%{?is_opensuse}
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
%else
@@ -117,10 +118,10 @@ ExclusiveArch: x86_64 aarch64 ppc64le s390x
#################################################################################
# dependencies that apply across all distro families
#################################################################################
-Requires: ceph-osd = %{_epoch_prefix}%{version}-%{release}
-Requires: ceph-mds = %{_epoch_prefix}%{version}-%{release}
-Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
-Requires: ceph-mon = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-osd = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-mds = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-mon = %{_epoch_prefix}%{version}-%{release}
Requires(post): binutils
%if 0%{with cephfs_java}
BuildRequires: java-devel
@@ -129,50 +130,47 @@ BuildRequires: sharutils
%if 0%{with selinux}
BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
-BuildRequires: selinux-policy-doc
-%endif
-%if 0%{with make_check}
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: python-cherrypy
-BuildRequires: python-werkzeug
-%endif
-%if 0%{?suse_version}
-BuildRequires: python-CherryPy
-BuildRequires: python-Werkzeug
-BuildRequires: python-numpy-devel
-%endif
-BuildRequires: python-coverage
-BuildRequires: python-pecan
-BuildRequires: socat
%endif
BuildRequires: bc
BuildRequires: gperf
-BuildRequires: cmake
+BuildRequires: cmake
BuildRequires: cryptsetup
BuildRequires: fuse-devel
+%if 0%{?rhel} == 7
+# devtoolset offers newer make and valgrind-devel, but the old ones are good
+# enough.
+BuildRequires: devtoolset-7-gcc-c++
+%else
BuildRequires: gcc-c++
+%endif
BuildRequires: gdbm
%if 0%{with tcmalloc}
BuildRequires: gperftools-devel >= 2.4
%endif
-BuildRequires: jq
+BuildRequires: jq
BuildRequires: leveldb-devel > 1.2
BuildRequires: libaio-devel
BuildRequires: libblkid-devel >= 2.17
BuildRequires: libcurl-devel
BuildRequires: libudev-devel
+BuildRequires: liboath-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
+BuildRequires: libuuid-devel
BuildRequires: make
BuildRequires: parted
BuildRequires: perl
BuildRequires: pkgconfig
-BuildRequires: python
-BuildRequires: python-devel
-BuildRequires: python-nose
-BuildRequires: python-requests
-BuildRequires: python-virtualenv
+BuildRequires: procps
+BuildRequires: python%{_python_buildid}
+BuildRequires: python%{_python_buildid}-devel
+BuildRequires: python%{_python_buildid}-nose
+BuildRequires: python%{_python_buildid}-requests
+BuildRequires: python%{_python_buildid}-virtualenv
BuildRequires: snappy-devel
+%if 0%{with make_check}
+BuildRequires: socat
+%endif
BuildRequires: udev
BuildRequires: util-linux
BuildRequires: valgrind-devel
@@ -186,27 +184,31 @@ BuildRequires: yasm
# distro-conditional dependencies
#################################################################################
%if 0%{?suse_version}
-BuildRequires: pkgconfig(systemd)
+BuildRequires: pkgconfig(systemd)
BuildRequires: systemd-rpm-macros
BuildRequires: systemd
%{?systemd_requires}
PreReq: %fillup_prereq
BuildRequires: net-tools
BuildRequires: libbz2-devel
-BuildRequires: btrfsprogs
+BuildRequires: btrfsprogs
BuildRequires: mozilla-nss-devel
BuildRequires: keyutils-devel
-BuildRequires: libopenssl-devel
-BuildRequires: lsb-release
-BuildRequires: openldap2-devel
-BuildRequires: python-Cython
-BuildRequires: python-PrettyTable
-BuildRequires: python-Sphinx
-BuildRequires: rdma-core-devel
+BuildRequires: libopenssl-devel
+BuildRequires: lsb-release
+BuildRequires: openldap2-devel
+BuildRequires: cunit-devel
+BuildRequires: python%{_python_buildid}-base
+BuildRequires: python%{_python_buildid}-Cython
+BuildRequires: python%{_python_buildid}-PrettyTable
+BuildRequires: python%{_python_buildid}-Sphinx
+BuildRequires: rdma-core-devel
+BuildRequires: liblz4-devel >= 1.7
+BuildRequires: rdma-core-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
Requires: systemd
-BuildRequires: boost-random
+BuildRequires: boost-random
BuildRequires: btrfs-progs
BuildRequires: nss-devel
BuildRequires: keyutils-libs-devel
@@ -214,12 +216,14 @@ BuildRequires: keyutils-libs-devel
%ifnarch %{arm}
BuildRequires: rdma-core-devel
%endif
-BuildRequires: openldap-devel
-BuildRequires: openssl-devel
-BuildRequires: redhat-lsb-core
-BuildRequires: Cython
-BuildRequires: python-prettytable
-BuildRequires: python-sphinx
+BuildRequires: openldap-devel
+BuildRequires: openssl-devel
+BuildRequires: redhat-lsb-core
+BuildRequires: CUnit-devel
+BuildRequires: Cython%{_python_buildid}
+BuildRequires: python%{_python_buildid}-prettytable
+BuildRequires: python%{_python_buildid}-sphinx
+BuildRequires: lz4-devel >= 1.7
%endif
# python34-... for RHEL, python3-... for all other supported distros
%if ( 0%{?rhel} && 0%{?rhel} <= 7 )
@@ -231,6 +235,33 @@ BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-Cython
%endif
+# distro-conditional make check dependencies
+%if 0%{with make_check}
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: python%{_python_buildid}-cherrypy
+BuildRequires: python%{_python_buildid}-routes
+BuildRequires: python%{_python_buildid}-pecan
+BuildRequires: python%{_python_buildid}-werkzeug
+BuildRequires: python%{_python_buildid}-tox
+BuildRequires: python%{_python_buildid}-coverage
+%if 0%{?fedora}
+BuildRequires: python%{_python_buildid}-bcrypt
+%endif
+%if 0%{?rhel}
+BuildRequires: py-bcrypt
+%endif
+%endif
+%if 0%{?suse_version}
+BuildRequires: python%{_python_buildid}-CherryPy
+BuildRequires: python%{_python_buildid}-Routes
+BuildRequires: python%{_python_buildid}-Werkzeug
+BuildRequires: python%{_python_buildid}-pecan
+BuildRequires: python%{_python_buildid}-numpy-devel
+BuildRequires: python%{_python_buildid}-bcrypt
+BuildRequires: python%{_python_buildid}-tox
+BuildRequires: python%{_python_buildid}-coverage
+%endif
+%endif
# lttng and babeltrace for rbd-replay-prep
%if %{with lttng}
%if 0%{?fedora} || 0%{?rhel}
@@ -239,7 +270,7 @@ BuildRequires: libbabeltrace-devel
%endif
%if 0%{?suse_version}
BuildRequires: lttng-ust-devel
-BuildRequires: babeltrace-devel
+BuildRequires: babeltrace-devel
%endif
%endif
%if 0%{?suse_version}
@@ -250,7 +281,7 @@ BuildRequires: expat-devel
%endif
#hardened-cc1
%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: redhat-rpm-config
+BuildRequires: redhat-rpm-config
%endif
%description
@@ -262,33 +293,39 @@ on commodity hardware and delivers object, block and file system storage.
# subpackages
#################################################################################
%package base
-Summary: Ceph Base Package
+Summary: Ceph Base Package
%if 0%{?suse_version}
-Group: System/Filesystems
+Group: System/Filesystems
%endif
-Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
-Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
-Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
-Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
-Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
+Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
+Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
+Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
%if 0%{with selinux}
-Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release}
%endif
Requires(post):/sbin/ldconfig
Requires(postun):/sbin/ldconfig
-Requires: python
-Requires: python-requests
-Requires: python-setuptools
-Requires: grep
-Requires: xfsprogs
-Requires: logrotate
-Requires: util-linux
-Requires: cryptsetup
-Requires: findutils
-Requires: psmisc
-Requires: which
-%if 0%{?suse_version}
-Recommends: ntp-daemon
+Requires: cryptsetup
+Requires: e2fsprogs
+Requires: findutils
+Requires: grep
+Requires: logrotate
+Requires: parted
+Requires: psmisc
+Requires: python%{_python_buildid}-requests
+Requires: python%{_python_buildid}-setuptools
+Requires: util-linux
+Requires: xfsprogs
+Requires: which
+%if 0%{?fedora} || 0%{?rhel}
+Requires: gdisk
+%endif
+%if 0%{?suse_version}
+Recommends: ntp-daemon
+Recommends: chrony
+Requires: gptfdisk
%endif
%description base
Base is the package that includes all the files shared amongst ceph servers
@@ -301,17 +338,18 @@ Group: System/Filesystems
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
-Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
-Requires: python-rbd = %{_epoch_prefix}%{version}-%{release}
-Requires: python-cephfs = %{_epoch_prefix}%{version}-%{release}
-Requires: python-rgw = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{_python_buildid}-rados = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{_python_buildid}-rbd = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{_python_buildid}-cephfs = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{_python_buildid}-rgw = %{_epoch_prefix}%{version}-%{release}
%if 0%{?fedora} || 0%{?rhel}
-Requires: python-prettytable
+Requires: python%{_python_buildid}-prettytable
+Requires: python%{_python_buildid}-requests
%endif
%if 0%{?suse_version}
-Requires: python-PrettyTable
+Requires: python%{_python_buildid}-PrettyTable
+Requires: python%{_python_buildid}-requests
%endif
-Requires: python-requests
%{?systemd_requires}
%if 0%{?suse_version}
Requires(pre): pwdutils
@@ -337,13 +375,6 @@ Summary: Ceph Monitor Daemon
Group: System/Filesystems
%endif
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
-# For ceph-rest-api
-%if 0%{?fedora} || 0%{?rhel}
-Requires: python-flask
-%endif
-%if 0%{?suse_version}
-Requires: python-Flask
-%endif
%description mon
ceph-mon is the cluster monitor daemon for the Ceph distributed file
system. One or more instances of ceph-mon form a Paxos part-time
@@ -351,24 +382,29 @@ parliament cluster that provides extremely reliable and durable storage
of cluster membership, configuration, and state.
%package mgr
-Summary: Ceph Manager Daemon
+Summary: Ceph Manager Daemon
%if 0%{?suse_version}
-Group: System/Filesystems
+Group: System/Filesystems
%endif
-Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
%if 0%{?fedora} || 0%{?rhel}
-Requires: python-cherrypy
-Requires: python-jinja2
-Requires: python-werkzeug
-Requires: pyOpenSSL
+Requires: python%{_python_buildid}-cherrypy
+Requires: python%{_python_buildid}-routes
+Requires: python%{_python_buildid}-jinja2
+Requires: python%{_python_buildid}-pecan
+Requires: python%{_python_buildid}-werkzeug
+Requires: pyOpenSSL%{_python_buildid}
+%endif
+%if 0%{?suse_version}
+Requires: python%{_python_buildid}-CherryPy
+Requires: python%{_python_buildid}-Routes
+Requires: python%{_python_buildid}-Jinja2
+Requires: python%{_python_buildid}-Werkzeug
+Requires: python%{_python_buildid}-pecan
+Requires: python%{_python_buildid}-pyOpenSSL
+Requires: python%{_python_buildid}-bcrypt
+Recommends: python%{_python_buildid}-influxdb
%endif
-%if 0%{?suse_version}
-Requires: python-CherryPy
-Requires: python-jinja2
-Requires: python-Werkzeug
-Requires: python-pyOpenSSL
-%endif
-Requires: python-pecan
%description mgr
ceph-mgr enables python modules that provide services (such as the REST
module derived from Calamari) and expose CLI hooks. ceph-mgr gathers
@@ -455,15 +491,7 @@ Summary: Ceph Object Storage Daemon
Group: System/Filesystems
%endif
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
-# for sgdisk, used by ceph-disk
-%if 0%{?fedora} || 0%{?rhel}
-Requires: gdisk
-%endif
-%if 0%{?suse_version}
-Requires: gptfdisk
-%endif
-Requires: parted
-Requires: lvm2
+Requires: lvm2
%description osd
ceph-osd is the object storage daemon for the Ceph distributed file
system. It is responsible for storing objects on a local file system
@@ -520,6 +548,7 @@ Obsoletes: librgw2-devel < %{_epoch_prefix}%{version}-%{release}
This package contains libraries and headers needed to develop programs
that use RADOS gateway client library.
+%if 0%{with python2}
%package -n python-rgw
Summary: Python 2 libraries for the RADOS gateway
%if 0%{?suse_version}
@@ -531,11 +560,12 @@ Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-rgw
This package contains Python 2 libraries for interacting with Cephs RADOS
gateway.
+%endif
%package -n python%{python3_pkgversion}-rgw
Summary: Python 3 libraries for the RADOS gateway
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
@@ -543,6 +573,7 @@ Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{relea
This package contains Python 3 libraries for interacting with Cephs RADOS
gateway.
+%if 0%{with python2}
%package -n python-rados
Summary: Python 2 libraries for the RADOS object store
%if 0%{?suse_version}
@@ -553,11 +584,12 @@ Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-rados
This package contains Python 2 libraries for interacting with Cephs RADOS
object store.
+%endif
%package -n python%{python3_pkgversion}-rados
Summary: Python 3 libraries for the RADOS object store
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
Requires: python%{python3_pkgversion}
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
@@ -623,10 +655,11 @@ Obsoletes: librbd1-devel < %{_epoch_prefix}%{version}-%{release}
This package contains libraries and headers needed to develop programs
that use RADOS block device.
+%if 0%{with python2}
%package -n python-rbd
Summary: Python 2 libraries for the RADOS block device
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
@@ -634,11 +667,12 @@ Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-rbd
This package contains Python 2 libraries for interacting with Cephs RADOS
block device.
+%endif
%package -n python%{python3_pkgversion}-rbd
Summary: Python 3 libraries for the RADOS block device
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
@@ -677,24 +711,26 @@ Obsoletes: libcephfs2-devel < %{_epoch_prefix}%{version}-%{release}
This package contains libraries and headers needed to develop programs
that use Cephs distributed file system.
+%if 0%{with python2}
%package -n python-cephfs
Summary: Python 2 libraries for Ceph distributed file system
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
%if 0%{?suse_version}
-Recommends: python-rados = %{_epoch_prefix}%{version}-%{release}
+Recommends: python-rados = %{_epoch_prefix}%{version}-%{release}
%endif
Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-cephfs
This package contains Python 2 libraries for interacting with Cephs distributed
file system.
+%endif
%package -n python%{python3_pkgversion}-cephfs
Summary: Python 3 libraries for Ceph distributed file system
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
@@ -702,16 +738,18 @@ Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{relea
This package contains Python 3 libraries for interacting with Cephs distributed
file system.
+%if 0%{with python2}
%package -n python%{python3_pkgversion}-ceph-argparse
Summary: Python 3 utility libraries for Ceph CLI
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
%description -n python%{python3_pkgversion}-ceph-argparse
This package contains types and routines for Python 3 used by the Ceph CLI as
well as the RESTful interface. These have to do with querying the daemons for
command-description information, validating user command input against those
descriptions, and submitting the command to the appropriate daemon.
+%endif
%if 0%{with ceph_test_package}
%package -n ceph-test
@@ -761,17 +799,18 @@ Group: System/Libraries
%endif
Requires: java
Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release}
-Requires: junit
-BuildRequires: junit
+BuildRequires: junit
%description -n cephfs-java
This package contains the Java libraries for the Ceph File System.
%endif
%package -n rados-objclass-devel
-Summary: RADOS object class development kit
-Group: Development/Libraries
-Requires: librados2-devel = %{_epoch_prefix}%{version}-%{release}
+Summary: RADOS object class development kit
+%if 0%{?suse_version}
+Group: Development/Libraries/C and C++
+%endif
+Requires: librados2-devel = %{_epoch_prefix}%{version}-%{release}
%description -n rados-objclass-devel
This package contains libraries and headers needed to develop RADOS object
class plugins.
@@ -795,10 +834,11 @@ populated file-systems.
%endif
+%if 0%{with python2}
%package -n python-ceph-compat
Summary: Compatibility package for Cephs python libraries
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
Obsoletes: python-ceph
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
@@ -811,6 +851,7 @@ This is a compatibility package to accommodate python-ceph split into
python-rados, python-rbd, python-rgw and python-cephfs. Packages still
depending on python-ceph should be fixed to depend on python-rados,
python-rbd, python-rgw or python-cephfs instead.
+%endif
#################################################################################
# common
@@ -819,6 +860,11 @@ python-rbd, python-rgw or python-cephfs instead.
%autosetup -p1 -n %{name}-%{version}
%build
+
+%if 0%{?rhel} == 7
+. /opt/rh/devtoolset-7/enable
+%endif
+
%if 0%{with cephfs_java}
# Find jni.h
for i in /usr/{lib64,lib}/jvm/java/include{,/linux}; do
@@ -826,36 +872,39 @@ for i in /usr/{lib64,lib}/jvm/java/include{,/linux}; do
done
%endif
-%if %{with lowmem_builder}
+%if 0%{?suse_version}
+# the following setting fixed an OOM condition we once encountered in the OBS
RPM_OPT_FLAGS="$RPM_OPT_FLAGS --param ggc-min-expand=20 --param ggc-min-heapsize=32768"
%endif
-%ifnarch armv7hl
-export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
-%else
-export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/' -e 's/-pipe//g'`
-%endif
export CPPFLAGS="$java_inc"
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
export LDFLAGS="$RPM_LD_FLAGS"
-env | sort
-
-%if %{with lowmem_builder}
-%ifnarch armv7hl
-%if 0%{?jobs} > 8
-%define _smp_mflags -j8
-%endif
-%else
-%define _smp_mflags -j1
-%endif
-%endif
+# Parallel build settings ...
+CEPH_MFLAGS_JOBS="%{?_smp_mflags}"
+CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//')
+%if 0%{?__isa_bits} == 32
+# 32-bit builds can use 3G memory max, which is not enough even for -j2
+CEPH_SMP_NCPUS="1"
+%endif
+# do not eat all memory
+echo "Available memory:"
+free -h
+echo "System limits:"
+ulimit -a
+if test -n "$CEPH_SMP_NCPUS" -a "$CEPH_SMP_NCPUS" -gt 1 ; then
+ mem_per_process=1800
+ max_mem=$(LANG=C free -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p")
+ max_jobs="$(($max_mem / $mem_per_process))"
+ test "$CEPH_SMP_NCPUS" -gt "$max_jobs" && CEPH_SMP_NCPUS="$max_jobs" && echo "Warning: Reducing build parallelism to -j$max_jobs because of memory limits"
+ test "$CEPH_SMP_NCPUS" -le 0 && CEPH_SMP_NCPUS="1" && echo "Warning: Not using parallel build at all because of memory limits"
+fi
+export CEPH_SMP_NCPUS
+export CEPH_MFLAGS_JOBS="-j$CEPH_SMP_NCPUS"
-# unlimit _smp_mflags in system macro if not set above
-%define _smp_ncpus_max 0
-# extract the number of processors for use with cmake
-%define _smp_ncpus %(echo %{_smp_mflags} | sed 's/-j//')
+env | sort
mkdir build
cd build
@@ -871,7 +920,13 @@ cmake .. \
-DWITH_EMBEDDED=OFF \
-DWITH_MANPAGE=ON \
-DWITH_PYTHON3=ON \
- -DWITH_SYSTEMD=ON \
+ -DWITH_MGR_DASHBOARD_FRONTEND=OFF \
+%if %{with python2}
+ -DWITH_PYTHON2=ON \
+%else
+ -DWITH_PYTHON2=OFF \
+ -DMGR_PYTHON_VERSION=3 \
+%endif
%if ( ( 0%{?rhel} && 0%{?rhel} <= 7) && ! 0%{?centos} )
-DWITH_SUBMAN=ON \
%endif
@@ -903,21 +958,18 @@ cmake .. \
%ifnarch %{arm}
-DWITH_RDMA=OFF \
%endif
- -DBOOST_J=%{_smp_ncpus}
-
-make %{?_smp_mflags}
+ -DBOOST_J=$CEPH_SMP_NCPUS
+make "$CEPH_MFLAGS_JOBS"
%if 0%{with make_check}
%check
# run in-tree unittests
cd build
-ctest %{?_smp_mflags}
-
+ctest "$CEPH_MFLAGS_JOBS"
%endif
-
%install
pushd build
make DESTDIR=%{buildroot} install
@@ -929,10 +981,9 @@ install -m 0644 -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap
install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph
%endif
%if 0%{?suse_version}
-install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_fillupdir}/sysconfig.%{name}
%endif
install -m 0644 -D systemd/ceph.tmpfiles.d %{buildroot}%{_tmpfilesdir}/ceph-common.conf
-install -m 0755 -D systemd/ceph %{buildroot}%{_sbindir}/rcceph
install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_libexecdir}/systemd/system-preset/50-ceph.preset
mkdir -p %{buildroot}%{_sbindir}
install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
@@ -989,7 +1040,6 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
%{_libexecdir}/systemd/system-preset/50-ceph.preset
%{_sbindir}/ceph-create-keys
%{_sbindir}/ceph-disk
-%{_sbindir}/rcceph
%dir %{_libexecdir}/ceph
%{_libexecdir}/ceph/ceph_common.sh
%dir %{_libdir}/rados-classes
@@ -1012,17 +1062,28 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
%config(noreplace) %{_sysconfdir}/sysconfig/ceph
%endif
%if 0%{?suse_version}
-%{_localstatedir}/adm/fillup-templates/sysconfig.*
+%{_fillupdir}/sysconfig.*
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
%endif
%{_unitdir}/ceph-disk@.service
%{_unitdir}/ceph.target
+%if 0%{with python2}
%{python_sitelib}/ceph_detect_init*
%{python_sitelib}/ceph_disk*
+%else
+%{python3_sitelib}/ceph_detect_init*
+%{python3_sitelib}/ceph_disk*
+%endif
+%if 0%{with python2}
%dir %{python_sitelib}/ceph_volume
%{python_sitelib}/ceph_volume/*
%{python_sitelib}/ceph_volume-*
+%else
+%dir %{python3_sitelib}/ceph_volume
+%{python3_sitelib}/ceph_volume/*
+%{python3_sitelib}/ceph_volume-*
+%endif
%{_mandir}/man8/ceph-deploy.8*
%{_mandir}/man8/ceph-detect-init.8*
%{_mandir}/man8/ceph-create-keys.8*
@@ -1093,7 +1154,6 @@ fi
%{_bindir}/ceph-dencoder
%{_bindir}/ceph-rbdnamer
%{_bindir}/ceph-syn
-%{_bindir}/ceph-crush-location
%{_bindir}/cephfs-data-scan
%{_bindir}/cephfs-journal-tool
%{_bindir}/cephfs-table-tool
@@ -1139,8 +1199,15 @@ fi
%config %{_sysconfdir}/bash_completion.d/radosgw-admin
%config(noreplace) %{_sysconfdir}/ceph/rbdmap
%{_unitdir}/rbdmap.service
+%if 0%{with python2}
%{python_sitelib}/ceph_argparse.py*
%{python_sitelib}/ceph_daemon.py*
+%else
+%{python3_sitelib}/ceph_argparse.py
+%{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py*
+%{python3_sitelib}/ceph_daemon.py
+%{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py*
+%endif
%dir %{_udevrulesdir}
%{_udevrulesdir}/50-rbd.rules
%attr(3770,ceph,ceph) %dir %{_localstatedir}/log/ceph/
@@ -1282,11 +1349,8 @@ fi
%files mon
%{_bindir}/ceph-mon
-%{_bindir}/ceph-rest-api
%{_bindir}/ceph-monstore-tool
%{_mandir}/man8/ceph-mon.8*
-%{_mandir}/man8/ceph-rest-api.8*
-%{python_sitelib}/ceph_rest_api.py*
%{_unitdir}/ceph-mon@.service
%{_unitdir}/ceph-mon.target
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mon
@@ -1559,9 +1623,11 @@ fi
%{_bindir}/librados-config
%{_mandir}/man8/librados-config.8*
+%if 0%{with python2}
%files -n python-rados
%{python_sitearch}/rados.so
%{python_sitearch}/rados-*.egg-info
+%endif
%files -n python%{python3_pkgversion}-rados
%{python3_sitearch}/rados.cpython*.so
@@ -1597,6 +1663,10 @@ fi
%ldconfig_scriptlets -n librgw2
%files -n librgw2
%{_libdir}/librgw.so.*
+%if %{with lttng}
+%{_libdir}/librgw_op_tp.so*
+%{_libdir}/librgw_rados_tp.so*
+%endif
%files -n librgw-devel
%dir %{_includedir}/rados
@@ -1604,17 +1674,21 @@ fi
%{_includedir}/rados/rgw_file.h
%{_libdir}/librgw.so
+%if 0%{with python2}
%files -n python-rgw
%{python_sitearch}/rgw.so
%{python_sitearch}/rgw-*.egg-info
+%endif
%files -n python%{python3_pkgversion}-rgw
%{python3_sitearch}/rgw.cpython*.so
%{python3_sitearch}/rgw-*.egg-info
+%if 0%{with python2}
%files -n python-rbd
%{python_sitearch}/rbd.so
%{python_sitearch}/rbd-*.egg-info
+%endif
%files -n python%{python3_pkgversion}-rbd
%{python3_sitearch}/rbd.cpython*.so
@@ -1630,10 +1704,12 @@ fi
%{_includedir}/cephfs/ceph_statx.h
%{_libdir}/libcephfs.so
+%if 0%{with python2}
%files -n python-cephfs
%{python_sitearch}/cephfs.so
%{python_sitearch}/cephfs-*.egg-info
%{python_sitelib}/ceph_volume_client.py*
+%endif
%files -n python%{python3_pkgversion}-cephfs
%{python3_sitearch}/cephfs.cpython*.so
@@ -1641,11 +1717,13 @@ fi
%{python3_sitelib}/ceph_volume_client.py
%{python3_sitelib}/__pycache__/ceph_volume_client.cpython*.py*
+%if 0%{with python2}
%files -n python%{python3_pkgversion}-ceph-argparse
%{python3_sitelib}/ceph_argparse.py
%{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py*
%{python3_sitelib}/ceph_daemon.py
%{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py*
+%endif
%if 0%{with ceph_test_package}
%files -n ceph-test
@@ -1667,13 +1745,7 @@ fi
%{_bindir}/ceph_rgw_multiparser
%{_bindir}/ceph_scratchtool
%{_bindir}/ceph_scratchtoolpp
-%{_bindir}/ceph_smalliobench
-%{_bindir}/ceph_smalliobenchdumb
-%{_bindir}/ceph_smalliobenchfs
-%{_bindir}/ceph_smalliobenchrbd
%{_bindir}/ceph_test_*
-%{_bindir}/ceph_tpbench
-%{_bindir}/ceph_xattr_bench
%{_bindir}/ceph-coverage
%{_bindir}/ceph-debugpack
%{_mandir}/man8/ceph-debugpack.8*
@@ -1790,12 +1862,17 @@ exit 0
%endif # with selinux
+%if 0%{with python2}
%files -n python-ceph-compat
# We need an empty %%files list for python-ceph-compat, to tell rpmbuild to
# actually build this meta package.
+%endif
%changelog
+* Tue May 8 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:13.1.0-1
+- New release (1:13.1.0-1)
+
* Fri Apr 27 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.5-1
- New release (1:12.2.5-1)
diff --git a/sources b/sources
index 021832c..e0ac550 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-12.2.5.tar.gz) = bd78358590eb077afcc3c1e12864fadee906c95ac8afee25bdca6155f99b75f89d923159fcc13430abba21a89fee3e566177ff5f9ffabdd3b3f220d05602ab86
+SHA512 (ceph-13.1.0.tar.gz) = d4feb0b0bac5e30232eddcc3f69c1d939f0b5268491acecba9a58dcadbbdaab6367f415ede924ca84de9a89a686410613cdc631f8aff15aec0eb4531138eec7a
6 years
Architecture specific change in rpms/golang-github-ncw-dropbox-sdk-go-unofficial.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-ncw-dropbox-sdk-go-unofficial.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-ncw-dropbox-sdk-go-....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 66083d01aa084bd1a6237f63caa5803a6ffff980
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Tue May 8 16:35:01 2018 +0200
Renamed to golang-github-ncw-dropbox-sdk-unofficial.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 89609d8..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/dropbox-sdk-go-unofficial-5d9f46f.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..be333f1
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Renamed to golang-github-ncw-dropbox-sdk-unofficial.
diff --git a/golang-github-ncw-dropbox-sdk-go-unofficial.spec b/golang-github-ncw-dropbox-sdk-go-unofficial.spec
deleted file mode 100644
index 2072672..0000000
--- a/golang-github-ncw-dropbox-sdk-go-unofficial.spec
+++ /dev/null
@@ -1,178 +0,0 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
-
-# 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 ncw
-%global repo dropbox-sdk-go-unofficial
-# https://github.com/ncw/dropbox-sdk-go-unofficial
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 5d9f46f9862ae5f65e264e178de6ce2c41a32d40
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20170530
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
-Summary: An unofficial Go SDK for integrating with the Dropbox API v2
-# Detected licences
-# - MIT/X11 (BSD like) at 'LICENSE'
-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}
-
-
-
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(golang.org/x/oauth2)
-%endif
-
-Requires: golang(golang.org/x/oauth2)
-
-Provides: golang(%{import_path}/dropbox) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/async) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/auth) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/common) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/files) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/paper) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/properties) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/sharing) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team_common) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team_log) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team_policies) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/users) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/users_common) = %{version}-%{release}
-Provides: golang(%{import_path}/generator/go_rsrc) = %{version}-%{release}
-Provides: golang(%{import_path}/generator/go_rsrc/files) = %{version}-%{release}
-Provides: golang(%{import_path}/generator/go_rsrc/sharing) = %{version}-%{release}
-
-%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%prep
-%setup -q -n %{repo}-%{commit}
-
-%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
-%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
-
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20170530git5d9f46f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Jul 24 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20170530git5d9f46f
-- First package for Fedora
-
diff --git a/sources b/sources
deleted file mode 100644
index 5b4aa91..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (dropbox-sdk-go-unofficial-5d9f46f.tar.gz) = 32875c330e36433a6ec285c660355c37ab7070e6fa148d0f2f6bfbc20310f3966e6a782c4e216f949174bd551c8c24923c55908b22703f1905d64f07fe0480c7
6 years
Architecture specific change in rpms/golang-github-ncw-dropbox-sdk-go-unofficial.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-ncw-dropbox-sdk-go-unofficial.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-ncw-dropbox-sdk-go-....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 1f3ee2e3dc76de3a96acea57fea77c19701a1336
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Tue May 8 16:34:41 2018 +0200
Renamed to golang-github-ncw-dropbox-sdk-unofficial.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 89609d8..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/dropbox-sdk-go-unofficial-5d9f46f.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..be333f1
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Renamed to golang-github-ncw-dropbox-sdk-unofficial.
diff --git a/golang-github-ncw-dropbox-sdk-go-unofficial.spec b/golang-github-ncw-dropbox-sdk-go-unofficial.spec
deleted file mode 100644
index 2072672..0000000
--- a/golang-github-ncw-dropbox-sdk-go-unofficial.spec
+++ /dev/null
@@ -1,178 +0,0 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
-
-# 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 ncw
-%global repo dropbox-sdk-go-unofficial
-# https://github.com/ncw/dropbox-sdk-go-unofficial
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 5d9f46f9862ae5f65e264e178de6ce2c41a32d40
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20170530
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
-Summary: An unofficial Go SDK for integrating with the Dropbox API v2
-# Detected licences
-# - MIT/X11 (BSD like) at 'LICENSE'
-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}
-
-
-
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(golang.org/x/oauth2)
-%endif
-
-Requires: golang(golang.org/x/oauth2)
-
-Provides: golang(%{import_path}/dropbox) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/async) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/auth) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/common) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/files) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/paper) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/properties) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/sharing) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team_common) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team_log) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team_policies) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/users) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/users_common) = %{version}-%{release}
-Provides: golang(%{import_path}/generator/go_rsrc) = %{version}-%{release}
-Provides: golang(%{import_path}/generator/go_rsrc/files) = %{version}-%{release}
-Provides: golang(%{import_path}/generator/go_rsrc/sharing) = %{version}-%{release}
-
-%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%prep
-%setup -q -n %{repo}-%{commit}
-
-%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
-%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
-
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20170530git5d9f46f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Jul 24 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20170530git5d9f46f
-- First package for Fedora
-
diff --git a/sources b/sources
deleted file mode 100644
index 5b4aa91..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (dropbox-sdk-go-unofficial-5d9f46f.tar.gz) = 32875c330e36433a6ec285c660355c37ab7070e6fa148d0f2f6bfbc20310f3966e6a782c4e216f949174bd551c8c24923c55908b22703f1905d64f07fe0480c7
6 years
Architecture specific change in rpms/firmware-addon-dell.git
by githook-noreply@fedoraproject.org
The package rpms/firmware-addon-dell.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/firmware-addon-dell.git/commit/?i....
Change:
-ExclusiveArch: x86_64 ia64 %{ix86}
Thanks.
Full change:
============
commit 23f8bab6e1a3dc30b6a49ed46e6b2b8c430ea4c0
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Tue May 8 10:19:45 2018 -0400
"The recommendation from Dell is to drop it. Other distros have dropped it too" -- Charles Rose, Dell
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f1f02ae..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-firmware-addon-dell-2.2.9.tar.bz2
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..06367a5
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+"The recommendation from Dell is to drop it. Other distros have dropped it too" -- Charles Rose, Dell
diff --git a/firmware-addon-dell.spec b/firmware-addon-dell.spec
deleted file mode 100644
index 87414a3..0000000
--- a/firmware-addon-dell.spec
+++ /dev/null
@@ -1,230 +0,0 @@
-# vim:tw=0:ts=4:sw=4:et
-%define major 2
-%define minor 2
-%define micro 9
-%define extra %{nil}
-%define release_version %{major}.%{minor}.%{micro}%{extra}
-
-# required by suse build system
-# norootforbuild
-
-%define run_unit_tests 1
-%{?_without_unit_tests: %define run_unit_tests 0}
-%{?_with_unit_tests: %define run_unit_tests 1}
-
-%define python_xml_BR %{nil}
-# Some variable definitions so that we can be compatible between SUSE Build service and Fedora build system
-# SUSE: fedora_version suse_version rhel_version centos_version sles_version
-# Fedora: fedora dist fc8 fc9
-%if 0%{?suse_version} || 0%{?sles_version}
- %define python_xml_BR python-xml
-%endif
-
-# per fedora python packaging guidelines
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-# no debuginfo package, as there are no compiled binaries.
-%define debug_package %{nil}
-
-Name: firmware-addon-dell
-Version: %{release_version}
-Release: 17%{?dist}
-Summary: A firmware-tools plugin to handle BIOS/Firmware for Dell systems
-
-Group: Applications/System
-License: GPLv2+ or OSL 2.1
-URL: http://linux.dell.com/libsmbios/download/
-Source0: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{nam...
-Patch0: replace_wineprefix_with_wineboot.patch
-
-# Dell only sells Intel-compat systems, so this package doesnt make much sense
-# on, eg. PPC. Also, we rely on libsmbios, which is only avail on Intel-compat
-ExclusiveArch: x86_64 ia64 %{ix86}
-
-BuildRequires: firmware-tools > 0:2.0
-BuildRequires: python3-smbios python2-devel %{python_xml_BR}
-
-Requires: smbios-utils python3-smbios
-Requires: firmware-tools >= 0:2.0.0
-Provides: firmware_inventory(system_bios) = 0:%{version}
-
-%description
-The firmware-addon-dell package provides plugins to firmware-tools which enable
-BIOS updates for Dell system, plus pulls in standard inventory modules
-applicable to most Dell systems.
-
-%prep
-%setup -q
-%patch0 -p1
-
-
-%build
-# this line lets us build an RPM directly from a git tarball
-[ -e ./configure ] || ./autogen.sh
-
-# only applicable on obs
-# # fix problems when buildsystem time is out of sync. ./configure will
-# # fail if newly created files are older than the packaged files.
-# # this should normally be a no-op on proper buildsystems.
-# touch configure
-# find . -type f -newer configure -print0 | xargs -r0 touch
-
-%configure RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_MICRO=%{micro} RELEASE_EXTRA=%{extra}
-make %{?_smp_mflags}
-
-%check
-%if 0%{?run_unit_tests}
-make %{?_smp_mflags} check
-%endif
-
-%install
-# Fedora Packaging guidelines
-rm -rf $RPM_BUILD_ROOT
-# SUSE Packaging rpmlint
-mkdir -p $RPM_BUILD_ROOT
-
-make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/firmware/dell/bios
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING-GPL COPYING-OSL
-%{python_sitelib}/*
-%config(noreplace) %{_sysconfdir}/firmware/firmware.d/*.conf
-%{_datadir}/firmware/dell
-%{_datadir}/firmware-tools/*
-
-
-%changelog
-* Mon Mar 26 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 2.2.9-17
-- Update Python 2 dependency declarations to new packaging standards
- (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.9-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.9-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.9-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.9-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-12
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_...
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.9-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Fri Jun 24 2011 Praveen K Paladugu <praveen_paladugu(a)dell.com>
-- Added a patch to fix BZ#688046.This patch uses wineboot when available and falls back to legacy winprefixcreate if not.
-
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Sep 27 2010 Matt Domsch <mdomsch(a)fedoraproject.org> - 2.2.9-1
-- update to latest upstream
-
-* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 2.2.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-
-* Fri Dec 11 2009 Matt Domsch <mdomsch(a)fedoraproject.org> - 2.2.1-2
-- remember to upload the tarball first
-
-* Fri Dec 11 2009 Matt Domsch <mdomsch(a)fedoraproject.org> - 2.2.1-1
-- rebase to latest upstream
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1.2-5.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu May 14 2009 Matt Domsch <mdomsch(a)fedoraproject.org> - 2.1.2-4.3
-- rebase to latest upstream
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.4.8-2.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm(a)gmail.com> - 1.4.8-2.1
-- Rebuild for Python 2.6
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 1.4.8-1
-- Autorebuild for GCC 4.3
-
-* Wed Aug 22 2007 Michael E Brown <michael_e_brown at dell.com> - 1.4.7-1
-- rebase to latest upstream
-
-* Fri Aug 17 2007 Michael E Brown <michael_e_brown at dell.com> - 1.4.4-1
-- rebase to latest upstream
-
-* Wed Jul 11 2007 Michael E Brown <michael_e_brown at dell.com> - 1.3.1-1
-- up2date_repo_autoconf is now obsolete. dell-*-repository files no longer
- use it.
-
-* Sat Apr 7 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.11-1
-- enhance up2date_repo_autoconf by populating default configuration file
-
-* Fri Apr 6 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.10-1
-- Couple of changes so that the dell sysid plugin work on yum 2.4.3
- prior versions didnt crash, but didnt properly substitute mirrolist
- because the name of mirrolist var is different in 2.4.3.
-- Per discussion on mailing list, convert to arch-specific pkg
-- package bin/up2date_repo_autoconf only for RHEL{3,4} releases
-
-* Fri Apr 6 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.9-1
-- downgrade api needed to 2.1
-- Added up2date_repo_autoconf binary
-- fix changes from 1.2.7 that were accidentally reverted in 1.2.8. :(
-
-* Fri Apr 6 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.8-1
-- sysid plugin: Zero pad value for sysid up to 4 chars
-- sysid plugin: Add 0x to signify that it is a hex value
-
-* Fri Mar 30 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.7-1
-- yum plugin didnt work on FC5 due to extra, unneeded import.
-- dont need plugin api 2.5, 2.2 will do
-
-* Wed Mar 28 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.6-1
-- Add yum plugins for setting system ID variables. repos can use $sys_ven_id
- $sys_dev_id in their baseurl= or mirrorlist= arguments.
-
-* Sat Mar 17 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.5-1
-- Add ExcludeArch for s390
-- Remove python-abi dep for RHEL3 (it was broken)
-- fix sitelib path missing /lib/ dir
-
-* Fri Mar 16 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.4-1
-- Add ExcludeArch to fix problem where f-a-d was being added to ppc repo
-
-* Thu Mar 15 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.2-1
-- Trivial changes to add specific {_datadir}/firmware/dell
-
-* Thu Mar 15 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.1-1
-- Trivial changes to make rpmlint happier
-
-* Wed Mar 14 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.0-1
-- Fedora-compliant packaging changes.
diff --git a/replace_wineprefix_with_wineboot.patch b/replace_wineprefix_with_wineboot.patch
deleted file mode 100644
index f81398f..0000000
--- a/replace_wineprefix_with_wineboot.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up firmware-addon-dell-2.2.9/firmware_addon_dell/extract_bios.py.orig firmware-addon-dell-2.2.9/firmware_addon_dell/extract_bios.py
---- firmware-addon-dell-2.2.9/firmware_addon_dell/extract_bios.py.orig 2011-06-22 17:00:47.000000000 -0500
-+++ firmware-addon-dell-2.2.9/firmware_addon_dell/extract_bios.py 2011-06-22 17:02:44.000000000 -0500
-@@ -189,7 +189,12 @@ def setupWine():
- "HOME":os.environ["HOME"],
- "WINEPREFIX": wineprefix,
- }
-- common.loggedCmd(["wineprefixcreate", "-w", "--prefix", wineprefix], cwd=wineprefix, env=env, logger=getLog(), raiseExc=False)
-+ if os.path.exists('/usr/bin/wineboot'):
-+ cmd = ["wineboot", "-u"]
-+ elif os.path.exists('/usr/bin/wineprefixcreate'):
-+ cmd = ["wineprefixcreate", "-w", "--prefix", wineprefix]
-+ common.loggedCmd(cmd, cwd=wineprefix, env=env, logger=getLog(), raiseExc=False)
-+
- atexit.register(shutil.rmtree, wineprefix)
- getLog(prefix="verbose.").info("Wine pre-setup finished.")
-
diff --git a/sources b/sources
deleted file mode 100644
index b6001c0..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-dd7298c9dd2807893d1c01e4e473c098 firmware-addon-dell-2.2.9.tar.bz2
6 years