May 2018 - Arch-excludes - Fedora Mailing-Lists

Architecture specific change in rpms/xtl.git

by githook-noreply＠fedoraproject.org

The package rpms/xtl.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/xtl.git/commit/?id=12f93065e13ff3.... Change: +%ifarch ppc64 s390x Thanks. Full change: ============ commit 1b0db8ed0f375b2018ca4388c4dd417705b088c0 Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> Date: Thu May 3 22:49:07 2018 -0400 Update to latest version. diff --git a/.gitignore b/.gitignore index 6aa0ad3..3fc2947 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /xtl-0.4.4.tar.gz +/xtl-0.4.7.tar.gz diff --git a/sources b/sources index f909fd9..2f1d908 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xtl-0.4.4.tar.gz) = 6f480081a83912c59c529d54dd036197d998346929f6cc79382515c9c1bc7ef7fc1439b7fe73d75748a7eb972e4799a13e33ad2a159c2f5ad7c0a51be0f30eda +SHA512 (xtl-0.4.7.tar.gz) = 624233c436c25995717efd95c361522d415883bd70e19a1c92c77413d049465bca21b4315564f2ea7edf3ae6844a3a78f018d0281a2c73b040b2b7d9685fb1b7 diff --git a/xtl.spec b/xtl.spec index 5c5c5a0..6771d0f 100644 --- a/xtl.spec +++ b/xtl.spec @@ -2,8 +2,8 @@ %global debug_package %{nil} Name: xtl -Version: 0.4.4 -Release: 2%{?dist} +Version: 0.4.7 +Release: 1%{?dist} License: BSD Summary: QuantStack tools library Url: https://github.com/QuantStack/xtl @@ -79,6 +79,9 @@ make xtest %changelog +* Wed May 02 2018 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> 0.4.7-1 +- Update to latest version + * Wed Mar 21 2018 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> 0.4.4-2 - Split documentation into subpackage - Run more tests on broken arches commit 12f93065e13ff3f14db1296288c68e19c0049181 Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> Date: Thu May 3 22:17:05 2018 -0400 Initial import (#1558473). diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6aa0ad3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/xtl-0.4.4.tar.gz diff --git a/0001-Remove-march-native-flag.patch b/0001-Remove-march-native-flag.patch new file mode 100644 index 0000000..3177918 --- /dev/null +++ b/0001-Remove-march-native-flag.patch @@ -0,0 +1,28 @@ +From bf37aab2b70905fd48ca3a11c92c8ca0e145cc74 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> +Date: Tue, 20 Mar 2018 05:15:08 -0400 +Subject: [PATCH] Remove march=native flag. + +Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> +--- + test/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 259cddc..23b1c5f 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -23,8 +23,8 @@ include(CheckCXXCompilerFlag) + string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE) + + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wunused-parameter -Wextra -Wreorder -Wconversion -Wsign-conversion") +- #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wunused-parameter -Wextra -Wreorder -Wconversion") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-parameter -Wextra -Wreorder -Wconversion -Wsign-conversion") ++ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-parameter -Wextra -Wreorder -Wconversion") + CHECK_CXX_COMPILER_FLAG("-std=c++14" HAS_CPP14_FLAG) + + if (HAS_CPP14_FLAG) +-- +2.14.3 + diff --git a/README.md b/README.md deleted file mode 100644 index e3a5b01..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# xtl - -The xtl package \ No newline at end of file diff --git a/sources b/sources new file mode 100644 index 0000000..f909fd9 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (xtl-0.4.4.tar.gz) = 6f480081a83912c59c529d54dd036197d998346929f6cc79382515c9c1bc7ef7fc1439b7fe73d75748a7eb972e4799a13e33ad2a159c2f5ad7c0a51be0f30eda diff --git a/xtl.spec b/xtl.spec new file mode 100644 index 0000000..5c5c5a0 --- /dev/null +++ b/xtl.spec @@ -0,0 +1,87 @@ +# Header-only library. +%global debug_package %{nil} + +Name: xtl +Version: 0.4.4 +Release: 2%{?dist} +License: BSD +Summary: QuantStack tools library +Url: https://github.com/QuantStack/xtl +Source0: https://github.com/QuantStack/%{name}/archive/%{version}/%{name}-%{versio... +# Just used in testing, and it breaks on some arches. +Patch0001: 0001-Remove-march-native-flag.patch + +BuildRequires: binutils +BuildRequires: cmake +BuildRequires: diffutils +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: gtest-devel +BuildRequires: make +BuildRequires: python3-breathe +BuildRequires: python3-sphinx +BuildRequires: python3-sphinx_rtd_theme + +%description +Basic tools (containers, algorithms) used by other QuantStack packages. + + +%package devel +Summary: %{summary} +Provides: xtl-static = %{version}-%{release} +Requires: cmake-filesystem + +%description devel +Development files for %{name} library. + + +%package doc +Summary: %{summary} + +%description doc +Documentation files for %{name} library. + + +%prep +%autosetup -p1 + + +%build +%cmake -DBUILD_TESTS=ON +%make_build + +pushd docs +make html SPHINXBUILD=sphinx-build-3 +rm build/html/.buildinfo +popd + + +%install +%make_install + + +%check +# https://github.com/QuantStack/xtl/issues/72 +%ifarch ppc64 s390x +export GTEST_FILTER=-hash.verification +%endif +make xtest + + +%files devel +%doc README.md +%license LICENSE +%{_includedir}/xtl/ +%{_libdir}/cmake/xtl/ + +%files doc +%doc docs/build/html + + +%changelog +* Wed Mar 21 2018 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> 0.4.4-2 +- Split documentation into subpackage +- Run more tests on broken arches + +* Mon Mar 19 2018 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> 0.4.4-1 +- Initial package for Fedora

6 years

1
0
0 / 0

Architecture specific change in rpms/xtl.git

by githook-noreply＠fedoraproject.org

The package rpms/xtl.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/xtl.git/commit/?id=12f93065e13ff3.... Change: +%ifarch ppc64 s390x Thanks. Full change: ============ commit 1b0db8ed0f375b2018ca4388c4dd417705b088c0 Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> Date: Thu May 3 22:49:07 2018 -0400 Update to latest version. diff --git a/.gitignore b/.gitignore index 6aa0ad3..3fc2947 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /xtl-0.4.4.tar.gz +/xtl-0.4.7.tar.gz diff --git a/sources b/sources index f909fd9..2f1d908 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xtl-0.4.4.tar.gz) = 6f480081a83912c59c529d54dd036197d998346929f6cc79382515c9c1bc7ef7fc1439b7fe73d75748a7eb972e4799a13e33ad2a159c2f5ad7c0a51be0f30eda +SHA512 (xtl-0.4.7.tar.gz) = 624233c436c25995717efd95c361522d415883bd70e19a1c92c77413d049465bca21b4315564f2ea7edf3ae6844a3a78f018d0281a2c73b040b2b7d9685fb1b7 diff --git a/xtl.spec b/xtl.spec index 5c5c5a0..6771d0f 100644 --- a/xtl.spec +++ b/xtl.spec @@ -2,8 +2,8 @@ %global debug_package %{nil} Name: xtl -Version: 0.4.4 -Release: 2%{?dist} +Version: 0.4.7 +Release: 1%{?dist} License: BSD Summary: QuantStack tools library Url: https://github.com/QuantStack/xtl @@ -79,6 +79,9 @@ make xtest %changelog +* Wed May 02 2018 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> 0.4.7-1 +- Update to latest version + * Wed Mar 21 2018 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> 0.4.4-2 - Split documentation into subpackage - Run more tests on broken arches commit 12f93065e13ff3f14db1296288c68e19c0049181 Author: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> Date: Thu May 3 22:17:05 2018 -0400 Initial import (#1558473). diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6aa0ad3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/xtl-0.4.4.tar.gz diff --git a/0001-Remove-march-native-flag.patch b/0001-Remove-march-native-flag.patch new file mode 100644 index 0000000..3177918 --- /dev/null +++ b/0001-Remove-march-native-flag.patch @@ -0,0 +1,28 @@ +From bf37aab2b70905fd48ca3a11c92c8ca0e145cc74 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> +Date: Tue, 20 Mar 2018 05:15:08 -0400 +Subject: [PATCH] Remove march=native flag. + +Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com> +--- + test/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 259cddc..23b1c5f 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -23,8 +23,8 @@ include(CheckCXXCompilerFlag) + string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE) + + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wunused-parameter -Wextra -Wreorder -Wconversion -Wsign-conversion") +- #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wunused-parameter -Wextra -Wreorder -Wconversion") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-parameter -Wextra -Wreorder -Wconversion -Wsign-conversion") ++ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-parameter -Wextra -Wreorder -Wconversion") + CHECK_CXX_COMPILER_FLAG("-std=c++14" HAS_CPP14_FLAG) + + if (HAS_CPP14_FLAG) +-- +2.14.3 + diff --git a/README.md b/README.md deleted file mode 100644 index e3a5b01..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# xtl - -The xtl package \ No newline at end of file diff --git a/sources b/sources new file mode 100644 index 0000000..f909fd9 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (xtl-0.4.4.tar.gz) = 6f480081a83912c59c529d54dd036197d998346929f6cc79382515c9c1bc7ef7fc1439b7fe73d75748a7eb972e4799a13e33ad2a159c2f5ad7c0a51be0f30eda diff --git a/xtl.spec b/xtl.spec new file mode 100644 index 0000000..5c5c5a0 --- /dev/null +++ b/xtl.spec @@ -0,0 +1,87 @@ +# Header-only library. +%global debug_package %{nil} + +Name: xtl +Version: 0.4.4 +Release: 2%{?dist} +License: BSD +Summary: QuantStack tools library +Url: https://github.com/QuantStack/xtl +Source0: https://github.com/QuantStack/%{name}/archive/%{version}/%{name}-%{versio... +# Just used in testing, and it breaks on some arches. +Patch0001: 0001-Remove-march-native-flag.patch + +BuildRequires: binutils +BuildRequires: cmake +BuildRequires: diffutils +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: gtest-devel +BuildRequires: make +BuildRequires: python3-breathe +BuildRequires: python3-sphinx +BuildRequires: python3-sphinx_rtd_theme + +%description +Basic tools (containers, algorithms) used by other QuantStack packages. + + +%package devel +Summary: %{summary} +Provides: xtl-static = %{version}-%{release} +Requires: cmake-filesystem + +%description devel +Development files for %{name} library. + + +%package doc +Summary: %{summary} + +%description doc +Documentation files for %{name} library. + + +%prep +%autosetup -p1 + + +%build +%cmake -DBUILD_TESTS=ON +%make_build + +pushd docs +make html SPHINXBUILD=sphinx-build-3 +rm build/html/.buildinfo +popd + + +%install +%make_install + + +%check +# https://github.com/QuantStack/xtl/issues/72 +%ifarch ppc64 s390x +export GTEST_FILTER=-hash.verification +%endif +make xtest + + +%files devel +%doc README.md +%license LICENSE +%{_includedir}/xtl/ +%{_libdir}/cmake/xtl/ + +%files doc +%doc docs/build/html + + +%changelog +* Wed Mar 21 2018 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> 0.4.4-2 +- Split documentation into subpackage +- Run more tests on broken arches + +* Mon Mar 19 2018 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> 0.4.4-1 +- Initial package for Fedora

6 years

1
0
0 / 0

Architecture specific change in rpms/shim.git

by githook-noreply＠fedoraproject.org

