Architecture specific change in rpms/golang-github-go-sql-driver-mysql.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-go-sql-driver-mysql.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-go-sql-driver-mysql....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit f83660a96be02a1dec0c6f6121a9ba1eec2a2e74
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 17:21:04 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-go-sql-driver-mysql.spec b/golang-github-go-sql-driver-mysql.spec
index 8e7377b..6780431 100644
--- a/golang-github-go-sql-driver-mysql.spec
+++ b/golang-github-go-sql-driver-mysql.spec
@@ -1,152 +1,54 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%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 go-sql-driver
-%global repo mysql
-# https://github.com/go-sql-driver/mysql
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/go-sql-driver/mysql
+%global provider_prefix github.com/go-sql-driver/mysql
+%global gobaseipath %{provider_prefix}
%global commit 0cc29e9fe8e25c2c58cf47bcab566e029bbaa88b
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20150503
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 1.2
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Lightweight and fast MySQL-Driver for Go's database/sql
License: MPLv2.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 %{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}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
-%endif
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-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
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%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" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- 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} && 0%{?with_devel}
-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
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- 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
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
+# Error call has possible formatting directive %v
+%gochecks %{gobaseipath}
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc CHANGELOG.md README.md CONTRIBUTING.md AUTHORS
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc CHANGELOG.md README.md CONTRIBUTING.md AUTHORS
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 1.2-9
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 1 month
- 1
- 0
Architecture specific change in rpms/golang-github-hashicorp-errwrap.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-hashicorp-errwrap.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-hashicorp-errwrap.g....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 8fea2ee9edec95b8abe14d215c0ffdf6d52d76f4
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 17:28:54 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-hashicorp-errwrap.spec b/golang-github-hashicorp-errwrap.spec
index 608240d..703cf78 100644
--- a/golang-github-hashicorp-errwrap.spec
+++ b/golang-github-hashicorp-errwrap.spec
@@ -1,163 +1,53 @@
-# 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 hashicorp
-%global repo errwrap
-# https://github.com/hashicorp/errwrap
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/hashicorp/errwrap
+%global provider_prefix github.com/hashicorp/errwrap
+%global gobaseipath %{provider_prefix}
%global commit 7554cd9344cec97297fa6649b055a8c98c2a1e55
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20141028
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.9.git%{shortcommit}%{?dist}
+Release: 0.10.%{commitdate}git%{shortcommit}%{?dist}
Summary: Errwrap is a Go (golang) library for wrapping and querying errors
License: MPLv2.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}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%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-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%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" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- 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} && 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
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- 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-devel.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
+%gochecks
#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
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.10.20141028git7554cd9
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.9.git7554cd9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -186,4 +76,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
* Wed Jan 13 2016 jchaloup <jchaloup(a)redhat.com> - 0-0.1.git7554cd9
- First package for Fedora
-
6 years, 1 month
- 1
- 0
Architecture specific change in rpms/shim.git
by githook-noreply＠fedoraproject.org
The package rpms/shim.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/shim.git/commit/?id=a0656a4af3f4f...
https://src.fedoraproject.org/cgit/rpms/shim.git/commit/?id=60deacd6eaf6b....
Change:
+%ifarch aarch64
-ExclusiveArch: x86_64
Thanks.
Full change:
============
commit a0656a4af3f4f4ab3459bce725bb285b53dcd667
Author: Peter Jones <pjones(a)redhat.com>
Date: Wed Feb 28 11:35:01 2018 -0500
Move the shim-signed package from f29 here.
Signed-off-by: Peter Jones <pjones(a)redhat.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7de9e4c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+shim*.efi
+*.rpm
+*/
+.build*.log
+*~
+.*.sw?
diff --git a/BOOTAA64.CSV b/BOOTAA64.CSV
new file mode 100644
index 0000000..e69de29
diff --git a/BOOTIA32.CSV b/BOOTIA32.CSV
new file mode 100644
index 0000000..e69de29
diff --git a/BOOTX64.CSV b/BOOTX64.CSV
new file mode 100644
index 0000000..e69de29
diff --git a/shim-signed.spec b/shim-signed.spec
new file mode 100644
index 0000000..d43d307
--- /dev/null
+++ b/shim-signed.spec
@@ -0,0 +1,336 @@
+%global debug_package %{nil}
+
+%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))
+
+# this is literally to make vim's \c not put a brace at the end.
+%global _dist %{expand:%{?_module_build:%%{?dist}}}
+%global dist %{expand:%%{_dist}}
+
+Name: shim-signed
+Version: 13
+Release: 1%{dist}
+Summary: First-stage UEFI bootloader
+License: BSD
+URL: http://github.com/rhboot/shim/
+
+# Shim is only required on platforms implementing the UEFI secure boot
+# protocol. The only one of those we currently wish to support is 64-bit x86.
+# Adding further platforms will require adding appropriate relocation code.
+ExclusiveArch: x86_64 aarch64
+
+# keep these two lists of sources synched up arch-wise. That is 0 and 10
+# match, 1 and 11 match, ...
+Source0: BOOTX64.CSV
+Source1: BOOTAA64.CSV
+Source2: BOOTIA32.CSV
+
+Source10: shimaa64.efi
+Source11: shimia32.efi
+Source12: shimx64.efi
+
+%global shimverx64 13-3.fc27
+%global shimveria32 13-3.fc27
+%global shimveraa64 13-3.fc27
+
+%ifarch x86_64
+BuildRequires: shim-unsigned-x64 = %{shimverx64}
+BuildRequires: shim-unsigned-ia32 = %{shimveria32}
+%global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64
+%global shimdiria32 %{_datadir}/shim/%{shimveria32}/ia32
+%endif
+%ifarch aarch64
+BuildRequires: shim-unsigned-aarch64 = %{shimveraa64}
+%global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64
+%endif
+BuildRequires: pesign >= 0.112-20.fc27
+
+%description
+Initial UEFI bootloader that handles chaining to a trusted full bootloader
+under secure boot environments. This package contains the version signed by
+the UEFI signing service.
+
+%define define_pkg(a:p:) \
+%{expand:%%package -n shim-%{-a*}} \
+Summary: First-stage UEFI bootloader \
+Requires: mokutil >= 1:0.2.0-1 \
+Provides: shim-signed-%{-a*} = %{version}-%{release} \
+Requires: dbxtool >= 0.6-3 \
+%{expand:%%if 0%%{-p*} \
+Provides: shim = %{version}-%{release} \
+Provides: shim-signed = %{version}-%{release} \
+Obsoletes: shim-signed < %{version}-%{release} \
+Obsoletes: shim < %{version}-%{release} \
+%%endif} \
+# Shim uses OpenSSL, but cannot use the system copy as the UEFI ABI \
+# is not compatible with SysV (there's no red zone under UEFI) and \
+# there isn't a POSIX-style C library. \
+# BuildRequires: OpenSSL \
+Provides: bundled(openssl) = 1.0.2j \
+ \
+%{expand:%%description -n shim-%{-a*}} \
+Initial UEFI bootloader that handles chaining to a trusted full \
+bootloader under secure boot environments. This package contains the \
+version signed by the UEFI signing service. \
+%{nil}
+
+%ifarch x86_64
+%define_pkg -a x64 -p 1
+%define_pkg -a ia32
+%endif
+%ifarch aarch64
+%define_pkg -a aa64 -p 1
+%endif
+
+%prep
+cd %{_builddir}
+rm -rf shim-signed-%{version}
+mkdir shim-signed-%{version}
+
+%build
+%define vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}}
+%define vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}}
+
+# -a <efiarch>
+# -i <input>
+%define hash(a:i:d:) \
+ pesign -i %{-i*} -h -P > shim.hash \
+ read file0 hash0 < shim.hash \
+ read file1 hash1 < %{-d*}/shim%{-a*}.hash \
+ if ! [ "$hash0" = "$hash1" ]; then \
+ echo Invalid signature\! > /dev/stderr \
+ echo $hash0 vs $hash1 \
+ exit 1 \
+ fi \
+ %{nil}
+
+# -i <input>
+# -o <output>
+%define sign(i:o:) \
+ %{expand:%%pesign -s -i %{-i*} -o %{-o*}} \
+ %{nil}
+
+# -b <binary prefix>
+# -a <efiarch>
+# -i <input>
+%define distrosign(b:a:d:) \
+ cp -av %{-d*}/%{-b*}%{-a*}.efi %{-b*}%{-a*}-unsigned.efi \
+ %{expand:%%sign -i %{-b*}%{-a*}-unsigned.efi -o %{-b*}%{-a*}-signed.efi}\
+ %{nil}
+
+# -a <efiarch>
+# -A <EFIARCH>
+# -b <yes|no> # signed by this builder?
+# -c <yes|no> # signed by UEFI CA?
+# -i <shimARCH.efi>
+%define define_build(a:A:b:c:i:d:) \
+if [ "%{-c*}" = "yes" ]; then \
+ %{expand:%%hash -i %{-i*} -a %{-a*} -d %{-d*}} \
+fi \
+cp %{-i*} shim%{-a*}.efi \
+if [ "%{-b*}" = "yes" ]; then \
+ %{expand:%%distrosign -b shim -a %{-a*} -d %{-d*}} \
+ mv shim%{-a*}-signed.efi shim%{-a*}-%{efidir}.efi \
+fi \
+if [ "%{-c*}" = "yes" ]; then \
+ cp shim%{-a*}-%{efidir}.efi shim%{-a*}.efi \
+fi \
+%{expand:%%distrosign -b mm -a %{-a*} -d %{-d*}} \
+mv mm%{-a*}-signed.efi mm%{-a*}.efi \
+%{expand:%%distrosign -b fb -a %{-a*} -d %{-d*}} \
+mv fb%{-a*}-signed.efi fb%{-a*}.efi \
+rm -vf \\\
+ mm%{-a*}-unsigned.efi \\\
+ fb%{-a*}-unsigned.efi \\\
+ shim%{-a*}-unsigned.efi \
+%{nil}
+
+cd shim-signed-%{version}
+%ifarch aarch64
+%define_build -a aa64 -A AA64 -i %{SOURCE10} -b yes -c no -d %{shimdiraa64}
+%endif
+%ifarch x86_64
+%define_build -a ia32 -A IA32 -i %{SOURCE11} -b yes -c yes -d %{shimdiria32}
+%define_build -a x64 -A X64 -i %{SOURCE12} -b yes -c yes -d %{shimdirx64}
+%endif
+
+%install
+# -a <efiarch>
+# -A <EFIARCH>
+# -b <BOOTCSV>
+%define do_install(a:A:b:) \
+install -m 0700 shim%{-a*}.efi \\\
+ $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim%{-a*}.efi \
+install -m 0700 shim%{-a*}-%{efidir}.efi \\\
+ $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim%{-a*}-%{efidir}.efi \
+install -m 0700 mm%{-a*}.efi \\\
+ $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/mm%{-a*}.efi \
+install -m 0700 %{-b*} \\\
+ $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT%{-A*}.CSV \
+install -m 0700 shim%{-a*}.efi \\\
+ $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/BOOT%{-A*}.EFI \
+install -m 0700 fb%{-a*}.efi \\\
+ $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fb%{-a*}.efi \
+%nil
+
+rm -rf $RPM_BUILD_ROOT
+cd shim-signed-%{version}
+install -D -d -m 0755 $RPM_BUILD_ROOT/boot/
+install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/
+install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/
+install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/
+install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/
+
+%ifarch x86_64
+%do_install -a x64 -A X64 -b %{SOURCE0}
+%do_install -a ia32 -A IA32 -b %{SOURCE2}
+install -m 0700 %{SOURCE2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT.CSV
+install -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/mmx64.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/MokManager.efi
+install -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fbx64.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fallback.efi
+install -m 0700 %{SOURCE12} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
+%endif
+%ifarch aarch64
+%do_install -a aa64 -A AA64 -b %{SOURCE1}
+install -m 0700 %{SOURCE10} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
+%endif
+
+# -a <efiarch>
+# -A <EFIARCH>
+%define define_files(a:A:) \
+%{expand:%%files -n shim-%{-a*}} \
+%dir /boot/efi \
+%dir /boot/efi/EFI \
+%dir /boot/efi/EFI/BOOT \
+%dir /boot/efi/EFI/%{efidir} \
+/boot/efi/EFI/%{efidir}/*%{-a*}*.efi \
+/boot/efi/EFI/%{efidir}/BOOT%{-A*}.CSV \
+/boot/efi/EFI/BOOT/*%{-a*}.efi \
+/boot/efi/EFI/BOOT/*%{-A*}.EFI \
+%{nil}
+
+%ifarch x86_64
+%define_files -a x64 -A X64
+/boot/efi/EFI/%{efidir}/BOOT.CSV
+/boot/efi/EFI/%{efidir}/MokManager.efi
+/boot/efi/EFI/%{efidir}/shim.efi
+/boot/efi/EFI/BOOT/fallback.efi
+
+%define_files -a ia32 -A IA32
+%endif
+%ifarch aarch64
+%define_files -a aa64 -A AA64
+/boot/efi/EFI/%{efidir}/shim.efi
+%endif
+
+%changelog
+* Wed Nov 01 2017 Peter Jones <pjones(a)redhat.com> - 13-1
+- Now with the actual signed 64-bit build of shim 13 for x64 as well.
+- Make everything under /boot/efi be mode 0700, since that's what FAT will
+ show anyway, so that rpm -V is correct.
+ Resolves: rhbz#1508516
+
+* Tue Oct 24 2017 Peter Jones <pjones(a)redhat.com> - 13-0.8
+- Now with signed 32-bit x86 build.
+ Related: rhbz#1474861
+
+* Wed Oct 04 2017 Peter Jones <pjones(a)redhat.com> - 13-0.7
+- Make /boot/efi/EFI/fedora/shim.efi still exist on aarch64 as well.
+ Resolves: rhbz#1497854
+
+* Tue Sep 19 2017 Peter Jones <pjones(a)redhat.com> - 13-0.6
+- Fix binary format issue on Aarch64
+ Resolves: rhbz#1489604
+
+* Tue Sep 05 2017 Peter Jones <pjones(a)redhat.com> - 13-0.5
+- Make /boot/efi/EFI/fedora/shim.efi still exist on x86_64, since some
+ machines have boot entries that point to it.
+
+* Tue Aug 29 2017 Peter Jones <pjones(a)redhat.com> - 13-0.4
+- Make our provides not get silently ignore by rpmbuild...
+
+* Fri Aug 25 2017 Peter Jones <pjones(a)redhat.com> - 13-0.3
+- x64: use the new fbx64.efi and mm64.efi as fallback.efi and MokManager.efi
+- Provide: "shim" in x64 and aa64 builds
+
+* Thu Aug 24 2017 Peter Jones <pjones(a)redhat.com> - 13-0.2
+- Obsolete old shim builds.
+
+* Tue Aug 22 2017 Peter Jones <pjones(a)redhat.com> - 13-0.1
+- Initial (partially unsigned) build for multi-arch support on x64/ia32.
+
+* Thu Mar 23 2017 Petr Šabata <contyk(a)redhat.com> - 0.8-9
+- Re-enable dist tag for module builds
+
+* Tue Feb 17 2015 Peter Jones <pjones(a)redhat.com> - 0.8-8
+- Don't dual-sign shim-%%{efidir}.efi either.
+ Resolves: rhbz#1184765
+
+* Tue Feb 17 2015 Peter Jones <pjones(a)redhat.com> - 0.8-8
+- Require dbxtool
+
+* Wed Dec 17 2014 Peter Jones <pjones(a)redhat.com> - 0.8-7
+- Wrong -signed changes got built for aarch64 last time, for dumb reasons.
+ Related: rhbz#1170289
+
+* Fri Dec 05 2014 Peter Jones <pjones(a)redhat.com> - 0.8-6
+- Rebuild once more so we can use a different -unsigned version on different
+ arches (because we can't tag a newer build into aarch64 without an x86
+ update to match.)
+ Related: rhbz#1170289
+
+* Wed Dec 03 2014 Peter Jones <pjones(a)redhat.com> - 0.8-5
+- Rebuild for aarch64 path fixes
+ Related: rhbz#1170289
+
+* Thu Oct 30 2014 Peter Jones <pjones(a)redhat.com> - 0.8-2
+- Remove the dist tag so people don't complain about what it says.
+
+* Fri Oct 24 2014 Peter Jones <pjones(a)redhat.com> - 0.8-1
+- Update to shim 0.8
+ rhbz#1148230
+ rhbz#1148231
+ rhbz#1148232
+- Handle building on aarch64 as well
+
+* Fri Jul 18 2014 Peter Jones <pjones(a)redhat.com> - 0.7-2
+- Don't do multi-signing; too many machines screw up verification.
+ Resolves: rhbz#1049749
+
+* Wed Nov 13 2013 Peter Jones <pjones(a)redhat.com> - 0.7-1
+- Update to shim 0.7
+ Resolves: rhbz#1023767
+
+* Thu Oct 24 2013 Peter Jones <pjones(a)redhat.com> - 0.5-1
+- Update to shim 0.5
+
+* Thu Jun 20 2013 Peter Jones <pjones(a)redhat.com> - 0.4-1
+- Provide a fallback for uninitialized Boot#### and BootOrder
+ Resolves: rhbz#963359
+- Move all signing from shim-unsigned to here
+- properly compare our generated hash from shim-unsigned with the hash of
+ the signed binary (as opposed to doing it manually)
+
+* Fri May 31 2013 Peter Jones <pjones(a)redhat.com> - 0.2-4.4
+- Re-sign to get alignments that match the new specification.
+ Resolves: rhbz#963361
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-4.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Jan 02 2013 Peter Jones <pjones(a)redhat.com> - 0.2-3.3
+- Add obsoletes and provides for earlier shim-signed packages, to cover
+ the package update cases where previous versions were installed.
+ Related: rhbz#888026
+
+* Mon Dec 17 2012 Peter Jones <pjones(a)redhat.com> - 0.2-3.2
+- Make the shim-unsigned dep be on the subpackage.
+
+* Sun Dec 16 2012 Peter Jones <pjones(a)redhat.com> - 0.2-3.1
+- Rebuild to provide "shim" package directly instead of just as a Provides:
+
+* Sat Dec 15 2012 Peter Jones <pjones(a)redhat.com> - 0.2-3
+- Also provide shim-fedora.efi, signed only by the fedora signer.
+- Fix the fedora signature on the result to actually be correct.
+- Update for shim-unsigned 0.2-3
+
+* Mon Dec 03 2012 Peter Jones <pjones(a)redhat.com> - 0.2-2
+- Initial build
diff --git a/sources b/sources
new file mode 100644
index 0000000..9e135b5
--- /dev/null
+++ b/sources
@@ -0,0 +1,3 @@
+SHA512 (shimaa64.efi) = 779893923f9707bb20476bf9dfd9a613e72efad4f6cd7fd569f1a46cf5565b210d62b5c78e8ef5b8eb40ba673561fd74dd3195d82f72492348a3e31f859bf3b5
+SHA512 (shimia32.efi) = 9f9d491c690faf70f0420f8a154d7a3b98e6d71b4da16d2e61f724694f7e55235aafec0233917f4907f1da1bc9598fa36e040666b94d2942e1fbbdfdd3a30826
+SHA512 (shimx64.efi) = 50e53ec4b17b4ddf0b7b0341c1de9a14027c2de940cd36218ba727b8742be03f793480bb7b330a897127c0691532262a2a0eb5022270ac323e6d2e07201a6191
commit 60deacd6eaf6b79735163b66afc3eb5aaa99d2e1
Author: Peter Jones <pjones(a)redhat.com>
Date: Wed Feb 28 11:34:24 2018 -0500
Boil the sea.
Signed-off-by: Peter Jones <pjones(a)redhat.com>
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 0b3bfd0..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.tar.*
-clog
-*.rpm
-/rhtest.cer
diff --git a/dbx.esl b/dbx.esl
deleted file mode 100644
index 2ea555c..0000000
Binary files a/dbx.esl and /dev/null differ
diff --git a/fedora-ca.cer b/fedora-ca.cer
deleted file mode 100644
index b81707b..0000000
Binary files a/fedora-ca.cer and /dev/null differ
diff --git a/shim.spec b/shim.spec
deleted file mode 100644
index e8b29e1..0000000
--- a/shim.spec
+++ /dev/null
@@ -1,151 +0,0 @@
-Name: shim
-Version: 0.9
-Release: 1%{?dist}
-Summary: First-stage UEFI bootloader
-
-License: BSD
-URL: https://github.com/rhinstaller/shim
-Source0: https://github.com/rhinstaller/shim/releases/download/%{version}/shim-%{v...
-Source1: fedora-ca.cer
-
-# currently here's what's in our dbx:
-# grub2-efi-2.00-11.fc18.x86_64:
-# grubx64.efi 6ac839881e73504047c06a1aac0c4763408ecb3642783c8acf77a2d393ea5cd7
-# gcdx64.efi 065cd63bab696ad2f4732af9634d66f2c0d48f8a3134b8808750d378550be151
-# grub2-efi-2.00-11.fc19.x86_64:
-# grubx64.efi 49ece9a10a9403b32c8e0c892fd9afe24a974323c96f2cc3dd63608754bf9b45
-# gcdx64.efi 99fcaa957786c155a92b40be9c981c4e4685b8c62b408cb0f6cb2df9c30b9978
-# woops.
-Source2: dbx.esl
-Source3: rhtest.cer
-
-BuildRequires: git openssl-devel openssl
-BuildRequires: pesign >= 0.106-1
-BuildRequires: gnu-efi >= 3.0.3-3
-BuildRequires: gnu-efi-devel >= 3.0.3-3
-
-# Shim uses OpenSSL, but cannot use the system copy as the UEFI ABI is not
-# compatible with SysV (there's no red zone under UEFI) and there isn't a
-# POSIX-style C library.
-# BuildRequires: OpenSSL
-Provides: bundled(openssl) = 0.9.8zb
-
-# Shim is only required on platforms implementing the UEFI secure boot
-# protocol. The only one of those we currently wish to support is 64-bit x86.
-# Adding further platforms will require adding appropriate relocation code.
-ExclusiveArch: x86_64
-
-%global efiarch x64
-
-# Figure out the right file path to use
-%if 0%{?rhel}
-%global efidir redhat
-%endif
-%if 0%{?fedora}
-%global efidir fedora
-%endif
-
-%description
-Initial UEFI bootloader that handles chaining to a trusted full bootloader
-under secure boot environments.
-
-%package -n shim-unsigned
-Summary: First-stage UEFI bootloader (unsigned data)
-
-%description -n shim-unsigned
-Initial UEFI bootloader that handles chaining to a trusted full bootloader
-under secure boot environments.
-
-%prep
-%setup -q
-git init
-git config user.email "%{name}-owner(a)fedoraproject.org"
-git config user.name "Fedora Ninjas"
-git add .
-git commit -a -q -m "%{version} baseline."
-git am --ignore-whitespace %{patches} </dev/null
-git config --unset user.email
-git config --unset user.name
-
-%build
-MAKEFLAGS=""
-if [ -f "%{SOURCE3}" ]; then
- MAKEFLAGS="VENDOR_CERT_FILE=%{SOURCE3} VENDOR_DBX_FILE=%{SOURCE2}"
-fi
-MAKEFLAGS="$MAKEFLAGS RELEASE=%{release}"
-make 'DEFAULT_LOADER=\\\\grub%{efiarch}.efi' ${MAKEFLAGS} shim.efi MokManager.efi fallback.efi
-
-%install
-rm -rf $RPM_BUILD_ROOT
-pesign -h -P -i shim.efi -h > shim.hash
-install -D -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/shim/
-install -m 0644 shim.efi $RPM_BUILD_ROOT%{_datadir}/shim/shim.efi
-install -m 0644 shim.hash $RPM_BUILD_ROOT%{_datadir}/shim/shim.hash
-install -m 0644 fallback.efi $RPM_BUILD_ROOT%{_datadir}/shim/fallback.efi
-install -m 0644 MokManager.efi $RPM_BUILD_ROOT%{_datadir}/shim/MokManager.efi
-# now install our .debug files...
-install -D -d -m 0755 $RPM_BUILD_ROOT/usr/lib/debug/%{_datadir}/shim/
-install -m 0644 shim.efi.debug $RPM_BUILD_ROOT/usr/lib/debug/%{_datadir}/shim/shim.efi.debug
-install -m 0644 fallback.efi.debug $RPM_BUILD_ROOT/usr/lib/debug/%{_datadir}/shim/fallback.efi.debug
-install -m 0644 MokManager.efi.debug $RPM_BUILD_ROOT/usr/lib/debug/%{_datadir}/shim/MokManager.efi.debug
-
-%files -n shim-unsigned
-%doc
-%dir %{_datadir}/shim
-%{_datadir}/shim/*
-
-%changelog
-* Fri Apr 28 2017 Petr Šabata <contyk(a)redhat.com> - 0.9-1
-- Updating to 0.9 to enable building with gcc7
-- Mostly mirroring the key shim-unsigned-aarch64 0.9 changes
-
-* Wed Dec 03 2014 Peter Jones <pjones(a)redhat.com> - 0.8-2
-- Fix bootloader path and whitelist certificates on ARM Aarch64.
- Resolves: rhbz#1170289
-
-* Tue Oct 14 2014 Peter Jones <pjones(a)redhat.com> - 0.8-1
-- Update to 0.8
- Related: rhbz#1148230
- Related: rhbz#1148231
- Related: rhbz#1148232
-
-* Wed Nov 06 2013 Peter Jones <pjones(a)redhat.com> - 0.7-1
-- Fix logic to handle SetupMode efi variable.
-
-* Thu Oct 31 2013 Peter Jones <pjones(a)redhat.com> - 0.6-1
-- Fix a FreePool(NULL) call on machines too old for SB
-
-* Fri Oct 04 2013 Peter Jones <pjones(a)redhat.com> - 0.5-1
-- Update to 0.5
-
-* Tue Jun 11 2013 Peter Jones <pjones(a)redhat.com> - 0.4-1
-- Update to 0.4
-
-* Fri Jun 07 2013 Peter Jones <pjones(a)redhat.com> - 0.3-2
-- Require gnu-efi-3.0q for now.
-- Don't allow mmx or sse during compilation.
-- Re-organize this so all real signing happens in shim-signed instead.
-- Split out mokutil
-
-* Wed Dec 12 2012 Peter Jones <pjones(a)redhat.com> - 0.2-3
-- Fix mokutil's idea of signature sizes.
-
-* Wed Nov 28 2012 Matthew Garrett <mjg59(a)srcf.ucam.org> - 0.2-2
-- Fix secure_mode() always returning true
-
-* Mon Nov 26 2012 Matthew Garrett <mjg59(a)srcf.ucam.org> - 0.2-1
-- Update shim
-- Include mokutil
-- Add debuginfo package since mokutil is a userspace executable
-
-* Mon Oct 22 2012 Peter Jones <pjones(a)redhat.com> - 0.1-4
-- Produce an unsigned shim
-
-* Tue Aug 14 2012 Peter Jones <pjones(a)redhat.com> - 0.1-3
-- Update how embedded cert and signing work.
-
-* Mon Aug 13 2012 Josh Boyer <jwboyer(a)redhat.com> - 0.1-2
-- Add patch to fix image size calculation
-
-* Mon Aug 13 2012 Matthew Garrett <mjg(a)redhat.com> - 0.1-1
-- initial release
diff --git a/sources b/sources
deleted file mode 100644
index 86c6569..0000000
--- a/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA512 (shim-0.9.tar.bz2) = 780f3eb3bfae366f25591eb5c46f7853614c03d79f88f0890f5e1bd614f2a9e859b355faa333894a16c048f50cbe9dc65ebe414e8fe07ce0657edec42836be0c
-SHA512 (rhtest.cer) = 33d20ec3540e75aca39d92971b65c7d0b6e35fde85dda2426f097fa4a8506d95693201de13e231fa06afce3bc0e05faf05976a7481ed3db1b9795b8fc045d468
6 years, 1 month
- 1
- 0
Architecture specific change in rpms/shim-signed.git
by githook-noreply＠fedoraproject.org
The package rpms/shim-signed.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/shim-signed.git/commit/?id=a29995....
Change:
-%ifarch aarch64
Thanks.
Full change:
============
commit a29995fbc34d4a30bb568ced3494fff364f8410d
Author: Peter Jones <pjones(a)redhat.com>
Date: Wed Feb 28 11:40:22 2018 -0500
In Fedora 29 this is now provided by the 'shim' package.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b531bde..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-shim*.efi
-*/
-.build*.log
-*~
-.*.sw?
diff --git a/BOOTAA64.CSV b/BOOTAA64.CSV
deleted file mode 100644
index f4d9fb1..0000000
Binary files a/BOOTAA64.CSV and /dev/null differ
diff --git a/BOOTIA32.CSV b/BOOTIA32.CSV
deleted file mode 100644
index 173a87b..0000000
Binary files a/BOOTIA32.CSV and /dev/null differ
diff --git a/BOOTX64.CSV b/BOOTX64.CSV
deleted file mode 100644
index 087ee40..0000000
Binary files a/BOOTX64.CSV and /dev/null differ
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..2c60200
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+In Fedora 29 this is now provided by the 'shim' package.
diff --git a/shim-signed.spec b/shim-signed.spec
deleted file mode 100644
index d43d307..0000000
--- a/shim-signed.spec
+++ /dev/null
@@ -1,336 +0,0 @@
-%global debug_package %{nil}
-
-%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))
-
-# this is literally to make vim's \c not put a brace at the end.
-%global _dist %{expand:%{?_module_build:%%{?dist}}}
-%global dist %{expand:%%{_dist}}
-
-Name: shim-signed
-Version: 13
-Release: 1%{dist}
-Summary: First-stage UEFI bootloader
-License: BSD
-URL: http://github.com/rhboot/shim/
-
-# Shim is only required on platforms implementing the UEFI secure boot
-# protocol. The only one of those we currently wish to support is 64-bit x86.
-# Adding further platforms will require adding appropriate relocation code.
-ExclusiveArch: x86_64 aarch64
-
-# keep these two lists of sources synched up arch-wise. That is 0 and 10
-# match, 1 and 11 match, ...
-Source0: BOOTX64.CSV
-Source1: BOOTAA64.CSV
-Source2: BOOTIA32.CSV
-
-Source10: shimaa64.efi
-Source11: shimia32.efi
-Source12: shimx64.efi
-
-%global shimverx64 13-3.fc27
-%global shimveria32 13-3.fc27
-%global shimveraa64 13-3.fc27
-
-%ifarch x86_64
-BuildRequires: shim-unsigned-x64 = %{shimverx64}
-BuildRequires: shim-unsigned-ia32 = %{shimveria32}
-%global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64
-%global shimdiria32 %{_datadir}/shim/%{shimveria32}/ia32
-%endif
-%ifarch aarch64
-BuildRequires: shim-unsigned-aarch64 = %{shimveraa64}
-%global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64
-%endif
-BuildRequires: pesign >= 0.112-20.fc27
-
-%description
-Initial UEFI bootloader that handles chaining to a trusted full bootloader
-under secure boot environments. This package contains the version signed by
-the UEFI signing service.
-
-%define define_pkg(a:p:) \
-%{expand:%%package -n shim-%{-a*}} \
-Summary: First-stage UEFI bootloader \
-Requires: mokutil >= 1:0.2.0-1 \
-Provides: shim-signed-%{-a*} = %{version}-%{release} \
-Requires: dbxtool >= 0.6-3 \
-%{expand:%%if 0%%{-p*} \
-Provides: shim = %{version}-%{release} \
-Provides: shim-signed = %{version}-%{release} \
-Obsoletes: shim-signed < %{version}-%{release} \
-Obsoletes: shim < %{version}-%{release} \
-%%endif} \
-# Shim uses OpenSSL, but cannot use the system copy as the UEFI ABI \
-# is not compatible with SysV (there's no red zone under UEFI) and \
-# there isn't a POSIX-style C library. \
-# BuildRequires: OpenSSL \
-Provides: bundled(openssl) = 1.0.2j \
- \
-%{expand:%%description -n shim-%{-a*}} \
-Initial UEFI bootloader that handles chaining to a trusted full \
-bootloader under secure boot environments. This package contains the \
-version signed by the UEFI signing service. \
-%{nil}
-
-%ifarch x86_64
-%define_pkg -a x64 -p 1
-%define_pkg -a ia32
-%endif
-%ifarch aarch64
-%define_pkg -a aa64 -p 1
-%endif
-
-%prep
-cd %{_builddir}
-rm -rf shim-signed-%{version}
-mkdir shim-signed-%{version}
-
-%build
-%define vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}}
-%define vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}}
-
-# -a <efiarch>
-# -i <input>
-%define hash(a:i:d:) \
- pesign -i %{-i*} -h -P > shim.hash \
- read file0 hash0 < shim.hash \
- read file1 hash1 < %{-d*}/shim%{-a*}.hash \
- if ! [ "$hash0" = "$hash1" ]; then \
- echo Invalid signature\! > /dev/stderr \
- echo $hash0 vs $hash1 \
- exit 1 \
- fi \
- %{nil}
-
-# -i <input>
-# -o <output>
-%define sign(i:o:) \
- %{expand:%%pesign -s -i %{-i*} -o %{-o*}} \
- %{nil}
-
-# -b <binary prefix>
-# -a <efiarch>
-# -i <input>
-%define distrosign(b:a:d:) \
- cp -av %{-d*}/%{-b*}%{-a*}.efi %{-b*}%{-a*}-unsigned.efi \
- %{expand:%%sign -i %{-b*}%{-a*}-unsigned.efi -o %{-b*}%{-a*}-signed.efi}\
- %{nil}
-
-# -a <efiarch>
-# -A <EFIARCH>
-# -b <yes|no> # signed by this builder?
-# -c <yes|no> # signed by UEFI CA?
-# -i <shimARCH.efi>
-%define define_build(a:A:b:c:i:d:) \
-if [ "%{-c*}" = "yes" ]; then \
- %{expand:%%hash -i %{-i*} -a %{-a*} -d %{-d*}} \
-fi \
-cp %{-i*} shim%{-a*}.efi \
-if [ "%{-b*}" = "yes" ]; then \
- %{expand:%%distrosign -b shim -a %{-a*} -d %{-d*}} \
- mv shim%{-a*}-signed.efi shim%{-a*}-%{efidir}.efi \
-fi \
-if [ "%{-c*}" = "yes" ]; then \
- cp shim%{-a*}-%{efidir}.efi shim%{-a*}.efi \
-fi \
-%{expand:%%distrosign -b mm -a %{-a*} -d %{-d*}} \
-mv mm%{-a*}-signed.efi mm%{-a*}.efi \
-%{expand:%%distrosign -b fb -a %{-a*} -d %{-d*}} \
-mv fb%{-a*}-signed.efi fb%{-a*}.efi \
-rm -vf \\\
- mm%{-a*}-unsigned.efi \\\
- fb%{-a*}-unsigned.efi \\\
- shim%{-a*}-unsigned.efi \
-%{nil}
-
-cd shim-signed-%{version}
-%ifarch aarch64
-%define_build -a aa64 -A AA64 -i %{SOURCE10} -b yes -c no -d %{shimdiraa64}
-%endif
-%ifarch x86_64
-%define_build -a ia32 -A IA32 -i %{SOURCE11} -b yes -c yes -d %{shimdiria32}
-%define_build -a x64 -A X64 -i %{SOURCE12} -b yes -c yes -d %{shimdirx64}
-%endif
-
-%install
-# -a <efiarch>
-# -A <EFIARCH>
-# -b <BOOTCSV>
-%define do_install(a:A:b:) \
-install -m 0700 shim%{-a*}.efi \\\
- $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim%{-a*}.efi \
-install -m 0700 shim%{-a*}-%{efidir}.efi \\\
- $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim%{-a*}-%{efidir}.efi \
-install -m 0700 mm%{-a*}.efi \\\
- $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/mm%{-a*}.efi \
-install -m 0700 %{-b*} \\\
- $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT%{-A*}.CSV \
-install -m 0700 shim%{-a*}.efi \\\
- $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/BOOT%{-A*}.EFI \
-install -m 0700 fb%{-a*}.efi \\\
- $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fb%{-a*}.efi \
-%nil
-
-rm -rf $RPM_BUILD_ROOT
-cd shim-signed-%{version}
-install -D -d -m 0755 $RPM_BUILD_ROOT/boot/
-install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/
-install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/
-install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/
-install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/
-
-%ifarch x86_64
-%do_install -a x64 -A X64 -b %{SOURCE0}
-%do_install -a ia32 -A IA32 -b %{SOURCE2}
-install -m 0700 %{SOURCE2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT.CSV
-install -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/mmx64.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/MokManager.efi
-install -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fbx64.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fallback.efi
-install -m 0700 %{SOURCE12} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
-%endif
-%ifarch aarch64
-%do_install -a aa64 -A AA64 -b %{SOURCE1}
-install -m 0700 %{SOURCE10} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
-%endif
-
-# -a <efiarch>
-# -A <EFIARCH>
-%define define_files(a:A:) \
-%{expand:%%files -n shim-%{-a*}} \
-%dir /boot/efi \
-%dir /boot/efi/EFI \
-%dir /boot/efi/EFI/BOOT \
-%dir /boot/efi/EFI/%{efidir} \
-/boot/efi/EFI/%{efidir}/*%{-a*}*.efi \
-/boot/efi/EFI/%{efidir}/BOOT%{-A*}.CSV \
-/boot/efi/EFI/BOOT/*%{-a*}.efi \
-/boot/efi/EFI/BOOT/*%{-A*}.EFI \
-%{nil}
-
-%ifarch x86_64
-%define_files -a x64 -A X64
-/boot/efi/EFI/%{efidir}/BOOT.CSV
-/boot/efi/EFI/%{efidir}/MokManager.efi
-/boot/efi/EFI/%{efidir}/shim.efi
-/boot/efi/EFI/BOOT/fallback.efi
-
-%define_files -a ia32 -A IA32
-%endif
-%ifarch aarch64
-%define_files -a aa64 -A AA64
-/boot/efi/EFI/%{efidir}/shim.efi
-%endif
-
-%changelog
-* Wed Nov 01 2017 Peter Jones <pjones(a)redhat.com> - 13-1
-- Now with the actual signed 64-bit build of shim 13 for x64 as well.
-- Make everything under /boot/efi be mode 0700, since that's what FAT will
- show anyway, so that rpm -V is correct.
- Resolves: rhbz#1508516
-
-* Tue Oct 24 2017 Peter Jones <pjones(a)redhat.com> - 13-0.8
-- Now with signed 32-bit x86 build.
- Related: rhbz#1474861
-
-* Wed Oct 04 2017 Peter Jones <pjones(a)redhat.com> - 13-0.7
-- Make /boot/efi/EFI/fedora/shim.efi still exist on aarch64 as well.
- Resolves: rhbz#1497854
-
-* Tue Sep 19 2017 Peter Jones <pjones(a)redhat.com> - 13-0.6
-- Fix binary format issue on Aarch64
- Resolves: rhbz#1489604
-
-* Tue Sep 05 2017 Peter Jones <pjones(a)redhat.com> - 13-0.5
-- Make /boot/efi/EFI/fedora/shim.efi still exist on x86_64, since some
- machines have boot entries that point to it.
-
-* Tue Aug 29 2017 Peter Jones <pjones(a)redhat.com> - 13-0.4
-- Make our provides not get silently ignore by rpmbuild...
-
-* Fri Aug 25 2017 Peter Jones <pjones(a)redhat.com> - 13-0.3
-- x64: use the new fbx64.efi and mm64.efi as fallback.efi and MokManager.efi
-- Provide: "shim" in x64 and aa64 builds
-
-* Thu Aug 24 2017 Peter Jones <pjones(a)redhat.com> - 13-0.2
-- Obsolete old shim builds.
-
-* Tue Aug 22 2017 Peter Jones <pjones(a)redhat.com> - 13-0.1
-- Initial (partially unsigned) build for multi-arch support on x64/ia32.
-
-* Thu Mar 23 2017 Petr Šabata <contyk(a)redhat.com> - 0.8-9
-- Re-enable dist tag for module builds
-
-* Tue Feb 17 2015 Peter Jones <pjones(a)redhat.com> - 0.8-8
-- Don't dual-sign shim-%%{efidir}.efi either.
- Resolves: rhbz#1184765
-
-* Tue Feb 17 2015 Peter Jones <pjones(a)redhat.com> - 0.8-8
-- Require dbxtool
-
-* Wed Dec 17 2014 Peter Jones <pjones(a)redhat.com> - 0.8-7
-- Wrong -signed changes got built for aarch64 last time, for dumb reasons.
- Related: rhbz#1170289
-
-* Fri Dec 05 2014 Peter Jones <pjones(a)redhat.com> - 0.8-6
-- Rebuild once more so we can use a different -unsigned version on different
- arches (because we can't tag a newer build into aarch64 without an x86
- update to match.)
- Related: rhbz#1170289
-
-* Wed Dec 03 2014 Peter Jones <pjones(a)redhat.com> - 0.8-5
-- Rebuild for aarch64 path fixes
- Related: rhbz#1170289
-
-* Thu Oct 30 2014 Peter Jones <pjones(a)redhat.com> - 0.8-2
-- Remove the dist tag so people don't complain about what it says.
-
-* Fri Oct 24 2014 Peter Jones <pjones(a)redhat.com> - 0.8-1
-- Update to shim 0.8
- rhbz#1148230
- rhbz#1148231
- rhbz#1148232
-- Handle building on aarch64 as well
-
-* Fri Jul 18 2014 Peter Jones <pjones(a)redhat.com> - 0.7-2
-- Don't do multi-signing; too many machines screw up verification.
- Resolves: rhbz#1049749
-
-* Wed Nov 13 2013 Peter Jones <pjones(a)redhat.com> - 0.7-1
-- Update to shim 0.7
- Resolves: rhbz#1023767
-
-* Thu Oct 24 2013 Peter Jones <pjones(a)redhat.com> - 0.5-1
-- Update to shim 0.5
-
-* Thu Jun 20 2013 Peter Jones <pjones(a)redhat.com> - 0.4-1
-- Provide a fallback for uninitialized Boot#### and BootOrder
- Resolves: rhbz#963359
-- Move all signing from shim-unsigned to here
-- properly compare our generated hash from shim-unsigned with the hash of
- the signed binary (as opposed to doing it manually)
-
-* Fri May 31 2013 Peter Jones <pjones(a)redhat.com> - 0.2-4.4
-- Re-sign to get alignments that match the new specification.
- Resolves: rhbz#963361
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-4.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Jan 02 2013 Peter Jones <pjones(a)redhat.com> - 0.2-3.3
-- Add obsoletes and provides for earlier shim-signed packages, to cover
- the package update cases where previous versions were installed.
- Related: rhbz#888026
-
-* Mon Dec 17 2012 Peter Jones <pjones(a)redhat.com> - 0.2-3.2
-- Make the shim-unsigned dep be on the subpackage.
-
-* Sun Dec 16 2012 Peter Jones <pjones(a)redhat.com> - 0.2-3.1
-- Rebuild to provide "shim" package directly instead of just as a Provides:
-
-* Sat Dec 15 2012 Peter Jones <pjones(a)redhat.com> - 0.2-3
-- Also provide shim-fedora.efi, signed only by the fedora signer.
-- Fix the fedora signature on the result to actually be correct.
-- Update for shim-unsigned 0.2-3
-
-* Mon Dec 03 2012 Peter Jones <pjones(a)redhat.com> - 0.2-2
-- Initial build
diff --git a/sources b/sources
deleted file mode 100644
index 9e135b5..0000000
--- a/sources
+++ /dev/null
@@ -1,3 +0,0 @@
-SHA512 (shimaa64.efi) = 779893923f9707bb20476bf9dfd9a613e72efad4f6cd7fd569f1a46cf5565b210d62b5c78e8ef5b8eb40ba673561fd74dd3195d82f72492348a3e31f859bf3b5
-SHA512 (shimia32.efi) = 9f9d491c690faf70f0420f8a154d7a3b98e6d71b4da16d2e61f724694f7e55235aafec0233917f4907f1da1bc9598fa36e040666b94d2942e1fbbdfdd3a30826
-SHA512 (shimx64.efi) = 50e53ec4b17b4ddf0b7b0341c1de9a14027c2de940cd36218ba727b8742be03f793480bb7b330a897127c0691532262a2a0eb5022270ac323e6d2e07201a6191
6 years, 1 month
- 1
- 0
Architecture specific change in rpms/golang-github-grpc-grpc-go.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-grpc-grpc-go.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-grpc-grpc-go.git/co....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 30cd2093d11539e934c23a59bd0f031ec735496a
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 17:24:53 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-grpc-grpc-go.spec b/golang-github-grpc-grpc-go.spec
index b9fd7aa..4247a8c 100644
--- a/golang-github-grpc-grpc-go.spec
+++ b/golang-github-grpc-grpc-go.spec
@@ -1,67 +1,26 @@
-# 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 grpc, cloud 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
-
-%global provider github
-%global provider_tld com
-%global project grpc
-%global repo grpc-go
-# https://github.com/grpc/grpc-go
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path google.golang.org/grpc
+# http://github.com/grpc/grpc-go
+%global provider_prefix github.com/grpc/grpc-go
+%global gobaseipath google.golang.org/grpc
%global commit 8050b9cbc271307e5a716a9d782803d09b0d6f2d
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20170407
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 1.0.0
-Release: 0.8.git%{shortcommit}%{?dist}
+Release: 0.9.%{commitdate}git%{shortcommit}%{?dist}
Summary: The Go language implementation of gRPC. HTTP/2 based RPC
License: BSD
-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}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
BuildRequires: golang(github.com/golang/glog)
BuildRequires: golang(github.com/golang/mock/gomock)
BuildRequires: golang(github.com/golang/protobuf/proto)
@@ -73,155 +32,34 @@ BuildRequires: golang(golang.org/x/net/trace)
BuildRequires: golang(golang.org/x/oauth2)
BuildRequires: golang(golang.org/x/oauth2/google)
BuildRequires: golang(golang.org/x/oauth2/jwt)
-%endif
-
-Requires: golang(github.com/golang/glog)
-Requires: golang(github.com/golang/mock/gomock)
-Requires: golang(github.com/golang/protobuf/proto)
-Requires: golang(github.com/golang/protobuf/protoc-gen-go/descriptor)
-Requires: golang(golang.org/x/net/context)
-Requires: golang(golang.org/x/net/http2)
-Requires: golang(golang.org/x/net/http2/hpack)
-Requires: golang(golang.org/x/net/trace)
-Requires: golang(golang.org/x/oauth2)
-Requires: golang(golang.org/x/oauth2/google)
-Requires: golang(golang.org/x/oauth2/jwt)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/benchmark) = %{version}-%{release}
-Provides: golang(%{import_path}/benchmark/grpc_testing) = %{version}-%{release}
-Provides: golang(%{import_path}/benchmark/stats) = %{version}-%{release}
-Provides: golang(%{import_path}/codes) = %{version}-%{release}
-Provides: golang(%{import_path}/credentials) = %{version}-%{release}
-Provides: golang(%{import_path}/credentials/oauth) = %{version}-%{release}
-Provides: golang(%{import_path}/examples/helloworld/helloworld) = %{version}-%{release}
-Provides: golang(%{import_path}/examples/helloworld/mock/mock_helloworld) = %{version}-%{release}
-Provides: golang(%{import_path}/examples/route_guide/routeguide) = %{version}-%{release}
-Provides: golang(%{import_path}/grpclb) = %{version}-%{release}
-Provides: golang(%{import_path}/grpclb/grpc_lb_v1) = %{version}-%{release}
-Provides: golang(%{import_path}/grpclog) = %{version}-%{release}
-Provides: golang(%{import_path}/grpclog/glogger) = %{version}-%{release}
-Provides: golang(%{import_path}/health) = %{version}-%{release}
-Provides: golang(%{import_path}/health/grpc_health_v1) = %{version}-%{release}
-Provides: golang(%{import_path}/interop) = %{version}-%{release}
-Provides: golang(%{import_path}/interop/grpc_testing) = %{version}-%{release}
-Provides: golang(%{import_path}/keepalive) = %{version}-%{release}
-Provides: golang(%{import_path}/metadata) = %{version}-%{release}
-Provides: golang(%{import_path}/naming) = %{version}-%{release}
-Provides: golang(%{import_path}/peer) = %{version}-%{release}
-Provides: golang(%{import_path}/reflection) = %{version}-%{release}
-Provides: golang(%{import_path}/reflection/grpc_reflection_v1alpha) = %{version}-%{release}
-Provides: golang(%{import_path}/reflection/grpc_testing) = %{version}-%{release}
-Provides: golang(%{import_path}/stats) = %{version}-%{release}
-Provides: golang(%{import_path}/stats/grpc_testing) = %{version}-%{release}
-Provides: golang(%{import_path}/stress/grpc_testing) = %{version}-%{release}
-Provides: golang(%{import_path}/tap) = %{version}-%{release}
-Provides: golang(%{import_path}/test/codec_perf) = %{version}-%{release}
-Provides: golang(%{import_path}/test/grpc_testing) = %{version}-%{release}
-Provides: golang(%{import_path}/transport) = %{version}-%{release}
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-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
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%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 unit-test.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp $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} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-chmod -x %{buildroot}%{gopath}/src/%{import_path}/interop/grpc_testing/test.pb.go
-for ext in .pem .key .proto _test.go; do
- # find all files with $ext prefix and generate unit-test.file-list
- for file in $(find . -iname "*${ext}"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
- done
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall $(find . -iname testdata -type d)
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-#%gotest %{import_path}
-%gotest %{import_path}/benchmark
-%gotest %{import_path}/metadata
-# Leaked goroutine
-#%%gotest %%{import_path}/test
-%gotest %{import_path}/transport
-%endif
+%gochecks
#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
-%dir %{gopath}/src/google.golang.org
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md CONTRIBUTING.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 1.0.0-0.9.20170407git8050b9c
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-0.8.git8050b9c
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 1 month
- 1
- 0
Architecture specific change in rpms/golang-github-gonum-floats.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-gonum-floats.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-gonum-floats.git/co....
Change:
+%ifnarch %{ix86} %{arm}
Thanks.
Full change:
============
commit 874ed0c4dab11821b905354e3b2f587afa9c36bc
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 16:32:59 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-gonum-floats.spec b/golang-github-gonum-floats.spec
index c3c5ab2..9a5ef3b 100644
--- a/golang-github-gonum-floats.spec
+++ b/golang-github-gonum-floats.spec
@@ -1,161 +1,63 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%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 gonum
-%global repo floats
-# https://github.com/gonum/floats
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/gonum/floats
+%global provider_prefix github.com/gonum/floats
+%global gobaseipath %{provider_prefix}
%global commit 122fac76c8ac937d81ef57182b34ec1206cef1ec
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20150709
+
+%gocraftmeta -i
-Name: golang-%{provider}-%{project}-%{repo}
+Name: %{goname}
Version: 0
-Release: 0.8.git%{shortcommit}%{?dist}
+Release: 0.9.%{commitdate}git%{shortcommit}%{?dist}
Summary: Operations on slices of floats
License: BSD
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+URL: %{gourl}
+Source0: %{gosource}
Patch0: add-license.patch
Patch1: change-internal-to-inteernal.patch
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{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}
BuildRequires: golang(github.com/gonum/inteernal/asm)
-%endif
-
-Requires: golang(github.com/gonum/inteernal/asm)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-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
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup
%patch0 -p1
%patch1 -p1
-%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" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- 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} && 0%{?with_devel}
-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
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- 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
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-# constant 10000000000 overflows int
-#%%gotest %%{import_path}
+# constant 10000000000 overflows int
+%ifnarch %{ix86} %{arm}
+%gochecks
%endif
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license
-%doc README.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.9.20150709git122fac7
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.8.git122fac7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 1 month
- 1
- 0
Architecture specific change in rpms/golang-github-gonum-graph.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-gonum-graph.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-gonum-graph.git/com....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit ab692abc6b84e8517362d3de74d79bacc8d7a4f6
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 16:34:23 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-gonum-graph.spec b/golang-github-gonum-graph.spec
index e7ee640..5821c8d 100644
--- a/golang-github-gonum-graph.spec
+++ b/golang-github-gonum-graph.spec
@@ -1,174 +1,60 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%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 gonum
-%global repo graph
-# https://github.com/gonum/graph
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/gonum/graph
+%global provider_prefix github.com/gonum/graph
+%global gobaseipath %{provider_prefix}
%global commit bde6d0fbd9dec5a997e906611fe0364001364c41
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20150701
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0.9
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Graph packages for the Go language
License: BSD
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+URL: %{gourl}
+Source0: %{gosource}
Patch0: add-license.patch
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{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}
BuildRequires: golang(github.com/gonum/floats)
BuildRequires: golang(github.com/gonum/matrix/mat64)
-%endif
-
-Requires: golang(github.com/gonum/floats)
-Requires: golang(github.com/gonum/matrix/mat64)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/concrete) = %{version}-%{release}
-Provides: golang(%{import_path}/encoding/dot) = %{version}-%{release}
-Provides: golang(%{import_path}/network) = %{version}-%{release}
-Provides: golang(%{import_path}/path) = %{version}-%{release}
-Provides: golang(%{import_path}/topo) = %{version}-%{release}
-Provides: golang(%{import_path}/traverse) = %{version}-%{release}
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-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
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup
%patch0 -p1
-%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" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- 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} && 0%{?with_devel}
-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
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- 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
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}/concrete
-%gotest %{import_path}/encoding/dot
-%gotest %{import_path}/internal
-%gotest %{import_path}/network
-# testing "confounding paths directed": unexpected shortest paths
-#%%gotest %%{import_path}/path
-%gotest %{import_path}/path/internal
-%gotest %{import_path}/topo
-%gotest %{import_path}/traverse
-%endif
+# Error call has possible formatting directive %d
+%gochecks %{gobaseipath}/{internal,path_test,path}
#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
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0.9-10
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 1 month
- 1
- 0
Architecture specific change in rpms/golang-github-google-gofuzz.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-google-gofuzz.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-google-gofuzz.git/c....
Change:
+%ifnarch ppc64le %{arm}
Thanks.
Full change:
============
commit 47dcd9292d781da3db127c309aeaac662a93353f
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 16:44:09 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-google-gofuzz.spec b/golang-github-google-gofuzz.spec
index e410f00..ab1ff30 100644
--- a/golang-github-google-gofuzz.spec
+++ b/golang-github-google-gofuzz.spec
@@ -1,166 +1,55 @@
-# 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
-# test fails on i686 in el6
-%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
-
-%global provider github
-%global provider_tld com
-%global project google
-%global repo gofuzz
-# https://github.com/google/gofuzz
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/google/gofuzz
+%global provider_prefix github.com/google/gofuzz
+%global gobaseipath %{provider_prefix}
%global commit 44d81051d367757e1c7c6a5a86423ece9afcf63c
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20161122
+
+%gocraftmeta -i
-Name: golang-%{provider}-%{project}-%{repo}
+Name: %{goname}
Version: 0
-Release: 0.19.git%{shortcommit}%{?dist}
+Release: 0.20.%{commitdate}git%{shortcommit}%{?dist}
Summary: Library for populating go objects with random values
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}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
-%endif
-
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-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
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%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" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- 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} && 0%{?with_devel}
-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
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- 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
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
+%ifnarch ppc64le %{arm}
+%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
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md CONTRIBUTING.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.20.20161122git44d8105
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.19.git44d8105
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 1 month
- 1
- 0
Architecture specific change in rpms/golang-github-gorilla-securecookie.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-gorilla-securecookie.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-gorilla-securecooki....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit fbfb37855b4e1466087b421c8d4447ffbb520bc4
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 17:14:17 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-gorilla-securecookie.spec b/golang-github-gorilla-securecookie.spec
index cc0eff1..cc88494 100644
--- a/golang-github-gorilla-securecookie.spec
+++ b/golang-github-gorilla-securecookie.spec
@@ -1,152 +1,53 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%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 gorilla
-%global repo securecookie
-# https://github.com/gorilla/securecookie
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/gorilla/securecookie
+%global provider_prefix github.com/gorilla/securecookie
+%global gobaseipath %{provider_prefix}
%global commit 1b0c7f6e9ab3d7f500fd7d50c7ad835ff428139b
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20140409
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.8.git%{shortcommit}%{?dist}
+Release: 0.9.%{commitdate}git%{shortcommit}%{?dist}
Summary: Encodes and decodes authenticated and encrypted cookies
License: BSD
-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 %{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}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
-%endif
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-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
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%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" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- 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} && 0%{?with_devel}
-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
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- 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
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
+%gochecks
#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
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.9.20140409git1b0c7f6
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.8.git1b0c7f6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 1 month
- 1
- 0
Architecture specific change in rpms/golang-github-google-go-genproto.git
by githook-noreply＠fedoraproject.org
The package rpms/golang-github-google-go-genproto.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-google-go-genproto.....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 157df8618c89ad69b151a4cf1815751e564c2094
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 16:46:37 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-google-go-genproto.spec b/golang-github-google-go-genproto.spec
index a9d8d5e..93e9094 100644
--- a/golang-github-google-go-genproto.spec
+++ b/golang-github-google-go-genproto.spec
@@ -1,72 +1,28 @@
-# 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
-# no test files so far
-%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 google
-%global repo go-genproto
-# https://github.com/google/go-genproto
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path google.golang.org/genproto
+# http://github.com/google/go-genproto
+%global provider_prefix github.com/google/go-genproto
+%global gobaseipath google.golang.org/genproto
%global commit 411e09b969b1170a9f0c467558eb4c4c110d9c77
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20170404
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.3.git%{shortcommit}%{?dist}
+Release: 0.4.%{commitdate}git%{shortcommit}%{?dist}
Summary: Go generated proto packages
# Detected licences
# - *No copyright* Apache (v2.0) GENERATED FILE at 'LICENSE'
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}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check} && ! 0%{?with_bundled}
BuildRequires: golang(github.com/golang/protobuf/proto)
BuildRequires: golang(github.com/golang/protobuf/protoc-gen-go/descriptor)
BuildRequires: golang(github.com/golang/protobuf/ptypes/any)
@@ -77,203 +33,35 @@ BuildRequires: golang(github.com/golang/protobuf/ptypes/timestamp)
BuildRequires: golang(github.com/golang/protobuf/ptypes/wrappers)
BuildRequires: golang(golang.org/x/net/context)
BuildRequires: golang(google.golang.org/grpc)
-%endif
-
-Requires: golang(github.com/golang/protobuf/proto)
-Requires: golang(github.com/golang/protobuf/protoc-gen-go/descriptor)
-Requires: golang(github.com/golang/protobuf/ptypes/any)
-Requires: golang(github.com/golang/protobuf/ptypes/duration)
-Requires: golang(github.com/golang/protobuf/ptypes/empty)
-Requires: golang(github.com/golang/protobuf/ptypes/struct)
-Requires: golang(github.com/golang/protobuf/ptypes/timestamp)
-Requires: golang(github.com/golang/protobuf/ptypes/wrappers)
-Requires: golang(golang.org/x/net/context)
-Requires: golang(google.golang.org/grpc)
-
-Provides: golang(%{import_path}/googleapis/api) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/api/annotations) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/api/configchange) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/api/distribution) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/api/httpbody) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/api/label) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/api/metric) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/api/monitoredres) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/api/serviceconfig) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/api/servicecontrol/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/api/servicemanagement/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/appengine/legacy) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/appengine/logging/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/appengine/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/bigtable/admin/table/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/bigtable/admin/v2) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/bigtable/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/bigtable/v2) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/bytestream) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/audit) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/billing/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/dataproc/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/functions/v1beta2) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/language/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/language/v1beta1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/language/v1beta2) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/ml/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/ml/v1beta1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/runtimeconfig/v1beta1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/speech/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/speech/v1beta1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/support/common) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/support/v1alpha1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/cloud/vision/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/container/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/datastore/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/datastore/v1beta3) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/devtools/cloudbuild/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/devtools/clouddebugger/v2) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/devtools/clouderrorreporting/v1beta1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/devtools/cloudtrace/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/devtools/source/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/devtools/sourcerepo/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/example/library/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/genomics/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/genomics/v1alpha2) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/iam/admin/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/iam/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/logging/type) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/logging/v2) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/longrunning) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/monitoring/v3) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/privacy/dlp/v2beta1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/pubsub/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/pubsub/v1beta2) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/rpc/code) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/rpc/errdetails) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/rpc/status) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/spanner/admin/database/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/spanner/admin/instance/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/spanner/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/storagetransfer/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/tracing/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/type/color) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/type/date) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/type/dayofweek) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/type/latlng) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/type/money) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/type/postaladdress) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/type/timeofday) = %{version}-%{release}
-Provides: golang(%{import_path}/googleapis/watcher/v1) = %{version}-%{release}
-Provides: golang(%{import_path}/protobuf/api) = %{version}-%{release}
-Provides: golang(%{import_path}/protobuf/field_mask) = %{version}-%{release}
-Provides: golang(%{import_path}/protobuf/ptype) = %{version}-%{release}
-Provides: golang(%{import_path}/protobuf/source_context) = %{version}-%{release}
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%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}
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
-
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup
-%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
+%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
-%endif
-
-%endif
+%gochecks
#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
%dir %{gopath}/src/google.golang.org
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc README.md CONTRIBUTING.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.4.20170404git411e09b
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.3.git411e09b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 1 month
- 1
- 0