From 1344fa219eebe9818027e7db6a7d1fec85685dea Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 04 2015 07:09:42 +0000
Subject: import devtoolset-3-rome-0.9-19.el7


---

diff --git a/SPECS/rome.spec b/SPECS/rome.spec
index 53d386d..ee0c84e 100644
--- a/SPECS/rome.spec
+++ b/SPECS/rome.spec
@@ -1,10 +1,10 @@
 %{?scl:%scl_package rome}
 %{!?scl:%global pkg_name %{name}}
-%{!?maven_scl:%global maven_scl_prefix  %{nil}}
+%{?java_common_find_provides_and_requires}
 
 Name:       %{?scl_prefix}rome
 Version:    0.9
-Release:    18%{?dist}
+Release:    19%{?dist}
 Summary:    RSS and Atom Utilities
 
 Group:      Development/Libraries
@@ -26,12 +26,10 @@ Patch0:     %{pkg_name}-%{version}-addosgimanifest.patch
 Patch1:     %{pkg_name}-%{version}-pom.patch
 
 BuildRequires:  java-devel >= 1:1.7.0
-BuildRequires:  %{?maven_scl_prefix}jpackage-utils
-BuildRequires:  %{?maven_scl_prefix}ant
-BuildRequires:  %{?scl_prefix}jdom >= 1.1.2-3
-Requires: java >= 1:1.7.0
-Requires: jpackage-utils
-Requires: %{?scl_prefix}jdom >= 1.1.2-3
+BuildRequires:  %{?scl_prefix_java_common}jpackage-utils
+BuildRequires:  %{?scl_prefix_java_common}ant
+BuildRequires:  %{?scl_prefix_java_common}jdom >= 1.1.2-3
+Requires: %{?scl_prefix_java_common}jdom >= 1.1.2-3
 %{?scl:Requires: %scl_runtime}
 
 %description
@@ -41,7 +39,6 @@ publishing RSS and Atom feeds.
 %package	javadoc
 Summary:  Javadocs for %{pkg_name}
 Group:    Documentation
-Requires: jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{pkg_name}.
@@ -50,38 +47,42 @@ This package contains the API documentation for %{pkg_name}.
 %setup -q -n %{pkg_name}-%{version}
 find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
 mkdir -p target/lib
-ln -s %{_datadir}/java/jdom.jar target/lib
 cp -p %{SOURCE1} .
 %patch0
 cp -p %{SOURCE2} pom.xml
 %patch1
 
 %build
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
+build-jar-repository -p target/lib jdom
 ant -Dnoget=true dist
+%{?scl:EOF}
 
 %install
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p target/%{pkg_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}.jar
 
 mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{pkg_name}.pom
-scl enable %{scl} - <<"EOF"
 %add_maven_depmap JPP-%{pkg_name}.pom %{pkg_name}.jar
-EOF
 
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{pkg_name}
 cp -rp dist/docs/api/* \
   $RPM_BUILD_ROOT%{_javadocdir}/%{pkg_name}
+%{?scl:EOF}
 
-%files
+%files -f .mfiles
 %{_javadir}/%{pkg_name}.jar
 %{_mavenpomdir}/JPP-%{pkg_name}.pom
-%{_mavendepmapfragdir}/%{pkg_name}
 
 %files javadoc
 %{_javadocdir}/%{pkg_name}
 
 %changelog
+* Mon May 11 2015 Mat Booth <mat.booth@redhat.com> - 0.9-19
+- Resolves: rhbz#1219013 - Fails to build from source
+
 * Tue May 27 2014 Mat Booth <mat.booth@redhat.com> - 0.9-18
 - java-headless is not available on rhel6