The package rpms/shim.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/shim.git/commit/?id=35825dbe33402.... Change: +%ifnarch x86_64 aarch64 Thanks. Full change: ============ commit 35825dbe33402923ca23689e29e72298a3b86095 Author: Peter Jones <pjones(a)redhat.com> Date: Thu May 3 16:47:35 2018 -0400 dammit diff --git a/macros.shim b/macros.shim deleted file mode 100644 index c9334b7..0000000 --- a/macros.shim +++ /dev/null @@ -1,170 +0,0 @@ -%global debug_package %{nil} -%global __brp_mangle_shebangs_exclude_from_file %{expand:%{_builddir}/shim-%{efi_arch}-%{version}-%{release}.%{_target_cpu}-shebangs.txt} -%global vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}} -%global vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}} - -%global bootcsvaa64 %{expand:%{SOURCE10}} -%global bootcsvia32 %{expand:%{SOURCE11}} -%global bootcsvx64 %{expand:%{SOURCE12}} -#%%global bootcsvarm %%{expand:%%{SOURCE13}} - -%global shimefiaa64 %{expand:%{SOURCE20}} -%global shimefiia32 %{expand:%{SOURCE21}} -%global shimefix64 %{expand:%{SOURCE22}} -#%%global shimefiarm %%%%{expand:%%{SOURCE23} - -%global shimveraa64 15-1.fc28 -%global shimveria32 15-1.fc28 -%global shimverx64 15-1.fc28 -#%%global shimverarm 15-1.fc28 - -%global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64 -%global shimdiria32 %{_datadir}/shim/%{shimveria32}/ia32 -%global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64 -#%%global shimdirarm %%{_datadir}/shim/%%{shimverarm}/arm - -%global bootcsv %{expand:%%{bootcsv%{efi_arch}}} -%global bootcsvalt %{expand:%%{bootcsv%{?efi_alt_arch}}} -%global shimefi %{expand:%%{shimefi%{efi_arch}}} -%global shimefialt %{expand:%%{shimefi%{?efi_alt_arch}}} -%global shimver %{expand:%%{shimver%{efi_arch}}} -%global shimveralt %{expand:%%{shimver%{?efi_alt_arch}}} -%global shimdir %{expand:%%{shimdir%{efi_arch}}} -%global shimdiralt %{expand:%%{shimdir%{?efi_alt_arch}}} - -%ifarch aarch64 -%global unsigned shim-unsigned-aarch64 -%else -%global unsigned shim-unsigned-%{efi_arch} -%endif -%global unsignedalt shim-unsigned-%{?efi_alt_arch} - -%define define_pkg(a:p:) \ -%{expand:%%package -n shim-%{-a*}} \ -Summary: First-stage UEFI bootloader \ -Requires: mokutil >= 1:0.2.0-1 \ -Provides: shim-signed-%{-a*} = %{version}-%{release} \ -Requires: dbxtool >= 0.6-3 \ -%{expand:%%if 0%%{-p*} \ -Provides: shim = %{version}-%{release} \ -Provides: shim-signed = %{version}-%{release} \ -Obsoletes: shim-signed < %{version}-%{release} \ -Obsoletes: shim < %{version}-%{release} \ -%%endif} \ -# Shim uses OpenSSL, but cannot use the system copy as the UEFI ABI \ -# is not compatible with SysV (there's no red zone under UEFI) and \ -# there isn't a POSIX-style C library. \ -# BuildRequires: OpenSSL \ -Provides: bundled(openssl) = 1.0.2j \ - \ -%{expand:%%description -n shim-%{-a*}} \ -Initial UEFI bootloader that handles chaining to a trusted full \ -bootloader under secure boot environments. This package contains the \ -version signed by the UEFI signing service. \ -%{nil} - -# -a <efiarch> -# -i <input> -%define hash(a:i:d:) \ - pesign -i %{-i*} -h -P > shim.hash \ - read file0 hash0 < shim.hash \ - read file1 hash1 < %{-d*}/shim%{-a*}.hash \ - if ! [ "$hash0" = "$hash1" ]; then \ - echo Invalid signature\! > /dev/stderr \ - echo $hash0 vs $hash1 \ - exit 1 \ - fi \ - %{nil} - -# -i <input> -# -o <output> -%define sign(i:o:) \ - %{expand:%%pesign -s -i %{-i*} -o %{-o*}} \ - %{nil} - -# -b <binary prefix> -# -a <efiarch> -# -i <input> -%define distrosign(b:a:d:) \ - cp -av %{-d*}/%{-b*}%{-a*}.efi %{-b*}%{-a*}-unsigned.efi \ - %{expand:%%sign -i %{-b*}%{-a*}-unsigned.efi -o %{-b*}%{-a*}-signed.efi}\ - %{nil} - -# -a <efiarch> -# -A <EFIARCH> -# -b <1|0> # signed by this builder? -# -c <1|0> # signed by UEFI CA? -# -i <shimARCH.efi> -%define define_build(a:A:b:c:i:d:) \ -if [ "%{-c*}" = "yes" ]; then \ - %{expand:%%hash -i %{-i*} -a %{-a*} -d %{-d*}} \ -fi \ -cp %{-i*} shim%{-a*}.efi \ -if [ "%{-b*}" = "yes" ]; then \ - %{expand:%%distrosign -b shim -a %{-a*} -d %{-d*}} \ - mv shim%{-a*}-signed.efi shim%{-a*}-%{efi_vendor}.efi \ -fi \ -if [ "%{-c*}" = "no" ]; then \ - cp shim%{-a*}-%{efi_vendor}.efi shim%{-a*}.efi \ -fi \ -%{expand:%%distrosign -b mm -a %{-a*} -d %{-d*}} \ -mv mm%{-a*}-signed.efi mm%{-a*}.efi \ -%{expand:%%distrosign -b fb -a %{-a*} -d %{-d*}} \ -mv fb%{-a*}-signed.efi fb%{-a*}.efi \ -rm -vf \\\ - mm%{-a*}-unsigned.efi \\\ - fb%{-a*}-unsigned.efi \\\ - shim%{-a*}-unsigned.efi \ -%{nil} - -# -a <efiarch> -# -A <EFIARCH> -# -b <BOOTCSV> -%define do_install(a:A:b:) \ -install -m 0700 shim%{-a*}.efi \\\ - $RPM_BUILD_ROOT%{efi_esp_dir}/shim%{-a*}.efi \ -install -m 0700 shim%{-a*}-%{efi_vendor}.efi \\\ - $RPM_BUILD_ROOT%{efi_esp_dir}/shim%{-a*}-%{efi_vendor}.efi \ -install -m 0700 mm%{-a*}.efi \\\ - $RPM_BUILD_ROOT%{efi_esp_dir}/mm%{-a*}.efi \ -install -m 0700 %{-b*} \\\ - $RPM_BUILD_ROOT%{efi_esp_dir}/BOOT%{-A*}.CSV \ -install -m 0700 shim%{-a*}.efi \\\ - $RPM_BUILD_ROOT%{efi_esp_boot}/BOOT%{-A*}.EFI \ -install -m 0700 fb%{-a*}.efi \\\ - $RPM_BUILD_ROOT%{efi_esp_boot}/fb%{-a*}.efi \ -%nil - -# -a <efiarch> -# -A <EFIARCH> -%define define_files(a:A:) \ -%{expand:%%files -n shim-%{-a*}} \ -%{efi_esp_dir}/*%{-a*}*.efi \ -%{efi_esp_dir}/BOOT%{-A*}.CSV \ -%{efi_esp_boot}/*%{-a*}.efi \ -%{efi_esp_boot}/*%{-A*}.EFI \ -%{nil} - -%ifarch x86_64 -%global is_signed yes -%global is_alt_signed yes -%global provide_legacy_shim 1 -%endif -%ifarch aarch64 -%global is_signed no -%global is_alt_signed no -%global provide_legacy_shim 1 -%endif -%ifnarch x86_64 aarch64 -%global is_signed no -%global is_alt_signed no -%global provide_legacy_shim 0 -%endif - -%global found_macros_dot_shim 1 - -%if ! 0%{?vendor:1} -%global vendor nopenopenope -%endif - -# filetype:spec diff --git a/shim.rpmmacros b/shim.rpmmacros new file mode 100644 index 0000000..0747e6f --- /dev/null +++ b/shim.rpmmacros @@ -0,0 +1,170 @@ +%global debug_package %{nil} +%global __brp_mangle_shebangs_exclude_from_file %{expand:%{_builddir}/shim-%{efi_arch}-%{version}-%{release}.%{_target_cpu}-shebangs.txt} +%global vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}} +%global vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}} + +%global bootcsvaa64 %{expand:%{SOURCE10}} +%global bootcsvia32 %{expand:%{SOURCE11}} +%global bootcsvx64 %{expand:%{SOURCE12}} +#%%global bootcsvarm %%{expand:%%{SOURCE13}} + +%global shimefiaa64 %{expand:%{SOURCE20}} +%global shimefiia32 %{expand:%{SOURCE21}} +%global shimefix64 %{expand:%{SOURCE22}} +#%%global shimefiarm %%%%{expand:%%{SOURCE23} + +%global shimveraa64 15-1.fc28 +%global shimveria32 15-1.fc28 +%global shimverx64 15-1.fc28 +#%%global shimverarm 15-1.fc28 + +%global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64 +%global shimdiria32 %{_datadir}/shim/%{shimveria32}/ia32 +%global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64 +#%%global shimdirarm %%{_datadir}/shim/%%{shimverarm}/arm + +%{expand: +%%global bootcsv %%{expand:%%{bootcsv%%{efi_arch}}} +%%global bootcsvalt %%{expand:%%{bootcsv%%{?efi_alt_arch}}} +%%global shimefi %%{expand:%%{shimefi%%{efi_arch}}} +%%global shimefialt %%{expand:%%{shimefi%%{?efi_alt_arch}}} +%%global shimver %%{expand:%%{shimver%%{efi_arch}}} +%%global shimveralt %%{expand:%%{shimver%%{?efi_alt_arch}}} +%%global shimdir %%{expand:%%{shimdir%%{efi_arch}}} +%%global shimdiralt %%{expand:%%{shimdir%%{?efi_alt_arch}}} + +%%global unsigned%{efi_arch} %{efi_arch} +%%global unsignedaa64 aarch64 +%%global unsigned shim-unsigned-%%{expand:%%{unsigned%{efi_arch}}} +%%global unsignedalt shim-unsigned-%{?efi_alt_arch} +} + +%define define_pkg(a:p:) \ +%{expand:%%package -n shim-%{-a*}} \ +Summary: First-stage UEFI bootloader \ +Requires: mokutil >= 1:0.2.0-1 \ +Provides: shim-signed-%{-a*} = %{version}-%{release} \ +Requires: dbxtool >= 0.6-3 \ +%{expand:%%if 0%%{-p*} \ +Provides: shim = %{version}-%{release} \ +Provides: shim-signed = %{version}-%{release} \ +Obsoletes: shim-signed < %{version}-%{release} \ +Obsoletes: shim < %{version}-%{release} \ +%%endif} \ +# Shim uses OpenSSL, but cannot use the system copy as the UEFI ABI \ +# is not compatible with SysV (there's no red zone under UEFI) and \ +# there isn't a POSIX-style C library. \ +# BuildRequires: OpenSSL \ +Provides: bundled(openssl) = 1.0.2j \ + \ +%{expand:%%description -n shim-%{-a*}} \ +Initial UEFI bootloader that handles chaining to a trusted full \ +bootloader under secure boot environments. This package contains the \ +version signed by the UEFI signing service. \ +%{nil} + +# -a <efiarch> +# -i <input> +%define hash(a:i:d:) \ + pesign -i %{-i*} -h -P > shim.hash \ + read file0 hash0 < shim.hash \ + read file1 hash1 < %{-d*}/shim%{-a*}.hash \ + if ! [ "$hash0" = "$hash1" ]; then \ + echo Invalid signature\! > /dev/stderr \ + echo $hash0 vs $hash1 \ + exit 1 \ + fi \ + %{nil} + +# -i <input> +# -o <output> +%define sign(i:o:) \ + %{expand:%%pesign -s -i %{-i*} -o %{-o*}} \ + %{nil} + +# -b <binary prefix> +# -a <efiarch> +# -i <input> +%define distrosign(b:a:d:) \ + cp -av %{-d*}/%{-b*}%{-a*}.efi %{-b*}%{-a*}-unsigned.efi \ + %{expand:%%sign -i %{-b*}%{-a*}-unsigned.efi -o %{-b*}%{-a*}-signed.efi}\ + %{nil} + +# -a <efiarch> +# -A <EFIARCH> +# -b <1|0> # signed by this builder? +# -c <1|0> # signed by UEFI CA? +# -i <shimARCH.efi> +%define define_build(a:A:b:c:i:d:) \ +if [ "%{-c*}" = "yes" ]; then \ + %{expand:%%hash -i %{-i*} -a %{-a*} -d %{-d*}} \ +fi \ +cp %{-i*} shim%{-a*}.efi \ +if [ "%{-b*}" = "yes" ]; then \ + %{expand:%%distrosign -b shim -a %{-a*} -d %{-d*}} \ + mv shim%{-a*}-signed.efi shim%{-a*}-%{efi_vendor}.efi \ +fi \ +if [ "%{-c*}" = "no" ]; then \ + cp shim%{-a*}-%{efi_vendor}.efi shim%{-a*}.efi \ +fi \ +%{expand:%%distrosign -b mm -a %{-a*} -d %{-d*}} \ +mv mm%{-a*}-signed.efi mm%{-a*}.efi \ +%{expand:%%distrosign -b fb -a %{-a*} -d %{-d*}} \ +mv fb%{-a*}-signed.efi fb%{-a*}.efi \ +rm -vf \\\ + mm%{-a*}-unsigned.efi \\\ + fb%{-a*}-unsigned.efi \\\ + shim%{-a*}-unsigned.efi \ +%{nil} + +# -a <efiarch> +# -A <EFIARCH> +# -b <BOOTCSV> +%define do_install(a:A:b:) \ +install -m 0700 shim%{-a*}.efi \\\ + $RPM_BUILD_ROOT%{efi_esp_dir}/shim%{-a*}.efi \ +install -m 0700 shim%{-a*}-%{efi_vendor}.efi \\\ + $RPM_BUILD_ROOT%{efi_esp_dir}/shim%{-a*}-%{efi_vendor}.efi \ +install -m 0700 mm%{-a*}.efi \\\ + $RPM_BUILD_ROOT%{efi_esp_dir}/mm%{-a*}.efi \ +install -m 0700 %{-b*} \\\ + $RPM_BUILD_ROOT%{efi_esp_dir}/BOOT%{-A*}.CSV \ +install -m 0700 shim%{-a*}.efi \\\ + $RPM_BUILD_ROOT%{efi_esp_boot}/BOOT%{-A*}.EFI \ +install -m 0700 fb%{-a*}.efi \\\ + $RPM_BUILD_ROOT%{efi_esp_boot}/fb%{-a*}.efi \ +%nil + +# -a <efiarch> +# -A <EFIARCH> +%define define_files(a:A:) \ +%{expand:%%files -n shim-%{-a*}} \ +%{efi_esp_dir}/*%{-a*}*.efi \ +%{efi_esp_dir}/BOOT%{-A*}.CSV \ +%{efi_esp_boot}/*%{-a*}.efi \ +%{efi_esp_boot}/*%{-A*}.EFI \ +%{nil} + +%ifarch x86_64 +%global is_signed yes +%global is_alt_signed yes +%global provide_legacy_shim 1 +%endif +%ifarch aarch64 +%global is_signed no +%global is_alt_signed no +%global provide_legacy_shim 1 +%endif +%ifnarch x86_64 aarch64 +%global is_signed no +%global is_alt_signed no +%global provide_legacy_shim 0 +%endif + +%global found_macros_dot_shim 1 + +%if ! 0%{?vendor:1} +%global vendor nopenopenope +%endif + +# filetype:spec diff --git a/shim.spec b/shim.spec index 7c5e7d9..0967a81 100644 --- a/shim.spec +++ b/shim.spec @@ -18,7 +18,7 @@ ExcludeArch: %{ix86} # and we don't have shim-unsigned-arm builds yet ExcludeArch: %{arm} -Source0: macros.shim +Source0: shim.rpmmacros # keep these two lists of sources synched up arch-wise. That is 0 and 10 # match, 1 and 11 match, ...

6 years

1
0
0 / 0

Architecture specific change in rpms/shim.git

