!3 回退 'Pull Request !2 : 回退 'Pull Request !1 : resolve "rpm -ivh" err''

Merge pull request !3 from 惊奇脆片饼干/revert-merge-2-master
This commit is contained in:
openeuler-ci-bot 2020-01-22 15:45:09 +08:00 committed by Gitee
commit 5c562e31d3

View File

@ -1,7 +1,7 @@
Summary: A line-oriented text editor Summary: A line-oriented text editor
Name: ed Name: ed
Version: 1.14.2 Version: 1.14.2
Release: 5 Release: 6
License: GPLv3+ and GFDL License: GPLv3+ and GFDL
# Note: Upstream provides only lzip compressed tarballs so we repacked from: # Note: Upstream provides only lzip compressed tarballs so we repacked from:
#Source: https://download.savannah.gnu.org/releases/ed/%{name}-%{version}.tar.lz #Source: https://download.savannah.gnu.org/releases/ed/%{name}-%{version}.tar.lz
@ -40,10 +40,10 @@ Man pages and other related documents.
%make_install %make_install
rm -vrf %{buildroot}%{_infodir}/dir rm -vrf %{buildroot}%{_infodir}/dir
%post %post help
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
%preun %preun help
if [ $1 = 0 ] ; then if [ $1 = 0 ] ; then
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi fi
@ -60,5 +60,8 @@ fi
%{_infodir}/ed.info* %{_infodir}/ed.info*
%changelog %changelog
* Tue Jan 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.14.2-6
- resolve "rpm -ivh" err
* Tue Sep 17 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.14.2-5 * Tue Sep 17 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.14.2-5
- Package init - Package init