- up to 2.6.1

- group no longer needed, program stores data in $HOME now

diff --git a/snapmakerjs.spec b/snapmakerjs.spec
index 4e08e93ab304c45590a9b65ef1aa390044ab8c67..12cfa451509a4566f47e092faa0d4cbcd0da14f7 100644 (file)
--- a/snapmakerjs.spec
+++ b/snapmakerjs.spec
@@ -1,13 +1,13 @@
 Summary:       Snapmaker 3-in-1 Software for 3D Printing, Laser Engraving and CNC Cutting
 Name:          snapmakerjs
-Version:       2.5.4
-Release:       3
+Version:       2.6.1
+Release:       1
 License:       MIT
 Group:         Applications
 Source0:       https://s3-us-west-2.amazonaws.com/snapmaker.com/download/snapmakerjs/%{name}-%{version}-linux-x64.tar.gz
-# Source0-md5: 7354bc4975732e4dfdc9d1aa9dc64643
+# Source0-md5: d73263375129a4645b7143458153955e
 Source1:       https://s3-us-west-2.amazonaws.com/snapmaker.com/download/snapmakerjs/%{name}-%{version}-linux-ia32.tar.gz
-# Source1-md5: bcf59cafd4ef964fc7034282aea62d37
+# Source1-md5: e41e89a361cdec177083d6a179477be1
 Source2:       %{name}.desktop
 Source3:       %{name}.png
 URL:           https://snapmaker.com/
@@ -19,8 +19,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _enable_debug_packages  0
 
 %description
-Snapmaker 3-in-1 Software for 3D Printing, Laser Engraving
-and CNC Cutting.
+Snapmaker 3-in-1 Software for 3D Printing, Laser Engraving and CNC
+Cutting.
 
 %prep
 %ifarch %{x8664}
@@ -31,24 +31,15 @@ and CNC Cutting.
 %endif
 
 %build
-%{__sed} -i -e 's|./sessions|/var/lib/snapmakerjs/sessions|' \
-       -e 's|./fonts|/var/lib/snapmakerjs/fonts|' resources/app/app/index.js
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}/%{name},%{_bindir},%{_desktopdir},/etc/snapmakerjs} \
-       $RPM_BUILD_ROOT{%{_iconsdir}/hicolor/256x256/apps,/var/lib/snapmakerjs/_cache}
+install -d $RPM_BUILD_ROOT{%{_libdir}/%{name},%{_bindir},%{_desktopdir}} \
+       $RPM_BUILD_ROOT%{_iconsdir}/hicolor/256x256/apps
 
 cp -a * $RPM_BUILD_ROOT%{_libdir}/%{name}
 ln -s %{_libdir}/%{name}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 
-%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/resources/app/web/images/_cache
-ln -s /var/lib/snapmakerjs/_cache $RPM_BUILD_ROOT%{_libdir}/%{name}/resources/app/web/images/_cache
-
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/snapmakerjs/resources/app/CuraEngine/Config \
-       $RPM_BUILD_ROOT/etc/snapmakerjs/CuraEngine
-ln -s /etc/snapmakerjs/CuraEngine $RPM_BUILD_ROOT%{_libdir}/snapmakerjs/resources/app/CuraEngine/Config
-
 for i in 16 24 32 48 64 96 128 ; do
   install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${i}x${i}/apps
   convert -geometry ${i}x${i} %{SOURCE3} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${i}x${i}/apps/%{name}.png
@@ -57,32 +48,18 @@ done
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/256x256/apps
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-%groupadd -g 184 snapmaker
-
 %post
 %update_icon_cache hicolor
 
-%banner %{name} <<-EOF
-You need to be a member of snapmaker group to use all features of the program!
-EOF
-
 %postun
-if [ "$1" = "0" ]; then
-       %groupremove snapmaker
-fi
 %update_icon_cache hicolor
 
 %files
 %defattr(644,root,root,755)
 %doc LICENSE.electron.txt LICENSES.chromium.html