by githook-noreply＠fedoraproject.org

The package rpms/shim.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/shim.git/commit/?id=de58e0d74e32b.... Change: -%ifarch aarch64 Thanks. Full change: ============ commit de58e0d74e32beabd80c3c1492d07ff7d67c5004 Author: Peter Jones <pjones(a)redhat.com> Date: Thu May 3 16:32:59 2018 -0400 try another small change... Signed-off-by: Peter Jones <pjones(a)redhat.com> diff --git a/macros.shim b/macros.shim index be88a12..c9334b7 100644 --- a/macros.shim +++ b/macros.shim @@ -6,22 +6,22 @@ %global bootcsvaa64 %{expand:%{SOURCE10}} %global bootcsvia32 %{expand:%{SOURCE11}} %global bootcsvx64 %{expand:%{SOURCE12}} -%global bootcsvarm %{expand:%{SOURCE13}} +#%%global bootcsvarm %%{expand:%%{SOURCE13}} %global shimefiaa64 %{expand:%{SOURCE20}} %global shimefiia32 %{expand:%{SOURCE21}} %global shimefix64 %{expand:%{SOURCE22}} -%global shimefiarm %%{expand:%{SOURCE23} +#%%global shimefiarm %%%%{expand:%%{SOURCE23} %global shimveraa64 15-1.fc28 %global shimveria32 15-1.fc28 %global shimverx64 15-1.fc28 -%global shimverarm 15-1.fc28 +#%%global shimverarm 15-1.fc28 %global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64 %global shimdiria32 %{_datadir}/shim/%{shimveria32}/ia32 %global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64 -%global shimdirarm %{_datadir}/shim/%{shimverarm}/arm +#%%global shimdirarm %%{_datadir}/shim/%%{shimverarm}/arm %global bootcsv %{expand:%%{bootcsv%{efi_arch}}} %global bootcsvalt %{expand:%%{bootcsv%{?efi_alt_arch}}} diff --git a/shim.spec b/shim.spec index b48bf88..7c5e7d9 100644 --- a/shim.spec +++ b/shim.spec @@ -88,13 +88,7 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi %define_files -a %{efi_alt_arch} -A %{efi_alt_arch_upper} %endif -%ifarch x86_64 -%{efi_esp_dir}/BOOT.CSV -%{efi_esp_dir}/MokManager.efi -%{efi_esp_dir}/shim.efi -%{efi_esp_boot}/fallback.efi -%endif -%ifarch aarch64 +%if %{provide_legacy_shim} %{efi_esp_dir}/shim.efi %endif

6 years

1
0
0 / 0

Architecture specific change in rpms/shim.git

by githook-noreply＠fedoraproject.org

The package rpms/shim.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/shim.git/commit/?id=c0bacf937c596.... Change: +%ifarch x86_64 Thanks. Full change: ============ commit c0bacf937c596d2bb1e6f79d4f0242c1da6f7dcb Author: Peter Jones <pjones(a)redhat.com> Date: Thu May 3 14:34:37 2018 -0400 Move a lot of boilerplate to macros.shim There's a bunch of boilerplate to determine filenames and such based on which arch we're on; there's no reason to read it most of the time. Move all that to macros.shim. This makes the actual spec much more reasonable. Signed-off-by: Peter Jones <pjones(a)redhat.com> diff --git a/macros.shim b/macros.shim new file mode 100644 index 0000000..be88a12 --- /dev/null +++ b/macros.shim @@ -0,0 +1,170 @@ +%global debug_package %{nil} +%global __brp_mangle_shebangs_exclude_from_file %{expand:%{_builddir}/shim-%{efi_arch}-%{version}-%{release}.%{_target_cpu}-shebangs.txt} +%global vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}} +%global vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}} + +%global bootcsvaa64 %{expand:%{SOURCE10}} +%global bootcsvia32 %{expand:%{SOURCE11}} +%global bootcsvx64 %{expand:%{SOURCE12}} +%global bootcsvarm %{expand:%{SOURCE13}} + +%global shimefiaa64 %{expand:%{SOURCE20}} +%global shimefiia32 %{expand:%{SOURCE21}} +%global shimefix64 %{expand:%{SOURCE22}} +%global shimefiarm %%{expand:%{SOURCE23} + +%global shimveraa64 15-1.fc28 +%global shimveria32 15-1.fc28 +%global shimverx64 15-1.fc28 +%global shimverarm 15-1.fc28 + +%global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64 +%global shimdiria32 %{_datadir}/shim/%{shimveria32}/ia32 +%global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64 +%global shimdirarm %{_datadir}/shim/%{shimverarm}/arm + +%global bootcsv %{expand:%%{bootcsv%{efi_arch}}} +%global bootcsvalt %{expand:%%{bootcsv%{?efi_alt_arch}}} +%global shimefi %{expand:%%{shimefi%{efi_arch}}} +%global shimefialt %{expand:%%{shimefi%{?efi_alt_arch}}} +%global shimver %{expand:%%{shimver%{efi_arch}}} +%global shimveralt %{expand:%%{shimver%{?efi_alt_arch}}} +%global shimdir %{expand:%%{shimdir%{efi_arch}}} +%global shimdiralt %{expand:%%{shimdir%{?efi_alt_arch}}} + +%ifarch aarch64 +%global unsigned shim-unsigned-aarch64 +%else +%global unsigned shim-unsigned-%{efi_arch} +%endif +%global unsignedalt shim-unsigned-%{?efi_alt_arch} + +%define define_pkg(a:p:) \ +%{expand:%%package -n shim-%{-a*}} \ +Summary: First-stage UEFI bootloader \ +Requires: mokutil >= 1:0.2.0-1 \ +Provides: shim-signed-%{-a*} = %{version}-%{release} \ +Requires: dbxtool >= 0.6-3 \ +%{expand:%%if 0%%{-p*} \ +Provides: shim = %{version}-%{release} \ +Provides: shim-signed = %{version}-%{release} \ +Obsoletes: shim-signed < %{version}-%{release} \ +Obsoletes: shim < %{version}-%{release} \ +%%endif} \ +# Shim uses OpenSSL, but cannot use the system copy as the UEFI ABI \ +# is not compatible with SysV (there's no red zone under UEFI) and \ +# there isn't a POSIX-style C library. \ +# BuildRequires: OpenSSL \ +Provides: bundled(openssl) = 1.0.2j \ + \ +%{expand:%%description -n shim-%{-a*}} \ +Initial UEFI bootloader that handles chaining to a trusted full \ +bootloader under secure boot environments. This package contains the \ +version signed by the UEFI signing service. \ +%{nil} + +# -a <efiarch> +# -i <input> +%define hash(a:i:d:) \ + pesign -i %{-i*} -h -P > shim.hash \ + read file0 hash0 < shim.hash \ + read file1 hash1 < %{-d*}/shim%{-a*}.hash \ + if ! [ "$hash0" = "$hash1" ]; then \ + echo Invalid signature\! > /dev/stderr \ + echo $hash0 vs $hash1 \ + exit 1 \ + fi \ + %{nil} + +# -i <input> +# -o <output> +%define sign(i:o:) \ + %{expand:%%pesign -s -i %{-i*} -o %{-o*}} \ + %{nil} + +# -b <binary prefix> +# -a <efiarch> +# -i <input> +%define distrosign(b:a:d:) \ + cp -av %{-d*}/%{-b*}%{-a*}.efi %{-b*}%{-a*}-unsigned.efi \ + %{expand:%%sign -i %{-b*}%{-a*}-unsigned.efi -o %{-b*}%{-a*}-signed.efi}\ + %{nil} + +# -a <efiarch> +# -A <EFIARCH> +# -b <1|0> # signed by this builder? +# -c <1|0> # signed by UEFI CA? +# -i <shimARCH.efi> +%define define_build(a:A:b:c:i:d:) \ +if [ "%{-c*}" = "yes" ]; then \ + %{expand:%%hash -i %{-i*} -a %{-a*} -d %{-d*}} \ +fi \ +cp %{-i*} shim%{-a*}.efi \ +if [ "%{-b*}" = "yes" ]; then \ + %{expand:%%distrosign -b shim -a %{-a*} -d %{-d*}} \ + mv shim%{-a*}-signed.efi shim%{-a*}-%{efi_vendor}.efi \ +fi \ +if [ "%{-c*}" = "no" ]; then \ + cp shim%{-a*}-%{efi_vendor}.efi shim%{-a*}.efi \ +fi \ +%{expand:%%distrosign -b mm -a %{-a*} -d %{-d*}} \ +mv mm%{-a*}-signed.efi mm%{-a*}.efi \ +%{expand:%%distrosign -b fb -a %{-a*} -d %{-d*}} \ +mv fb%{-a*}-signed.efi fb%{-a*}.efi \ +rm -vf \\\ + mm%{-a*}-unsigned.efi \\\ + fb%{-a*}-unsigned.efi \\\ + shim%{-a*}-unsigned.efi \ +%{nil} + +# -a <efiarch> +# -A <EFIARCH> +# -b <BOOTCSV> +%define do_install(a:A:b:) \ +install -m 0700 shim%{-a*}.efi \\\ + $RPM_BUILD_ROOT%{efi_esp_dir}/shim%{-a*}.efi \ +install -m 0700 shim%{-a*}-%{efi_vendor}.efi \\\ + $RPM_BUILD_ROOT%{efi_esp_dir}/shim%{-a*}-%{efi_vendor}.efi \ +install -m 0700 mm%{-a*}.efi \\\ + $RPM_BUILD_ROOT%{efi_esp_dir}/mm%{-a*}.efi \ +install -m 0700 %{-b*} \\\ + $RPM_BUILD_ROOT%{efi_esp_dir}/BOOT%{-A*}.CSV \ +install -m 0700 shim%{-a*}.efi \\\ + $RPM_BUILD_ROOT%{efi_esp_boot}/BOOT%{-A*}.EFI \ +install -m 0700 fb%{-a*}.efi \\\ + $RPM_BUILD_ROOT%{efi_esp_boot}/fb%{-a*}.efi \ +%nil + +# -a <efiarch> +# -A <EFIARCH> +%define define_files(a:A:) \ +%{expand:%%files -n shim-%{-a*}} \ +%{efi_esp_dir}/*%{-a*}*.efi \ +%{efi_esp_dir}/BOOT%{-A*}.CSV \ +%{efi_esp_boot}/*%{-a*}.efi \ +%{efi_esp_boot}/*%{-A*}.EFI \ +%{nil} + +%ifarch x86_64 +%global is_signed yes +%global is_alt_signed yes +%global provide_legacy_shim 1 +%endif +%ifarch aarch64 +%global is_signed no +%global is_alt_signed no +%global provide_legacy_shim 1 +%endif +%ifnarch x86_64 aarch64 +%global is_signed no +%global is_alt_signed no +%global provide_legacy_shim 0 +%endif + +%global found_macros_dot_shim 1 + +%if ! 0%{?vendor:1} +%global vendor nopenopenope +%endif + +# filetype:spec diff --git a/shim.spec b/shim.spec index d6dd183..254f7e0 100644 --- a/shim.spec +++ b/shim.spec @@ -1,85 +1,57 @@ -%global debug_package %{nil} - -%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')) - -# this is literally to make vim's \c not put a brace at the end. +# this is to make us only expand %%{dist} if we're on a modularity build. +# it's 2 macros make vim's \c not put a brace at the end of the changelog. %global _dist %{expand:%{?_module_build:%%{?dist}}} %global dist %{expand:%%{_dist}} Name: shim Version: 15 -Release: 3%{?dist} +Release: 4%{?dist} Summary: First-stage UEFI bootloader License: BSD -URL: http://github.com/rhboot/shim/ +URL: https://github.com/rhboot/shim/ +Requires: efi-filesystem -# Shim is only required on platforms implementing the UEFI secure boot -# protocol. The only one of those we currently wish to support is 64-bit x86. -# Adding further platforms will require adding appropriate relocation code. -ExclusiveArch: x86_64 aarch64 +ExclusiveArch: %{efi} +# but we don't build a .i686 package, just a shim-ia32.x86_64 package +ExcludeArch: %{ix86} +# and we don't have shim-unsigned-arm builds yet +ExcludeArch: %{arm} + +Source0: macros.shim # keep these two lists of sources synched up arch-wise. That is 0 and 10 # match, 1 and 11 match, ... -Source0: BOOTX64.CSV -Source1: BOOTAA64.CSV -Source2: BOOTIA32.CSV - -Source10: shimaa64.efi -Source11: shimia32.efi -Source12: shimx64.efi -#Source13: shimx64-signed.efi - -%global shimverx64 15-1.fc28 -%global shimveria32 15-1.fc28 -%global shimveraa64 15-1.fc28 - -%ifarch x86_64 -BuildRequires: shim-unsigned-x64 = %{shimverx64} -BuildRequires: shim-unsigned-ia32 = %{shimveria32} -%global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64 -%global shimdiria32 %{_datadir}/shim/%{shimveria32}/ia32 +Source10: BOOTAA64.CSV +Source20: shimaa64.efi +Source11: BOOTIA32.CSV +Source21: shimia32.efi +Source12: BOOTX64.CSV +Source22: shimx64.efi +#Source13: BOOTARM.CSV +#Source23: shimarm.efi + +# is this gross? yes, this is gross. +%if 0%{?_buildhost:1} +%include %{SOURCE0} %endif -%ifarch aarch64 -BuildRequires: shim-unsigned-aarch64 = %{shimveraa64} -%global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64 +%if ! 0%{?found_macros_dot_shim} +%include %{SOURCEURL0} %endif + BuildRequires: pesign >= 0.112-20.fc27 +BuildRequires: %{unsigned} = %{shimver} +%if %{efi_has_alt_arch} +BuildRequires: %{unsignedalt} = %{shimveralt} +%endif %description Initial UEFI bootloader that handles chaining to a trusted full bootloader under secure boot environments. This package contains the version signed by the UEFI signing service. -%define define_pkg(a:p:) \ -%{expand:%%package -n shim-%{-a*}} \ -Summary: First-stage UEFI bootloader \ -Requires: mokutil >= 1:0.2.0-1 \ -Provides: shim-signed-%{-a*} = %{version}-%{release} \ -Requires: dbxtool >= 0.6-3 \ -%{expand:%%if 0%%{-p*} \ -Provides: shim = %{version}-%{release} \ -Provides: shim-signed = %{version}-%{release} \ -Obsoletes: shim-signed < %{version}-%{release} \ -Obsoletes: shim < %{version}-%{release} \ -%%endif} \ -# Shim uses OpenSSL, but cannot use the system copy as the UEFI ABI \ -# is not compatible with SysV (there's no red zone under UEFI) and \ -# there isn't a POSIX-style C library. \ -# BuildRequires: OpenSSL \ -Provides: bundled(openssl) = 1.0.2j \ - \ -%{expand:%%description -n shim-%{-a*}} \ -Initial UEFI bootloader that handles chaining to a trusted full \ -bootloader under secure boot environments. This package contains the \ -version signed by the UEFI signing service. \ -%{nil} - -%ifarch x86_64 -%define_pkg -a x64 -p 1 -%define_pkg -a ia32 -%endif -%ifarch aarch64 -%define_pkg -a aa64 -p 1 +%define_pkg -a %{efi_arch} -p 1 +%if %{efi_has_alt_arch} +%define_pkg -a %{efi_alt_arch} %endif %prep @@ -88,144 +60,53 @@ rm -rf shim-%{version} mkdir shim-%{version} %build -%define vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}} -%define vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}} - -# -a <efiarch> -# -i <input> -%define hash(a:i:d:) \ - pesign -i %{-i*} -h -P > shim.hash \ - read file0 hash0 < shim.hash \ - read file1 hash1 < %{-d*}/shim%{-a*}.hash \ - if ! [ "$hash0" = "$hash1" ]; then \ - echo Invalid signature\! > /dev/stderr \ - echo $hash0 vs $hash1 \ - exit 1 \ - fi \ - %{nil} - -# -i <input> -# -o <output> -%define sign(i:o:) \ - %{expand:%%pesign -s -i %{-i*} -o %{-o*}} \ - %{nil} - -# -b <binary prefix> -# -a <efiarch> -# -i <input> -%define distrosign(b:a:d:) \ - cp -av %{-d*}/%{-b*}%{-a*}.efi %{-b*}%{-a*}-unsigned.efi \ - %{expand:%%sign -i %{-b*}%{-a*}-unsigned.efi -o %{-b*}%{-a*}-signed.efi}\ - %{nil} - -# -a <efiarch> -# -A <EFIARCH> -# -b <yes|no> # signed by this builder? -# -c <yes|no> # signed by UEFI CA? -# -i <shimARCH.efi> -%define define_build(a:A:b:c:i:d:) \ -#if [ "%%{-c*}" = "yes" ]; then \ -# %%{expand:%%%%hash -i %%{-i*} -a %%{-a*} -d %%{-d*}} \ -#fi \ -cp %{-i*} shim%{-a*}.efi \ -if [ "%{-b*}" = "yes" ]; then \ - %{expand:%%distrosign -b shim -a %{-a*} -d %{-d*}} \ - mv shim%{-a*}-signed.efi shim%{-a*}-%{efidir}.efi \ -fi \ -if [ "%{-c*}" = "no" ]; then \ - cp shim%{-a*}-%{efidir}.efi shim%{-a*}.efi \ -fi \ -%{expand:%%distrosign -b mm -a %{-a*} -d %{-d*}} \ -mv mm%{-a*}-signed.efi mm%{-a*}.efi \ -%{expand:%%distrosign -b fb -a %{-a*} -d %{-d*}} \ -mv fb%{-a*}-signed.efi fb%{-a*}.efi \ -rm -vf \\\ - mm%{-a*}-unsigned.efi \\\ - fb%{-a*}-unsigned.efi \\\ - shim%{-a*}-unsigned.efi \ -%{nil} cd shim-%{version} -%ifarch aarch64 -%define_build -a aa64 -A AA64 -i %{SOURCE10} -b yes -c no -d %{shimdiraa64} -%endif -%ifarch x86_64 -%define_build -a ia32 -A IA32 -i %{SOURCE11} -b yes -c yes -d %{shimdiria32} -%define_build -a x64 -A X64 -i %{SOURCE12} -b yes -c yes -d %{shimdirx64} +%if %{efi_has_alt_arch} +%define_build -a %{efi_alt_arch} -A %{efi_alt_arch_upper} -i %{shimefialt} -b yes -c %{is_alt_signed} -d %{shimdiralt} %endif +%define_build -a %{efi_arch} -A %{efi_arch_upper} -i %{shimefi} -b yes -c %{is_signed} -d %{shimdir} %install -# -a <efiarch> -# -A <EFIARCH> -# -b <BOOTCSV> -%define do_install(a:A:b:) \ -install -m 0700 shim%{-a*}.efi \\\ - $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim%{-a*}.efi \ -install -m 0700 shim%{-a*}-%{efidir}.efi \\\ - $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim%{-a*}-%{efidir}.efi \ -install -m 0700 mm%{-a*}.efi \\\ - $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/mm%{-a*}.efi \ -install -m 0700 %{-b*} \\\ - $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT%{-A*}.CSV \ -install -m 0700 shim%{-a*}.efi \\\ - $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/BOOT%{-A*}.EFI \ -install -m 0700 fb%{-a*}.efi \\\ - $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fb%{-a*}.efi \ -%nil - rm -rf $RPM_BUILD_ROOT cd shim-%{version} install -D -d -m 0755 $RPM_BUILD_ROOT/boot/ -install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/ -install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/ -install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/ -install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/ - -%ifarch x86_64 -%do_install -a x64 -A X64 -b %{SOURCE0} -%do_install -a ia32 -A IA32 -b %{SOURCE2} -install -m 0700 %{SOURCE2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT.CSV -install -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/mmx64.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/MokManager.efi -install -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fbx64.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fallback.efi -install -m 0700 %{SOURCE12} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi -#install -m 0700 %%{SOURCE13} $RPM_BUILD_ROOT/boot/efi/EFI/%%{efidir}/shim.efi -#install -m 0700 %%{SOURCE13} $RPM_BUILD_ROOT/boot/efi/EFI/%%{efidir}/shimx64.efi -#install -m 0700 %%{SOURCE13} $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/BOOTX64.EFI +install -D -d -m 0700 $RPM_BUILD_ROOT%{efi_esp_root}/ +install -D -d -m 0700 $RPM_BUILD_ROOT%{efi_esp_efi}/ +install -D -d -m 0700 $RPM_BUILD_ROOT%{efi_esp_dir}/ +install -D -d -m 0700 $RPM_BUILD_ROOT%{efi_esp_boot}/ + +%do_install -a %{efi_arch} -A %{efi_arch_upper} -b %{bootcsv} +%if %{efi_has_alt_arch} +%do_install -a %{efi_alt_arch} -A %{efi_alt_arch_upper} -b %{bootcsvalt} %endif -%ifarch aarch64 -%do_install -a aa64 -A AA64 -b %{SOURCE1} -install -m 0700 %{SOURCE10} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi + +%if %{provide_legacy_shim} +install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi %endif -# -a <efiarch> -# -A <EFIARCH> -%define define_files(a:A:) \ -%{expand:%%files -n shim-%{-a*}} \ -%dir /boot/efi \ -%dir /boot/efi/EFI \ -%dir /boot/efi/EFI/BOOT \ -%dir /boot/efi/EFI/%{efidir} \ -/boot/efi/EFI/%{efidir}/*%{-a*}*.efi \ -/boot/efi/EFI/%{efidir}/BOOT%{-A*}.CSV \ -/boot/efi/EFI/BOOT/*%{-a*}.efi \ -/boot/efi/EFI/BOOT/*%{-A*}.EFI \ -%{nil} +( cd $RPM_BUILD_ROOT ; find .%{efi_esp_root} -type f ) \ + | sed -e 's/\./\^/' -e 's,^\\\./,.*/,' -e 's,$,$,' > %{__brp_mangle_shebangs_exclude_from_file} -%ifarch x86_64 -%define_files -a x64 -A X64 -/boot/efi/EFI/%{efidir}/BOOT.CSV -/boot/efi/EFI/%{efidir}/MokManager.efi -/boot/efi/EFI/%{efidir}/shim.efi -/boot/efi/EFI/BOOT/fallback.efi +%define_files -a %{efi_arch} -A %{efi_arch_upper} +%if %{efi_has_alt_arch} +%define_files -a %{efi_alt_arch} -A %{efi_alt_arch_upper} +%endif -%define_files -a ia32 -A IA32 +%ifarch x86_64 +%{efi_esp_dir}/BOOT.CSV +%{efi_esp_dir}/MokManager.efi +%{efi_esp_dir}/shim.efi +%{efi_esp_boot}/fallback.efi %endif %ifarch aarch64 -%define_files -a aa64 -A AA64 -/boot/efi/EFI/%{efidir}/shim.efi +%{efi_esp_dir}/shim.efi %endif %changelog +* Thu May 03 2018 Peter Jones <pjones(a)redhat.com> - 15-4 +- Rework the .spec to use efi-rpm-macros. + * Mon Apr 30 2018 Peter Jones <pjones(a)redhat.com> - 15-3 - Pick a release value that'll be higher than what's in F28.

