From f16a1f0243c28be635b10efd849f71399dd9c37c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 04 2015 07:13:30 +0000 Subject: import devtoolset-3-jsoup-1.7.2-2.el7 --- diff --git a/SPECS/jsoup.spec b/SPECS/jsoup.spec index 6c543fb..40d27b3 100644 --- a/SPECS/jsoup.spec +++ b/SPECS/jsoup.spec @@ -1,10 +1,10 @@ %{?scl:%scl_package jsoup} %{!?scl:%global pkg_name %{name}} -%{!?maven_scl:%global maven_scl_prefix %{nil}} +%{?java_common_find_provides_and_requires} Name: %{?scl_prefix}jsoup Version: 1.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java library for working with real-world HTML Group: Development/Libraries @@ -15,10 +15,10 @@ BuildArch: noarch # https://github.com/jhy/jsoup/archive/jsoup-1.7.2.tar.gz Source0: %{pkg_name}-%{pkg_name}-%{version}.tar.gz -BuildRequires: %{maven_scl_prefix}maven-local -BuildRequires: junit -BuildRequires: %{maven_scl_prefix}maven-plugin-bundle -BuildRequires: %{maven_scl_prefix}maven-source-plugin +BuildRequires: %{?scl_prefix_java_common}maven-local +BuildRequires: %{?scl_prefix_java_common}junit +BuildRequires: %{?scl_prefix_maven}maven-plugin-bundle +BuildRequires: %{?scl_prefix_maven}maven-source-plugin %{?scl:Requires: %scl_runtime} %description @@ -51,14 +51,14 @@ API documentation for %{name}. %setup -q -n %{pkg_name}-%{pkg_name}-%{version} %build -scl enable %{scl} - <<"EOF" +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} %mvn_build -EOF +%{?scl:EOF} %install -scl enable %{scl} - <<"EOF" +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} %mvn_install -EOF +%{?scl:EOF} %files -f .mfiles %doc LICENSE README CHANGES @@ -67,6 +67,9 @@ EOF %doc LICENSE %changelog +* Mon May 11 2015 Mat Booth - 1.7.2-2 +- Resolves: rhbz#1219013 - Fails to build from source + * Mon May 26 2014 Sami Wagiaalla 1.7.2-1 - Build for DTS 3 - import new sources from rawhide.