-%dir /etc/snapmakerjs
-%dir %attr(775,root,snapmaker) /etc/snapmakerjs/CuraEngine
-%attr(664,root,snapmaker) %config %verify(not md5 mtime size) /etc/snapmakerjs/CuraEngine/*
 %attr(755,root,root) %{_bindir}/%{name}*
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/locales
@@ -92,14 +69,31 @@ fi
 %{_libdir}/snapmakerjs/resources/app/app
 %{_libdir}/snapmakerjs/resources/app/electron-app
 %{_libdir}/snapmakerjs/resources/app/node_modules
-%{_libdir}/snapmakerjs/resources/app/web
 %{_libdir}/snapmakerjs/resources/app/*.js
 %{_libdir}/snapmakerjs/resources/app/*.json
-%dir %{_libdir}/snapmakerjs/resources/app/CuraEngine
-%{_libdir}/snapmakerjs/resources/app/CuraEngine/Config
-%dir %{_libdir}/snapmakerjs/resources/app/CuraEngine/3.6
-%dir %{_libdir}/snapmakerjs/resources/app/CuraEngine/3.6/Linux
-%attr(755,root,root) %{_libdir}/snapmakerjs/resources/app/CuraEngine/3.6/Linux/CuraEngine
+%dir %{_libdir}/snapmakerjs/resources/app/resources
+%{_libdir}/snapmakerjs/resources/app/resources/fonts
+%dir %{_libdir}/snapmakerjs/resources/app/resources/CuraEngine
+%{_libdir}/snapmakerjs/resources/app/resources/CuraEngine/Config
+%dir %{_libdir}/snapmakerjs/resources/app/resources/CuraEngine/3.6
+%dir %{_libdir}/snapmakerjs/resources/app/resources/CuraEngine/3.6/Linux
+%attr(755,root,root) %{_libdir}/snapmakerjs/resources/app/resources/CuraEngine/3.6/Linux/CuraEngine
+%dir %{_libdir}/snapmakerjs/resources/app/server
+%{_libdir}/snapmakerjs/resources/app/server/index.js
+%dir %{_libdir}/snapmakerjs/resources/app/server/i18n
+%lang(cs) %{_libdir}/snapmakerjs/resources/app/server/i18n/cs
+%lang(de) %{_libdir}/snapmakerjs/resources/app/server/i18n/de
+%lang(en) %{_libdir}/snapmakerjs/resources/app/server/i18n/en
+%lang(es) %{_libdir}/snapmakerjs/resources/app/server/i18n/es
+%lang(fr) %{_libdir}/snapmakerjs/resources/app/server/i18n/fr
+%lang(hu) %{_libdir}/snapmakerjs/resources/app/server/i18n/hu
+%lang(it) %{_libdir}/snapmakerjs/resources/app/server/i18n/it
+%lang(ja) %{_libdir}/snapmakerjs/resources/app/server/i18n/ja
+%lang(pt_BR) %{_libdir}/snapmakerjs/resources/app/server/i18n/pt-br
+%lang(ru) %{_libdir}/snapmakerjs/resources/app/server/i18n/ru
+%lang(zh_CN) %{_libdir}/snapmakerjs/resources/app/server/i18n/zh-cn
+%lang(zh_TW) %{_libdir}/snapmakerjs/resources/app/server/i18n/zh-tw
+%{_libdir}/snapmakerjs/resources/app/server/views
 %{_libdir}/%{name}/*.dat
 %{_libdir}/%{name}/*.bin
 %{_libdir}/%{name}/*.pak
@@ -108,5 +102,3 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/snapmakerjs
 %{_desktopdir}/%{name}.desktop
 %{_iconsdir}/hicolor/*x*/apps/%{name}.png
-%dir %attr(1777,root,root) /var/lib/%{name}
-%dir %attr(1777,root,root) /var/lib/%{name}/_cache