6 years

1
0
0 / 0

Architecture specific change in rpms/love.git

by githook-noreply＠fedoraproject.org

The package rpms/love.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/love.git/commit/?id=ef020378d1513.... Change: +ExcludeArch: ppc ppc64 s390x Thanks. Full change: ============ commit ef020378d1513c2aa36f354c4a1b210f156a2a0b Author: Mystro256 <alexjnewt(a)hotmail.com> Date: Thu May 3 14:34:39 2018 -0400 Exclude big endian systems, as they are not supported by love 11.1 diff --git a/love.spec b/love.spec index cfe5d25..c8bd3dc 100644 --- a/love.spec +++ b/love.spec @@ -50,6 +50,9 @@ Provides: bundled(luasocket) = 3.0 Provides: bundled(lz4) = 1.8.0 Provides: bundled(physfs) = 3.0.1 +#Big endian systems are not yet supported by love 11+ +ExcludeArch: ppc ppc64 s390x + %description LOVE is an open source, cross platform 2D game engine which uses the Lua scripting language. LOVE can be used to make games of any license

6 years

1
0
0 / 0

Architecture specific change in rpms/COPASI.git

by githook-noreply＠fedoraproject.org

The package rpms/COPASI.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/COPASI.git/commit/?id=fa7fe2ce9c3... https://src.fedoraproject.org/cgit/rpms/COPASI.git/commit/?id=85a271130e7... https://src.fedoraproject.org/cgit/rpms/COPASI.git/commit/?id=a47f7d4dd18... https://src.fedoraproject.org/cgit/rpms/COPASI.git/commit/?id=14b4b758cec.... Change: -%ifarch s390 s390x %{arm} -%ifarch s390x %{arm} +%ifarch s390 s390x %{arm} +%ifarch s390x %{arm} Thanks. Full change: ============ commit fa7fe2ce9c3dcdde5f4ea8160ce54e459d525e3b Author: sagitter <sagitter(a)fedoraproject.org> Date: Thu May 3 11:30:12 2018 +0200 Disable java/octave bindings diff --git a/COPASI.spec b/COPASI.spec index c547ac0..8c98680 100644 --- a/COPASI.spec +++ b/COPASI.spec @@ -9,23 +9,19 @@ %endif %endif -%global buildid 184 +%global buildid 184 +%global octpkg COPASI %global with_python2 1 %global with_python3 1 -%ifarch s390 s390x %{arm} aarch64 %{power64} +# Disable Java binding %global with_java 0 -%else -%global with_java 1 -%endif +Obsoletes: java-%{octpkg} < 0:4.23.184-2 -# Disable Octave binding on ARM ('virtual memory exhausted' issue) -%ifarch s390 s390x %{arm} +# Disable Octave binding ('virtual memory exhausted' issue) %global with_octave 0 -%else -%global with_octave 1 -%endif +Obsoletes: octave-%{octpkg} < 0:4.23.184-2 %global with_perl 1 %global with_r 1 @@ -44,7 +40,6 @@ # Not ready %global with_qt5 0 -%global octpkg COPASI %if 0%{?with_octave} # Exclude .oct files from provides %global __provides_exclude_from ^%{octpkglibdir}/.*\\.oct$ @@ -394,8 +389,7 @@ export INCBLAS=%{_includedir} -DENABLE_FLEX_BISON:BOOL=ON -DBISON_EXECUTABLE:FILEPATH=%{_bindir}/bison \ -DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES -DCombine-static_DIR:PATH=%{_libdir}/cmake .. -##'Parallel make' breaks builds -make -j1 +%make_build popd ## ----> Move to build2 directory ## @@ -611,7 +605,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appd %changelog * Sun Apr 29 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.23.184-2 - Now built with Qt4 -- Do not use parallel Make jobs +- Disable java/octave bindings * Sun Apr 29 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.23.184-1 - Update to version 4.23 -build 184 commit 85a271130e70e1faa278923e7aac45f058fc4a31 Author: sagitter <sagitter(a)fedoraproject.org> Date: Wed May 2 17:59:13 2018 +0200 Update to version 4.23 -build 184 diff --git a/.gitignore b/.gitignore index 9583b19..5567ff1 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /COPASI-Build-165.tar.gz /COPASI-Build-166.tar.gz /COPASI-Build-170.tar.gz +/COPASI-Build-184.tar.gz diff --git a/COPASI-find_QWT5-QTMML-SBW.patch b/COPASI-find_QWT5-QTMML-SBW.patch index 363993a..20a9ef7 100644 --- a/COPASI-find_QWT5-QTMML-SBW.patch +++ b/COPASI-find_QWT5-QTMML-SBW.patch @@ -6,16 +6,16 @@ /opt/include - /usr/freeware/include + /usr/include - PATH_SUFFIXES qwt qwt-qt4 qwt-qt5 qwt6 + PATH_SUFFIXES qt5/qwt6 qwt qwt-qt4 qwt-qt5 qwt6 NO_DEFAULT_PATH) @@ -35,7 +35,7 @@ find_library(QWT_LIBRARY - NAMES qwt-static + NAMES qwt-qt5 - qwt-qt4 + qwt5-qt4 - qwt-qt5 + qwt-static qwt PATHS $ENV{QWT_DIR}/lib --- CMakeModules/FindQtMmlQt4.orig.cmake 2015-06-17 07:55:18.000000000 +0200 diff --git a/COPASI-find_QWT6-QTMML-SBW.patch b/COPASI-find_QWT6-QTMML-SBW.patch index 2c3235d..d25ecc4 100644 --- a/COPASI-find_QWT6-QTMML-SBW.patch +++ b/COPASI-find_QWT6-QTMML-SBW.patch @@ -10,16 +10,10 @@ $ENV{QWT_DIR} ~/Library/Frameworks /Library/Frameworks -@@ -34,11 +35,12 @@ - endif () - - find_library(QWT_LIBRARY -- NAMES qwt-static -+ NAMES qwt -+ qwt-static +@@ -38,7 +39,8 @@ qwt-qt4 - qwt-qt5 -- qwt + qwt-static + qwt - PATHS $ENV{QWT_DIR}/lib + PATHS @@libdir@@ + $ENV{QWT_DIR}/lib diff --git a/COPASI-fix_exe_permissions.patch b/COPASI-fix_exe_permissions.patch index 7d40170..b913759 100644 --- a/COPASI-fix_exe_permissions.patch +++ b/COPASI-fix_exe_permissions.patch @@ -15,7 +15,7 @@ --- copasi/CopasiUI/CMakeLists.orig.txt 2015-07-06 20:53:01.000000000 +0200 +++ copasi/CopasiUI/CMakeLists.txt 2015-07-18 14:25:32.353337151 +0200 -@@ -104,7 +104,11 @@ +@@ -109,7 +109,11 @@ if(NOT APPLE) SET(APPS "\${CMAKE_INSTALL_PREFIX}/bin/CopasiUI${CMAKE_EXECUTABLE_SUFFIX}" CACHE INTERNAL "") diff --git a/COPASI-fix_install_libpaths.patch b/COPASI-fix_install_libpaths.patch index af84592..8f03174 100644 --- a/COPASI-fix_install_libpaths.patch +++ b/COPASI-fix_install_libpaths.patch @@ -1,7 +1,7 @@ ##This patch sets libraries' installation paths according to the Fedora packaging guidelines --- CMakeLists.orig.txt 2015-06-03 14:40:54.000000000 +0200 +++ CMakeLists.txt 2015-06-11 12:29:51.346501583 +0200 -@@ -694,13 +694,13 @@ +@@ -843,13 +843,13 @@ file(GLOB_RECURSE WIZARD_HELP_FILES "${PROJECT_SOURCE_DIR}/copasi/wizard/help_html" copasi/wizard/help_html/*.html) file(GLOB_RECURSE WIZARD_IMAGE_FILES "${PROJECT_SOURCE_DIR}/copasi/wizard/help_html/figures" copasi/wizard/help_html/figures/*.png) file(GLOB_RECURSE EXAMPLE_FILES "${PROJECT_SOURCE_DIR}/TestSuite/distribution" TestSuite/distribution/*.*) @@ -11,17 +11,17 @@ +install(FILES ${WIZARD_HELP_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/copasi/doc/html) +install(FILES ${WIZARD_IMAGE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/copasi/doc/html/figures) +install(FILES ${EXAMPLE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/copasi/examples) - install(FILES - "${PROJECT_SOURCE_DIR}/copasi/UI/icons/Copasi.ico" - "${PROJECT_SOURCE_DIR}/copasi/UI/icons/CopasiDoc.ico" + install(FILES + "${PROJECT_SOURCE_DIR}/copasi/UI/icons/Copasi.ico" + "${PROJECT_SOURCE_DIR}/copasi/UI/icons/CopasiDoc.ico" - DESTINATION share/copasi/icons) + DESTINATION share/icons/copasi/icons) - install(FILES - "${PROJECT_SOURCE_DIR}/copasi/MIRIAM/MIRIAMResources.xml" + install(FILES + "${PROJECT_SOURCE_DIR}/copasi/MIRIAM/MIRIAMResources.xml" DESTINATION share/copasi/config) --- copasi/bindings/csharp/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/csharp/CMakeLists.txt 2015-01-07 16:29:49.830302408 +0100 -@@ -145,9 +145,7 @@ +@@ -157,9 +157,7 @@ target_link_libraries(binding_csharp_native_lib ${SE_LIBS} ${SE_EXTERNAL_LIBS} ) @@ -32,7 +32,7 @@ #################################################################### # -@@ -173,9 +173,9 @@ +@@ -185,9 +185,9 @@ add_custom_target(binding_csharp_managed_lib ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/copasicsP.dll) add_dependencies(binding_csharp_managed_lib binding_csharp_swig) @@ -46,7 +46,7 @@ # they still work with the current objectmodel --- copasi/bindings/perl/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/perl/CMakeLists.txt 2015-01-07 16:25:59.264689795 +0100 -@@ -142,7 +142,7 @@ +@@ -153,7 +153,7 @@ string(REPLACE "'" "" PERL_PLATFORM ${PERL_PLATFORM}) string(REPLACE ";" "" PERL_PLATFORM ${PERL_PLATFORM}) string(REPLACE "archname=" "" PERL_PLATFORM ${PERL_PLATFORM}) @@ -55,7 +55,7 @@ set(PERL_PACKAGE_INSTALL_BIN_DIR ${PERL_PACKAGE_INSTALL_DIR}/auto/COPASI) else() set(PERL_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/perl) -@@ -159,5 +159,5 @@ +@@ -170,5 +170,5 @@ set_target_properties(binding_perl_lib PROPERTIES SUFFIX ".bundle") endif() @@ -64,7 +64,7 @@ --- copasi/bindings/python/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/python/CMakeLists.txt 2015-01-07 19:32:33.235855748 +0100 -@@ -134,10 +134,10 @@ +@@ -165,13 +165,13 @@ set(PYTHON_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/python) endif() @@ -77,9 +77,12 @@ file(GLOB examples ${CMAKE_CURRENT_SOURCE_DIR}/examples/*.py) -INSTALL(FILES ${examples} DESTINATION ${MISC_PREFIX}bindings/python) +INSTALL(FILES ${examples} DESTINATION ${PYTHON_PACKAGE_INSTALL_DIR}/copasi/examples) + + macro(ADJUST_PYTHONPATH target) + --- copasi/bindings/java/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/java/CMakeLists.txt 2015-01-07 21:08:43.571075012 +0100 -@@ -145,7 +145,7 @@ +@@ -149,7 +149,7 @@ set_target_properties (binding_java_lib PROPERTIES SUFFIX ".jnilib") endif() @@ -88,7 +91,7 @@ target_link_libraries(binding_java_lib ${SE_LIBS} ${SE_EXTERNAL_LIBS} ) -@@ -177,9 +177,9 @@ +@@ -181,9 +181,9 @@ install(FILES ${COPASI_JAR} ${COPASI_GUI_JAR} @@ -102,7 +105,7 @@ # they still work with the current objectmodel --- copasi/bindings/octave/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/octave/CMakeLists.txt 2015-01-08 18:34:10.609971192 +0100 -@@ -132,11 +132,11 @@ +@@ -145,12 +145,12 @@ # set(OCTAVE_PACKAGE_INSTALL_DIR) if (UNIX OR CYGWIN) @@ -114,3 +117,6 @@ -INSTALL(TARGETS binding_octave_lib DESTINATION ${OCTAVE_PACKAGE_INSTALL_DIR} ) +INSTALL(TARGETS binding_octave_lib PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${OCTAVE_PACKAGE_INSTALL_DIR}) + + add_test(NAME octave_test_version + COMMAND octave --no-gui --eval "COPASI;display(COPASI.CVersion.VERSION.getVersion())" diff --git a/COPASI-set_QWTPLOT3D_QT4.patch b/COPASI-set_QWTPLOT3D_QT4.patch index eb9bb4d..ec950bd 100644 --- a/COPASI-set_QWTPLOT3D_QT4.patch +++ b/COPASI-set_QWTPLOT3D_QT4.patch @@ -1,6 +1,6 @@ --- CMakeModules/FindQwtplot3dQt4.orig.cmake 2015-06-17 07:55:18.000000000 +0200 +++ CMakeModules/FindQwtplot3dQt4.cmake 2015-06-23 18:16:42.954635914 +0200 -@@ -20,18 +20,17 @@ +@@ -20,19 +20,17 @@ /opt/csw/include # Blastwave /opt/include /usr/freeware/include @@ -18,12 +18,13 @@ find_library(QWTPLOT3D_LIBRARY - NAMES qwtplot3d-static - qwtplot3d-qt4 +- qwtplot3d-qt5 - qwtplot3d + NAMES qwtplot3d-qt4 PATHS $ENV{QWTPLOT3D_DIR}/lib $ENV{QWTPLOT3D_DIR} ~/Library/Frameworks -@@ -43,6 +42,7 @@ +@@ -44,6 +42,7 @@ /opt/csw/lib # Blastwave /opt/lib /usr/freeware/lib64 @@ -31,4 +32,3 @@ NO_DEFAULT_PATH) if (NOT QWTPLOT3D_LIBRARY) - diff --git a/COPASI-set_QWTPLOT3D_QT5.patch b/COPASI-set_QWTPLOT3D_QT5.patch index 87797d0..730f361 100644 --- a/COPASI-set_QWTPLOT3D_QT5.patch +++ b/COPASI-set_QWTPLOT3D_QT5.patch @@ -14,8 +14,8 @@ /opt/include /usr/freeware/include - PATH_SUFFIXES qwtplot3d qwtplot3d-qt4 -+ @@qtplot3d_includedir@@ -+ PATH_SUFFIXES qwtplot3d-qt5 ++ @@qtplot3d_includedir@@ ++ PATH_SUFFIXES qwtplot3d-qt5 NO_DEFAULT_PATH) if (NOT QWTPLOT3D_INCLUDE_DIR) @@ -27,12 +27,12 @@ find_library(QWTPLOT3D_LIBRARY - NAMES qwtplot3d-static - qwtplot3d-qt4 -- qwtplot3d +- qwtplot3d-qt5 + NAMES qwtplot3d-qt5 + qwtplot3d PATHS $ENV{QWTPLOT3D_DIR}/lib $ENV{QWTPLOT3D_DIR} - ~/Library/Frameworks -@@ -43,6 +42,7 @@ +@@ -44,6 +43,7 @@ /opt/csw/lib # Blastwave /opt/lib /usr/freeware/lib64 diff --git a/COPASI.spec b/COPASI.spec index 9b92ba0..c547ac0 100644 --- a/COPASI.spec +++ b/COPASI.spec @@ -9,7 +9,7 @@ %endif %endif -%global buildid 170 +%global buildid 184 %global with_python2 1 %global with_python3 1 @@ -65,8 +65,8 @@ Name: COPASI Summary: Biochemical network simulator -Version: 4.22.%{buildid} -Release: 7%{?dist} +Version: 4.23.%{buildid} +Release: 2%{?dist} ##Artistic 2.0 is main license ##GPLv2+ is related to a Mixed Source Licensing Scenario @@ -101,6 +101,9 @@ BuildRequires: libkdeedu-static BuildRequires: libsbml-devel BuildRequires: libsedml-devel >= 1:0.4.3-3 BuildRequires: libnuml-devel +BuildRequires: libCombine-static +BuildRequires: zipper-devel +BuildRequires: minizip-devel BuildRequires: libsbw-devel BuildRequires: raptor-devel BuildRequires: mesa-libGL-devel @@ -125,7 +128,7 @@ BuildRequires: ImageMagick BuildRequires: libappstream-glib Requires: %{name}-data = %{version}-%{release} -Requires: libsedml >= 1:0.4.3-3 +Requires: libsedml%{?_isa} >= 1:0.4.3-3 ##This patch sets libraries' installation paths Patch0: %{name}-fix_install_libpaths.patch @@ -244,7 +247,7 @@ develop applications with COPASI Perl bindings. %package -n R-%{octpkg} Summary: %{name} R Bindings BuildRequires: R-devel, R-core-devel, tex(latex) -Requires: R-core +Requires: R-core%{?_isa} %description -n R-%{octpkg} This package provides the libraries to develop applications with COPASI R bindings. @@ -360,12 +363,14 @@ export INCBLAS=%{_includedir} -DQWT_VERSION_STRING:STRING=6.1.3 \ %endif %if 0%{?with_qt4} + -DSELECT_QT=Qt4 \ -DQT_QMAKE_EXECUTABLE:FILEPATH=%{_bindir}/qmake-qt4 \ -DQWT_VERSION_STRING:STRING=5.2.2 \ -DQWT_LIBRARY:FILEPATH=%{_qt4_libdir}/libqwt5-qt4.so \ -DQWT_INCLUDE_DIR:PATH=%{_qt4_headerdir}/qwt5-qt4 \ %endif %if 0%{?with_qt5} + -DSELECT_QT=Qt5 \ -DQT_QMAKE_EXECUTABLE:FILEPATH=%{_bindir}/qmake-qt5 \ -DQWT_VERSION_STRING:STRING=6.1.3 \ -DQWT_LIBRARY:FILEPATH=%{_qt5_libdir}/libqwt-qt5.so \ @@ -381,19 +386,16 @@ export INCBLAS=%{_includedir} -DBLAS_blas_LIBRARY:FILEPATH=%{_libdir}/$LIBBLAS -DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/$LIBLAPACK -DCLAPACK_INCLUDE_DIR:PATH=$INCBLAS \ -DENABLE_FLEX_BISON:BOOL=ON -DENABLE_COPASI_PARAMETERFITTING_RESIDUAL_SCALING:BOOL=ON \ -DENABLE_WITH_MERGEMODEL:BOOL=ON -DENABLE_USE_MATH_CONTAINER:BOOL=ON \ - -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir}/sbml -DF2C_INCLUDE_DIR:PATH=%{_includedir} \ + -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir}/sbml -DLIBSBML_SHARED:BOOL=ON -DLIBSBML_LIBRARY:FILEPATH=%{_libdir}/libsbml.so \ + -DF2C_INCLUDE_DIR:PATH=%{_includedir} \ -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DENABLE_GPROF:BOOL=OFF \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -DCMAKE_COLOR_MAKEFILE:BOOL=ON \ -DENABLE_FLEX_BISON:BOOL=ON -DBISON_EXECUTABLE:FILEPATH=%{_bindir}/bison \ - -DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES .. + -DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES -DCombine-static_DIR:PATH=%{_libdir}/cmake .. ##'Parallel make' breaks builds -%ifarch s390x %{arm} make -j1 -%else -make -j4 -%endif popd ## ----> Move to build2 directory ## @@ -448,7 +450,8 @@ export INCBLAS=%{_includedir} -DBLAS_blas_LIBRARY:FILEPATH=%{_libdir}/$LIBBLAS -DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/$LIBLAPACK -DCLAPACK_INCLUDE_DIR:PATH=$INCBLAS \ -DENABLE_FLEX_BISON:BOOL=ON -DENABLE_COPASI_PARAMETERFITTING_RESIDUAL_SCALING:BOOL=ON \ -DENABLE_WITH_MERGEMODEL:BOOL=ON -DENABLE_USE_MATH_CONTAINER:BOOL=ON \ - -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir}/sbml -DF2C_INCLUDE_DIR:PATH=%{_includedir} \ + -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir}/sbml -DLIBSBML_SHARED:BOOL=ON -DLIBSBML_LIBRARY:FILEPATH=%{_libdir}/libsbml.so \ + -DF2C_INCLUDE_DIR:PATH=%{_includedir} \ -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DENABLE_GPROF:BOOL=OFF \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -DCMAKE_COLOR_MAKEFILE:BOOL=ON \ @@ -606,6 +609,15 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appd %{_datadir}/copasi/doc/ %changelog +* Sun Apr 29 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.23.184-2 +- Now built with Qt4 +- Do not use parallel Make jobs + +* Sun Apr 29 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.23.184-1 +- Update to version 4.23 -build 184 +- Add libCombine, zipper, minizip dependencies +- Build with Qt5 + * Thu Feb 15 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.22.170-7 - Rebuild for libsbml-5.16.0 - Disable Octave binding on ARM ('virtual memory exhausted' issue) diff --git a/sources b/sources index 225b2d0..c707395 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (COPASI-Build-170.tar.gz) = 086d8cf4178e55b260787e9c02c9c253edfd07878b5c67f6d757f87bb0f26dadaeb2fdf7c61093eb2f7dab1894525217bec8e91cf06ce725b1958cce350f414d +SHA512 (COPASI-Build-184.tar.gz) = d63f0081b62dd451de469b9450d7a8fbcf49cf5a0387947798ea7cb10a7ece39b3a4fe3e76b04d0d2ec15605d2636e4579f51b1b551870512602885e92e978d1 commit a47f7d4dd18ea6f365be0908aef3b4c0e87e6b37 Author: sagitter <sagitter(a)fedoraproject.org> Date: Fri Feb 16 12:45:08 2018 +0100 Disable Octave binding on ARM ('virtual memory exhausted' issue) diff --git a/COPASI.spec b/COPASI.spec index cf87eca..9b92ba0 100644 --- a/COPASI.spec +++ b/COPASI.spec @@ -20,7 +20,8 @@ %global with_java 1 %endif -%ifarch s390 s390x +# Disable Octave binding on ARM ('virtual memory exhausted' issue) +%ifarch s390 s390x %{arm} %global with_octave 0 %else %global with_octave 1 @@ -607,6 +608,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appd %changelog * Thu Feb 15 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.22.170-7 - Rebuild for libsbml-5.16.0 +- Disable Octave binding on ARM ('virtual memory exhausted' issue) * Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.22.170-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild commit 14b4b758cecf588b16402858be0c8c79a4347405 Author: sagitter <sagitter(a)fedoraproject.org> Date: Thu Feb 15 18:22:48 2018 +0100 Use Make job-1 on arm diff --git a/COPASI.spec b/COPASI.spec index 3487a04..cf87eca 100644 --- a/COPASI.spec +++ b/COPASI.spec @@ -388,7 +388,7 @@ export INCBLAS=%{_includedir} -DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES .. ##'Parallel make' breaks builds -%ifarch s390x +%ifarch s390x %{arm} make -j1 %else make -j4

