diff --git a/migration-tools-1.0.1.tar.gz b/migration-tools-1.0.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..53eb4e5cc98089124f02d623fdb8257a7c6f8a2f Binary files /dev/null and b/migration-tools-1.0.1.tar.gz differ diff --git a/migration-tools.spec b/migration-tools.spec index 10c6f6f05533707d63e042f575e6c5119c6cc15e..7130ec7f2d02d3e053d47ed347ea5b95cae8bdf9 100644 --- a/migration-tools.spec +++ b/migration-tools.spec @@ -1,9 +1,9 @@ Name: migration-tools Version: 1.0.1 -Release: 13 +Release: 14 License: MulanPSL-2.0 Summary: A tool to help users migrate the Centos system to the UOS system and openEuler system -Source0: migration-tools.tar.gz +Source0: %{name}-%{version}.tar.gz Source1: requires.tar.gz Source2: xlwt-1.3.0-py2.py3-none-any.whl # patches @@ -60,23 +60,12 @@ Migration software server side %prep +%autosetup -p1 %setup -c -%patch 0 -p1 -%patch 1 -p1 -%patch 2 -p1 -%patch 3 -p1 -%patch 4 -p1 -%patch 5 -p1 -%patch 6 -p1 -%patch 7 -p1 -%patch 8 -p1 -%patch 9 -p1 -%patch 100 -p1 - %if 0%{?openEuler} -cp -f %SOURCE1 agent-requires/ -cp -f %SOURCE2 agent-requires/ +cp -f %SOURCE1 %{name}-%{version}/agent-requires/ +cp -f %SOURCE2 %{name}-%{version}/agent-requires/ %endif %install @@ -86,11 +75,11 @@ mkdir -p $RPM_BUILD_ROOT/var/tmp/uos-migration mkdir -p $RPM_BUILD_ROOT/etc/migration-tools mkdir -p $RPM_BUILD_ROOT%{_unitdir} -cp -r * $RPM_BUILD_ROOT/usr/lib/migration-tools-server/ +cp -r %{name}-%{version}/* $RPM_BUILD_ROOT/usr/lib/migration-tools-server/ %if 0%{?rhel} >= 7 mkdir -p $RPM_BUILD_ROOT/usr/lib/migration-tools-agent -cp -r * $RPM_BUILD_ROOT/usr/lib/migration-tools-agent/ +cp -r %{name}-%{version}/* $RPM_BUILD_ROOT/usr/lib/migration-tools-agent/ %{__cp} -r $RPM_BUILD_ROOT/usr/lib/migration-tools-server/server/migration-tools-agent.service $RPM_BUILD_ROOT%{_unitdir} %endif @@ -127,6 +116,9 @@ rm -rf /usr/bin/migration-tools %endif %changelog +* Wed Sep 11 2024 Xuezhixin - 1.0.1-14 +- Fix the problem of error when compiling rpm patch + * Wed Sep 04 2024 lihaipeng - 1.0.1-13 - verify user password is disabled by button diff --git a/migration-tools.tar.gz b/migration-tools.tar.gz deleted file mode 100644 index 6ec73170fe4685e25f170c1d7dd4dcffd1e6c99f..0000000000000000000000000000000000000000 Binary files a/migration-tools.tar.gz and /dev/null differ