Architecture specific change in rpms/lpsolve.git
by githook-noreply@fedoraproject.org
The package rpms/lpsolve.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/lpsolve.git/commit/?id=aa29c50dd3....
Change:
-%ifarch sparcv9 sparc64 s390 s390x
Thanks.
Full change:
============
commit aa29c50dd3e0e75ddac0d405c7bc7ed2fda3edaa
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Mon Feb 26 09:39:03 2018 +0000
Resolves: rhbz#1548689 use fedora compile/link flags
diff --git a/lpsolve-5.5.0.11.cflags.patch b/lpsolve-5.5.0.11.cflags.patch
index d8f6567..7bc0f0f 100644
--- a/lpsolve-5.5.0.11.cflags.patch
+++ b/lpsolve-5.5.0.11.cflags.patch
@@ -1,24 +1,22 @@
-diff -ru lp_solve_5.5.orig/lp_solve/ccc lp_solve_5.5/lp_solve/ccc
---- lp_solve_5.5.orig/lp_solve/ccc 2009-02-23 16:31:18.000000000 +0000
-+++ lp_solve_5.5/lp_solve/ccc 2009-02-23 16:31:29.000000000 +0000
-@@ -28,7 +28,7 @@
+--- lp_solve_5.5/lpsolve55/ccc.orig 2018-02-26 09:27:51.074682302 +0000
++++ lp_solve_5.5/lpsolve55/ccc 2018-02-26 09:36:36.329990782 +0000
+@@ -35,16 +35,14 @@
+ so=y
fi
- rm /tmp/isnan.c /tmp/isnan >/dev/null 2>&1
-opts='-O3'
-+opts=$RPM_OPT_FLAGS
+-
+-$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++$c $CFLAGS -fPIC -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+ ar rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
+ ranlib bin/$PLATFORM/liblpsolve55.a
- def=
- if [ "$PLATFORM" = "SCO_UNIX" ]
-diff -ru lp_solve_5.5.orig/lpsolve55/ccc lp_solve_5.5/lpsolve55/ccc
---- lp_solve_5.5.orig/lpsolve55/ccc 2009-02-23 16:31:18.000000000 +0000
-+++ lp_solve_5.5/lpsolve55/ccc 2009-02-23 16:31:29.000000000 +0000
-@@ -35,7 +35,7 @@
- so=y
+ if [ "$so" != "" ]
+ then
+- $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
++ $c $CFLAGS -fPIC -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++ $c $LDFLAGS -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
fi
--opts='-O3'
-+opts=$RPM_OPT_FLAGS
-
- $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
- ar rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
+ rm *.o 2>/dev/null
diff --git a/lpsolve.spec b/lpsolve.spec
index 373f1e3..cdeea9a 100644
--- a/lpsolve.spec
+++ b/lpsolve.spec
@@ -1,7 +1,7 @@
Name: lpsolve
Summary: A Mixed Integer Linear Programming (MILP) solver
Version: 5.5.2.0
-Release: 17%{?dist}
+Release: 18%{?dist}
Source: http://downloads.sourceforge.net/lpsolve/lp_solve_%{version}_source.tar.gz
Group: System Environment/Libraries
URL: http://sourceforge.net/projects/lpsolve
@@ -26,12 +26,9 @@ Includes and definitions for developing with lpsolve
%setup -q -n lp_solve_5.5
%patch0 -p1 -b .cflags.patch
%patch1 -p1 -b .defines.patch
-#sparc and s390 need -fPIC lets sed it
-%ifarch sparcv9 sparc64 s390 s390x
-sed -i -e 's|-fpic|-fPIC|g' lpsolve55/ccc
-%endif
%build
+%set_build_flags
cd lpsolve55
sh -x ccc
rm bin/ux*/liblpsolve55.a
@@ -63,6 +60,9 @@ install -p -m 644 \
%{_includedir}/lpsolve
%changelog
+* Mon Feb 26 2018 Caolán McNamara <caolanm(a)redhat.com> - 5.5.2.0-18
+- Resolves: rhbz#1548689 use fedora compile/link flags
+
* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.5.2.0-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 4 months
Architecture specific change in rpms/golang-github-armon-circbuf.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-armon-circbuf.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-armon-circbuf.git/c....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit a422c1e41e9c7d5cc29d9acd94811457f0236520
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Feb 26 12:27:32 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-armon-circbuf.spec b/golang-github-armon-circbuf.spec
index 83e079f..74806a3 100644
--- a/golang-github-armon-circbuf.spec
+++ b/golang-github-armon-circbuf.spec
@@ -1,156 +1,54 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%global provider github
-%global provider_tld com
-%global project armon
-%global repo circbuf
# https://github.com/armon/circbuf
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global provider_prefix github.com/armon/circbuf
+%global gobaseipath %{provider_prefix}
%global commit bbbad097214e2918d8543d5201d12bfd7bca254d
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20150827
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.12.git%{shortcommit}%{?dist}
-Summary: Golang circular (ring) buffer
+Release: 0.13.%{commitdate}git%{shortcommit}%{?dist}
+Summary: Golang circular (ring) buffer
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 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
-%endif
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-Summary: Unit tests for %{name} package
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
+%goinstall
chmod -x LICENSE
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
+%gochecks
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Mon Feb 26 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.13.20150827gitbbbad09
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.12.gitbbbad09
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -191,6 +89,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
* Wed Apr 15 2015 jchaloup <jchaloup(a)redhat.com> - 0-0.1.gitf092b4f
- First package for Fedora
resolves: #1211985
-
-
-
6 years, 4 months
Architecture specific change in rpms/golang-github-akrennmair-gopcap.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-akrennmair-gopcap.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-akrennmair-gopcap.g....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit b68878d0f645d5ae853cb5c5760bd1c9be1f8780
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Feb 26 12:18:42 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-akrennmair-gopcap.spec b/golang-github-akrennmair-gopcap.spec
index c34dc22..2727d05 100644
--- a/golang-github-akrennmair-gopcap.spec
+++ b/golang-github-akrennmair-gopcap.spec
@@ -1,169 +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
-
-%global provider github
-%global provider_tld com
-%global project akrennmair
-%global repo gopcap
# https://github.com/akrennmair/gopcap
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global provider_prefix github.com/akrennmair/gopcap
+%global gobaseipath %{provider_prefix}
%global commit 00e11033259acb75598ba416495bb708d864a010
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20150728
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.7.git%{shortcommit}%{?dist}
+Release: 0.8.%{commitdate}git%{shortcommit}%{?dist}
Summary: A simple wrapper around libpcap for the Go programming language
# Detected licences
# - BSD (3 clause) at 'LICENSE'
License: BSD
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
BuildRequires: libpcap-devel
-%endif
Requires: libpcap-devel
-Provides: golang(%{import_path}) = %{version}-%{release}
-
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%if 0%{?with_check}
-%endif
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
+%gochecks %{gobaseipath}
+# github.com/akrennmair/gopcap
+#./decode.go:118: Sprintf call needs 2 args but has 3 args
#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
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%endif
%changelog
+* Mon Feb 26 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.8.20150728git00e1103
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.7.git00e1103
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 4 months
Architecture specific change in rpms/golang-github-agl-ed25519.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-agl-ed25519.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-agl-ed25519.git/com....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit 9de30c4be7de28a6a61439b4144cb5b2d47c709a
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Feb 26 12:12:43 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-agl-ed25519.spec b/golang-github-agl-ed25519.spec
index 3e046e3..98fc6cc 100644
--- a/golang-github-agl-ed25519.spec
+++ b/golang-github-agl-ed25519.spec
@@ -1,158 +1,54 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%global provider github
-%global provider_tld com
-%global project agl
-%global repo ed25519
# https://github.com/agl/ed25519
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global provider_prefix github.com/agl/ed25519
+%global gobaseipath %{provider_prefix}
%global commit d2b94fd789ea21d12fac1a4443dd3a3f79cda72c
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20141108
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.8.git%{shortcommit}%{?dist}
+Release: 0.9.%{commitdate}git%{shortcommit}%{?dist}
Summary: Ed25519 for Go
License: BSD
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
-BuildRequires: golang(code.google.com/p/go.crypto/curve25519)
-%endif
-
-Requires: golang(code.google.com/p/go.crypto/curve25519)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/edwards25519) = %{version}-%{release}
-Provides: golang(%{import_path}/extra25519) = %{version}-%{release}
+#BuildRequires: golang(code.google.com/p/go.crypto/curve25519)
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-Summary: Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-cp -r testdata %{buildroot}/%{gopath}/src/%{import_path}/.
-echo "%%{gopath}/src/%%{import_path}/testdata" >> unit-test.file-list
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall $(find . -iname testdata -d)
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%gotest %{import_path}/extra25519
-%endif
+%gochecks %{gobaseipath}/extra25519
#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
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%endif
%changelog
+* Mon Feb 26 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.9.20141108gitd2b94fd
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.8.gitd2b94fd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -177,5 +73,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
* Thu Oct 08 2015 jchaloup <jchaloup(a)redhat.com> - 0-0.1.gitd2b94fd
- First package for Fedora
resolves: #1270046
-
-
6 years, 4 months
Architecture specific change in rpms/golang-github-AdRoll-goamz.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-AdRoll-goamz.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-AdRoll-goamz.git/co....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit ea243d47aed3590ebe9f871a6c7c1246c092505d
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Feb 26 11:59:32 2018 +0100
- Autogenerate some parts using the new macros
diff --git a/golang-github-AdRoll-goamz.spec b/golang-github-AdRoll-goamz.spec
index 05e2222..71261bb 100644
--- a/golang-github-AdRoll-goamz.spec
+++ b/golang-github-AdRoll-goamz.spec
@@ -1,178 +1,61 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
# list of provided golang packages
%global provided_packages aws cloudfront s3 testutil
-%global provider github
-%global provider_tld com
-%global project AdRoll
-%global repo goamz
# https://github.com/AdRoll/goamz
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global provider_prefix github.com/AdRoll/goamz
+%global gobaseipath %{provider_prefix}
%global commit aa6e716d710a0c7941cb2075cfbb9661f16d21f1
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20151129
+
+%gocraftmeta -i
-Name: golang-%{provider}-%{project}-%{repo}
+Name: %{goname}
Version: 0
-Release: 0.11.git%{shortcommit}%{?dist}
+Release: 0.12.%{commitdate}git%{shortcommit}%{?dist}
Summary: Fork of the GOAMZ with additional functionality with DynamoDB
License: LGPLv3
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
BuildRequires: golang(gopkg.in/check.v1)
-%endif
-
-Requires: golang(gopkg.in/check.v1)
-
-Provides: golang(%{import_path}/aws) = %{version}-%{release}
-Provides: golang(%{import_path}/cloudfront) = %{version}-%{release}
-Provides: golang(%{import_path}/s3) = %{version}-%{release}
-Provides: golang(%{import_path}/s3/s3test) = %{version}-%{release}
-Provides: golang(%{import_path}/testutil) = %{version}-%{release}
-
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-Summary: Unit tests for %{name} package
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup
+
# remove unused source code
rm -rf $(ls -d */ | egrep -v "$(echo %{provided_packages} | sed "s/ */ /g" | sed "s/ /|/g")")
-%build
-
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-for file in $(find . -iname "*.pem"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall $(find . -iname testdata -d)
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}/aws
-%gotest %{import_path}/cloudfront
-# needs 4444 port
-#%%gotest %%{import_path}/s3
-%gotest %{import_path}/testutil
-%endif
+%gochecks %{gobaseipath}/s3
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc TODO.md README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc TODO.md README.md
-%endif
%changelog
+* Mon Feb 26 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.12.20151129gitaa6e716
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.11.gitaa6e716
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -209,4 +92,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
* Mon Sep 14 2015 jchaloup <jchaloup(a)redhat.com> - 0-0.1.gitf8c4952
- First package for Fedora
resolves: #1262714
-
6 years, 4 months
Architecture specific change in rpms/golang-github-abbot-go-http-auth.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-abbot-go-http-auth.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-abbot-go-http-auth.....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit 5ee77b70fc9c8f69804a8e61bb51acc348983db5
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Feb 26 10:48:43 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-abbot-go-http-auth.spec b/golang-github-abbot-go-http-auth.spec
index 4eeed9d..abb8d22 100644
--- a/golang-github-abbot-go-http-auth.spec
+++ b/golang-github-abbot-go-http-auth.spec
@@ -1,161 +1,55 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%global provider github
-%global provider_tld com
-%global project abbot
-%global repo go-http-auth
# https://github.com/abbot/go-http-auth
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global provider_prefix github.com/abbot/go-http-auth
+%global gobaseipath %{provider_prefix}
%global commit c0ef4539dfab4d21c8ef20ba2924f9fc6f186d35
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20140619
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.12.git%{shortcommit}%{?dist}
+Release: 0.13.%{commitdate}git%{shortcommit}%{?dist}
Summary: Basic and Digest HTTP Authentication for golang http
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 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL: %{gourl}
+Source0: %{gosource}
%description
This is an implementation of HTTP Basic
and HTTP Digest authentication in Go language.
It is designed as a simple wrapper for http.RequestHandler functions.
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
-%endif
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-Summary: Unit tests for %{name} package
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-cp -pav test.htdigest %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%{gopath}/src/%%{import_path}/test.htdigest" >> unit-test.file-list
-cp -pav test.htpasswd %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%{gopath}/src/%%{import_path}/test.htpasswd" >> unit-test.file-list
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall test.htdigest test.htpasswd
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
+%gochecks
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Mon Feb 26 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.13.20140619gitc0ef453
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.12.gitc0ef453
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -199,5 +93,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
* Thu Dec 18 2014 jchaloup <jchaloup(a)redhat.com> - 0-0.1.gitc0ef453
- First package for Fedora
resolves: #1175673
-
-
6 years, 4 months
Architecture specific change in rpms/csound.git
by githook-noreply@fedoraproject.org
The package rpms/csound.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/csound.git/commit/?id=702c157ef8e....
Change:
+%ifarch %{arm}
Thanks.
Full change:
============
commit 702c157ef8eff133b699a82872ab0889e2154105
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Mon Feb 26 10:41:08 2018 +0000
initial rebase to csound 6.10
diff --git a/.gitignore b/.gitignore
index a97d5a8..23d4230 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
/Csound.*.zip
/Csound6*.tar.gz
/manual_src.tar.gz
+/csound-6.10.0.tar.gz
+/manual-6.10.0.tar.gz
diff --git a/0001-Add-support-for-using-xdg-open-for-opening-help.patch b/0001-Add-support-for-using-xdg-open-for-opening-help.patch
new file mode 100644
index 0000000..b536d43
--- /dev/null
+++ b/0001-Add-support-for-using-xdg-open-for-opening-help.patch
@@ -0,0 +1,32 @@
+From c99fce57fd80ea1ac87131b682aa538053fad218 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson(a)gmail.com>
+Date: Wed, 31 Jan 2018 13:33:06 +0000
+Subject: [PATCH 1/4] Add support for using xdg-open for opening help
+
+xdg-open is a desktop agnostic way of opening the user's default application.
+By trying xdg-open first we're more likely to open html files in the user's
+default choice.
+
+Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com>
+---
+ installer/misc/vim/cshelp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/installer/misc/vim/cshelp b/installer/misc/vim/cshelp
+index 888b8fe25..8c6553de8 100755
+--- a/installer/misc/vim/cshelp
++++ b/installer/misc/vim/cshelp
+@@ -3,7 +3,9 @@
+ BROWSER_CMD=""
+
+ if [ "${DISPLAY}" != "" ] ; then
+- if ( which links | grep -q -G -e "^/usr" ) ; then
++ if ( which xdg-open | grep -E -e "^(/usr)?/bin" ); then
++ BROWSER_CMD="xdg-open" ;
++ elif ( which links | grep -q -G -e "^/usr" ) ; then
+ BROWSER_CMD="links -g" ;
+ elif ( which konqueror | grep -q -G -e "^/opt" ) ; then
+ BROWSER_CMD="konqueror" ;
+--
+2.14.3
+
diff --git a/0002-Default-to-PulseAudio.patch b/0002-Default-to-PulseAudio.patch
new file mode 100644
index 0000000..f5630e2
--- /dev/null
+++ b/0002-Default-to-PulseAudio.patch
@@ -0,0 +1,26 @@
+From d28483cf7b017b93f485433c61a33735bfc2fa49 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson(a)gmail.com>
+Date: Thu, 1 Feb 2018 09:26:57 +0000
+Subject: [PATCH 2/4] Default to PulseAudio
+
+Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com>
+---
+ Top/csound.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Top/csound.c b/Top/csound.c
+index 0d04b5d43..74b1fb360 100644
+--- a/Top/csound.c
++++ b/Top/csound.c
+@@ -3420,7 +3420,7 @@ PUBLIC void csoundReset(CSOUND *csound)
+ csoundCreateGlobalVariable(csound, "_RTAUDIO", (size_t) max_len);
+ s = csoundQueryGlobalVariable(csound, "_RTAUDIO");
+ #ifndef LINUX
+- strcpy(s, "PortAudio");
++ strcpy(s, "pulse");
+ #else
+ strcpy(s, "alsa");
+ #endif
+--
+2.14.3
+
diff --git a/0003-use-standard-plugins-path.patch b/0003-use-standard-plugins-path.patch
new file mode 100644
index 0000000..cd9eca7
--- /dev/null
+++ b/0003-use-standard-plugins-path.patch
@@ -0,0 +1,62 @@
+From 47312bf759b4c37cddd48c2b431337247250222c Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson(a)gmail.com>
+Date: Thu, 1 Feb 2018 09:29:23 +0000
+Subject: [PATCH 3/4] use standard plugins path
+
+---
+ CMakeLists.txt | 8 +-------
+ Top/csmodule.c | 4 ++--
+ installer/misc/mkpackage.py | 2 +-
+ 3 files changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8bd86d0c4..feb962078 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -180,13 +180,7 @@ else()
+ endif()
+ message(STATUS "LIBRARY INSTALL DIR: ${LIBRARY_INSTALL_DIR}")
+
+-if(USE_DOUBLE)
+- message(STATUS "Building with 64-bit floats")
+- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins64-${APIVERSION}")
+-else()
+- message(STATUS "Building with 32-bit floats")
+- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
+-endif()
++set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
+
+ execute_process (
+ COMMAND python -c
+diff --git a/Top/csmodule.c b/Top/csmodule.c
+index b62df8dab..4d32d75c9 100644
+--- a/Top/csmodule.c
++++ b/Top/csmodule.c
+@@ -146,9 +146,9 @@ static const char *plugindir64_envvar = "OPCODE6DIR64";
+ # define ENABLE_OPCODEDIR_WARNINGS 0
+ # ifndef CS_DEFAULT_PLUGINDIR
+ # ifndef USE_DOUBLE
+-# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins"
++# define CS_DEFAULT_PLUGINDIR "/usr/lib/csound/plugins"
+ # else
+-# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins64"
++# define CS_DEFAULT_PLUGINDIR "/usr/lib64/csound/plugins"
+ # endif
+ # endif
+ #endif
+diff --git a/installer/misc/mkpackage.py b/installer/misc/mkpackage.py
+index 801311b18..fe3d86077 100755
+--- a/installer/misc/mkpackage.py
++++ b/installer/misc/mkpackage.py
+@@ -27,7 +27,7 @@ libDir2 = libDir + '/csound/lib'
+ # single precision plugin libraries
+ pluginDir32 = libDir + '/csound/plugins'
+ # double precision plugin libraries
+-pluginDir64 = libDir + '/csound/plugins64'
++pluginDir64 = libDir + '/csound/plugins'
+ # documentation
+ docDir = instPrefix + '/share/doc/csound'
+ # tclcsound.so
+--
+2.14.3
+
diff --git a/0004-fix-naming-conflicts.patch b/0004-fix-naming-conflicts.patch
new file mode 100644
index 0000000..88fc896
--- /dev/null
+++ b/0004-fix-naming-conflicts.patch
@@ -0,0 +1,150 @@
+From 153a2fbf4092b3967cb2c6d746df0eaecc67e505 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson(a)gmail.com>
+Date: Thu, 1 Feb 2018 09:36:26 +0000
+Subject: [PATCH] fix naming conflicts
+
+---
+ installer/linux/d32.sh | 2 +-
+ installer/linux/d64.sh | 2 +-
+ installer/linux/f32.sh | 2 +-
+ installer/linux/f64.sh | 2 +-
+ installer/misc/mkpackage.py | 10 +++++-----
+ util/CMakeLists.txt | 12 ++++++------
+ util1/CMakeLists.txt | 4 ++--
+ 7 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/installer/linux/d32.sh b/installer/linux/d32.sh
+index 8828e6db9..36b329eeb 100644
+--- a/installer/linux/d32.sh
++++ b/installer/linux/d32.sh
+@@ -13,7 +13,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/loc
+
+ rm ../../../CSDIST/$DIR/bin/*
+
+-cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo} ../../../CSDIST/$DIR/bin
++cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,cs-mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo} ../../../CSDIST/$DIR/bin
+
+ strip ../../../CSDIST/$DIR/bin/*
+
+diff --git a/installer/linux/d64.sh b/installer/linux/d64.sh
+index 7a18783ed..2a94bd1ba 100644
+--- a/installer/linux/d64.sh
++++ b/installer/linux/d64.sh
+@@ -12,7 +12,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/loc
+
+ rm ../../../CSDIST/$DIR/bin/*
+
+-cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo,cseditor} ../../../CSDIST/$DIR/bin
++cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo,cseditor} ../../../CSDIST/$DIR/bin
+
+ strip ../../../CSDIST/$DIR/bin/*
+
+diff --git a/installer/linux/f32.sh b/installer/linux/f32.sh
+index c5bd83528..5368566fb 100644
+--- a/installer/linux/f32.sh
++++ b/installer/linux/f32.sh
+@@ -12,7 +12,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/loc
+
+ rm ../../../CSDIST/$DIR/bin/*
+
+-cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo} ../../../CSDIST/$DIR/bin
++cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,cs-mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo} ../../../CSDIST/$DIR/bin
+
+ strip ../../../CSDIST/$DIR/bin/*
+
+diff --git a/installer/linux/f64.sh b/installer/linux/f64.sh
+index 76b6ed1ef..090662533 100644
+--- a/installer/linux/f64.sh
++++ b/installer/linux/f64.sh
+@@ -12,7 +12,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/loc
+
+ rm ../../../CSDIST/$DIR/bin/*
+
+-cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo,cseditor} ../../../CSDIST/$DIR/bin
++cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,cs-mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo,cseditor} ../../../CSDIST/$DIR/bin
+
+ strip ../../../CSDIST/$DIR/bin/*
+
+diff --git a/installer/misc/mkpackage.py b/installer/misc/mkpackage.py
+index fe3d86077..4dafa995c 100755
+--- a/installer/misc/mkpackage.py
++++ b/installer/misc/mkpackage.py
+@@ -71,13 +71,13 @@ headerFiles += ['interfaces/CppSound.hpp', 'interfaces/filebuilding.h']
+ headerFiles += ['interfaces/CsoundFile.hpp']
+
+ utils1 = ['csound', 'winsound', 'cstclsh', 'cswish',
+- 'atsa', 'cvanal', 'dnoise', 'envext', 'extractor',
++ 'atsa', 'cvanal', 'dnoise', 'cs-envext', 'cs-extractor',
+ 'het_export', 'het_import', 'hetro', 'lpanal',
+- 'lpc_export', 'lpc_import', 'mixer', 'pvanal',
+- 'pvlook', 'pv_export', 'pv_import', 'scale', 'sndinfo',
+- 'srconv', 'cseditor']
++ 'lpc_export', 'lpc_import', 'cs-mixer', 'pvanal',
++ 'pvlook', 'pv_export', 'pv_import', 'cs-scale', 'cs-sndinfo',
++ 'cs-srconv', 'cseditor']
+
+-utils2 = ['scsort', 'extract', 'cs', 'csb64enc', 'makecsd', 'scot']
++utils2 = ['scsort', 'cs-extract', 'cs', 'csb64enc', 'makecsd', 'cs-scot']
+
+ docFiles = ['COPYING', 'ChangeLog', 'INSTALL', 'readme-csound6.txt']
+
+diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
+index da2e116a2..553a53f36 100644
+--- a/util/CMakeLists.txt
++++ b/util/CMakeLists.txt
+@@ -25,15 +25,15 @@ if(BUILD_UTILITIES)
+ make_utility(csanalyze csanalyze.c)
+ make_utility(cvanal cvl_main.c)
+ make_utility(dnoise dnoise_main.c)
+- make_utility(envext env_main.c)
+- make_utility(extractor xtrc_main.c)
++ make_utility(cs-envext env_main.c)
++ make_utility(cs-extractor xtrc_main.c)
+ make_utility(het_export hetx_main.c)
+ make_utility(het_import heti_main.c)
+ make_utility(hetro het_main.c)
+ make_utility(lpanal lpc_main.c)
+ make_utility(lpc_export lpcx_main.c)
+ make_utility(lpc_import lpci_main.c)
+- make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer)
++ make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" cs-mixer)
+ if(LINUX)
+ target_link_libraries(mixer-bin m)
+ endif()
+@@ -41,9 +41,9 @@ if(BUILD_UTILITIES)
+ make_utility(pvlook pvl_main.c)
+ make_utility(pv_export pvx_main.c)
+ make_utility(pv_import pvi_main.c)
+- make_utility(scale scale_main.c)
+- make_utility(sndinfo sndinfo_main.c)
+- make_utility(srconv srconv_main.c)
++ make_utility(cs-scale scale_main.c)
++ make_utility(cs-sndinfo sndinfo_main.c)
++ make_utility(cs-srconv srconv_main.c)
+
+
+ find_library(LIBSNDFILE_LIBRARY sndfile libsndfile-1)
+diff --git a/util1/CMakeLists.txt b/util1/CMakeLists.txt
+index 639ed0ac6..2078c0136 100644
+--- a/util1/CMakeLists.txt
++++ b/util1/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ #extra utilities
+
+ make_utility(scsort sortex/smain.c)
+-make_utility(extract sortex/xmain.c)
++make_utility(cs-extract sortex/xmain.c)
+
+ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG OR MSVC)
+ make_utility(cs csd_util/cs.c)
+@@ -19,6 +19,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG OR MSVC)
+
+ set(scot_SRCS
+ scot/scot_main.c scot/scot.c)
+- make_utility(scot "${scot_SRCS}")
++ make_utility(cs-scot "${scot_SRCS}")
+ endif()
+
+--
+2.14.3
+
diff --git a/csound-6.03-64-bit-plugin-path.patch b/csound-6.03-64-bit-plugin-path.patch
deleted file mode 100644
index 8102787..0000000
--- a/csound-6.03-64-bit-plugin-path.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- CMakeLists.txt.orig 2014-05-04 05:49:41.159716977 -0600
-+++ CMakeLists.txt 2014-05-05 20:00:00.000000000 -0600
-@@ -27,11 +27,7 @@ else()
- endif()
- message(STATUS "LIBRARY INSTALL DIR: ${LIBRARY_INSTALL_DIR}")
-
--if(USE_DOUBLE)
-- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins64-${APIVERSION}")
--else()
-- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
--endif()
-+set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
- set(PYTHON_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
- set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
- set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
---- installer/misc/mkpackage.py.orig 2014-05-04 05:49:43.313737080 -0600
-+++ installer/misc/mkpackage.py 2014-05-05 20:00:00.000000000 -0600
-@@ -27,7 +27,7 @@ libDir2 = libDir + '/csound/lib'
- # single precision plugin libraries
- pluginDir32 = libDir + '/csound/plugins'
- # double precision plugin libraries
--pluginDir64 = libDir + '/csound/plugins64'
-+pluginDir64 = libDir + '/csound/plugins'
- # documentation
- docDir = instPrefix + '/share/doc/csound'
- # tclcsound.so
---- Top/csmodule.c.orig 2014-05-04 05:49:41.341718675 -0600
-+++ Top/csmodule.c 2014-05-05 20:00:00.000000000 -0600
-@@ -142,9 +142,9 @@ static const char *plugindir64_env
- # define ENABLE_OPCODEDIR_WARNINGS 0
- # ifndef CS_DEFAULT_PLUGINDIR
- # ifndef USE_DOUBLE
--# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins"
-+# define CS_DEFAULT_PLUGINDIR "/usr/lib/csound/plugins"
- # else
--# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins64"
-+# define CS_DEFAULT_PLUGINDIR "/usr/lib64/csound/plugins"
- # endif
- # endif
- #endif
diff --git a/csound-6.03-default-pulse.patch b/csound-6.03-default-pulse.patch
deleted file mode 100644
index 160402e..0000000
--- a/csound-6.03-default-pulse.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Top/csound.c.orig 2014-05-04 10:25:40.373359897 -0600
-+++ Top/csound.c 2014-05-05 20:30:00.000000000 -0600
-@@ -3127,7 +3127,7 @@ PUBLIC void csoundReset(CSOUND *csound)
- csoundCreateGlobalVariable(csound, "_RTAUDIO", (size_t) max_len);
- s = csoundQueryGlobalVariable(csound, "_RTAUDIO");
- #ifndef LINUX
-- strcpy(s, "PortAudio");
-+ strcpy(s, "pulse");
- #else
- strcpy(s, "alsa");
- #endif
diff --git a/csound-6.03-fix-conflicts.patch b/csound-6.03-fix-conflicts.patch
deleted file mode 100644
index e4fc858..0000000
--- a/csound-6.03-fix-conflicts.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- installer/linux/d32.sh.orig 2014-05-04 05:49:43.213736146 -0600
-+++ installer/linux/d32.sh 2014-05-05 20:15:00.000000000 -0600
-@@ -13,7 +13,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/lo
-
- rm ../../../CSDIST/$DIR/bin/*
-
--cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo} ../../../CSDIST/$DIR/bin
-+cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,cs-mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo} ../../../CSDIST/$DIR/bin
-
- strip ../../../CSDIST/$DIR/bin/*
-
---- installer/linux/d64.sh.orig 2014-05-04 05:49:43.213736146 -0600
-+++ installer/linux/d64.sh 2014-05-05 20:15:00.000000000 -0600
-@@ -12,7 +12,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/lo
-
- rm ../../../CSDIST/$DIR/bin/*
-
--cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo,cseditor} ../../../CSDIST/$DIR/bin
-+cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo,cseditor} ../../../CSDIST/$DIR/bin
-
- strip ../../../CSDIST/$DIR/bin/*
-
---- installer/linux/f32.sh.orig 2014-05-04 05:49:43.213736146 -0600
-+++ installer/linux/f32.sh 2014-05-05 20:15:00.000000000 -0600
-@@ -12,7 +12,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/lo
-
- rm ../../../CSDIST/$DIR/bin/*
-
--cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo} ../../../CSDIST/$DIR/bin
-+cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,cs-mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo} ../../../CSDIST/$DIR/bin
-
- strip ../../../CSDIST/$DIR/bin/*
-
---- installer/linux/f64.sh.orig 2014-05-04 05:49:43.213736146 -0600
-+++ installer/linux/f64.sh 2014-05-05 20:15:00.000000000 -0600
-@@ -12,7 +12,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/lo
-
- rm ../../../CSDIST/$DIR/bin/*
-
--cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo,cseditor} ../../../CSDIST/$DIR/bin
-+cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,cs-mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo,cseditor} ../../../CSDIST/$DIR/bin
-
- strip ../../../CSDIST/$DIR/bin/*
-
---- installer/misc/mkpackage.py.orig 2014-05-05 17:00:10.347460267 -0600
-+++ installer/misc/mkpackage.py 2014-05-05 20:15:00.000000000 -0600
-@@ -71,13 +71,13 @@ headerFiles += ['interfaces/CppSound.hpp
- headerFiles += ['interfaces/CsoundFile.hpp']
-
- utils1 = ['csound', 'winsound', 'cstclsh', 'cswish',
-- 'atsa', 'cvanal', 'dnoise', 'envext', 'extractor',
-+ 'atsa', 'cvanal', 'dnoise', 'cs-envext', 'cs-extractor',
- 'het_export', 'het_import', 'hetro', 'lpanal',
-- 'lpc_export', 'lpc_import', 'mixer', 'pvanal',
-- 'pvlook', 'pv_export', 'pv_import', 'scale', 'sndinfo',
-- 'srconv', 'cseditor']
-+ 'lpc_export', 'lpc_import', 'cs-mixer', 'pvanal',
-+ 'pvlook', 'pv_export', 'pv_import', 'cs-scale', 'cs-sndinfo',
-+ 'cs-srconv', 'cseditor']
-
--utils2 = ['scsort', 'extract', 'cs', 'csb64enc', 'makecsd', 'scot']
-+utils2 = ['scsort', 'cs-extract', 'cs', 'csb64enc', 'makecsd', 'cs-scot']
-
- docFiles = ['COPYING', 'ChangeLog', 'INSTALL', 'readme-csound6.txt']
-
---- util1/CMakeLists.txt.orig 2014-05-04 05:49:44.284746142 -0600
-+++ util1/CMakeLists.txt 2014-05-05 20:15:00.000000000 -0600
-@@ -1,7 +1,7 @@
- #extra utilities
-
- make_utility(scsort sortex/smain.c)
--make_utility(extract sortex/xmain.c)
-+make_utility(cs-extract sortex/xmain.c)
-
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
- if(HAVE_UNISTD_H)
-@@ -19,6 +19,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMP
-
- set(scot_SRCS
- scot/scot_main.c scot/scot.c)
-- make_utility(scot "${scot_SRCS}")
-+ make_utility(cs-scot "${scot_SRCS}")
- endif()
-
---- util/CMakeLists.txt.orig 2014-05-04 05:49:44.239745722 -0600
-+++ util/CMakeLists.txt 2014-05-05 20:15:00.000000000 -0600
-@@ -17,8 +17,8 @@ if(BUILD_UTILITIES)
- make_utility(csanalyze csanalyze.c)
- make_utility(cvanal cvl_main.c)
- make_utility(dnoise dnoise_main.c)
-- make_utility(envext env_main.c)
-- make_utility(extractor xtrc_main.c)
-+ make_utility(cs-envext env_main.c)
-+ make_utility(cs-extractor xtrc_main.c)
- make_utility(het_export hetx_main.c)
- make_utility(het_import heti_main.c)
- make_utility(hetro het_main.c)
-@@ -26,13 +26,13 @@ if(BUILD_UTILITIES)
- make_utility(lpc_export lpcx_main.c)
- target_link_libraries(lpc_export m)
- make_utility(lpc_import lpci_main.c)
-- make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer)
-+ make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" cs-mixer)
- make_utility(pvanal pvc_main.c)
- make_utility(pvlook pvl_main.c)
- make_utility(pv_export pvx_main.c)
- make_utility(pv_import pvi_main.c)
-- make_utility(scale scale_main.c)
-- make_utility(sndinfo sndinfo_main.c)
-- make_utility(srconv srconv_main.c)
-+ make_utility(cs-scale scale_main.c)
-+ make_utility(cs-sndinfo sndinfo_main.c)
-+ make_utility(cs-srconv srconv_main.c)
- make_utility(scope scope_main.c)
- endif()
diff --git a/csound-6.03-porttime.patch b/csound-6.03-porttime.patch
deleted file mode 100644
index a060b66..0000000
--- a/csound-6.03-porttime.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- InOut/CMakeLists.txt.orig 2014-05-04 05:49:41.223717574 -0600
-+++ InOut/CMakeLists.txt 2014-05-05 21:00:00.000000000 -0600
-@@ -45,10 +45,6 @@ if(USE_PORTMIDI)
- find_library(PORTMIDI_LIBRARY portmidi)
- # include_directories(${PORTMIDI_INCLUDE_PATH})
- # include_directories(${PORTTIME_INCLUDE_PATH})
-- if(WIN32)
-- else()
-- find_library(PORTTIME_LIBRARY porttime)
-- endif()
- endif()
- if(USE_JACK)
- find_library(JACK_LIBRARY jack)
diff --git a/csound-6.03-sse2.patch b/csound-6.03-sse2.patch
deleted file mode 100644
index 4d02911..0000000
--- a/csound-6.03-sse2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- cmake/CompilerOptimizations.cmake.orig 2014-05-04 05:49:42.169726403 -0600
-+++ cmake/CompilerOptimizations.cmake 2014-05-05 20:45:00.000000000 -0600
-@@ -19,30 +19,6 @@ if (HAS_CXX_FAST_MATH)
- endif()
-
-
--if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--
--check_c_compiler_flag(-mfpmath=sse HAS_FPMATH_SSE)
--check_cxx_compiler_flag(-mfpmath=sse HAS_CXX_FPMATH_SSE)
-- if (HAS_FPMATH_SSE)
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse")
--endif()
--if (HAS_CXX_FPMATH_SSE)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")
--endif()
--
--endif()
--
--
--check_c_compiler_flag(-msse2 HAS_SSE2)
--check_cxx_compiler_flag(-msse2 HAS_CXX_SSE2)
-- if (HAS_SSE2)
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2")
--endif()
--if (HAS_CXX_SSE2)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
--endif()
--
--
- check_c_compiler_flag(-fomit-frame-pointer HAS_OMIT_FRAME_POINTER)
- check_cxx_compiler_flag(-fomit-frame-pointer HAS_CXX_OMIT_FRAME_POINTER)
- if (HAS_OMIT_FRAME_POINTER)
diff --git a/csound-6.03-xdg-open.patch b/csound-6.03-xdg-open.patch
deleted file mode 100644
index 5c4b99b..0000000
--- a/csound-6.03-xdg-open.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- installer/misc/vim/cshelp.orig 2014-05-04 05:49:43.318737126 -0600
-+++ installer/misc/vim/cshelp 2014-05-05 21:15:00.000000000 -0600
-@@ -3,7 +3,9 @@
- BROWSER_CMD=""
-
- if [ "${DISPLAY}" != "" ] ; then
-- if ( which links | grep -q -G -e "^/usr" ) ; then
-+ if ( which xdg-open | grep -E -e "^(/usr)?/bin" ); then
-+ BROWSER_CMD="xdg-open" ;
-+ elif ( which links | grep -q -G -e "^/usr" ) ; then
- BROWSER_CMD="links -g" ;
- elif ( which konqueror | grep -q -G -e "^/opt" ) ; then
- BROWSER_CMD="konqueror" ;
-@@ -38,5 +40,5 @@ else
- OPNAME="${1}" ;
- fi
-
--exec ${BROWSER_CMD} "/usr/local/share/doc/csound/manual/${OPNAME}.html"
-+exec ${BROWSER_CMD} "/usr/share/doc/csound-manual/${OPNAME}.html"
-
diff --git a/csound-6.10.0-turn-off-security.patch b/csound-6.10.0-turn-off-security.patch
new file mode 100644
index 0000000..cdffb0b
--- /dev/null
+++ b/csound-6.10.0-turn-off-security.patch
@@ -0,0 +1,11 @@
+--- csound-6.10.0/CMakeLists.txt.orig 2018-01-31 15:03:26.998613322 +0000
++++ csound-6.10.0/CMakeLists.txt 2018-01-31 15:12:14.056728522 +0000
+@@ -440,7 +440,7 @@
+ endif()
+
+ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+- add_definitions("-Wno-format")
++ add_definitions("-Wno-format -Wno-format-security")
+ endif()
+
+
diff --git a/csound.spec b/csound.spec
index 9e95c51..e13c9d8 100644
--- a/csound.spec
+++ b/csound.spec
@@ -1,29 +1,22 @@
-%ifarch %{arm} %{ix86} x86_64
-%global has_luajit 1
+%ifarch aarch64 %{arm} %{ix86} x86_64
+%global has_luajit 0
%global luajit_version 2.1
%endif
Summary: A sound synthesis language and library
Name: csound
-Version: 6.03.2
-Release: 17%{?dist}
+Version: 6.10.0
+Release: 1%{?dist}
URL: http://csound.github.io/
License: LGPLv2+
-Source0: http://downloads.sourceforge.net/csound/Csound%{version}.tar.gz
-Source1: http://downloads.sourceforge.net/csound/manual_src.tar.gz
-# Put plugins in _libdir/csound/plugins on all platforms
-Patch0: %{name}-6.03-64-bit-plugin-path.patch
-# Rename some binaries to avoid name conflicts
-Patch1: %{name}-6.03-fix-conflicts.patch
-# Default to using pulseaudio instead of portaudio
-Patch2: %{name}-6.03-default-pulse.patch
-# Do not use SSE2 on non-x86_64 platforms
-Patch3: %{name}-6.03-sse2.patch
-# Adapt to the way portmidi/porttime is packaged in Fedora
-Patch4: %{name}-6.03-porttime.patch
-# Use xdg-open to open a browser to view the manual
-Patch5: %{name}-6.03-xdg-open.patch
+Source0: https://github.com/csound/csound/archive/%{version}.tar.gz#/%{name}-%{ver...
+Source1: https://github.com/csound/manual/archive/%{version}.tar.gz#/manual-%{vers...
+Patch1: csound-6.10.0-turn-off-security.patch
+Patch2: 0001-Add-support-for-using-xdg-open-for-opening-help.patch
+Patch3: 0002-Default-to-PulseAudio.patch
+Patch4: 0003-use-standard-plugins-path.patch
+Patch5: 0004-fix-naming-conflicts.patch
BuildRequires: bison
BuildRequires: bluez-libs-devel
@@ -31,6 +24,7 @@ BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: CUnit-devel
BuildRequires: docbook-style-xsl
+BuildRequires: python2-pygments
BuildRequires: dssi-devel
BuildRequires: eigen3-static
BuildRequires: flex
@@ -59,12 +53,9 @@ BuildRequires: swig
BuildRequires: tkinter
BuildRequires: wiiuse-devel
-# The fltk and tcl/tk frontends were removed in version 6. These obsoletes
-# can be removed in Fedora 23
-Obsoletes: %{name}-gui < 6.0-1%{?dist}
-Provides: %{name}-gui = 6.0-1%{?dist}
-Obsoletes: %{name}-tk < 6.0-1%{?dist}
-Provides: %{name}-tk = 6.0-1%{?dist}
+# These obsoletes can be removed in Fedora 31
+Obsoletes: %{name}-javadoc < 6.10.0-1%{?dist}
+Provides: %{name}-javadoc = 6.10.0-1%{?dist}
%global luaver %(lua -v | sed -r 's/Lua ([[:digit:]]+\\.[[:digit:]]+).*/\\1/')
@@ -88,17 +79,17 @@ Provides: %{name}-python%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
Summary: Python Csound development files and libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: python
+Requires: python2
%description -n python2-csound
Contains Python language bindings for developing Python applications that
use Csound.
-%package python-devel
+%package python2-csound-devel
Summary: Csound python development files and libraries
-Requires: %{name}-python%{?_isa} = %{version}-%{release}
+Requires: python2-%{name}%{?_isa} = %{version}-%{release}
-%description python-devel
+%description python2-csound-devel
Contains libraries for developing against csound-python.
%package java
@@ -111,13 +102,6 @@ Requires: jpackage-utils
Contains Java language bindings for developing and running Java
applications that use Csound.
-%package javadoc
-Summary: API documentation for Java Csound support
-BuildArch: noarch
-
-%description javadoc
-API documentation for the %{name}-java package.
-
%if 0%{?has_luajit}
%package lua
Summary: Lua Csound support
@@ -214,23 +198,13 @@ Canonical Reference Manual for Csound.
%prep
-%setup -q -n Csound%{version}
-%setup -q -n Csound%{version} -T -D -a 1
-
-%patch0 -b .64-bit-plugin-path
-%patch1 -b .fix-conflicts
-%patch2 -b .default-pulse
-%ifnarch x86_64
-%patch3 -b .sse2
-%endif
-%patch4 -b .porttime
-%patch5 -b .xdg-open
-
-# Fix python, lua, and java install paths
-sed -e 's,\(set(PYTHON_MODULE_INSTALL_DIR \).*,\1"%{python_sitearch}"),' \
- -e 's,\(set(JAVA_MODULE_INSTALL_DIR.*\)),\1/csound/java),' \
- -e 's,\(set(LUA_MODULE_INSTALL_DIR.*\)),\1/lua/%{luaver}),' \
- -i CMakeLists.txt
+%setup -q
+%setup -q -T -D -a 1
+%patch1 -p1 -b .cf
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
# Fix luajit version
find ./ -name CMakeLists.txt -exec sed -i 's|luajit-2.0|luajit-%{luajit_version}|g' {} \;
@@ -241,40 +215,59 @@ find ./ -name CMakeLists.txt -exec sed -i 's|luajit-2.0|luajit-%{luajit_version}
touch -r %1.orig %1; \
rm -f %1.orig;
-for csd in $(find manual6/examples -name \*.csd); do
+for csd in $(find manual-%{version}/examples -name \*.csd); do
%fix_line_encoding $csd
done
+
%fix_line_encoding examples/c/pvsbus.csd
%fix_line_encoding examples/cplusplus/fl_controller.dev
%fix_line_encoding examples/csoundapi_tilde/csoundapi-osx.pd
%fix_line_encoding examples/lua/csound_ffi.lua
%fix_line_encoding examples/opcode_demos/band.csd
%fix_line_encoding examples/opcode_demos/sdft.csd
-%fix_line_encoding manual6/examples/128,8-torus
-%fix_line_encoding manual6/examples/128-spiral-8,16,128,2,1over2
-%fix_line_encoding manual6/examples/128-stringcircular
-%fix_line_encoding manual6/examples/string-128.matrix
+%fix_line_encoding manual-%{version}/examples/128,8-torus
+%fix_line_encoding manual-%{version}/examples/128-spiral-8,16,128,2,1over2
+%fix_line_encoding manual-%{version}/examples/128-stringcircular
+%fix_line_encoding manual-%{version}/examples/string-128.matrix
# Fix spurious executable bits
chmod a-x examples/csoundapi_tilde/csoundapi-osx.pd \
examples/csoundapi_tilde/csoundapi.pd \
examples/lua/lua_example.lua \
- manual6/examples/128*
+ manual-%{version}/examples/128*
%build
-if [ "%{_libdir}" = "%{_prefix}/lib64" ]; then
- %cmake -DUSE_LIB64:BOOL=ON
-else
- %cmake -DUSE_LIB64:BOOL=OFF
-fi
+%if "%{_libdir}" == "%{_prefix}/lib64"
+ %global uselib64 ON
+%else
+ %global uselib64 OFF
+%endif
+
+# Terrible hack
+%ifarch %{arm}
+sed -i 's*//#define PFFFT_SIMD_DISABLE*#define PFFFT_SIMD_DISABLE*' OOps/pffft.c
+%endif
-make %{?_smp_mflags} V=1
+%cmake -DUSE_LIB64:BOOL=%{uselib64} -DBUILD_JAVA_INTERFACE:BOOL=ON \
+ -DSWIG_ADD_LIBRARY:BOOL=OFF -DBUILD_JACK_OPCODES:BOOL=ON \
+ -DPYTHON_MODULE_INSTALL_DIR:STRING="%{python_sitearch}" \
+%if 0%{?has_luajit}
+ -DLUA_MODULE_INSTALL_DIR:STRING="%{libdir}/lua/%{luaver}" \
+%endif
+ -DBUILD_CSOUND_AC_PYTHON_INTERFACE:BOOL=ON \
+%ifarch %{x86}
+ -DHAS_SSE2:BOOL=OFF -DHAS_FPMATH_SSE:BOOL=OFF \
+%endif
+%ifarch %{arm}
+ -DHAVE_NEON:BOOL=OFF \
+%endif
+ -DBUILD_STK_OPCODES:BOOL=ON -DBUILD_PADSYNTH_OPCODES:BOOL=OFF
-# Generate javadoc
-(cd interfaces; mkdir apidocs; javadoc -d apidocs *.java)
+#make %{?_smp_mflags} V=1
+make V=1
# Make the manual
-make -C manual6 html-dist \
+make -C manual-%{version} html-dist \
XSL_BASE_PATH=%{_datadir}/sgml/docbook/xsl-stylesheets
%install
@@ -283,11 +276,6 @@ make install DESTDIR=%{buildroot}
# Fix the Java installation
install -dm 755 %{buildroot}%{_javadir}
(cd %{buildroot}%{_javadir}; ln -s %{_libdir}/%{name}/java/csnd.jar .)
-mv %{buildroot}%{_libdir}/%{name}/java/lib_jcsound6.so %{buildroot}%{_libdir}
-
-# Install Javadocs
-install -dm 755 %{buildroot}%{_javadocdir}
-cp -a interfaces/apidocs %{buildroot}%{_javadocdir}/%{name}-java
# Help the debuginfo generator
ln -s ../csound_orclex.c Engine/csound_orclex.c
@@ -308,11 +296,11 @@ ln -s ../csound_prelex.c Engine/csound_prelex.c
%postun csoundac -p /sbin/ldconfig
%check
-make csdtests
+# make csdtests
%files -f %{name}6.lang
-%doc ChangeLog README.md Release_Notes
%license COPYING
+%doc ChangeLog README.md Release_Notes
%{_bindir}/atsa
%{_bindir}/cs
%{_bindir}/csanalyze
@@ -338,7 +326,6 @@ make csdtests
%{_bindir}/pv_import
%{_bindir}/pvlook
%{_bindir}/cs-scale
-%{_bindir}/scope
%{_bindir}/cs-scot
%{_bindir}/scsort
%{_bindir}/sdif2ad
@@ -348,24 +335,37 @@ make csdtests
%dir %{_libdir}/%{name}/plugins-6.0
%{_libdir}/%{name}/plugins-6.0/csladspa.so
%{_libdir}/%{name}/plugins-6.0/libampmidid.so
+%{_libdir}/%{name}/plugins-6.0/libarrayops.so
+%{_libdir}/%{name}/plugins-6.0/libbuchla.so
%{_libdir}/%{name}/plugins-6.0/libcellular.so
%{_libdir}/%{name}/plugins-6.0/libchua.so
%{_libdir}/%{name}/plugins-6.0/libcontrol.so
%{_libdir}/%{name}/plugins-6.0/libcs_date.so
%{_libdir}/%{name}/plugins-6.0/libdoppler.so
+%{_libdir}/%{name}/plugins-6.0/libemugens.so
+%{_libdir}/%{name}/plugins-6.0/libexciter.so
%{_libdir}/%{name}/plugins-6.0/libfareygen.so
%{_libdir}/%{name}/plugins-6.0/libfractalnoise.so
+%{_libdir}/%{name}/plugins-6.0/libframebuffer.so
+%{_libdir}/%{name}/plugins-6.0/libftsamplebank.so
+%{_libdir}/%{name}/plugins-6.0/libgetftargs.so
%{_libdir}/%{name}/plugins-6.0/libimage.so
%{_libdir}/%{name}/plugins-6.0/libipmidi.so
%{_libdir}/%{name}/plugins-6.0/libjoystick.so
%{_libdir}/%{name}/plugins-6.0/liblinear_algebra.so
+%{_libdir}/%{name}/plugins-6.0/libliveconv.so
%{_libdir}/%{name}/plugins-6.0/libmixer.so
%{_libdir}/%{name}/plugins-6.0/libplaterev.so
+%{_libdir}/%{name}/plugins-6.0/libpvsops.so
+%{_libdir}/%{name}/plugins-6.0/libquadbezier.so
%{_libdir}/%{name}/plugins-6.0/librtalsa.so
%{_libdir}/%{name}/plugins-6.0/librtpulse.so
%{_libdir}/%{name}/plugins-6.0/libscansyn.so
+%{_libdir}/%{name}/plugins-6.0/libscugens.so
%{_libdir}/%{name}/plugins-6.0/libserial.so
+%{_libdir}/%{name}/plugins-6.0/libselect.so
%{_libdir}/%{name}/plugins-6.0/libsignalflowgraph.so
+%{_libdir}/%{name}/plugins-6.0/libstackops.so
%{_libdir}/%{name}/plugins-6.0/libstdutil.so
%{_libdir}/%{name}/plugins-6.0/libsystem_call.so
%{_libdir}/%{name}/plugins-6.0/liburandom.so
@@ -380,25 +380,22 @@ make csdtests
%{_libdir}/%{name}/plugins-6.0/libpy.so
%{python_sitearch}/_csnd*
%{python_sitearch}/csnd*
+%{python_sitearch}/*csound.py*
-%files python-devel
+%files python2-csound-devel
%{_libdir}/libCsoundAC.so
-%files java
-%{_libdir}/lib_jcsound6.so
-%{_libdir}/%{name}/java/
-%{_javadir}/csnd.jar
-
-%files javadoc
-%license COPYING
-%{_javadocdir}/%{name}-java
-
%if 0%{?has_luajit}
%files lua
%{_libdir}/%{name}/plugins-6.0/libLuaCsound.so
%{_libdir}/lua/%{luaver}/*
%endif
+%files java
+%{_libdir}/lib_jcsound6.so
+%{_libdir}/csnd6.jar
+%{_javadir}/csnd.jar
+
%files csoundac
%{python_sitearch}/CsoundAC.*
%{python_sitearch}/_CsoundAC.*
@@ -425,7 +422,7 @@ make csdtests
%{_libdir}/%{name}/plugins-6.0/librtpa.so
%files stk
-%{_libdir}/%{name}/plugins-6.0/libstk.so
+%{_libdir}/%{name}/plugins-6.0/libstkops.so
%files virtual-keyboard
%{_libdir}/%{name}/plugins-6.0/libvirtual.so
@@ -434,10 +431,14 @@ make csdtests
%{_libdir}/%{name}/plugins-6.0/libwiimote.so
%files manual
-%doc examples manual6/html
-%license manual6/copying.txt
+%doc examples manual-%{version}/html
%changelog
+* Sun Feb 25 2018 Peter Robinson <pbrobinson(a)fedoraproject.org> 6.10.0-1
+- Update to Csound 6.10.0
+- Obsolete javadocs support (deprecated upstream)
+- Packaging updates from Hlöðver Sigurðsson
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.03.2-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index fbd444d..872e641 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-94c836cf9b491cfceec55982ab8f3237 Csound6.03.2.tar.gz
-6bbd6cd442c9822a9f52ad9cc53d6e2d manual_src.tar.gz
+SHA512 (csound-6.10.0.tar.gz) = 1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4
+SHA512 (manual-6.10.0.tar.gz) = bb2e33d9693656e9292e14017d20e5b3ab28433cf17f0134820b22111cb70fa15f7b664e40adf40cbda07160f7f081e1900a47746aae3f050779419c45593764
6 years, 4 months
Architecture specific change in rpms/golang-github-3rf-mongo-lint.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-3rf-mongo-lint.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-3rf-mongo-lint.git/....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit 457ad9f8448d347db94ab565c1e47054d3495dcc
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Feb 26 10:43:30 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-3rf-mongo-lint.spec b/golang-github-3rf-mongo-lint.spec
index a31bffa..349d60e 100644
--- a/golang-github-3rf-mongo-lint.spec
+++ b/golang-github-3rf-mongo-lint.spec
@@ -1,152 +1,54 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-# Some tests are failing and upsteam has no commits with fixes
-%global with_check 0
-%global with_unit_test 1
-%else
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 1
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%global provider github
-%global provider_tld com
-%global project 3rf
-%global repo mongo-lint
# https://github.com/3rf/mongo-lint
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global provider_prefix github.com/3rf/mongo-lint
+%global gobaseipath %{provider_prefix}
%global commit f6cf4f8a7d07167375b035d186a1e8b3ebf28aa3
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20140702
+%global __go_ignore_regex /testdata
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.10.git%{shortcommit}%{?dist}
+Release: 0.11.%{commitdate}git%{shortcommit}%{?dist}
Summary: MongoDB fork of Golint
License: BSD
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go" | grep -v "./testdata") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-done
-cp -r testdata %{buildroot}/%{gopath}/src/%{import_path}/.
-echo "%%{gopath}/src/%%{import_path}/testdata" >> unit-test-devel.file-list
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall $(find . -name "testdata" -type d)
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%gotest %{import_path}
-%gotest %{import_path}/testdata
-%endif
+%gochecks %{gobaseipath}
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README
-%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
-%endif
%changelog
+* Mon Feb 26 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.11.20140702gitf6cf4f8
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.10.gitf6cf4f8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 4 months
Architecture specific change in rpms/lpsolve.git
by githook-noreply@fedoraproject.org
The package rpms/lpsolve.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/lpsolve.git/commit/?id=aa29c50dd3....
Change:
-%ifarch sparcv9 sparc64 s390 s390x
Thanks.
Full change:
============
commit aa29c50dd3e0e75ddac0d405c7bc7ed2fda3edaa
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Mon Feb 26 09:39:03 2018 +0000
Resolves: rhbz#1548689 use fedora compile/link flags
diff --git a/lpsolve-5.5.0.11.cflags.patch b/lpsolve-5.5.0.11.cflags.patch
index d8f6567..7bc0f0f 100644
--- a/lpsolve-5.5.0.11.cflags.patch
+++ b/lpsolve-5.5.0.11.cflags.patch
@@ -1,24 +1,22 @@
-diff -ru lp_solve_5.5.orig/lp_solve/ccc lp_solve_5.5/lp_solve/ccc
---- lp_solve_5.5.orig/lp_solve/ccc 2009-02-23 16:31:18.000000000 +0000
-+++ lp_solve_5.5/lp_solve/ccc 2009-02-23 16:31:29.000000000 +0000
-@@ -28,7 +28,7 @@
+--- lp_solve_5.5/lpsolve55/ccc.orig 2018-02-26 09:27:51.074682302 +0000
++++ lp_solve_5.5/lpsolve55/ccc 2018-02-26 09:36:36.329990782 +0000
+@@ -35,16 +35,14 @@
+ so=y
fi
- rm /tmp/isnan.c /tmp/isnan >/dev/null 2>&1
-opts='-O3'
-+opts=$RPM_OPT_FLAGS
+-
+-$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++$c $CFLAGS -fPIC -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+ ar rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
+ ranlib bin/$PLATFORM/liblpsolve55.a
- def=
- if [ "$PLATFORM" = "SCO_UNIX" ]
-diff -ru lp_solve_5.5.orig/lpsolve55/ccc lp_solve_5.5/lpsolve55/ccc
---- lp_solve_5.5.orig/lpsolve55/ccc 2009-02-23 16:31:18.000000000 +0000
-+++ lp_solve_5.5/lpsolve55/ccc 2009-02-23 16:31:29.000000000 +0000
-@@ -35,7 +35,7 @@
- so=y
+ if [ "$so" != "" ]
+ then
+- $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
++ $c $CFLAGS -fPIC -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++ $c $LDFLAGS -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
fi
--opts='-O3'
-+opts=$RPM_OPT_FLAGS
-
- $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
- ar rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
+ rm *.o 2>/dev/null
diff --git a/lpsolve.spec b/lpsolve.spec
index 373f1e3..cdeea9a 100644
--- a/lpsolve.spec
+++ b/lpsolve.spec
@@ -1,7 +1,7 @@
Name: lpsolve
Summary: A Mixed Integer Linear Programming (MILP) solver
Version: 5.5.2.0
-Release: 17%{?dist}
+Release: 18%{?dist}
Source: http://downloads.sourceforge.net/lpsolve/lp_solve_%{version}_source.tar.gz
Group: System Environment/Libraries
URL: http://sourceforge.net/projects/lpsolve
@@ -26,12 +26,9 @@ Includes and definitions for developing with lpsolve
%setup -q -n lp_solve_5.5
%patch0 -p1 -b .cflags.patch
%patch1 -p1 -b .defines.patch
-#sparc and s390 need -fPIC lets sed it
-%ifarch sparcv9 sparc64 s390 s390x
-sed -i -e 's|-fpic|-fPIC|g' lpsolve55/ccc
-%endif
%build
+%set_build_flags
cd lpsolve55
sh -x ccc
rm bin/ux*/liblpsolve55.a
@@ -63,6 +60,9 @@ install -p -m 644 \
%{_includedir}/lpsolve
%changelog
+* Mon Feb 26 2018 Caolán McNamara <caolanm(a)redhat.com> - 5.5.2.0-18
+- Resolves: rhbz#1548689 use fedora compile/link flags
+
* Thu Feb 08 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.5.2.0-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 4 months
Architecture specific change in rpms/golang-github-spacemonkeygo-spacelog.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-spacemonkeygo-spacelog.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-spacemonkeygo-space....
Change:
-%ifarch 0%{?gccgo_arches}
Thanks.
Full change:
============
commit 4470bdc054262f0192bb7d9bf3a83e5eae2a6edd
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Mon Feb 26 10:19:39 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-spacemonkeygo-spacelog.spec b/golang-github-spacemonkeygo-spacelog.spec
index 93f2aa8..bb9ed08 100644
--- a/golang-github-spacemonkeygo-spacelog.spec
+++ b/golang-github-spacemonkeygo-spacelog.spec
@@ -1,161 +1,56 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-# No tests provided
-%global with_check 0
-%global with_unit_test 0
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%global provider github
-%global provider_tld com
-%global project spacemonkeygo
-%global repo spacelog
# https://github.com/spacemonkeygo/spacelog
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+%global provider_prefix github.com/spacemonkeygo/spacelog
+%global gobaseipath %{provider_prefix}
%global commit ae95ccc1eb0c8ce2496c43177430efd61930f7e4
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20150320
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.9.git%{shortcommit}%{?dist}
+Release: 0.10.%{commitdate}git%{shortcommit}%{?dist}
Summary: Hierarchical, leveled, and structured logging library for Go
License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+URL: %{gourl}
+Source0: %{gosource}
Patch1: 0001-Convert-dup2-calls-to-dup3.patch
-# If go_arches not defined fall through to implicit golang archs
-%if 0%{?go_arches:1}
-ExclusiveArch: %{go_arches}
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
-# If gccgo_arches does not fit or is not defined fall through to golang
-%ifarch 0%{?gccgo_arches}
-BuildRequires: gcc-go >= %{gccgo_min_vers}
-%else
-BuildRequires: golang
-%endif
-
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
BuildRequires: golang(github.com/spacemonkeygo/flagfile/utils)
-%endif
-
-Requires: golang(github.com/spacemonkeygo/flagfile/utils)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/setup) = %{version}-%{release}
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test}
-%package unit-test
-Summary: Unit tests for %{name} package
-
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup
%patch1 -p1 -b .dup2
-%build
-
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%ifarch 0%{?gccgo_arches}
-function gotest { %{gcc_go_test} "$@"; }
-%else
-%if 0%{?golang_test:1}
-function gotest { %{golang_test} "$@"; }
-%else
-function gotest { go test "$@"; }
-%endif
-%endif
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%{!?_licensedir:%global license %%doc}
-%license LICENSE
-%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%dir %{gopath}/src/%{import_path}
-%endif
+%gochecks
-%if 0%{?with_unit_test}
-%files unit-test -f unit-test.file-list
%{!?_licensedir:%global license %%doc}
+
+%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%endif
%changelog
+* Mon Feb 26 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.10.20150320gitae95ccc
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.9.gitae95ccc
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 4 months