Architecture specific change in rpms/golang-github-mitchellh-go-wordwrap.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-mitchellh-go-wordwrap.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-mitchellh-go-wordwr....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 2d11a4f0eebb3690fd3e6a92a5da85c29eead391
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Jun 18 20:33:10 2018 +0200
Upload glide files
diff --git a/.gitignore b/.gitignore
index 206335d..80ec7a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/go-wordwrap-ad45545.tar.gz
+/go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz
diff --git a/glide.lock b/glide.lock
new file mode 100644
index 0000000..a8a54f6
--- /dev/null
+++ b/glide.lock
@@ -0,0 +1,4 @@
+hash: d8302b9d5c7f6337404085529aa0d7b272a17daadb5b70ab9dd26b907475e6ae
+imports: []
+updated: '2018-06-18T18:33:02.761657+00:00'
+
diff --git a/glide.yaml b/glide.yaml
new file mode 100644
index 0000000..b89760f
--- /dev/null
+++ b/glide.yaml
@@ -0,0 +1,3 @@
+import: []
+package: github.com/mitchellh/go-wordwrap
+
diff --git a/golang-github-mitchellh-go-wordwrap.spec b/golang-github-mitchellh-go-wordwrap.spec
index a4bc667..41723f5 100644
--- a/golang-github-mitchellh-go-wordwrap.spec
+++ b/golang-github-mitchellh-go-wordwrap.spec
@@ -1,185 +1,57 @@
-# 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 mitchellh
-%global repo go-wordwrap
-# https://github.com/mitchellh/go-wordwrap
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/mitchellh/go-wordwrap
+
+%global goipath github.com/mitchellh/go-wordwrap
%global commit ad45545899c7b13c020ea92b2072220eefad42b8
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-Name: golang-%{provider}-%{project}-%{repo}
+
+%gometa -i
+
+Name: golang-github-mitchellh-go-wordwrap
Version: 0
-Release: 0.4.git%{shortcommit}%{?dist}
+Release: 0.5%{?dist}
Summary: A Go library for wrapping words in a string
# Detected licences
# - MIT/X11 (BSD like) at 'LICENSE.md'
License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-
+URL: %{gourl}
+Source0: %{gosource}
+Source1: glide.yaml
+Source2: glide.yaml
%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}
-
-%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
+%{goipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup -q
+cp %{SOURCE1} %{SOURCE2} .
%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 glide.lock glide.yaml
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%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.md
%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.md
-%doc README.md
-%endif
%changelog
+* Mon Jun 18 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.5.gitad45545
+- Upload glide files
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.4.gitad45545
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 853fcf9..6bc5c78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go-wordwrap-ad45545.tar.gz) = 39cd6786782e3a29ad448db3ec815a6da029bc22fbe543fb04e0e869d8b4a698f20434bb24c09bd18b5d2cdb992fc28e21b7ae16b3e585412cede7b4eed2b26c
+SHA512 (go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz) = 39cd6786782e3a29ad448db3ec815a6da029bc22fbe543fb04e0e869d8b4a698f20434bb24c09bd18b5d2cdb992fc28e21b7ae16b3e585412cede7b4eed2b26c
commit 10d21fa0005b8d3c08ced7f354d950c9280c5741
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 14:40:55 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/golang-github-mitchellh-go-wordwrap.spec b/golang-github-mitchellh-go-wordwrap.spec
index 7e445d4..a4bc667 100644
--- a/golang-github-mitchellh-go-wordwrap.spec
+++ b/golang-github-mitchellh-go-wordwrap.spec
@@ -42,7 +42,7 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.3.git%{shortcommit}%{?dist}
+Release: 0.4.git%{shortcommit}%{?dist}
Summary: A Go library for wrapping words in a string
# Detected licences
# - MIT/X11 (BSD like) at 'LICENSE.md'
@@ -180,6 +180,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.4.gitad45545
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.3.gitad45545
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
5 years, 10 months
Architecture specific change in rpms/golang-github-mitchellh-copystructure.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-mitchellh-copystructure.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-mitchellh-copystruc....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit a4c3d217a6537a73f683c7fe438792846adcab93
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Jun 18 20:31:34 2018 +0200
Upload glide files
diff --git a/.gitignore b/.gitignore
index 2eac267..ac7a048 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/copystructure-cdac825.tar.gz
+/copystructure-cdac8253d00f2ecf0a0b19fbff173a9a72de4f82.tar.gz
diff --git a/glide.lock b/glide.lock
new file mode 100644
index 0000000..872f4a4
--- /dev/null
+++ b/glide.lock
@@ -0,0 +1,6 @@
+hash: 471b9221b985c6669bf159cd9c7f2110ee9f4144206b067bfa67a7cd8925bab8
+imports:
+- name: github.com/mitchellh/reflectwalk
+ version: eecf4c70c626c7cfbb95c90195bc34d386c74ac6
+updated: '2018-06-18T18:31:14.837756+00:00'
+
diff --git a/glide.yaml b/glide.yaml
new file mode 100644
index 0000000..7676213
--- /dev/null
+++ b/glide.yaml
@@ -0,0 +1,5 @@
+import:
+- package: github.com/mitchellh/reflectwalk
+ version: eecf4c70c626c7cfbb95c90195bc34d386c74ac6
+package: github.com/mitchellh/copystructure
+
diff --git a/golang-github-mitchellh-copystructure.spec b/golang-github-mitchellh-copystructure.spec
index b136c6a..741d3ee 100644
--- a/golang-github-mitchellh-copystructure.spec
+++ b/golang-github-mitchellh-copystructure.spec
@@ -1,187 +1,59 @@
-# 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 mitchellh
-%global repo copystructure
-# https://github.com/mitchellh/copystructure
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/mitchellh/copystructure
+
+%global goipath github.com/mitchellh/copystructure
%global commit cdac8253d00f2ecf0a0b19fbff173a9a72de4f82
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-Name: golang-%{provider}-%{project}-%{repo}
+
+%gometa -i
+
+Name: %{goname}
Version: 0
-Release: 0.4.git%{shortcommit}%{?dist}
+Release: 0.5%{?dist}
Summary: Go library for deep copying values in Go
# Detected licences
# - MIT/X11 (BSD like) at 'LICENSE'
License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-
+URL: %{gourl}
+Source0: %{gosource}
+Source1: glide.yaml
+Source2: glide.yaml
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check} && ! 0%{?with_bundled}
BuildRequires: golang(github.com/mitchellh/reflectwalk)
-%endif
-
-Requires: golang(github.com/mitchellh/reflectwalk)
-
-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}
-
-%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
+%{goipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup -q
+cp %{SOURCE1} %{SOURCE2} .
%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 glide.lock glide.yaml
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%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
+* Mon Jun 18 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.5.gitcdac825
+- Upload glide files
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.4.gitcdac825
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 11749fb..f2e0c64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (copystructure-cdac825.tar.gz) = b79aefeef61464484d73ef04b9f3a1ea8dd0b62d83aa15ebf452edc0f353c5d5ec543970072021092c1c8d6a6603b1f39a00f5e5d1b6c9b5280a05bd87797da4
+SHA512 (copystructure-cdac8253d00f2ecf0a0b19fbff173a9a72de4f82.tar.gz) = b79aefeef61464484d73ef04b9f3a1ea8dd0b62d83aa15ebf452edc0f353c5d5ec543970072021092c1c8d6a6603b1f39a00f5e5d1b6c9b5280a05bd87797da4
5 years, 10 months
Architecture specific change in rpms/golang-github-mitchellh-copystructure.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-mitchellh-copystructure.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-mitchellh-copystruc....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit a4c3d217a6537a73f683c7fe438792846adcab93
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Jun 18 20:31:34 2018 +0200
Upload glide files
diff --git a/.gitignore b/.gitignore
index 2eac267..ac7a048 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/copystructure-cdac825.tar.gz
+/copystructure-cdac8253d00f2ecf0a0b19fbff173a9a72de4f82.tar.gz
diff --git a/glide.lock b/glide.lock
new file mode 100644
index 0000000..872f4a4
--- /dev/null
+++ b/glide.lock
@@ -0,0 +1,6 @@
+hash: 471b9221b985c6669bf159cd9c7f2110ee9f4144206b067bfa67a7cd8925bab8
+imports:
+- name: github.com/mitchellh/reflectwalk
+ version: eecf4c70c626c7cfbb95c90195bc34d386c74ac6
+updated: '2018-06-18T18:31:14.837756+00:00'
+
diff --git a/glide.yaml b/glide.yaml
new file mode 100644
index 0000000..7676213
--- /dev/null
+++ b/glide.yaml
@@ -0,0 +1,5 @@
+import:
+- package: github.com/mitchellh/reflectwalk
+ version: eecf4c70c626c7cfbb95c90195bc34d386c74ac6
+package: github.com/mitchellh/copystructure
+
diff --git a/golang-github-mitchellh-copystructure.spec b/golang-github-mitchellh-copystructure.spec
index b136c6a..741d3ee 100644
--- a/golang-github-mitchellh-copystructure.spec
+++ b/golang-github-mitchellh-copystructure.spec
@@ -1,187 +1,59 @@
-# 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 mitchellh
-%global repo copystructure
-# https://github.com/mitchellh/copystructure
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/mitchellh/copystructure
+
+%global goipath github.com/mitchellh/copystructure
%global commit cdac8253d00f2ecf0a0b19fbff173a9a72de4f82
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-Name: golang-%{provider}-%{project}-%{repo}
+
+%gometa -i
+
+Name: %{goname}
Version: 0
-Release: 0.4.git%{shortcommit}%{?dist}
+Release: 0.5%{?dist}
Summary: Go library for deep copying values in Go
# Detected licences
# - MIT/X11 (BSD like) at 'LICENSE'
License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-
+URL: %{gourl}
+Source0: %{gosource}
+Source1: glide.yaml
+Source2: glide.yaml
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check} && ! 0%{?with_bundled}
BuildRequires: golang(github.com/mitchellh/reflectwalk)
-%endif
-
-Requires: golang(github.com/mitchellh/reflectwalk)
-
-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}
-
-%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
+%{goipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup -q
+cp %{SOURCE1} %{SOURCE2} .
%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 glide.lock glide.yaml
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%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
+* Mon Jun 18 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.5.gitcdac825
+- Upload glide files
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.4.gitcdac825
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 11749fb..f2e0c64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (copystructure-cdac825.tar.gz) = b79aefeef61464484d73ef04b9f3a1ea8dd0b62d83aa15ebf452edc0f353c5d5ec543970072021092c1c8d6a6603b1f39a00f5e5d1b6c9b5280a05bd87797da4
+SHA512 (copystructure-cdac8253d00f2ecf0a0b19fbff173a9a72de4f82.tar.gz) = b79aefeef61464484d73ef04b9f3a1ea8dd0b62d83aa15ebf452edc0f353c5d5ec543970072021092c1c8d6a6603b1f39a00f5e5d1b6c9b5280a05bd87797da4
5 years, 10 months
Architecture specific change in rpms/golang-github-mitchellh-copystructure.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-mitchellh-copystructure.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-mitchellh-copystruc....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit a4c3d217a6537a73f683c7fe438792846adcab93
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Jun 18 20:31:34 2018 +0200
Upload glide files
diff --git a/.gitignore b/.gitignore
index 2eac267..ac7a048 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/copystructure-cdac825.tar.gz
+/copystructure-cdac8253d00f2ecf0a0b19fbff173a9a72de4f82.tar.gz
diff --git a/glide.lock b/glide.lock
new file mode 100644
index 0000000..872f4a4
--- /dev/null
+++ b/glide.lock
@@ -0,0 +1,6 @@
+hash: 471b9221b985c6669bf159cd9c7f2110ee9f4144206b067bfa67a7cd8925bab8
+imports:
+- name: github.com/mitchellh/reflectwalk
+ version: eecf4c70c626c7cfbb95c90195bc34d386c74ac6
+updated: '2018-06-18T18:31:14.837756+00:00'
+
diff --git a/glide.yaml b/glide.yaml
new file mode 100644
index 0000000..7676213
--- /dev/null
+++ b/glide.yaml
@@ -0,0 +1,5 @@
+import:
+- package: github.com/mitchellh/reflectwalk
+ version: eecf4c70c626c7cfbb95c90195bc34d386c74ac6
+package: github.com/mitchellh/copystructure
+
diff --git a/golang-github-mitchellh-copystructure.spec b/golang-github-mitchellh-copystructure.spec
index b136c6a..741d3ee 100644
--- a/golang-github-mitchellh-copystructure.spec
+++ b/golang-github-mitchellh-copystructure.spec
@@ -1,187 +1,59 @@
-# 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 mitchellh
-%global repo copystructure
-# https://github.com/mitchellh/copystructure
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/mitchellh/copystructure
+
+%global goipath github.com/mitchellh/copystructure
%global commit cdac8253d00f2ecf0a0b19fbff173a9a72de4f82
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-Name: golang-%{provider}-%{project}-%{repo}
+
+%gometa -i
+
+Name: %{goname}
Version: 0
-Release: 0.4.git%{shortcommit}%{?dist}
+Release: 0.5%{?dist}
Summary: Go library for deep copying values in Go
# Detected licences
# - MIT/X11 (BSD like) at 'LICENSE'
License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-
+URL: %{gourl}
+Source0: %{gosource}
+Source1: glide.yaml
+Source2: glide.yaml
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check} && ! 0%{?with_bundled}
BuildRequires: golang(github.com/mitchellh/reflectwalk)
-%endif
-
-Requires: golang(github.com/mitchellh/reflectwalk)
-
-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}
-
-%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
+%{goipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup -q
+cp %{SOURCE1} %{SOURCE2} .
%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 glide.lock glide.yaml
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%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
+* Mon Jun 18 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.5.gitcdac825
+- Upload glide files
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.4.gitcdac825
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 11749fb..f2e0c64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (copystructure-cdac825.tar.gz) = b79aefeef61464484d73ef04b9f3a1ea8dd0b62d83aa15ebf452edc0f353c5d5ec543970072021092c1c8d6a6603b1f39a00f5e5d1b6c9b5280a05bd87797da4
+SHA512 (copystructure-cdac8253d00f2ecf0a0b19fbff173a9a72de4f82.tar.gz) = b79aefeef61464484d73ef04b9f3a1ea8dd0b62d83aa15ebf452edc0f353c5d5ec543970072021092c1c8d6a6603b1f39a00f5e5d1b6c9b5280a05bd87797da4
commit b6a74a847f6daf86047cb034c3460f2eb41fb09f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 14:40:28 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/golang-github-mitchellh-copystructure.spec b/golang-github-mitchellh-copystructure.spec
index 3296e60..b136c6a 100644
--- a/golang-github-mitchellh-copystructure.spec
+++ b/golang-github-mitchellh-copystructure.spec
@@ -42,7 +42,7 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.3.git%{shortcommit}%{?dist}
+Release: 0.4.git%{shortcommit}%{?dist}
Summary: Go library for deep copying values in Go
# Detected licences
# - MIT/X11 (BSD like) at 'LICENSE'
@@ -182,6 +182,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.4.gitcdac825
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.3.gitcdac825
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
5 years, 10 months
Architecture specific change in rpms/qt5-qtbase.git
by githook-noreply@fedoraproject.org
The package rpms/qt5-qtbase.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/qt5-qtbase.git/commit/?id=17e492a....
Change:
-%ifarch %{ix86}
Thanks.
Full change:
============
commit 17e492aa0e93b54ae6618c1a35bd1ada9e91336a
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Jun 18 12:52:49 2018 -0500
%%build: %%ix86 --no-sse2 on < f29 only
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index aefab6a..133a4e0 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -8,6 +8,12 @@
%endif
%global openssl -openssl-linked
+%if 0%{?fedora} < 29
+%ifarch %{ix86}
+%global no_sse2 -no-sse2
+%endif
+%endif
+
# support qtchooser (adds qtchooser .conf file)
%global qtchooser 1
%if 0%{?qtchooser}
@@ -443,9 +449,7 @@ export MAKEFLAGS="%{?_smp_mflags}"
-no-pch \
-no-rpath \
-no-separate-debug-info \
-%ifarch %{ix86}
- -no-sse2 \
-%endif
+ %{?no_sse2} \
-no-strip \
-system-libjpeg \
-system-libpng \
@@ -969,6 +973,7 @@ fi
%changelog
* Mon Jun 18 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.11.0-3
- backport CMake-Restore-qt5_use_modules-function.patch
+- %%build: %%ix86 --no-sse2 on < f29 only
* Wed May 30 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 5.11.0-2
- move libQt5EglFSDeviceIntegration to -gui (#1557223)
5 years, 10 months
Architecture specific change in rpms/vulkan.git
by githook-noreply@fedoraproject.org
The package rpms/vulkan.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/vulkan.git/commit/?id=052dcd1e0b7....
Change:
-ExclusiveArch: x86_64 i686
Thanks.
Full change:
============
commit 052dcd1e0b71e94a665e5257c8875d95aee7a40a
Author: Adam Jackson <ajax(a)redhat.com>
Date: Mon Jun 18 12:41:02 2018 -0400
Undo previous change. Mesa is wrong to not build radv for more arches,
and there's nothing x86-specific about this package, the Vulkan loader.
diff --git a/vulkan.spec b/vulkan.spec
index 8f023ea..0f77dc6 100644
--- a/vulkan.spec
+++ b/vulkan.spec
@@ -10,7 +10,7 @@
Name: vulkan
Version: 1.1.73.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Vulkan loader and validation layers
License: ASL 2.0
URL: https://github.com/KhronosGroup
@@ -21,9 +21,6 @@ Patch0: cmake_spirv_tools_commit.patch
Patch1: 0003-layers-Don-t-set-an-rpath.patch
Patch2: 0008-demos-Don-t-build-tri-or-cube.patch
-# mesa-vulkan-drivers and nvidia driver don't support other arch
-ExclusiveArch: x86_64 i686
-
BuildRequires: gcc-c++
BuildRequires: bison
BuildRequires: cmake3
@@ -148,6 +145,10 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo
%dir %{_datadir}/vulkan/implicit_layer.d/
%changelog
+* Mon Jun 18 2018 Adam Jackson <ajax(a)redhat.com> - 1.1.73.0-4
+- Undo previous change. Mesa is wrong to not build radv for more arches,
+ and there's nothing x86-specific about this package, the Vulkan loader.
+
* Sat Jun 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.73.0-3
- Make vulkan x86 only to match vulkan drivers
5 years, 10 months
Architecture specific change in rpms/vulkan.git
by githook-noreply@fedoraproject.org
The package rpms/vulkan.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/vulkan.git/commit/?id=87e37ae6ad1....
Change:
-ExclusiveArch: x86_64 i686
Thanks.
Full change:
============
commit 87e37ae6ad1778784909c95f2511c4b5154832b8
Author: Adam Jackson <ajax(a)redhat.com>
Date: Mon Jun 18 12:41:02 2018 -0400
Undo previous change. Mesa is wrong to not build radv for more arches,
and there's nothing x86-specific about this package, the Vulkan loader.
diff --git a/vulkan.spec b/vulkan.spec
index 8f023ea..0f77dc6 100644
--- a/vulkan.spec
+++ b/vulkan.spec
@@ -10,7 +10,7 @@
Name: vulkan
Version: 1.1.73.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Vulkan loader and validation layers
License: ASL 2.0
URL: https://github.com/KhronosGroup
@@ -21,9 +21,6 @@ Patch0: cmake_spirv_tools_commit.patch
Patch1: 0003-layers-Don-t-set-an-rpath.patch
Patch2: 0008-demos-Don-t-build-tri-or-cube.patch
-# mesa-vulkan-drivers and nvidia driver don't support other arch
-ExclusiveArch: x86_64 i686
-
BuildRequires: gcc-c++
BuildRequires: bison
BuildRequires: cmake3
@@ -148,6 +145,10 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo
%dir %{_datadir}/vulkan/implicit_layer.d/
%changelog
+* Mon Jun 18 2018 Adam Jackson <ajax(a)redhat.com> - 1.1.73.0-4
+- Undo previous change. Mesa is wrong to not build radv for more arches,
+ and there's nothing x86-specific about this package, the Vulkan loader.
+
* Sat Jun 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.73.0-3
- Make vulkan x86 only to match vulkan drivers
5 years, 10 months
Architecture specific change in rpms/vulkan.git
by githook-noreply@fedoraproject.org
The package rpms/vulkan.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/vulkan.git/commit/?id=bac864740d8....
Change:
-ExclusiveArch: x86_64 i686
Thanks.
Full change:
============
commit bac864740d844ba526184bf3dbcdabeb5f27a7d5
Author: Adam Jackson <ajax(a)redhat.com>
Date: Mon Jun 18 12:41:02 2018 -0400
Undo previous change. Mesa is wrong to not build radv for more arches,
and there's nothing x86-specific about this package, the Vulkan loader.
diff --git a/vulkan.spec b/vulkan.spec
index 4acbe93..e77e5f9 100644
--- a/vulkan.spec
+++ b/vulkan.spec
@@ -9,7 +9,7 @@
Name: vulkan
Version: 1.1.73.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Vulkan loader and validation layers
License: ASL 2.0
URL: https://github.com/KhronosGroup
@@ -20,9 +20,6 @@ Patch0: cmake_spirv_tools_commit.patch
Patch1: 0003-layers-Don-t-set-an-rpath.patch
Patch2: 0008-demos-Don-t-build-tri-or-cube.patch
-# mesa-vulkan-drivers and nvidia driver don't support other arch
-ExclusiveArch: x86_64 i686
-
BuildRequires: gcc-c++
BuildRequires: bison
BuildRequires: cmake3
@@ -154,6 +151,10 @@ chrpath -d %{buildroot}%{_bindir}/vulkaninfo
%dir %{_datadir}/vulkan/implicit_layer.d/
%changelog
+* Mon Jun 18 2018 Adam Jackson <ajax(a)redhat.com> - 1.1.73.0-4
+- Undo previous change. Mesa is wrong to not build radv for more arches,
+ and there's nothing x86-specific about this package, the Vulkan loader.
+
* Sat Jun 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.1.73.0-3
- Make vulkan x86 only to match vulkan drivers
5 years, 10 months
Architecture specific change in rpms/xorg-x11-drv-intel.git
by githook-noreply@fedoraproject.org
The package rpms/xorg-x11-drv-intel.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/xorg-x11-drv-intel.git/commit/?id....
Change:
-%ifnarch %{ix86}
Thanks.
Full change:
============
commit 89b3f184f64e459544ac1f77eb58d41eec3bd94e
Author: Adam Jackson <ajax(a)redhat.com>
Date: Mon Jun 18 12:31:17 2018 -0400
Today's git snapshot (commit 3d395062)
Clean up some conditionals
Build with python3
diff --git a/.gitignore b/.gitignore
index 25a361b..f53a76e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,5 @@ xf86-video-intel-2.10.0.tar.bz2
/xf86-video-intel-20160712.tar.bz2
/xf86-video-intel-20160929.tar.bz2
/xf86-video-intel-20171025.tar.bz2
+/xf86-video-intel-20180530.tar.bz2
+/xf86-video-intel-20180618.tar.bz2
diff --git a/sources b/sources
index f8cde9b..4d75789 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (xf86-video-intel-20171025.tar.bz2) = cc847dd958cfe84379923eed1ea174436ebe9e6d2bd7d44c4a1a3f13bc86c15ae14cc75223c9fe808beb52ca3013d83ff14e375bfaddffe7f8a5568bfa38559a
SHA512 (intel-gpu-tools-1.9.tar.bz2) = 642b18ef705f3c8853b89920287ae8da23af54cdf277665a1f4d348029e001d314e7a0f701ed12ffe7ed88626934e2b7b0a76e9aaf4e61367de3f3548e5162ea
+SHA512 (xf86-video-intel-20180618.tar.bz2) = 50d7f8ec10db8200700c2de804c21987c903b347615c004e9f5334c1f2b189fafdc049469e1491d651bbcd8df2968c1247d0f4d2a3dc6c7d885a40ad577a5101
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index 52ccb9b..a5384d1 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -1,27 +1,15 @@
%define moduledir %(pkg-config xorg-server --variable=moduledir )
%define driverdir %{moduledir}/drivers
%define gputoolsver 1.9
-%define gitdate 20171025
+%define gitdate 20180618
%define gitrev .%{gitdate}
%undefine _hardened_build
-%if 0%{?rhel} >=7 || 0%{?fedora} > 17
-%define prime 1
-%endif
-
-%if 0%{?rhel} >=7 || 0%{?fedora} > 20
-%define kmsonly 1
-%else
-%ifnarch %{ix86}
-%define kmsonly 1
-%endif
-%endif
-
Summary: Xorg X11 Intel video driver
Name: xorg-x11-drv-intel
Version: 2.99.917
-Release: 36%{?gitrev}%{?dist}
+Release: 37%{?gitrev}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -29,14 +17,13 @@ Group: User Interface/X Hardware Support
%if 0%{?gitdate}
Source0: xf86-video-intel-%{gitdate}.tar.bz2
%else
-Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{...
+Source0: https://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%...
%endif
Source1: make-intel-gpu-tools-snapshot.sh
-Source3: http://xorg.freedesktop.org/archive/individual/app/intel-gpu-tools-%{gput...
+Source3: https://xorg.freedesktop.org/archive/individual/app/intel-gpu-tools-%{gpu...
Source4: make-git-snapshot.sh
Patch0: intel-gcc-pr65873.patch
-Patch1: igt-stat.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=96255#c11
Patch4: 0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch
Patch5: 0001-Fix-build-on-F28-and-later.patch
@@ -57,11 +44,7 @@ BuildRequires: libXrandr-devel
BuildRequires: libXrender-devel
BuildRequires: libXtst-devel
BuildRequires: libXvMC-devel
-%if 0%{?fedora} > 24 || 0%{?rhel} > 7
BuildRequires: libXfont2-devel
-%else
-BuildRequires: libXfont-devel
-%endif
BuildRequires: mesa-libGL-devel >= 6.5-9
BuildRequires: libdrm-devel >= 2.4.25
BuildRequires: kernel-headers >= 2.6.32.3
@@ -69,7 +52,7 @@ BuildRequires: libudev-devel
BuildRequires: libxcb-devel >= 1.5
BuildRequires: xcb-util-devel
BuildRequires: cairo-devel
-BuildRequires: python2
+BuildRequires: python3
BuildRequires: libXScrnSaver-devel
BuildRequires: libXext-devel
BuildRequires: pixman-devel
@@ -110,24 +93,17 @@ Debugging tools for Intel graphics chips
%patch5 -p1
%patch6 -p1
-pushd ../intel-gpu-tools-%{gputoolsver}
-%patch1 -p1 -b .stat
-popd
-
%build
autoreconf -f -i -v
-%configure %{?kmsonly:--enable-kms-only} --with-default-dri=3 --enable-tools
+%configure --enable-kms-only --with-default-dri=3 --enable-tools
make %{?_smp_mflags} V=1
pushd ../intel-gpu-tools-%{gputoolsver}
-# this is missing from the tarbal, having it empty is ok
-touch lib/check-ndebug.h
-mkdir -p m4
-autoreconf -f -i -v
+%global _configure ./autogen.sh
# --disable-dumper: quick_dump is both not recommended for packaging yet,
# and requires python3 to build; i'd like to keep this spec valid for rhel6
# for at least a bit longer
-%configure %{!?prime:--disable-nouveau} --disable-dumper
+%configure --disable-dumper
# some of the sources are in utf-8 and pre-preprocessed by python
export LANG=en_US.UTF-8
make %{?_smp_mflags}
@@ -153,9 +129,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so
%files
%doc COPYING
%{driverdir}/intel_drv.so
-%if !0%{?kmsonly}
-%{_libdir}/libI810XvMC.so.1*
-%endif
%{_libdir}/libIntelXvMC.so.1*
%{_libexecdir}/xf86-video-intel-backlight-helper
%{_datadir}/polkit-1/actions/org.x.xf86-video-intel.backlight-helper.policy
@@ -176,6 +149,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libI*XvMC.so
%{_mandir}/man1/intel_*.1*
%changelog
+* Mon Jun 18 2018 Adam Jackson <ajax(a)redhat.com> - 2.99.917-37
+- Today's git snapshot (commit 3d395062)
+- Clean up some conditionals
+- Build with python3
+
+* Wed May 30 2018 Adam Jackson <ajax(a)redhat.com> - 2.99.917-37
+
* Mon Apr 02 2018 Adam Jackson <ajax(a)redhat.com> - 2.99.917-36.20171025
- Rebuild for xserver 1.20
5 years, 10 months
Architecture specific change in rpms/kicad.git
by githook-noreply@fedoraproject.org
The package rpms/kicad.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/kicad.git/commit/?id=9cc8fbeb3692....
Change:
+ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
Thanks.
Full change:
============
commit b39f6a2b8cda5bc7849906893009b71f5b3e4de7
Author: Steven A. Falco <stevenfalco(a)gmail.com>
Date: Thu Jun 14 21:41:18 2018 -0400
Simplify description and add a changelog entry for 5.0.0-rc2
KiCad now supports 32 copper layers, so we need to update the
description.
This commit completes the migration to 5.0.0-rc2, so add a changelog
entry for that.
diff --git a/kicad.spec b/kicad.spec
index 1cb5855..94e2333 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -53,14 +53,9 @@ BuildRequires: dblatex
BuildRequires: po4a
%description
-KiCad is an EDA software to design electronic schematic
-diagrams and printed circuit board artwork up to 16 layers.
-KiCad is a set of four softwares and a project manager:
-- KiCad: project manager
-- Eeschema: schematic entry
-- Pcbnew: board editor
-- Cvpcb: footprint selector for components used in the circuit design
-- Gerbview: GERBER viewer (photoplotter documents)
+KiCad is EDA software to design electronic schematic
+diagrams and printed circuit board artwork of up to
+32 layers.
%package doc
Summary: Documentation for KiCad
@@ -294,6 +289,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
+* Thu Jun 14 2018 Steven A. Falco <stevenfalco(a)gmail.com> - 1:5.0.0-0.1.rc2
+- Update to 5.0.0-rc2
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:4.0.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit d42ea1a1fc181d2187cd2f81bd310f168de8a927
Author: Steven A. Falco <stevenfalco(a)gmail.com>
Date: Thu Jun 14 21:38:36 2018 -0400
Add 3D models
Add the 3D model tar file and build it.
diff --git a/.gitignore b/.gitignore
index 2d51fa6..77fb0bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -722,3 +722,4 @@ kicad-libraries-2010.05.27.tar.bz2
/kicad-templates-5.0.0-rc2.tar.gz
/kicad-symbols-5.0.0-rc2.tar.gz
/kicad-footprints-5.0.0-rc2.tar.gz
+/kicad-packages3D-5.0.0-rc2.tar.gz
diff --git a/kicad.spec b/kicad.spec
index eb8468e..1cb5855 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -17,6 +17,7 @@ Source2: https://github.com/KiCad/kicad-i18n/archive/%{version}-%{candidate}.tar
Source3: https://github.com/KiCad/kicad-templates/archive/%{version}-%{candidate}....
Source4: https://github.com/KiCad/kicad-symbols/archive/%{version}-%{candidate}.ta...
Source5: https://github.com/KiCad/kicad-footprints/archive/%{version}-%{candidate}...
+Source6: https://github.com/KiCad/kicad-packages3D/archive/%{version}-%{candidate}...
#Source0: https://launchpad.net/kicad/5.0/%%{version}/+download/kicad-%%{version}.t...
#Source1: https://github.com/KiCad/kicad-doc/archive/%%{version}.tar.gz#/kicad-doc-...
@@ -24,6 +25,7 @@ Source5: https://github.com/KiCad/kicad-footprints/archive/%{version}-%{candidat
#Source3: https://github.com/KiCad/kicad-templates/archive/%%{version}.tar.gz#/kica...
#Source4: https://github.com/KiCad/kicad-symbols/archive/%%{version}.tar.gz#/kicad-...
#Source5: https://github.com/KiCad/kicad-footprints/archive/%%{version}.tar.gz#/kic...
+#Source6: https://github.com/KiCad/kicad-packages3D/archive/%%{version}.tar.gz#/kic...
Patch1: kicad-5.0.0-nostrip.patch
Patch2: kicad-5.0.0-freerouting.patch
@@ -122,8 +124,13 @@ mv kicad-symbols-%{version}-%{candidate} kicad-symbols-%{version}
%setup -n kicad-%{version}-%{candidate} -D -T -a 5
mv kicad-footprints-%{version}-%{candidate} kicad-footprints-%{version}
+# The packages3D repo will create a tar with -rc2 in the root dir name. We
+# rename the dir to remove the -rc2 portion.
+%setup -n kicad-%{version}-%{candidate} -D -T -a 6
+mv kicad-packages3D-%{version}-%{candidate} kicad-packages3D-%{version}
+
# Eventually we should just be able to do:
-#%%setup -q -a 1 -a 2 -a 3 -a 4 -a 5
+#%%setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 6
%patch1 -p1
%patch2 -p1
@@ -179,6 +186,12 @@ pushd %{name}-footprints-%{version}/
%make_build
popd
+# 3D package libraries
+pushd %{name}-packages3D-%{version}/
+%cmake .
+%make_build
+popd
+
# Documentation (HTML only)
mkdir %{name}-doc-%{version}/build/
pushd %{name}-doc-%{version}/build/
@@ -223,6 +236,11 @@ pushd %{name}-footprints-%{version}/
%make_install
popd
+# 3D models
+pushd %{name}-packages3D-%{version}/
+%make_install
+popd
+
# Documentation
pushd %{name}-doc-%{version}/build/
%make_install
diff --git a/sources b/sources
index e4f3219..ee4c103 100644
--- a/sources
+++ b/sources
@@ -4,3 +4,4 @@ SHA512 (kicad-i18n-5.0.0-rc2.tar.gz) = 3a5674832843537d7a88a92ca18400a8ddd03bfb3
SHA512 (kicad-templates-5.0.0-rc2.tar.gz) = fe0310acdb815684548b18978597c69aee1e7a450896c8bbc791e9b1082e1a412ffdf5edccb8c624866ceafca4a4087f04bfed67459dfc47a52c0d9cd01c9b64
SHA512 (kicad-symbols-5.0.0-rc2.tar.gz) = 11aa347dcedb469e61478cf553fcc395f7cb8f4aae27ca4994e6f995ead2714da35a354c2f8d417823916f22c22889ba99454756814ada4f858a964f877fb8ee
SHA512 (kicad-footprints-5.0.0-rc2.tar.gz) = e1980ddfb7f4d4bc0f5812a78aba20252f38744f77522034d6870c2b761a1ba07b2f7a428385ad76770981ce376742bf5983b9d84fb928cbac8c4d7077f51eda
+SHA512 (kicad-packages3D-5.0.0-rc2.tar.gz) = c853f321eb94c266a0c3b81c34f5572d98ef75de439b8cf2233c61f9310e08cb16ecef912847651b1fe0b5fd9665f915c05dd19a1eacc78fc10510448c9d0533
commit 278232b7611b9f72511637a287e27ed8d355f152
Author: Steven A. Falco <stevenfalco(a)gmail.com>
Date: Thu Jun 14 21:38:03 2018 -0400
Add footprints
Add the footprint tar file and build it.
diff --git a/.gitignore b/.gitignore
index fcd0896..2d51fa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -721,3 +721,4 @@ kicad-libraries-2010.05.27.tar.bz2
/kicad-i18n-5.0.0-rc2.tar.gz
/kicad-templates-5.0.0-rc2.tar.gz
/kicad-symbols-5.0.0-rc2.tar.gz
+/kicad-footprints-5.0.0-rc2.tar.gz
diff --git a/kicad.spec b/kicad.spec
index 44b10f5..eb8468e 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -16,12 +16,14 @@ Source1: https://github.com/KiCad/kicad-doc/archive/%{version}-%{candidate}.tar.
Source2: https://github.com/KiCad/kicad-i18n/archive/%{version}-%{candidate}.tar.g...
Source3: https://github.com/KiCad/kicad-templates/archive/%{version}-%{candidate}....
Source4: https://github.com/KiCad/kicad-symbols/archive/%{version}-%{candidate}.ta...
+Source5: https://github.com/KiCad/kicad-footprints/archive/%{version}-%{candidate}...
#Source0: https://launchpad.net/kicad/5.0/%%{version}/+download/kicad-%%{version}.t...
#Source1: https://github.com/KiCad/kicad-doc/archive/%%{version}.tar.gz#/kicad-doc-...
#Source2: https://github.com/KiCad/kicad-i18n/archive/%%{version}.tar.gz#/kicad-i18...
#Source3: https://github.com/KiCad/kicad-templates/archive/%%{version}.tar.gz#/kica...
#Source4: https://github.com/KiCad/kicad-symbols/archive/%%{version}.tar.gz#/kicad-...
+#Source5: https://github.com/KiCad/kicad-footprints/archive/%%{version}.tar.gz#/kic...
Patch1: kicad-5.0.0-nostrip.patch
Patch2: kicad-5.0.0-freerouting.patch
@@ -115,8 +117,13 @@ mv kicad-templates-%{version}-%{candidate} kicad-templates-%{version}
%setup -n kicad-%{version}-%{candidate} -D -T -a 4
mv kicad-symbols-%{version}-%{candidate} kicad-symbols-%{version}
+# The footprints repo will create a tar with -rc2 in the root dir name. We
+# rename the dir to remove the -rc2 portion.
+%setup -n kicad-%{version}-%{candidate} -D -T -a 5
+mv kicad-footprints-%{version}-%{candidate} kicad-footprints-%{version}
+
# Eventually we should just be able to do:
-#%%setup -q -a 1 -a 2 -a 3 -a 4
+#%%setup -q -a 1 -a 2 -a 3 -a 4 -a 5
%patch1 -p1
%patch2 -p1
@@ -166,6 +173,12 @@ pushd %{name}-symbols-%{version}/
%make_build
popd
+# Footprint libraries
+pushd %{name}-footprints-%{version}/
+%cmake .
+%make_build
+popd
+
# Documentation (HTML only)
mkdir %{name}-doc-%{version}/build/
pushd %{name}-doc-%{version}/build/
@@ -205,6 +218,11 @@ pushd %{name}-symbols-%{version}/
%make_install
popd
+# Footprint libraries
+pushd %{name}-footprints-%{version}/
+%make_install
+popd
+
# Documentation
pushd %{name}-doc-%{version}/build/
%make_install
diff --git a/sources b/sources
index 08bc31d..e4f3219 100644
--- a/sources
+++ b/sources
@@ -3,3 +3,4 @@ SHA512 (kicad-doc-5.0.0-rc2.tar.gz) = d13552878c18819f9978899d5a8cd6973232a65aac
SHA512 (kicad-i18n-5.0.0-rc2.tar.gz) = 3a5674832843537d7a88a92ca18400a8ddd03bfb33146e69bde80d955aaf4fc8ca211aba941948f68b8436803ff949dc65c7ef7121c8b1debc1edae132529bcf
SHA512 (kicad-templates-5.0.0-rc2.tar.gz) = fe0310acdb815684548b18978597c69aee1e7a450896c8bbc791e9b1082e1a412ffdf5edccb8c624866ceafca4a4087f04bfed67459dfc47a52c0d9cd01c9b64
SHA512 (kicad-symbols-5.0.0-rc2.tar.gz) = 11aa347dcedb469e61478cf553fcc395f7cb8f4aae27ca4994e6f995ead2714da35a354c2f8d417823916f22c22889ba99454756814ada4f858a964f877fb8ee
+SHA512 (kicad-footprints-5.0.0-rc2.tar.gz) = e1980ddfb7f4d4bc0f5812a78aba20252f38744f77522034d6870c2b761a1ba07b2f7a428385ad76770981ce376742bf5983b9d84fb928cbac8c4d7077f51eda
commit fee94253aee8212f7a8b105639178a2727d66f73
Author: Steven A. Falco <stevenfalco(a)gmail.com>
Date: Thu Jun 14 21:37:22 2018 -0400
Add symbols
Add the symbol tar file and build it.
diff --git a/.gitignore b/.gitignore
index 13e603b..fcd0896 100644
--- a/.gitignore
+++ b/.gitignore
@@ -720,3 +720,4 @@ kicad-libraries-2010.05.27.tar.bz2
/kicad-doc-5.0.0-rc2.tar.gz
/kicad-i18n-5.0.0-rc2.tar.gz
/kicad-templates-5.0.0-rc2.tar.gz
+/kicad-symbols-5.0.0-rc2.tar.gz
diff --git a/kicad.spec b/kicad.spec
index 8cce423..44b10f5 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -15,11 +15,13 @@ Source0: https://launchpad.net/kicad/5.0/%{version}-%{candidate}/+download/kicad
Source1: https://github.com/KiCad/kicad-doc/archive/%{version}-%{candidate}.tar.gz...
Source2: https://github.com/KiCad/kicad-i18n/archive/%{version}-%{candidate}.tar.g...
Source3: https://github.com/KiCad/kicad-templates/archive/%{version}-%{candidate}....
+Source4: https://github.com/KiCad/kicad-symbols/archive/%{version}-%{candidate}.ta...
#Source0: https://launchpad.net/kicad/5.0/%%{version}/+download/kicad-%%{version}.t...
#Source1: https://github.com/KiCad/kicad-doc/archive/%%{version}.tar.gz#/kicad-doc-...
#Source2: https://github.com/KiCad/kicad-i18n/archive/%%{version}.tar.gz#/kicad-i18...
#Source3: https://github.com/KiCad/kicad-templates/archive/%%{version}.tar.gz#/kica...
+#Source4: https://github.com/KiCad/kicad-symbols/archive/%%{version}.tar.gz#/kicad-...
Patch1: kicad-5.0.0-nostrip.patch
Patch2: kicad-5.0.0-freerouting.patch
@@ -108,8 +110,13 @@ mv kicad-i18n-%{version}-%{candidate} kicad-i18n-%{version}
%setup -n kicad-%{version}-%{candidate} -D -T -a 3
mv kicad-templates-%{version}-%{candidate} kicad-templates-%{version}
+# The symbols repo will create a tar with -rc2 in the root dir name. We
+# rename the dir to remove the -rc2 portion.
+%setup -n kicad-%{version}-%{candidate} -D -T -a 4
+mv kicad-symbols-%{version}-%{candidate} kicad-symbols-%{version}
+
# Eventually we should just be able to do:
-#%%setup -q -a 1 -a 2 -a 3
+#%%setup -q -a 1 -a 2 -a 3 -a 4
%patch1 -p1
%patch2 -p1
@@ -153,6 +160,12 @@ pushd %{name}-templates-%{version}/
%make_build
popd
+# Symbol libraries
+pushd %{name}-symbols-%{version}/
+%cmake .
+%make_build
+popd
+
# Documentation (HTML only)
mkdir %{name}-doc-%{version}/build/
pushd %{name}-doc-%{version}/build/
@@ -187,6 +200,11 @@ pushd %{name}-templates-%{version}/
%make_install
popd
+# Symbol libraries
+pushd %{name}-symbols-%{version}/
+%make_install
+popd
+
# Documentation
pushd %{name}-doc-%{version}/build/
%make_install
diff --git a/sources b/sources
index cf74efe..08bc31d 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@ SHA512 (kicad-5.0.0-rc2.tar.xz) = 9880458288ad8ba618ad1f807b0f4040d367f2d549f6a7
SHA512 (kicad-doc-5.0.0-rc2.tar.gz) = d13552878c18819f9978899d5a8cd6973232a65aaccc0bcb12063d37b9226f0a2948a6e9c23627123edfde85a51ff6fe457cba86e13a41567a13ac26db4685e7
SHA512 (kicad-i18n-5.0.0-rc2.tar.gz) = 3a5674832843537d7a88a92ca18400a8ddd03bfb33146e69bde80d955aaf4fc8ca211aba941948f68b8436803ff949dc65c7ef7121c8b1debc1edae132529bcf
SHA512 (kicad-templates-5.0.0-rc2.tar.gz) = fe0310acdb815684548b18978597c69aee1e7a450896c8bbc791e9b1082e1a412ffdf5edccb8c624866ceafca4a4087f04bfed67459dfc47a52c0d9cd01c9b64
+SHA512 (kicad-symbols-5.0.0-rc2.tar.gz) = 11aa347dcedb469e61478cf553fcc395f7cb8f4aae27ca4994e6f995ead2714da35a354c2f8d417823916f22c22889ba99454756814ada4f858a964f877fb8ee
commit b100d4b287b019242e95e6282ae12c8b1ca4532a
Author: Steven A. Falco <stevenfalco(a)gmail.com>
Date: Thu Jun 14 21:34:47 2018 -0400
Add templates
Add the template tar file and build it.
diff --git a/.gitignore b/.gitignore
index d3d8322..13e603b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -719,3 +719,4 @@ kicad-libraries-2010.05.27.tar.bz2
/kicad-5.0.0-rc2.tar.xz
/kicad-doc-5.0.0-rc2.tar.gz
/kicad-i18n-5.0.0-rc2.tar.gz
+/kicad-templates-5.0.0-rc2.tar.gz
diff --git a/kicad.spec b/kicad.spec
index 5685931..8cce423 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -14,10 +14,12 @@ URL: http://www.kicad-pcb.org
Source0: https://launchpad.net/kicad/5.0/%{version}-%{candidate}/+download/kicad-%...
Source1: https://github.com/KiCad/kicad-doc/archive/%{version}-%{candidate}.tar.gz...
Source2: https://github.com/KiCad/kicad-i18n/archive/%{version}-%{candidate}.tar.g...
+Source3: https://github.com/KiCad/kicad-templates/archive/%{version}-%{candidate}....
#Source0: https://launchpad.net/kicad/5.0/%%{version}/+download/kicad-%%{version}.t...
#Source1: https://github.com/KiCad/kicad-doc/archive/%%{version}.tar.gz#/kicad-doc-...
#Source2: https://github.com/KiCad/kicad-i18n/archive/%%{version}.tar.gz#/kicad-i18...
+#Source3: https://github.com/KiCad/kicad-templates/archive/%%{version}.tar.gz#/kica...
Patch1: kicad-5.0.0-nostrip.patch
Patch2: kicad-5.0.0-freerouting.patch
@@ -101,8 +103,13 @@ mv kicad-doc-%{version}-%{candidate} kicad-doc-%{version}
%setup -n kicad-%{version}-%{candidate} -D -T -a 2
mv kicad-i18n-%{version}-%{candidate} kicad-i18n-%{version}
+# The templates repo will create a tar with -rc2 in the root dir name. We
+# rename the dir to remove the -rc2 portion.
+%setup -n kicad-%{version}-%{candidate} -D -T -a 3
+mv kicad-templates-%{version}-%{candidate} kicad-templates-%{version}
+
# Eventually we should just be able to do:
-#%%setup -q -a 1 -a 2
+#%%setup -q -a 1 -a 2 -a 3
%patch1 -p1
%patch2 -p1
@@ -140,6 +147,12 @@ pushd %{name}-i18n-%{version}/build/
%make_build
popd
+# Templates
+pushd %{name}-templates-%{version}/
+%cmake .
+%make_build
+popd
+
# Documentation (HTML only)
mkdir %{name}-doc-%{version}/build/
pushd %{name}-doc-%{version}/build/
@@ -169,6 +182,11 @@ for desktopfile in %{buildroot}%{_datadir}/applications/*.desktop ; do
${desktopfile}
done
+# Templates
+pushd %{name}-templates-%{version}/
+%make_install
+popd
+
# Documentation
pushd %{name}-doc-%{version}/build/
%make_install
diff --git a/sources b/sources
index 367a3fb..cf74efe 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
SHA512 (kicad-5.0.0-rc2.tar.xz) = 9880458288ad8ba618ad1f807b0f4040d367f2d549f6a70cfa2862171c9d8358e4d685bbdf81c7cc645626d930defa64b73b5d300da36a252e583d649cc24ad0
SHA512 (kicad-doc-5.0.0-rc2.tar.gz) = d13552878c18819f9978899d5a8cd6973232a65aaccc0bcb12063d37b9226f0a2948a6e9c23627123edfde85a51ff6fe457cba86e13a41567a13ac26db4685e7
SHA512 (kicad-i18n-5.0.0-rc2.tar.gz) = 3a5674832843537d7a88a92ca18400a8ddd03bfb33146e69bde80d955aaf4fc8ca211aba941948f68b8436803ff949dc65c7ef7121c8b1debc1edae132529bcf
+SHA512 (kicad-templates-5.0.0-rc2.tar.gz) = fe0310acdb815684548b18978597c69aee1e7a450896c8bbc791e9b1082e1a412ffdf5edccb8c624866ceafca4a4087f04bfed67459dfc47a52c0d9cd01c9b64
commit 4e0b77b5dff8524aab3d4211505eede6ed52a0c0
Author: Steven A. Falco <stevenfalco(a)gmail.com>
Date: Thu Jun 14 21:34:08 2018 -0400
We don't need to patch plugin path
We no longer need to patch the plugin path, so remove that.
diff --git a/kicad.spec b/kicad.spec
index be88e13..5685931 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -107,8 +107,6 @@ mv kicad-i18n-%{version}-%{candidate} kicad-i18n-%{version}
%patch1 -p1
%patch2 -p1
-sed -i "s|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|" CMakeLists.txt
-
%build
commit edd95e331b133c693408316534939d69a1dfe4c3
Author: Steven A. Falco <stevenfalco(a)gmail.com>
Date: Thu Jun 14 21:33:38 2018 -0400
Replace the install logic and %files
The upstream nighlies use slightly different %install and %file
sections. It will ease future maintenance if we stay as similar as
possible.
diff --git a/kicad.spec b/kicad.spec
index 9987310..be88e13 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -153,8 +153,14 @@ popd
%install
-# KiCAD itself
-make INSTALL="install -p" DESTDIR=%{buildroot} install
+
+# KiCad application
+%make_install
+
+# Localization
+pushd %{name}-i18n-%{version}/build/
+%make_install
+popd
# install desktop
for desktopfile in %{buildroot}%{_datadir}/applications/*.desktop ; do
@@ -165,25 +171,12 @@ for desktopfile in %{buildroot}%{_datadir}/applications/*.desktop ; do
${desktopfile}
done
-# install template
-install -d %{buildroot}%{_datadir}/%{name}/template
-install -m 644 template/%{name}.pro %{buildroot}%{_datadir}/%{name}/template
-
# Documentation
-pushd %{name}-doc-%{version}/
-make INSTALL="install -p" DESTDIR=%{buildroot} install
+pushd %{name}-doc-%{version}/build/
+%make_install
popd
-# Translations
-pushd %{name}-i18n-%{version}/build
-make -j1 VERBOSE=1
-make INSTALL="install -p" DESTDIR=%{buildroot} install
-popd
%find_lang %{name}
-for F in %{buildroot}%{_docdir}/%{name}/help/*/; do
- L=$(basename $F)
- echo "%%lang($L) %{_docdir}/%{name}/help/$L" >>help.lang
-done
%check
@@ -214,20 +207,20 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%files -f %{name}.lang
%{_bindir}/*
-%{_libdir}/%{name}
-%{_datadir}/%{name}/
+%{_libdir}/%{name}/*
+%{_libdir}/libkicad_3dsg.so*
+%{_datadir}/%{name}/*
+%{_datadir}/appdata/*.xml
%{_datadir}/applications/*.desktop
-%{_datadir}/appdata/*.appdata.xml
%{_datadir}/icons/hicolor/*/mimetypes/application-x-*.*
%{_datadir}/icons/hicolor/*/apps/*.*
-%{_datadir}/mime/packages/%{name}.xml
-%{_datadir}/mimelnk/application/x-%{name}-*.desktop
-%dir %{_docdir}/%{name}/
-%{_docdir}/%{name}/*.txt
-
-%files doc -f help.lang
-%dir %{_docdir}/%{name}
-%{_docdir}/%{name}/scripts
+%{_datadir}/mime/packages/*.xml
+
+%files doc
+%doc AUTHORS.txt
+%{_docdir}/%{name}/help/*
+%{_docdir}/%{name}/scripts/*
+%license %{name}-doc-%{version}/LICENSE.adoc
%changelog
commit c9e892e642dccfa2c278fb8e5abbad51680614b0
Author: Steven A. Falco <stevenfalco(a)gmail.com>
Date: Thu Jun 14 21:31:46 2018 -0400
Replace the build logic
The upstream nighlies use a slightly different %build section. It will
ease future maintenance if we use the same %build.
Also, several compile-time flags have been removed from the upstream
source, and new ones have been added.
diff --git a/kicad.spec b/kicad.spec
index d6667f9..9987310 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -112,28 +112,44 @@ sed -i "s|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|"
%build
-# Documentation
-pushd %{name}-doc-%{version}/
-%cmake -DBUILD_FORMATS=html
-make -j1 VERBOSE=1
-popd
-
-# Translations
-mkdir %{name}-i18n-%{version}/build
-pushd %{name}-i18n-%{version}/build
-%cmake -DKICAD_I18N_UNIX_STRICT_PATH=ON ..
-make -j1 VERBOSE=1
-popd
-
-# Core components
+# compat-wxGTK3-gtk2-devel is now merged with wxGTK3-devel and uses a single wx-config
%if 0%{?fedora} > 27
%global wx_config wx-config
%else
%global wx_config wx-config-3.0-gtk2
%endif
-%cmake -DKICAD_SKIP_BOOST=ON -DKICAD_BUILD_VERSION="%{version}-%{release}" \
- -DwxWidgets_CONFIG_EXECUTABLE=%{_bindir}/%{wx_config}
-make %{_smp_mflags} VERBOSE=1
+
+# KiCad application
+%cmake \
+ -DKICAD_SCRIPTING=OFF \
+ -DKICAD_SCRIPTING_MODULES=OFF \
+ -DKICAD_SCRIPTING_WXPYTHON=OFF \
+ -DKICAD_SPICE=OFF \
+ -DKICAD_VERSION_EXTRA=%{release} \
+ -DwxWidgets_CONFIG_EXECUTABLE=%{_bindir}/%{wx_config} \
+ .
+# workaround to get WXPYTHON_VERSION set in config.h
+%{__make} rebuild_cache
+# end workaround
+%make_build
+
+# Localization
+mkdir %{name}-i18n-%{version}/build/
+pushd %{name}-i18n-%{version}/build/
+%cmake \
+ -DKICAD_I18N_UNIX_STRICT_PATH=ON \
+ ..
+%make_build
+popd
+
+# Documentation (HTML only)
+mkdir %{name}-doc-%{version}/build/
+pushd %{name}-doc-%{version}/build/
+%cmake \
+ -DBUILD_FORMATS=html \
+ ..
+%make_build
+popd
%install
commit 9cc8fbeb3692321cc2187249e01d8b712f8dcbcb
Author: Steven A. Falco <stevenfalco(a)gmail.com>
Date: Thu Jun 14 21:30:42 2018 -0400
Update architectures and requirements
KiCad no longer supports PowerPC, so we have to remove that architecture.
Please see https://bugs.launchpad.net/kicad/+bug/1755752 for more
information.
Also, the build requirements have changed.
diff --git a/kicad.spec b/kicad.spec
index b394825..d6667f9 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -22,8 +22,8 @@ Source2: https://github.com/KiCad/kicad-i18n/archive/%{version}-%{candidate}.tar
Patch1: kicad-5.0.0-nostrip.patch
Patch2: kicad-5.0.0-freerouting.patch
-# boost-context is only available on the following architectures:
-ExclusiveArch: %{ix86} x86_64 %{arm} ppc64 ppc64le aarch64
+# kicad is only available on the following architectures (see https://bugs.launchpad.net/kicad/+bug/1755752):
+ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
BuildRequires: desktop-file-utils
BuildRequires: compat-wxGTK3-gtk2-devel
@@ -31,17 +31,18 @@ BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: glew-devel
-BuildRequires: pkgconfig(openssl)
BuildRequires: libappstream-glib
BuildRequires: libcurl-devel
+BuildRequires: gettext
+BuildRequires: swig
+BuildRequires: glm-devel
+BuildRequires: OCE-devel
+BuildRequires: openssl-devel
# Documentation
BuildRequires: asciidoc
BuildRequires: dblatex
BuildRequires: po4a
-BuildRequires: perl(Unicode::GCString)
-
-Requires: freerouting
%description
KiCad is an EDA software to design electronic schematic
commit f7eaea5d4c2465e1d85a00e571f3afd81f39e176
Author: Steven A. Falco <stevenfalco(a)gmail.com>
Date: Thu Jun 14 21:30:06 2018 -0400
Regenerate the freerouting and nostrip patches
Line numbers have changed, so regenerate the patches for 5.0.0.
diff --git a/kicad-4.0.0-freerouting.patch b/kicad-4.0.0-freerouting.patch
deleted file mode 100644
index 8915496..0000000
--- a/kicad-4.0.0-freerouting.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From f51140b80a0925d2d69b15030a7f8d54c2276832 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak(a)v3.sk>
-Date: Wed, 24 Dec 2014 09:53:49 +0100
-Subject: [PATCH] Try to run freerouting by its JPackage launcher script
-
-It's a sin to touch the Java tool by its JAR file in Fedora.
----
- pcbnew/dialogs/dialog_freeroute_exchange.cpp | 23 ++++++++++++++++++++---
- 1 file changed, 20 insertions(+), 3 deletions(-)
-
-diff --git a/pcbnew/dialogs/dialog_freeroute_exchange.cpp b/pcbnew/dialogs/dialog_freeroute_exchange.cpp
-index 7b057f6..4207d4e 100644
---- a/pcbnew/dialogs/dialog_freeroute_exchange.cpp
-+++ b/pcbnew/dialogs/dialog_freeroute_exchange.cpp
-@@ -71,7 +71,10 @@ void DIALOG_FREEROUTE::MyInit()
- SetFocus();
- m_freeRouterFound = false;
-
-- wxFileName fileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
-+ wxFileName fileName( FindKicadFile( wxT( "freerouting" ) ), wxPATH_UNIX );
-+
-+ if( !fileName.FileExists() )
-+ fileName.Assign ( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
-
- if( fileName.FileExists() )
- m_freeRouterFound = true;
-@@ -126,8 +129,22 @@ void DIALOG_FREEROUTE::OnLaunchButtonClick( wxCommandEvent& event )
- return;
- }
-
-- wxFileName jarfileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
-- wxString command;
-+ wxFileName jarfileName( FindKicadFile( wxT( "freerouting" ) ), wxPATH_UNIX );
-+ wxString command = wxT( "" );
-+
-+ if( jarfileName.FileExists() )
-+ {
-+ command << wxChar( '"' ) << jarfileName.GetFullPath() << wxChar( '"' );
-+ // add option to load the .dsn file
-+ command << wxT( " -de " );
-+ // add *.dsn full filename (quoted):
-+ command << wxChar( '"' ) << dsnFile << wxChar( '"' );
-+
-+ ProcessExecute( command );
-+ return;
-+ } else {
-+ jarfileName.Assign ( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
-+ }
-
- // Find the Java application on Windows.
- // Colud be no more needed since we now have to run only java, not java web start
---
-2.5.0
-
diff --git a/kicad-4.0.0-nostrip.patch b/kicad-4.0.0-nostrip.patch
deleted file mode 100644
index 7259f5a..0000000
--- a/kicad-4.0.0-nostrip.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ec4c5b7..1350307 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -187,7 +187,6 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
- endif()
-
- if( MINGW )
-- set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
-
- # _UNICODE definition seems needed under mingw/gcc 4.8
- # (Kicad uses unicode, and on Windows, wxWidgets >= 2.9.4 is mandatory
-@@ -236,8 +235,6 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
- set( CMAKE_SHARED_LINKER_FLAGS "${TO_LINKER},--no-undefined" )
- set( CMAKE_MODULE_LINKER_FLAGS "${TO_LINKER},--no-undefined" )
-
-- set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
--
- # Defeat ELF's ability to use the GOT to replace locally implemented functions
- # with ones from another module.
- # https://bugs.launchpad.net/kicad/+bug/1322354
diff --git a/kicad-5.0.0-freerouting.patch b/kicad-5.0.0-freerouting.patch
new file mode 100644
index 0000000..588d96d
--- /dev/null
+++ b/kicad-5.0.0-freerouting.patch
@@ -0,0 +1,54 @@
+From 15e039ca1ca1af1f2c52a21d3571e9629c9580ef Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak(a)v3.sk>
+Date: Mon, 4 Jun 2018 10:13:00 -0400
+Subject: [PATCH] Try to run freerouting by its JPackage launcher script
+
+It's a sin to touch the Java tool by its JAR file in Fedora.
+---
+ pcbnew/dialogs/dialog_freeroute_exchange.cpp | 23 +++++++++++++++++---
+ 1 file changed, 20 insertions(+), 3 deletions(-)
+
+diff --git a/pcbnew/dialogs/dialog_freeroute_exchange.cpp b/pcbnew/dialogs/dialog_freeroute_exchange.cpp
+index 3200de151..17e9e0543 100644
+--- a/pcbnew/dialogs/dialog_freeroute_exchange.cpp
++++ b/pcbnew/dialogs/dialog_freeroute_exchange.cpp
+@@ -82,7 +82,10 @@ void DIALOG_FREEROUTE::init()
+ SetFocus();
+ m_freeRouterFound = false;
+
+- wxFileName fileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
++ wxFileName fileName( FindKicadFile( wxT( "freerouting" ) ), wxPATH_UNIX );
++
++ if( !fileName.FileExists() )
++ fileName.Assign ( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
+
+ if( fileName.FileExists() )
+ m_freeRouterFound = true;
+@@ -131,8 +134,22 @@ void DIALOG_FREEROUTE::OnLaunchButtonClick( wxCommandEvent& event )
+ return;
+ }
+
+- wxFileName jarfileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
+- wxString command;
++ wxFileName jarfileName( FindKicadFile( wxT( "freerouting" ) ), wxPATH_UNIX );
++ wxString command = wxT( "" );
++
++ if( jarfileName.FileExists() )
++ {
++ command << wxChar( '"' ) << jarfileName.GetFullPath() << wxChar( '"' );
++ // add option to load the .dsn file
++ command << wxT( " -de " );
++ // add *.dsn full filename (quoted):
++ command << wxChar( '"' ) << dsnFile << wxChar( '"' );
++
++ ProcessExecute( command );
++ return;
++ } else {
++ jarfileName.Assign ( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
++ }
+
+ // Find the Java application on Windows.
+ // Colud be no more needed since we now have to run only java, not java web start
+--
+2.17.1
+
diff --git a/kicad-5.0.0-nostrip.patch b/kicad-5.0.0-nostrip.patch
new file mode 100644
index 0000000..c44d694
--- /dev/null
+++ b/kicad-5.0.0-nostrip.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6c52528fb..786b672f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -278,8 +278,6 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
+ set( CMAKE_CXX_FLAGS_DEBUG "-g3 -ggdb3 -DDEBUG -Wno-deprecated-declarations" )
+
+ if( MINGW )
+- set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
+-
+ # _UNICODE definition seems needed under mingw/gcc 4.8
+ # (Kicad uses unicode, and on Windows, wxWidgets >= 2.9.4 is mandatory
+ # and uses unicode)
+@@ -318,8 +316,6 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
+ set( CMAKE_SHARED_LINKER_FLAGS "${TO_LINKER},--no-undefined" )
+ set( CMAKE_MODULE_LINKER_FLAGS "${TO_LINKER},--no-undefined" )
+
+- set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
+-
+ # Defeat ELF's ability to use the GOT to replace locally implemented functions
+ # with ones from another module.
+ # https://bugs.launchpad.net/kicad/+bug/1322354
diff --git a/kicad.spec b/kicad.spec
index b18b257..b394825 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -19,8 +19,8 @@ Source2: https://github.com/KiCad/kicad-i18n/archive/%{version}-%{candidate}.tar
#Source1: https://github.com/KiCad/kicad-doc/archive/%%{version}.tar.gz#/kicad-doc-...
#Source2: https://github.com/KiCad/kicad-i18n/archive/%%{version}.tar.gz#/kicad-i18...
-Patch1: kicad-4.0.0-nostrip.patch
-Patch2: kicad-4.0.0-freerouting.patch
+Patch1: kicad-5.0.0-nostrip.patch
+Patch2: kicad-5.0.0-freerouting.patch
# boost-context is only available on the following architectures:
ExclusiveArch: %{ix86} x86_64 %{arm} ppc64 ppc64le aarch64
commit 34293d17a176e07686e7ef493f736f4fec0380aa
Author: Steven A. Falco <stevenfalco(a)gmail.com>
Date: Thu Jun 14 21:28:54 2018 -0400
Bring in new sources
Bring in the new KiCad source, doc, and i18n tars. Note that this
won't build because I'm bringing in the changes a little at a time
to make reviewing easier.
The tars have been uploaded via fedpkg.
diff --git a/.gitignore b/.gitignore
index 7c7e373..d3d8322 100644
--- a/.gitignore
+++ b/.gitignore
@@ -716,3 +716,6 @@ kicad-libraries-2010.05.27.tar.bz2
/kicad-doc-4.0.7.tar.gz
/kicad-i18n-4.0.7.tar.gz
/kicad-library-4.0.7.tar.gz
+/kicad-5.0.0-rc2.tar.xz
+/kicad-doc-5.0.0-rc2.tar.gz
+/kicad-i18n-5.0.0-rc2.tar.gz
diff --git a/kicad.spec b/kicad.spec
index bcb2fe6..b18b257 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -1,16 +1,23 @@
+%global candidate rc2
+
Name: kicad
-Version: 4.0.7
-Release: 3%{?dist}
+Version: 5.0.0
+Release: 0.1.%{candidate}%{?dist}
Epoch: 1
Summary: EDA software suite for creation of schematic diagrams and PCBs
Group: Applications/Engineering
-License: GPLv2+
+License: GPLv3+
URL: http://www.kicad-pcb.org
-Source: https://launchpad.net/kicad/4.0/%{version}/+download/kicad-%{version}.tar.xz
-Source1: https://github.com/KiCad/kicad-doc/archive/%{version}.tar.gz#/kicad-doc-%...
-Source3: https://github.com/KiCad/kicad-i18n/archive/%{version}.tar.gz#/kicad-i18n...
+# These are temporary until 5.0.0 is released.
+Source0: https://launchpad.net/kicad/5.0/%{version}-%{candidate}/+download/kicad-%...
+Source1: https://github.com/KiCad/kicad-doc/archive/%{version}-%{candidate}.tar.gz...
+Source2: https://github.com/KiCad/kicad-i18n/archive/%{version}-%{candidate}.tar.g...
+
+#Source0: https://launchpad.net/kicad/5.0/%%{version}/+download/kicad-%%{version}.t...
+#Source1: https://github.com/KiCad/kicad-doc/archive/%%{version}.tar.gz#/kicad-doc-...
+#Source2: https://github.com/KiCad/kicad-i18n/archive/%%{version}.tar.gz#/kicad-i18...
Patch1: kicad-4.0.0-nostrip.patch
Patch2: kicad-4.0.0-freerouting.patch
@@ -49,7 +56,7 @@ KiCad is a set of four softwares and a project manager:
%package doc
Summary: Documentation for KiCad
Group: Documentation
-License: GPLv2+
+License: GPLv3+ or CC-BY-3.0+
BuildArch: noarch
Provides: %{name}-doc-de = %{version}-%{release}
@@ -79,7 +86,22 @@ Documentation for KiCad.
%prep
-%setup -q -a 1 -a 3
+# The -rc2 source tar on launchpad has a root directory that includes the -rc2
+# name component, so we have to account for that.
+%setup -n kicad-%{version}-%{candidate}
+
+# The doc repo will create a tar with -rc2 in the root dir name. We rename
+# the dir to remove the -rc2 portion.
+%setup -n kicad-%{version}-%{candidate} -D -T -a 1
+mv kicad-doc-%{version}-%{candidate} kicad-doc-%{version}
+
+# The i18n repo will create a tar with -rc2 in the root dir name. We rename
+# the dir to remove the -rc2 portion.
+%setup -n kicad-%{version}-%{candidate} -D -T -a 2
+mv kicad-i18n-%{version}-%{candidate} kicad-i18n-%{version}
+
+# Eventually we should just be able to do:
+#%%setup -q -a 1 -a 2
%patch1 -p1
%patch2 -p1
diff --git a/sources b/sources
index d89bd84..367a3fb 100644
--- a/sources
+++ b/sources
@@ -1,90 +1,3 @@
-SHA512 (Battery_Holders.pretty-4.0.7.tar.gz) = a02e81e5e1f42c3045e4ed8fb27705befbe67baff9de528912756ab973ee2650d81c386fc04091db742c29475d9b8e7c255cdcd8fcbcd4d12925add6edb80659
-SHA512 (Buttons_Switches_SMD.pretty-4.0.7.tar.gz) = 140f4bef2cc5e214d7802fcf692dec7efac2ca2ec4028870352c7a2fc7afc82d9ab1741ff8383af175b7405a58ca1a169e1b7c4370c260b4f4d1e00ffdf47e8c
-SHA512 (Buttons_Switches_THT.pretty-4.0.7.tar.gz) = c6575ea18f0e990fd9517077eb3a90458d22dab5c4e5fc0b256a661e3a340f806cd1b49fd41f135266b10716489801ae09440bf2fa0f1534305cdfa443bde54c
-SHA512 (Buzzers_Beepers.pretty-4.0.7.tar.gz) = c151dc22df88b65c42e293dcb4d295e458bc859f50d64dfbcba730eca4aaec08aad77f4c03a60ea246935bd71e11f3d8cb498a8023a8767273ebedb933215bf8
-SHA512 (Capacitors_SMD.pretty-4.0.7.tar.gz) = 89ad6c679ea8a8321352734ff42558c3b4c8554c4b3a65fcd4095c77ba16f51422b84c1700d00fffde7e4d3f474e71ef544b8c9626c2b366b5f05db86b62d6d5
-SHA512 (Capacitors_THT.pretty-4.0.7.tar.gz) = 0e9bd8b0aa7bf83e1ba57bac6e74f5c7e1070ec33feb33bcaa62639cb1b85476cd7aeecf6bffafcedbb2697a75eaddcf2c51427628069718930315c2f43a685b
-SHA512 (Capacitors_Tantalum_SMD.pretty-4.0.7.tar.gz) = d250a80ca11cd5f7478352922dfe00f06c2a4026b274f6aeb35ccfe5890361397dd44b2957eea2df957261ea7590c893370cf50be474677ee392a659d6428738
-SHA512 (Connectors.pretty-4.0.7.tar.gz) = 5b9121dc8e6c7a5b35fbe79291a6d470ed21d5672d696de495499a3d31a5dc0e8cfb744e50ef2af7ca634d940a0a4d88fc2a252a0854ec43b3afe6f9b2bf21f8
-SHA512 (Connectors_Card.pretty-4.0.7.tar.gz) = c80665e2606ee3046d64d018aa930425034f3d98448092f630c08e3d80c1e86d73b6b3186a8d8785c63479c7292f80fb088736dbf50054ff42144f96d7dd2f8e
-SHA512 (Connectors_HDMI.pretty-4.0.7.tar.gz) = 89513fdc6b17dd1e2fb86b96d55476b07d3bc317bc8e09b21814a215f893b8a500cc1989ea9515ecb98071241f0771f08132e70f777629dcf5d2a7e6335931c4
-SHA512 (Connectors_Harwin.pretty-4.0.7.tar.gz) = 14b66e775babf701e17ca00c156f873a34ec30d2b8bfafb60ab8f6c6c8342841e51e22d35a85648800598bdc5badb0896c350a1da3cfe869806f6065b96417e0
-SHA512 (Connectors_Hirose.pretty-4.0.7.tar.gz) = 59ae489001f0fb16f88011b3be194f5f3f5e5e201031a3a85799a433f899fd8cedd92ed0a8359c9e3cbf45a9b99bd757e29c066747b33715c2bd86a6f9f3f5d3
-SHA512 (Connectors_IEC_DIN.pretty-4.0.7.tar.gz) = cfe810f464b89dd998622de41b7ef6f2fd9151651b31beb808572ab3c8bd2c679527cde11edf83107384a982146703669259d7275cec376f58757e92e52294a2
-SHA512 (Connectors_JAE.pretty-4.0.7.tar.gz) = 27ba5bcc2ea14fdd8a661d5afeac1cf4a34b2b6cd7c26270bce241dabdd8b894847bb30f02e60a72a2cc1f1853ab51adad62709e0ee5fd036467a5e46319c433
-SHA512 (Connectors_JST.pretty-4.0.7.tar.gz) = e48e7a7b3ce6a802fc5ce460d2077262de2bfca56bf242106df066858d3f2d2fd54677a5b8895e05d5d4a08f3977ce6b381c1c8a429639e3dbb751a7db12c2f5
-SHA512 (Connectors_Mini-Universal.pretty-4.0.7.tar.gz) = 26b5e5315cf786e79e581ad3486b129caa18ddb8c5035a24365ac4ea65b14488564034b91821cc296ab845f68cdffab00a998b863ee14c3cdf9e8a09ecd5358a
-SHA512 (Connectors_Molex.pretty-4.0.7.tar.gz) = a920fe8695b9581b8c1747bed4414b01c127d141acd16c1feb2ffbed15ea63ba08aacce70dd1ba34a34fddb92cc7afc877910d557b2eaf961c1ed8908a611979
-SHA512 (Connectors_Multicomp.pretty-4.0.7.tar.gz) = 54e53664e0f2fa9921b241e57166858f5571c26fca38445ed4bdc4f13196d38e55122527fa634fe3dfecfc571702496a50796f458b56e858c529acc8051e7ff7
-SHA512 (Connectors_Phoenix.pretty-4.0.7.tar.gz) = e1073d49fc91c4477acf85f14e48cc72e3ce4ff18e452b9f8551dd5315c6179732a5242eba09f6ab3f6a6b1cd3dce5dd485207ebb1668f04753d71859a00c3f0
-SHA512 (Connectors_Samtec.pretty-4.0.7.tar.gz) = 84eda48831ec3ec9669f9e13586535ba30f5ab8b42c86ff7ba6b6d0aa7e850d150be1aa0e97103688220586b2d97b7735c0c44112cfa4c37f8bcde242b40fa44
-SHA512 (Connectors_TE-Connectivity.pretty-4.0.7.tar.gz) = 5ccc47a586693d0113df8f945dedfc89d3320782082405dc07737bd918b271e31edb8054684a577b3aaeadf6aec7b158c14c04121ff6fe241356880d522c1639
-SHA512 (Connectors_Terminal_Blocks.pretty-4.0.7.tar.gz) = 7ea1fbaa36e874c93e562667ff943ba4b5c8ece0f33a4bb4ecec4c5d3b70095f2a3375cff643ae33714394ee1a7ac424038ecee0ee1e8ac27cd96f2b26db2088
-SHA512 (Connectors_USB.pretty-4.0.7.tar.gz) = 0a788e0de209fea154c98ccdf2da0b670df47a53b44f11ad0ce1f6588daee7c4eaf9bb2681188b109d484f45c02d0339b0f9c7eee87dc0b22c2e6ce72511fe70
-SHA512 (Connectors_WAGO.pretty-4.0.7.tar.gz) = 6bebc8cd238aedff0102131eb60b90a0cf6f252fb41fbed9211508244b5a521700acfdcc02512987d4251693c37b70aa080b6ddbf3cec2d597f0902bd70b091a
-SHA512 (Converters_DCDC_ACDC.pretty-4.0.7.tar.gz) = 6a03797ccf65bc047ee73ee0d9641896041f12b81e86b4a53e006a8fed4c67342ea06152910e756847c5800821a1fe2b801269beb9457b8909054ceaf31663e8
-SHA512 (Crystals.pretty-4.0.7.tar.gz) = c107143db70a8de3e9be6f2fdb33ace3e853d18b48719b12ee097103705fb1c59309eb46da3fdff382b8bc9878d416ee33d76ca540dcf7ae96727215ebf394fc
-SHA512 (Diodes_SMD.pretty-4.0.7.tar.gz) = 118b3bef198f05cbb4413a28d724fc31fa7d5f16b8962d6b5052535553d9cb2945d40668e5a4820e4cb8b6b2078894a205f23d1d92b8642942995bd9f166d1cf
-SHA512 (Diodes_THT.pretty-4.0.7.tar.gz) = aec15e5735dda43f67da0765451511a959b8a43000de96d1d7f30bfdad5f4bafe166402670bc36810bc1aaee58e7d55f638714137b9017479dfc2ce1d0b66b76
-SHA512 (Displays.pretty-4.0.7.tar.gz) = cf458a0e70a24e706b72f193b5b8fbfa941dcbdf5953661547d696c389731c8f7ab23daae399dec1968bc5fe2397fe1cd67c5952d1b962367d34ebb14a43082e
-SHA512 (Displays_7-Segment.pretty-4.0.7.tar.gz) = ef624828b2370d9583adfb5f1a77179ca9bc29d452073e49b9c6db33fd81555cbbde7a71b364d2fc748f8d55ed7f2c1b43edb930a21fd1d9bac4af77b9e6cbb7
-SHA512 (Enclosures.pretty-4.0.7.tar.gz) = 4fd4ed8d26e480ebd87b5474fa431ab20a6ad69bc5603025caad8cf1d66e0072e09220a03825a1d5966db4bb17cdadd36385cf64a9810970b06b1cad74e15fd4
-SHA512 (EuroBoard_Outline.pretty-4.0.7.tar.gz) = 9b4612d98a3df7e0466f353cab4d025e669e4d3e82e5b27d7ae923fdc5acec2be34c8a6e00475179bc55a570d38b9a95c61554272b7e95380688dffe82d2f498
-SHA512 (Fiducials.pretty-4.0.7.tar.gz) = bad935c0557392a3eb9d58c4fcb8b10ab1dc03130dd7389a86218f5d2efab99d4fb644eaf1cda6a9c9462c4b39928273664a5c9cc51961888ca02cbdcafdd3c3
-SHA512 (Fuse_Holders_and_Fuses.pretty-4.0.7.tar.gz) = d166af830a841fb08405be9ab53e4b0fa9820104e4e6aab87affc8a451d99809a8692553dc7e4704638451536342923ac27610d79ce78b2f715c7b9e711bb6d3
-SHA512 (Hall-Effect_Transducers_LEM.pretty-4.0.7.tar.gz) = ca0d9872a07bc5dd52386bda8b10b97cd41cfff483213c6c41417ba8bdf076d6a2c00b176d9b3b4e4d0c22b0482a77f2e96fdc32f2c408f8dcad9025acd83330
-SHA512 (Heatsinks.pretty-4.0.7.tar.gz) = 80b0b657258a16dd9f4b2cc92f9c553d98529aef3f4d86ea25472712b9ba328feb954c5faa6858911291f4b13bd0c7c3012934ea09c3ef1fce0e0d6c0bce54db
-SHA512 (Housings_BGA.pretty-4.0.7.tar.gz) = 2aa625656a4504b765978918c2361b5fae88ddb2c39367c1c05521f461b0f7bc7404443bcd67f15ce13b823648b41fc032150fba52913d4dcd9eb0a4062bf81a
-SHA512 (Housings_CSP.pretty-4.0.7.tar.gz) = 719a5ca458a59383ae96c13aeae6b05f1f59641ff077b6f9f7f26035b085d950e5ff4aabc7fb61e253cc2fb611fe6ff7a050d2b8e257e85d5338e122773e4ee8
-SHA512 (Housings_DFN_QFN.pretty-4.0.7.tar.gz) = b6aa796f55610ef10149d01bd74df26a603f9f55e4b4543e3f8b5158bbc0993d9443f19f7971e521c6e07c961443d37858cbfed370d5672509f6dfadbd70927b
-SHA512 (Housings_DIP.pretty-4.0.7.tar.gz) = 06a4354c45a6055c18d60c5d49222f166224ee0c9d344c14d0a695abdf72cbfe09cd22bfe875782874b948c4e92c597772067e4dff25a47f79567f39d8c7dad8
-SHA512 (Housings_LCC.pretty-4.0.7.tar.gz) = 7a066ab0f5071ed6c2a86e3121c7ac5375328984444414dd2c596f8be6ac4ddedd38ecb43756dea792a02f20e7bb8662ca294e668580fec14f0c391bf1fff34f
-SHA512 (Housings_LGA.pretty-4.0.7.tar.gz) = 91b1b573abdac7797f2f85fd26181d9202c339b930e708abdaa07ff1530e5f326d66f20bea2e452384e617a17e13c9a3c4ce4e5654bfd1311bb50dc3e7f39b1a
-SHA512 (Housings_PGA.pretty-4.0.7.tar.gz) = 19acb56582d3dda8e18facfa14814c58f4cb6afd480488ad4bd15181eee718b00edd5b1441367fe9db2bb289c4bb9cc2d8ef722d1e9687664b74a29557af0484
-SHA512 (Housings_QFP.pretty-4.0.7.tar.gz) = dc107c11eea595b5291269ec922f06a2f14f5fae3b825e7e7e4e80b7f5717fe0d352d40cb5810b81f323bcfdfd8443236b9801c665b399d33a1cd4bcf133dd5c
-SHA512 (Housings_SIP.pretty-4.0.7.tar.gz) = e2e6cc55774870aadbd7982b66ac93a0c2961ae55e64b14b2368648e6520e518073550504ca7fa58113a047037ca3c4eb436af0e6cef2b4d9a67b172c733b12f
-SHA512 (Housings_SOIC.pretty-4.0.7.tar.gz) = 1a1597fa51004ad1ac8a26ffd9b4fa0eb8d79ec194eef156dc07bfc756415699638e35710ee51078f3160265c28f0810d42f7c652f39f14981e4c7c8ccb0d6a1
-SHA512 (Housings_SON.pretty-4.0.7.tar.gz) = ee89fbbd5250000fc5f6174bf8359a33d52f3f6c5dd6186cf69999c82bd4d54c4ff6539f8d4f9c22b9f2f492b9cd9826dd598901667974d9c20582ed608fd1bf
-SHA512 (Housings_SSOP.pretty-4.0.7.tar.gz) = 6c0c96da6f73ae1a1734cf4a95fc45196d02cd2e7b0d78d10e56a48e899faa4a3a2294059bec7152d27e2b3876e498f5e2b29e70c9208b9a86257caf41d0c770
-SHA512 (IR-DirectFETs.pretty-4.0.7.tar.gz) = dd69b861be89a3901c53d0d1c067fa6316db068663da36b84ded358bcdce3685e7282db0d875a5b64d16fec145b8bc96fc71d7750fc8d2abc3fd09c120e1e92b
-SHA512 (Inductors_SMD.pretty-4.0.7.tar.gz) = 48b77ab9409a3c9135e1bcfac7a182807b2167265e8450cdc5a521943158ea54490f17b46a178a8cfaabc999264b2634011fa9cbfb1f9bdc7a1e423d11ac087b
-SHA512 (Inductors_THT.pretty-4.0.7.tar.gz) = 9bc4fcff81891ca323e119bce7934bedf238d506d6c60fbf230a271576c5bcdfc8b0d98e190b9360b30b56411c12c929a12b22c436bc8e852314f1225b604030
-SHA512 (LEDs.pretty-4.0.7.tar.gz) = 103f394eb41dab298656476650a0db07c12ffc33346557a5d26cf88a1f6b49952bb9b69cc8569f3e6d7a0361a5fb66bcb44a60c98f263ebb5160949c70c027a8
-SHA512 (Measurement_Points.pretty-4.0.7.tar.gz) = 74357e4f0da2bcd890a719933de6c7ae314bc8c3aecaa621acb6cf3585715db85e073897a9c8c4b99f59da5a5c7c56135b752c62df48a00a2d269ddbecfddcb4
-SHA512 (Measurement_Scales.pretty-4.0.7.tar.gz) = 5586585720c105259673edfcf021f69e197b6470060603ff1746097e08c913d56b97a3f3fbc73833cf3b2bd64476bf6b17216d56995bbaf04baac538ce4c6751
-SHA512 (Microwave.pretty-4.0.7.tar.gz) = a2e98ffa47c60c123ebbae4efcad4bc90f8d7ba6687ae4970c29d283c7bc94c080915bb1bbbdc7966848e480b9430c448864275ae945ad29713d514b5c8b3f02
-SHA512 (Modules.pretty-4.0.7.tar.gz) = dcf8b716f8b7610aeab8e621943c94a7c8f148c5b1280f0740b50eba5fccfb60fb863d9a4d2629e1dccd505d306f2b6620b74384f4a18e6f0f4ab48a306c4b5d
-SHA512 (Mounting_Holes.pretty-4.0.7.tar.gz) = c15524311dc03180727c141acd4390ed5f57eea2d3e61ffa0fe01f45b8063c532881776665e140e046e0478a339feda17ffbd4ef73fa7c52f8f6d8538dd70772
-SHA512 (Opto-Devices.pretty-4.0.7.tar.gz) = 5b07bebfa93b121d628fd43841773b2ff399fad05c965f42c5af73b25107b0dbcbe0ede539c86b446493355b4045bb6951a7a33d6646d8c93444325958002622
-SHA512 (Oscillators.pretty-4.0.7.tar.gz) = 260b6d55d2e0d3f66b103997f8482e885a97e22fc9fe8e7e738ccfca2fb6395a1a7be4cd1ef5397680db30c9d962863600ece65ac19d7eb3d2d3a5cecfcfbe9d
-SHA512 (PFF_PSF_PSS_Leadforms.pretty-4.0.7.tar.gz) = 0aa45799fd329b65c589bc5d062a48a1b7ba76517275ed32a877b1dd65670b1c3c4a4fedeafba0b9032b7641e4d15c1124752adc8ea9c1d605bea8481418348d
-SHA512 (Pin_Headers.pretty-4.0.7.tar.gz) = fac3de6f20e4d2cfd7370f293a8f2888343b19019781cc06c02b7d7597607a80cce36005dcd5d43acdb30c57473eda3d91df63d266e0b1b9f93de4d853d0cbe7
-SHA512 (Potentiometers.pretty-4.0.7.tar.gz) = 6a10fddc5a7175809b7143281064255ce623d4f729bbd2f26ec9c14720261c014aa52484bcbcf3276b40a85b44dce1fd02b66bfdbd0e33f3f4f78706e7314f99
-SHA512 (Power_Integrations.pretty-4.0.7.tar.gz) = a89eae91c92c20537816f42616a59826e1a3c031786a013888003f7b0c7f92b64290e3d482af8e90eda93ad29521a310b2a1ccd1d3946b00320bae550ad55701
-SHA512 (RF_Antennas.pretty-4.0.7.tar.gz) = 772ae0d7acc4febaf5cadf4ae35221c899f01df1552f99223e43e6aac18e3b9c7d87338ca10f7c093da030b54c3647aac23b32b247ba39835ad7b095d9192b09
-SHA512 (RF_Modules.pretty-4.0.7.tar.gz) = 5a9cee69f28217d34eda62d410f5278e4ede2fef4f57312d9448c2b656231f97f8f0d714ff51d469c6a4e87af7dd1462d7d1ae8a23a45347f3ec1f8fe4ef8086
-SHA512 (Relays_SMD.pretty-4.0.7.tar.gz) = a7ffc677c5aaafcb245cc6feec83d8d00444bc20b1b2017e081343d738ce870b9ca9315556eaeb99ad822e00ff2bfaeddd4afa93dd78a6b946d8d7483cf8cf2f
-SHA512 (Relays_THT.pretty-4.0.7.tar.gz) = a2e40b9fcd3bd88ee1c844a694e820a28bf7da91d8a5760b3bf4d52e15ac100ede7aa149a950a727d299f3172e18685a0a80c5939aff03fd1aff9038dcdd80bf
-SHA512 (Resistors_SMD.pretty-4.0.7.tar.gz) = 559e7d31bf0eb5b28ecea5518be8bcb819a9a75864c45a2945f968f2df1aba72ca8381b2de57f69dc0fbd7038cc229792d2489477c7c0737d24fb6fcff261f25
-SHA512 (Resistors_THT.pretty-4.0.7.tar.gz) = 8de580e3bd8f22d6c40a493d8f2a4d1d74f9c6fe119c562fc24468dd3b76bb647e2873b39936bc1b276750a4c98bf2eb9f2d1559cead8d70831c2fc92f0c61f3
-SHA512 (Resistors_Universal.pretty-4.0.7.tar.gz) = 0b8d56903b56716d1c5edad17a474483c1d9fe1a0b47ea231f32d70822983e88fdbaa7ab553e764b91bd4e8fc079563ca7394c0ff57b4f534d3556a77ff52747
-SHA512 (SMD_Packages.pretty-4.0.7.tar.gz) = 433187d2b9c4a64875e30432d9029a64cf329686e7205d833d73d2f07663fbe6b1d344a89ff69e6071062d248efd079e64887294ae13159095bc17a5060eff84
-SHA512 (Shielding_Cabinets.pretty-4.0.7.tar.gz) = 0e3e20173c32d7f4043880199d052515c2de796827b1059d05c4931febae662b4c29e7fda8fc5ee32c43ee45b7b218015ebb9140744f38b0159ffd721440c58d
-SHA512 (Socket_Strips.pretty-4.0.7.tar.gz) = f39ed90977c8318d8043ad317dc1827fad0c3ac59b65ab392cd32b0cececbf31378a68e42a7da860e3f22af19384d7f18d2c1beaa7063458192b327a65843795
-SHA512 (Sockets.pretty-4.0.7.tar.gz) = f97cdcded13a564ce898e6ac8aad753cb8f22226941dc16d7fb888ddb83b8a9c3da70f752cce9ba4f653a60b92e883d7eae24e6b5612377b67bc2cfa1b4c89c3
-SHA512 (Symbols.pretty-4.0.7.tar.gz) = b37a6bee82655c245ef8e5ee8b25abc88347b5e501e47403097b9a2fc58de5e6367424988162afe08c868b5f4189ad87f77ef8e2ba67c3bc03d9a83bf8b79d8d
-SHA512 (TO_SOT_Packages_SMD.pretty-4.0.7.tar.gz) = adf385aa86feca51bade23e4f131537d3112ecbb10858bd63ed075c58ac52431d3becba1f1839a2edf356b9cc8b2592dc783431c5ac751a717f25c11d4fa7adb
-SHA512 (TO_SOT_Packages_THT.pretty-4.0.7.tar.gz) = 5db3054847b2293a58fec11045d8d746e72222a233a990442869e996b775f6045bbde25a3a05fc61e6e3b7cd23619f654f8be11431be6211918150f9ca26eb25
-SHA512 (TerminalBlocks_Phoenix.pretty-4.0.7.tar.gz) = 19c62851c896b7958cdd151abce0a2d9cea7294b81303ddb252cbc8e4dc185cbc0be50245508ae8bb6008065b564126375eee01b9cac044b75cf9185d7c961b9
-SHA512 (TerminalBlocks_WAGO.pretty-4.0.7.tar.gz) = d410697aabbd16a4a566647fdc3a5431fcccdb2d2ca319b17bc09b67cee642ef1743ba8a2137bb2083c4276b6c97e8dfabed8c6da232e5414db9b0d87733de8f
-SHA512 (Transformers_SMD.pretty-4.0.7.tar.gz) = 67d596b16e0d6d9c8a39bde46c9092cb6fb43ee435365e4f438eabf229cd055c8cc9b4af6e9934850b9d53a4f20f517ca1a0b5f8abc6b287415a363c3b065c6f
-SHA512 (Transformers_THT.pretty-4.0.7.tar.gz) = fcb4babdbd78535d5e2b5f56fa9159b1e6834f4bd9f4d76efb1c60139677bde9b6df361b4bd5a07a59b38822717e179aadcccf55f354991817e246f0e9e52926
-SHA512 (Transistors_OldSowjetAera.pretty-4.0.7.tar.gz) = 4461c39d73e320e9342be637a9e28bff93993f996325f5532980dd434424c177903d575e406f940366ae96564d44b61c3906faf98eb8bbf41e859f625ea2f7c5
-SHA512 (Valves.pretty-4.0.7.tar.gz) = 836c5320f9c74a4ed9c5b2b98b1a263c0fcb33c7624531d70a82902441263a1d6ca632b61573c181df527392205a5c67d6b172872f6e12f9b51c8c9e627c178c
-SHA512 (Varistors.pretty-4.0.7.tar.gz) = 72980b3685cd4fb2831bc2e125494a0cb87763f0de645b4112845a1338e18ed876de48b2a85cf928a017c6b00d38976ee4560e7a3b83b456c96f9bc159b438bf
-SHA512 (Wire_Connections_Bridges.pretty-4.0.7.tar.gz) = f608fa5e26f483edca32c72c430ffd82e2d6c41d78cfc03f73c5d05086d68425bc24987078058a77e78f93c8acd85160c14e496b991cbb2fbcaad97a02369286
-SHA512 (Wire_Pads.pretty-4.0.7.tar.gz) = ae05f3ee7c79a6ea28c584de971100acd7e2db998213ac1fc07a56c7ff2033add6a459e1cb3193d7146170cfdf092b453295c51dd0be536e57e4f70b02148b76
-SHA512 (kicad-4.0.7.tar.xz) = 7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b
-SHA512 (kicad-doc-4.0.7.tar.gz) = c1f58ca04dff2afb7c8c23a81a4b54f91e310342e741cc92fe6168417252b76ee009651a6845924302651d4183ca3e58620b0655aea1ee8afa40581f62e5272a
-SHA512 (kicad-i18n-4.0.7.tar.gz) = 4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a
-SHA512 (kicad-library-4.0.7.tar.gz) = 08c4aa8a00091aa3fa1a48ed277a7ab804807e4b0e14c1b99c0ed9cc2dd3263ec724656885f0087077a0261befd8ff6378c59dc57f162059feebd186cc333cce
+SHA512 (kicad-5.0.0-rc2.tar.xz) = 9880458288ad8ba618ad1f807b0f4040d367f2d549f6a70cfa2862171c9d8358e4d685bbdf81c7cc645626d930defa64b73b5d300da36a252e583d649cc24ad0
+SHA512 (kicad-doc-5.0.0-rc2.tar.gz) = d13552878c18819f9978899d5a8cd6973232a65aaccc0bcb12063d37b9226f0a2948a6e9c23627123edfde85a51ff6fe457cba86e13a41567a13ac26db4685e7
+SHA512 (kicad-i18n-5.0.0-rc2.tar.gz) = 3a5674832843537d7a88a92ca18400a8ddd03bfb33146e69bde80d955aaf4fc8ca211aba941948f68b8436803ff949dc65c7ef7121c8b1debc1edae132529bcf
commit 9729806ccb4a3e5780c1b90e66cab687d732ffb1
Author: Steven A. Falco <stevenfalco(a)gmail.com>
Date: Thu Jun 14 21:27:59 2018 -0400
Remove unneeded patches
The appstream and boost patches are obsolete. Necessary changes are
now upstream.
diff --git a/kicad-4.0.2-appstream.patch b/kicad-4.0.2-appstream.patch
deleted file mode 100644
index 6a2b863..0000000
--- a/kicad-4.0.2-appstream.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From fd329bac32dbf4038d458a8f019ebbb42e8faf48 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak(a)v3.sk>
-Date: Wed, 20 Apr 2016 16:54:08 +0200
-Subject: [PATCH] Add AppStream metadata
-
-This will ensure KiCad will be easily installable from the app stores such as
-GNOME Software.
-
-The screenshots probably need a better home. Not that it would matter
-too much -- the Linux distributions do cache them with their feeds, so
-the app store applications don't access them from this source directly.
-
-Screenshots from the web [1] can't be used since they are too large for use
-in the app store application. :(
-
-[1] http://kicad-pcb.org/discover/screenshots/
----
- CMakeLists.txt | 7 +++++
- resources/linux/appdata/kicad.appdata.xml | 49 +++++++++++++++++++++++++++++++
- 2 files changed, 56 insertions(+)
- create mode 100644 resources/linux/appdata/kicad.appdata.xml
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 456f5e3..6c5eaa1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -860,6 +860,7 @@ if( UNIX AND NOT APPLE )
- set( UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime )
- set( UNIX_ICON_FILES ${UNIX_MIME_DIR}/icons )
- set( UNIX_APPLICATIONS_FILES ${UNIX_MIME_DIR}/applications )
-+ set( UNIX_APPDATA_FILES resources/linux/appdata )
-
- # Install Mimelnk directory
- install( DIRECTORY ${UNIX_MIMELNK_FILES}
-@@ -884,6 +885,12 @@ if( UNIX AND NOT APPLE )
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share
- COMPONENT resources
- )
-+
-+ # Install AppStream directory (app store entry)
-+ install( DIRECTORY ${UNIX_APPDATA_FILES}
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share
-+ COMPONENT resources
-+ )
- endif()
-
- #include( CTest )
-diff --git a/resources/linux/appdata/kicad.appdata.xml b/resources/linux/appdata/kicad.appdata.xml
-new file mode 100644
-index 0000000..4452714
---- /dev/null
-+++ b/resources/linux/appdata/kicad.appdata.xml
-@@ -0,0 +1,49 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!-- Copyright Lubomir Rintel 2016 -->
-+<component type="desktop">
-+ <id>kicad.desktop</id>
-+ <name>KiCad</name>
-+ <project_license>GPL-2.0+</project_license>
-+ <metadata_license>CC0-1.0</metadata_license>
-+ <summary>EDA Suite</summary>
-+
-+ <keywords>
-+ <keyword>KiCad</keyword>
-+ <keyword>EDA</keyword>
-+ <keyword>PCB</keyword>
-+ <keyword>Schema</keyword>
-+ <keyword>PcbNew</keyword>
-+ <keyword>Eeschema</keyword>
-+ </keywords>
-+
-+ <description>
-+ <p>A Cross Platform and Open Source Electronics Design Automation Suite.</p>
-+ <p>The programs handle Schematic Capture, and PCB Layout with Gerber output.</p>
-+ </description>
-+
-+ <screenshots>
-+ <screenshot type="default">
-+ <image width="800" height="450">https://raw.githubusercontent.com/lkundrak/kicad-source-mirror/master/res...</image>
-+ </screenshot>
-+
-+ <screenshot type="default">
-+ <caption>Eeschema Schematic Editor</caption>
-+ <image width="800" height="450">https://raw.githubusercontent.com/lkundrak/kicad-source-mirror/master/res...</image>
-+ </screenshot>
-+
-+ <screenshot type="default">
-+ <caption>PcbNew PCB Layout</caption>
-+ <image width="800" height="450">https://raw.githubusercontent.com/lkundrak/kicad-source-mirror/master/res...</image>
-+ </screenshot>
-+
-+ <screenshot type="default">
-+ <caption>PcbNew 3D Viewer</caption>
-+ <image width="800" height="450">https://raw.githubusercontent.com/lkundrak/kicad-source-mirror/master/res...</image>
-+ </screenshot>
-+ </screenshots>
-+
-+ <url type="homepage">http://kicad-pcb.org/</url>
-+ <url type="bugtracker">http://kicad-pcb.org/help/report-a-bug/</url>
-+ <update_contact>kicad-developers(a)lists.launchpad.net</update_contact>
-+ <developer_name>The KiCad Developers</developer_name>
-+</component>
---
-2.5.5
-
diff --git a/kicad-4.0.5-boost.patch b/kicad-4.0.5-boost.patch
deleted file mode 100644
index 3abaa96..0000000
--- a/kicad-4.0.5-boost.patch
+++ /dev/null
@@ -1,897 +0,0 @@
-From 9a7bd89fd15be9af3b676cd1d7a28338e6c8cd15 Mon Sep 17 00:00:00 2001
-From: Michael Steinberg <michsteinb(a)gmail.com>
-Date: Tue, 5 Jul 2016 00:14:32 +0200
-Subject: [PATCH 1/3] boost::context fixes to make it compatible with boost
- 1.61
-
-(cherry picked from commit 06d4894fdbeb00727cdcc667b8899ad73d8eb1c2)
----
- common/tool/tool_manager.cpp | 6 +-
- include/tool/coroutine.h | 162 ++++++++++++++++++++++++++--------------
- include/tool/tool_base.h | 7 +-
- include/tool/tool_interactive.h | 3 +-
- 4 files changed, 116 insertions(+), 62 deletions(-)
-
-diff --git a/common/tool/tool_manager.cpp b/common/tool/tool_manager.cpp
-index 447ab99..a198c69 100644
---- a/common/tool/tool_manager.cpp
-+++ b/common/tool/tool_manager.cpp
-@@ -528,7 +528,7 @@ void TOOL_MANAGER::dispatchInternal( const TOOL_EVENT& aEvent )
- }
- }
-
-- BOOST_FOREACH( TOOL_STATE* st, m_toolState | boost::adaptors::map_values )
-+ for( TOOL_STATE* st : ( m_toolState | boost::adaptors::map_values ) )
- {
- // no state handler in progress - check if there are any transitions (defined by
- // Go() method that match the event.
-@@ -542,11 +542,11 @@ void TOOL_MANAGER::dispatchInternal( const TOOL_EVENT& aEvent )
- if( st->cofunc )
- st->Push();
-
-+ st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second );
-+
- // as the state changes, the transition table has to be set up again
- st->transitions.clear();
-
-- st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second );
--
- // got match? Run the handler.
- st->cofunc->Call( aEvent );
-
-diff --git a/include/tool/coroutine.h b/include/tool/coroutine.h
-index c7eaf5f..e21e18f 100644
---- a/include/tool/coroutine.h
-+++ b/include/tool/coroutine.h
-@@ -3,6 +3,7 @@
- *
- * Copyright (C) 2013 CERN
- * @author Tomasz Wlostowski <tomasz.wlostowski(a)cern.ch>
-+ * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
-@@ -27,10 +28,14 @@
-
- #include <cstdlib>
-
--#include <boost/context/fcontext.hpp>
- #include <boost/version.hpp>
-+#include <type_traits>
-
--#include "delegate.h"
-+#if BOOST_VERSION <= 106000
-+#include <boost/context/fcontext.hpp>
-+#else
-+#include <boost/context/execution_context.hpp>
-+#endif
-
- /**
- * Class COROUNTINE.
-@@ -53,13 +58,12 @@
- * See coroutine_example.cpp for sample code.
- */
-
--template <class ReturnType, class ArgType>
-+template <typename ReturnType, typename ArgType>
- class COROUTINE
- {
- public:
- COROUTINE() :
-- m_saved( NULL ), m_self( NULL ), m_stack( NULL ), m_stackSize( c_defaultStackSize ),
-- m_running( false )
-+ COROUTINE( nullptr )
- {
- }
-
-@@ -69,8 +73,7 @@ public:
- */
- template <class T>
- COROUTINE( T* object, ReturnType(T::* ptr)( ArgType ) ) :
-- m_func( object, ptr ), m_self( NULL ), m_saved( NULL ), m_stack( NULL ),
-- m_stackSize( c_defaultStackSize ), m_running( false )
-+ COROUTINE( std::bind( ptr, object, std::placeholders::_1 ) )
- {
- }
-
-@@ -78,9 +81,15 @@ public:
- * Constructor
- * Creates a coroutine from a delegate object
- */
-- COROUTINE( DELEGATE<ReturnType, ArgType> aEntry ) :
-- m_func( aEntry ), m_saved( NULL ), m_self( NULL ), m_stack( NULL ),
-- m_stackSize( c_defaultStackSize ), m_running( false )
-+ COROUTINE( std::function<ReturnType(ArgType)> aEntry ) :
-+ m_func( std::move( aEntry ) ),
-+ m_running( false ),
-+#if BOOST_VERSION <= 106000
-+ m_stack( nullptr ),
-+ m_stackSize( c_defaultStackSize ),
-+#endif
-+ m_caller( nullptr ),
-+ m_callee( nullptr )
- {
- // Avoid not initialized members, and make static analysers quiet
- m_args = 0;
-@@ -89,18 +98,26 @@ public:
-
- ~COROUTINE()
- {
-- if( m_saved )
-- delete m_saved;
--
- #if BOOST_VERSION >= 105600
-- if( m_self )
-- delete m_self;
-+ delete m_callee;
- #endif
-
-+#if BOOST_VERSION <= 106000
-+ delete m_caller;
-+
- if( m_stack )
- free( m_stack );
-+#endif
- }
-
-+private:
-+#if BOOST_VERSION <= 106000
-+ using context_type = boost::context::fcontext_t;
-+#else
-+ using context_type = boost::context::execution_context<COROUTINE*>;
-+#endif
-+
-+public:
- /**
- * Function Yield()
- *
-@@ -110,7 +127,12 @@ public:
- */
- void Yield()
- {
-- jump( m_self, m_saved, 0 );
-+#if BOOST_VERSION <= 106000
-+ jump( m_callee, m_caller, false );
-+#else
-+ auto result = (*m_caller)( this );
-+ *m_caller = std::move( std::get<0>( result ) );
-+#endif
- }
-
- /**
-@@ -122,7 +144,11 @@ public:
- void Yield( ReturnType& aRetVal )
- {
- m_retVal = aRetVal;
-- jump( m_self, m_saved, 0 );
-+#if BOOST_VERSION <= 106000
-+ jump( m_callee, m_caller, false );
-+#else
-+ m_caller( this );
-+#endif
- }
-
- /**
-@@ -130,9 +156,9 @@ public:
- *
- * Defines the entry point for the coroutine, if not set in the constructor.
- */
-- void SetEntry( DELEGATE<ReturnType, ArgType> aEntry )
-+ void SetEntry( std::function<ReturnType(ArgType)> aEntry )
- {
-- m_func = aEntry;
-+ m_func = std::move( aEntry );
- }
-
- /* Function Call()
-@@ -143,6 +169,10 @@ public:
- */
- bool Call( ArgType aArgs )
- {
-+ assert( m_callee == NULL );
-+ assert( m_caller == NULL );
-+
-+#if BOOST_VERSION <= 106000
- // fixme: Clean up stack stuff. Add a guard
- m_stack = malloc( c_defaultStackSize );
-
-@@ -151,22 +181,32 @@ public:
-
- // correct the stack size
- m_stackSize -= ( (size_t) m_stack + m_stackSize - (size_t) sp );
--
-- assert( m_self == NULL );
-- assert( m_saved == NULL );
-+#endif
-
- m_args = &aArgs;
--#if BOOST_VERSION >= 105600
-- m_self = new boost::context::fcontext_t();
-- *m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
-+
-+#if BOOST_VERSION < 105600
-+ m_callee = boost::context::make_fcontext( sp, m_stackSize, callerStub );
-+#elif BOOST_VERSION <= 106000
-+ m_callee = new context_type( boost::context::make_fcontext( sp, m_stackSize, callerStub ) );
- #else
-- m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
-+ m_callee = new context_type( std::allocator_arg_t(),
-+ boost::context::fixedsize_stack( c_defaultStackSize ), &COROUTINE::callerStub );
-+#endif
-+
-+#if BOOST_VERSION <= 106000
-+ m_caller = new context_type();
- #endif
-- m_saved = new boost::context::fcontext_t();
-
- m_running = true;
-+
- // off we go!
-- jump( m_saved, m_self, reinterpret_cast<intptr_t>( this ) );
-+#if BOOST_VERSION <= 106000
-+ jump( m_caller, m_callee, reinterpret_cast<intptr_t>( this ) );
-+#else
-+ auto result = (*m_callee)( this );
-+ *m_callee = std::move( std::get<0>( result ) );
-+#endif
- return m_running;
- }
-
-@@ -179,7 +219,12 @@ public:
- */
- bool Resume()
- {
-- jump( m_saved, m_self, 0 );
-+#if BOOST_VERSION <= 106000
-+ jump( m_caller, m_callee, false );
-+#else
-+ auto result = (*m_callee)( this );
-+ *m_callee = std::move( std::get<0>( result ) );
-+#endif
-
- return m_running;
- }
-@@ -208,61 +253,66 @@ private:
- static const int c_defaultStackSize = 2000000; // fixme: make configurable
-
- /* real entry point of the coroutine */
-+#if BOOST_VERSION <= 106000
- static void callerStub( intptr_t aData )
-+#else
-+ static context_type callerStub( context_type caller, COROUTINE* cor )
-+#endif
- {
- // get pointer to self
-+#if BOOST_VERSION <= 106000
- COROUTINE<ReturnType, ArgType>* cor = reinterpret_cast<COROUTINE<ReturnType, ArgType>*>( aData );
-+#else
-+ cor->m_caller = &caller;
-+#endif
-
- // call the coroutine method
-- cor->m_retVal = cor->m_func( *cor->m_args );
-+ cor->m_retVal = cor->m_func( *( cor->m_args ) );
- cor->m_running = false;
-
- // go back to wherever we came from.
-- jump( cor->m_self, cor->m_saved, 0 ); // reinterpret_cast<intptr_t>( this ));
-+#if BOOST_VERSION <= 106000
-+ jump( cor->m_callee, cor->m_caller, 0 );
-+#else
-+ return caller;
-+#endif
- }
-
- ///> Wrapper for jump_fcontext to assure compatibility between different boost versions
-- static inline intptr_t jump(boost::context::fcontext_t* aOld, boost::context::fcontext_t* aNew,
-+#if BOOST_VERSION <= 106000
-+ static inline intptr_t jump( context_type* aOld, context_type* aNew,
- intptr_t aP, bool aPreserveFPU = true )
- {
--#if BOOST_VERSION >= 105600
-- return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
--#else
-+#if BOOST_VERSION < 105600
- return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU );
-+#else
-+ return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
- #endif
- }
-+#endif
-
-- template <typename T>
-- struct strip_ref
-- {
-- typedef T result;
-- };
-+ std::function<ReturnType(ArgType)> m_func;
-
-- template <typename T>
-- struct strip_ref<T&>
-- {
-- typedef T result;
-- };
-+ bool m_running;
-
-- DELEGATE<ReturnType, ArgType> m_func;
-+#if BOOST_VERSION <= 106000
-+ ///< coroutine stack
-+ void* m_stack;
-+
-+ size_t m_stackSize;
-+#endif
-
- ///< pointer to coroutine entry arguments. Stripped of references
- ///< to avoid compiler errors.
-- typename strip_ref<ArgType>::result* m_args;
-+ typename std::remove_reference<ArgType>::type* m_args;
-+
- ReturnType m_retVal;
-
- ///< saved caller context
-- boost::context::fcontext_t* m_saved;
-+ context_type* m_caller;
-
- ///< saved coroutine context
-- boost::context::fcontext_t* m_self;
--
-- ///< coroutine stack
-- void* m_stack;
--
-- size_t m_stackSize;
--
-- bool m_running;
-+ context_type* m_callee;
- };
-
- #endif
-diff --git a/include/tool/tool_base.h b/include/tool/tool_base.h
-index 584a979..3bef987 100644
---- a/include/tool/tool_base.h
-+++ b/include/tool/tool_base.h
-@@ -3,6 +3,7 @@
- *
- * Copyright (C) 2013 CERN
- * @author Tomasz Wlostowski <tomasz.wlostowski(a)cern.ch>
-+ * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
-@@ -31,7 +32,7 @@
- #include <tool/tool_event.h>
- #include <tool/tool_settings.h>
-
--#include <tool/delegate.h>
-+#include <functional>
-
- class EDA_ITEM;
- class TOOL_MANAGER;
-@@ -53,7 +54,9 @@ enum TOOL_TYPE
-
- /// Unique identifier for tools
- typedef int TOOL_ID;
--typedef DELEGATE<int, const TOOL_EVENT&> TOOL_STATE_FUNC;
-+
-+using TOOL_STATE_FUNC = std::function<int(const TOOL_EVENT&)>;
-+
-
- /**
- * Class TOOL_BASE
-diff --git a/include/tool/tool_interactive.h b/include/tool/tool_interactive.h
-index 17d2de7..240eb58 100644
---- a/include/tool/tool_interactive.h
-+++ b/include/tool/tool_interactive.h
-@@ -3,6 +3,7 @@
- *
- * Copyright (C) 2013 CERN
- * @author Tomasz Wlostowski <tomasz.wlostowski(a)cern.ch>
-+ * Copyright (C) 2016 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
-@@ -113,7 +114,7 @@ template <class T>
- void TOOL_INTERACTIVE::Go( int (T::* aStateFunc)( const TOOL_EVENT& ),
- const TOOL_EVENT_LIST& aConditions )
- {
-- TOOL_STATE_FUNC sptr( static_cast<T*>( this ), aStateFunc );
-+ TOOL_STATE_FUNC sptr = std::bind( aStateFunc, static_cast<T*>( this ), std::placeholders::_1 );
-
- goInternal( sptr, aConditions );
- }
---
-2.9.3
-
-From 157c499b031659b895c1a7fef056d02a94bce0b3 Mon Sep 17 00:00:00 2001
-From: decimad <michsteinb(a)gmail.com>
-Date: Tue, 5 Jul 2016 18:02:50 +0200
-Subject: [PATCH 2/3] use a guarded stack for coroutines in boost version 1.61
-
-(cherry picked from commit 78bc3c65de6c03d19be9902327d08cd4d87c229c)
----
- include/tool/coroutine.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/include/tool/coroutine.h b/include/tool/coroutine.h
-index e21e18f..8e472ca 100644
---- a/include/tool/coroutine.h
-+++ b/include/tool/coroutine.h
-@@ -35,6 +35,7 @@
- #include <boost/context/fcontext.hpp>
- #else
- #include <boost/context/execution_context.hpp>
-+#include <boost/context/protected_fixedsize_stack.hpp>
- #endif
-
- /**
-@@ -191,7 +192,7 @@ public:
- m_callee = new context_type( boost::context::make_fcontext( sp, m_stackSize, callerStub ) );
- #else
- m_callee = new context_type( std::allocator_arg_t(),
-- boost::context::fixedsize_stack( c_defaultStackSize ), &COROUTINE::callerStub );
-+ boost::context::protected_fixedsize_stack( c_defaultStackSize ), &COROUTINE::callerStub );
- #endif
-
- #if BOOST_VERSION <= 106000
---
-2.9.3
-
-From 418c62f03d9bd81881a17c9cca9c30f839d23e3a Mon Sep 17 00:00:00 2001
-From: decimad <michsteinb(a)gmail.com>
-Date: Tue, 2 Aug 2016 11:39:39 +0200
-Subject: [PATCH 3/3] Refactor coroutine to improve readability and removed
- unnecessary heap allocations. Added documentation/links to various boost doc
- revisions.
-
-(cherry picked from commit 18b7dbf4d166fcb7da10ced72268a77f02448188)
----
- include/tool/coroutine.h | 221 +++++++++++++++++++++++++----------------------
- include/tool/delegate.h | 100 ---------------------
- 2 files changed, 120 insertions(+), 201 deletions(-)
- delete mode 100644 include/tool/delegate.h
-
-diff --git a/include/tool/coroutine.h b/include/tool/coroutine.h
-index 8e472ca..70ef6cb 100644
---- a/include/tool/coroutine.h
-+++ b/include/tool/coroutine.h
-@@ -31,7 +31,7 @@
- #include <boost/version.hpp>
- #include <type_traits>
-
--#if BOOST_VERSION <= 106000
-+#if BOOST_VERSION < 106100
- #include <boost/context/fcontext.hpp>
- #else
- #include <boost/context/execution_context.hpp>
-@@ -39,6 +39,44 @@
- #endif
-
- /**
-+ * Note: in the history of boost, two changes to the context interface happened.
-+ * [1.54, 1.56)
-+ * http://www.boost.org/doc/libs/1_55_0/libs/context/doc/html/context/contex...
-+ * intptr_t jump_fcontext(
-+ * fcontext_t* ofc,
-+ * fcontext_t const* nfc,
-+ * intptr_t vp,
-+ * bool preserve_fpu = true
-+ * );
-+ *
-+ * fcontext_t* make_fcontext(
-+ * void* sp,
-+ * std::size_t size,
-+ * void (*fn)(intptr_t)
-+ * );
-+ *
-+ * [1.56, 1.61)
-+ * http://www.boost.org/doc/libs/1_56_0/libs/context/doc/html/context/contex...
-+ * intptr_t jump_fcontext(
-+ * fcontext_t* ofc,
-+ * fcontext_t nfc, <-----
-+ * intptr_t vp,
-+ * bool preserve_fpu = true
-+ * );
-+ *
-+ * fcontext_t make_fcontext( <-----
-+ * void* sp,
-+ * std::size_t size,
-+ * void(*fn)(intptr_t)
-+ * );
-+ *
-+ * [1.61, oo)
-+ * http://www.boost.org/doc/libs/1_61_0/libs/context/doc/html/context/ecv2.html
-+ * fcontext_t is hidden away behind the boost::execution_context(_v2) and the stack is created on behalf of
-+ * the user.
-+ */
-+
-+/**
- * Class COROUNTINE.
- * Implements a coroutine. Wikipedia has a good explanation:
- *
-@@ -73,7 +111,7 @@ public:
- * Creates a coroutine from a member method of an object
- */
- template <class T>
-- COROUTINE( T* object, ReturnType(T::* ptr)( ArgType ) ) :
-+ COROUTINE( T* object, ReturnType(T::*ptr)( ArgType ) ) :
- COROUTINE( std::bind( ptr, object, std::placeholders::_1 ) )
- {
- }
-@@ -85,34 +123,20 @@ public:
- COROUTINE( std::function<ReturnType(ArgType)> aEntry ) :
- m_func( std::move( aEntry ) ),
- m_running( false ),
--#if BOOST_VERSION <= 106000
-- m_stack( nullptr ),
-- m_stackSize( c_defaultStackSize ),
-+ m_args( 0 ),
-+#if BOOST_VERSION < 106100 // -> m_callee = void* or void**
-+ m_callee( nullptr ),
- #endif
-- m_caller( nullptr ),
-- m_callee( nullptr )
-+ m_retVal( 0 )
- {
-- // Avoid not initialized members, and make static analysers quiet
-- m_args = 0;
-- m_retVal = 0;
- }
-
- ~COROUTINE()
- {
--#if BOOST_VERSION >= 105600
-- delete m_callee;
--#endif
--
--#if BOOST_VERSION <= 106000
-- delete m_caller;
--
-- if( m_stack )
-- free( m_stack );
--#endif
- }
-
- private:
--#if BOOST_VERSION <= 106000
-+#if BOOST_VERSION < 106100
- using context_type = boost::context::fcontext_t;
- #else
- using context_type = boost::context::execution_context<COROUTINE*>;
-@@ -128,12 +152,7 @@ public:
- */
- void Yield()
- {
--#if BOOST_VERSION <= 106000
-- jump( m_callee, m_caller, false );
--#else
-- auto result = (*m_caller)( this );
-- *m_caller = std::move( std::get<0>( result ) );
--#endif
-+ jumpOut();
- }
-
- /**
-@@ -145,11 +164,20 @@ public:
- void Yield( ReturnType& aRetVal )
- {
- m_retVal = aRetVal;
--#if BOOST_VERSION <= 106000
-- jump( m_callee, m_caller, false );
--#else
-- m_caller( this );
--#endif
-+ jumpOut();
-+ }
-+
-+ /**
-+ * Function Resume()
-+ *
-+ * Resumes execution of a previously yielded coroutine.
-+ * @return true, if the coroutine has yielded again and false if it has finished its
-+ * execution (returned).
-+ */
-+ bool Resume()
-+ {
-+ jumpIn();
-+ return m_running;
- }
-
- /**
-@@ -170,62 +198,37 @@ public:
- */
- bool Call( ArgType aArgs )
- {
-- assert( m_callee == NULL );
-- assert( m_caller == NULL );
-+ assert( m_func );
-+ assert( !m_callee );
-+
-+ m_args = &aArgs;
-+
-+#if BOOST_VERSION < 106100
-+ assert( m_stack == nullptr );
-
--#if BOOST_VERSION <= 106000
- // fixme: Clean up stack stuff. Add a guard
-- m_stack = malloc( c_defaultStackSize );
-+ size_t stackSize = c_defaultStackSize;
-+ m_stack.reset( new char[stackSize] );
-
- // align to 16 bytes
-- void* sp = (void*) ( ( ( (ptrdiff_t) m_stack ) + m_stackSize - 0xf ) & ( ~0x0f ) );
-+ void* sp = (void*) ( ( ( (ptrdiff_t) m_stack.get() ) + stackSize - 0xf ) & ( ~0x0f ) );
-
- // correct the stack size
-- m_stackSize -= ( (size_t) m_stack + m_stackSize - (size_t) sp );
--#endif
--
-- m_args = &aArgs;
-+ stackSize -= size_t( ( (ptrdiff_t) m_stack.get() + stackSize) - (ptrdiff_t) sp );
-
--#if BOOST_VERSION < 105600
-- m_callee = boost::context::make_fcontext( sp, m_stackSize, callerStub );
--#elif BOOST_VERSION <= 106000
-- m_callee = new context_type( boost::context::make_fcontext( sp, m_stackSize, callerStub ) );
-+ m_callee = boost::context::make_fcontext( sp, stackSize, callerStub );
- #else
-- m_callee = new context_type( std::allocator_arg_t(),
-- boost::context::protected_fixedsize_stack( c_defaultStackSize ), &COROUTINE::callerStub );
--#endif
--
--#if BOOST_VERSION <= 106000
-- m_caller = new context_type();
-+ m_callee = context_type(
-+ std::allocator_arg_t(),
-+ boost::context::protected_fixedsize_stack( c_defaultStackSize ),
-+ &COROUTINE::callerStub
-+ );
- #endif
-
- m_running = true;
-
- // off we go!
--#if BOOST_VERSION <= 106000
-- jump( m_caller, m_callee, reinterpret_cast<intptr_t>( this ) );
--#else
-- auto result = (*m_callee)( this );
-- *m_callee = std::move( std::get<0>( result ) );
--#endif
-- return m_running;
-- }
--
-- /**
-- * Function Resume()
-- *
-- * Resumes execution of a previously yielded coroutine.
-- * @return true, if the coroutine has yielded again and false if it has finished its
-- * execution (returned).
-- */
-- bool Resume()
-- {
--#if BOOST_VERSION <= 106000
-- jump( m_caller, m_callee, false );
--#else
-- auto result = (*m_callee)( this );
-- *m_callee = std::move( std::get<0>( result ) );
--#endif
-+ jumpIn();
-
- return m_running;
- }
-@@ -254,66 +257,82 @@ private:
- static const int c_defaultStackSize = 2000000; // fixme: make configurable
-
- /* real entry point of the coroutine */
--#if BOOST_VERSION <= 106000
-+#if BOOST_VERSION < 106100
- static void callerStub( intptr_t aData )
--#else
-- static context_type callerStub( context_type caller, COROUTINE* cor )
--#endif
- {
- // get pointer to self
--#if BOOST_VERSION <= 106000
-- COROUTINE<ReturnType, ArgType>* cor = reinterpret_cast<COROUTINE<ReturnType, ArgType>*>( aData );
-+ COROUTINE* cor = reinterpret_cast<COROUTINE*>( aData );
-+
-+ // call the coroutine method
-+ cor->m_retVal = cor->m_func( *(cor->m_args) );
-+ cor->m_running = false;
-+
-+ // go back to wherever we came from.
-+ cor->jumpOut();
-+ }
- #else
-- cor->m_caller = &caller;
--#endif
-+ /* real entry point of the coroutine */
-+ static context_type callerStub( context_type caller, COROUTINE* cor )
-+ {
-+ cor->m_caller = std::move( caller );
-
- // call the coroutine method
-- cor->m_retVal = cor->m_func( *( cor->m_args ) );
-+ cor->m_retVal = cor->m_func( *(cor->m_args) );
- cor->m_running = false;
-
- // go back to wherever we came from.
--#if BOOST_VERSION <= 106000
-- jump( cor->m_callee, cor->m_caller, 0 );
-+ return std::move( cor->m_caller );
-+ }
-+#endif
-+
-+ void jumpIn()
-+ {
-+#if BOOST_VERSION < 105600
-+ boost::context::jump_fcontext( &m_caller, m_callee, reinterpret_cast<intptr_t>(this) );
-+#elif BOOST_VERSION < 106100
-+ boost::context::jump_fcontext( &m_caller, m_callee, reinterpret_cast<intptr_t>(this) );
- #else
-- return caller;
-+ auto result = m_callee( this );
-+ m_callee = std::move( std::get<0>( result ) );
- #endif
- }
-
-- ///> Wrapper for jump_fcontext to assure compatibility between different boost versions
--#if BOOST_VERSION <= 106000
-- static inline intptr_t jump( context_type* aOld, context_type* aNew,
-- intptr_t aP, bool aPreserveFPU = true )
-+ void jumpOut()
- {
- #if BOOST_VERSION < 105600
-- return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU );
-+ boost::context::jump_fcontext( m_callee, &m_caller, 0 );
-+#elif BOOST_VERSION < 106100
-+ boost::context::jump_fcontext( &m_callee, m_caller, 0 );
- #else
-- return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
-+ auto result = m_caller( nullptr );
-+ m_caller = std::move( std::get<0>( result ) );
- #endif
- }
--#endif
-
- std::function<ReturnType(ArgType)> m_func;
-
- bool m_running;
-
--#if BOOST_VERSION <= 106000
-+#if BOOST_VERSION < 106100
- ///< coroutine stack
-- void* m_stack;
--
-- size_t m_stackSize;
-+ std::unique_ptr<char[]> m_stack;
- #endif
-
- ///< pointer to coroutine entry arguments. Stripped of references
- ///< to avoid compiler errors.
- typename std::remove_reference<ArgType>::type* m_args;
-
-- ReturnType m_retVal;
--
- ///< saved caller context
-- context_type* m_caller;
-+ context_type m_caller;
-
- ///< saved coroutine context
-+#if BOOST_VERSION < 105600
- context_type* m_callee;
-+#else
-+ context_type m_callee;
-+#endif
-+
-+ ReturnType m_retVal;
- };
-
- #endif
-diff --git a/include/tool/delegate.h b/include/tool/delegate.h
-deleted file mode 100644
-index a350dec..0000000
---- a/include/tool/delegate.h
-+++ /dev/null
-@@ -1,100 +0,0 @@
--/*
-- * This program source code file is part of KiCad, a free EDA CAD application.
-- *
-- * Copyright (C) 2013 CERN
-- * @author Tomasz Wlostowski <tomasz.wlostowski(a)cern.ch>
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, you may find one here:
-- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-- * or you may search the http://www.gnu.org website for the version 2 license,
-- * or you may write to the Free Software Foundation, Inc.,
-- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-- */
--
--#ifndef __DELEGATE_H
--#define __DELEGATE_H
--
--
--/**
-- * class DELEGATE
-- * A trivial delegate (pointer to member method of an object) pattern implementation.
-- * Check delegate_example.cpp for a coding sample.
-- */
--
--template <class ReturnType, class Arg>
--class DELEGATE
--{
--public:
-- typedef ReturnType (DELEGATE<ReturnType, Arg>::* MemberPointer)( Arg );
-- typedef ReturnType _ReturnType;
-- typedef Arg _ArgType;
--
-- DELEGATE()
-- {
-- }
--
-- template <class T>
-- DELEGATE( T* aObject, ReturnType(T::* aPtr)( Arg ) )
-- {
-- m_ptr = reinterpret_cast<MemberPointer>( aPtr );
-- m_object = reinterpret_cast<void*>( aObject );
-- };
--
--
-- ReturnType operator()( Arg aA ) const
-- {
-- DELEGATE<ReturnType, Arg>* casted = reinterpret_cast<DELEGATE<ReturnType, Arg>*>( m_object );
-- return (casted->*m_ptr)( aA );
-- }
--
--private:
-- MemberPointer m_ptr;
-- void* m_object;
--};
--
--/**
-- * Class DELEGATE0
-- * Same as DELEGATE, but with no arguments.
-- */
--template <class ReturnType>
--class DELEGATE0
--{
--public:
-- typedef ReturnType ( DELEGATE0<ReturnType>::* MemberPointer )();
-- typedef ReturnType _ReturnType;
--
-- DELEGATE0()
-- {
-- }
--
-- template <class T>
-- DELEGATE0( T* aObject, ReturnType(T::* aPtr)() )
-- {
-- m_ptr = reinterpret_cast<MemberPointer>( aPtr );
-- m_object = reinterpret_cast<void*>( aObject );
-- };
--
--
-- ReturnType operator()() const
-- {
-- DELEGATE0<ReturnType>* casted = reinterpret_cast<DELEGATE0<ReturnType>*>( m_object );
-- return ( casted->*m_ptr )();
-- }
--
--private:
-- MemberPointer m_ptr;
-- void* m_object;
--};
--
--#endif
---
-2.9.3
-
diff --git a/kicad.spec b/kicad.spec
index 907fd3d..bcb2fe6 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -14,9 +14,6 @@ Source3: https://github.com/KiCad/kicad-i18n/archive/%{version}.tar.gz#/k
Patch1: kicad-4.0.0-nostrip.patch
Patch2: kicad-4.0.0-freerouting.patch
-# https://code.launchpad.net/~lkundrak/kicad/appstream-data/+merge/293391
-Patch3: kicad-4.0.2-appstream.patch
-Patch4: kicad-4.0.5-boost.patch
# boost-context is only available on the following architectures:
ExclusiveArch: %{ix86} x86_64 %{arm} ppc64 ppc64le aarch64
@@ -86,8 +83,6 @@ Documentation for KiCad.
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
sed -i "s|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|" CMakeLists.txt
commit e289e2e8ccb6be4ace38005a7e11282e5c71a704
Author: Steven A. Falco <stevenfalco(a)gmail.com>
Date: Thu Jun 14 21:27:03 2018 -0400
Remove old symbols and templates
Symbols are now stored in a new github repo.
Templates are now stored in a new github repo.
diff --git a/kicad.spec b/kicad.spec
index 18142b9..907fd3d 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -10,7 +10,6 @@ URL: http://www.kicad-pcb.org
Source: https://launchpad.net/kicad/4.0/%{version}/+download/kicad-%{version}.tar.xz
Source1: https://github.com/KiCad/kicad-doc/archive/%{version}.tar.gz#/kicad-doc-%...
-Source2: https://github.com/KiCad/kicad-library/archive/%{version}.tar.gz#/kicad-l...
Source3: https://github.com/KiCad/kicad-i18n/archive/%{version}.tar.gz#/kicad-i18n...
Patch1: kicad-4.0.0-nostrip.patch
@@ -83,7 +82,7 @@ Documentation for KiCad.
%prep
-%setup -q -a 1 -a 2 -a 3
+%setup -q -a 1 -a 3
%patch1 -p1
%patch2 -p1
@@ -95,12 +94,6 @@ sed -i "s|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|"
%build
-# Symbols libraries
-pushd %{name}-library-%{version}/
-%cmake
-make -j1 VERBOSE=1
-popd
-
# Documentation
pushd %{name}-doc-%{version}/
%cmake -DBUILD_FORMATS=html
@@ -138,11 +131,6 @@ for desktopfile in %{buildroot}%{_datadir}/applications/*.desktop ; do
${desktopfile}
done
-# Symbols libraries
-pushd %{name}-library-%{version}/
-make INSTALL="install -p" DESTDIR=%{buildroot} install
-popd
-
# install template
install -d %{buildroot}%{_datadir}/%{name}/template
install -m 644 template/%{name}.pro %{buildroot}%{_datadir}/%{name}/template
commit 4a181eea9e1b56d9c2b4e62d17a59cfea398904b
Author: Steven A. Falco <stevenfalco(a)gmail.com>
Date: Thu Jun 14 21:26:16 2018 -0400
Remove old footprints
Footprints are now contained in a single github repo. Remove the old repos.
Also, we no longer need to test that all footprints are present.
diff --git a/kicad.spec b/kicad.spec
index 1a0ef98..18142b9 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -13,95 +13,6 @@ Source1: https://github.com/KiCad/kicad-doc/archive/%{version}.tar.gz#/ki
Source2: https://github.com/KiCad/kicad-library/archive/%{version}.tar.gz#/kicad-l...
Source3: https://github.com/KiCad/kicad-i18n/archive/%{version}.tar.gz#/kicad-i18n...
-# perl -ne 'BEGIN {$s=4} /uri \$\{KIGITHUB}\/([^)]*)/ and printf "%-16shttps://github.com/KiCad/$1/archive/%{version}.tar.gz#/$1-%{version}.tar.gz\n", "Source".$s++.":"' \
-# kicad-*/kicad-library-*/template/fp-lib-table.for-github
-Source4: https://github.com/KiCad/Battery_Holders.pretty/archive/%{version}.tar.gz...
-Source5: https://github.com/KiCad/Buttons_Switches_SMD.pretty/archive/%{version}.t...
-Source6: https://github.com/KiCad/Buttons_Switches_THT.pretty/archive/%{version}.t...
-Source7: https://github.com/KiCad/Buzzers_Beepers.pretty/archive/%{version}.tar.gz...
-Source8: https://github.com/KiCad/Capacitors_SMD.pretty/archive/%{version}.tar.gz#...
-Source9: https://github.com/KiCad/Capacitors_Tantalum_SMD.pretty/archive/%{version...
-Source10: https://github.com/KiCad/Capacitors_THT.pretty/archive/%{version}.tar.gz#...
-Source11: https://github.com/KiCad/Connectors_Card.pretty/archive/%{version}.tar.gz...
-Source12: https://github.com/KiCad/Connectors_Harwin.pretty/archive/%{version}.tar....
-Source13: https://github.com/KiCad/Connectors_HDMI.pretty/archive/%{version}.tar.gz...
-Source14: https://github.com/KiCad/Connectors_Hirose.pretty/archive/%{version}.tar....
-Source15: https://github.com/KiCad/Connectors_IEC_DIN.pretty/archive/%{version}.tar...
-Source16: https://github.com/KiCad/Connectors_JAE.pretty/archive/%{version}.tar.gz#...
-Source17: https://github.com/KiCad/Connectors_JST.pretty/archive/%{version}.tar.gz#...
-Source18: https://github.com/KiCad/Connectors_Mini-Universal.pretty/archive/%{versi...
-Source19: https://github.com/KiCad/Connectors_Molex.pretty/archive/%{version}.tar.g...
-Source20: https://github.com/KiCad/Connectors_Multicomp.pretty/archive/%{version}.t...
-Source21: https://github.com/KiCad/Connectors_Phoenix.pretty/archive/%{version}.tar...
-Source22: https://github.com/KiCad/Connectors_Samtec.pretty/archive/%{version}.tar....
-Source23: https://github.com/KiCad/Connectors_TE-Connectivity.pretty/archive/%{vers...
-Source24: https://github.com/KiCad/Connectors_Terminal_Blocks.pretty/archive/%{vers...
-Source25: https://github.com/KiCad/Connectors_WAGO.pretty/archive/%{version}.tar.gz...
-Source26: https://github.com/KiCad/Connectors_USB.pretty/archive/%{version}.tar.gz#...
-Source27: https://github.com/KiCad/Connectors.pretty/archive/%{version}.tar.gz#/Con...
-Source28: https://github.com/KiCad/Converters_DCDC_ACDC.pretty/archive/%{version}.t...
-Source29: https://github.com/KiCad/Crystals.pretty/archive/%{version}.tar.gz#/Cryst...
-Source30: https://github.com/KiCad/Diodes_SMD.pretty/archive/%{version}.tar.gz#/Dio...
-Source31: https://github.com/KiCad/Diodes_THT.pretty/archive/%{version}.tar.gz#/Dio...
-Source32: https://github.com/KiCad/Displays_7-Segment.pretty/archive/%{version}.tar...
-Source33: https://github.com/KiCad/Displays.pretty/archive/%{version}.tar.gz#/Displ...
-Source34: https://github.com/KiCad/Enclosures.pretty/archive/%{version}.tar.gz#/Enc...
-Source35: https://github.com/KiCad/EuroBoard_Outline.pretty/archive/%{version}.tar....
-Source36: https://github.com/KiCad/Fiducials.pretty/archive/%{version}.tar.gz#/Fidu...
-Source37: https://github.com/KiCad/Fuse_Holders_and_Fuses.pretty/archive/%{version}...
-Source38: https://github.com/KiCad/Hall-Effect_Transducers_LEM.pretty/archive/%{ver...
-Source39: https://github.com/KiCad/Heatsinks.pretty/archive/%{version}.tar.gz#/Heat...
-Source40: https://github.com/KiCad/Housings_BGA.pretty/archive/%{version}.tar.gz#/H...
-Source41: https://github.com/KiCad/Housings_CSP.pretty/archive/%{version}.tar.gz#/H...
-Source42: https://github.com/KiCad/Housings_DFN_QFN.pretty/archive/%{version}.tar.g...
-Source43: https://github.com/KiCad/Housings_DIP.pretty/archive/%{version}.tar.gz#/H...
-Source44: https://github.com/KiCad/Housings_LCC.pretty/archive/%{version}.tar.gz#/H...
-Source45: https://github.com/KiCad/Housings_LGA.pretty/archive/%{version}.tar.gz#/H...
-Source46: https://github.com/KiCad/Housings_PGA.pretty/archive/%{version}.tar.gz#/H...
-Source47: https://github.com/KiCad/Housings_QFP.pretty/archive/%{version}.tar.gz#/H...
-Source48: https://github.com/KiCad/Housings_SIP.pretty/archive/%{version}.tar.gz#/H...
-Source49: https://github.com/KiCad/Housings_SOIC.pretty/archive/%{version}.tar.gz#/...
-Source50: https://github.com/KiCad/Housings_SON.pretty/archive/%{version}.tar.gz#/H...
-Source51: https://github.com/KiCad/Housings_SSOP.pretty/archive/%{version}.tar.gz#/...
-Source52: https://github.com/KiCad/Inductors_SMD.pretty/archive/%{version}.tar.gz#/...
-Source53: https://github.com/KiCad/Inductors_THT.pretty/archive/%{version}.tar.gz#/...
-Source54: https://github.com/KiCad/IR-DirectFETs.pretty/archive/%{version}.tar.gz#/...
-Source55: https://github.com/KiCad/LEDs.pretty/archive/%{version}.tar.gz#/LEDs.pret...
-Source56: https://github.com/KiCad/Measurement_Points.pretty/archive/%{version}.tar...
-Source57: https://github.com/KiCad/Measurement_Scales.pretty/archive/%{version}.tar...
-Source58: https://github.com/KiCad/Microwave.pretty/archive/%{version}.tar.gz#/Micr...
-Source59: https://github.com/KiCad/Modules.pretty/archive/%{version}.tar.gz#/Module...
-Source60: https://github.com/KiCad/Mounting_Holes.pretty/archive/%{version}.tar.gz#...
-Source61: https://github.com/KiCad/Opto-Devices.pretty/archive/%{version}.tar.gz#/O...
-Source62: https://github.com/KiCad/Oscillators.pretty/archive/%{version}.tar.gz#/Os...
-Source63: https://github.com/KiCad/PFF_PSF_PSS_Leadforms.pretty/archive/%{version}....
-Source64: https://github.com/KiCad/Pin_Headers.pretty/archive/%{version}.tar.gz#/Pi...
-Source65: https://github.com/KiCad/Potentiometers.pretty/archive/%{version}.tar.gz#...
-Source66: https://github.com/KiCad/Power_Integrations.pretty/archive/%{version}.tar...
-Source67: https://github.com/KiCad/Relays_SMD.pretty/archive/%{version}.tar.gz#/Rel...
-Source68: https://github.com/KiCad/Relays_THT.pretty/archive/%{version}.tar.gz#/Rel...
-Source69: https://github.com/KiCad/Resistors_SMD.pretty/archive/%{version}.tar.gz#/...
-Source70: https://github.com/KiCad/Resistors_THT.pretty/archive/%{version}.tar.gz#/...
-Source71: https://github.com/KiCad/Resistors_Universal.pretty/archive/%{version}.ta...
-Source72: https://github.com/KiCad/RF_Antennas.pretty/archive/%{version}.tar.gz#/RF...
-Source73: https://github.com/KiCad/RF_Modules.pretty/archive/%{version}.tar.gz#/RF_...
-Source74: https://github.com/KiCad/Shielding_Cabinets.pretty/archive/%{version}.tar...
-Source75: https://github.com/KiCad/SMD_Packages.pretty/archive/%{version}.tar.gz#/S...
-Source76: https://github.com/KiCad/Socket_Strips.pretty/archive/%{version}.tar.gz#/...
-Source77: https://github.com/KiCad/Sockets.pretty/archive/%{version}.tar.gz#/Socket...
-Source78: https://github.com/KiCad/Symbols.pretty/archive/%{version}.tar.gz#/Symbol...
-Source79: https://github.com/KiCad/TerminalBlocks_Phoenix.pretty/archive/%{version}...
-Source80: https://github.com/KiCad/TerminalBlocks_WAGO.pretty/archive/%{version}.ta...
-Source81: https://github.com/KiCad/TO_SOT_Packages_SMD.pretty/archive/%{version}.ta...
-Source82: https://github.com/KiCad/TO_SOT_Packages_THT.pretty/archive/%{version}.ta...
-Source83: https://github.com/KiCad/Transformers_SMD.pretty/archive/%{version}.tar.g...
-Source84: https://github.com/KiCad/Transformers_THT.pretty/archive/%{version}.tar.g...
-Source85: https://github.com/KiCad/Transistors_OldSowjetAera.pretty/archive/%{versi...
-Source86: https://github.com/KiCad/Valves.pretty/archive/%{version}.tar.gz#/Valves....
-Source87: https://github.com/KiCad/Varistors.pretty/archive/%{version}.tar.gz#/Vari...
-Source88: https://github.com/KiCad/Wire_Connections_Bridges.pretty/archive/%{versio...
-Source89: https://github.com/KiCad/Wire_Pads.pretty/archive/%{version}.tar.gz#/Wire...
-
Patch1: kicad-4.0.0-nostrip.patch
Patch2: kicad-4.0.0-freerouting.patch
# https://code.launchpad.net/~lkundrak/kicad/appstream-data/+merge/293391
@@ -236,16 +147,6 @@ popd
install -d %{buildroot}%{_datadir}/%{name}/template
install -m 644 template/%{name}.pro %{buildroot}%{_datadir}/%{name}/template
-# Footprints
-mkdir -p %{buildroot}%{_datadir}/%{name}/modules
-for S in %{sources}; do
- P=$(basename $S |sed -n 's/\.pretty-.*/.pretty/p')
- [ "$P" ] || continue
- mkdir -p %{buildroot}%{_datadir}/%{name}/modules/$P
- tar xzf $S --strip-components=1 -C %{buildroot}%{_datadir}/%{name}/modules/$P
-done
-ln -f %{buildroot}%{_datadir}/%{name}/template/fp-lib-table{.for-pretty,}
-
# Documentation
pushd %{name}-doc-%{version}/
make INSTALL="install -p" DESTDIR=%{buildroot} install
@@ -266,11 +167,6 @@ done
%check
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
-# Ensure all known footprint libraries are present
-for P in $(sed -n 's|.*uri \${KISYSMOD}/\([^)]*\).*|\1|p' %{buildroot}%{_datadir}/%{name}/template/fp-lib-table); do
- [ -d %{buildroot}%{_datadir}/%{name}/modules/$P ] || exit 1
-done
-
%post
touch --no-create %{_datadir}/icons/hicolor || :
5 years, 10 months