Commit 2c8ef8ea authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Merge branch 'mantid_prod' into 'main' 

Take control of launching production mantid

See merge request sns-hfir-scse/infrastructure/nsd-app-wrap!17
parents 475a8dd5 3762666d

nsd-app-wrap.spec

+8 −8
Original line number Diff line number Diff line 
%global srcname nsd-app-wrap



Name:           nsd-app-wrap

Version:        1.31

Version:        1.32

Release:        1%{?dist}

Summary:        Wrapper scripts to launch python applications installed via anaconda

Vendor:         Peter F. Peterson
@@ -32,9 +32,8 @@ install -m 755 mantidpythonnightly %{buildroot}%{_bindir}/ 
install -m 755 mantidworkbenchnightly %{buildroot}%{_bindir}/

install -m 755 mantidpythonqa %{buildroot}%{_bindir}/

install -m 755 mantidworkbenchqa %{buildroot}%{_bindir}/

# uncomment next two lines when full release of mantid is installed via conda

#install -m 755 mantidpython %{buildroot}%{_bindir}/

#install -m 755 mantidworkbench %{buildroot}%{_bindir}/

install -m 755 mantidpython %{buildroot}%{_bindir}/

install -m 755 mantidworkbench %{buildroot}%{_bindir}/

install -m 755 mantidtotalscattering %{buildroot}%{_bindir}/

install -m 755 nsd-app-wrap.sh %{buildroot}%{_bindir}/

install -m 755 nsd-conda-wrap.sh %{buildroot}%{_bindir}/
@@ -47,16 +46,14 @@ install -m 755 jupyter %{buildroot}%{_bindir}/ 
# put icons in the right place

mkdir -p %{buildroot}/%{_datadir}/pixmaps/

install -m 644 pyrs.png %{buildroot}/%{_datadir}/pixmaps/

# uncomment next two lines when full release of mantid is installed via conda

#install -m 644 mantid_workbench.png %{buildroot}/%{_datadir}/pixmaps/

install -m 644 mantid_workbench.png %{buildroot}/%{_datadir}/pixmaps/

install -m 644 mantid_workbenchnightly.png %{buildroot}/%{_datadir}/pixmaps/

install -m 644 mantid_workbenchqa.png %{buildroot}/%{_datadir}/pixmaps/

install -m 644 jupyter.svg %{buildroot}/%{_datadir}/pixmaps/

# put desktop files in the right place

mkdir -p %{buildroot}%{_datadir}/applications/

install -m 644 pyrs.desktop %{buildroot}%{_datadir}/applications/

# uncomment next two lines when full release of mantid is installed via conda

#install -m 644 mantidworkbench.desktop %{buildroot}%{_datadir}/applications/

install -m 644 mantidworkbench.desktop %{buildroot}%{_datadir}/applications/

install -m 644 mantidworkbenchnightly.desktop %{buildroot}%{_datadir}/applications/

install -m 644 mantidworkbenchqa.desktop %{buildroot}%{_datadir}/applications/

install -m 644 jupyter.sns.desktop %{buildroot}%{_datadir}/applications/
@@ -70,6 +67,9 @@ install -m 644 jupyter.local.desktop %{buildroot}%{_datadir}/applications/ 
%license LICENSE



%changelog

* Mon Nov 14 2022 Pete Peterson

- Take over starting mantidworkbench and mantidpython with conda



* Fri Nov 11 2022 Pete Peterson

- Fix bug in mantidworkbench and mantidpython wrappers finding applications