!35 [sync] PR-34: Modify the expression 0%{?openEuler} >= 2 to 0%{?openEuler} >= 1
Merge pull request !35 from openeuler-sync-bot/sync-pr34-openEuler-20.03-LTS-Next-to-openEuler-20.03-LTS-SP3
This commit is contained in:
commit
c6283d1e74
@ -16,9 +16,9 @@ Name: caja
|
|||||||
Summary: File manager for MATE
|
Summary: File manager for MATE
|
||||||
Version: %{branch}.2
|
Version: %{branch}.2
|
||||||
%if 0%{?rel_build}
|
%if 0%{?rel_build}
|
||||||
Release: 10
|
Release: 11
|
||||||
%else
|
%else
|
||||||
Release: 0.15%{?git_rel}%{?dist}
|
Release: 0.16%{?git_rel}%{?dist}
|
||||||
%endif
|
%endif
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
URL: http://mate-desktop.org
|
URL: http://mate-desktop.org
|
||||||
@ -81,7 +81,7 @@ It is also responsible for handling the icons on the MATE desktop.
|
|||||||
%package core-extensions
|
%package core-extensions
|
||||||
Summary: Mate-file-manager extensions library
|
Summary: Mate-file-manager extensions library
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
%if (0%{?fedora} >= 28 && 0%{?fedora} <= 32) || 0%{?openEuler} >= 2
|
%if (0%{?fedora} >= 28 && 0%{?fedora} <= 32) || 0%{?openEuler} >= 1
|
||||||
Provides: %{name}-extensions = %{version}-%{release}
|
Provides: %{name}-extensions = %{version}-%{release}
|
||||||
Provides: %{name}-extensions%{?_isa} = %{version}-%{release}
|
Provides: %{name}-extensions%{?_isa} = %{version}-%{release}
|
||||||
Obsoletes: %{name}-extensions < 1.20.2-2
|
Obsoletes: %{name}-extensions < 1.20.2-2
|
||||||
@ -198,6 +198,9 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 14 2021 tangjie02 <tangjie02@kylinsec.com.cn> - 1.22.2-11
|
||||||
|
- Modify the expression 0%{?openEuler} >= 2 to 0%{?openEuler} >= 1
|
||||||
|
|
||||||
* Tue Dec 14 2021 tangjie02 <tangjie02@kylinsec.com.cn> - 1.22.2-10
|
* Tue Dec 14 2021 tangjie02 <tangjie02@kylinsec.com.cn> - 1.22.2-10
|
||||||
- Fix circular dependency.
|
- Fix circular dependency.
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user