diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..62c893550adb53d3a8fc29a1584ff831cb829062 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/ \ No newline at end of file diff --git a/oedp-1.0.2.tar.gz b/oedp-1.0.2.tar.gz deleted file mode 100644 index 36e41eed470163dc0de223793e7a71444b6ce12d..0000000000000000000000000000000000000000 Binary files a/oedp-1.0.2.tar.gz and /dev/null differ diff --git a/oedp-1.1.0.tar.gz b/oedp-1.1.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..77c39cd1b81fd9db206613a2881d2b70e34948ca Binary files /dev/null and b/oedp-1.1.0.tar.gz differ diff --git a/oedp.spec b/oedp.spec index b858cb5bf91a7edb184a31568e475be50dfb87f0..67914a234f73b380d3de7d38ab92c27b526c91c9 100644 --- a/oedp.spec +++ b/oedp.spec @@ -1,6 +1,6 @@ %define _python_bytecompile_errors_terminate_build 0 Name: oedp -Version: 1.0.2 +Version: 1.1.0 Release: 1 Summary: openEuler deploy tool License: MulanPSL-2.0 @@ -8,7 +8,7 @@ Source0: %{name}-%{version}.tar.gz BuildArch: noarch -Requires: python3, ansible, python3-prettytable +Requires: python3, ansible, python3-prettytable, tar %description openEuler deploy tool @@ -32,8 +32,10 @@ mkdir -p -m 700 %{buildroot}%{_usr}/share/applications mkdir -p -m 700 %{buildroot}%{_sysconfdir}/oedp/config mkdir -p %{buildroot}%{_bindir} +touch %{buildroot}%{_var}/oedp/log/oedp.log cp -rdpf %{_builddir}/%{name}-%{version}/src %{buildroot}%{_usr}/lib/oedp -mv %{buildroot}%{_usr}/lib/oedp/src/config/log.conf %{buildroot}%{_sysconfdir}/oedp/config +mv %{buildroot}%{_usr}/lib/oedp/src/config/* %{buildroot}%{_sysconfdir}/oedp/config +mkdir -p -m 700 %{buildroot}%{_sysconfdir}/oedp/config/repo/cache install -c -m 0400 %{_builddir}/%{name}-%{version}/static/* %{buildroot}%{_usr}/share/applications install -c -m 0500 %{_builddir}/%{name}-%{version}/oedp.py %{buildroot}%{_bindir}/oedp @@ -41,6 +43,7 @@ install -c -m 0500 %{_builddir}/%{name}-%{version}/oedp.py %{buildroot}%{_bindir %postun if [ $1 -eq 0 ]; then # 卸载时删除可能会残留的目录 + rm -rf /etc/oedp rm -rf /var/oedp rm -rf /usr/lib/oedp fi @@ -49,20 +52,28 @@ fi %files %attr(0555,root,root) %dir %{_var}/oedp %attr(0777,root,root) %dir %{_var}/oedp/log -%attr(0555,root,root) %dir %{_var}/oedp/plugin +%attr(0777,root,root) %dir %{_var}/oedp/plugin %attr(0555,root,root) %dir %{_var}/oedp/python %attr(0555,root,root) %dir %{_var}/oedp/python/venv %attr(0555,root,root) %dir %{_usr}/lib/oedp %attr(0777,root,root) %dir %{_sysconfdir}/oedp/config +%attr(0777,root,root) %dir %{_sysconfdir}/oedp/config/repo +%attr(0777,root,root) %dir %{_sysconfdir}/oedp/config/repo/cache -%attr(0666,root,root) %ghost %{_var}/oedp/log/oedp.log +%attr(0666,root,root) %{_var}/oedp/log/oedp.log %attr(0555,root,root) %{_usr}/lib/oedp/src/* %attr(0666,root,root) %config(noreplace) %{_sysconfdir}/oedp/config/log.conf +%attr(0666,root,root) %config(noreplace) %{_sysconfdir}/oedp/config/repo/repo.conf %attr(0644,root,root) %{_usr}/share/applications/* %attr(0555,root,root) %{_bindir}/oedp %changelog +* Sun Apr 27 2025 Liu Jiangbin - 1.1.0-1 +- Support configurable plugin sources +- Support one-click initialization +- Fix the log permission bug + * Mon Mar 31 2025 Liu Jiangbin - 1.0.2-1 - Fix the issue where non-root users cannot execute