Architecture specific change in rpms/golang-github-robertkrimen-otto.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-robertkrimen-otto.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-robertkrimen-otto.g....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit e7bbdc280e9fd0cbe6c16cdefb86ccbb986d0a29
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 23:37:30 2018 +0100
Fix BuildRequires
diff --git a/golang-github-robertkrimen-otto.spec b/golang-github-robertkrimen-otto.spec
index 70bef6f..b7b978a 100644
--- a/golang-github-robertkrimen-otto.spec
+++ b/golang-github-robertkrimen-otto.spec
@@ -16,16 +16,14 @@ A JavaScript interpreter in Golang.}
Name: %{goname}
Version: 0
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
Summary: A JavaScript interpreter in Golang
License: MIT
URL: %{gourl}
Source: %{gosource}
-%if %{with check}
BuildRequires: golang(gopkg.in/readline.v1)
BuildRequires: golang(gopkg.in/sourcemap.v1)
-%endif
%description
%{common_description}
@@ -62,6 +60,9 @@ the %{goipath} Go namespace.
%changelog
+* Wed Mar 14 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.4.20180314git6c383dd
+- Fix BuildRequires
+
* Fri Mar 09 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.3.20180314git6c383dd
- Update with the new Go packaging
- Upstream GIT revision 6c383dd
commit f11446df4b5ec203b0d1abdafa47ae875bf59838
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 18:04:16 2018 +0100
Fix Release tag
diff --git a/golang-github-robertkrimen-otto.spec b/golang-github-robertkrimen-otto.spec
index 2dae412..70bef6f 100644
--- a/golang-github-robertkrimen-otto.spec
+++ b/golang-github-robertkrimen-otto.spec
@@ -16,7 +16,7 @@ A JavaScript interpreter in Golang.}
Name: %{goname}
Version: 0
-Release: 0.1%{?dist}
+Release: 0.3%{?dist}
Summary: A JavaScript interpreter in Golang
License: MIT
URL: %{gourl}
@@ -62,7 +62,7 @@ the %{goipath} Go namespace.
%changelog
-* Fri Mar 09 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20180314git6c383dd
+* Fri Mar 09 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.3.20180314git6c383dd
- Update with the new Go packaging
- Upstream GIT revision 6c383dd
commit 295fc78bb18422177d685893487aee5259c176e0
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 17:35:04 2018 +0100
Update with the new Go packaging
Upstream GIT revision 6c383dd
diff --git a/.gitignore b/.gitignore
index 54afeb0..abcc61b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/otto-3b44b4d.tar.gz
+/otto-6c383dd335ef8dcccef05e651ce1eccfe4d0f011.tar.gz
diff --git a/golang-github-robertkrimen-otto.spec b/golang-github-robertkrimen-otto.spec
index 4a5b883..2dae412 100644
--- a/golang-github-robertkrimen-otto.spec
+++ b/golang-github-robertkrimen-otto.spec
@@ -1,197 +1,71 @@
-# 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
-# Tests fail on arches != x86_64
-%global with_check 0
-# Generate unit-test rpm
-%global with_unit_test 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
+# Run tests in check section
+# Tests fail on non x86_64
+%ifnarch x86_64
+%bcond_with check
%else
-%global debug_package %{nil}
+%bcond_without check
%endif
+%global goipath github.com/robertkrimen/otto
+%global commit 6c383dd335ef8dcccef05e651ce1eccfe4d0f011
-%global provider github
-%global provider_tld com
-%global project robertkrimen
-%global repo otto
-# https://github.com/robertkrimen/otto
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 3b44b4dcb6c00477273595c312908e2412d07da6
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20171130
+%global common_description %{expand:
+A JavaScript interpreter in Golang.}
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
-Summary: A JavaScript interpreter in Golang
-License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+%gometa
-# 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}
+Name: %{goname}
+Version: 0
+Release: 0.1%{?dist}
+Summary: A JavaScript interpreter in Golang
+License: MIT
+URL: %{gourl}
+Source: %{gosource}
-
-
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
+%if %{with check}
BuildRequires: golang(gopkg.in/readline.v1)
BuildRequires: golang(gopkg.in/sourcemap.v1)
%endif
-Requires: golang(gopkg.in/readline.v1)
-Requires: golang(gopkg.in/sourcemap.v1)
+%description
+%{common_description}
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/ast) = %{version}-%{release}
-Provides: golang(%{import_path}/dbg) = %{version}-%{release}
-Provides: golang(%{import_path}/file) = %{version}-%{release}
-Provides: golang(%{import_path}/parser) = %{version}-%{release}
-Provides: golang(%{import_path}/registry) = %{version}-%{release}
-Provides: golang(%{import_path}/repl) = %{version}-%{release}
-Provides: golang(%{import_path}/terst) = %{version}-%{release}
-Provides: golang(%{import_path}/token) = %{version}-%{release}
-Provides: golang(%{import_path}/underscore) = %{version}-%{release}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
+%{common_description}
+
+This package contains the source code needed for building packages that import
+the %{goipath} Go namespace.
-%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
%prep
-%autosetup -n %{repo}-%{commit}
+%gosetup -q
-%build
-%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
+%install
+%goinstall
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%if %{with check}
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%gotest %{import_path}/ast
-%gotest %{import_path}/parser
+%gochecks
%endif
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
+%doc README.markdown
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%endif
%changelog
+* Fri Mar 09 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20180314git6c383dd
+- Update with the new Go packaging
+- Upstream GIT revision 6c383dd
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20171130git3b44b4d
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 6decfe3..65e99c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (otto-3b44b4d.tar.gz) = ae6391646725c27ca28ea3944b119f55f6d8182ec7adb7d534eb47eaecdd7981ead83414c70d600da3cd487e342868887d3412a0f7e3a6be26268d64e194ce88
+SHA512 (otto-6c383dd335ef8dcccef05e651ce1eccfe4d0f011.tar.gz) = 94283e7f8ff014ac1ee7390ce84d7f358a9d4a1f945fa1dfccd8630728e18b8275f23de0fdf88929dad6ac97494b65204e781c79055af3fcd69d34459cfe7414
commit 1ecbfbc34d87794c87f741770f592b33015a6c27
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 14:50:08 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-robertkrimen-otto.spec b/golang-github-robertkrimen-otto.spec
index 9dffe0d..4a5b883 100644
--- a/golang-github-robertkrimen-otto.spec
+++ b/golang-github-robertkrimen-otto.spec
@@ -43,7 +43,7 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.1.%{commitdate}git%{shortcommit}%{?dist}
+Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
Summary: A JavaScript interpreter in Golang
License: MIT
URL: https://%{provider_prefix}
@@ -192,6 +192,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20171130git3b44b4d
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Thu Dec 07 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20171130git3b44b4d
- Upstream GIT revision 3b44b4d
5 years
Architecture specific change in rpms/golang-github-rfjakob-eme.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-rfjakob-eme.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-rfjakob-eme.git/com....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 8d33dd34a431cac3fdd9f16d940c9b4a824d4848
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 17:05:54 2018 +0100
Update with the new Go packaging
diff --git a/golang-github-rfjakob-eme.spec b/golang-github-rfjakob-eme.spec
index 7faac60..dc8a991 100644
--- a/golang-github-rfjakob-eme.spec
+++ b/golang-github-rfjakob-eme.spec
@@ -1,185 +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 rfjakob
-%global repo eme
-# https://github.com/rfjakob/eme
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%bcond_without check
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 1.1
-Release: 2%{?dist}
-Summary: Encrypt-Mix-Encrypt for Go
-# Detected licences
-# - MIT/X11 (BSD like) at 'LICENSE'
-License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/v%{version}.tar.gz#/%{repo}-%{version}.tar.gz
+%global goipath github.com/rfjakob/eme
+Version: 1.1
-# 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}
+%global common_description %{expand:
+Encrypt-Mix-Encrypt for Go.}
+%gometa
+Name: %{goname}
+Release: 3%{?dist}
+Summary: Encrypt-Mix-Encrypt for Go
+License: MIT
+URL: %{gourl}
+Source: %{gosource}
%description
-EME (ECB-Mix-ECB or Encrypt-Mix-Encrypt) is a wide-block
-encryption mode developed by Halevi and Rogaway in 2003.
+%{common_description}
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
-
-
-Provides: golang(%{import_path}) = %{version}-%{release}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
%description devel
-EME (ECB-Mix-ECB Encrypt-Mix-Encrypt) is a wide-block
-encryption mode developed by Halevi and Rogaway in 2003.
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
+%{common_description}
+
+This package contains the source code needed for building packages that import
+the %{goipath} Go namespace.
-%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
%prep
-%setup -q -n %{repo}-%{version}
+%gosetup -q
-%build
-%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
+%install
+%goinstall
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%if %{with check}
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
+%gochecks
%endif
-%gotest %{import_path}
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-%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
+* Fri Mar 09 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.1-3
+- Update with the new Go packaging
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit 2bdce33fe65921e7660b0d6acccf114ffcc84b62
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 14:50:00 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-rfjakob-eme.spec b/golang-github-rfjakob-eme.spec
index 121a6f4..7faac60 100644
--- a/golang-github-rfjakob-eme.spec
+++ b/golang-github-rfjakob-eme.spec
@@ -40,7 +40,7 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Encrypt-Mix-Encrypt for Go
# Detected licences
# - MIT/X11 (BSD like) at 'LICENSE'
@@ -180,6 +180,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Mon Jul 24 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.1-1
- First package for Fedora
5 years
Architecture specific change in rpms/golang-github-nwidger-jsoncolor.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-nwidger-jsoncolor.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-nwidger-jsoncolor.g....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit a7fe5dc0b05a54c984350f2da07f71068431c8e8
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 23:27:02 2018 +0100
Fix BuildRequires
diff --git a/golang-github-nwidger-jsoncolor.spec b/golang-github-nwidger-jsoncolor.spec
index bf9001c..ccb6104 100644
--- a/golang-github-nwidger-jsoncolor.spec
+++ b/golang-github-nwidger-jsoncolor.spec
@@ -11,15 +11,13 @@ Colorized JSON output for Go.}
Name: %{goname}
Version: 0
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
Summary: Colorized JSON output for Go
License: MIT
URL: %{gourl}
Source: %{gosource}
-%if %{with check}
BuildRequires: golang(github.com/fatih/color)
-%endif
%description
%{common_description}
@@ -56,6 +54,9 @@ the %{goipath} Go namespace.
%changelog
+* Wed Mar 14 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.4.20180314git75a6de4
+- Fix BuildRequires
+
* Fri Mar 09 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.3.20180314git75a6de4
- Update with the new Go packaging
commit fc54b2a3e6d23d6819488abf0b954211696a1dc2
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 16:38:32 2018 +0100
Update with the new Go packaging
diff --git a/.gitignore b/.gitignore
index 2461334..a017480 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/jsoncolor-75a6de4.tar.gz
+/jsoncolor-75a6de4340e59be95f0884b9cebdda246e0fdf40.tar.gz
diff --git a/golang-github-nwidger-jsoncolor.spec b/golang-github-nwidger-jsoncolor.spec
index 9027623..bf9001c 100644
--- a/golang-github-nwidger-jsoncolor.spec
+++ b/golang-github-nwidger-jsoncolor.spec
@@ -1,185 +1,64 @@
-# 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 0
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
+%bcond_without check
-%global provider github
-%global provider_tld com
-%global project nwidger
-%global repo jsoncolor
-# https://github.com/nwidger/jsoncolor
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global goipath github.com/nwidger/jsoncolor
%global commit 75a6de4340e59be95f0884b9cebdda246e0fdf40
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20170215
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
-Summary: Colorized JSON output for Go
-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}
+%global common_description %{expand:
+Colorized JSON output for Go.}
+%gometa
+Name: %{goname}
+Version: 0
+Release: 0.3%{?dist}
+Summary: Colorized JSON output for Go
+License: MIT
+URL: %{gourl}
+Source: %{gosource}
-%description
-%{summary}.
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
+%if %{with check}
BuildRequires: golang(github.com/fatih/color)
%endif
-Requires: golang(github.com/fatih/color)
+%description
+%{common_description}
-Provides: golang(%{import_path}) = %{version}-%{release}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
%description devel
-%{summary}.
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
+%{common_description}
+
+This package contains the source code needed for building packages that import
+the %{goipath} Go namespace.
-%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
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup -q
-%build
-%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
+%install
+%goinstall
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%if %{with check}
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
+%gochecks
%endif
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc 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
+* Fri Mar 09 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.3.20180314git75a6de4
+- Update with the new Go packaging
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20170215git75a6de4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 99e58ef..00f1b32 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jsoncolor-75a6de4.tar.gz) = 567171a3b256fc929d89de0e82c84d25edf2d231c3d895d50ac1c8617e6bc679f0bfa7c7183fc081a6e36a393bca7c94b0544854a323055d0283a170df41e94c
+SHA512 (jsoncolor-75a6de4340e59be95f0884b9cebdda246e0fdf40.tar.gz) = 567171a3b256fc929d89de0e82c84d25edf2d231c3d895d50ac1c8617e6bc679f0bfa7c7183fc081a6e36a393bca7c94b0544854a323055d0283a170df41e94c
commit 90d1c5f9e9f5bd60201254a2df4cf990d296fdbf
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 14:43:45 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-nwidger-jsoncolor.spec b/golang-github-nwidger-jsoncolor.spec
index cc9339d..9027623 100644
--- a/golang-github-nwidger-jsoncolor.spec
+++ b/golang-github-nwidger-jsoncolor.spec
@@ -43,7 +43,7 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.1.%{commitdate}git%{shortcommit}%{?dist}
+Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
Summary: Colorized JSON output for Go
License: MIT
URL: https://%{provider_prefix}
@@ -180,6 +180,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20170215git75a6de4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Sat Nov 25 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20170215git75a6de4
- First package for Fedora
5 years
Architecture specific change in rpms/golang-github-kylelemons-godebug.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-kylelemons-godebug.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-kylelemons-godebug.....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit e6cbf4d844cfd2ac0277f8bfd62c73ddaf321e1b
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 15:47:20 2018 +0100
Update with the new Go packaging
diff --git a/.gitignore b/.gitignore
index 3cb8b5b..7677d6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/godebug-d65d576.tar.gz
+/godebug-d65d576e9348f5982d7f6d83682b694e731a45c6.tar.gz
diff --git a/golang-github-kylelemons-godebug.spec b/golang-github-kylelemons-godebug.spec
index 67028f4..5d1118a 100644
--- a/golang-github-kylelemons-godebug.spec
+++ b/golang-github-kylelemons-godebug.spec
@@ -1,186 +1,60 @@
-# 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
-
+%bcond_without check
-%global provider github
-%global provider_tld com
-%global project kylelemons
-%global repo godebug
-# https://github.com/kylelemons/godebug
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global goipath github.com/kylelemons/godebug
%global commit d65d576e9348f5982d7f6d83682b694e731a45c6
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20170820
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
-Summary: Debugging helper utilities for Go
-License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+%global common_description %{expand:
+Debugging helper utilities for Go.}
+%gometa
+Name: %{goname}
+Version: 0
+Release: 0.3%{?dist}
+Summary: Debugging helper utilities for Go
+License: ASL 2.0
+URL: %{gourl}
+Source: %{gosource}
%description
-%{summary}
+%{common_description}
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
-
-
-Provides: golang(%{import_path}/diff) = %{version}-%{release}
-Provides: golang(%{import_path}/pretty) = %{version}-%{release}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
+%{common_description}
+
+This package contains the source code needed for building packages that import
+the %{goipath} Go namespace.
-%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
%prep
-%autosetup -n %{repo}-%{commit}
+%gosetup -q
-%build
-%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
+%install
+%goinstall
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%if %{with check}
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
+%gochecks
%endif
-%gotest %{import_path}/diff
-%gotest %{import_path}/pretty
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-%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
+* Thu Mar 08 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.3.20180314gitd65d576
+- Update with the new Go packaging
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20170820gitd65d576
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index e3bb100..603aba6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (godebug-d65d576.tar.gz) = c978c368731a22a8ddf8384ba8fada56ef058bf2bfdeac6743edb1624dfd7b6e73f25772c55ee469c504ab37aad92bf4c9f8d1085bd518d1b62aabea5a1c05cf
+SHA512 (godebug-d65d576e9348f5982d7f6d83682b694e731a45c6.tar.gz) = c978c368731a22a8ddf8384ba8fada56ef058bf2bfdeac6743edb1624dfd7b6e73f25772c55ee469c504ab37aad92bf4c9f8d1085bd518d1b62aabea5a1c05cf
commit 817072ee21c0dbe39a35023281bae44d334999b2
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 14:35:52 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-kylelemons-godebug.spec b/golang-github-kylelemons-godebug.spec
index cec05a2..67028f4 100644
--- a/golang-github-kylelemons-godebug.spec
+++ b/golang-github-kylelemons-godebug.spec
@@ -43,7 +43,7 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.1.%{commitdate}git%{shortcommit}%{?dist}
+Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
Summary: Debugging helper utilities for Go
License: ASL 2.0
URL: https://%{provider_prefix}
@@ -181,6 +181,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20170820gitd65d576
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Fri Sep 29 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20170820gitd65d576
- First package for Fedora
5 years
Architecture specific change in rpms/golang-github-jlaffaye-ftp.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-jlaffaye-ftp.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-jlaffaye-ftp.git/co....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 12d269d4999867893f3642b0073f184a7c9f36eb
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 15:21:15 2018 +0100
Update with the new Go packaging
Upstream GIT revision 4274679
diff --git a/.gitignore b/.gitignore
index df38170..154f316 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/ftp-769512c.tar.gz
/ftp-299b7ff.tar.gz
+/ftp-427467931c6fbc25acba4537c9d3cbc40cfa569b.tar.gz
diff --git a/golang-github-jlaffaye-ftp.spec b/golang-github-jlaffaye-ftp.spec
index f9b6634..38ed524 100644
--- a/golang-github-jlaffaye-ftp.spec
+++ b/golang-github-jlaffaye-ftp.spec
@@ -1,194 +1,71 @@
-# 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
# disabled: it needs a ftp server running for the tests
-%global with_check 0
-# Generate unit-test rpm
-%global with_unit_test 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-
-%global provider github
-%global provider_tld com
-%global project jlaffaye
-%global repo ftp
-# https://github.com/jlaffaye/ftp
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 299b7ff5b6096588cceca2edc1fc9f557002fb85
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20170927
+%bcond_with check
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
-Summary: A FTP client package for Go
-# Detected licences
-# - ISC at 'LICENSE'
-License: ISC
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+%global goipath github.com/jlaffaye/ftp
+%global commit 427467931c6fbc25acba4537c9d3cbc40cfa569b
-# 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}
+%global common_description %{expand:
+A FTP client package for Go.}
+%gometa
+Name: %{goname}
+Version: 0
+Release: 0.3%{?dist}
+Summary: A FTP client package for Go
+License: ISC
+URL: %{gourl}
+Source: %{gosource}
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
+%if %{with check}
+BuildRequires: golang(github.com/stretchr/testify/assert)
%endif
+%description
+%{common_description}
-Provides: golang(%{import_path}) = %{version}-%{release}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
%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
+%{common_description}
+
+This package contains the source code needed for building packages that import
+the %{goipath} Go namespace.
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(github.com/stretchr/testify/assert)
-%endif
-
-Requires: golang(github.com/stretchr/testify/assert)
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup -q
+
-%build
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
+%goinstall
-# 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
+%if %{with check}
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
+%gochecks
%endif
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-%gotest %{import_path}
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-%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
+* Thu Mar 08 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.3.20180314git4274679
+- Update with the new Go packaging
+- Upstream GIT revision 4274679
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20170927git299b7ff
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Dec 07 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20170927git299b7ff
-- Upstream GIT revision 299b7ff
+- Upstream GIT revision 299b7ff
* Mon Jul 24 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20170721git769512c
- First package for Fedora
diff --git a/sources b/sources
index 1b91d41..d6fd455 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ftp-299b7ff.tar.gz) = 0c073754e67c249a9059d8d2987a8ae5e7eb8729945fa97b19033981d4120075b196eede5babf719798f888718212fb383918758476a9f7576de004d92174668
+SHA512 (ftp-427467931c6fbc25acba4537c9d3cbc40cfa569b.tar.gz) = 86cbf8f3b0a5d93b3dd7a3772c4bb69770a0d16f9e59c9a1139a01faa44a30a19034c7100a18f58280021b160d9da56e9b232262e959bf213dcb8e4d2ec2f1f4
commit 67fdcf278bc6054a27bdf600049202488a0a1e91
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 14:32:19 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-jlaffaye-ftp.spec b/golang-github-jlaffaye-ftp.spec
index 01c8782..f9b6634 100644
--- a/golang-github-jlaffaye-ftp.spec
+++ b/golang-github-jlaffaye-ftp.spec
@@ -44,7 +44,7 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.1.%{commitdate}git%{shortcommit}%{?dist}
+Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
Summary: A FTP client package for Go
# Detected licences
# - ISC at 'LICENSE'
@@ -184,6 +184,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20170927git299b7ff
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Thu Dec 07 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20170927git299b7ff
- Upstream GIT revision 299b7ff
5 years
Architecture specific change in rpms/golang-github-chzyer-test.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-chzyer-test.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-chzyer-test.git/com....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 8791dbe7edc142abc09375f3c958c361d5819a39
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 23:20:44 2018 +0100
Fix BuildRequires
diff --git a/golang-github-chzyer-test.spec b/golang-github-chzyer-test.spec
index 70f5336..351cac1 100644
--- a/golang-github-chzyer-test.spec
+++ b/golang-github-chzyer-test.spec
@@ -11,15 +11,13 @@ Golang test utility.}
Name: %{goname}
Version: 0
-Release: 0.4%{?dist}
+Release: 0.5%{?dist}
Summary: Golang test utility
License: MIT
URL: %{gourl}
Source: %{gosource}
-%if %{with check}
BuildRequires: golang(github.com/chzyer/logex)
-%endif
%description
%{common_description}
@@ -56,6 +54,9 @@ the %{goipath} Go namespace.
%changelog
+* Wed Mar 14 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.5.20180314gita1ea475
+- Fix BuildRequires
+
* Thu Mar 08 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.4.20180314gita1ea475
- Update with the new Go packaging
commit 065dfb25c63685c09ce40977953058d3ae02f745
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 01:47:00 2018 +0100
Update with the new Go packaging
diff --git a/.gitignore b/.gitignore
index ae64840..d0f5dce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/test-bea8f08.tar.gz
+/test-a1ea475d72b168a29f44221e0ad031a842642302.tar.gz
diff --git a/0001-Fix-erroneous-number-of-arguments-in-Errorf.patch b/0001-Fix-erroneous-number-of-arguments-in-Errorf.patch
deleted file mode 100644
index a98b8f7..0000000
--- a/0001-Fix-erroneous-number-of-arguments-in-Errorf.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 14dddcea5c6ef2b327e25728130efa493404c086 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com>
-Date: Tue, 13 Feb 2018 00:58:34 +0100
-Subject: [PATCH] Fix erroneous number of arguments in Errorf
-
----
- test.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test.go b/test.go
-index a53b054..aef573a 100644
---- a/test.go
-+++ b/test.go
-@@ -107,10 +107,10 @@ func ReadAndCheck(r io.Reader, b []byte) {
- func Read(r io.Reader, b []byte) {
- n, err := r.Read(b)
- if err != nil && !logex.Equal(err, io.EOF) {
-- Panic(0, fmt.Errorf("Read: %v, got: %v", err))
-+ Panic(0, fmt.Errorf("Read error: %v", err))
- }
- if n != len(b) {
-- Panic(0, fmt.Errorf("Read: %v, got: %v", n))
-+ Panic(0, fmt.Errorf("Read: %v, want: %v", n, len(b)))
- }
- }
-
---
-2.14.3
-
diff --git a/golang-github-chzyer-test.spec b/golang-github-chzyer-test.spec
index 9525688..70f5336 100644
--- a/golang-github-chzyer-test.spec
+++ b/golang-github-chzyer-test.spec
@@ -1,190 +1,64 @@
-# 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 chzyer
-%global repo test
-# https://github.com/chzyer/test
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit bea8f082b6fd8382588bf6fdc6af9217078af151
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20160617
+%bcond_without check
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.3.%{commitdate}git%{shortcommit}%{?dist}
-Summary: Golang test utility
-License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+%global goipath github.com/chzyer/test
+%global commit a1ea475d72b168a29f44221e0ad031a842642302
-# https://github.com/chzyer/test/issues/1
-Patch0: 0001-Fix-erroneous-number-of-arguments-in-Errorf.patch
+%global common_description %{expand:
+Golang test utility.}
-# 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}
+%gometa
+Name: %{goname}
+Version: 0
+Release: 0.4%{?dist}
+Summary: Golang test utility
+License: MIT
+URL: %{gourl}
+Source: %{gosource}
-
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
+%if %{with check}
BuildRequires: golang(github.com/chzyer/logex)
%endif
-Requires: golang(github.com/chzyer/logex)
+%description
+%{common_description}
-Provides: golang(%{import_path}) = %{version}-%{release}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
%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}
+%{common_description}
+
+This package contains the source code needed for building packages that import
+the %{goipath} Go namespace.
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
%prep
-%setup -q -n %{repo}-%{commit}
-%patch0 -p1
+%gosetup -q
+
-%build
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
+%goinstall
-# 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
+%if %{with check}
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
+%gochecks
%endif
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-%gotest %{import_path}
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-%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
+* Thu Mar 08 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.4.20180314gita1ea475
+- Update with the new Go packaging
+
* Tue Feb 13 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.3.20160617gitbea8f08
- Added patch fixing erroneous number of arguments in Errorf function
diff --git a/sources b/sources
index d3ea09d..c71a68f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (test-bea8f08.tar.gz) = 85542dbb3c24aea339e753565ddc793a80ad7cfe18d73e78b5a49ca00c46274e19a57ac44e1be6e126c92919e7cf660c05a948c368de1d12a1414ba37e4ff16c
+SHA512 (test-a1ea475d72b168a29f44221e0ad031a842642302.tar.gz) = e4d7ee906d543e3ce790e0530c6efc3a89aa814ca33f65564f1d0da4b757fda9cd8fefc5a50fcb78cb977c718c3ea0153066ed5aa6b5d5402e067e01a4c70c93
commit b1d9d004e338fadf0d1783d54b9cd9b2eb19906c
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Tue Feb 13 01:13:23 2018 +0100
Added patch fixing erroneous number of arguments in Errorf function
diff --git a/0001-Fix-erroneous-number-of-arguments-in-Errorf.patch b/0001-Fix-erroneous-number-of-arguments-in-Errorf.patch
new file mode 100644
index 0000000..a98b8f7
--- /dev/null
+++ b/0001-Fix-erroneous-number-of-arguments-in-Errorf.patch
@@ -0,0 +1,29 @@
+From 14dddcea5c6ef2b327e25728130efa493404c086 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com>
+Date: Tue, 13 Feb 2018 00:58:34 +0100
+Subject: [PATCH] Fix erroneous number of arguments in Errorf
+
+---
+ test.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test.go b/test.go
+index a53b054..aef573a 100644
+--- a/test.go
++++ b/test.go
+@@ -107,10 +107,10 @@ func ReadAndCheck(r io.Reader, b []byte) {
+ func Read(r io.Reader, b []byte) {
+ n, err := r.Read(b)
+ if err != nil && !logex.Equal(err, io.EOF) {
+- Panic(0, fmt.Errorf("Read: %v, got: %v", err))
++ Panic(0, fmt.Errorf("Read error: %v", err))
+ }
+ if n != len(b) {
+- Panic(0, fmt.Errorf("Read: %v, got: %v", n))
++ Panic(0, fmt.Errorf("Read: %v, want: %v", n, len(b)))
+ }
+ }
+
+--
+2.14.3
+
diff --git a/golang-github-chzyer-test.spec b/golang-github-chzyer-test.spec
index c74fb55..9525688 100644
--- a/golang-github-chzyer-test.spec
+++ b/golang-github-chzyer-test.spec
@@ -43,12 +43,15 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
+Release: 0.3.%{commitdate}git%{shortcommit}%{?dist}
Summary: Golang test utility
License: MIT
URL: https://%{provider_prefix}
Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+# https://github.com/chzyer/test/issues/1
+Patch0: 0001-Fix-erroneous-number-of-arguments-in-Errorf.patch
+
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
@@ -104,6 +107,7 @@ providing packages with %{import_path} prefix.
%prep
%setup -q -n %{repo}-%{commit}
+%patch0 -p1
%build
%install
@@ -181,6 +185,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
%changelog
+* Tue Feb 13 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.3.20160617gitbea8f08
+- Added patch fixing erroneous number of arguments in Errorf function
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20160617gitbea8f08
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit d940cef8cd3250c701282a7bd94955205d86cf44
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 14:03:25 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-chzyer-test.spec b/golang-github-chzyer-test.spec
index ad6c3c3..c74fb55 100644
--- a/golang-github-chzyer-test.spec
+++ b/golang-github-chzyer-test.spec
@@ -43,7 +43,7 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.1.%{commitdate}git%{shortcommit}%{?dist}
+Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
Summary: Golang test utility
License: MIT
URL: https://%{provider_prefix}
@@ -181,6 +181,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20160617gitbea8f08
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Fri Sep 29 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20160617gitbea8f08
- First package for Fedora
5 years
Architecture specific change in rpms/golang-github-chzyer-logex.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-chzyer-logex.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-chzyer-logex.git/co....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 7b2b85cde939abcec5ed399e6f87c8908044b0b8
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 00:23:48 2018 +0100
Update with the new Go packaging
diff --git a/golang-github-chzyer-logex.spec b/golang-github-chzyer-logex.spec
index a5f3d79..ed8b90e 100644
--- a/golang-github-chzyer-logex.spec
+++ b/golang-github-chzyer-logex.spec
@@ -1,186 +1,61 @@
-# 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 chzyer
-%global repo logex
-# https://github.com/chzyer/logex
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit cd112f618178aaaf4ea8592c8839f5276145d9cf
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20151010
+%bcond_without check
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 1.1.10
-Release: 2%{?dist}
-Summary: A golang log lib, supports tracking and level, wrap by standard log lib
-License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/v%{version}/%{repo}-%{version}.tar.gz
-Source1: https://raw.githubusercontent.com/chzyer/logex/master/LICENSE
+%global goipath github.com/chzyer/logex
+Version: 1.1.10
-# 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}
+%global common_description %{expand:
+A golang log lib, supports tracking and level, wrap by standard log lib.}
+%gometa
+Name: %{goname}
+Release: 3%{?dist}
+Summary: A golang log lib, supports tracking and level, wrap by standard log lib
+License: MIT
+URL: %{gourl}
+Source: %{gosource}
+Source1: https://raw.githubusercontent.com/chzyer/logex/master/LICENSE
%description
-%{summary}
+%{common_description}
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
-
-
-Provides: golang(%{import_path}) = %{version}-%{release}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
+%{common_description}
+
+This package contains the source code needed for building packages that import
+the %{goipath} Go namespace.
-%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
%prep
-%autosetup -n %{repo}-%{version}
+%gosetup -q
cp %{SOURCE1} .
-%build
-%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
+%install
+%goinstall
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%if %{with check}
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
+%gochecks
%endif
-%gotest %{import_path}
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-%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
+* Thu Mar 08 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.1.10-3
+- Update with the new Go packaging
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit e9b82fbb54f2e4121f73b8d149dc7e25d8b2f1f4
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 14:03:16 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-chzyer-logex.spec b/golang-github-chzyer-logex.spec
index 6be7b09..a5f3d79 100644
--- a/golang-github-chzyer-logex.spec
+++ b/golang-github-chzyer-logex.spec
@@ -43,7 +43,7 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 1.1.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A golang log lib, supports tracking and level, wrap by standard log lib
License: MIT
URL: https://%{provider_prefix}
@@ -181,6 +181,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Fri Sep 29 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.1.10-1
- First package for Fedora
5 years
Architecture specific change in rpms/golang-github-billziss-gh-cgofuse.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-billziss-gh-cgofuse.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-billziss-gh-cgofuse....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit af5af635da7743b741cba569e9dbe2a31298f044
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Tue Mar 13 23:22:49 2018 +0100
Update with the new Go packaging
diff --git a/.gitignore b/.gitignore
index 70cd848..60373ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/cgofuse-35bcf03.tar.gz
/cgofuse-487e2ba.tar.gz
+/cgofuse-1.0.4.tar.gz
diff --git a/golang-github-billziss-gh-cgofuse.spec b/golang-github-billziss-gh-cgofuse.spec
index 9c36f51..af65f5d 100644
--- a/golang-github-billziss-gh-cgofuse.spec
+++ b/golang-github-billziss-gh-cgofuse.spec
@@ -1,194 +1,63 @@
-# 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
-# Deactivating test: tests depends on fuse being present and fuse.ko being loaded
-# but the chroot doesn't allow to insert module.
-%global with_check 0
-# Generate unit-test rpm
-%global with_unit_test 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
+# Deactivating test: tests depends on fuse being present and fuse.ko being
+# loaded but the chroot doesn't allow to insert module.
+%bcond_with check
-%global provider github
-%global provider_tld com
-%global project billziss-gh
-%global repo cgofuse
-# https://github.com/billziss-gh/cgofuse
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-# commit b24eb346a94c3ba12c1da1e564dbac1b498a77ce == version 1.0.4
-%global commit 487e2baa5611bab252a906d7f9b869f944607305
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20171118
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 1.0.4
-Release: 2%{?dist}
-Summary: Cross-platform FUSE library for Go
-# Detected licences
-# - MIT/X11 (BSD like) at 'License.txt'
-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}
+%global goipath github.com/billziss-gh/cgofuse
+Version: 1.0.4
+%global common_description %{expand:
+Cross-platform FUSE library for Go.}
-%description
-%{summary}
+%gometa
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
+Name: %{goname}
+Release: 2%{?dist}
+Summary: Cross-platform FUSE library for Go
+License: MIT
+URL: %{gourl}
+Source: %{gosource}
+%description
+%{common_description}
-Provides: golang(%{import_path}/fuse) = %{version}-%{release}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
+%{common_description}
+
+This package contains the source code needed for building packages that import
+the %{goipath} Go namespace.
-%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
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup -q
-%build
-%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -path "*/examples/*" \! -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
+%install
+%goinstall
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%if %{with check}
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}/fuse
+%gochecks
%endif
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license License.txt
-%doc README.md Changelog.md examples/
-%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.txt
%doc README.md Changelog.md
-%endif
+
%changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+* Thu Mar 08 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.0.4-2
+- Update with the new Go packaging
* Thu Dec 07 2017 Robert-André Mauchin <zebob.m(a)gmail.com> 1.0.4-1
- Upstream release 1.0.4
* Mon Jul 24 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.0.2-1
- First package for Fedora
-
diff --git a/sources b/sources
index ba1284f..1b3d00a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cgofuse-487e2ba.tar.gz) = 0996076b53080ebb8fe764a861dc17c4cb4b0b598e6d007acbe2aa2f2b5eecc3afc9826c1e1c0792e31d40ac6eb6dbe1ac1ce27c0d09d6d825f428de456a187a
+SHA512 (cgofuse-1.0.4.tar.gz) = 180c345ecdb114c39bc5fde58dbe76d67864de42228edf8d3777adc9af8503511ea4204c53c4d605f25cd815193850fdfccbeb395440a3bd08052dd4eb9c67ed
commit 5e366a4bd233dc5e4890b1c8c8daedd06116e8c9
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 13:59:49 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-billziss-gh-cgofuse.spec b/golang-github-billziss-gh-cgofuse.spec
index 50a8dae..9c36f51 100644
--- a/golang-github-billziss-gh-cgofuse.spec
+++ b/golang-github-billziss-gh-cgofuse.spec
@@ -46,7 +46,7 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 1.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Cross-platform FUSE library for Go
# Detected licences
# - MIT/X11 (BSD like) at 'License.txt'
@@ -183,6 +183,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Thu Dec 07 2017 Robert-André Mauchin <zebob.m(a)gmail.com> 1.0.4-1
- Upstream release 1.0.4
5 years
Architecture specific change in rpms/golang-bazil-fuse.git
by githook-noreply@fedoraproject.org
The package rpms/golang-bazil-fuse.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-bazil-fuse.git/commit/?id=....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 21a34bfaaa20f555fb05e9e6ad746f6204d5a84d
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 23:15:38 2018 +0100
Fix BuildRequires
diff --git a/golang-bazil-fuse.spec b/golang-bazil-fuse.spec
index bf082e3..a0b0568 100644
--- a/golang-bazil-fuse.spec
+++ b/golang-bazil-fuse.spec
@@ -14,16 +14,14 @@ Go library for writing FUSE userspace filesystems.}
Name: %{goname}
Version: 0
-Release: 0.3%{?dist}
+Release: 0.4%{?dist}
Summary: Go library for writing FUSE userspace filesystems
License: BSD and MIT
URL: %{gourl}
Source: %{gosource}
-%if %{with check}
BuildRequires: golang(golang.org/x/net/context)
BuildRequires: golang(golang.org/x/sys/unix)
-%endif
%description
%{common_description}
@@ -59,7 +57,10 @@ break
%changelog
-* Wed Mar 07 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.3.20180310git371fbbd
+* Wed Mar 14 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.4.20180313git371fbbd
+- Fix BuildRequires
+
+* Wed Mar 07 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.3.20180313git371fbbd
- Update with the new Go packaging
- Add doc and examples
- Make devel package arched
commit 8ec49dc6af53f79c1ec6cd95a378993fc828f586
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Tue Mar 13 22:42:57 2018 +0100
Update with the new Go packaging
Add doc and examples
Make devel package arched
diff --git a/golang-bazil-fuse.spec b/golang-bazil-fuse.spec
index 7b568de..bf082e3 100644
--- a/golang-bazil-fuse.spec
+++ b/golang-bazil-fuse.spec
@@ -10,7 +10,7 @@
%global common_description %{expand:
Go library for writing FUSE userspace filesystems.}
-%gometa -i
+%gometa
Name: %{goname}
Version: 0
@@ -31,7 +31,6 @@ BuildRequires: golang(golang.org/x/sys/unix)
%package devel
Summary: %{summary}
-BuildArch: noarch
%description devel
%{common_description}
@@ -46,7 +45,7 @@ the %{goipath} Go namespace.
%install
%goinstall
-
+break
%if %{with check}
%check
@@ -56,12 +55,14 @@ the %{goipath} Go namespace.
%files devel -f devel.file-list
%license LICENSE
-%doc README.md
+%doc README.md doc examples
%changelog
* Wed Mar 07 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.3.20180310git371fbbd
- Update with the new Go packaging
+- Add doc and examples
+- Make devel package arched
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20160811git371fbbd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit b2f328d3f106614623c297c29599705925b3ece7
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Sun Mar 11 00:32:16 2018 +0100
Fix snapshot date
diff --git a/golang-bazil-fuse.spec b/golang-bazil-fuse.spec
index dd56c97..7b568de 100644
--- a/golang-bazil-fuse.spec
+++ b/golang-bazil-fuse.spec
@@ -60,7 +60,7 @@ the %{goipath} Go namespace.
%changelog
-* Wed Mar 07 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.3.20180308git371fbbd
+* Wed Mar 07 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.3.20180310git371fbbd
- Update with the new Go packaging
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20160811git371fbbd
commit e3c53de2e86d9728f0bb2be25e77ae55cec9c67c
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Sun Mar 11 00:11:33 2018 +0100
Forge-specific packaging variables
forgeurl: https://github.com/bazil/fuse
forgesource: https://github.com/bazil/fuse/archive/371fbbdaa8987b715bdd21d6adc4c9b2015...
forgesetupargs: -n fuse-371fbbdaa8987b715bdd21d6adc4c9b20155f748
Generic variables
archivename: fuse-371fbbdaa8987b715bdd21d6adc4c9b20155f748
archiveext: tar.gz
archiveurl: https://github.com/bazil/fuse/archive/371fbbdaa8987b715bdd21d6adc4c9b2015...
scm: git
tag:
commit: 371fbbdaa8987b715bdd21d6adc4c9b20155f748
dist: .20180310git371fbbd.fc29 (snapshot date is computed once %{_sourcedir}/%{archivename}.%{archiveext} is available)
Go-specific packaging variables
goipath: bazil.org/fuse
goname: golang-bazil-fuse
gourl: https://github.com/bazil/fuse
gosource: https://github.com/bazil/fuse/archive/371fbbdaa8987b715bdd21d6adc4c9b2015...
Update with the new Go packaging
diff --git a/.gitignore b/.gitignore
index 8aa0244..56bd3ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/fuse-371fbbd.tar.gz
+/fuse-371fbbdaa8987b715bdd21d6adc4c9b20155f748.tar.gz
diff --git a/golang-bazil-fuse.spec b/golang-bazil-fuse.spec
index 2add410..dd56c97 100644
--- a/golang-bazil-fuse.spec
+++ b/golang-bazil-fuse.spec
@@ -1,194 +1,68 @@
-# 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
-# Deactivating test: tests depends on fuse being present and fuse.ko being loaded
-# but the chroot doesn't allow to insert module.
-%global with_check 0
-# Generate unit-test rpm
-%global with_unit_test 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
+# Deactivating test: tests depends on fuse being present and fuse.ko being
+# loaded but the chroot doesn't allow to insert module.
+%bcond_with check
-%global provider github
-%global provider_tld com
-%global project bazil
-%global repo fuse
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path bazil.org/fuse
+%global goipath bazil.org/fuse
+%global forgeurl https://github.com/bazil/fuse
%global commit 371fbbdaa8987b715bdd21d6adc4c9b20155f748
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20160811
-
-Name: golang-bazil-fuse
-Version: 0
-Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
-Summary: Go library for writing FUSE userspace filesystems
-# BSD except fuse.go under MIT licensing
-License: BSD and 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}
+%global common_description %{expand:
+Go library for writing FUSE userspace filesystems.}
+%gometa -i
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
+Name: %{goname}
+Version: 0
+Release: 0.3%{?dist}
+Summary: Go library for writing FUSE userspace filesystems
+License: BSD and MIT
+URL: %{gourl}
+Source: %{gosource}
-%if 0%{?with_check} && ! 0%{?with_bundled}
+%if %{with check}
BuildRequires: golang(golang.org/x/net/context)
BuildRequires: golang(golang.org/x/sys/unix)
%endif
-Requires: golang(golang.org/x/net/context)
-Requires: golang(golang.org/x/sys/unix)
+%description
+%{common_description}
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/fs) = %{version}-%{release}
-Provides: golang(%{import_path}/fs/bench) = %{version}-%{release}
-Provides: golang(%{import_path}/fs/fstestutil) = %{version}-%{release}
-Provides: golang(%{import_path}/fs/fstestutil/record) = %{version}-%{release}
-Provides: golang(%{import_path}/fuseutil) = %{version}-%{release}
-Provides: golang(%{import_path}/syscallx) = %{version}-%{release}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
%description devel
-%{summary}
+%{common_description}
+
+This package contains the source code needed for building packages that import
+the %{goipath} Go namespace.
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup -q
-%build
-%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
+%install
+%goinstall
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%if %{with check}
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
+%gochecks
%endif
-%gotest %{import_path}
-%gotest %{import_path}/fs
-%gotest %{import_path}/fs/bench
-%endif
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/bazil.org/
-%endif
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Wed Mar 07 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.3.20180308git371fbbd
+- Update with the new Go packaging
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20160811git371fbbd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 96f7e5b..a375759 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fuse-371fbbd.tar.gz) = 0a09cf11b5d7851fc2af3f72ab8400a33445191bc9da0f196c5b4a7d1f57c4845f3daa72edb30ca44acf548fdb5f52c4bd3fbae73d914023c4560791c23e26e3
+SHA512 (fuse-371fbbdaa8987b715bdd21d6adc4c9b20155f748.tar.gz) = 0a09cf11b5d7851fc2af3f72ab8400a33445191bc9da0f196c5b4a7d1f57c4845f3daa72edb30ca44acf548fdb5f52c4bd3fbae73d914023c4560791c23e26e3
commit 6ba4659ebea8f25c320b11f40f652abb814f2edd
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 13:49:07 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-bazil-fuse.spec b/golang-bazil-fuse.spec
index f0add78..2add410 100644
--- a/golang-bazil-fuse.spec
+++ b/golang-bazil-fuse.spec
@@ -44,7 +44,7 @@
Name: golang-bazil-fuse
Version: 0
-Release: 0.1.%{commitdate}git%{shortcommit}%{?dist}
+Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
Summary: Go library for writing FUSE userspace filesystems
# BSD except fuse.go under MIT licensing
License: BSD and MIT
@@ -189,6 +189,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20160811git371fbbd
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Mon Jul 24 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20160811git371fbbd
- First package for Fedora
5 years
Architecture specific change in rpms/gdl.git
by githook-noreply@fedoraproject.org
The package rpms/gdl.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/gdl.git/commit/?id=14e11c8b58a981...
https://src.fedoraproject.org/cgit/rpms/gdl.git/commit/?id=b91914660f5b96....
Change:
+%ifnarch ppc64 s390x
+%ifnarch s390x
Thanks.
Full change:
============
commit 0c2aa245c2a7fcadc571180f2580f3fcd31caa8d
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Mon May 21 21:51:17 2018 -0600
More failing tests
diff --git a/gdl.spec b/gdl.spec
index 42a6b0f..7972a45 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -234,7 +234,7 @@ failing_tests="$failing_tests|test_(fix|formats|l64|wait|xdr)"
failing_tests="$failing_tests|test_(formats|l64|sem|xdr)"
%endif
%ifarch ppc64
-failing_tests="$failing_tests|test_(save_restore|window_background)"
+failing_tests="$failing_tests|test_(save_restore|wait|window_background)"
%endif
%ifarch s390x
failing_tests="$failing_tests|test_(save_restore|window_background)"
commit 067b2d212d2da6168534a1b6413d1541aae184b3
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Mon May 21 21:30:07 2018 -0600
More failing tests
diff --git a/gdl.spec b/gdl.spec
index b47d90f..42a6b0f 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -223,7 +223,7 @@ failing_tests='test_(fft_leak|file_delete|finite|fix|formats|idlneturl|make_dll|
failing_tests="$failing_tests|test_fix"
%endif
%ifarch aarch64
-failing_tests="$failing_tests|test_(l64|xdr)"
+failing_tests="$failing_tests|test_(l64|wait|xdr)"
%endif
%ifarch %{arm}
# These fail on 32-bit: test_formats test_xdr
commit 7a4c856dbf9f36d05882c2834149903cf6484409
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Mon May 21 19:41:31 2018 -0600
More failing tests
diff --git a/gdl.spec b/gdl.spec
index 25aad46..b47d90f 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -227,14 +227,14 @@ failing_tests="$failing_tests|test_(l64|xdr)"
%endif
%ifarch %{arm}
# These fail on 32-bit: test_formats test_xdr
-failing_tests="$failing_tests|test_(fix|formats|l64|xdr)"
+failing_tests="$failing_tests|test_(fix|formats|l64|wait|xdr)"
%endif
%ifarch %{ix86}
# These fail on 32-bit: test_formats test_xdr
failing_tests="$failing_tests|test_(formats|l64|sem|xdr)"
%endif
%ifarch ppc64
-failing_tests="$failing_tests|test_save_restore"
+failing_tests="$failing_tests|test_(save_restore|window_background)"
%endif
%ifarch s390x
failing_tests="$failing_tests|test_(save_restore|window_background)"
commit 92a27f68933eadcf6ef95bce1eb3c27198ddf34e
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Mon May 21 17:38:29 2018 -0600
Fix typo, exclude failing arm tests
diff --git a/gdl.spec b/gdl.spec
index 42d1670..25aad46 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -227,17 +227,17 @@ failing_tests="$failing_tests|test_(l64|xdr)"
%endif
%ifarch %{arm}
# These fail on 32-bit: test_formats test_xdr
-failing_tests="$failing_tests|test_(fix|formats)"
+failing_tests="$failing_tests|test_(fix|formats|l64|xdr)"
%endif
%ifarch %{ix86}
# These fail on 32-bit: test_formats test_xdr
failing_tests="$failing_tests|test_(formats|l64|sem|xdr)"
%endif
%ifarch ppc64
-feailing_tests="$failing_tests|test_save_restore"
+failing_tests="$failing_tests|test_save_restore"
%endif
%ifarch s390x
-feailing_tests="$failing_tests|test_(save_restore|window_background)"
+failing_tests="$failing_tests|test_(save_restore|window_background)"
%endif
make check ARGS="-V -E '$failing_tests'"
%ifnarch ppc64 s390x
commit 14e11c8b58a981b1ed2bbcea2915ccc2e336c650
Author: Orion Poplawski <orion(a)nwra.com>
Date: Mon May 21 09:27:15 2018 -0600
Fix typo; save_restore hangs on ppc64 too
diff --git a/gdl.spec b/gdl.spec
index ddecb61..42d1670 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -233,12 +233,15 @@ failing_tests="$failing_tests|test_(fix|formats)"
# These fail on 32-bit: test_formats test_xdr
failing_tests="$failing_tests|test_(formats|l64|sem|xdr)"
%endif
+%ifarch ppc64
+feailing_tests="$failing_tests|test_save_restore"
+%endif
%ifarch s390x
-eailing_tests="$failing_tests|test_(save_restore|window_background)"
+feailing_tests="$failing_tests|test_(save_restore|window_background)"
%endif
make check ARGS="-V -E '$failing_tests'"
-%ifnarch s390x
-# test_save_restore hangs on s390x
+%ifnarch ppc64 s390x
+# test_save_restore hangs on ppc64 s390x
make check ARGS="-V -R '$failing_tests'" || :
%endif
kill %1 || :
commit b91914660f5b9651c8fc3d6573d890ffe5971107
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Sun May 20 21:19:04 2018 -0600
Update to 0.9.8
Drop parallel make for now
Use libtirpc
Switch to Xorg dummy driver for tests, fail build on test failure
Add patch to fix ppc64 altivec vector usage
Add patches to fix various warnings
diff --git a/.gitignore b/.gitignore
index d77399d..b6391d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ gdl-0.9rc4.tar.gz
/gdl-0.9.6.tar.gz
/gdl-0.9.6v2.tgz
/gdl-0.9.7.tgz
+/gdl-0.9.8.tgz
diff --git a/gdl-alias.patch b/gdl-alias.patch
new file mode 100644
index 0000000..39db1c1
--- /dev/null
+++ b/gdl-alias.patch
@@ -0,0 +1,54 @@
+diff -up gdl-0.9.8/src/basic_pro_jmg.cpp.alias gdl-0.9.8/src/basic_pro_jmg.cpp
+--- gdl-0.9.8/src/basic_pro_jmg.cpp.alias 2018-04-11 19:20:07.670748377 -0600
++++ gdl-0.9.8/src/basic_pro_jmg.cpp 2018-04-12 09:01:16.578294989 -0600
+@@ -23,6 +23,7 @@
+
+ #include "envt.hpp"
+ #include "dinterpreter.hpp"
++#include "prognode.hpp"
+ #include "basic_pro_jmg.hpp"
+
+ #define MAXNDLL 40
+@@ -38,8 +39,8 @@ namespace lib {
+
+ using namespace std;
+
+- void (*dynPro[MAXNDLL/2])( EnvT* e);
+- BaseGDL*(*dynFun[MAXNDLL/2])( EnvT* e);
++ LibPro dynPro[MAXNDLL/2];
++ LibFun dynFun[MAXNDLL/2];
+
+ void point_lun( EnvT* e)
+ {
+@@ -141,11 +142,11 @@ namespace lib {
+
+ #if defined(_WIN32) && !defined(__CYGWIN__)
+ if (funcType == 0) {
+- (void* &) dynPro[count_pro] =
+- (void *) GetProcAddress(module[count], entryName.c_str());
++ dynPro[count_pro] =
++ (LibPro) GetProcAddress(module[count], entryName.c_str());
+ } else if (funcType == 1) {
+- (BaseGDL* &) dynFun[count_fun] =
+- (BaseGDL*) GetProcAddress(module[count], entryName.c_str());
++ dynFun[count_fun] =
++ (LibFun) GetProcAddress(module[count], entryName.c_str());
+ } else {
+ printf("Improper function type: %d\n", funcType);
+ FreeLibrary(module[count]);
+@@ -153,11 +154,11 @@ namespace lib {
+ }
+ #else
+ if (funcType == 0) {
+- (void* &) dynPro[count_pro] =
+- (void *) dlsym(module[count], entryName.c_str());
++ dynPro[count_pro] =
++ (LibPro) dlsym(module[count], entryName.c_str());
+ } else if (funcType == 1) {
+- (BaseGDL* &) dynFun[count_fun] =
+- (BaseGDL*) dlsym(module[count], entryName.c_str());
++ dynFun[count_fun] =
++ (LibFun) dlsym(module[count], entryName.c_str());
+ } else {
+ printf("Improper function type: %d\n", funcType);
+ dlclose(module[count]);
diff --git a/gdl-array.patch b/gdl-array.patch
deleted file mode 100644
index 3b425db..0000000
--- a/gdl-array.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 965eb0af7a532740637c96ac31f7fc5d022d1953 Mon Sep 17 00:00:00 2001
-From: Gilles Duvert <gilles-duvert(a)users.sourceforge.net>
-Date: Tue, 24 Jan 2017 10:05:41 +0000
-Subject: [PATCH] reverted to previous version since correction of bug#709 was
- making a mess with array dimensions.
-
----
- src/accessdesc.hpp | 3 ++-
- src/dimension.hpp | 16 +++++++++-------
- 2 files changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/src/accessdesc.hpp b/src/accessdesc.hpp
-index 0309d11..b4d78a9 100644
---- a/src/accessdesc.hpp
-+++ b/src/accessdesc.hpp
-@@ -317,7 +317,8 @@ class DotAccessDescT
- // dim >> topDim;
- dim >> ix[d]->GetDim();
- }
-- dim.Purge();
-+// Was added to solve bug 709 but may have side effects.
-+// dim.Purge();
- }
-
- private:
-diff --git a/src/dimension.hpp b/src/dimension.hpp
-index 6469648..1345ff5 100644
---- a/src/dimension.hpp
-+++ b/src/dimension.hpp
-@@ -378,13 +378,15 @@ class dimension
- // throw away unused ranks (ie. ranks == 1)
- void Purge()
- {
-- //old version: produce bug #709
--// for(; rank>1 && dim[rank-1] <= 1; --rank);
-- int m=rank-1;
-- for (; m>0; --m) if (dim[m]<=1) {
-- for (int j=m; j<rank-1; ++j) dim[j]=dim[j+1];
-- rank--;
-- }
-+ //The following line produces bug #709
-+ for(; rank>1 && dim[rank-1] <= 1; --rank);
-+// However those following lines are too strict: test=fltarr(1, 1, 114) & help,test
-+// gives: TEST FLOAT = Array[1, 114] instead of good answer TEST FLOAT = Array[1, 1, 114]
-+// int m=rank-1;
-+// for (; m>0; --m) if (dim[m]<=1) {
-+// for (int j=m; j<rank-1; ++j) dim[j]=dim[j+1];
-+// rank--;
-+// }
- }
-
- // set the rank to r (pads 1s) if it is smaller than r
diff --git a/gdl-catch.patch b/gdl-catch.patch
new file mode 100644
index 0000000..a3eb1e9
--- /dev/null
+++ b/gdl-catch.patch
@@ -0,0 +1,122 @@
+diff -up gdl-0.9.8/src/basic_fun.cpp.catch gdl-0.9.8/src/basic_fun.cpp
+--- gdl-0.9.8/src/basic_fun.cpp.catch 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/basic_fun.cpp 2018-03-26 16:54:13.508994366 -0600
+@@ -1505,7 +1505,7 @@ namespace lib {
+ if( !compileFlags) GDLInterpreter::ReportCompileError( ex);
+ return new DIntGDL( 0);
+ }
+- catch( ANTLRException ex)
++ catch( ANTLRException& ex)
+ {
+ if( !compileFlags) cerr << "EXECUTE: Lexer/Parser exception: " <<
+ ex.getMessage() << endl;
+@@ -1529,7 +1529,7 @@ namespace lib {
+ return new DIntGDL( 0);
+ }
+
+- catch( ANTLRException ex)
++ catch( ANTLRException& ex)
+ {
+ if( !compileFlags) cerr << "EXECUTE: Compiler exception: " <<
+ ex.getMessage() << endl;
+@@ -1570,7 +1570,7 @@ namespace lib {
+ ex.getMessage() << endl;
+ return new DIntGDL( 0);
+ }
+- catch( ANTLRException ex)
++ catch( ANTLRException& ex)
+ {
+ caller->ResizeForLoops( nForLoopsIn);
+
+@@ -6456,7 +6456,7 @@ template <typename Ty, typename T2> sta
+ try {
+ oStruct = e->GetObjHeap( objRef);
+ }
+- catch ( GDLInterpreter::HeapException )
++ catch ( GDLInterpreter::HeapException& )
+ { // non valid object
+ if( count)
+ e->SetKW( countIx, new DLongGDL( 0));
+diff -up gdl-0.9.8/src/dinterpreter.cpp.catch gdl-0.9.8/src/dinterpreter.cpp
+--- gdl-0.9.8/src/dinterpreter.cpp.catch 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/dinterpreter.cpp 2018-03-26 16:53:15.635298830 -0600
+@@ -143,7 +143,7 @@ DStructGDL* GDLInterpreter::ObjectStruct
+ try {
+ oStructGDL= GetObjHeap( o);
+ }
+- catch ( HeapException)
++ catch ( HeapException&)
+ {
+ throw GDLException( mp, "Object not valid: "+Name(self));
+ }
+@@ -578,12 +578,12 @@ bool GDLInterpreter::CompileFile(const s
+ return false;
+ }
+ }
+- catch( GDLException e)
++ catch( GDLException& e)
+ {
+ ReportCompileError( e, f);
+ return false;
+ }
+- catch( ANTLRException e)
++ catch( ANTLRException& e)
+ {
+ cerr << "Lexer/Parser exception: " << e.getMessage() << endl;
+ return false;
+@@ -612,13 +612,13 @@ bool GDLInterpreter::CompileFile(const s
+
+ if( treeParser.ActiveProCompiled()) RetAll();
+ }
+- catch( GDLException e)
++ catch( GDLException& e)
+ {
+ ReportCompileError( e, f);
+ if( treeParser.ActiveProCompiled()) RetAll();
+ return false;
+ }
+- catch( ANTLRException e)
++ catch( ANTLRException& e)
+ {
+ cerr << "Compiler exception: " << e.getMessage() << endl;
+ if( treeParser.ActiveProCompiled()) RetAll();
+@@ -705,7 +705,7 @@ DInterpreter::CommandCode DInterpreter::
+ // default is more verbose
+ CompileFile( argstr); //, origstr);
+ }
+- catch( RetAllException)
++ catch( RetAllException&)
+ {
+ // delay the RetAllException until finished
+ retAll = true;
+@@ -771,7 +771,7 @@ DInterpreter::CommandCode DInterpreter::
+ // default is more verbose
+ CompileFile( argstr); //, origstr);
+ }
+- catch( RetAllException)
++ catch( RetAllException&)
+ {
+ // delay the RetAllException until finished
+ retAll = true;
+diff -up gdl-0.9.8/src/getfmtast.cpp.catch gdl-0.9.8/src/getfmtast.cpp
+--- gdl-0.9.8/src/getfmtast.cpp.catch 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/getfmtast.cpp 2018-03-26 16:54:32.793899215 -0600
+@@ -68,15 +68,15 @@ RefFMTNode GetFMTAST( DString fmtString)
+ cout << endl;
+ #endif
+ }
+- catch( GDLException ex)
++ catch( GDLException& ex)
+ {
+ throw GDLException("Format: "+ex.getMessage());
+ }
+- catch( antlr::ANTLRException ex)
++ catch( antlr::ANTLRException& ex)
+ {
+ throw GDLException("Format parser: "+ex.getMessage());
+ }
+- catch( exception ex)
++ catch( exception& ex)
+ {
+ throw GDLException("Format exception: "+string(ex.what()));
+ }
diff --git a/gdl-gcc6.patch b/gdl-gcc6.patch
deleted file mode 100644
index 67610f1..0000000
--- a/gdl-gcc6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up gdl-0.9.6/src/specializations.hpp.gcc6 gdl-0.9.6/src/specializations.hpp
---- gdl-0.9.6/src/specializations.hpp.gcc6 2015-08-24 15:26:47.000000000 -0600
-+++ gdl-0.9.6/src/specializations.hpp 2016-03-03 16:30:46.694379312 -0700
-@@ -534,16 +534,6 @@ void Data_<SpDString>::MinMax( DLong* mi
-
- // default_io.cpp
- template<>
--std::istream& operator>>(std::istream& i, Data_<SpDFloat>& data_);
--template<>
--std::istream& operator>>(std::istream& i, Data_<SpDDouble>& data_);
--template<>
--std::istream& operator>>(std::istream& i, Data_<SpDComplex>& data_);
--template<>
--std::istream& operator>>(std::istream& i, Data_<SpDComplexDbl>& data_);
--template<>
--std::istream& operator>>(std::istream& is, Data_<SpDString>& data_);
--template<>
- std::ostream& Data_<SpDLong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr);
- template<>
- std::ostream& Data_<SpDULong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr);
diff --git a/gdl-return.patch b/gdl-return.patch
new file mode 100644
index 0000000..f506877
--- /dev/null
+++ b/gdl-return.patch
@@ -0,0 +1,288 @@
+diff -up gdl-0.9.8/src/basic_fun.cpp.return gdl-0.9.8/src/basic_fun.cpp
+--- gdl-0.9.8/src/basic_fun.cpp.return 2018-04-11 16:33:39.117920749 -0600
++++ gdl-0.9.8/src/basic_fun.cpp 2018-04-11 16:33:39.124920716 -0600
+@@ -4420,6 +4420,7 @@ BaseGDL* where_fun(EnvT* e) {
+ }
+ }
+ }
++ return NULL; // should not reach
+ }
+ // uses MergeSort
+ // 2 parts in the code: without "width" or with "width" (limited to 1D and 2D)
+@@ -6249,6 +6250,7 @@ template <typename Ty, typename T2> sta
+ }
+
+ } else e->Throw("Operand must be integer:" + e->GetParString(0));
++ return NULL; // should not reach
+ }
+
+ BaseGDL* shift_fun( EnvT* e) {
+@@ -6544,6 +6546,7 @@ template <typename Ty, typename T2> sta
+ }
+ return res;
+ } else e->Throw("Object reference type required in this context: " + e->GetParString(0));
++ return NULL; // should not reach
+ }
+
+ BaseGDL* n_tags( EnvT* e)
+@@ -8328,6 +8331,7 @@ template <typename Ty, typename T2> sta
+ }
+ }
+ e->Throw("Expecting string or byte array as a first parameter");
++ return NULL; // should not reach
+ }
+
+ BaseGDL* get_drive_list(EnvT* e)
+@@ -8442,6 +8446,7 @@ template <typename Ty, typename T2> sta
+ return res;
+
+ }
++ return NULL; // should not reach
+ }
+
+ // note: changes here MUST be reflected in scope_varfetch_reference() as well
+diff -up gdl-0.9.8/src/basic_pro_jmg.cpp.return gdl-0.9.8/src/basic_pro_jmg.cpp
+--- gdl-0.9.8/src/basic_pro_jmg.cpp.return 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/basic_pro_jmg.cpp 2018-04-11 19:20:07.670748377 -0600
+@@ -589,6 +589,7 @@ namespace lib {
+ break;
+ }
+ assert( false);
++ return NULL; // Silence warning
+ }
+
+
+diff -up gdl-0.9.8/src/graphicsdevice.hpp.return gdl-0.9.8/src/graphicsdevice.hpp
+--- gdl-0.9.8/src/graphicsdevice.hpp.return 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/graphicsdevice.hpp 2018-04-11 19:21:25.832376682 -0600
+@@ -220,8 +220,8 @@ public:
+ virtual void MaxXYSize(DLong *xsize, DLong *ysize) {
+ *xsize=1200, *ysize=800; return;}
+ virtual DLong GetDecomposed() { return -1;}
+- virtual BaseGDL* GetFontnames() { ThrowGDLException("DEVICE: Keyword GET_FONTNAMES not allowed for call to: DEVICE" );}//{return NULL;}
+- virtual DLong GetFontnum() { ThrowGDLException("DEVICE: Keyword GET_FONTNUM not allowed for call to: DEVICE" );}//{return -1;}
++ virtual BaseGDL* GetFontnames() { ThrowGDLException("DEVICE: Keyword GET_FONTNAMES not allowed for call to: DEVICE" ); return NULL;}
++ virtual DLong GetFontnum() { ThrowGDLException("DEVICE: Keyword GET_FONTNUM not allowed for call to: DEVICE" ); return -1;}
+ virtual bool SetFont(DString f) {static int warning_sent=1; if (warning_sent) {Warning("SET_FONT not active for this device (FIXME)."); warning_sent=0;} return true;}
+ virtual DString GetCurrentFont() {return NULL;}
+ virtual DLong GetGraphicsFunction() { return -1;}
+@@ -360,8 +360,8 @@ public:
+ bool UnsetFocus();
+ bool Decomposed(bool value);
+ DLong GetDecomposed();
+- BaseGDL* GetFontnames(){ ThrowGDLException("DEVICE: Keyword GET_FONTNAMES not allowed for call to: DEVICE" );}//{return NULL;}
+- DLong GetFontnum(){ ThrowGDLException("DEVICE: Keyword GET_FONTNUM not allowed for call to: DEVICE" );}//{return -1;}
++ BaseGDL* GetFontnames(){ ThrowGDLException("DEVICE: Keyword GET_FONTNAMES not allowed for call to: DEVICE" ); return NULL;}
++ DLong GetFontnum(){ ThrowGDLException("DEVICE: Keyword GET_FONTNUM not allowed for call to: DEVICE" ); return -1;}
+ bool SetFont(DString f) {fontname=f; return true;}
+ DString GetCurrentFont() {return fontname;}
+ bool SetBackingStore(int value);
+diff -up gdl-0.9.8/src/gzstream.hpp.return gdl-0.9.8/src/gzstream.hpp
+--- gdl-0.9.8/src/gzstream.hpp.return 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/gzstream.hpp 2018-04-11 16:33:39.125920711 -0600
+@@ -75,9 +75,9 @@ public:
+ std::streampos pubseekoff(std::streamoff off, std::ios_base::seekdir way, std::ios_base::openmode which=std::ios_base::in|std::ios_base::out);
+ //hacks for not being lost with input gzipped streams
+ std::streampos getPosition(){return position;}
+- std::streampos setPosition(long pos){position=pos;}
+- std::streampos incrementPosition(long pos=1){position+=pos;}
+- std::streampos decrementPosition(long pos=1){position-=pos;}
++ void setPosition(long pos){position=pos;}
++ void incrementPosition(long pos=1){position+=pos;}
++ void decrementPosition(long pos=1){position-=pos;}
+ };
+
+ class gzstreambase : virtual public std::ios {
+diff -up gdl-0.9.8/src/hdf_fun.cpp.return gdl-0.9.8/src/hdf_fun.cpp
+--- gdl-0.9.8/src/hdf_fun.cpp.return 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/hdf_fun.cpp 2018-04-11 19:22:44.477002324 -0600
+@@ -106,6 +106,7 @@ namespace lib {
+ return new DLongGDL( Vattach(hdf_id, vg_ref, "r"));
+ else if (e->KeywordSet( writeIx ))
+ return new DLongGDL( Vattach(hdf_id, vg_ref, "w"));
++ return NULL;
+ }
+
+
+diff -up gdl-0.9.8/src/hdf_pro.cpp.return gdl-0.9.8/src/hdf_pro.cpp
+--- gdl-0.9.8/src/hdf_pro.cpp.return 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/hdf_pro.cpp 2018-04-11 16:33:39.126920706 -0600
+@@ -34,7 +34,7 @@ namespace lib {
+ using namespace std;
+
+ template< typename T>
+- BaseGDL* hdf_sd_getdata_template( EnvT* e, dimension dim, int32 sds_id,
++ void hdf_sd_getdata_template( EnvT* e, dimension dim, int32 sds_id,
+ int32 start[], int32 edges[], int32 stride[],
+ DLongGDL* strideKW)
+ {
+@@ -622,7 +622,7 @@ namespace lib {
+ }
+
+ template< typename T>
+- BaseGDL* hdf_sd_getdscl_template(EnvT* e, DLong dim_size, int32 dim_id)
++ void hdf_sd_getdscl_template(EnvT* e, DLong dim_size, int32 dim_id)
+ {
+ T* data = new T(dimension(dim_size), BaseGDL::NOZERO);
+ SDgetdimscale(dim_id, data->DataAddr());
+diff -up gdl-0.9.8/src/list.cpp.return gdl-0.9.8/src/list.cpp
+--- gdl-0.9.8/src/list.cpp.return 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/list.cpp 2018-04-11 19:24:14.900571515 -0600
+@@ -149,6 +149,7 @@
+ {
+ ThrowFromInternalUDSub( e, "SELF object ID <"+i2s(selfID)+"> not found.");
+ }
++ return NULL;
+ }
+
+ void LIST__ToStream( DStructGDL* oStructGDL, std::ostream& o, SizeT w, SizeT* actPosPtr)
+diff -up gdl-0.9.8/src/magick_cl.cpp.return gdl-0.9.8/src/magick_cl.cpp
+--- gdl-0.9.8/src/magick_cl.cpp.return 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/magick_cl.cpp 2018-04-11 19:27:37.564602966 -0600
+@@ -125,6 +125,7 @@ namespace lib {
+ } catch (Exception &error_) {
+ e->Throw(error_.what());
+ }
++ return NULL;
+ }
+
+ BaseGDL * magick_ping(EnvT* e) {
+@@ -332,6 +333,7 @@ namespace lib {
+ } catch (Exception &error_) {
+ e->Throw(error_.what());
+ }
++ return NULL;
+ }
+
+ //CLOSE, magic_id
+@@ -411,6 +413,7 @@ namespace lib {
+ } catch (Exception &error_) {
+ e->Throw(error_.what());
+ }
++ return NULL;
+ }
+
+ //MAGICK_READCOLORMAPRGB, mid, red, green, blue
+@@ -572,6 +575,7 @@ namespace lib {
+ } catch (Exception &error_) {
+ e->Throw(error_.what());
+ }
++ return NULL;
+ }
+
+ // MAGICK_WRITE, mid, gdlImageArray, rgb=rgb
+@@ -706,6 +710,7 @@ namespace lib {
+ } catch (Exception &error_) {
+ e->Throw(error_.what());
+ }
++ return NULL;
+ }
+
+ //magickNumber=MAGICK_MAGICK(mid [, "imageType"])
+@@ -727,6 +732,7 @@ namespace lib {
+ } catch (Exception &error_) {
+ e->Throw(error_.what());
+ }
++ return NULL;
+ }
+
+ //nrows=MAGICK_ROWS(mid)
+@@ -740,6 +746,7 @@ namespace lib {
+ } catch (Exception &error_) {
+ e->Throw(error_.what());
+ }
++ return NULL;
+ }
+
+ //ncols=MAGICK_COLUMNS(mid)
+@@ -753,6 +760,7 @@ namespace lib {
+ } catch (Exception &error_) {
+ e->Throw(error_.what());
+ }
++ return NULL;
+ }
+ //bool=MAGICK_INDEXEDCOLOR(mid)
+ BaseGDL* magick_IndexedColor(EnvT* e) {
+@@ -769,7 +777,7 @@ namespace lib {
+ } catch (Exception &error_) {
+ e->Throw(error_.what());
+ }
+-
++ return NULL;
+ }
+
+ //MAGICK_QUALITY, mid, quality
+diff -up gdl-0.9.8/src/math_fun_jmg.cpp.return gdl-0.9.8/src/math_fun_jmg.cpp
+--- gdl-0.9.8/src/math_fun_jmg.cpp.return 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/math_fun_jmg.cpp 2018-04-11 19:29:36.258031486 -0600
+@@ -288,6 +288,7 @@ extern "C" {
+ return res;
+ }
+ assert( false);
++ return NULL;
+ }
+ };
+
+diff -up gdl-0.9.8/src/math_fun_ng.cpp.return gdl-0.9.8/src/math_fun_ng.cpp
+--- gdl-0.9.8/src/math_fun_ng.cpp.return 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/math_fun_ng.cpp 2018-04-11 19:30:57.610639792 -0600
+@@ -371,6 +371,7 @@ namespace lib {
+ return Yout;
+ }
+ assert( false);
++ return NULL;
+ }// RK4_fun
+
+ }//namespace
+diff -up gdl-0.9.8/src/plotting_convert_coord.cpp.return gdl-0.9.8/src/plotting_convert_coord.cpp
+--- gdl-0.9.8/src/plotting_convert_coord.cpp.return 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/plotting_convert_coord.cpp 2018-04-11 20:42:10.177037332 -0600
+@@ -368,6 +368,7 @@ namespace lib {
+ delete res;
+ return res1;
+ }
++ return NULL; // Should not reach
+ }
+
+ //THE FOLLOWING ARE POSSIBLY THE WORST WAY TO DO THE JOB. At least they are to be used *only*
+diff -up gdl-0.9.8/src/pythongdl.cpp.return gdl-0.9.8/src/pythongdl.cpp
+--- gdl-0.9.8/src/pythongdl.cpp.return 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/pythongdl.cpp 2018-04-11 16:33:39.127920702 -0600
+@@ -272,6 +272,7 @@ int GDLEventHandlerPy()
+ GDLEventHandler();
+ if( oldInputHook != NULL)
+ (*oldInputHook)();
++ return 0;
+ }
+
+ // Execute a GDL subroutine
+diff -up gdl-0.9.8/src/triangulation.cpp.return gdl-0.9.8/src/triangulation.cpp
+--- gdl-0.9.8/src/triangulation.cpp.return 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/triangulation.cpp 2018-04-11 20:43:03.965777173 -0600
+@@ -1108,6 +1108,7 @@ namespace lib {
+ BaseGDL* qgrid3_fun ( EnvT* e)
+ {
+ e->Throw("Please Write this function in GDL.");
++ return NULL;
+ }
+ #endif
+ }
+diff -up gdl-0.9.8/src/widget.cpp.return gdl-0.9.8/src/widget.cpp
+--- gdl-0.9.8/src/widget.cpp.return 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/widget.cpp 2018-04-11 20:45:36.447036861 -0600
+@@ -45,6 +45,7 @@ wxRealPoint GetRequestedUnitConversionFa
+ if (the_units==0) return wxRealPoint(1,1);
+ if (the_units==1) return wxRealPoint(sx*25.4,sy*25.4);
+ if (the_units==2) return wxRealPoint(sx*10.0,sy*10.0);
++ return wxRealPoint(0,0); // Should not reach
+ }
+
+ void GDLWidget::ChangeUnitConversionFactor( EnvT* e)
+@@ -2231,6 +2232,7 @@ endwait:
+ }
+ } while (infinity);
+ #endif
++ return NULL; // Should not reach
+ }
+
+ void widget_control( EnvT* e ) {
diff --git a/gdl-saverestore.patch b/gdl-saverestore.patch
new file mode 100644
index 0000000..ffaff91
--- /dev/null
+++ b/gdl-saverestore.patch
@@ -0,0 +1,11 @@
+diff -up gdl-0.9.8/src/saverestore.cpp.return gdl-0.9.8/src/saverestore.cpp
+--- gdl-0.9.8/src/saverestore.cpp.return 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/saverestore.cpp 2018-04-11 16:33:39.129920693 -0600
+@@ -164,6 +164,7 @@ namespace lib {
+
+ uint32_t writeEnd(XDR *xdrs) {
+ uint32_t cur=writeNewRecordHeader(xdrs, 6);
++ return cur;
+ }
+
+ int getVersion(XDR* xdrs) {
diff --git a/gdl-sign.patch b/gdl-sign.patch
new file mode 100644
index 0000000..2f459eb
--- /dev/null
+++ b/gdl-sign.patch
@@ -0,0 +1,63 @@
+diff -up gdl-0.9.8/src/dinterpreter.cpp.sign gdl-0.9.8/src/dinterpreter.cpp
+--- gdl-0.9.8/src/dinterpreter.cpp.sign 2018-04-14 20:29:23.612484457 -0600
++++ gdl-0.9.8/src/dinterpreter.cpp 2018-04-14 20:29:23.628484629 -0600
+@@ -666,7 +666,7 @@ DInterpreter::CommandCode DInterpreter::
+ DInterpreter::CommandCode DInterpreter::CmdCompile( const string& command)
+ {
+ string cmdstr = command;
+- int sppos = cmdstr.find(" ",0);
++ size_t sppos = cmdstr.find(" ",0);
+ if (sppos == string::npos)
+ {
+ cout << "Interactive COMPILE not implemented yet." << endl;
+@@ -676,7 +676,7 @@ DInterpreter::CommandCode DInterpreter::
+ bool retAll = false; // Remember if Retall is needed
+
+ // Parse each file name
+- int pos = sppos + 1;
++ size_t pos = sppos + 1;
+ while (pos < command.length())
+ {
+ sppos = command.find(" ",pos);
+@@ -737,7 +737,7 @@ DInterpreter::CommandCode DInterpreter::
+ bool retAll = false; // Remember if Retall is needed
+
+ // Parse each file name
+- int pos = sppos + 1;
++ size_t pos = sppos + 1;
+ while (pos < command.length())
+ {
+ sppos = command.find(" ",pos);
+@@ -799,7 +799,7 @@ DInterpreter::CommandCode DInterpreter::
+ {
+ string cmdstr = command;
+ string args;
+- int sppos = cmdstr.find(" ",0);
++ size_t sppos = cmdstr.find(" ",0);
+ if (sppos != string::npos) {
+ args = cmdstr.substr(sppos+1);
+ cmdstr = cmdstr.substr(0, sppos);
+diff -up gdl-0.9.8/src/GDLLexer.cpp.sign gdl-0.9.8/src/GDLLexer.cpp
+--- gdl-0.9.8/src/GDLLexer.cpp.sign 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/GDLLexer.cpp 2018-04-14 20:30:05.656936102 -0600
+@@ -434,7 +434,7 @@ void GDLLexer::mINCLUDE(bool _createToke
+ std::string name = f->getText();
+
+ // find comments on the same line
+- long pos = name.find_first_of(';', 0);
++ size_t pos = name.find_first_of(';', 0);
+ if( pos != std::string::npos) // remove them
+ name = name.substr(0, pos);
+
+diff -up gdl-0.9.8/src/GDLParser.cpp.sign gdl-0.9.8/src/GDLParser.cpp
+--- gdl-0.9.8/src/GDLParser.cpp.sign 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/GDLParser.cpp 2018-04-14 20:29:23.630484650 -0600
+@@ -6773,7 +6773,7 @@ void GDLParser::arrayindex_list() {
+ antlr::ASTPair currentAST;
+ RefDNode arrayindex_list_AST = RefDNode(antlr::nullAST);
+
+- int rank = 1;
++ SizeT rank = 1;
+
+
+ if ((LA(1) == LSQUARE)) {
diff --git a/gdl-std.patch b/gdl-std.patch
new file mode 100644
index 0000000..d60ec37
--- /dev/null
+++ b/gdl-std.patch
@@ -0,0 +1,11 @@
+diff -up gdl-0.9.8/src/basic_fun.cpp.std gdl-0.9.8/src/basic_fun.cpp
+--- gdl-0.9.8/src/basic_fun.cpp.std 2018-04-11 09:17:16.200257202 -0600
++++ gdl-0.9.8/src/basic_fun.cpp 2018-04-11 09:20:12.854448333 -0600
+@@ -111,6 +111,7 @@ namespace lib {
+ std::vector<char*> command_line_args;
+
+ // using namespace std;
++ using std::isinf;
+ using std::isnan;
+ using namespace antlr;
+
diff --git a/gdl-uninit.patch b/gdl-uninit.patch
new file mode 100644
index 0000000..002ec09
--- /dev/null
+++ b/gdl-uninit.patch
@@ -0,0 +1,12 @@
+diff -up gdl-0.9.8/src/GDLInterpreter.cpp.uninit gdl-0.9.8/src/GDLInterpreter.cpp
+--- gdl-0.9.8/src/GDLInterpreter.cpp.uninit 2018-04-11 16:33:42.112906758 -0600
++++ gdl-0.9.8/src/GDLInterpreter.cpp 2018-04-11 22:14:29.401901171 -0600
+@@ -2905,7 +2905,7 @@ void GDLInterpreter::tag_array_expr(Prog
+ BaseGDL* GDLInterpreter::r_dot_indexable_expr(ProgNodeP _t,
+ DotAccessDescT* aD
+ ) {
+- BaseGDL* res;
++ BaseGDL* res = NULL;
+ ProgNodeP r_dot_indexable_expr_AST_in = (_t == ProgNodeP(ASTNULL)) ? ProgNodeP(antlr::nullAST) : _t;
+
+ switch ( _t->getType()) {
diff --git a/gdl-vector.patch b/gdl-vector.patch
new file mode 100644
index 0000000..a183dd9
--- /dev/null
+++ b/gdl-vector.patch
@@ -0,0 +1,25 @@
+diff -up gdl-0.9.8/src/medianfilter.cpp.vector gdl-0.9.8/src/medianfilter.cpp
+--- gdl-0.9.8/src/medianfilter.cpp.vector 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/medianfilter.cpp 2018-05-20 15:19:38.072948145 -0600
+@@ -673,8 +673,8 @@ static inline void histogram_add( const
+ #elif defined(__ALTIVEC__)
+ static inline void histogram_add( const uint16_t x[16], uint16_t y[16] )
+ {
+- *(vector unsigned short*) &y[0] = vec_add( *(vector unsigned short*) &y[0], *(vector unsigned short*) &x[0] );
+- *(vector unsigned short*) &y[8] = vec_add( *(vector unsigned short*) &y[8], *(vector unsigned short*) &x[8] );
++ *(__vector unsigned short*) &y[0] = vec_add( *(__vector unsigned short*) &y[0], *(__vector unsigned short*) &x[0] );
++ *(__vector unsigned short*) &y[8] = vec_add( *(__vector unsigned short*) &y[8], *(__vector unsigned short*) &x[8] );
+ }
+ #else
+ static inline void histogram_add( const uint16_t x[16], uint16_t y[16] )
+@@ -707,8 +707,8 @@ static inline void histogram_sub( const
+ #elif defined(__ALTIVEC__)
+ static inline void histogram_sub( const uint16_t x[16], uint16_t y[16] )
+ {
+- *(vector unsigned short*) &y[0] = vec_sub( *(vector unsigned short*) &y[0], *(vector unsigned short*) &x[0] );
+- *(vector unsigned short*) &y[8] = vec_sub( *(vector unsigned short*) &y[8], *(vector unsigned short*) &x[8] );
++ *(__vector unsigned short*) &y[0] = vec_sub( *(__vector unsigned short*) &y[0], *(__vector unsigned short*) &x[0] );
++ *(__vector unsigned short*) &y[8] = vec_sub( *(__vector unsigned short*) &y[8], *(__vector unsigned short*) &x[8] );
+ }
+ #else
+ static inline void histogram_sub( const uint16_t x[16], uint16_t y[16] )
diff --git a/gdl-warnings.patch b/gdl-warnings.patch
new file mode 100644
index 0000000..1ffab49
--- /dev/null
+++ b/gdl-warnings.patch
@@ -0,0 +1,30 @@
+diff -up gdl-0.9.8/src/gdlc.g.warnings gdl-0.9.8/src/gdlc.g
+--- gdl-0.9.8/src/gdlc.g.warnings 2018-03-26 03:57:27.000000000 -0600
++++ gdl-0.9.8/src/gdlc.g 2018-04-14 21:04:41.196663086 -0600
+@@ -1217,7 +1217,7 @@ numeric_constant!//
+
+ arrayindex_list
+ {
+- int rank = 1;
++ SizeT rank = 1;
+ }
+ : LSQUARE! arrayindex ({++rank <= MAXRANK}? COMMA! arrayindex)* RSQUARE!
+ | { IsRelaxed()}? LBRACE! arrayindex
+@@ -1948,7 +1948,7 @@ tokens {
+ {
+ // Stuff for include files (@filename)
+ private:
+- std::auto_ptr<std::ifstream> inputFile; // stores ifsteam* and deletes
++ std::unique_ptr<std::ifstream> inputFile; // stores ifsteam* and deletes
+ // it when it is deleted itself
+
+ antlr::TokenStreamSelector* selector;
+@@ -2071,7 +2071,7 @@ INCLUDE!
+ std::string name = f->getText();
+
+ // find comments on the same line
+- long pos = name.find_first_of(';', 0);
++ size_t pos = name.find_first_of(';', 0);
+ if( pos != std::string::npos) // remove them
+ name = name.substr(0, pos);
+
diff --git a/gdl.spec b/gdl.spec
index a1b70b9..ddecb61 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,6 +1,6 @@
Name: gdl
-Version: 0.9.7
-Release: 11%{?dist}
+Version: 0.9.8
+Release: 1%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
@@ -10,16 +10,30 @@ Source0: http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{versi
Source1: gdl.csh
Source2: gdl.sh
Source3: makecvstarball
+Source4: xorg.conf
# Build with system antlr library. Request for upstream change here:
# https://sourceforge.net/tracker/index.php?func=detail&aid=2685215&group_i...
Patch1: gdl-antlr.patch
-# Fix problem with arra generation
-Patch2: gdl-array.patch
-# Fix build with gcc 6
-# https://sourceforge.net/p/gnudatalanguage/bugs/686/
-# https://sourceforge.net/p/gnudatalanguage/bugs/688/
-Patch4: gdl-gcc6.patch
-
+# Catch by reference
+# https://github.com/gnudatalanguage/gdl/pull/5
+Patch2: gdl-catch.patch
+# https://github.com/gnudatalanguage/gdl/pull/142
+Patch3: gdl-std.patch
+# Silence some (harmless) warnings about return values
+Patch4: gdl-return.patch
+# https://github.com/gnudatalanguage/gdl/pull/274
+Patch5: gdl-sign.patch
+# https://github.com/gnudatalanguage/gdl/pull/275
+Patch6: gdl-uninit.patch
+# Fix -Wstrict-aliasing warning
+# https://github.com/gnudatalanguage/gdl/pull/162
+Patch7: gdl-alias.patch
+# https://github.com/gnudatalanguage/gdl/pull/276
+Patch8: gdl-warnings.patch
+#
+Patch9: gdl-vector.patch
+# Fix test_save_restore segfault with gcc 8
+Patch10: gdl-saverestore.patch
#RHEL5 doesn't have the needed antlr version/headers, has old plplot
%if 0%{?rhel} == 5
@@ -49,6 +63,7 @@ BuildRequires: grib_api-static
%endif
%endif
BuildRequires: eigen3-static
+BuildRequires: libtirpc-devel
#TODO - Build with mpi support
#BuildRequires: mpich2-devel
BuildRequires: pslib-devel
@@ -61,7 +76,7 @@ BuildRequires: udunits2-devel
BuildRequires: wxGTK-devel
BuildRequires: cmake
# For tests
-BuildRequires: xorg-x11-server-Xvfb
+BuildRequires: xorg-x11-drv-dummy
BuildRequires: metacity
# Needed to pull in drivers
Requires: plplot
@@ -110,8 +125,17 @@ Provides: %{name}-runtime = %{version}-%{release}
%setup -q -n %{name}-%{version}
rm -rf src/antlr
%patch1 -p1 -b .antlr
-%patch2 -p1 -b .array
-%patch4 -p1 -b .gcc6
+%patch2 -p1 -b .catch
+%patch3 -p1 -b .std
+%patch4 -p1 -b .return
+%patch5 -p1 -b .sign
+%patch6 -p1 -b .uninit
+%patch7 -p1 -b .alias
+%patch8 -p1 -b .warnings
+%patch9 -p1 -b .vector
+%patch10 -p1 -b .saverestore
+# Stray link
+rm src/gdl
pushd src
for f in *.g
@@ -140,12 +164,12 @@ mkdir build build-python
#Build the standalone executable
pushd build
%{cmake} %{cmake_opts} ..
-make %{?_smp_mflags}
+make #{?_smp_mflags}
popd
#Build the python module
pushd build-python
%{cmake} %{cmake_opts} -DPYTHON_MODULE=ON ..
-make %{?_smp_mflags}
+make #{?_smp_mflags}
popd
@@ -168,37 +192,57 @@ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d
%check
cd build
-# test_bug_3275334 and window_background appear to need to read from display
-# test_bug_3147146 failure
-# https://sourceforge.net/p/gnudatalanguage/bugs/619/
-# test_bug_3285659 failure
-# https://sourceforge.net/p/gnudatalanguage/bugs/387/
-# test_routine_names failure
-# https://sourceforge.net/p/gnudatalanguage/bugs/647/
-# test_zip - https://sourceforge.net/p/gnudatalanguage/bugs/632/
-cat > xrun.sh <<'EOF'
+cp %SOURCE4 .
+if [ -x /usr/libexec/Xorg ]; then
+ Xorg=/usr/libexec/Xorg
+elif [ -x /usr/libexec/Xorg.bin ]; then
+ Xorg=/usr/libexec/Xorg.bin
+else
+ Xorg=/usr/bin/Xorg
+fi
+$Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 &
+export DISPLAY=:99
+
metacity &
sleep 2
-failing_tests='test_(bug_3275334|sem|window_background)'
-%ifarch aarch64 ppc
+# fft_leak - https://github.com/gnudatalanguage/gdl/issues/147
+# file_delete - https://github.com/gnudatalanguage/gdl/issues/148
+# fix - https://github.com/gnudatalanguage/gdl/issues/149
+# formats - https://github.com/gnudatalanguage/gdl/issues/144
+# n_tags - https://github.com/gnudatalanguage/gdl/issues/150
+# obj_isa - https://github.com/gnudatalanguage/gdl/issues/151
+# parse_url - https://github.com/gnudatalanguage/gdl/issues/153
+# resolve_routine - https://github.com/gnudatalanguage/gdl/issues/146
+# rounding - https://github.com/gnudatalanguage/gdl/issues/154
+# total - https://github.com/gnudatalanguage/gdl/issues/155
+failing_tests='test_(fft_leak|file_delete|finite|fix|formats|idlneturl|make_dll|n_tags|obj_isa|parse_url|resolve_routine|rounding|total)'
+%ifarch aarch64 ppc %{power64}
# test_fix fails currently on arm
# https://sourceforge.net/p/gnudatalanguage/bugs/622/
# https://bugzilla.redhat.com/show_bug.cgi?id=990749
failing_tests="$failing_tests|test_fix"
%endif
+%ifarch aarch64
+failing_tests="$failing_tests|test_(l64|xdr)"
+%endif
%ifarch %{arm}
# These fail on 32-bit: test_formats test_xdr
-failing_tests="$failing_tests|test_(fix|formats|xdr)"
+failing_tests="$failing_tests|test_(fix|formats)"
%endif
%ifarch %{ix86}
# These fail on 32-bit: test_formats test_xdr
-failing_tests="$failing_tests|test_(formats|xdr)"
+failing_tests="$failing_tests|test_(formats|l64|sem|xdr)"
+%endif
+%ifarch s390x
+eailing_tests="$failing_tests|test_(save_restore|window_background)"
%endif
make check ARGS="-V -E '$failing_tests'"
+%ifnarch s390x
+# test_save_restore hangs on s390x
make check ARGS="-V -R '$failing_tests'" || :
-EOF
-chmod +x xrun.sh
-xvfb-run ./xrun.sh
+%endif
+kill %1 || :
+cat xorg.log
%files
@@ -216,6 +260,14 @@ xvfb-run ./xrun.sh
%changelog
+* Sun May 20 2018 Orion Poplawski <orion(a)cora.nwra.com> - 0.9.8-1
+- Update to 0.9.8
+- Drop parallel make for now
+- Use libtirpc
+- Switch to Xorg dummy driver for tests, fail build on test failure
+- Add patch to fix ppc64 altivec vector usage
+- Add patches to fix various warnings
+
* Thu Mar 01 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 0.9.7-11
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
diff --git a/sources b/sources
index 275bfae..f616f2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gdl-0.9.7.tgz) = 1fef5ccccb31bdb39b5f855ba030fd7bed6b3deacf9aefce7f5afcd7ca48f5d25dfe20d32eb1d1fd25a533f69cabc341d1146e2f8e41f6c986163a9b84fda03b
+SHA512 (gdl-0.9.8.tgz) = df7728b6e79a8e812ed022f7fb60d23ad331337d15a77c94d1666a5a1ab63e14c1607520a752ceff999eb65bbde12fa9fffd8d82806455b1c0651cb5f2d92a10
diff --git a/xorg.conf b/xorg.conf
new file mode 100644
index 0000000..39bc48a
--- /dev/null
+++ b/xorg.conf
@@ -0,0 +1,135 @@
+# This xorg configuration file is meant to be used
+# to start a dummy X11 server for graphical testing.
+
+Section "ServerFlags"
+ Option "DontVTSwitch" "true"
+ Option "AllowMouseOpenFail" "true"
+ Option "PciForceNone" "true"
+ Option "AutoEnableDevices" "false"
+ Option "AutoAddDevices" "false"
+EndSection
+
+Section "InputDevice"
+ Identifier "dummy_mouse"
+ Option "CorePointer" "true"
+ Driver "void"
+EndSection
+
+Section "InputDevice"
+ Identifier "dummy_keyboard"
+ Option "CoreKeyboard" "true"
+ Driver "void"
+EndSection
+
+Section "Device"
+ Identifier "dummy_videocard"
+ Driver "dummy"
+ Option "ConstantDPI" "true"
+ #VideoRam 4096000
+ #VideoRam 256000
+ VideoRam 192000
+EndSection
+
+Section "Monitor"
+ Identifier "dummy_monitor"
+ HorizSync 5.0 - 1000.0
+ VertRefresh 5.0 - 200.0
+ #This can be used to get a specific DPI, but only for the default resolution:
+ #DisplaySize 508 317
+ #NOTE: the highest modes will not work without increasing the VideoRam
+ # for the dummy video card.
+ Modeline "32768x32768" 15226.50 32768 35800 39488 46208 32768 32771 32781 32953
+ Modeline "32768x16384" 7516.25 32768 35544 39192 45616 16384 16387 16397 16478
+ Modeline "16384x8192" 2101.93 16384 16416 24400 24432 8192 8390 8403 8602
+ Modeline "8192x4096" 424.46 8192 8224 9832 9864 4096 4195 4202 4301
+ Modeline "5496x1200" 199.13 5496 5528 6280 6312 1200 1228 1233 1261
+ Modeline "5280x1080" 169.96 5280 5312 5952 5984 1080 1105 1110 1135
+ Modeline "5280x1200" 191.40 5280 5312 6032 6064 1200 1228 1233 1261
+ Modeline "5120x3200" 199.75 5120 5152 5904 5936 3200 3277 3283 3361
+ Modeline "4800x1200" 64.42 4800 4832 5072 5104 1200 1229 1231 1261
+ Modeline "3840x2880" 133.43 3840 3872 4376 4408 2880 2950 2955 3025
+ Modeline "3840x2560" 116.93 3840 3872 4312 4344 2560 2622 2627 2689
+ Modeline "3840x2048" 91.45 3840 3872 4216 4248 2048 2097 2101 2151
+ Modeline "3840x1080" 100.38 3840 3848 4216 4592 1080 1081 1084 1093
+ Modeline "3600x1200" 106.06 3600 3632 3984 4368 1200 1201 1204 1214
+ Modeline "3288x1080" 39.76 3288 3320 3464 3496 1080 1106 1108 1135
+ Modeline "2048x2048" 49.47 2048 2080 2264 2296 2048 2097 2101 2151
+ Modeline "2048x1536" 80.06 2048 2104 2312 2576 1536 1537 1540 1554
+ Modeline "2560x1600" 47.12 2560 2592 2768 2800 1600 1639 1642 1681
+ Modeline "2560x1440" 42.12 2560 2592 2752 2784 1440 1475 1478 1513
+ Modeline "1920x1440" 69.47 1920 1960 2152 2384 1440 1441 1444 1457
+ Modeline "1920x1200" 26.28 1920 1952 2048 2080 1200 1229 1231 1261
+ Modeline "1920x1080" 23.53 1920 1952 2040 2072 1080 1106 1108 1135
+ Modeline "1680x1050" 20.08 1680 1712 1784 1816 1050 1075 1077 1103
+ Modeline "1600x1200" 22.04 1600 1632 1712 1744 1200 1229 1231 1261
+ Modeline "1600x900" 33.92 1600 1632 1760 1792 900 921 924 946
+ Modeline "1440x900" 30.66 1440 1472 1584 1616 900 921 924 946
+ ModeLine "1366x768" 72.00 1366 1414 1446 1494 768 771 777 803
+ Modeline "1280x1024" 31.50 1280 1312 1424 1456 1024 1048 1052 1076
+ Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841
+ Modeline "1280x768" 23.11 1280 1312 1392 1424 768 786 789 807
+ Modeline "1360x768" 24.49 1360 1392 1480 1512 768 786 789 807
+ Modeline "1024x768" 18.71 1024 1056 1120 1152 768 786 789 807
+ Modeline "768x1024" 19.50 768 800 872 904 1024 1048 1052 1076
+
+
+ #common resolutions for android devices (both orientations):
+ Modeline "800x1280" 25.89 800 832 928 960 1280 1310 1315 1345
+ Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841
+ Modeline "720x1280" 30.22 720 752 864 896 1280 1309 1315 1345
+ Modeline "1280x720" 27.41 1280 1312 1416 1448 720 737 740 757
+ Modeline "768x1024" 24.93 768 800 888 920 1024 1047 1052 1076
+ Modeline "1024x768" 23.77 1024 1056 1144 1176 768 785 789 807
+ Modeline "600x1024" 19.90 600 632 704 736 1024 1047 1052 1076
+ Modeline "1024x600" 18.26 1024 1056 1120 1152 600 614 617 631
+ Modeline "536x960" 16.74 536 568 624 656 960 982 986 1009
+ Modeline "960x536" 15.23 960 992 1048 1080 536 548 551 563
+ Modeline "600x800" 15.17 600 632 688 720 800 818 822 841
+ Modeline "800x600" 14.50 800 832 880 912 600 614 617 631
+ Modeline "480x854" 13.34 480 512 560 592 854 873 877 897
+ Modeline "848x480" 12.09 848 880 920 952 480 491 493 505
+ Modeline "480x800" 12.43 480 512 552 584 800 818 822 841
+ Modeline "800x480" 11.46 800 832 872 904 480 491 493 505
+ #resolutions for android devices (both orientations)
+ #minus the status bar
+ #38px status bar (and width rounded up)
+ Modeline "800x1242" 25.03 800 832 920 952 1242 1271 1275 1305
+ Modeline "1280x762" 22.93 1280 1312 1392 1424 762 780 783 801
+ Modeline "720x1242" 29.20 720 752 856 888 1242 1271 1276 1305
+ Modeline "1280x682" 25.85 1280 1312 1408 1440 682 698 701 717
+ Modeline "768x986" 23.90 768 800 888 920 986 1009 1013 1036
+ Modeline "1024x730" 22.50 1024 1056 1136 1168 730 747 750 767
+ Modeline "600x986" 19.07 600 632 704 736 986 1009 1013 1036
+ Modeline "1024x562" 17.03 1024 1056 1120 1152 562 575 578 591
+ Modeline "536x922" 16.01 536 568 624 656 922 943 947 969
+ Modeline "960x498" 14.09 960 992 1040 1072 498 509 511 523
+ Modeline "600x762" 14.39 600 632 680 712 762 779 783 801
+ Modeline "800x562" 13.52 800 832 880 912 562 575 578 591
+ Modeline "480x810" 12.59 480 512 552 584 810 828 832 851
+ Modeline "848x442" 11.09 848 880 920 952 442 452 454 465
+ Modeline "480x762" 11.79 480 512 552 584 762 779 783 801
+EndSection
+
+Section "Screen"
+ Identifier "dummy_screen"
+ Device "dummy_videocard"
+ Monitor "dummy_monitor"
+ DefaultDepth 24
+ SubSection "Display"
+ Viewport 0 0
+ Depth 24
+ #Modes "32768x32768" "32768x16384" "16384x8192" "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"
+ Modes "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"
+ #Virtual 32000 32000
+ #Virtual 16384 8192
+ Virtual 8192 4096
+ #Virtual 5120 3200
+ EndSubSection
+EndSection
+
+Section "ServerLayout"
+ Identifier "dummy_layout"
+ Screen "dummy_screen"
+ InputDevice "dummy_mouse"
+ InputDevice "dummy_keyboard"
+EndSection
commit 8fc7c76d08ed13fbb527d42fcc303defbd76c268
Author: Iryna Shcherbina <shcherbina.iryna(a)gmail.com>
Date: Thu Mar 1 03:07:56 2018 +0100
Update Python 2 dependency declarations to new packaging standards
diff --git a/gdl.spec b/gdl.spec
index ab596af..a1b70b9 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,6 +1,6 @@
Name: gdl
Version: 0.9.7
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
@@ -39,7 +39,7 @@ BuildRequires: java
BuildRequires: readline-devel, ncurses-devel
BuildRequires: gsl-devel, plplot-devel, GraphicsMagick-c++-devel
BuildRequires: netcdf-devel, hdf5-devel, libjpeg-devel
-BuildRequires: python2-devel, numpy, python-matplotlib
+BuildRequires: python2-devel, python2-numpy, python2-matplotlib
BuildRequires: fftw-devel, hdf-static
%if 0%{?fedora} >= 21
BuildRequires: grib_api-devel
@@ -216,6 +216,10 @@ xvfb-run ./xrun.sh
%changelog
+* Thu Mar 01 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 0.9.7-11
+- Update Python 2 dependency declarations to new packaging standards
+ (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
* Wed Feb 21 2018 Orion Poplawski <orion(a)cora.nwra.com> - 0.9.7-10
- Explicitly use python2
- Build with libtirpc
commit b2e0b6eb2b492e2f4e209291e89b1331130e98e3
Author: Orion Poplawski <orion(a)nwra.com>
Date: Wed Feb 21 09:15:32 2018 -0700
Explicitly use python2
Build with libtirpc
diff --git a/gdl.spec b/gdl.spec
index ba65a45..ab596af 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -126,6 +126,7 @@ popd
-DUDUNITS_INCLUDE_DIR=%{_includedir}/udunits2 \\\
-DGRIB=ON \\\
-DOPENMP=ON \\\
+ -DPYTHON_EXECUTABLE=%{_bindir}/python2 \\\
%{?cmake_qhull} \\\
%{nil}
# TODO - build an mpi version
@@ -133,9 +134,8 @@ popd
# --with-mpich=%{_libdir}/mpich2 \
%build
-# Build convenience .a libraries with -fPIC
-#export CFLAGS="$RPM_OPT_FLAGS -fPIC"
-#export CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
+export CFLAGS="%{optflags} -I%{_includedir}/tirpc -ltirpc"
+export CXXFLAGS="%{optflags} -I%{_includedir}/tirpc -ltirpc"
mkdir build build-python
#Build the standalone executable
pushd build
@@ -144,7 +144,7 @@ make %{?_smp_mflags}
popd
#Build the python module
pushd build-python
-%{cmake} %{cmake_opts} -DPYTHON_MODULE=ON -DPYTHON_VERSION=%{python2_version} ..
+%{cmake} %{cmake_opts} -DPYTHON_MODULE=ON ..
make %{?_smp_mflags}
popd
@@ -216,6 +216,10 @@ xvfb-run ./xrun.sh
%changelog
+* Wed Feb 21 2018 Orion Poplawski <orion(a)cora.nwra.com> - 0.9.7-10
+- Explicitly use python2
+- Build with libtirpc
+
* Tue Feb 20 2018 Orion Poplawski <orion(a)cora.nwra.com> - 0.9.7-10
- Rebuild for hdf5 1.8.20
commit 0b959cb930fc54edfc8c5f50640848902d8d8c59
Author: Orion Poplawski <orion(a)nwra.com>
Date: Tue Feb 20 14:14:44 2018 -0700
Rebuild for hdf5 1.8.20
diff --git a/gdl.spec b/gdl.spec
index c2f3f2e..ba65a45 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,6 +1,6 @@
Name: gdl
Version: 0.9.7
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
@@ -216,6 +216,9 @@ xvfb-run ./xrun.sh
%changelog
+* Tue Feb 20 2018 Orion Poplawski <orion(a)cora.nwra.com> - 0.9.7-10
+- Rebuild for hdf5 1.8.20
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.7-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit 9c7e1313931b79b85b96b0ce8bc762a26b62305e
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Tue Feb 13 23:25:24 2018 +0100
Remove BuildRoot definition
None of currently supported distributions need that.
It was needed last for EL5 which is EOL now
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/gdl.spec b/gdl.spec
index b58eafc..c2f3f2e 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -20,7 +20,6 @@ Patch2: gdl-array.patch
# https://sourceforge.net/p/gnudatalanguage/bugs/688/
Patch4: gdl-gcc6.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#RHEL5 doesn't have the needed antlr version/headers, has old plplot
%if 0%{?rhel} == 5
commit dab641f72a59db32895511f80796d7f03f15ecdc
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 10:46:35 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/gdl.spec b/gdl.spec
index 1cd18b1..b58eafc 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,6 +1,6 @@
Name: gdl
Version: 0.9.7
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
@@ -217,6 +217,9 @@ xvfb-run ./xrun.sh
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.7-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 0.9.7-8
- Add Provides for the old name without %%_isa
commit 3f89538852f6615924b9203ba2f691dc06fa61df
Author: Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl>
Date: Sun Aug 20 10:32:33 2017 -0400
Add Provides for the old name without %_isa
diff --git a/gdl.spec b/gdl.spec
index e9be0bb..1cd18b1 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,6 +1,6 @@
Name: gdl
Version: 0.9.7
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
@@ -93,6 +93,7 @@ Common files for GDL
%package -n python2-gdl
%{?python_provide:%python_provide python2-gdl}
# Remove before F30
+Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
Summary: GDL python module
@@ -216,6 +217,9 @@ xvfb-run ./xrun.sh
%changelog
+* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 0.9.7-8
+- Add Provides for the old name without %%_isa
+
* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 0.9.7-7
- Python 2 binary package renamed to python2-gdl
See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
commit 8880b4243a412279d62eb1aa65c1718b4c4afaf4
Author: Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl>
Date: Sat Aug 19 09:38:20 2017 -0400
Python 2 binary package renamed to python2-gdl
diff --git a/gdl.spec b/gdl.spec
index fd0d07e..e9be0bb 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,6 +1,6 @@
Name: gdl
Version: 0.9.7
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
@@ -90,7 +90,11 @@ BuildArch: noarch
Common files for GDL
-%package python
+%package -n python2-gdl
+%{?python_provide:%python_provide python2-gdl}
+# Remove before F30
+Provides: %{name}-python%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-python < %{version}-%{release}
Summary: GDL python module
Group: Applications/Engineering
# Needed to pull in drivers
@@ -98,7 +102,7 @@ Requires: plplot
Requires: %{name}-common = %{version}-%{release}
Provides: %{name}-runtime = %{version}-%{release}
-%description python
+%description -n python2-gdl
%{summary}.
@@ -207,11 +211,15 @@ xvfb-run ./xrun.sh
%files common
%{_datadir}/gnudatalanguage/
-%files python
+%files -n python2-gdl
%{python2_sitearch}/GDL.so
%changelog
+* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 0.9.7-7
+- Python 2 binary package renamed to python2-gdl
+ See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
5 years