Architecture specific change in rpms/mmc.git
by githook-noreply@fedoraproject.org
The package rpms/mmc.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/mmc.git/commit/?id=2920433f01e90b....
Change:
+%ifarch %ix86 x86_64
Thanks.
Full change:
============
commit 2920433f01e90b958fd79e9b19324e8d1d41c748
Author: Qianqian Fang <fangqq(a)gmail.com>
Date: Tue Mar 3 16:29:22 2020 -0500
initial package for mmc and octave-mmc
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..38dbe05
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/mmc-1.7.9.tar.gz
diff --git a/mmc.spec b/mmc.spec
new file mode 100644
index 0000000..c2a2661
--- /dev/null
+++ b/mmc.spec
@@ -0,0 +1,225 @@
+%global octpkg mmclab
+
+Name: mmc
+Version: 1.7.9
+Release: 1%{?dist}
+License: GPLv3+
+URL: http://mcx.space/mmc
+Source0: https://github.com/fangq/%{name}/archive/v%{version}/%{name}-%{version}.t...
+Summary: A GPU-based mesh-based Monte Carlo (MMC) photon simulator
+BuildRequires: octave-devel gcc-c++ vim-common opencl-headers ocl-icd-devel
+Requires: octave opencl-filesystem octave-iso2mesh
+Requires(post): octave
+Requires(postun): octave
+Provides: bundled(ssemath) = 0.0
+Provides: bundled(cjson) = 0.0
+
+%description
+Mesh-based Monte Carlo (MMC) is a 3D Monte Carlo (MC) simulation software
+for photon transport in complex turbid media. MMC combines the strengths
+of the MC-based technique and the finite-element (FE) method: on the
+one hand, it can handle general media, including low-scattering ones,
+as in the MC method; on the other hand, it can use an FE-like tetrahedral
+mesh to represent curved boundaries and complex structures, making it
+even more accurate, flexible, and memory efficient. MMC uses the
+state-of-the-art ray-tracing techniques to simulate photon propagation in
+a mesh space. It has been extensively optimized for excellent computational
+efficiency and portability. MMC currently supports both multi-threaded
+parallel computing and GPU to maximize performance on modern processors.
+
+%package -n octave-%{octpkg}
+Summary: A GPU mesh-based Monte Carlo photon simulator for MATLAB/Octave
+Requires: octave opencl-filesystem octave-iso2mesh
+Recommends: %{octpkg}-demos
+
+%description -n octave-%{octpkg}
+MMCLAB is the native MEX version of MMC - Mesh-based Monte Carlo - for
+MATLAB and GNU Octave. By converting the input and output files into
+convenient in-memory variables, MMCLAB is very intuitive to use and
+straightforward to be integrated with mesh generation and post-simulation
+analyses. Because MMCLAB contains the same computational codes for
+OpenCL-based photon simulation as in a MMC binary, running MMCLAB
+inside MATLAB is expected to give similar speed as running a standalone
+MMC binary using either a CPU or a GPU.
+
+%package -n %{octpkg}-demos
+Summary: Example datasets and scripts for MMCLAB toolbox
+BuildArch: noarch
+Requires: octave octave-%{octpkg} octave-iso2mesh
+
+%description -n %{octpkg}-demos
+This package contains the demo script and sample datasets for octave-%{octpkg}.
+
+
+%package demos
+Summary: Example datasets and scripts for Mesh-based Monte Carlo - MMC
+BuildArch: noarch
+Requires: octave octave-iso2mesh
+
+%description demos
+This package contains the demo script and sample datasets for MMC.
+
+
+%prep
+%autosetup -n %{name}-%{version}
+rm -rf .git_filters .gitattributes deploy webmmc
+cp matlab/*.m mmclab
+
+cp LICENSE.txt COPYING
+
+cat > DESCRIPTION << EOF
+Name: %{octpkg}
+Version: %{version}
+Date: %(date +"%Y-%d-%m")
+Title: %{summary}
+Author: Qianqian Fang <fangqq(a)gmail.com>
+Maintainer: Qianqian Fang <fangqq(a)gmail.com>
+Description: Mesh-based Monte Carlo (MMC) is a 3D Monte Carlo (MC) simulation software
+ for photon transport in complex turbid media. MMC combines the strengths
+ of the MC-based technique and the finite-element (FE) method: on the
+ one hand, it can handle general media, including low-scattering ones,
+ as in the MC method; on the other hand, it can use an FE-like tetrahedral
+ mesh to represent curved boundaries and complex structures, making it
+ even more accurate, flexible, and memory efficient. MMC uses the
+ state-of-the-art ray-tracing techniques to simulate photon propagation in
+ a mesh space. It has been extensively optimized for excellent computational
+ efficiency and portability. MMC currently supports both multi-threaded
+ parallel computing and GPU to maximize performance on a multi-core processor.
+URL: %{url}
+Depends: iso2mesh
+EOF
+
+cat > INDEX << EOF
+mmclab >> MMCLAB
+MMCLAB
+ generate_g1
+ genT5mesh
+ genT6mesh
+ loadmch
+ load_mc_prop
+ mmc2json
+ mmcadddet
+ mmcaddsrc
+ mmcdettime
+ mmcdettpsf
+ mmcdetweight
+ mmcjacobian
+ mmcjmua
+ mmcjmus
+ mmclab
+ mmcmeanpath
+ mmcmeanscat
+ mmcraytrace
+ mmcsrcdomain
+ readmmcelem
+ readmmcface
+ readmmcmesh
+ readmmcnode
+ savemmcmesh
+SphDiffusion Toolbox
+ besselhprime
+ besseljprime
+ besselyprime
+ cart2sphorigin
+ spbesselh
+ spbesselhprime
+ spbesselj
+ spbesseljprime
+ spbessely
+ spbesselyprime
+ spharmonic
+ sphdiffAcoeff
+ sphdiffBcoeff
+ sphdiffCcoeff
+ sphdiffexterior
+ sphdiffincident
+ sphdiffinterior
+ sphdiffscatter
+ sphdiffusioninfinite
+ sphdiffusion
+ sphdiffusionscatteronly
+ sphdiffusionsemi
+ sphdiffusionslab
+EOF
+
+%build
+%set_build_flags
+rm -rf src/SFMT
+# Build octave bits
+%ifarch %ix86 x86_64
+ %make_build -C src oct LFLAGS="-L`octave-config -p OCTLIBDIR` -lOpenCL" USERCCFLAGS="%{optflags} -DUSE_OS_TIMER -DUSE_OPENCL"
+%else
+ %make_build -C src octomp LFLAGS="-L`octave-config -p OCTLIBDIR` -lOpenCL" USERCCFLAGS="%{optflags} -DUSE_OS_TIMER -DUSE_OPENCL"
+%endif
+
+rm %{octpkg}/*.txt
+mv %{octpkg}/example .
+mv %{octpkg} inst
+mv src/Makefile .
+%octave_pkg_build
+
+# Build non octave bits
+mv Makefile src
+pushd src
+%make_build clean
+
+%ifarch %ix86 x86_64
+ %make_build USERCCFLAGS="%{optflags} -DUSE_OS_TIMER -DUSE_OPENCL"
+%else
+ %make_build omp USERCCFLAGS="%{optflags} -DUSE_OS_TIMER -DUSE_OPENCL"
+%endif
+
+mkdir -p ../bin
+cp bin/%{name} ../bin/%{name}
+popd
+
+%if 0%{?fedora} <=30
+ %global octave_tar_suffix any-none
+%endif
+
+%install
+%octave_pkg_install
+
+install -m 0755 -pd %{buildroot}%{_bindir}
+install -m 0755 -pt %{buildroot}%{_bindir} bin/%{name}
+
+# Move mex to arch specific directory
+mkdir -p -m 0755 %{buildroot}/%{octpkglibdir}/%{octave_host}-%{octave_api}
+mv %{buildroot}/%{octpkgdir}/*.mex %{buildroot}/%{octpkglibdir}/%{octave_host}-%{octave_api} -v
+
+%post -n octave-%{octpkg}
+%octave_cmd pkg rebuild
+
+%preun -n octave-%{octpkg}
+%octave_pkg_preun
+
+%postun -n octave-%{octpkg}
+%octave_cmd pkg rebuild
+
+%files
+%license LICENSE.txt
+%doc README.txt AUTHORS.txt
+%{_bindir}/%{name}
+
+%files demos
+%license LICENSE.txt
+%doc README.txt AUTHORS.txt
+%doc examples
+
+%files -n octave-%{octpkg}
+%license LICENSE.txt
+%doc README.txt AUTHORS.txt
+%doc %{octpkgdir}/doc-cache
+%{octpkglibdir}
+%{octpkgdir}
+%{octpkgdir}/packinfo
+
+%files -n %{octpkg}-demos
+%license LICENSE.txt
+%doc README.txt AUTHORS.txt
+%doc example
+
+
+%changelog
+* Fri Oct 04 2019 Qianqian Fang <fangqq(a)gmail.com> - 1.7.9-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..c214bf1
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (mmc-1.7.9.tar.gz) = 9e8ebb1b49b7aabffb6a9dbafb36ce692396eccd665d867521e820befac133f27c17d1bb6b910e86a8dd467350275d71345fd0a4894fa0b88813ef498e2fb620
4 years, 1 month
Architecture specific change in rpms/mmc.git
by githook-noreply@fedoraproject.org
The package rpms/mmc.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/mmc.git/commit/?id=2920433f01e90b....
Change:
+%ifarch %ix86 x86_64
Thanks.
Full change:
============
commit 2920433f01e90b958fd79e9b19324e8d1d41c748
Author: Qianqian Fang <fangqq(a)gmail.com>
Date: Tue Mar 3 16:29:22 2020 -0500
initial package for mmc and octave-mmc
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..38dbe05
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/mmc-1.7.9.tar.gz
diff --git a/mmc.spec b/mmc.spec
new file mode 100644
index 0000000..c2a2661
--- /dev/null
+++ b/mmc.spec
@@ -0,0 +1,225 @@
+%global octpkg mmclab
+
+Name: mmc
+Version: 1.7.9
+Release: 1%{?dist}
+License: GPLv3+
+URL: http://mcx.space/mmc
+Source0: https://github.com/fangq/%{name}/archive/v%{version}/%{name}-%{version}.t...
+Summary: A GPU-based mesh-based Monte Carlo (MMC) photon simulator
+BuildRequires: octave-devel gcc-c++ vim-common opencl-headers ocl-icd-devel
+Requires: octave opencl-filesystem octave-iso2mesh
+Requires(post): octave
+Requires(postun): octave
+Provides: bundled(ssemath) = 0.0
+Provides: bundled(cjson) = 0.0
+
+%description
+Mesh-based Monte Carlo (MMC) is a 3D Monte Carlo (MC) simulation software
+for photon transport in complex turbid media. MMC combines the strengths
+of the MC-based technique and the finite-element (FE) method: on the
+one hand, it can handle general media, including low-scattering ones,
+as in the MC method; on the other hand, it can use an FE-like tetrahedral
+mesh to represent curved boundaries and complex structures, making it
+even more accurate, flexible, and memory efficient. MMC uses the
+state-of-the-art ray-tracing techniques to simulate photon propagation in
+a mesh space. It has been extensively optimized for excellent computational
+efficiency and portability. MMC currently supports both multi-threaded
+parallel computing and GPU to maximize performance on modern processors.
+
+%package -n octave-%{octpkg}
+Summary: A GPU mesh-based Monte Carlo photon simulator for MATLAB/Octave
+Requires: octave opencl-filesystem octave-iso2mesh
+Recommends: %{octpkg}-demos
+
+%description -n octave-%{octpkg}
+MMCLAB is the native MEX version of MMC - Mesh-based Monte Carlo - for
+MATLAB and GNU Octave. By converting the input and output files into
+convenient in-memory variables, MMCLAB is very intuitive to use and
+straightforward to be integrated with mesh generation and post-simulation
+analyses. Because MMCLAB contains the same computational codes for
+OpenCL-based photon simulation as in a MMC binary, running MMCLAB
+inside MATLAB is expected to give similar speed as running a standalone
+MMC binary using either a CPU or a GPU.
+
+%package -n %{octpkg}-demos
+Summary: Example datasets and scripts for MMCLAB toolbox
+BuildArch: noarch
+Requires: octave octave-%{octpkg} octave-iso2mesh
+
+%description -n %{octpkg}-demos
+This package contains the demo script and sample datasets for octave-%{octpkg}.
+
+
+%package demos
+Summary: Example datasets and scripts for Mesh-based Monte Carlo - MMC
+BuildArch: noarch
+Requires: octave octave-iso2mesh
+
+%description demos
+This package contains the demo script and sample datasets for MMC.
+
+
+%prep
+%autosetup -n %{name}-%{version}
+rm -rf .git_filters .gitattributes deploy webmmc
+cp matlab/*.m mmclab
+
+cp LICENSE.txt COPYING
+
+cat > DESCRIPTION << EOF
+Name: %{octpkg}
+Version: %{version}
+Date: %(date +"%Y-%d-%m")
+Title: %{summary}
+Author: Qianqian Fang <fangqq(a)gmail.com>
+Maintainer: Qianqian Fang <fangqq(a)gmail.com>
+Description: Mesh-based Monte Carlo (MMC) is a 3D Monte Carlo (MC) simulation software
+ for photon transport in complex turbid media. MMC combines the strengths
+ of the MC-based technique and the finite-element (FE) method: on the
+ one hand, it can handle general media, including low-scattering ones,
+ as in the MC method; on the other hand, it can use an FE-like tetrahedral
+ mesh to represent curved boundaries and complex structures, making it
+ even more accurate, flexible, and memory efficient. MMC uses the
+ state-of-the-art ray-tracing techniques to simulate photon propagation in
+ a mesh space. It has been extensively optimized for excellent computational
+ efficiency and portability. MMC currently supports both multi-threaded
+ parallel computing and GPU to maximize performance on a multi-core processor.
+URL: %{url}
+Depends: iso2mesh
+EOF
+
+cat > INDEX << EOF
+mmclab >> MMCLAB
+MMCLAB
+ generate_g1
+ genT5mesh
+ genT6mesh
+ loadmch
+ load_mc_prop
+ mmc2json
+ mmcadddet
+ mmcaddsrc
+ mmcdettime
+ mmcdettpsf
+ mmcdetweight
+ mmcjacobian
+ mmcjmua
+ mmcjmus
+ mmclab
+ mmcmeanpath
+ mmcmeanscat
+ mmcraytrace
+ mmcsrcdomain
+ readmmcelem
+ readmmcface
+ readmmcmesh
+ readmmcnode
+ savemmcmesh
+SphDiffusion Toolbox
+ besselhprime
+ besseljprime
+ besselyprime
+ cart2sphorigin
+ spbesselh
+ spbesselhprime
+ spbesselj
+ spbesseljprime
+ spbessely
+ spbesselyprime
+ spharmonic
+ sphdiffAcoeff
+ sphdiffBcoeff
+ sphdiffCcoeff
+ sphdiffexterior
+ sphdiffincident
+ sphdiffinterior
+ sphdiffscatter
+ sphdiffusioninfinite
+ sphdiffusion
+ sphdiffusionscatteronly
+ sphdiffusionsemi
+ sphdiffusionslab
+EOF
+
+%build
+%set_build_flags
+rm -rf src/SFMT
+# Build octave bits
+%ifarch %ix86 x86_64
+ %make_build -C src oct LFLAGS="-L`octave-config -p OCTLIBDIR` -lOpenCL" USERCCFLAGS="%{optflags} -DUSE_OS_TIMER -DUSE_OPENCL"
+%else
+ %make_build -C src octomp LFLAGS="-L`octave-config -p OCTLIBDIR` -lOpenCL" USERCCFLAGS="%{optflags} -DUSE_OS_TIMER -DUSE_OPENCL"
+%endif
+
+rm %{octpkg}/*.txt
+mv %{octpkg}/example .
+mv %{octpkg} inst
+mv src/Makefile .
+%octave_pkg_build
+
+# Build non octave bits
+mv Makefile src
+pushd src
+%make_build clean
+
+%ifarch %ix86 x86_64
+ %make_build USERCCFLAGS="%{optflags} -DUSE_OS_TIMER -DUSE_OPENCL"
+%else
+ %make_build omp USERCCFLAGS="%{optflags} -DUSE_OS_TIMER -DUSE_OPENCL"
+%endif
+
+mkdir -p ../bin
+cp bin/%{name} ../bin/%{name}
+popd
+
+%if 0%{?fedora} <=30
+ %global octave_tar_suffix any-none
+%endif
+
+%install
+%octave_pkg_install
+
+install -m 0755 -pd %{buildroot}%{_bindir}
+install -m 0755 -pt %{buildroot}%{_bindir} bin/%{name}
+
+# Move mex to arch specific directory
+mkdir -p -m 0755 %{buildroot}/%{octpkglibdir}/%{octave_host}-%{octave_api}
+mv %{buildroot}/%{octpkgdir}/*.mex %{buildroot}/%{octpkglibdir}/%{octave_host}-%{octave_api} -v
+
+%post -n octave-%{octpkg}
+%octave_cmd pkg rebuild
+
+%preun -n octave-%{octpkg}
+%octave_pkg_preun
+
+%postun -n octave-%{octpkg}
+%octave_cmd pkg rebuild
+
+%files
+%license LICENSE.txt
+%doc README.txt AUTHORS.txt
+%{_bindir}/%{name}
+
+%files demos
+%license LICENSE.txt
+%doc README.txt AUTHORS.txt
+%doc examples
+
+%files -n octave-%{octpkg}
+%license LICENSE.txt
+%doc README.txt AUTHORS.txt
+%doc %{octpkgdir}/doc-cache
+%{octpkglibdir}
+%{octpkgdir}
+%{octpkgdir}/packinfo
+
+%files -n %{octpkg}-demos
+%license LICENSE.txt
+%doc README.txt AUTHORS.txt
+%doc example
+
+
+%changelog
+* Fri Oct 04 2019 Qianqian Fang <fangqq(a)gmail.com> - 1.7.9-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..c214bf1
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (mmc-1.7.9.tar.gz) = 9e8ebb1b49b7aabffb6a9dbafb36ce692396eccd665d867521e820befac133f27c17d1bb6b910e86a8dd467350275d71345fd0a4894fa0b88813ef498e2fb620
4 years, 1 month
Architecture specific change in rpms/mmc.git
by githook-noreply@fedoraproject.org
The package rpms/mmc.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/mmc.git/commit/?id=2920433f01e90b....
Change:
+%ifarch %ix86 x86_64
Thanks.
Full change:
============
commit 2920433f01e90b958fd79e9b19324e8d1d41c748
Author: Qianqian Fang <fangqq(a)gmail.com>
Date: Tue Mar 3 16:29:22 2020 -0500
initial package for mmc and octave-mmc
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..38dbe05
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/mmc-1.7.9.tar.gz
diff --git a/mmc.spec b/mmc.spec
new file mode 100644
index 0000000..c2a2661
--- /dev/null
+++ b/mmc.spec
@@ -0,0 +1,225 @@
+%global octpkg mmclab
+
+Name: mmc
+Version: 1.7.9
+Release: 1%{?dist}
+License: GPLv3+
+URL: http://mcx.space/mmc
+Source0: https://github.com/fangq/%{name}/archive/v%{version}/%{name}-%{version}.t...
+Summary: A GPU-based mesh-based Monte Carlo (MMC) photon simulator
+BuildRequires: octave-devel gcc-c++ vim-common opencl-headers ocl-icd-devel
+Requires: octave opencl-filesystem octave-iso2mesh
+Requires(post): octave
+Requires(postun): octave
+Provides: bundled(ssemath) = 0.0
+Provides: bundled(cjson) = 0.0
+
+%description
+Mesh-based Monte Carlo (MMC) is a 3D Monte Carlo (MC) simulation software
+for photon transport in complex turbid media. MMC combines the strengths
+of the MC-based technique and the finite-element (FE) method: on the
+one hand, it can handle general media, including low-scattering ones,
+as in the MC method; on the other hand, it can use an FE-like tetrahedral
+mesh to represent curved boundaries and complex structures, making it
+even more accurate, flexible, and memory efficient. MMC uses the
+state-of-the-art ray-tracing techniques to simulate photon propagation in
+a mesh space. It has been extensively optimized for excellent computational
+efficiency and portability. MMC currently supports both multi-threaded
+parallel computing and GPU to maximize performance on modern processors.
+
+%package -n octave-%{octpkg}
+Summary: A GPU mesh-based Monte Carlo photon simulator for MATLAB/Octave
+Requires: octave opencl-filesystem octave-iso2mesh
+Recommends: %{octpkg}-demos
+
+%description -n octave-%{octpkg}
+MMCLAB is the native MEX version of MMC - Mesh-based Monte Carlo - for
+MATLAB and GNU Octave. By converting the input and output files into
+convenient in-memory variables, MMCLAB is very intuitive to use and
+straightforward to be integrated with mesh generation and post-simulation
+analyses. Because MMCLAB contains the same computational codes for
+OpenCL-based photon simulation as in a MMC binary, running MMCLAB
+inside MATLAB is expected to give similar speed as running a standalone
+MMC binary using either a CPU or a GPU.
+
+%package -n %{octpkg}-demos
+Summary: Example datasets and scripts for MMCLAB toolbox
+BuildArch: noarch
+Requires: octave octave-%{octpkg} octave-iso2mesh
+
+%description -n %{octpkg}-demos
+This package contains the demo script and sample datasets for octave-%{octpkg}.
+
+
+%package demos
+Summary: Example datasets and scripts for Mesh-based Monte Carlo - MMC
+BuildArch: noarch
+Requires: octave octave-iso2mesh
+
+%description demos
+This package contains the demo script and sample datasets for MMC.
+
+
+%prep
+%autosetup -n %{name}-%{version}
+rm -rf .git_filters .gitattributes deploy webmmc
+cp matlab/*.m mmclab
+
+cp LICENSE.txt COPYING
+
+cat > DESCRIPTION << EOF
+Name: %{octpkg}
+Version: %{version}
+Date: %(date +"%Y-%d-%m")
+Title: %{summary}
+Author: Qianqian Fang <fangqq(a)gmail.com>
+Maintainer: Qianqian Fang <fangqq(a)gmail.com>
+Description: Mesh-based Monte Carlo (MMC) is a 3D Monte Carlo (MC) simulation software
+ for photon transport in complex turbid media. MMC combines the strengths
+ of the MC-based technique and the finite-element (FE) method: on the
+ one hand, it can handle general media, including low-scattering ones,
+ as in the MC method; on the other hand, it can use an FE-like tetrahedral
+ mesh to represent curved boundaries and complex structures, making it
+ even more accurate, flexible, and memory efficient. MMC uses the
+ state-of-the-art ray-tracing techniques to simulate photon propagation in
+ a mesh space. It has been extensively optimized for excellent computational
+ efficiency and portability. MMC currently supports both multi-threaded
+ parallel computing and GPU to maximize performance on a multi-core processor.
+URL: %{url}
+Depends: iso2mesh
+EOF
+
+cat > INDEX << EOF
+mmclab >> MMCLAB
+MMCLAB
+ generate_g1
+ genT5mesh
+ genT6mesh
+ loadmch
+ load_mc_prop
+ mmc2json
+ mmcadddet
+ mmcaddsrc
+ mmcdettime
+ mmcdettpsf
+ mmcdetweight
+ mmcjacobian
+ mmcjmua
+ mmcjmus
+ mmclab
+ mmcmeanpath
+ mmcmeanscat
+ mmcraytrace
+ mmcsrcdomain
+ readmmcelem
+ readmmcface
+ readmmcmesh
+ readmmcnode
+ savemmcmesh
+SphDiffusion Toolbox
+ besselhprime
+ besseljprime
+ besselyprime
+ cart2sphorigin
+ spbesselh
+ spbesselhprime
+ spbesselj
+ spbesseljprime
+ spbessely
+ spbesselyprime
+ spharmonic
+ sphdiffAcoeff
+ sphdiffBcoeff
+ sphdiffCcoeff
+ sphdiffexterior
+ sphdiffincident
+ sphdiffinterior
+ sphdiffscatter
+ sphdiffusioninfinite
+ sphdiffusion
+ sphdiffusionscatteronly
+ sphdiffusionsemi
+ sphdiffusionslab
+EOF
+
+%build
+%set_build_flags
+rm -rf src/SFMT
+# Build octave bits
+%ifarch %ix86 x86_64
+ %make_build -C src oct LFLAGS="-L`octave-config -p OCTLIBDIR` -lOpenCL" USERCCFLAGS="%{optflags} -DUSE_OS_TIMER -DUSE_OPENCL"
+%else
+ %make_build -C src octomp LFLAGS="-L`octave-config -p OCTLIBDIR` -lOpenCL" USERCCFLAGS="%{optflags} -DUSE_OS_TIMER -DUSE_OPENCL"
+%endif
+
+rm %{octpkg}/*.txt
+mv %{octpkg}/example .
+mv %{octpkg} inst
+mv src/Makefile .
+%octave_pkg_build
+
+# Build non octave bits
+mv Makefile src
+pushd src
+%make_build clean
+
+%ifarch %ix86 x86_64
+ %make_build USERCCFLAGS="%{optflags} -DUSE_OS_TIMER -DUSE_OPENCL"
+%else
+ %make_build omp USERCCFLAGS="%{optflags} -DUSE_OS_TIMER -DUSE_OPENCL"
+%endif
+
+mkdir -p ../bin
+cp bin/%{name} ../bin/%{name}
+popd
+
+%if 0%{?fedora} <=30
+ %global octave_tar_suffix any-none
+%endif
+
+%install
+%octave_pkg_install
+
+install -m 0755 -pd %{buildroot}%{_bindir}
+install -m 0755 -pt %{buildroot}%{_bindir} bin/%{name}
+
+# Move mex to arch specific directory
+mkdir -p -m 0755 %{buildroot}/%{octpkglibdir}/%{octave_host}-%{octave_api}
+mv %{buildroot}/%{octpkgdir}/*.mex %{buildroot}/%{octpkglibdir}/%{octave_host}-%{octave_api} -v
+
+%post -n octave-%{octpkg}
+%octave_cmd pkg rebuild
+
+%preun -n octave-%{octpkg}
+%octave_pkg_preun
+
+%postun -n octave-%{octpkg}
+%octave_cmd pkg rebuild
+
+%files
+%license LICENSE.txt
+%doc README.txt AUTHORS.txt
+%{_bindir}/%{name}
+
+%files demos
+%license LICENSE.txt
+%doc README.txt AUTHORS.txt
+%doc examples
+
+%files -n octave-%{octpkg}
+%license LICENSE.txt
+%doc README.txt AUTHORS.txt
+%doc %{octpkgdir}/doc-cache
+%{octpkglibdir}
+%{octpkgdir}
+%{octpkgdir}/packinfo
+
+%files -n %{octpkg}-demos
+%license LICENSE.txt
+%doc README.txt AUTHORS.txt
+%doc example
+
+
+%changelog
+* Fri Oct 04 2019 Qianqian Fang <fangqq(a)gmail.com> - 1.7.9-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..c214bf1
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (mmc-1.7.9.tar.gz) = 9e8ebb1b49b7aabffb6a9dbafb36ce692396eccd665d867521e820befac133f27c17d1bb6b910e86a8dd467350275d71345fd0a4894fa0b88813ef498e2fb620
4 years, 1 month
Architecture specific change in rpms/wine.git
by githook-noreply@fedoraproject.org
The package rpms/wine.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/wine.git/commit/?id=85f25c8c1cfbd...
https://src.fedoraproject.org/cgit/rpms/wine.git/commit/?id=84981987dcd43....
Change:
+%ifnarch %{arm} aarch64
-%ifnarch %{arm} aarch64
Thanks.
Full change:
============
commit 84981987dcd43781fe5aea0f38a363318d394fe5
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Mar 3 14:11:25 2020 -0600
Set activeds.tlb extension as this is not an arch problem
diff --git a/wine.spec b/wine.spec
index a1fd9b0..b8f5dcb 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1204,6 +1204,7 @@ fi
%{_libdir}/wine/acledit.%{winedll}
%{_libdir}/wine/aclui.%{winedll}
%{_libdir}/wine/activeds.%{winedll}
+%{_libdir}/wine/activeds.%{winetlb}
%{_libdir}/wine/actxprxy.%{winedll}
%{_libdir}/wine/adsldp.%{winedll}
%{_libdir}/wine/adsldpc.%{winedll}
@@ -2008,10 +2009,6 @@ fi
%endif
%endif
-%ifnarch %{arm} aarch64
-%{_libdir}/wine/activeds.tlb
-%endif
-
# 16 bit and other non 64bit stuff
%ifnarch x86_64 %{arm} aarch64
%{_libdir}/wine/winevdm.exe.so
commit 85f25c8c1cfbda0aaaeb726f347a51e44865f017
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Mar 3 12:32:30 2020 -0600
Don't ship activeds.tlb on ARM arches
diff --git a/wine.spec b/wine.spec
index ed7832c..a1fd9b0 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1204,7 +1204,6 @@ fi
%{_libdir}/wine/acledit.%{winedll}
%{_libdir}/wine/aclui.%{winedll}
%{_libdir}/wine/activeds.%{winedll}
-%{_libdir}/wine/activeds.tlb
%{_libdir}/wine/actxprxy.%{winedll}
%{_libdir}/wine/adsldp.%{winedll}
%{_libdir}/wine/adsldpc.%{winedll}
@@ -2009,6 +2008,10 @@ fi
%endif
%endif
+%ifnarch %{arm} aarch64
+%{_libdir}/wine/activeds.tlb
+%endif
+
# 16 bit and other non 64bit stuff
%ifnarch x86_64 %{arm} aarch64
%{_libdir}/wine/winevdm.exe.so
commit c1f860d9509a452321307444de4880813b733daf
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Mar 3 11:00:00 2020 -0600
Apply patch for arm
diff --git a/wine-5.3-msvcrt-arm.patch b/wine-5.3-msvcrt-arm.patch
new file mode 100644
index 0000000..67948c7
--- /dev/null
+++ b/wine-5.3-msvcrt-arm.patch
@@ -0,0 +1,41 @@
+From: Jacek Caban <jacek(a)codeweavers.com>
+Subject: [PATCH] stdio.h: Fix calling convention of variadic inline functions.
+Message-Id: <bc92fe4e-2b7c-e139-fcf3-736d723db401(a)codeweavers.com>
+Date: Tue, 3 Mar 2020 14:37:00 +0100
+
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48697
+Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
+---
+ include/msvcrt/corecrt_wstdio.h | 2 +-
+ include/msvcrt/stdio.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h
+index 3951a1c829..c1779fb81a 100644
+--- a/include/msvcrt/corecrt_wstdio.h
++++ b/include/msvcrt/corecrt_wstdio.h
+@@ -115,7 +115,7 @@ static inline int __cdecl _vsnwprintf_s(wchar_t *buffer, size_t size, size_t cou
+ return ret < 0 ? -1 : ret;
+ }
+
+-static inline int __cdecl _snwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, ...)
++static inline int WINAPIV _snwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, ...)
+ {
+ int ret;
+ __ms_va_list args;
+diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h
+index e184704eb9..f2aef46e6f 100644
+--- a/include/msvcrt/stdio.h
++++ b/include/msvcrt/stdio.h
+@@ -174,7 +174,7 @@ static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count,
+ return ret < 0 ? -1 : ret;
+ }
+
+-static inline int __cdecl _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...)
++static inline int WINAPIV _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...)
+ {
+ int ret;
+ __ms_va_list args;
+
+
diff --git a/wine.spec b/wine.spec
index a6fac00..ed7832c 100644
--- a/wine.spec
+++ b/wine.spec
@@ -72,6 +72,8 @@ Source109: wine-oleview.desktop
Source150: wine.appdata.xml
# wine bugs
+# https://bugs.winehq.org/show_bug.cgi?id=48697
+Patch100: wine-5.3-msvcrt-arm.patch
# desktop dir
Source200: wine.menu
@@ -678,6 +680,7 @@ This package adds the opencl driver for wine.
%prep
%setup -q -n wine-%{version}
+%patch100 -p1 -b.mscvrt
%patch511 -p1 -b.cjk
%if 0%{?wine_staging}
commit 958adb640ff976b5785dcd5ec00b7220244c8b50
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon Mar 2 22:29:41 2020 -0600
Update to 5.3
diff --git a/.gitignore b/.gitignore
index 16ce3a0..5016ea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/wine-5.2.tar.xz
-/wine-5.2.tar.xz.sign
-/wine-staging-5.2.tar.gz
+/wine-5.3.tar.xz
+/wine-5.3.tar.xz.sign
+/wine-staging-5.3.tar.gz
diff --git a/sources b/sources
index 44e73d9..f0064f0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (wine-5.2.tar.xz) = 57fa66885c3b5f43e51324e24b8524f663ad67ff15b464ac7d58096d5921f523a59ef5f1dc1ea7aa65fa10d64b7cd832f421c1b773c72bc312d8544a61c33f8f
-SHA512 (wine-5.2.tar.xz.sign) = 310d27ef2aa2ca166a65ee9638a666c3a3d70152eefcf4d36567492455b35829eab35b9059ef08af4bdabefa4d167e7f0ae3ae1c6509b4072c85109dbad1012f
-SHA512 (wine-staging-5.2.tar.gz) = dd2066db1eb4d424579bdf8d25f476eae0b86a6bea7b1f7ff2a21d7bf0209b4ef00d9c0ed29a7cab50c5dea4684acb5d342ebf02554b16fd0938a03e607f6270
+SHA512 (wine-5.3.tar.xz) = 40528f46ad10c11758308e3bf21ba73c7af133d4dda386d542acec3a5cb31e01be0eb102b94f9d82a2358e45597bf49bd1e82c463e3a26aff8c0827b5a0894b6
+SHA512 (wine-5.3.tar.xz.sign) = b1f30a8a72b6efcfb2f7a492de85ab8613b1191d4eb0aff45ff81ab9736e7f877f971ddd040157c88a6bc7ad068d2e6e28bdba5bee6a8010cb098dc53022fec0
+SHA512 (wine-staging-5.3.tar.gz) = df14a61c04b134a72dc8662ee331fd234e2c82bf82824cb01443ae6516aba0bdcb579e2dbedc1ada47de0f3a1265c5fe9ef5f8183094d74451845b78d0a81702
diff --git a/wine.spec b/wine.spec
index c9f74c4..a6fac00 100644
--- a/wine.spec
+++ b/wine.spec
@@ -41,7 +41,7 @@
%endif
Name: wine
-Version: 5.2
+Version: 5.3
Release: 1%{?dist}
Summary: A compatibility layer for windows applications
@@ -1201,6 +1201,7 @@ fi
%{_libdir}/wine/acledit.%{winedll}
%{_libdir}/wine/aclui.%{winedll}
%{_libdir}/wine/activeds.%{winedll}
+%{_libdir}/wine/activeds.tlb
%{_libdir}/wine/actxprxy.%{winedll}
%{_libdir}/wine/adsldp.%{winedll}
%{_libdir}/wine/adsldpc.%{winedll}
@@ -1793,6 +1794,7 @@ fi
%{_libdir}/wine/propsys.%{winedll}
%{_libdir}/wine/psapi.%{winedll}
%{_libdir}/wine/pstorec.%{winedll}
+%{_libdir}/wine/qasf.%{winedll}
%{_libdir}/wine/qcap.dll.so
%{_libdir}/wine/qedit.%{winedll}
%{_libdir}/wine/qmgr.%{winedll}
@@ -2285,6 +2287,9 @@ fi
%endif
%changelog
+* Mon Mar 02 2020 Michael Cronenworth <mike(a)cchtml.com> 5.3-1
+- version update
+
* Tue Feb 18 2020 Michael Cronenworth <mike(a)cchtml.com> 5.2-1
- version update
4 years, 1 month
Architecture specific change in rpms/wine.git
by githook-noreply@fedoraproject.org
The package rpms/wine.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/wine.git/commit/?id=85f25c8c1cfbd...
https://src.fedoraproject.org/cgit/rpms/wine.git/commit/?id=84981987dcd43....
Change:
+%ifnarch %{arm} aarch64
-%ifnarch %{arm} aarch64
Thanks.
Full change:
============
commit 84981987dcd43781fe5aea0f38a363318d394fe5
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Mar 3 14:11:25 2020 -0600
Set activeds.tlb extension as this is not an arch problem
diff --git a/wine.spec b/wine.spec
index a1fd9b0..b8f5dcb 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1204,6 +1204,7 @@ fi
%{_libdir}/wine/acledit.%{winedll}
%{_libdir}/wine/aclui.%{winedll}
%{_libdir}/wine/activeds.%{winedll}
+%{_libdir}/wine/activeds.%{winetlb}
%{_libdir}/wine/actxprxy.%{winedll}
%{_libdir}/wine/adsldp.%{winedll}
%{_libdir}/wine/adsldpc.%{winedll}
@@ -2008,10 +2009,6 @@ fi
%endif
%endif
-%ifnarch %{arm} aarch64
-%{_libdir}/wine/activeds.tlb
-%endif
-
# 16 bit and other non 64bit stuff
%ifnarch x86_64 %{arm} aarch64
%{_libdir}/wine/winevdm.exe.so
commit 85f25c8c1cfbda0aaaeb726f347a51e44865f017
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Mar 3 12:32:30 2020 -0600
Don't ship activeds.tlb on ARM arches
diff --git a/wine.spec b/wine.spec
index ed7832c..a1fd9b0 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1204,7 +1204,6 @@ fi
%{_libdir}/wine/acledit.%{winedll}
%{_libdir}/wine/aclui.%{winedll}
%{_libdir}/wine/activeds.%{winedll}
-%{_libdir}/wine/activeds.tlb
%{_libdir}/wine/actxprxy.%{winedll}
%{_libdir}/wine/adsldp.%{winedll}
%{_libdir}/wine/adsldpc.%{winedll}
@@ -2009,6 +2008,10 @@ fi
%endif
%endif
+%ifnarch %{arm} aarch64
+%{_libdir}/wine/activeds.tlb
+%endif
+
# 16 bit and other non 64bit stuff
%ifnarch x86_64 %{arm} aarch64
%{_libdir}/wine/winevdm.exe.so
commit c1f860d9509a452321307444de4880813b733daf
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Mar 3 11:00:00 2020 -0600
Apply patch for arm
diff --git a/wine-5.3-msvcrt-arm.patch b/wine-5.3-msvcrt-arm.patch
new file mode 100644
index 0000000..67948c7
--- /dev/null
+++ b/wine-5.3-msvcrt-arm.patch
@@ -0,0 +1,41 @@
+From: Jacek Caban <jacek(a)codeweavers.com>
+Subject: [PATCH] stdio.h: Fix calling convention of variadic inline functions.
+Message-Id: <bc92fe4e-2b7c-e139-fcf3-736d723db401(a)codeweavers.com>
+Date: Tue, 3 Mar 2020 14:37:00 +0100
+
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48697
+Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
+---
+ include/msvcrt/corecrt_wstdio.h | 2 +-
+ include/msvcrt/stdio.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h
+index 3951a1c829..c1779fb81a 100644
+--- a/include/msvcrt/corecrt_wstdio.h
++++ b/include/msvcrt/corecrt_wstdio.h
+@@ -115,7 +115,7 @@ static inline int __cdecl _vsnwprintf_s(wchar_t *buffer, size_t size, size_t cou
+ return ret < 0 ? -1 : ret;
+ }
+
+-static inline int __cdecl _snwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, ...)
++static inline int WINAPIV _snwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, ...)
+ {
+ int ret;
+ __ms_va_list args;
+diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h
+index e184704eb9..f2aef46e6f 100644
+--- a/include/msvcrt/stdio.h
++++ b/include/msvcrt/stdio.h
+@@ -174,7 +174,7 @@ static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count,
+ return ret < 0 ? -1 : ret;
+ }
+
+-static inline int __cdecl _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...)
++static inline int WINAPIV _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...)
+ {
+ int ret;
+ __ms_va_list args;
+
+
diff --git a/wine.spec b/wine.spec
index a6fac00..ed7832c 100644
--- a/wine.spec
+++ b/wine.spec
@@ -72,6 +72,8 @@ Source109: wine-oleview.desktop
Source150: wine.appdata.xml
# wine bugs
+# https://bugs.winehq.org/show_bug.cgi?id=48697
+Patch100: wine-5.3-msvcrt-arm.patch
# desktop dir
Source200: wine.menu
@@ -678,6 +680,7 @@ This package adds the opencl driver for wine.
%prep
%setup -q -n wine-%{version}
+%patch100 -p1 -b.mscvrt
%patch511 -p1 -b.cjk
%if 0%{?wine_staging}
4 years, 1 month
Architecture specific change in rpms/golang-github-google-jsonnet.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-google-jsonnet.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-google-jsonnet.git/....
Change:
+%ifnarch s390x
Thanks.
Full change:
============
commit 92b1f93fa162d4f7c36c6197f35ac221e13da93d
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Tue Mar 3 21:16:20 2020 +0100
Initial import (#1797130)
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..22d7aac
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/go-jsonnet-0.15.0.tar.gz
diff --git a/0001-Prevent-int-overflow.patch b/0001-Prevent-int-overflow.patch
new file mode 100644
index 0000000..e6d899e
--- /dev/null
+++ b/0001-Prevent-int-overflow.patch
@@ -0,0 +1,29 @@
+From ee8a186f4346c08ac7b8364f73d3ac99551ae83f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?=
+ <30413512+eclipseo(a)users.noreply.github.com>
+Date: Thu, 13 Feb 2020 23:21:58 +0100
+Subject: [PATCH] Prevent int overflow
+
+---
+ builtins.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/builtins.go b/builtins.go
+index 9d5d94b9..eae363b5 100644
+--- a/builtins.go
++++ b/builtins.go
+@@ -862,11 +862,11 @@ func liftBitwise(f func(int64, int64) int64) func(*interpreter, traceElement, va
+ return nil, err
+ }
+ if x.value < math.MinInt64 || x.value > math.MaxInt64 {
+- msg := fmt.Sprintf("Bitwise operator argument %v outside of range [%v, %v]", x.value, math.MinInt64, math.MaxInt64)
++ msg := fmt.Sprintf("Bitwise operator argument %v outside of range [%v, %v]", x.value, int64(math.MinInt64), int64(math.MaxInt64))
+ return nil, makeRuntimeError(msg, i.getCurrentStackTrace(trace))
+ }
+ if y.value < math.MinInt64 || y.value > math.MaxInt64 {
+- msg := fmt.Sprintf("Bitwise operator argument %v outside of range [%v, %v]", y.value, math.MinInt64, math.MaxInt64)
++ msg := fmt.Sprintf("Bitwise operator argument %v outside of range [%v, %v]", y.value, int64(math.MinInt64), int64(math.MaxInt64))
+ return nil, makeRuntimeError(msg, i.getCurrentStackTrace(trace))
+ }
+ return makeDoubleCheck(i, trace, float64(f(int64(x.value), int64(y.value))))
+
diff --git a/golang-github-google-jsonnet.spec b/golang-github-google-jsonnet.spec
new file mode 100644
index 0000000..1484502
--- /dev/null
+++ b/golang-github-google-jsonnet.spec
@@ -0,0 +1,73 @@
+# Generated by go2rpm 1
+%ifnarch s390x
+%bcond_without check
+%endif
+
+# https://github.com/google/go-jsonnet
+%global goipath github.com/google/go-jsonnet
+Version: 0.15.0
+
+%gometa
+
+%global common_description %{expand:
+This an implementation of Jsonnet in pure Go. It is feature complete but is not
+as heavily exercised as the Jsonnet C++ implementation. Please try it out and
+give feedback.}
+
+%global golicenses LICENSE
+%global godocs README.md
+
+Name: %{goname}
+Release: 1%{?dist}
+Summary: Implementation of Jsonnet in pure Go
+
+# Upstream license specification: Apache-2.0
+License: ASL 2.0
+
+URL: %{gourl}
+Source0: %{gosource}
+# Prevent int overflow
+# https://github.com/google/go-jsonnet/pull/377
+Patch0: 0001-Prevent-int-overflow.patch
+
+BuildRequires: golang(github.com/fatih/color)
+
+%if %{with check}
+# Tests
+BuildRequires: golang(github.com/sergi/go-diff/diffmatchpatch)
+%endif
+
+%description
+%{common_description}
+
+%gopkg
+
+%prep
+%goprep
+%patch0 -p1
+
+%build
+for cmd in cmd/* ; do
+ %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd
+done
+
+%install
+%gopkginstall
+install -m 0755 -vd %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
+
+%if %{with check}
+%check
+%gocheck
+%endif
+
+%files
+%license LICENSE
+%doc README.md
+%{_bindir}/*
+
+%gopkgfiles
+
+%changelog
+* Sat Feb 01 00:48:04 CET 2020 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0.15.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..2b82a45
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (go-jsonnet-0.15.0.tar.gz) = b0f4deba2fa3fc06171f7ab92304c2f8659ad9c7a71c9f6defef59b476e048cd3e9477f8d3a63f9c908f0af1fb9236e9be5f8a15b0678d40c5eb71a3734519f6
4 years, 1 month
Architecture specific change in rpms/golang-github-google-jsonnet.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-google-jsonnet.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-google-jsonnet.git/....
Change:
+%ifnarch s390x
Thanks.
Full change:
============
commit 92b1f93fa162d4f7c36c6197f35ac221e13da93d
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Tue Mar 3 21:16:20 2020 +0100
Initial import (#1797130)
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..22d7aac
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/go-jsonnet-0.15.0.tar.gz
diff --git a/0001-Prevent-int-overflow.patch b/0001-Prevent-int-overflow.patch
new file mode 100644
index 0000000..e6d899e
--- /dev/null
+++ b/0001-Prevent-int-overflow.patch
@@ -0,0 +1,29 @@
+From ee8a186f4346c08ac7b8364f73d3ac99551ae83f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?=
+ <30413512+eclipseo(a)users.noreply.github.com>
+Date: Thu, 13 Feb 2020 23:21:58 +0100
+Subject: [PATCH] Prevent int overflow
+
+---
+ builtins.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/builtins.go b/builtins.go
+index 9d5d94b9..eae363b5 100644
+--- a/builtins.go
++++ b/builtins.go
+@@ -862,11 +862,11 @@ func liftBitwise(f func(int64, int64) int64) func(*interpreter, traceElement, va
+ return nil, err
+ }
+ if x.value < math.MinInt64 || x.value > math.MaxInt64 {
+- msg := fmt.Sprintf("Bitwise operator argument %v outside of range [%v, %v]", x.value, math.MinInt64, math.MaxInt64)
++ msg := fmt.Sprintf("Bitwise operator argument %v outside of range [%v, %v]", x.value, int64(math.MinInt64), int64(math.MaxInt64))
+ return nil, makeRuntimeError(msg, i.getCurrentStackTrace(trace))
+ }
+ if y.value < math.MinInt64 || y.value > math.MaxInt64 {
+- msg := fmt.Sprintf("Bitwise operator argument %v outside of range [%v, %v]", y.value, math.MinInt64, math.MaxInt64)
++ msg := fmt.Sprintf("Bitwise operator argument %v outside of range [%v, %v]", y.value, int64(math.MinInt64), int64(math.MaxInt64))
+ return nil, makeRuntimeError(msg, i.getCurrentStackTrace(trace))
+ }
+ return makeDoubleCheck(i, trace, float64(f(int64(x.value), int64(y.value))))
+
diff --git a/golang-github-google-jsonnet.spec b/golang-github-google-jsonnet.spec
new file mode 100644
index 0000000..1484502
--- /dev/null
+++ b/golang-github-google-jsonnet.spec
@@ -0,0 +1,73 @@
+# Generated by go2rpm 1
+%ifnarch s390x
+%bcond_without check
+%endif
+
+# https://github.com/google/go-jsonnet
+%global goipath github.com/google/go-jsonnet
+Version: 0.15.0
+
+%gometa
+
+%global common_description %{expand:
+This an implementation of Jsonnet in pure Go. It is feature complete but is not
+as heavily exercised as the Jsonnet C++ implementation. Please try it out and
+give feedback.}
+
+%global golicenses LICENSE
+%global godocs README.md
+
+Name: %{goname}
+Release: 1%{?dist}
+Summary: Implementation of Jsonnet in pure Go
+
+# Upstream license specification: Apache-2.0
+License: ASL 2.0
+
+URL: %{gourl}
+Source0: %{gosource}
+# Prevent int overflow
+# https://github.com/google/go-jsonnet/pull/377
+Patch0: 0001-Prevent-int-overflow.patch
+
+BuildRequires: golang(github.com/fatih/color)
+
+%if %{with check}
+# Tests
+BuildRequires: golang(github.com/sergi/go-diff/diffmatchpatch)
+%endif
+
+%description
+%{common_description}
+
+%gopkg
+
+%prep
+%goprep
+%patch0 -p1
+
+%build
+for cmd in cmd/* ; do
+ %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd
+done
+
+%install
+%gopkginstall
+install -m 0755 -vd %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
+
+%if %{with check}
+%check
+%gocheck
+%endif
+
+%files
+%license LICENSE
+%doc README.md
+%{_bindir}/*
+
+%gopkgfiles
+
+%changelog
+* Sat Feb 01 00:48:04 CET 2020 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0.15.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..2b82a45
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (go-jsonnet-0.15.0.tar.gz) = b0f4deba2fa3fc06171f7ab92304c2f8659ad9c7a71c9f6defef59b476e048cd3e9477f8d3a63f9c908f0af1fb9236e9be5f8a15b0678d40c5eb71a3734519f6
4 years, 1 month
Architecture specific change in rpms/golang-github-google-jsonnet.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-google-jsonnet.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-google-jsonnet.git/....
Change:
+%ifnarch s390x
Thanks.
Full change:
============
commit 92b1f93fa162d4f7c36c6197f35ac221e13da93d
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Tue Mar 3 21:16:20 2020 +0100
Initial import (#1797130)
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..22d7aac
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/go-jsonnet-0.15.0.tar.gz
diff --git a/0001-Prevent-int-overflow.patch b/0001-Prevent-int-overflow.patch
new file mode 100644
index 0000000..e6d899e
--- /dev/null
+++ b/0001-Prevent-int-overflow.patch
@@ -0,0 +1,29 @@
+From ee8a186f4346c08ac7b8364f73d3ac99551ae83f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?=
+ <30413512+eclipseo(a)users.noreply.github.com>
+Date: Thu, 13 Feb 2020 23:21:58 +0100
+Subject: [PATCH] Prevent int overflow
+
+---
+ builtins.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/builtins.go b/builtins.go
+index 9d5d94b9..eae363b5 100644
+--- a/builtins.go
++++ b/builtins.go
+@@ -862,11 +862,11 @@ func liftBitwise(f func(int64, int64) int64) func(*interpreter, traceElement, va
+ return nil, err
+ }
+ if x.value < math.MinInt64 || x.value > math.MaxInt64 {
+- msg := fmt.Sprintf("Bitwise operator argument %v outside of range [%v, %v]", x.value, math.MinInt64, math.MaxInt64)
++ msg := fmt.Sprintf("Bitwise operator argument %v outside of range [%v, %v]", x.value, int64(math.MinInt64), int64(math.MaxInt64))
+ return nil, makeRuntimeError(msg, i.getCurrentStackTrace(trace))
+ }
+ if y.value < math.MinInt64 || y.value > math.MaxInt64 {
+- msg := fmt.Sprintf("Bitwise operator argument %v outside of range [%v, %v]", y.value, math.MinInt64, math.MaxInt64)
++ msg := fmt.Sprintf("Bitwise operator argument %v outside of range [%v, %v]", y.value, int64(math.MinInt64), int64(math.MaxInt64))
+ return nil, makeRuntimeError(msg, i.getCurrentStackTrace(trace))
+ }
+ return makeDoubleCheck(i, trace, float64(f(int64(x.value), int64(y.value))))
+
diff --git a/golang-github-google-jsonnet.spec b/golang-github-google-jsonnet.spec
new file mode 100644
index 0000000..1484502
--- /dev/null
+++ b/golang-github-google-jsonnet.spec
@@ -0,0 +1,73 @@
+# Generated by go2rpm 1
+%ifnarch s390x
+%bcond_without check
+%endif
+
+# https://github.com/google/go-jsonnet
+%global goipath github.com/google/go-jsonnet
+Version: 0.15.0
+
+%gometa
+
+%global common_description %{expand:
+This an implementation of Jsonnet in pure Go. It is feature complete but is not
+as heavily exercised as the Jsonnet C++ implementation. Please try it out and
+give feedback.}
+
+%global golicenses LICENSE
+%global godocs README.md
+
+Name: %{goname}
+Release: 1%{?dist}
+Summary: Implementation of Jsonnet in pure Go
+
+# Upstream license specification: Apache-2.0
+License: ASL 2.0
+
+URL: %{gourl}
+Source0: %{gosource}
+# Prevent int overflow
+# https://github.com/google/go-jsonnet/pull/377
+Patch0: 0001-Prevent-int-overflow.patch
+
+BuildRequires: golang(github.com/fatih/color)
+
+%if %{with check}
+# Tests
+BuildRequires: golang(github.com/sergi/go-diff/diffmatchpatch)
+%endif
+
+%description
+%{common_description}
+
+%gopkg
+
+%prep
+%goprep
+%patch0 -p1
+
+%build
+for cmd in cmd/* ; do
+ %gobuild -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd
+done
+
+%install
+%gopkginstall
+install -m 0755 -vd %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
+
+%if %{with check}
+%check
+%gocheck
+%endif
+
+%files
+%license LICENSE
+%doc README.md
+%{_bindir}/*
+
+%gopkgfiles
+
+%changelog
+* Sat Feb 01 00:48:04 CET 2020 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0.15.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..2b82a45
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (go-jsonnet-0.15.0.tar.gz) = b0f4deba2fa3fc06171f7ab92304c2f8659ad9c7a71c9f6defef59b476e048cd3e9477f8d3a63f9c908f0af1fb9236e9be5f8a15b0678d40c5eb71a3734519f6
4 years, 1 month
Architecture specific change in rpms/wine.git
by githook-noreply@fedoraproject.org
The package rpms/wine.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/wine.git/commit/?id=84981987dcd43....
Change:
-%ifnarch %{arm} aarch64
Thanks.
Full change:
============
commit 84981987dcd43781fe5aea0f38a363318d394fe5
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Mar 3 14:11:25 2020 -0600
Set activeds.tlb extension as this is not an arch problem
diff --git a/wine.spec b/wine.spec
index a1fd9b0..b8f5dcb 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1204,6 +1204,7 @@ fi
%{_libdir}/wine/acledit.%{winedll}
%{_libdir}/wine/aclui.%{winedll}
%{_libdir}/wine/activeds.%{winedll}
+%{_libdir}/wine/activeds.%{winetlb}
%{_libdir}/wine/actxprxy.%{winedll}
%{_libdir}/wine/adsldp.%{winedll}
%{_libdir}/wine/adsldpc.%{winedll}
@@ -2008,10 +2009,6 @@ fi
%endif
%endif
-%ifnarch %{arm} aarch64
-%{_libdir}/wine/activeds.tlb
-%endif
-
# 16 bit and other non 64bit stuff
%ifnarch x86_64 %{arm} aarch64
%{_libdir}/wine/winevdm.exe.so
4 years, 1 month
Architecture specific change in rpms/rstudio.git
by githook-noreply@fedoraproject.org
The package rpms/rstudio.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/rstudio.git/commit/?id=88447b887e....
Change:
+%ifarch %{qt5_qtwebengine_arches}
Thanks.
Full change:
============
commit 88447b887ef8632c08bfb0d9bb9ff177384611be
Author: Iaki car <iucar(a)fedoraproject.org>
Date: Tue Mar 3 18:52:59 2020 +0100
initial import (#1803528)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f817319
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/gin-2.1.2.zip
+/gwt-2.8.1.zip
+/rstudio-1.2.5033.tar.gz
diff --git a/0000-unbundle-dependencies-common.patch b/0000-unbundle-dependencies-common.patch
new file mode 100644
index 0000000..1df3bf6
--- /dev/null
+++ b/0000-unbundle-dependencies-common.patch
@@ -0,0 +1,67 @@
+From dc5d9b6c5fc48853fa22d12d116caaee5676a2ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar(a)fedoraproject.org>
+Date: Thu, 20 Feb 2020 18:22:09 +0100
+Subject: [PATCH] unbundle dependencies/common
+
+---
+ src/cpp/session/CMakeLists.txt | 33 ---------------------------------
+ 1 file changed, 33 deletions(-)
+
+diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
+index 1fd7718..8ab972c 100644
+--- a/src/cpp/session/CMakeLists.txt
++++ b/src/cpp/session/CMakeLists.txt
+@@ -17,18 +17,6 @@ project (SESSION)
+
+ add_subdirectory(workers)
+
+-# verify that install-dictionaries, install-mathjax, install-pandoc,
+-# and install-rmarkdown have been run as required
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries")
+- message(FATAL_ERROR "Dictionaries not found (re-run install-dependencies script to install)")
+-endif()
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26")
+- message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)")
+-endif()
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
+- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
+-endif()
+-
+ # we often install embedded versions of these packages but don't do so currently
+
+ # if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown")
+@@ -478,31 +466,10 @@ if (NOT RSTUDIO_SESSION_WIN32)
+ install(FILES ${R_MODULE_SRC_FILES}
+ DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/R/modules)
+
+- # install hunspell dictionaries
+- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries"
+- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
+-
+- # install mathjax for local html preview
+- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26"
+- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
+-
+ # icons for database connections
+ install(DIRECTORY "resources/connections"
+ DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
+
+- # install pandoc
+- if(WIN32)
+- set(PANDOC_VERSION "2.7.2" CACHE INTERNAL "Pandoc version")
+- else()
+- set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version")
+- endif()
+-
+- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
+- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
+- install(FILES ${PANDOC_FILES}
+- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc)
+-
+ # install rmarkdown package
+ # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
+ # install(FILES ${RMARKDOWN_PACKAGE}
+--
+2.24.1
+
diff --git a/0001-unbundle-qtsingleapplication.patch b/0001-unbundle-qtsingleapplication.patch
new file mode 100644
index 0000000..8533492
--- /dev/null
+++ b/0001-unbundle-qtsingleapplication.patch
@@ -0,0 +1,63 @@
+From 080a23e9f2802692eb8f02a9d7532c554145b527 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar(a)fedoraproject.org>
+Date: Thu, 20 Feb 2020 20:09:35 +0100
+Subject: [PATCH] unbundle qtsingleapplication
+
+---
+ src/cpp/desktop/CMakeLists.txt | 5 ++---
+ src/cpp/desktop/DesktopPosixApplication.hpp | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/cpp/desktop/CMakeLists.txt b/src/cpp/desktop/CMakeLists.txt
+index dabe4f4..ec28567 100644
+--- a/src/cpp/desktop/CMakeLists.txt
++++ b/src/cpp/desktop/CMakeLists.txt
+@@ -158,7 +158,6 @@ endif (NOT WIN32)
+
+ set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES})
+ list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES
+- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp
+@@ -224,8 +223,6 @@ set(DESKTOP_SOURCE_FILES
+ DesktopSlotBinders.cpp
+ DesktopSubMenu.cpp
+ DesktopSynctex.cpp
+- 3rdparty/qtsingleapplication/qtsingleapplication.cpp
+- 3rdparty/qtsingleapplication/qtlocalpeer.cpp
+ )
+
+ if(WIN32)
+@@ -387,6 +384,7 @@ if(NOT APPLE)
+ target_link_libraries(rstudio
+ ${RSTUDIO_QTMODULES}
+ ${QT_LIBRARIES}
++ Qt5Solutions_SingleApplication-2.6
+ ${Boost_LIBRARIES}
+ rstudio-core
+ ${LINK_FLAGS}
+@@ -429,6 +427,7 @@ else()
+ target_link_libraries(RStudio
+ ${RSTUDIO_QTMODULES}
+ ${QT_LIBRARIES}
++ Qt5Solutions_SingleApplication-2.6
+ rstudio-core
+ ${APPLICATION_SERVICES_LIBRARY}
+ ${COCOA_LIBRARY}
+diff --git a/src/cpp/desktop/DesktopPosixApplication.hpp b/src/cpp/desktop/DesktopPosixApplication.hpp
+index 03d09d9..ca2eaee 100644
+--- a/src/cpp/desktop/DesktopPosixApplication.hpp
++++ b/src/cpp/desktop/DesktopPosixApplication.hpp
+@@ -16,7 +16,7 @@
+ #ifndef DESKTOP_POSIX_APPLICATION_HPP
+ #define DESKTOP_POSIX_APPLICATION_HPP
+
+-#include "3rdparty/qtsingleapplication/QtSingleApplication"
++#include <qt5/QtSolutions/QtSingleApplication>
+
+ #include "DesktopApplicationLaunch.hpp"
+
+--
+2.24.1
+
diff --git a/0002-fix-rstudio-exec-path.patch b/0002-fix-rstudio-exec-path.patch
new file mode 100644
index 0000000..08fc362
--- /dev/null
+++ b/0002-fix-rstudio-exec-path.patch
@@ -0,0 +1,23 @@
+From bfd42aef8759252d4fb2f620c8869fc85e0a6684 Mon Sep 17 00:00:00 2001
+From: Marco Varlese <marco.varlese(a)suse.com>
+Date: Mon, 27 Jan 2020 14:29:40 +0100
+Subject: [PATCH 10/10] Fix rstudio exec path
+
+Fix the path to the rstudio executable in the rstudio.desktop file.
+---
+ src/cpp/desktop/resources/freedesktop/rstudio.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in
+index 0a1a387fd2..e8f68277e2 100644
+--- a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in
++++ b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Exec=${CMAKE_INSTALL_PREFIX}/${RSTUDIO_INSTALL_BIN}/rstudio %F
++Exec=rstudio %F
+ Icon=rstudio
+ Type=Application
+ Terminal=false
+--
+2.25.0
diff --git a/0003-fix-STL-access-undefined-behaviour.patch b/0003-fix-STL-access-undefined-behaviour.patch
new file mode 100644
index 0000000..c952ac4
--- /dev/null
+++ b/0003-fix-STL-access-undefined-behaviour.patch
@@ -0,0 +1,32 @@
+From 3077fbe2890704d5d2150985bf796af07af6c2d1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar(a)fedoraproject.org>
+Date: Sun, 16 Feb 2020 14:22:20 +0100
+Subject: [PATCH] fix STL access undefined behaviour
+
+---
+ src/cpp/session/modules/SessionFiles.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/cpp/session/modules/SessionFiles.cpp b/src/cpp/session/modules/SessionFiles.cpp
+index a509c10..11c8015 100644
+--- a/src/cpp/session/modules/SessionFiles.cpp
++++ b/src/cpp/session/modules/SessionFiles.cpp
+@@ -909,13 +909,13 @@ SEXP rs_readLines(SEXP filePathSEXP)
+ return r::sexp::create(contents, &protect);
+
+ std::vector<std::string> splat = core::algorithm::split(contents, "\n");
+- if (splat[splat.size() - 1].empty())
++ if (splat.size() && splat[splat.size() - 1].empty())
+ splat.pop_back();
+
+ for (std::size_t i = 0, n = splat.size(); i < n; ++i)
+ {
+ std::string& rElement = splat[i];
+- if (rElement[rElement.size() - 1] == '\r')
++ if (rElement.size() && rElement[rElement.size() - 1] == '\r')
+ rElement.erase(rElement.size() - 1);
+ }
+
+--
+2.24.1
+
diff --git a/rstudio.spec b/rstudio.spec
new file mode 100644
index 0000000..a854fe6
--- /dev/null
+++ b/rstudio.spec
@@ -0,0 +1,339 @@
+%global bundled_gwt_version 2.8.1
+%global bundled_websockets_version 1.0.4
+%global bundled_gin_version 2.1.2
+%global bundled_guice_version 3.0
+%global bundled_aopalliance_version 1.0
+%global bundled_jsonspirit_version 4.03
+%global bundled_sundown_version 07d0d98
+%global bundled_hunspell_version 1.3
+%global bundled_synctex_version 1.17
+%global bundled_datatables_version 1.10.4
+%global bundled_pdfjs_version 1.3.158
+%global bundled_revealjs_version 2.4.0
+%global bundled_jsbn_version 2005
+%global bundled_highlightjs_version c589dcc
+%global bundled_qunitjs_version 1.18.0
+%global bundled_xtermjs_version 0.0.7
+%global mathjax_short 26
+%global rstudio_version_major 1
+%global rstudio_version_minor 2
+%global rstudio_version_patch 5033
+%global rstudio_git_revision_hash 330255ddec489e7a147ace3e8a9a3e4157d8d5ad
+
+Name: rstudio
+Version: %{rstudio_version_major}.%{rstudio_version_minor}.%{rstudio_version_patch}
+Release: 10%{?dist}
+Summary: RStudio base package
+
+# AGPLv3: RStudio, hunspell, icomoon glyphs
+# ASL 2.0: gwt, gwt-websockets, gin, guice, pdf.js
+# MIT: synctex, json-spirit, sundown, datatables, reveal.js, jsbn,
+# qunit.js, xterm.js
+# BSD: highlight.js
+# Public: aopalliance
+License: AGPLv3 and ASL 2.0 and MIT and BSD and Public Domain
+URL: https://github.com/%{name}/%{name}
+Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source1: https://s3.amazonaws.com/%{name}-buildtools/gwt-%{bundled_gwt_version}.zip
+Source2: https://s3.amazonaws.com/%{name}-buildtools/gin-%{bundled_gin_version}.zip
+# Unbundle mathjax, pandoc, hunspell dictionaries, qtsingleapplication
+Patch0: 0000-unbundle-dependencies-common.patch
+Patch1: 0001-unbundle-qtsingleapplication.patch
+# Remove the installation prefix from the exec path in the .desktop file
+Patch2: 0002-fix-rstudio-exec-path.patch
+# https://github.com/rstudio/rstudio/pull/6244
+Patch3: 0003-fix-STL-access-undefined-behaviour.patch
+
+BuildRequires: cmake, ant
+BuildRequires: gcc-c++, java-devel, R-core-devel
+BuildRequires: pandoc, pandoc-citeproc
+BuildRequires: mathjax, js-jquery
+BuildRequires: lato-fonts, glyphography-newscycle-fonts
+BuildRequires: boost-devel
+BuildRequires: pam-devel
+BuildRequires: rapidxml-devel
+BuildRequires: pkgconfig(uuid)
+BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(pango)
+BuildRequires: pkgconfig(libxslt)
+BuildRequires: pkgconfig(gl)
+BuildRequires: pkgconfig(libpq)
+BuildRequires: pkgconfig(xscrnsaver)
+BuildRequires: pkgconfig(websocketpp)
+%ifarch %{qt5_qtwebengine_arches}
+BuildRequires: qt5-devel
+BuildRequires: pkgconfig(Qt5WebKit)
+BuildRequires: pkgconfig(Qt5Location)
+BuildRequires: pkgconfig(Qt5Sensors)
+BuildRequires: pkgconfig(Qt5Svg)
+BuildRequires: pkgconfig(Qt5WebEngine)
+BuildRequires: pkgconfig(Qt5WebChannel)
+BuildRequires: pkgconfig(Qt5XmlPatterns)
+BuildRequires: qtsingleapplication-qt5-devel
+BuildRequires: hicolor-icon-theme
+BuildRequires: desktop-file-utils
+%endif
+BuildRequires: pkgconfig(systemd)
+BuildRequires: systemd
+%{?systemd_requires}
+Requires(pre): shadow-utils
+Requires: hunspell
+Requires: pandoc, pandoc-citeproc
+Requires: mathjax, js-jquery
+Requires: lato-fonts, glyphography-newscycle-fonts
+Recommends: git
+%ifarch %{qt5_qtwebengine_arches}
+Suggests: rstudio-desktop
+%endif
+Suggests: rstudio-server
+Provides: bundled(gwt) = %{bundled_gwt_version}
+Provides: bundled(gwt-websockets) = %{bundled_websockets_version}
+Provides: bundled(gin) = %{bundled_gin_version}
+Provides: bundled(guice) = %{bundled_guice_version}
+Provides: bundled(aopalliance) = %{bundled_aopalliance_version}
+Provides: bundled(json-spirit) = %{bundled_jsonspirit_version}
+Provides: bundled(sundown) = %{bundled_sundown_version}
+Provides: bundled(hunspell) = %{bundled_hunspell_version}
+Provides: bundled(synctex) = %{bundled_synctex_version}
+Provides: bundled(js-datatables) = %{bundled_datatables_version}
+Provides: bundled(js-pdf) = %{bundled_pdfjs_version}
+Provides: bundled(js-reveal) = %{bundled_revealjs_version}
+Provides: bundled(js-bn) = %{bundled_jsbn_version}
+Provides: bundled(js-highlight) = %{bundled_highlightjs_version}
+Provides: bundled(js-qunit) = %{bundled_qunitjs_version}
+Provides: bundled(js-xterm) = %{bundled_xtermjs_version}
+
+%global _description %{expand:
+RStudio is an integrated development environment (IDE) for R. It includes a
+console, syntax-highlighting editor that supports direct code execution, as
+well as tools for plotting, history, debugging and workspace management.
+}
+
+%description %_description
+This package provides common files for %{name}-desktop and %{name}-server.
+
+%ifarch %{qt5_qtwebengine_arches}
+%package desktop
+Summary: Integrated development environment for the R programming language
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: hicolor-icon-theme, shared-mime-info
+
+%description desktop %_description
+This package provides the Desktop version, to access the RStudio IDE locally.
+%endif
+
+%package server
+Summary: Access RStudio via a web browser
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: pam
+
+%description server %_description
+This package provides the Server version, a browser-based interface to the RStudio IDE.
+
+%prep
+%autosetup -p1
+
+# unpack gwt
+mkdir -p src/gwt/lib/gwt
+unzip -q -d src/gwt/lib/gwt/ %{SOURCE1}
+mv src/gwt/lib/gwt/gwt-%{bundled_gwt_version} src/gwt/lib/gwt/%{bundled_gwt_version}
+# unpack gin
+mkdir -p src/gwt/lib/gin/%{bundled_gin_version}
+unzip -q -d src/gwt/lib/gin/%{bundled_gin_version} %{SOURCE2}
+
+# use system libraries when available
+rm -rf src/cpp/desktop/3rdparty src/cpp/ext/websocketpp
+ln -sf %{_includedir}/rapidxml.h src/cpp/core/include/core/rapidxml/rapidxml.hpp
+ln -sf %{_includedir}/websocketpp src/cpp/ext/websocketpp
+
+# don't include gwt_build in ALL to avoid recompilation
+sed -i 's@gwt_build ALL@gwt_build@g' src/gwt/CMakeLists.txt
+# increase Java stack size
+%ifarch s390 s390x
+sed -i '/StackOverflowError/c\<jvmarg value="-Xss8M"/>' src/gwt/build.xml
+%endif
+
+%build
+export RSTUDIO_VERSION_MAJOR=%{rstudio_version_major}
+export RSTUDIO_VERSION_MINOR=%{rstudio_version_minor}
+export RSTUDIO_VERSION_PATCH=%{rstudio_version_patch}
+export RSTUDIO_GIT_REVISION_HASH=%{rstudio_git_revision_hash}
+export GIT_COMMIT=%{rstudio_git_revision_hash}
+%cmake . \
+%ifarch %{qt5_qtwebengine_arches}
+ -DRSTUDIO_TARGET=Desktop \
+ -DRSTUDIO_SERVER=TRUE \
+ -DQT_QMAKE_EXECUTABLE=%{_bindir}/qmake-qt5 \
+%else
+ -DRSTUDIO_TARGET=Server \
+%endif
+ -DCMAKE_BUILD_TYPE=Release \
+ -DRSTUDIO_USE_SYSTEM_BOOST=Yes \
+ -DBOOST_ROOT=%{_prefix} -DBOOST_LIBRARYDIR=%{_lib} \
+ -DCMAKE_INSTALL_PREFIX=%{_libexecdir}/%{name}
+%make_build # ALL
+%make_build gwt_build
+
+%install
+%make_install
+# expose symlinks in /usr/bin
+install -d -m 0755 %{buildroot}%{_bindir}
+%ifarch %{qt5_qtwebengine_arches}
+ln -s %{_libexecdir}/%{name}/bin/%{name} %{buildroot}%{_bindir}/%{name}
+%endif
+for bin in %{name}-server rserver rserver-pam; do
+ ln -s %{_libexecdir}/%{name}/bin/${bin} %{buildroot}%{_bindir}/${bin}
+done
+
+# validate .desktop file
+%ifarch %{qt5_qtwebengine_arches}
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+%endif
+
+# create required directories for rstudio-server (according to INSTALL)
+mkdir -p %{buildroot}%{_sharedstatedir}/%{name}-server
+
+# install the systemd service file and change /var/run -> /run
+install -D -m 0644 \
+ %{buildroot}%{_libexecdir}/%{name}/extras/systemd/%{name}-server.service \
+ %{buildroot}%{_unitdir}/%{name}-server.service
+sed -i 's@/var/run@/run@g' %{buildroot}%{_unitdir}/%{name}-server.service
+
+# install the PAM module
+mkdir -p %{buildroot}%{_sysconfdir}/pam.d
+install -m 0644 \
+ %{buildroot}%{_libexecdir}/%{name}/extras/pam/%{name} \
+ %{buildroot}%{_sysconfdir}/pam.d/%{name}
+
+# symlink the location where the bundled dependencies should be
+pushd %{buildroot}%{_libexecdir}/%{name}/bin
+ mkdir -p pandoc
+ ln -sf %{_bindir}/pandoc pandoc/pandoc
+ ln -sf %{_bindir}/pandoc-citeproc pandoc/pandoc-citeproc
+popd
+pushd %{buildroot}%{_libexecdir}/%{name}/resources
+ ln -sf %{_datadir}/myspell dictionaries
+ ln -sf %{_datadir}/javascript/mathjax mathjax-%{mathjax_short}
+ ln -sf %{_datadir}/javascript/jquery/latest/jquery.js grid/datatables/js/jquery.js
+ pushd presentation/revealjs/fonts
+ for fnt in Lato*.ttf; do
+ ln -sf %{_datadir}/fonts/lato/${fnt} ${fnt}
+ done
+ for fnt in News*.ttf; do
+ ln -sf %{_datadir}/fonts/glyphography-newscycle-fonts/${fnt,,} ${fnt}
+ done
+ popd
+ # move and symlink bundled libraries
+ mv grid/datatables grid/datatables.bundled
+ ln -sf ./datatables.bundled grid/datatables
+ mv pdfjs pdfjs.bundled
+ ln -sf ./pdfjs.bundled pdfjs
+ mv presentation/revealjs presentation/revealjs.bundled
+ ln -sf ./revealjs.bundled presentation/revealjs
+popd
+
+# clean up
+pushd %{buildroot}%{_libexecdir}/%{name}
+ for f in .gitignore .Rbuildignore LICENSE README; do
+ find . -name ${f} -delete
+ done
+ rm -rf {extras,INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION}
+popd
+
+# add user rstudio-server
+%pre server
+getent group %{name}-server >/dev/null || groupadd -r %{name}-server
+getent passwd %{name}-server >/dev/null || \
+ useradd -r -g %{name}-server -d %{_sharedstatedir}/%{name}-server -s /sbin/nologin \
+ -c "User for %{name}-server" %{name}-server
+exit 0
+
+%post server
+%systemd_post %{name}-server.service
+
+%preun server
+%systemd_preun %{name}-server.service
+
+%postun server
+%systemd_postun_with_restart %{name}-server.service
+
+%files
+%license COPYING NOTICE
+%doc README.md
+%dir %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/R
+%{_libexecdir}/%{name}/bin
+%{_libexecdir}/%{name}/resources
+%{_libexecdir}/%{name}/www
+%{_libexecdir}/%{name}/www-symbolmaps
+
+%ifarch %{qt5_qtwebengine_arches}
+%files desktop
+%{_bindir}/%{name}
+%{_libexecdir}/%{name}/%{name}.png
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/*/mimetypes/*
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/pixmaps/%{name}.png
+%endif
+
+%files server
+%{_bindir}/%{name}-server
+%{_bindir}/rserver
+%{_bindir}/rserver-pam
+%dir %{_sharedstatedir}/%{name}-server
+%{_unitdir}/%{name}-server.service
+%config(noreplace) %{_sysconfdir}/pam.d/%{name}
+
+%changelog
+* Fri Feb 28 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5033-10
+- Do not remove NOTICE from resources dir (displayed in the help menu)
+
+* Thu Feb 27 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5033-9
+- Unbundle NewsCycle font
+- Make unzip quiet
+- Simplify description
+
+* Tue Feb 25 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5033-8
+- Explicitly list gcc-c++ and java-devel as BuildRequires
+- Change Source0 URL to include the package name
+- Add isa flag to subpackages
+- Require hicolor-icon-theme and shared-mimo-info in -desktop
+- Mark config file as noreplace in -server
+- Add comments to justify patches
+- Unbundle Lato font
+- Some refactoring
+
+* Sun Feb 23 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5033-7
+- Downgrade to gwt version 2.8.1 to fix notebook issues
+- Rebase patches
+
+* Fri Feb 21 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5033-6
+- Declare bundled hunspell, synctex (RStudio relies on an old APIs)
+
+* Thu Feb 20 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5033-5
+- Declare bundled gwt-websockets, guice, aopalliance, json-spirit, sundown,
+ datatables, pdfjs, revealjs, jsbn, highlightjs, qunitjs
+- Move and symlink bundled libraries included as-is: datatables, pdfjs, revealjs
+- Unbundle qtsingleapplication, websocketpp, hunspell, dictionaries, rapidxml,
+ synctex, jQuery
+- Validate .desktop file
+- Expose rstudio-server script in /usr/bin
+- Mark NOTICE as license, clean up more files
+- Rebase patches
+
+* Mon Feb 17 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5033-4
+- Increase Java stack size for s390x
+- Call target gwt_build manually
+
+* Sun Feb 16 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5033-3
+- Move PNG file to rstudio-desktop sub-package
+
+* Sun Feb 16 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5033-2
+- Exclude rstudio-desktop from arches not supported by QtWebEngine
+- Add 0004-fix-STL-access-undefined-behaviour.patch
+
+* Sun Feb 16 2020 Iaki car <iucar(a)fedoraproject.org> - 1.2.5033-1
+- Initial packaging for Fedora
+- Most of the work ported from Dan ermk's SPEC for openSUSE
diff --git a/sources b/sources
new file mode 100644
index 0000000..89bcae8
--- /dev/null
+++ b/sources
@@ -0,0 +1,3 @@
+SHA512 (gin-2.1.2.zip) = 03407b6318ffb0dd504ce520649ed90e845f13fbdbd0bfb4d7e3b127842f1735093e39674077c3a04a11d434aefdc3a734652c3f85e8ab00ff37ae760ccb8dbb
+SHA512 (gwt-2.8.1.zip) = feeb00cb0413c2703dfd6931f57ba669813bd65f814715f2c04dd6dc69e885a8048337272333d7504c48e9fa52cdab699f854ee13211228ab142a1f458ee33ae
+SHA512 (rstudio-1.2.5033.tar.gz) = 3569d4fed342275a9905c87e4f97be63b6391d2c37f75397e06201a7c31f80d94799214f51ff8e57d458ef18d5e54afe1ec8a7c56ac05ed8b8225ecca72d1daf
4 years, 1 month