|
|
|
@ -81,16 +81,12 @@ Group: Development/Libraries
|
|
|
|
BuildRequires: java-devel >= 1.5.0
|
|
|
|
BuildRequires: java-devel >= 1.5.0
|
|
|
|
BuildRequires: jpackage-utils
|
|
|
|
BuildRequires: jpackage-utils
|
|
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
%if 0%{?rhel} <= 6
|
|
|
|
%if 0%{?rhel} <= 6
|
|
|
|
Requires: java >= 1.5.0
|
|
|
|
Requires: java >= 1.5.0
|
|
|
|
%else
|
|
|
|
%else
|
|
|
|
Requires: java-headless >= 1.5.0
|
|
|
|
Requires: java-headless >= 1.5.0
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
Requires: java-headless >= 1.5.0
|
|
|
|
|
|
|
|
>>>>>>> Use Requires: java-headless rebuild (#1067528)
|
|
|
|
|
|
|
|
Requires: jpackage-utils
|
|
|
|
Requires: jpackage-utils
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
|
|
|
Ding-Yi Chen
11 years ago