6 years

1
0
0 / 0

Architecture specific change in rpms/COPASI.git

by githook-noreply＠fedoraproject.org

The package rpms/COPASI.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/COPASI.git/commit/?id=fa7fe2ce9c3... https://src.fedoraproject.org/cgit/rpms/COPASI.git/commit/?id=85a271130e7.... Change: -%ifarch s390 s390x %{arm} -%ifarch s390x %{arm} Thanks. Full change: ============ commit fa7fe2ce9c3dcdde5f4ea8160ce54e459d525e3b Author: sagitter <sagitter(a)fedoraproject.org> Date: Thu May 3 11:30:12 2018 +0200 Disable java/octave bindings diff --git a/COPASI.spec b/COPASI.spec index c547ac0..8c98680 100644 --- a/COPASI.spec +++ b/COPASI.spec @@ -9,23 +9,19 @@ %endif %endif -%global buildid 184 +%global buildid 184 +%global octpkg COPASI %global with_python2 1 %global with_python3 1 -%ifarch s390 s390x %{arm} aarch64 %{power64} +# Disable Java binding %global with_java 0 -%else -%global with_java 1 -%endif +Obsoletes: java-%{octpkg} < 0:4.23.184-2 -# Disable Octave binding on ARM ('virtual memory exhausted' issue) -%ifarch s390 s390x %{arm} +# Disable Octave binding ('virtual memory exhausted' issue) %global with_octave 0 -%else -%global with_octave 1 -%endif +Obsoletes: octave-%{octpkg} < 0:4.23.184-2 %global with_perl 1 %global with_r 1 @@ -44,7 +40,6 @@ # Not ready %global with_qt5 0 -%global octpkg COPASI %if 0%{?with_octave} # Exclude .oct files from provides %global __provides_exclude_from ^%{octpkglibdir}/.*\\.oct$ @@ -394,8 +389,7 @@ export INCBLAS=%{_includedir} -DENABLE_FLEX_BISON:BOOL=ON -DBISON_EXECUTABLE:FILEPATH=%{_bindir}/bison \ -DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES -DCombine-static_DIR:PATH=%{_libdir}/cmake .. -##'Parallel make' breaks builds -make -j1 +%make_build popd ## ----> Move to build2 directory ## @@ -611,7 +605,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appd %changelog * Sun Apr 29 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.23.184-2 - Now built with Qt4 -- Do not use parallel Make jobs +- Disable java/octave bindings * Sun Apr 29 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.23.184-1 - Update to version 4.23 -build 184 commit 85a271130e70e1faa278923e7aac45f058fc4a31 Author: sagitter <sagitter(a)fedoraproject.org> Date: Wed May 2 17:59:13 2018 +0200 Update to version 4.23 -build 184 diff --git a/.gitignore b/.gitignore index 9583b19..5567ff1 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /COPASI-Build-165.tar.gz /COPASI-Build-166.tar.gz /COPASI-Build-170.tar.gz +/COPASI-Build-184.tar.gz diff --git a/COPASI-find_QWT5-QTMML-SBW.patch b/COPASI-find_QWT5-QTMML-SBW.patch index 363993a..20a9ef7 100644 --- a/COPASI-find_QWT5-QTMML-SBW.patch +++ b/COPASI-find_QWT5-QTMML-SBW.patch @@ -6,16 +6,16 @@ /opt/include - /usr/freeware/include + /usr/include - PATH_SUFFIXES qwt qwt-qt4 qwt-qt5 qwt6 + PATH_SUFFIXES qt5/qwt6 qwt qwt-qt4 qwt-qt5 qwt6 NO_DEFAULT_PATH) @@ -35,7 +35,7 @@ find_library(QWT_LIBRARY - NAMES qwt-static + NAMES qwt-qt5 - qwt-qt4 + qwt5-qt4 - qwt-qt5 + qwt-static qwt PATHS $ENV{QWT_DIR}/lib --- CMakeModules/FindQtMmlQt4.orig.cmake 2015-06-17 07:55:18.000000000 +0200 diff --git a/COPASI-find_QWT6-QTMML-SBW.patch b/COPASI-find_QWT6-QTMML-SBW.patch index 2c3235d..d25ecc4 100644 --- a/COPASI-find_QWT6-QTMML-SBW.patch +++ b/COPASI-find_QWT6-QTMML-SBW.patch @@ -10,16 +10,10 @@ $ENV{QWT_DIR} ~/Library/Frameworks /Library/Frameworks -@@ -34,11 +35,12 @@ - endif () - - find_library(QWT_LIBRARY -- NAMES qwt-static -+ NAMES qwt -+ qwt-static +@@ -38,7 +39,8 @@ qwt-qt4 - qwt-qt5 -- qwt + qwt-static + qwt - PATHS $ENV{QWT_DIR}/lib + PATHS @@libdir@@ + $ENV{QWT_DIR}/lib diff --git a/COPASI-fix_exe_permissions.patch b/COPASI-fix_exe_permissions.patch index 7d40170..b913759 100644 --- a/COPASI-fix_exe_permissions.patch +++ b/COPASI-fix_exe_permissions.patch @@ -15,7 +15,7 @@ --- copasi/CopasiUI/CMakeLists.orig.txt 2015-07-06 20:53:01.000000000 +0200 +++ copasi/CopasiUI/CMakeLists.txt 2015-07-18 14:25:32.353337151 +0200 -@@ -104,7 +104,11 @@ +@@ -109,7 +109,11 @@ if(NOT APPLE) SET(APPS "\${CMAKE_INSTALL_PREFIX}/bin/CopasiUI${CMAKE_EXECUTABLE_SUFFIX}" CACHE INTERNAL "") diff --git a/COPASI-fix_install_libpaths.patch b/COPASI-fix_install_libpaths.patch index af84592..8f03174 100644 --- a/COPASI-fix_install_libpaths.patch +++ b/COPASI-fix_install_libpaths.patch @@ -1,7 +1,7 @@ ##This patch sets libraries' installation paths according to the Fedora packaging guidelines --- CMakeLists.orig.txt 2015-06-03 14:40:54.000000000 +0200 +++ CMakeLists.txt 2015-06-11 12:29:51.346501583 +0200 -@@ -694,13 +694,13 @@ +@@ -843,13 +843,13 @@ file(GLOB_RECURSE WIZARD_HELP_FILES "${PROJECT_SOURCE_DIR}/copasi/wizard/help_html" copasi/wizard/help_html/*.html) file(GLOB_RECURSE WIZARD_IMAGE_FILES "${PROJECT_SOURCE_DIR}/copasi/wizard/help_html/figures" copasi/wizard/help_html/figures/*.png) file(GLOB_RECURSE EXAMPLE_FILES "${PROJECT_SOURCE_DIR}/TestSuite/distribution" TestSuite/distribution/*.*) @@ -11,17 +11,17 @@ +install(FILES ${WIZARD_HELP_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/copasi/doc/html) +install(FILES ${WIZARD_IMAGE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/copasi/doc/html/figures) +install(FILES ${EXAMPLE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/copasi/examples) - install(FILES - "${PROJECT_SOURCE_DIR}/copasi/UI/icons/Copasi.ico" - "${PROJECT_SOURCE_DIR}/copasi/UI/icons/CopasiDoc.ico" + install(FILES + "${PROJECT_SOURCE_DIR}/copasi/UI/icons/Copasi.ico" + "${PROJECT_SOURCE_DIR}/copasi/UI/icons/CopasiDoc.ico" - DESTINATION share/copasi/icons) + DESTINATION share/icons/copasi/icons) - install(FILES - "${PROJECT_SOURCE_DIR}/copasi/MIRIAM/MIRIAMResources.xml" + install(FILES + "${PROJECT_SOURCE_DIR}/copasi/MIRIAM/MIRIAMResources.xml" DESTINATION share/copasi/config) --- copasi/bindings/csharp/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/csharp/CMakeLists.txt 2015-01-07 16:29:49.830302408 +0100 -@@ -145,9 +145,7 @@ +@@ -157,9 +157,7 @@ target_link_libraries(binding_csharp_native_lib ${SE_LIBS} ${SE_EXTERNAL_LIBS} ) @@ -32,7 +32,7 @@ #################################################################### # -@@ -173,9 +173,9 @@ +@@ -185,9 +185,9 @@ add_custom_target(binding_csharp_managed_lib ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/copasicsP.dll) add_dependencies(binding_csharp_managed_lib binding_csharp_swig) @@ -46,7 +46,7 @@ # they still work with the current objectmodel --- copasi/bindings/perl/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/perl/CMakeLists.txt 2015-01-07 16:25:59.264689795 +0100 -@@ -142,7 +142,7 @@ +@@ -153,7 +153,7 @@ string(REPLACE "'" "" PERL_PLATFORM ${PERL_PLATFORM}) string(REPLACE ";" "" PERL_PLATFORM ${PERL_PLATFORM}) string(REPLACE "archname=" "" PERL_PLATFORM ${PERL_PLATFORM}) @@ -55,7 +55,7 @@ set(PERL_PACKAGE_INSTALL_BIN_DIR ${PERL_PACKAGE_INSTALL_DIR}/auto/COPASI) else() set(PERL_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/perl) -@@ -159,5 +159,5 @@ +@@ -170,5 +170,5 @@ set_target_properties(binding_perl_lib PROPERTIES SUFFIX ".bundle") endif() @@ -64,7 +64,7 @@ --- copasi/bindings/python/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/python/CMakeLists.txt 2015-01-07 19:32:33.235855748 +0100 -@@ -134,10 +134,10 @@ +@@ -165,13 +165,13 @@ set(PYTHON_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/python) endif() @@ -77,9 +77,12 @@ file(GLOB examples ${CMAKE_CURRENT_SOURCE_DIR}/examples/*.py) -INSTALL(FILES ${examples} DESTINATION ${MISC_PREFIX}bindings/python) +INSTALL(FILES ${examples} DESTINATION ${PYTHON_PACKAGE_INSTALL_DIR}/copasi/examples) + + macro(ADJUST_PYTHONPATH target) + --- copasi/bindings/java/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/java/CMakeLists.txt 2015-01-07 21:08:43.571075012 +0100 -@@ -145,7 +145,7 @@ +@@ -149,7 +149,7 @@ set_target_properties (binding_java_lib PROPERTIES SUFFIX ".jnilib") endif() @@ -88,7 +91,7 @@ target_link_libraries(binding_java_lib ${SE_LIBS} ${SE_EXTERNAL_LIBS} ) -@@ -177,9 +177,9 @@ +@@ -181,9 +181,9 @@ install(FILES ${COPASI_JAR} ${COPASI_GUI_JAR} @@ -102,7 +105,7 @@ # they still work with the current objectmodel --- copasi/bindings/octave/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100 +++ copasi/bindings/octave/CMakeLists.txt 2015-01-08 18:34:10.609971192 +0100 -@@ -132,11 +132,11 @@ +@@ -145,12 +145,12 @@ # set(OCTAVE_PACKAGE_INSTALL_DIR) if (UNIX OR CYGWIN) @@ -114,3 +117,6 @@ -INSTALL(TARGETS binding_octave_lib DESTINATION ${OCTAVE_PACKAGE_INSTALL_DIR} ) +INSTALL(TARGETS binding_octave_lib PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${OCTAVE_PACKAGE_INSTALL_DIR}) + + add_test(NAME octave_test_version + COMMAND octave --no-gui --eval "COPASI;display(COPASI.CVersion.VERSION.getVersion())" diff --git a/COPASI-set_QWTPLOT3D_QT4.patch b/COPASI-set_QWTPLOT3D_QT4.patch index eb9bb4d..ec950bd 100644 --- a/COPASI-set_QWTPLOT3D_QT4.patch +++ b/COPASI-set_QWTPLOT3D_QT4.patch @@ -1,6 +1,6 @@ --- CMakeModules/FindQwtplot3dQt4.orig.cmake 2015-06-17 07:55:18.000000000 +0200 +++ CMakeModules/FindQwtplot3dQt4.cmake 2015-06-23 18:16:42.954635914 +0200 -@@ -20,18 +20,17 @@ +@@ -20,19 +20,17 @@ /opt/csw/include # Blastwave /opt/include /usr/freeware/include @@ -18,12 +18,13 @@ find_library(QWTPLOT3D_LIBRARY - NAMES qwtplot3d-static - qwtplot3d-qt4 +- qwtplot3d-qt5 - qwtplot3d + NAMES qwtplot3d-qt4 PATHS $ENV{QWTPLOT3D_DIR}/lib $ENV{QWTPLOT3D_DIR} ~/Library/Frameworks -@@ -43,6 +42,7 @@ +@@ -44,6 +42,7 @@ /opt/csw/lib # Blastwave /opt/lib /usr/freeware/lib64 @@ -31,4 +32,3 @@ NO_DEFAULT_PATH) if (NOT QWTPLOT3D_LIBRARY) - diff --git a/COPASI-set_QWTPLOT3D_QT5.patch b/COPASI-set_QWTPLOT3D_QT5.patch index 87797d0..730f361 100644 --- a/COPASI-set_QWTPLOT3D_QT5.patch +++ b/COPASI-set_QWTPLOT3D_QT5.patch @@ -14,8 +14,8 @@ /opt/include /usr/freeware/include - PATH_SUFFIXES qwtplot3d qwtplot3d-qt4 -+ @@qtplot3d_includedir@@ -+ PATH_SUFFIXES qwtplot3d-qt5 ++ @@qtplot3d_includedir@@ ++ PATH_SUFFIXES qwtplot3d-qt5 NO_DEFAULT_PATH) if (NOT QWTPLOT3D_INCLUDE_DIR) @@ -27,12 +27,12 @@ find_library(QWTPLOT3D_LIBRARY - NAMES qwtplot3d-static - qwtplot3d-qt4 -- qwtplot3d +- qwtplot3d-qt5 + NAMES qwtplot3d-qt5 + qwtplot3d PATHS $ENV{QWTPLOT3D_DIR}/lib $ENV{QWTPLOT3D_DIR} - ~/Library/Frameworks -@@ -43,6 +42,7 @@ +@@ -44,6 +43,7 @@ /opt/csw/lib # Blastwave /opt/lib /usr/freeware/lib64 diff --git a/COPASI.spec b/COPASI.spec index 9b92ba0..c547ac0 100644 --- a/COPASI.spec +++ b/COPASI.spec @@ -9,7 +9,7 @@ %endif %endif -%global buildid 170 +%global buildid 184 %global with_python2 1 %global with_python3 1 @@ -65,8 +65,8 @@ Name: COPASI Summary: Biochemical network simulator -Version: 4.22.%{buildid} -Release: 7%{?dist} +Version: 4.23.%{buildid} +Release: 2%{?dist} ##Artistic 2.0 is main license ##GPLv2+ is related to a Mixed Source Licensing Scenario @@ -101,6 +101,9 @@ BuildRequires: libkdeedu-static BuildRequires: libsbml-devel BuildRequires: libsedml-devel >= 1:0.4.3-3 BuildRequires: libnuml-devel +BuildRequires: libCombine-static +BuildRequires: zipper-devel +BuildRequires: minizip-devel BuildRequires: libsbw-devel BuildRequires: raptor-devel BuildRequires: mesa-libGL-devel @@ -125,7 +128,7 @@ BuildRequires: ImageMagick BuildRequires: libappstream-glib Requires: %{name}-data = %{version}-%{release} -Requires: libsedml >= 1:0.4.3-3 +Requires: libsedml%{?_isa} >= 1:0.4.3-3 ##This patch sets libraries' installation paths Patch0: %{name}-fix_install_libpaths.patch @@ -244,7 +247,7 @@ develop applications with COPASI Perl bindings. %package -n R-%{octpkg} Summary: %{name} R Bindings BuildRequires: R-devel, R-core-devel, tex(latex) -Requires: R-core +Requires: R-core%{?_isa} %description -n R-%{octpkg} This package provides the libraries to develop applications with COPASI R bindings. @@ -360,12 +363,14 @@ export INCBLAS=%{_includedir} -DQWT_VERSION_STRING:STRING=6.1.3 \ %endif %if 0%{?with_qt4} + -DSELECT_QT=Qt4 \ -DQT_QMAKE_EXECUTABLE:FILEPATH=%{_bindir}/qmake-qt4 \ -DQWT_VERSION_STRING:STRING=5.2.2 \ -DQWT_LIBRARY:FILEPATH=%{_qt4_libdir}/libqwt5-qt4.so \ -DQWT_INCLUDE_DIR:PATH=%{_qt4_headerdir}/qwt5-qt4 \ %endif %if 0%{?with_qt5} + -DSELECT_QT=Qt5 \ -DQT_QMAKE_EXECUTABLE:FILEPATH=%{_bindir}/qmake-qt5 \ -DQWT_VERSION_STRING:STRING=6.1.3 \ -DQWT_LIBRARY:FILEPATH=%{_qt5_libdir}/libqwt-qt5.so \ @@ -381,19 +386,16 @@ export INCBLAS=%{_includedir} -DBLAS_blas_LIBRARY:FILEPATH=%{_libdir}/$LIBBLAS -DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/$LIBLAPACK -DCLAPACK_INCLUDE_DIR:PATH=$INCBLAS \ -DENABLE_FLEX_BISON:BOOL=ON -DENABLE_COPASI_PARAMETERFITTING_RESIDUAL_SCALING:BOOL=ON \ -DENABLE_WITH_MERGEMODEL:BOOL=ON -DENABLE_USE_MATH_CONTAINER:BOOL=ON \ - -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir}/sbml -DF2C_INCLUDE_DIR:PATH=%{_includedir} \ + -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir}/sbml -DLIBSBML_SHARED:BOOL=ON -DLIBSBML_LIBRARY:FILEPATH=%{_libdir}/libsbml.so \ + -DF2C_INCLUDE_DIR:PATH=%{_includedir} \ -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DENABLE_GPROF:BOOL=OFF \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -DCMAKE_COLOR_MAKEFILE:BOOL=ON \ -DENABLE_FLEX_BISON:BOOL=ON -DBISON_EXECUTABLE:FILEPATH=%{_bindir}/bison \ - -DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES .. + -DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES -DCombine-static_DIR:PATH=%{_libdir}/cmake .. ##'Parallel make' breaks builds -%ifarch s390x %{arm} make -j1 -%else -make -j4 -%endif popd ## ----> Move to build2 directory ## @@ -448,7 +450,8 @@ export INCBLAS=%{_includedir} -DBLAS_blas_LIBRARY:FILEPATH=%{_libdir}/$LIBBLAS -DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/$LIBLAPACK -DCLAPACK_INCLUDE_DIR:PATH=$INCBLAS \ -DENABLE_FLEX_BISON:BOOL=ON -DENABLE_COPASI_PARAMETERFITTING_RESIDUAL_SCALING:BOOL=ON \ -DENABLE_WITH_MERGEMODEL:BOOL=ON -DENABLE_USE_MATH_CONTAINER:BOOL=ON \ - -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir}/sbml -DF2C_INCLUDE_DIR:PATH=%{_includedir} \ + -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir}/sbml -DLIBSBML_SHARED:BOOL=ON -DLIBSBML_LIBRARY:FILEPATH=%{_libdir}/libsbml.so \ + -DF2C_INCLUDE_DIR:PATH=%{_includedir} \ -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DENABLE_GPROF:BOOL=OFF \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -DCMAKE_COLOR_MAKEFILE:BOOL=ON \ @@ -606,6 +609,15 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appd %{_datadir}/copasi/doc/ %changelog +* Sun Apr 29 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.23.184-2 +- Now built with Qt4 +- Do not use parallel Make jobs + +* Sun Apr 29 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.23.184-1 +- Update to version 4.23 -build 184 +- Add libCombine, zipper, minizip dependencies +- Build with Qt5 + * Thu Feb 15 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.22.170-7 - Rebuild for libsbml-5.16.0 - Disable Octave binding on ARM ('virtual memory exhausted' issue) diff --git a/sources b/sources index 225b2d0..c707395 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (COPASI-Build-170.tar.gz) = 086d8cf4178e55b260787e9c02c9c253edfd07878b5c67f6d757f87bb0f26dadaeb2fdf7c61093eb2f7dab1894525217bec8e91cf06ce725b1958cce350f414d +SHA512 (COPASI-Build-184.tar.gz) = d63f0081b62dd451de469b9450d7a8fbcf49cf5a0387947798ea7cb10a7ece39b3a4fe3e76b04d0d2ec15605d2636e4579f51b1b551870512602885e92e978d1

