Architecture specific change in rpms/nodejs-rollup-plugin-buble.git
by githook-noreply@fedoraproject.org
The package rpms/nodejs-rollup-plugin-buble.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-rollup-plugin-buble.git/co....
Change:
+ExclusiveArch: %{nodejs_arches} noarch
Thanks.
Full change:
============
commit 3f6948c10ae2fdf25766922d664118129c357676
Author: Jared Smith <jsmith(a)fedoraproject.org>
Date: Fri Jun 1 10:55:33 2018 -0400
Initial packaging
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..64ca65b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/rollup-plugin-buble-0.19.2.tgz
+/src-0.19.2.tar.bz2
+/tests-0.19.2.tar.bz2
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..355c03e
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 [these people](https://github.com/rollup/rollup/graphs/contributors)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/README.md b/README.md
deleted file mode 100644
index 098afee..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# nodejs-rollup-plugin-buble
-
-'Compile ES2015 with buble'
\ No newline at end of file
diff --git a/dl-tests.sh b/dl-tests.sh
new file mode 100644
index 0000000..36f13ab
--- /dev/null
+++ b/dl-tests.sh
@@ -0,0 +1,131 @@
+#!/bin/bash
+
+tag=$(sed -n 's/^Version:\s\(.*\)$/\1/p' ./*.spec | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+url=$(sed -n 's/^URL:\s\(.*\)$/\1/p' ./*.spec | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+pkgdir=$(basename $url | sed -s 's/\.git$//')
+
+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 $url
+cd $pkgdir
+echo Finding git tag
+gittag=$(git show-ref --tags | cut -d' ' -f2 | grep "${tag}$" || git show-ref --tags | cut -d' ' -f2 | sort -Vr | head -n1)
+if [ -z $gittag ]; then
+ gittag=refs/master
+fi
+echo "Git Tag: $gittag"
+if [ -d "test" ]; then
+ git archive --prefix='test/' --format=tar ${gittag}:test/ \
+ | bzip2 > "$pwd"/tests-${tag}.tar.bz2
+elif [ -d "tests" ]; then
+ git archive --prefix='tests/' --format=tar ${gittag}:tests/ \
+ | bzip2 > "$pwd"/tests-${tag}.tar.bz2
+elif [ -d "spec" ]; then
+ git archive --prefix='spec/' --format=tar ${gittag}:spec/ \
+ | bzip2 > "$pwd"/tests-${tag}.tar.bz2
+else
+ echo "No test directory found for tag ${gittag}"
+fi
+if [ -d "support" ]; then
+ git archive --prefix='support/' --format=tar ${gittag}:support/ \
+ | bzip2 > "$pwd"/support-${tag}.tar.bz2
+fi
+if [ -d "fixture" ]; then
+ git archive --prefix='fixture/' --format=tar ${gittag}:fixture/ \
+ | bzip2 > "$pwd"/fixture-${tag}.tar.bz2
+fi
+if [ -d "examples" ]; then
+ git archive --prefix='examples/' --format=tar ${gittag}:examples/ \
+ | bzip2 > "$pwd"/examples-${tag}.tar.bz2
+elif [ -d "example" ]; then
+ git archive --prefix='example/' --format=tar ${gittag}:example/ \
+ | bzip2 > "$pwd"/examples-${tag}.tar.bz2
+fi
+if [ -d "tasks" ]; then
+ git archive --prefix='tasks/' --format=tar ${gittag}:tasks/ \
+ | bzip2 > "$pwd"/tasks-${tag}.tar.bz2
+fi
+if [ -d "docs" ]; then
+ git archive --prefix='docs/' --format=tar ${gittag}:docs/ \
+ | bzip2 > "$pwd"/docs-${tag}.tar.bz2
+elif [ -d "doc" ]; then
+ git archive --prefix='doc/' --format=tar ${gittag}:doc/ \
+ | bzip2 > "$pwd"/docs-${tag}.tar.bz2
+fi
+if [ -d "src" ]; then
+ git archive --prefix='src/' --format=tar ${gittag}:src/ \
+ | bzip2 > "$pwd"/src-${tag}.tar.bz2
+elif [ -d "source" ]; then
+ git archive --prefix='source/' --format=tar ${gittag}:source/ \
+ | bzip2 > "$pwd"/source-${tag}.tar.bz2
+fi
+if [ -d "tools" ]; then
+ git archive --prefix='tools/' --format=tar ${gittag}:tools/ \
+ | bzip2 > "$pwd"/tools-${tag}.tar.bz2
+fi
+if [ -d "scripts" ]; then
+ git archive --prefix='scripts/' --format=tar ${gittag}:scripts/ \
+ | bzip2 > "$pwd"/scripts-${tag}.tar.bz2
+fi
+if [ -d "modules" ]; then
+ git archive --prefix='modules/' --format=tar ${gittag}:modules/ \
+ | bzip2 > "$pwd"/modules-${tag}.tar.bz2
+fi
+if [ -d "ts" ]; then
+ git archive --prefix='ts/' --format=tar ${gittag}:ts/ \
+ | bzip2 > "$pwd"/ts-${tag}.tar.bz2
+fi
+if [ -d "build" ]; then
+ git archive --prefix='build/' --format=tar ${gittag}:build/ \
+ | bzip2 > "$pwd"/build-${tag}.tar.bz2
+fi
+if [ -d "fixtures" ]; then
+ git archive --prefix='fixtures/' --format=tar ${gittag}:fixtures/ \
+ | bzip2 > "$pwd"/fixtures-${tag}.tar.bz2
+fi
+if [ -d "mocks" ]; then
+ git archive --prefix='mocks/' --format=tar ${gittag}:mocks/ \
+ | bzip2 > "$pwd"/mocks-${tag}.tar.bz2
+fi
+if [ -d "typings" ]; then
+ git archive --prefix='typings/' --format=tar ${gittag}:typings/ \
+ | bzip2 > "$pwd"/typings-${tag}.tar.bz2
+fi
+if [ -d "templates" ]; then
+ git archive --prefix='templates/' --format=tar ${gittag}:templates/ \
+ | bzip2 > "$pwd"/templates-${tag}.tar.bz2
+fi
+if [ -d "benchmark" ]; then
+ git archive --prefix='benchmark/' --format=tar ${gittag}:benchmark/ \
+ | bzip2 > "$pwd"/benchmark-${tag}.tar.bz2
+fi
+if [ -d "vendor" ]; then
+ git archive --prefix='vendor/' --format=tar ${gittag}:vendor/ \
+ | bzip2 > "$pwd"/vendor-${tag}.tar.bz2
+fi
+if [ -d "packages" ]; then
+ git archive --prefix='packages/' --format=tar ${gittag}:packages/ \
+ | bzip2 > "$pwd"/packages-${tag}.tar.bz2
+fi
+if [ -d "rollup" ]; then
+ git archive --prefix='rollup/' --format=tar ${gittag}:rollup/ \
+ | bzip2 > "$pwd"/rollup-${tag}.tar.bz2
+fi
+popd
diff --git a/nodejs-rollup-plugin-buble.spec b/nodejs-rollup-plugin-buble.spec
new file mode 100644
index 0000000..8b55a20
--- /dev/null
+++ b/nodejs-rollup-plugin-buble.spec
@@ -0,0 +1,79 @@
+%{?nodejs_find_provides_and_requires}
+
+%global packagename rollup-plugin-buble
+%global enable_tests 1
+
+Name: nodejs-rollup-plugin-buble
+Version: 0.19.2
+Release: 1%{?dist}
+Summary: Compile ES2015 with buble
+
+License: MIT
+URL: https://github.com/rollup/rollup-plugin-buble
+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: src-%{version}.tar.bz2
+Source2: tests-%{version}.tar.bz2
+Source10: dl-tests.sh
+# rollup config
+Source11: https://raw.githubusercontent.com/rollup/rollup-plugin-buble/v%{version}/...
+# license file
+Source12: https://raw.githubusercontent.com/rollup/rollup/master/LICENSE.md
+
+BuildArch: noarch
+ExclusiveArch: %{nodejs_arches} noarch
+
+BuildRequires: nodejs-packaging
+BuildRequires: npm(buble)
+BuildRequires: npm(rollup)
+BuildRequires: npm(rollup-pluginutils)
+
+%if 0%{?enable_tests}
+BuildRequires: mocha
+%endif
+
+%description
+Compile ES2015 with buble
+
+
+%prep
+%autosetup -n package
+# setup the source code and tests
+%autosetup -T -D -a 1 -n package
+%autosetup -T -D -a 2 -n package
+cp -p %{SOURCE11} .
+cp -p %{SOURCE12} .
+
+%nodejs_fixdep micromatch '~3.1.10'
+%nodejs_fixdep buble '^0.16.0'
+
+%build
+rollup -m -i src/index.js -f cjs -o dist/rollup-plugin-buble.cjs.js
+rollup -m -i src/index.js -f es -o dist/rollup-plugin-buble.es.js
+
+%install
+mkdir -p %{buildroot}%{nodejs_sitelib}/%{packagename}
+cp -pr package.json dist/ \
+ %{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.md
+%{nodejs_sitelib}/%{packagename}
+
+%changelog
+* Tue May 29 2018 Jared K. Smith <jsmith(a)fedoraproject.org> - 0.19.2-1
+- Initial packaging
diff --git a/rollup.config.js b/rollup.config.js
new file mode 100644
index 0000000..ce79caa
--- /dev/null
+++ b/rollup.config.js
@@ -0,0 +1,36 @@
+import buble from 'rollup-plugin-buble';
+import json from 'rollup-plugin-json';
+import nodeResolve from 'rollup-plugin-node-resolve';
+import commonjs from 'rollup-plugin-commonjs';
+
+var external = process.env.DEPS ? [] : [ 'acorn/dist/acorn.js', 'magic-string' ];
+
+export default {
+ entry: 'src/index.js',
+ moduleName: 'buble',
+ plugins: [
+ json(),
+ commonjs(),
+ buble({
+ include: [
+ 'src/**',
+ 'node_modules/acorn-object-spread/**',
+ 'node_modules/unicode-loose-match/**',
+ 'node_modules/regexpu-core/**'
+ ],
+ transforms: {
+ dangerousForOf: true
+ }
+ }),
+ nodeResolve({
+ jsnext: true,
+ skip: external
+ })
+ ],
+ external: external,
+ globals: {
+ 'acorn/dist/acorn.js': 'acorn',
+ 'magic-string': 'MagicString'
+ },
+ sourceMap: true
+};
diff --git a/sources b/sources
new file mode 100644
index 0000000..d000850
--- /dev/null
+++ b/sources
@@ -0,0 +1,3 @@
+SHA512 (rollup-plugin-buble-0.19.2.tgz) = 7712b4a6b47c8ffeea848d84643cff7af28246e86e64ca5195418fad15a6a60e7fd95f2d3f55c55be524d167f1c8d8057c91efcb41a6c672524dbe5d21a3658d
+SHA512 (src-0.19.2.tar.bz2) = ee37a935efba563dff0f6d131ccfffc693e10021442174233e8a997447fcbd7da260fd0f572b6981979943ebca4f25a7d19bcd210cb13fd88908d9c940fcfe2d
+SHA512 (tests-0.19.2.tar.bz2) = 17533e8cee1e47e9b1b5b0422d82b7f26ffa564e61d1ee1948656acc4dfc165444309bc9c2a5dd3a5c7870f1edc025d20c2a20e584e689e3fbb3a7e42b653a5c
5 years, 10 months
Architecture specific change in rpms/golang-github-prometheus-client_model.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-prometheus-client_model.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-prometheus-client_m....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 1ba08a088bd49f9e970818c4509283b83399dd4e
Author: Paul Gier <pgier(a)redhat.com>
Date: Fri May 25 11:19:29 2018 -0500
Update to latest snapshot version 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
Update spec to current Go packaging standards
diff --git a/.gitignore b/.gitignore
index 3457052..a99c1cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/client_model-6f38060.tar.gz
+/client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz
diff --git a/golang-github-prometheus-client_model.spec b/golang-github-prometheus-client_model.spec
index 5aaf164..96eb8d7 100644
--- a/golang-github-prometheus-client_model.spec
+++ b/golang-github-prometheus-client_model.spec
@@ -1,162 +1,58 @@
-# 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 0
-# Generate unit-test rpm
-%global with_unit_test 0
-
-%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 prometheus
-%global repo client_model
-# https://github.com/prometheus/client_model
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 6f3806018612930941127f2a7c6c453ba2c527d2
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.13.git%{shortcommit}%{?dist}
-Summary: Data model artifacts for Prometheus
-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}
-
-%description
-%{summary}
+%bcond_without check
+%global goipath github.com/prometheus/client_model
+%global commit 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check}
-BuildRequires: golang(github.com/golang/protobuf/proto)
-%endif
+Version: 0
-Requires: golang(github.com/golang/protobuf/proto)
+%global common_description %{expand:
+Data model artifacts for Prometheus.}
-Provides: golang(%{import_path}/go) = %{version}-%{release}
+%gometa
-%description devel
-%{summary}
+Name: %{goname}
+Release: 0.14%{?dist}
+Summary: Data model artifacts for Prometheus
+License: ASL 2.0
+URL: %{gourl}
+Source: %{gosource}
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
+BuildRequires: golang(github.com/golang/protobuf/proto)
-%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
+%description
+%{common_description}
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
-%description unit-test
-%{summary}
+%description devel
+%{common_description}
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+This package contains the source code needed for building packages that import
+the %{goipath} Go namespace.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup -q
+rm -rf vendor
%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
%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
+%if %{with check}
+ %gochecks
%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 *.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%dir %{gopath}/src/%{import_path}
-%endif
-
-%if 0%{?with_unit_test}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc *.md
-%endif
+%license LICENSE NOTICE
+%doc CONTRIBUTING.md MAINTAINERS.md README.md
%changelog
+* Fri May 25 2018 Paul Gier <pgier(a)redhat.com> - 0-0.14.20180525git99fa1f4
+- Update to latest snapshot version 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
+- Update spec to current Go packaging standards
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.13.git6f38060
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index db0737e..92d01f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (client_model-6f38060.tar.gz) = 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf
+SHA512 (client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz) = 99bc72ca0887df4c7ab5a006af9c59afdc1281fe6d6d17f2897428a06da80d63d6ccd476deacb933cb208357500f14a7b96e99b9c5a7582e65a7aae87aaf2c50
5 years, 10 months
Architecture specific change in rpms/nodejs-rollup-plugin-json.git
by githook-noreply@fedoraproject.org
The package rpms/nodejs-rollup-plugin-json.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-rollup-plugin-json.git/com....
Change:
+ExclusiveArch: %{nodejs_arches} noarch
Thanks.
Full change:
============
commit 775719c9e70e5694544d02f2f38bda374a7fca8a
Author: Jared Smith <jsmith(a)fedoraproject.org>
Date: Fri Jun 1 10:26:30 2018 -0400
Initial packaging
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fdaa6cd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/rollup-plugin-json-3.0.0.tgz
+/tests-3.0.0.tar.bz2
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..355c03e
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 [these people](https://github.com/rollup/rollup/graphs/contributors)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/README.md b/README.md
deleted file mode 100644
index fdac132..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# nodejs-rollup-plugin-json
-
-'Convert .json files to ES6 modules:'
\ No newline at end of file
diff --git a/dl-tests.sh b/dl-tests.sh
new file mode 100644
index 0000000..36f13ab
--- /dev/null
+++ b/dl-tests.sh
@@ -0,0 +1,131 @@
+#!/bin/bash
+
+tag=$(sed -n 's/^Version:\s\(.*\)$/\1/p' ./*.spec | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+url=$(sed -n 's/^URL:\s\(.*\)$/\1/p' ./*.spec | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+pkgdir=$(basename $url | sed -s 's/\.git$//')
+
+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 $url
+cd $pkgdir
+echo Finding git tag
+gittag=$(git show-ref --tags | cut -d' ' -f2 | grep "${tag}$" || git show-ref --tags | cut -d' ' -f2 | sort -Vr | head -n1)
+if [ -z $gittag ]; then
+ gittag=refs/master
+fi
+echo "Git Tag: $gittag"
+if [ -d "test" ]; then
+ git archive --prefix='test/' --format=tar ${gittag}:test/ \
+ | bzip2 > "$pwd"/tests-${tag}.tar.bz2
+elif [ -d "tests" ]; then
+ git archive --prefix='tests/' --format=tar ${gittag}:tests/ \
+ | bzip2 > "$pwd"/tests-${tag}.tar.bz2
+elif [ -d "spec" ]; then
+ git archive --prefix='spec/' --format=tar ${gittag}:spec/ \
+ | bzip2 > "$pwd"/tests-${tag}.tar.bz2
+else
+ echo "No test directory found for tag ${gittag}"
+fi
+if [ -d "support" ]; then
+ git archive --prefix='support/' --format=tar ${gittag}:support/ \
+ | bzip2 > "$pwd"/support-${tag}.tar.bz2
+fi
+if [ -d "fixture" ]; then
+ git archive --prefix='fixture/' --format=tar ${gittag}:fixture/ \
+ | bzip2 > "$pwd"/fixture-${tag}.tar.bz2
+fi
+if [ -d "examples" ]; then
+ git archive --prefix='examples/' --format=tar ${gittag}:examples/ \
+ | bzip2 > "$pwd"/examples-${tag}.tar.bz2
+elif [ -d "example" ]; then
+ git archive --prefix='example/' --format=tar ${gittag}:example/ \
+ | bzip2 > "$pwd"/examples-${tag}.tar.bz2
+fi
+if [ -d "tasks" ]; then
+ git archive --prefix='tasks/' --format=tar ${gittag}:tasks/ \
+ | bzip2 > "$pwd"/tasks-${tag}.tar.bz2
+fi
+if [ -d "docs" ]; then
+ git archive --prefix='docs/' --format=tar ${gittag}:docs/ \
+ | bzip2 > "$pwd"/docs-${tag}.tar.bz2
+elif [ -d "doc" ]; then
+ git archive --prefix='doc/' --format=tar ${gittag}:doc/ \
+ | bzip2 > "$pwd"/docs-${tag}.tar.bz2
+fi
+if [ -d "src" ]; then
+ git archive --prefix='src/' --format=tar ${gittag}:src/ \
+ | bzip2 > "$pwd"/src-${tag}.tar.bz2
+elif [ -d "source" ]; then
+ git archive --prefix='source/' --format=tar ${gittag}:source/ \
+ | bzip2 > "$pwd"/source-${tag}.tar.bz2
+fi
+if [ -d "tools" ]; then
+ git archive --prefix='tools/' --format=tar ${gittag}:tools/ \
+ | bzip2 > "$pwd"/tools-${tag}.tar.bz2
+fi
+if [ -d "scripts" ]; then
+ git archive --prefix='scripts/' --format=tar ${gittag}:scripts/ \
+ | bzip2 > "$pwd"/scripts-${tag}.tar.bz2
+fi
+if [ -d "modules" ]; then
+ git archive --prefix='modules/' --format=tar ${gittag}:modules/ \
+ | bzip2 > "$pwd"/modules-${tag}.tar.bz2
+fi
+if [ -d "ts" ]; then
+ git archive --prefix='ts/' --format=tar ${gittag}:ts/ \
+ | bzip2 > "$pwd"/ts-${tag}.tar.bz2
+fi
+if [ -d "build" ]; then
+ git archive --prefix='build/' --format=tar ${gittag}:build/ \
+ | bzip2 > "$pwd"/build-${tag}.tar.bz2
+fi
+if [ -d "fixtures" ]; then
+ git archive --prefix='fixtures/' --format=tar ${gittag}:fixtures/ \
+ | bzip2 > "$pwd"/fixtures-${tag}.tar.bz2
+fi
+if [ -d "mocks" ]; then
+ git archive --prefix='mocks/' --format=tar ${gittag}:mocks/ \
+ | bzip2 > "$pwd"/mocks-${tag}.tar.bz2
+fi
+if [ -d "typings" ]; then
+ git archive --prefix='typings/' --format=tar ${gittag}:typings/ \
+ | bzip2 > "$pwd"/typings-${tag}.tar.bz2
+fi
+if [ -d "templates" ]; then
+ git archive --prefix='templates/' --format=tar ${gittag}:templates/ \
+ | bzip2 > "$pwd"/templates-${tag}.tar.bz2
+fi
+if [ -d "benchmark" ]; then
+ git archive --prefix='benchmark/' --format=tar ${gittag}:benchmark/ \
+ | bzip2 > "$pwd"/benchmark-${tag}.tar.bz2
+fi
+if [ -d "vendor" ]; then
+ git archive --prefix='vendor/' --format=tar ${gittag}:vendor/ \
+ | bzip2 > "$pwd"/vendor-${tag}.tar.bz2
+fi
+if [ -d "packages" ]; then
+ git archive --prefix='packages/' --format=tar ${gittag}:packages/ \
+ | bzip2 > "$pwd"/packages-${tag}.tar.bz2
+fi
+if [ -d "rollup" ]; then
+ git archive --prefix='rollup/' --format=tar ${gittag}:rollup/ \
+ | bzip2 > "$pwd"/rollup-${tag}.tar.bz2
+fi
+popd
diff --git a/nodejs-rollup-plugin-json.spec b/nodejs-rollup-plugin-json.spec
new file mode 100644
index 0000000..c74e9c8
--- /dev/null
+++ b/nodejs-rollup-plugin-json.spec
@@ -0,0 +1,80 @@
+%{?nodejs_find_provides_and_requires}
+
+%global packagename rollup-plugin-json
+
+# disable tests to boostrap newer npm(rollup)
+%global enable_tests 0
+
+Name: nodejs-rollup-plugin-json
+Version: 3.0.0
+Release: 1%{?dist}
+Summary: Convert .json files to ES6 modules:
+
+License: MIT
+URL: https://github.com/rollup/rollup-plugin-json.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: tests-%{version}.tar.bz2
+Source10: dl-tests.sh
+# Rollup config
+Source11: https://raw.githubusercontent.com/rollup/rollup-plugin-json/v%{version}/r...
+# license
+Source12: https://raw.githubusercontent.com/rollup/rollup/master/LICENSE.md
+
+
+BuildArch: noarch
+ExclusiveArch: %{nodejs_arches} noarch
+
+BuildRequires: nodejs-packaging
+BuildRequires: npm(rollup)
+BuildRequires: npm(rollup-pluginutils)
+
+%if 0%{?enable_tests}
+BuildRequires: mocha
+BuildRequires: npm(rollup-plugin-node-resolve)
+BuildRequires: npm(source-map-support)
+%endif
+
+%description
+Convert .json files to ES6 modules:
+
+
+%prep
+%autosetup -n package
+# setup the tests
+%autosetup -T -D -a 1 -n package
+cp -p %{SOURCE11} .
+cp -p %{SOURCE12} .
+
+rm -rf dist/
+
+%build
+rollup -m -i src/index.js -f cjs -o dist/rollup-plugin-json.cjs.js
+rollup -m -i src/index.js -f es -o dist/rollup-plugin-json.es.js
+
+%install
+mkdir -p %{buildroot}%{nodejs_sitelib}/%{packagename}
+cp -pr package.json dist/ \
+ %{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.md
+%{nodejs_sitelib}/%{packagename}
+
+%changelog
+* Thu May 31 2018 Jared K. Smith <jsmith(a)fedoraproject.org> - 3.0.0-1
+- Initial packaging
diff --git a/rollup.config.js b/rollup.config.js
new file mode 100644
index 0000000..20119cf
--- /dev/null
+++ b/rollup.config.js
@@ -0,0 +1,14 @@
+import buble from 'rollup-plugin-buble';
+
+const pkg = require('./package.json');
+const external = Object.keys(pkg.dependencies);
+
+export default {
+ input: 'src/index.js',
+ output: [
+ { file: pkg.main, format: 'cjs', sourcemap: true },
+ { file: pkg.module, format: 'es', sourcemap: true }
+ ],
+ plugins: [buble()],
+ external
+};
diff --git a/sources b/sources
new file mode 100644
index 0000000..b9c6182
--- /dev/null
+++ b/sources
@@ -0,0 +1,2 @@
+SHA512 (rollup-plugin-json-3.0.0.tgz) = 594015f7f23fb855af1e1c914ea15bfb74886a98c8485252ed1d7137f717c56112adf628f48f2770723b0312477e52915e10554afeeb7af055261db0be15a1e7
+SHA512 (tests-3.0.0.tar.bz2) = 3d9bd77c0df610330d20c6e30c64f6bfe6f0cebba7c639681d2c1292ef2a57fb80006e1e3aad1b37ed8184ac4e7dc979c051e7f316b1a13a0cc2e012def19848
5 years, 10 months
Architecture specific change in rpms/nodejs-rollup-plugin-commonjs.git
by githook-noreply@fedoraproject.org
The package rpms/nodejs-rollup-plugin-commonjs.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-rollup-plugin-commonjs.git....
Change:
+ExclusiveArch: %{nodejs_arches} noarch
Thanks.
Full change:
============
commit 3b599d962004c2e918c28e96fc0316a4e5ed6cdb
Author: Jared Smith <jsmith(a)fedoraproject.org>
Date: Fri Jun 1 10:23:33 2018 -0400
Initial packaging
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..38d0fe8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/rollup-plugin-commonjs-9.1.3.tgz
+/tests-9.1.3.tar.bz2
diff --git a/README.md b/README.md
deleted file mode 100644
index 89765be..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# nodejs-rollup-plugin-commonjs
-
-'Convert CommonJS modules to ES2015'
\ No newline at end of file
diff --git a/dl-tests.sh b/dl-tests.sh
new file mode 100644
index 0000000..36f13ab
--- /dev/null
+++ b/dl-tests.sh
@@ -0,0 +1,131 @@
+#!/bin/bash
+
+tag=$(sed -n 's/^Version:\s\(.*\)$/\1/p' ./*.spec | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+url=$(sed -n 's/^URL:\s\(.*\)$/\1/p' ./*.spec | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+pkgdir=$(basename $url | sed -s 's/\.git$//')
+
+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 $url
+cd $pkgdir
+echo Finding git tag
+gittag=$(git show-ref --tags | cut -d' ' -f2 | grep "${tag}$" || git show-ref --tags | cut -d' ' -f2 | sort -Vr | head -n1)
+if [ -z $gittag ]; then
+ gittag=refs/master
+fi
+echo "Git Tag: $gittag"
+if [ -d "test" ]; then
+ git archive --prefix='test/' --format=tar ${gittag}:test/ \
+ | bzip2 > "$pwd"/tests-${tag}.tar.bz2
+elif [ -d "tests" ]; then
+ git archive --prefix='tests/' --format=tar ${gittag}:tests/ \
+ | bzip2 > "$pwd"/tests-${tag}.tar.bz2
+elif [ -d "spec" ]; then
+ git archive --prefix='spec/' --format=tar ${gittag}:spec/ \
+ | bzip2 > "$pwd"/tests-${tag}.tar.bz2
+else
+ echo "No test directory found for tag ${gittag}"
+fi
+if [ -d "support" ]; then
+ git archive --prefix='support/' --format=tar ${gittag}:support/ \
+ | bzip2 > "$pwd"/support-${tag}.tar.bz2
+fi
+if [ -d "fixture" ]; then
+ git archive --prefix='fixture/' --format=tar ${gittag}:fixture/ \
+ | bzip2 > "$pwd"/fixture-${tag}.tar.bz2
+fi
+if [ -d "examples" ]; then
+ git archive --prefix='examples/' --format=tar ${gittag}:examples/ \
+ | bzip2 > "$pwd"/examples-${tag}.tar.bz2
+elif [ -d "example" ]; then
+ git archive --prefix='example/' --format=tar ${gittag}:example/ \
+ | bzip2 > "$pwd"/examples-${tag}.tar.bz2
+fi
+if [ -d "tasks" ]; then
+ git archive --prefix='tasks/' --format=tar ${gittag}:tasks/ \
+ | bzip2 > "$pwd"/tasks-${tag}.tar.bz2
+fi
+if [ -d "docs" ]; then
+ git archive --prefix='docs/' --format=tar ${gittag}:docs/ \
+ | bzip2 > "$pwd"/docs-${tag}.tar.bz2
+elif [ -d "doc" ]; then
+ git archive --prefix='doc/' --format=tar ${gittag}:doc/ \
+ | bzip2 > "$pwd"/docs-${tag}.tar.bz2
+fi
+if [ -d "src" ]; then
+ git archive --prefix='src/' --format=tar ${gittag}:src/ \
+ | bzip2 > "$pwd"/src-${tag}.tar.bz2
+elif [ -d "source" ]; then
+ git archive --prefix='source/' --format=tar ${gittag}:source/ \
+ | bzip2 > "$pwd"/source-${tag}.tar.bz2
+fi
+if [ -d "tools" ]; then
+ git archive --prefix='tools/' --format=tar ${gittag}:tools/ \
+ | bzip2 > "$pwd"/tools-${tag}.tar.bz2
+fi
+if [ -d "scripts" ]; then
+ git archive --prefix='scripts/' --format=tar ${gittag}:scripts/ \
+ | bzip2 > "$pwd"/scripts-${tag}.tar.bz2
+fi
+if [ -d "modules" ]; then
+ git archive --prefix='modules/' --format=tar ${gittag}:modules/ \
+ | bzip2 > "$pwd"/modules-${tag}.tar.bz2
+fi
+if [ -d "ts" ]; then
+ git archive --prefix='ts/' --format=tar ${gittag}:ts/ \
+ | bzip2 > "$pwd"/ts-${tag}.tar.bz2
+fi
+if [ -d "build" ]; then
+ git archive --prefix='build/' --format=tar ${gittag}:build/ \
+ | bzip2 > "$pwd"/build-${tag}.tar.bz2
+fi
+if [ -d "fixtures" ]; then
+ git archive --prefix='fixtures/' --format=tar ${gittag}:fixtures/ \
+ | bzip2 > "$pwd"/fixtures-${tag}.tar.bz2
+fi
+if [ -d "mocks" ]; then
+ git archive --prefix='mocks/' --format=tar ${gittag}:mocks/ \
+ | bzip2 > "$pwd"/mocks-${tag}.tar.bz2
+fi
+if [ -d "typings" ]; then
+ git archive --prefix='typings/' --format=tar ${gittag}:typings/ \
+ | bzip2 > "$pwd"/typings-${tag}.tar.bz2
+fi
+if [ -d "templates" ]; then
+ git archive --prefix='templates/' --format=tar ${gittag}:templates/ \
+ | bzip2 > "$pwd"/templates-${tag}.tar.bz2
+fi
+if [ -d "benchmark" ]; then
+ git archive --prefix='benchmark/' --format=tar ${gittag}:benchmark/ \
+ | bzip2 > "$pwd"/benchmark-${tag}.tar.bz2
+fi
+if [ -d "vendor" ]; then
+ git archive --prefix='vendor/' --format=tar ${gittag}:vendor/ \
+ | bzip2 > "$pwd"/vendor-${tag}.tar.bz2
+fi
+if [ -d "packages" ]; then
+ git archive --prefix='packages/' --format=tar ${gittag}:packages/ \
+ | bzip2 > "$pwd"/packages-${tag}.tar.bz2
+fi
+if [ -d "rollup" ]; then
+ git archive --prefix='rollup/' --format=tar ${gittag}:rollup/ \
+ | bzip2 > "$pwd"/rollup-${tag}.tar.bz2
+fi
+popd
diff --git a/nodejs-rollup-plugin-commonjs.spec b/nodejs-rollup-plugin-commonjs.spec
new file mode 100644
index 0000000..89ace0c
--- /dev/null
+++ b/nodejs-rollup-plugin-commonjs.spec
@@ -0,0 +1,84 @@
+%{?nodejs_find_provides_and_requires}
+
+%global packagename rollup-plugin-commonjs
+
+# tests disabled until we bootstrap a newer version of rollup
+%global enable_tests 0
+
+Name: nodejs-rollup-plugin-commonjs
+Version: 9.1.3
+Release: 1%{?dist}
+Summary: Convert CommonJS modules to ES2015
+
+License: MIT
+URL: https://github.com/rollup/rollup-plugin-commonjs.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: tests-%{version}.tar.bz2
+Source10: dl-tests.sh
+# Rollup config
+Source11: https://raw.githubusercontent.com/rollup/rollup-plugin-commonjs/v%{versio...
+
+
+BuildArch: noarch
+ExclusiveArch: %{nodejs_arches} noarch
+
+BuildRequires: nodejs-packaging
+BuildRequires: npm(estree-walker)
+BuildRequires: npm(magic-string)
+BuildRequires: npm(resolve)
+BuildRequires: npm(rollup-pluginutils)
+
+
+%if 0%{?enable_tests}
+BuildRequires: mocha
+BuildRequires: npm(acorn)
+BuildRequires: npm(require-relative)
+BuildRequires: npm(locate-character)
+BuildRequires: npm(rollup)
+BuildRequires: npm(source-map)
+BuildRequires: npm(source-map-support)
+BuildRequires: npm(rollup-plugin-node-resolve)
+%endif
+
+%description
+Convert CommonJS modules to ES2015
+
+
+%prep
+%autosetup -n package
+# setup the tests
+%autosetup -T -D -a 1 -n package
+# rollup config
+cp -p %{SOURCE11} .
+
+
+%build
+# nothing to do
+
+%install
+mkdir -p %{buildroot}%{nodejs_sitelib}/%{packagename}
+cp -pr package.json dist/ \
+ %{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
+* Wed May 30 2018 Jared K. Smith <jsmith(a)fedoraproject.org> - 9.1.3-1
+- Initial packaging
diff --git a/rollup.config.js b/rollup.config.js
new file mode 100644
index 0000000..c9bd226
--- /dev/null
+++ b/rollup.config.js
@@ -0,0 +1,24 @@
+import buble from 'rollup-plugin-buble';
+import pkg from './package.json';
+
+export default {
+ input: 'src/index.js',
+ plugins: [
+ buble({
+ transforms: { dangerousForOf: true }
+ })
+ ],
+ external: Object.keys( pkg.dependencies ).concat([ 'fs', 'path' ]),
+ output: [
+ {
+ format: 'es',
+ file: pkg.module,
+ sourcemap: true
+ },
+ {
+ format: 'cjs',
+ file: pkg.main,
+ sourcemap: true
+ }
+ ]
+};
diff --git a/sources b/sources
new file mode 100644
index 0000000..f44c646
--- /dev/null
+++ b/sources
@@ -0,0 +1,2 @@
+SHA512 (rollup-plugin-commonjs-9.1.3.tgz) = 83dd5964a6704d6ec5eef2fa8cc79edfc23c7288ff43d1817539975de14bee57600b52b2e5626f1e06ca9408975d387beb6aafa21844c7052079018587db2e1a
+SHA512 (tests-9.1.3.tar.bz2) = 3902722de308ac7e5cd9a44505273849cd12ab5283f5f4847fc397abe144c3becc73ede1787e0e575d281086dfaf8da409f7acd0035906e85bb015a32343a25b
5 years, 10 months
Architecture specific change in rpms/initscripts.git
by githook-noreply@fedoraproject.org
The package rpms/initscripts.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/initscripts.git/commit/?id=cc0891....
Change:
-%ifarch s390 s390x
Thanks.
Full change:
============
commit cc0891ad5a8369f20a3e9289c48eec1cdecf3fa4
Author: David Kaspar [Dee'Kej] <dkaspar(a)redhat.com>
Date: Fri Jun 1 14:54:01 2018 +0200
9.81
diff --git a/.gitignore b/.gitignore
index c1a4795..2092552 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
/initscripts-9.78.tar.gz
/initscripts-9.79.tar.gz
/initscripts-9.80.tar.gz
+/initscripts-9.81.tar.gz
diff --git a/initscripts.spec b/initscripts.spec
index 95c6626..4e9eeea 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,159 +1,260 @@
-Summary: Scripts to bring up network interfaces and legacy utilities
-Name: initscripts
-Version: 9.80
-License: GPLv2
-Group: System Environment/Base
-Release: 1%{?dist}
-URL: https://github.com/fedora-sysv/initscripts
-Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{n...
-Requires: /bin/awk, sed, coreutils
-Requires: grep
-Requires: module-init-tools
-Requires: util-linux >= 2.16
-Requires: bash >= 3.0
-Requires: procps-ng >= 3.3.8-16
-Requires: ipcalc
-Conflicts: systemd < 216-3
-Conflicts: lvm2 < 2.02.98-3
-Conflicts: dmraid < 1.0.0.rc16-18
-Conflicts: policycoreutils < 2.5-6
-Requires: systemd
-Requires: iproute, /sbin/arping, findutils
-Requires: cpio
-Requires: hostname
-Conflicts: ipsec-tools < 0.8.0-2
-Conflicts: NetworkManager < 0.9.9.0-37.git20140131.el7
-Conflicts: util-linux < 2.32-5
-Conflicts: ppp < 2.4.6-4
-Requires(pre): /usr/sbin/groupadd
-Requires(post): /sbin/chkconfig, coreutils
-Requires(preun): /sbin/chkconfig
+# === GLOBAL MACROS ===========================================================
+
+# According to Fedora Package Guidelines, it is advised that packages that can
+# process untrusted input are build with position-idenpendent code (PIC).
+#
+# Koji should override the compilation flags and add the -fPIC or -fPIE flags by
+# default. This is here just in case this wouldn't happen for some reason.
+# For more info: https://fedoraproject.org/wiki/Packaging:Guidelines#PIE
+%global _hardened_build 1
+
+# =============================================================================
+
+Name: initscripts
+Summary: Scripts to bring up network interfaces & legacy utilities
+Version: 9.81
+Release: 1%{?dist}
+
+License: GPLv2
+
+URL: https://github.com/fedora-sysv/initscripts
+Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{n...
+
+Requires: bash >= 3.0
+Requires: coreutils
+Requires: cpio
+Requires: filesystem >= 3
+Requires: findutils
+Requires: gawk
+Requires: grep
+Requires: hostname
+Requires: ipcalc
+Requires: iproute
+Requires: iputils
+Requires: module-init-tools
+Requires: procps-ng >= 3.3.8-16
+Requires: sed
+Requires: setup
+Requires: systemd
+Requires: util-linux >= 2.16
+
+Requires(pre): shadow-utils
+Requires(post): chkconfig
+Requires(post): coreutils
+Requires(post): %{_sbindir}/update-alternatives
+
+Requires(preun): chkconfig
+Requires(postun): %{_sbindir}/update-alternatives
+
+BuildRequires: filesystem >= 3
+BuildRequires: gcc
+BuildRequires: git
+BuildRequires: gettext
+BuildRequires: glib2-devel
+BuildRequires: pkgconfig
+BuildRequires: popt-devel
+BuildRequires: setup
+
%{?systemd_requires}
-BuildRequires: gcc glib2-devel popt-devel gettext pkgconfig systemd
-Provides: /sbin/service
+BuildRequires: systemd
+
+Provides: /sbin/service
+
+Conflicts: dmraid < 1.0.0.rc16-18
+Conflicts: ipsec-tools < 0.8.0-2
+Conflicts: lvm2 < 2.02.98-3
+Conflicts: NetworkManager < 0.9.9.0-37.git20140131.el7
+Conflicts: policycoreutils < 2.5-6
+Conflicts: ppp < 2.4.6-4
+Conflicts: systemd < 216-3
+
+# === PATCHES =================================================================
+
+# NOTE: 'autosetup' macro (below) uses 'git' for applying the patches:
+# ->> All the patches should be provided in 'git format-patch' format.
+# ->> Auxiliary repository will be created during 'fedpkg prep', you
+# can see all the applied patches there via 'git log'.
+
+# Upstream patches -- official upstream patches released by upstream since the
+# ---------------- last rebase that are necessary for any reason:
+#Patch000: example000.patch
+
+
+# Downstream patches -- these should be always included when doing rebase:
+# ------------------
+#Patch100: example100.patch
+
+
+# Downstream patches for RHEL -- patches that we keep only in RHEL for various
+# --------------------------- reasons, but are not enabled in Fedora:
+%if %{defined rhel} || %{defined centos}
+#Patch200: example200.patch
+%endif
+
+
+# Patches to be removed -- deprecated functionality which shall be removed at
+# --------------------- some point in the future:
+
%description
-This package contains the script that activates and deactivates most
+This package contains the scripts that activates and deactivates most
network interfaces, some utilities, and other legacy files.
+# === BUILD INSTRUCTIONS ======================================================
+
%prep
-%setup -q
+%autosetup -S git
+
+# ---------------
%build
-make
+%make_build
+
+# ---------------
%install
-make ROOT=%{buildroot} SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandir} install
+%make_install
+# This installs the NLS language files:
%find_lang %{name}
%ifnarch s390 s390x
-rm -f \
- %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc \
+ rm -f %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc
%endif
-rm -f %{buildroot}%{_sysconfdir}/rc.d/rc.local %{buildroot}%{_sysconfdir}/rc.local
-touch %{buildroot}%{_sysconfdir}/rc.d/rc.local
-chmod 755 %{buildroot}%{_sysconfdir}/rc.d/rc.local
+ln -s %{_mandir}/man8/ifup.8 %{buildroot}%{_mandir}/man8/ifdown.8
-rm -f %{buildroot}%{_sysconfdir}/adjtime
+# We are now using alternatives approach to better co-exist with NetworkManager:
+touch %{buildroot}%{_sbindir}/ifup
+touch %{buildroot}%{_sbindir}/ifdown
+
+# ---------------
%post
-%systemd_post fedora-import-state.service fedora-loadmodules.service fedora-readonly.service
+%systemd_post import-state.service loadmodules.service readonly-root.service
+
+chkconfig --add network > /dev/null 2>&1 || :
+chkconfig --add netconsole > /dev/null 2>&1 || :
+
+[ -L %{_sbindir}/ifup ] || rm -f %{_sbindir}/ifup
+[ -L %{_sbindir}/ifdown ] || rm -f %{_sbindir}/ifdown
+
+%{_sbindir}/update-alternatives --install %{_sbindir}/ifup ifup %{_sysconfdir}/sysconfig/network-scripts/ifup 90 \
+ --slave %{_sbindir}/ifdown ifdown %{_sysconfdir}/sysconfig/network-scripts/ifdown \
+ --initscript network
-/usr/sbin/chkconfig --add network > /dev/null 2>&1 || :
-/usr/sbin/chkconfig --add netconsole > /dev/null 2>&1 || :
+# ---------------
%preun
-%systemd_preun fedora-import-state.service fedora-loadmodules.service fedora-readonly.service
+%systemd_preun import-state.service loadmodules.service readonly-root.service
-if [ $1 = 0 ]; then
- /usr/sbin/chkconfig --del network > /dev/null 2>&1 || :
- /usr/sbin/chkconfig --del netconsole > /dev/null 2>&1 || :
+if [ $1 -eq 0 ]; then
+ chkconfig --del network > /dev/null 2>&1 || :
+ chkconfig --del netconsole > /dev/null 2>&1 || :
+ %{_sbindir}/update-alternatives --remove ifup %{_sysconfdir}/sysconfig/network-scripts/ifup
fi
+# ---------------
+
%postun
-%systemd_postun fedora-import-state.service fedora-loadmodules.service fedora-readonly.service
+%systemd_postun import-state.service loadmodules.service readonly-root.service
+
+# === PACKAGING INSTRUCTIONS ==================================================
%files -f %{name}.lang
-%defattr(-,root,root)
-%dir %{_sysconfdir}/sysconfig/network-scripts
-%config(noreplace) %{_sysconfdir}/sysconfig/netconsole
-%config(noreplace) %{_sysconfdir}/sysconfig/readonly-root
-%{_sysconfdir}/sysconfig/network-scripts/ifdown
-%{_sbindir}/ifdown
-%{_sysconfdir}/sysconfig/network-scripts/ifdown-post
-%{_sysconfdir}/sysconfig/network-scripts/ifup
-%{_sbindir}/ifup
+%license COPYING
+%doc doc/*
+
+# NOTE: /etc/profile.d/ is owned by setup package.
+# /etc/sysconfig/ is owned by filesystem package.
+%dir %{_sysconfdir}/rc.d
+%dir %{_sysconfdir}/rc.d/init.d
+%dir %{_sysconfdir}/rc.d/rc[0-6].d
+%dir %{_sysconfdir}/rwtab.d
+%dir %{_sysconfdir}/statetab.d
%dir %{_sysconfdir}/sysconfig/console
%dir %{_sysconfdir}/sysconfig/modules
-%{_sysconfdir}/sysconfig/network-scripts/network-functions
-%{_sysconfdir}/sysconfig/network-scripts/network-functions-ipv6
-%{_sysconfdir}/sysconfig/network-scripts/init.ipv6-global
-%config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-lo
-%{_sysconfdir}/sysconfig/network-scripts/ifup-post
-%{_sysconfdir}/sysconfig/network-scripts/ifup-routes
-%{_sysconfdir}/sysconfig/network-scripts/ifdown-routes
-%{_sysconfdir}/sysconfig/network-scripts/ifup-plip
-%{_sysconfdir}/sysconfig/network-scripts/ifup-plusb
-%{_sysconfdir}/sysconfig/network-scripts/ifup-bnep
-%{_sysconfdir}/sysconfig/network-scripts/ifdown-bnep
-%{_sysconfdir}/sysconfig/network-scripts/ifup-eth
-%{_sysconfdir}/sysconfig/network-scripts/ifdown-eth
-%{_sysconfdir}/sysconfig/network-scripts/ifup-ipv6
-%{_sysconfdir}/sysconfig/network-scripts/ifdown-ipv6
-%{_sysconfdir}/sysconfig/network-scripts/ifup-sit
-%{_sysconfdir}/sysconfig/network-scripts/ifdown-sit
-%{_sysconfdir}/sysconfig/network-scripts/ifup-tunnel
-%{_sysconfdir}/sysconfig/network-scripts/ifdown-tunnel
-%{_sysconfdir}/sysconfig/network-scripts/ifup-aliases
-%{_sysconfdir}/sysconfig/network-scripts/ifup-ippp
-%{_sysconfdir}/sysconfig/network-scripts/ifdown-ippp
-%{_sysconfdir}/sysconfig/network-scripts/ifup-wireless
-%{_sysconfdir}/sysconfig/network-scripts/ifup-isdn
-%{_sysconfdir}/sysconfig/network-scripts/ifdown-isdn
-%ifarch s390 s390x
-%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc
-%endif
-%config(noreplace) %{_sysconfdir}/networks
+%dir %{_sysconfdir}/sysconfig/network-scripts
+%dir %{_libexecdir}/%{name}
+%dir %{_libexecdir}/%{name}/legacy-actions
+%dir %{_sharedstatedir}/stateless
+%dir %{_sharedstatedir}/stateless/state
+%dir %{_sharedstatedir}/stateless/writable
+
+# ---------------
+
%config(noreplace) %{_sysconfdir}/rwtab
%config(noreplace) %{_sysconfdir}/statetab
-%dir %{_sysconfdir}/rwtab.d
-%dir %{_sysconfdir}/statetab.d
-%{_prefix}/lib/systemd/fedora-*
-%{_prefix}/lib/systemd/system/*
-%dir %{_sysconfdir}/rc.d
-%dir %{_sysconfdir}/rc.d/rc[0-9].d
-%{_sysconfdir}/rc[0-9].d
-%dir %{_sysconfdir}/rc.d/init.d
-%{_sysconfdir}/rc.d/init.d/*
-%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/rc.d/rc.local
-%{_sysconfdir}/profile.d/*
-%{_sbindir}/sys-unconfig
-%{_bindir}/usleep
-%attr(4755,root,root) %{_sbindir}/usernetctl
+%config(noreplace) %{_sysconfdir}/sysconfig/netconsole
+%config(noreplace) %{_sysconfdir}/sysconfig/readonly-root
+%config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-lo
+
+%ghost %config(noreplace, missingok) %verify(not md5 size mtime) %{_sysconfdir}/rc.d/rc.local
+
+%{_sysconfdir}/rc.d/init.d/functions
+%{_sysconfdir}/rc.d/init.d/netconsole
+%{_sysconfdir}/rc.d/init.d/network
+%{_sysconfdir}/sysconfig/network-scripts/*
+
+# RC symlinks:
+%{_sysconfdir}/rc[0-6].d
+
+# ---------------
+
+%{_bindir}/*
%{_sbindir}/consoletype
%{_sbindir}/genhostid
-%{_sbindir}/sushell
-%attr(2755,root,root) %{_sbindir}/netreport
-%{_udevrulesdir}/*
-%{_prefix}/lib/udev/rename_device
%{_sbindir}/service
-%{_mandir}/man*/*
-%dir %attr(775,root,root) /run/netreport
-%dir %{_sysconfdir}/NetworkManager
-%dir %{_sysconfdir}/NetworkManager/dispatcher.d
-%{_sysconfdir}/NetworkManager/dispatcher.d/00-netreport
-%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6
-%doc examples
-%{!?_licensedir:%global license %%doc}
-%license COPYING
-%{_sharedstatedir}/stateless
-%{_tmpfilesdir}/initscripts.conf
-%dir %{_libexecdir}/initscripts
-%dir %{_libexecdir}/initscripts/legacy-actions
+
+%ghost %{_sbindir}/ifup
+%ghost %{_sbindir}/ifdown
+
+%attr(4755,root,root) %{_sbindir}/usernetctl
+
+%{_prefix}/lib/systemd/import-state
+%{_prefix}/lib/systemd/loadmodules
+%{_prefix}/lib/systemd/readonly-root
+%{_prefix}/lib/systemd/system/*
+%{_prefix}/lib/udev/rename_device
+
+%{_udevrulesdir}/*
+
+%{_mandir}/man1/*
+%{_mandir}/man8/*
+
+# ---------------
%changelog
+* Thu May 31 2018 David Kaspar [Dee'Kej] <dkaspar(a)redhat.com> - 9.81-1
+- src/consoletype.c: deprecation warning added
+- src/genhostid.c: deprecation warning added
+- src/genhostid.c: fixed to not override /etc/hostid if it already exists
+- src/usleep.c: GCC warnings fixed
+- nis-domainname.service removed
+- fedora-* services renamed to more general names
+- specfile: missing fedora-domainname.service returned in systemd macros
+- COPYING updated to latest GNU version (GPLv2+)
+- network-scripts: control 'network' service with alternatives as well
+- netreport functionality dropped
+- networks moved into 'setup' package
+- lang.{sh,csh} moved into setup package
+- lang.{sh,csh} cleanup before moving to 'setup' package
+- src/sushell moved into 'policycoreutils' package
+- src/shvar.* removed
+- po/xgettext_sh removed
+- sys-unconfig removed
+- Outdated files from doc/ folder removed
+- make archive: ChangeLog generating removed
+- network-scripts: ifup & ifdown -- use alternatives system
+- adjtime moved into 'util-linux' package
+- specfile: simplified & updated to new repository layout
+- .gitignore files updated to new repository layout
+- Makefile simplified & updated to new repository layout
+- po/Makefile simplified & updated to new repository layout
+- src/Makefile simplified & updated to new repository layout
+- Repository scheme updated to new layout
+- fedora-readonly: command substitution warning fixed (null-byte input)
+
* Fri May 25 2018 David Kaspar [Dee'Kej] <dkaspar(a)redhat.com> - 9.80-1
- sysconfig/readonly-root: Clarify the usage of readonly-root
- use proper shebang where appropriate
@@ -167,7 +268,6 @@ fi
- ifup-tunnel: Support 'external' tunnels
- spec: add gcc to BuildRequires
- init.d/functions: fix sourcing for ksh
-- /etc/adjtime config moved from initscripts to util-linux
* Tue Jan 02 2018 David Kaspar [Dee'Kej] <dkaspar(a)redhat.com> - 9.79-1
- ifdown-post: fix logical error in commit 5d61564
@@ -477,7 +577,7 @@ ng
- check an IP address for existence in ifup-alias (#852005)
- sync FSF address with GPL 2 text.
- fix rpmlint's spaces vs tabs warning.
-- fix bogus %%changelog dates.
+- fix bogus %changelog dates.
- build with $RPM_LD_FLAGS.
- use -sf, not -s. (#901827)
- add /usr/libexec/initscripts to file list (#894475)
diff --git a/sources b/sources
index 7141d09..a07b8b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (initscripts-9.80.tar.gz) = 68405a89840bfe339ff5810216c94ab83af7bb189cf5d75c90854e599147e0b6c2c15b695a5498407fb5b972c451d5b4c8f73bd61e5f23cfb887e889ee512f97
+SHA512 (initscripts-9.81.tar.gz) = 1b534725f3e3fdd702fc7ee467e822436aae5b25ec803ce4446397c5be0988055788ae12942b79adc0a4b8c1315708d4c37d93c7c8808ed48f89e3f90fa53be4
5 years, 10 months
Architecture specific change in rpms/mongodb.git
by githook-noreply@fedoraproject.org
The package rpms/mongodb.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/mongodb.git/commit/?id=77494fb130....
Change:
+ExclusiveArch: %{upstream_arches}
Thanks.
Full change:
============
commit 77494fb130cfc601d09294baf4d919f91b82fe28
Author: Marek Skalický <mskalick(a)redhat.com>
Date: Fri Jun 1 10:32:05 2018 +0200
Build modularized mongodb only on upstream arches
diff --git a/mongodb.spec b/mongodb.spec
index 1e5d4a8..64d57fb 100644
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -119,8 +119,13 @@ BuildRequires: python3-pymongo
%endif
BuildRequires: python3-cheetah
+%if 0%{?_module_build}
+# Provide modules only on upstream architectures
+ExclusiveArch: %{upstream_arches}
+%else
# Mongodb must run on a 64-bit CPU (see bug #630898)
ExcludeArch: ppc %{sparc} s390
+%endif
%description
Mongo (from "humongous") is a high-performance, open source, schema-free
5 years, 10 months
Architecture specific change in rpms/mongodb.git
by githook-noreply@fedoraproject.org
The package rpms/mongodb.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/mongodb.git/commit/?id=77494fb130....
Change:
+ExclusiveArch: %{upstream_arches}
Thanks.
Full change:
============
commit 77494fb130cfc601d09294baf4d919f91b82fe28
Author: Marek Skalický <mskalick(a)redhat.com>
Date: Fri Jun 1 10:32:05 2018 +0200
Build modularized mongodb only on upstream arches
diff --git a/mongodb.spec b/mongodb.spec
index 1e5d4a8..64d57fb 100644
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -119,8 +119,13 @@ BuildRequires: python3-pymongo
%endif
BuildRequires: python3-cheetah
+%if 0%{?_module_build}
+# Provide modules only on upstream architectures
+ExclusiveArch: %{upstream_arches}
+%else
# Mongodb must run on a 64-bit CPU (see bug #630898)
ExcludeArch: ppc %{sparc} s390
+%endif
%description
Mongo (from "humongous") is a high-performance, open source, schema-free
5 years, 10 months
Architecture specific change in rpms/mongodb.git
by githook-noreply@fedoraproject.org
The package rpms/mongodb.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/mongodb.git/commit/?id=f945450733....
Change:
+ExclusiveArch: %{upstream_arches}
Thanks.
Full change:
============
commit f94545073372dfb2d06446221e6bfc8b0ed7aeaf
Author: Marek Skalický <mskalick(a)redhat.com>
Date: Fri Jun 1 10:26:04 2018 +0200
Build modularized mongodb only on upstream arches
diff --git a/mongodb.spec b/mongodb.spec
index 4a114a0..30ce623 100644
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -129,8 +129,13 @@ BuildRequires: python-pymongo
BuildRequires: python2-yaml
%endif
+%if 0%{?_module_build}
+# Provide modules only on upstream architectures
+ExclusiveArch: %{upstream_arches}
+%else
# Mongodb must run on a 64-bit CPU (see bug #630898)
ExcludeArch: ppc %{sparc} s390
+%endif
%description
Mongo (from "humongous") is a high-performance, open source, schema-free
commit 54fd3f5b9306661d514186890d4327292fe65b96
Merge: e3fc71a 08999d9
Author: Marek Skalický <mskalick(a)redhat.com>
Date: Fri Jun 1 10:25:07 2018 +0200
Merge branch 'f27' into 3.4
commit e3fc71af0b63c9c9441347b0f687417b63e5b61c
Author: Marek Skalický <mskalick(a)redhat.com>
Date: Fri May 25 13:35:46 2018 +0200
Add patch to work with boost 1.66
diff --git a/boost-1.66.patch b/boost-1.66.patch
new file mode 100644
index 0000000..573f7db
--- /dev/null
+++ b/boost-1.66.patch
@@ -0,0 +1,35 @@
+From 3c34eda8d8a38b982a1659b919e9f4b5971ba512 Mon Sep 17 00:00:00 2001
+From: Judah Schvimer <judah(a)mongodb.com>
+Date: Wed, 31 Jan 2018 11:38:57 -0500
+Subject: [PATCH] SERVER-32516 remove make_optional type
+
+---
+ src/mongo/db/repl/oplog_fetcher.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mongo/db/repl/oplog_fetcher.cpp b/src/mongo/db/repl/oplog_fetcher.cpp
+index 94e0ac6d63f..7729e1b5d80 100644
+--- a/src/mongo/db/repl/oplog_fetcher.cpp
++++ b/src/mongo/db/repl/oplog_fetcher.cpp
+@@ -248,7 +248,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> parseOplogQueryMetadata(
+ if (!metadataResult.isOK()) {
+ return metadataResult.getStatus();
+ }
+- oqMetadata = boost::make_optional<rpc::OplogQueryMetadata>(metadataResult.getValue());
++ oqMetadata = boost::make_optional(metadataResult.getValue());
+ }
+ return oqMetadata;
+ }
+diff --git a/src/mongo/executor/network_interface_mock_test.cpp b/src/mongo/executor/network_interface_mock_test.cpp
+index b1a2e4edff..c41aad1f8c 100644
+--- a/src/mongo/executor/network_interface_mock_test.cpp
++++ b/src/mongo/executor/network_interface_mock_test.cpp
+@@ -143,7 +143,7 @@ TEST_F(NetworkInterfaceMockTest, ConnectionHook) {
+ [&](const HostAndPort& remoteHost) {
+ makeRequestCalled = true;
+ hostCorrectForRequest = (remoteHost == testHost());
+- return boost::make_optional<RemoteCommandRequest>(expectedRequest);
++ return boost::make_optional(expectedRequest);
+ },
+ [&](const HostAndPort& remoteHost, RemoteCommandResponse&& response) {
+ handleReplyCalled = true;
diff --git a/mongodb.spec b/mongodb.spec
index 77e4211..050992a 100644
--- a/mongodb.spec
+++ b/mongodb.spec
@@ -89,6 +89,10 @@ Patch3: asio-new.patch
# https://jira.mongodb.org/browse/SERVER-33395
Patch8: ppc64le-disable-altivec.patch
+# Fix building with boost 1.66
+# https://jira.mongodb.org/browse/SERVER-32516
+Patch9: boost-1.66.patch
+
# Fedora specific - adding support for rest of Fedora architectures
# Upstream does not support it at this time
#
@@ -197,8 +201,9 @@ the MongoDB sources.
%patch2 -p1
%patch3 -p1
%patch8 -p1
-# Boost 1.62+ is in F26
-%if 0%{?fedora} >=26
+# Boost 1.66+ is in F28
+%if 0%{?fedora} >=28
+%patch9 -p1
%endif
# Patch only Fedora specific architectures
%ifnarch %{upstream_arches}
5 years, 10 months
Architecture specific change in rpms/ghc.git
by githook-noreply@fedoraproject.org
The package rpms/ghc.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/ghc.git/commit/?id=f77e76b10e0e66....
Change:
+%ifarch %{ghc_llvm_archs}
Thanks.
Full change:
============
commit 5219736e174cebf0ce08e35be26eef80b9917d54
Author: Jens Petersen <petersen(a)redhat.com>
Date: Fri Jun 1 16:05:10 2018 +0900
disable testsuite, bootstrap and build fixes
diff --git a/ghc.spec b/ghc.spec
index 36ba5fe..3c88211 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -1,11 +1,14 @@
# perf production build (disable for quick build)
%bcond_without perf_build
+# to handle RCs
+%global ghc_release %{version}
+
# make sure ghc libraries' ABI hashes unchanged
%bcond_without abicheck
-# run testsuite
-%bcond_without testsuite
+# run testsuite (takes time and not really being using)
+%bcond_with testsuite
# build profiling libraries
%bcond_without prof
# build docs (haddock and manuals)
@@ -13,12 +16,8 @@
# <https://ghc.haskell.org/trac/ghc/ticket/15190>
%bcond_without docs
-# to handle RCs
-%global ghc_release %{version}
-
# 8.2 needs llvm-3.9
%global llvm_major 3.9
-
%global ghc_llvm_archs armv7hl aarch64
Name: ghc
@@ -63,10 +62,10 @@ Patch28: ghc-Debian-x32-use-native-x86_64-insn.patch
# and retired arches: alpha sparcv9 armv5tel
# see also deprecated ghc_arches defined in /etc/rpm/macros.ghc-srpm by redhat-rpm-macros
-%if %{with abicheck}
-BuildRequires: ghc-compiler = %{version}
+BuildRequires: ghc-compiler
# for ABI hash checking
-BuildRequires: ghc = %{version}
+%if %{with abicheck}
+BuildRequires: ghc
%endif
BuildRequires: ghc-rpm-macros-extra >= 1.8
BuildRequires: ghc-binary-devel
@@ -86,7 +85,7 @@ BuildRequires: python3
%endif
%if %{with docs}
# for /usr/bin/sphinx-build
-BuildRequires: python2-sphinx
+BuildRequires: python-sphinx
%endif
%ifarch %{ghc_llvm_archs}
BuildRequires: llvm%{llvm_major}
@@ -302,7 +301,7 @@ BuildFlavour = quick
%endif
GhcLibWays = v dyn %{?with_prof:p}
%if %{with docs}
-HADDOCK_DOCS = yes
+#HADDOCK_DOCS = yes
BUILD_MAN = yes
%else
HADDOCK_DOCS = no
@@ -360,14 +359,15 @@ make %{?_smp_mflags}
%install
make DESTDIR=%{buildroot} install
+%if %{defined _ghcdynlibdir}
mv %{buildroot}%{ghclibdir}/*/libHS*ghc%{ghc_version}.so %{buildroot}%{_libdir}/
for i in $(find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \; -print); do
chrpath -d $i
done
-
for i in %{buildroot}%{ghclibdir}/package.conf.d/*.conf; do
sed -i -e 's!^dynamic-library-dirs: .*!dynamic-library-dirs: %{_libdir}!' $i
done
+%endif
for i in %{ghc_packages_list}; do
name=$(echo $i | sed -e "s/\(.*\)-.*/\1/")
@@ -380,8 +380,7 @@ echo "%%license libraries/$name/LICENSE" >> ghc-$name.files
%endif
done
-# ghc-base should own ghclibdir
-echo "%%dir %{ghclibdir}" >> ghc-base-devel.files
+echo "%%dir %{ghclibdir}" >> ghc-base%{?_ghcdynlibdir:-devel}.files
%ghc_gen_filelists ghc-boot %{ghc_version_override}
%ghc_gen_filelists ghc %{ghc_version_override}
@@ -403,21 +402,26 @@ echo "%%license libraries/LICENSE.%1" >> ghc-%2.files\
%merge_filelist ghc-prim base
# add rts libs
+%if %{defined _ghcdynlibdir}
echo "%{ghclibdir}/rts" >> ghc-base-devel.files
-ls %{buildroot}%{_libdir}/libHSrts*.so >> ghc-base.files
+%else
+echo "%%dir %{ghclibdir}/rts" >> ghc-base.files
+ls -d %{buildroot}%{ghclibdir}/rts/lib*.a >> ghc-base-devel.files
+%endif
+ls %{buildroot}%{?_ghcdynlibdir}%{!?_ghcdynlibdir:%{ghclibdir}/rts}/libHSrts*.so >> ghc-base.files
%if 0%{?rhel} && 0%{?rhel} < 7
ls %{buildroot}%{ghclibdir}/rts/libffi.so.* >> ghc-base.files
%endif
+%if %{defined _ghcdynlibdir}
sed -i -e 's!^library-dirs: %{ghclibdir}/rts!&\ndynamic-library-dirs: %{_libdir}!' %{buildroot}%{ghclibdir}/package.conf.d/rts.conf
-
-sed -i -e "s|^%{buildroot}||g" ghc-base.files
+%endif
ls -d %{buildroot}%{ghclibdir}/package.conf.d/rts.conf %{buildroot}%{ghclibdir}/include >> ghc-base-devel.files
%if 0%{?rhel} && 0%{?rhel} < 7
ls %{buildroot}%{ghclibdir}/rts/libffi.so >> ghc-base-devel.files
%endif
-sed -i -e "s|^%{buildroot}||g" ghc-base-devel.files
+sed -i -e "s|^%{buildroot}||g" ghc-base*.files
# these are handled as alternatives
for i in hsc2hs runhaskell; do
@@ -493,6 +497,8 @@ if [ "%{version}" = "$(ghc --numeric-version)" ]; then
echo "ghc ABI hash change: aborting build!" >&2
exit 1
fi
+else
+ echo "ABI hash checks skipped: GHC changed from $(ghc --numeric-version) to %{version}"
fi
%endif
@@ -579,7 +585,7 @@ fi
%{ghclibdir}/latex
%if %{with docs}
# https://ghc.haskell.org/trac/ghc/ticket/12939
-#%%{_mandir}/man1/ghc.*
+#%%{_mandir}/man1/ghc.1*
%endif
%dir %{ghc_html_dir}/libraries
%{ghc_html_dir}/libraries/gen_contents_index
@@ -609,9 +615,7 @@ fi
%files manual
## needs pandoc
#%%{ghc_html_dir}/Cabal
-%if %{with docs}
%{ghc_html_dir}/haddock
-%endif
%{ghc_html_dir}/index.html
%{ghc_html_dir}/users_guide
%endif
@@ -621,10 +625,12 @@ fi
* Mon May 28 2018 Jens Petersen <petersen(a)redhat.com> - 8.2.2-68
- fix sphinx-build version detection
- merge bcond for haddock and manual
+- disable the testsuite to speed up builds
+- version bootstrap and packaging fixes and tweaks
* Mon May 28 2018 Jens Petersen <petersen(a)redhat.com> - 8.2.2-67
-- move manuals to ghc-manual.noarch
-- rename ghc-doc-index to ghc-doc-cron.noarch
+- move manuals to new ghc-manual (noarch)
+- rename ghc-doc-index to ghc-doc-cron (noarch)
- ghost the ghc-doc-index local state files
- ghost some newer libraries index files
- simplify and extend bcond for build configuration
commit f77e76b10e0e667ebff5c0a7deb6298a9ba46bf5
Author: Jens Petersen <petersen(a)redhat.com>
Date: Wed May 30 16:45:25 2018 +0900
add ghc_llvm_archs
diff --git a/ghc.spec b/ghc.spec
index 3e749dd..36ba5fe 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -16,6 +16,11 @@
# to handle RCs
%global ghc_release %{version}
+# 8.2 needs llvm-3.9
+%global llvm_major 3.9
+
+%global ghc_llvm_archs armv7hl aarch64
+
Name: ghc
# ghc must be rebuilt after a version bump to avoid ABI change problems
Version: 8.2.2
@@ -53,9 +58,6 @@ Patch26: ghc-Debian-no-missing-haddock-file-warning.patch
Patch27: ghc-Debian-reproducible-tmp-names.patch
Patch28: ghc-Debian-x32-use-native-x86_64-insn.patch
-# 8.2 needs llvm-3.9
-%global llvm_major 3.9
-
# fedora ghc has been bootstrapped on
# %%{ix86} x86_64 ppc ppc64 armv7hl s390 s390x ppc64le aarch64
# and retired arches: alpha sparcv9 armv5tel
@@ -86,7 +88,7 @@ BuildRequires: python3
# for /usr/bin/sphinx-build
BuildRequires: python2-sphinx
%endif
-%ifarch armv7hl aarch64
+%ifarch %{ghc_llvm_archs}
BuildRequires: llvm%{llvm_major}
%endif
# patch5
@@ -143,7 +145,7 @@ Obsoletes: ghc-doc-cron < %{version}-%{release}
# added in f28
Obsoletes: ghc-doc-index < %{version}-%{release}
%endif
-%ifarch armv7hl aarch64
+%ifarch %{ghc_llvm_archs}
Requires: llvm%{llvm_major}
%endif
@@ -286,13 +288,13 @@ fi
# cf https://github.com/gentoo-haskell/gentoo-haskell/tree/master/dev-lang/ghc
cat > mk/build.mk << EOF
%if %{with perf_build}
-%ifarch armv7hl aarch64
+%ifarch %{ghc_llvm_archs}
BuildFlavour = perf-llvm
%else
BuildFlavour = perf
%endif
%else
-%ifarch armv7hl aarch64
+%ifarch %{ghc_llvm_archs}
BuildFlavour = quick-llvm
%else
BuildFlavour = quick
5 years, 10 months
Architecture specific change in rpms/ghc-cmark-gfm.git
by githook-noreply@fedoraproject.org
The package rpms/ghc-cmark-gfm.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/ghc-cmark-gfm.git/commit/?id=c1fc....
Change:
+%ifarch ppc64 s390x
Thanks.
Full change:
============
commit c1fc85bab2b7a2eeac78cc588c1dfd35efdf6cb9
Author: Jens Petersen <petersen(a)redhat.com>
Date: Fri Jun 1 15:31:23 2018 +0900
disable testsuite to restore the package hash
enable the testsuite after unsubpackaging caused the hash to change again
diff --git a/ghc-cmark-gfm.spec b/ghc-cmark-gfm.spec
index ad6967d..7ed5d2d 100644
--- a/ghc-cmark-gfm.spec
+++ b/ghc-cmark-gfm.spec
@@ -5,15 +5,16 @@
%global pkgver %{pkg_name}-%{version}
# https://github.com/kivikakk/cmark-gfm-hs/issues/6
-%ifnarch ppc64 s390x
-%bcond_without tests
+%ifarch ppc64 s390x
+%bcond_with tests
%else
+# enabling the testsuite changed the hashes
%bcond_with tests
%endif
Name: ghc-%{pkg_name}
Version: 0.1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Fast, accurate GitHub Flavored Markdown parser and renderer
License: BSD
@@ -84,6 +85,9 @@ This package provides the Haskell %{pkg_name} library development files.
%changelog
+* Fri Jun 1 2018 Jens Petersen <petersen(a)redhat.com> - 0.1.3-4
+- disable testsuite to restore the package hash
+
* Wed May 30 2018 Jens Petersen <petersen(a)redhat.com> - 0.1.3-3
- bump release over pandoc
5 years, 10 months