6 years

1
0
0 / 0

Architecture specific change in rpms/love.git

by githook-noreply＠fedoraproject.org

The package rpms/love.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/love.git/commit/?id=f12b3585f37c3.... Change: -ExcludeArch: ppc64le Thanks. Full change: ============ commit f12b3585f37c3fe220696b6b824028a0e88f3770 Author: Mystro256 <alexjnewt(a)hotmail.com> Date: Thu May 3 12:43:20 2018 -0400 Update to 11.1 diff --git a/.gitignore b/.gitignore index a97d6b9..461bde8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /0.10.0.tar.gz /0.10.1.tar.gz /0.10.2.tar.gz +/love-11.1.tar.gz diff --git a/love-0.10.2-luajit2.1.0beta3.patch b/love-0.10.2-luajit2.1.0beta3.patch deleted file mode 100644 index 2f132f3..0000000 --- a/love-0.10.2-luajit2.1.0beta3.patch +++ /dev/null @@ -1,29 +0,0 @@ -# HG changeset patch -# User Bart van Strien <bart.bes+projects(a)gmail.com> -# Date 1493809570 -7200 -# Node ID 10f58e78bbfd82b681a45aeaf1177a765726bb31 -# Parent 33511fb56ffe3f7a9d3d1471114743e2e725d6fa -Fix luasocket compatibility with luajit 2.1.0 beta 3 (fix #1277) - -Note that luasocket 3.0 (in minor) targets lua 5.1, so it does not rely on a -5.0 compatibility feature, and does not require this patch. Since a 0.10.3 -release seems unlikely at this point, this commit is mostly targeted at future -packagers of older love versions. - -diff --git a/src/libraries/luasocket/libluasocket/lua.h b/src/libraries/luasocket/libluasocket/lua.h ---- a/src/libraries/luasocket/libluasocket/lua.h -+++ b/src/libraries/luasocket/libluasocket/lua.h -@@ -6,9 +6,12 @@ - #include <lualib.h> - #include <lauxlib.h> - --#if LUA_VERSION_NUM > 501 -+#if LUA_VERSION_NUM >= 501 -+# undef luaL_reg - # define luaL_reg luaL_Reg -+# undef luaL_putchar - # define luaL_putchar(B, c) luaL_addchar(B, c) -+# undef luaL_typerror - # define luaL_typerror(L, n, t) luax_typerror(L, n, t) - - extern int luax_typerror(lua_State *L, int narg, const char *type); diff --git a/love.spec b/love.spec index 743e08d..27e5c05 100644 --- a/love.spec +++ b/love.spec @@ -5,27 +5,19 @@ %global luadep lua %endif +# Git commit tag, source folder name is rude-love-{gittag} +%global gittag 0ab246b5045d + Name: love -Version: 0.10.2 -Release: 12%{?dist} +Version: 11.1 +Release: 1%{?dist} Summary: A free 2D game engine which enables easy game creation in Lua #All is licensed as zlib with one exception: #SOURCE/platform/unix/ltmain.sh is public domain License: zlib and Public Domain URL: http://love2d.org -Source0: https://bitbucket.org/rude/%{name}/get/%{version}.tar.gz - -#From upstream: -#https://bitbucket.org/rude/love/commits/10f58e78bbfd82b681a45aeaf1177a765726bb31 -%if 0%{?fedora} > 25 -Patch1: %{name}-%{version}-luajit2.1.0beta3.patch -%endif - -#ppc64le is not supported prior to f28, excluding for legacy: -%if 0%{?fedora} < 28 -ExcludeArch: ppc64le -%endif +Source0: https://bitbucket.org/rude/%{name}/get/%{version}.tar.gz#/%{name}-%{versi... BuildRequires: desktop-file-utils BuildRequires: freetype-devel @@ -37,7 +29,6 @@ BuildRequires: libtool BuildRequires: libvorbis-devel BuildRequires: %{luadep}-devel BuildRequires: openal-soft-devel -BuildRequires: physfs-devel BuildRequires: SDL2-devel Requires: lib%{name}%{?_isa} = %{version}-%{release} Requires: hicolor-icon-theme @@ -50,8 +41,10 @@ Requires: hicolor-icon-theme #https://bitbucket.org/rude/love/issues/870/allow-for-shared-version-of-libraries Provides: bundled(Box2D) = 2.3.0 Provides: bundled(enet) = 1.3.13 -Provides: bundled(luasocket) = 2.0.2 -Provides: bundled(lz4) = 1.7.0 +#Luasocket 3.0 rc1: +Provides: bundled(luasocket) = 3.0 +Provides: bundled(lz4) = 1.8.0 +Provides: bundled(physfs) = 3.0.1 %description LOVE is an open source, cross platform 2D game engine which uses the @@ -68,11 +61,11 @@ Lua scripting language. LOVE can be used to make games of any license allowing it to be used for both free and non-free projects. %prep -%autosetup -p1 -n rude-%{name}-afc69c4f7145 +%autosetup -p1 -n rude-%{name}-%{gittag} #Fixing line encoding: sed -i 's/\r//' license.txt #Fixing permissions: -chmod -x src/*/*/*.* src/libraries/Box2D/*/*.* src/libraries/Box2D/*/*/*.* +chmod a-x src/libraries/*/*/*/*.* src/libraries/*/*.* %build platform/unix/automagic @@ -109,9 +102,12 @@ rm -f %{buildroot}%{_libdir}/lib%{name}.la %doc changes.txt readme.md %license license.txt #Note that liblove.so is just a symlink, so a devel package is useless -%{_libdir}/lib%{name}.* +%{_libdir}/lib%{name}*.so %changelog +* Thu May 03 2018 Jeremy Newton <alexjnewt AT hotmail DOT com> - 11.1-1 +- Update to 11.1 + * Thu May 03 2018 Jeremy Newton <alexjnewt AT hotmail DOT com> - 0.10.2-12 - Update bundle info - Cleanup build requires diff --git a/sources b/sources index 5ac290c..664ad9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0ac22b0471dc000eb4e09cbe86bfa6a 0.10.2.tar.gz +SHA512 (love-11.1.tar.gz) = caba2847bfb5e7bfa9adba53859d403c81c195693577314c94b3ca2c85bf1026b604a9ca01648b551f6216f4a1ce68cf641a87c15640d54819d7dfd6be2fd4fa

6 years

1
0
0 / 0

Architecture specific change in rpms/golang-googlecode-goauth2.git

by githook-noreply＠fedoraproject.org

The package rpms/golang-googlecode-goauth2.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-googlecode-goauth2.git/com.... Change: -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} Thanks. Full change: ============ commit 89123cad4a65f0b9a4dc505dee8c035953e6c98c Author: Robert-André Mauchin <zebob.m(a)gmail.com> Date: Mon Apr 23 15:50:41 2018 +0200 Bump to upstream 6881fee410a5daf86371371f9ad451b95e168b71 Update to new Go packaging diff --git a/.gitignore b/.gitignore index a2fd6b2..90c52c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /afe77d958c701557ec5dc56f6936fcc194d15520.tar.gz /oauth2-5432cc9.tar.gz +/oauth2-6881fee410a5daf86371371f9ad451b95e168b71.tar.gz diff --git a/golang-googlecode-goauth2.spec b/golang-googlecode-goauth2.spec index e9731d3..b736e49 100644 --- a/golang-googlecode-goauth2.spec +++ b/golang-googlecode-goauth2.spec @@ -1,239 +1,90 @@ -# If any of the following macros should be set otherwise, -# you can wrap any of them with the following conditions: -# - %%if 0%%{centos} == 7 -# - %%if 0%%{?rhel} == 7 -# - %%if 0%%{?fedora} == 23 -# Or just test for particular distribution: -# - %%if 0%%{centos} -# - %%if 0%%{?rhel} -# - %%if 0%%{?fedora} -# -# Be aware, on centos, both %%rhel and %%centos are set. If you want to test -# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition. -# (Don't forget to replace double percentage symbol with single one in order to apply a condition) - -# Generate devel rpm -%global with_devel 1 -# Build project from bundled dependencies -%global with_bundled 0 -# Build with debug info rpm -%global with_debug 0 # Run tests in check section -# Cyclic deps among cloud, grpc and oauth2 -%global with_check 0 -# Generate unit-test rpm -%global with_unit_test 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif +%bcond_without check + +%global goipath golang.org/x/oauth2 +%global forgeurl https://github.com/golang/oauth2 +%global oldgoipath code.google.com/p/goauth2 +%global oldgoname %gorpmname %{oldgoipath} +%global commit 6881fee410a5daf86371371f9ad451b95e168b71 -%global provider github -%global provider_tld com -%global project golang -%global repo oauth2 -# https://github.com/golang/oauth2 -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path golang.org/x/oauth2 -%global commit 5432cc9688e6250a0dd8f5a5f4c781d92b398be6 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -%global gc_rev afe77d958c701557ec5dc56f6936fcc194d15520 -%global gc_shortrev %(r=%{gc_rev}; echo ${r:0:12}) -%global gc_provider google -%global gc_provider_sub code -%global gc_provider_tld com -%global gc_repo goauth2 -%global gc_import_path %{gc_provider_sub}.%{gc_provider}.%{gc_provider_tld}/p/%{gc_repo} -%global gc_name golang-%{gc_provider}%{gc_provider_sub}-%{gc_repo} - -%global x_name golang-golangorg-oauth2 -%global devel_main %{x_name}-devel +%global common_description %{expand: +A client implementation for OAuth 2.0 spec.} + +%gometa Name: golang-googlecode-goauth2 Version: 0 -Release: 0.23.git%{shortcommit}%{?dist} -Summary: OAuth 2.0 for Go clients +Release: 0.24%{?dist} +Summary: A client implementation for OAuth 2.0 spec License: BSD -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -Source1: https://%{gc_repo}.%{gc_provider}%{gc_provider_sub}.%{gc_provider_tld}/archive/%{gc_rev}.tar.gz - -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} - -%description -%{summary} - -%if 0%{?with_devel} -%package -n %{x_name}-devel -Summary: %{summary} -BuildArch: noarch +URL: %{gourl} +Source0: %{gosource} -%if 0%{?with_check} +BuildRequires: golang(cloud.google.com/go/compute/metadata) BuildRequires: golang(golang.org/x/net/context) +BuildRequires: golang(golang.org/x/net/context/ctxhttp) BuildRequires: golang(google.golang.org/appengine) BuildRequires: golang(google.golang.org/appengine/urlfetch) -%endif -Requires: golang(golang.org/x/net/context) -Requires: golang(google.golang.org/appengine) -Requires: golang(google.golang.org/appengine/urlfetch) - -Provides: golang(%{import_path}) = %{version}-%{release} -Provides: golang(%{import_path}/amazon) = %{version}-%{release} -Provides: golang(%{import_path}/bitbucket) = %{version}-%{release} -Provides: golang(%{import_path}/clientcredentials) = %{version}-%{release} -Provides: golang(%{import_path}/facebook) = %{version}-%{release} -Provides: golang(%{import_path}/fitbit) = %{version}-%{release} -Provides: golang(%{import_path}/foursquare) = %{version}-%{release} -Provides: golang(%{import_path}/github) = %{version}-%{release} -Provides: golang(%{import_path}/google) = %{version}-%{release} -Provides: golang(%{import_path}/heroku) = %{version}-%{release} -Provides: golang(%{import_path}/hipchat) = %{version}-%{release} -Provides: golang(%{import_path}/jws) = %{version}-%{release} -Provides: golang(%{import_path}/jwt) = %{version}-%{release} -Provides: golang(%{import_path}/linkedin) = %{version}-%{release} -Provides: golang(%{import_path}/mediamath) = %{version}-%{release} -Provides: golang(%{import_path}/microsoft) = %{version}-%{release} -Provides: golang(%{import_path}/odnoklassniki) = %{version}-%{release} -Provides: golang(%{import_path}/paypal) = %{version}-%{release} -Provides: golang(%{import_path}/slack) = %{version}-%{release} -Provides: golang(%{import_path}/uber) = %{version}-%{release} -Provides: golang(%{import_path}/vk) = %{version}-%{release} -Provides: golang(%{import_path}/yandex) = %{version}-%{release} - -%description -n %{x_name}-devel -%{summary} +%description +%{common_description} -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%package -n %{gc_name}-devel +%package devel Summary: %{summary} BuildArch: noarch -Provides: golang(%{gc_import_path}/appengine/serviceaccount) = %{version}-%{release} -Provides: golang(%{gc_import_path}/compute/serviceaccount) = %{version}-%{release} -Provides: golang(%{gc_import_path}/oauth) = %{version}-%{release} -Provides: golang(%{gc_import_path}/oauth/jwt) = %{version}-%{release} - -%description -n %{gc_name}-devel -%{summary} +%description devel +%{common_description} This package contains library source intended for building other packages which use import path with -%{gc_import_path} prefix. -%endif +%{goipath} prefix. -%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 +%package -n compat-%{oldgoname}-devel +Summary: %{summary} +BuildArch: noarch + +%description -n compat-%{oldgoname}-devel +%{common_description} + +This package contains compatibility glue for code that still imports the +%{oldgoipath} Go namespace. -# test subpackage tests code from devel subpackage -Requires: %{x_name}-devel = %{version}-%{release} - -%description unit-test -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif %prep -%setup -q -n %{gc_repo}-%{gc_shortrev} -T -b 1 -%setup -q -n %{repo}-%{commit} +%forgeautosetup -%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 - -install -d -p %{buildroot}/%{gopath}/src/%{gc_import_path}/ -pushd ../%{gc_repo}-%{gc_shortrev} -# 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/%{gc_import_path}/$(dirname $file) - cp -pav $file %{buildroot}/%{gopath}/src/%{gc_import_path}/$file - echo "%%{gopath}/src/%%{gc_import_path}/$file" >> ../%{repo}-%{commit}/gc_devel.file-list -done -popd +%goinstall -%endif +install -m 0755 -vd %{buildroot}%{gopath}/src/%(dirname %{oldgoipath}) +ln -s %{gopath}/src/%{goipath} %{buildroot}%{gopath}/src/%{oldgoipath} -# 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 +%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}/clientcredentials -# open testdata/gcloud/credentials: no such file or directory -#%gotest %{import_path}/google -%gotest %{import_path}/internal -%gotest %{import_path}/jws -%gotest %{import_path}/jwt -%endif -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%if 0%{?with_devel} -%files -n %{x_name}-devel -f devel.file-list +%files devel -f devel.file-list %license LICENSE -%doc README.md CONTRIBUTING.md AUTHORS CONTRIBUTORS -%dir %{gopath}/src/%{import_path} +%doc README.md CONTRIBUTORS CONTRIBUTING.md AUTHORS -%files -n %{gc_name}-devel -f gc_devel.file-list -%license LICENSE -%doc README.md CONTRIBUTING.md AUTHORS CONTRIBUTORS -%dir %{gopath}/src/%{gc_import_path} -%endif -%if 0%{?with_unit_test} -%files unit-test -f unit-test.file-list -%license LICENSE -%doc README.md CONTRIBUTING.md AUTHORS CONTRIBUTORS -%endif +%files -n compat-%{oldgoname}-devel +%dir %{gopath}/src/%(dirname %{oldgoipath}) +%{gopath}/src/%{oldgoipath} + %changelog +* Wed Mar 21 2018 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.24.20180423git6881fee +- Bump to upstream 6881fee410a5daf86371371f9ad451b95e168b71 +- Update to new Go packaging + * Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.23.git5432cc9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index f69195a..65a3cb2 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (oauth2-5432cc9.tar.gz) = ec212f2369cc4aa568a2c76fd736450a7f429a9dce93c4c1656e04ab3cba39e858e067ab9be8a2cf94dc391b00c67a253c7d8fdce63469b6ea129aa529d51fc3 -SHA512 (afe77d958c701557ec5dc56f6936fcc194d15520.tar.gz) = 813ae04e2887165f2f4a35cfd594f784d4057d28c94248a059ff9e4852eaf26ada289217bf506dddf17919466720849de18f4ec0beb296645eae26bdea8c470e +SHA512 (oauth2-6881fee410a5daf86371371f9ad451b95e168b71.tar.gz) = bec09e224f035ce6adde1c87de3e0eea21098bd3faabd9e8372bd30096ddd5a92a14470445d9dd50ac840f8fb674456d49343ba552bc87c8e70a67e7e36e1ff7

6 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes May 2018