From e12d2f5c7934b263d046e252398dec71983b2367 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 23 2015 07:40:08 +0000
Subject: import devtoolset-3-swt-chart-0.9.0-4.1.el7


---

diff --git a/SPECS/swt-chart.spec b/SPECS/swt-chart.spec
index 05ddc78..5096325 100644
--- a/SPECS/swt-chart.spec
+++ b/SPECS/swt-chart.spec
@@ -1,12 +1,12 @@
 %{?scl:%scl_package swt-chart}
 %{!?scl:%global pkg_name %{name}}
+%{?java_common_find_provides_and_requires}
 
 Name:           %{?scl_prefix}swt-chart
 Version:        0.9.0
-Release:        1%{?dist}
+Release:        4.1%{?dist}
 Summary:        SWTChart Feature
 
-Group:          Development/Tools
 License:        EPL
 URL:            http://www.swtchart.org/
 # svn export https://swt-chart.svn.sourceforge.net/svnroot/swt-chart/tags/%%{version}/ %%{name}-%%{version}
@@ -16,83 +16,60 @@ Source0:        %{pkg_name}-%{version}.tar.xz
 
 BuildArch:      noarch
 
-BuildRequires:  tycho >= 0.14.0
-BuildRequires:  maven-local
-BuildRequires:  %{?scl_prefix}eclipse-swt >= 3.4.0
-
-Requires:       jpackage-utils
-Requires:       java >= 1.5
+BuildRequires:  %{?scl_prefix}tycho >= 0.14.0
 Requires:       %{?scl_prefix}eclipse-platform >= 3.4.0
 
 %description
 SWTChart is a light-weight charting component for SWT.
 
-%package        javadoc
-Summary:        Javadoc for %{name}
-Group:          Documentation
-
-Requires:       jpackage-utils
-
-%description    javadoc
-%{summary}.
-
 %prep
-%setup -q -n %{pkg_name}-%{version}
+%setup -q -n swt-chart-%{version}
 # Create the poms
-scl enable %{scl} - <<"EOF"
+%{?scl:scl enable %{scl_maven} %{scl} - <<EOF}
 xmvn -o org.eclipse.tycho:tycho-pomgenerator-plugin:generate-poms -DgroupId=org.swtchart
-EOF
+%{?scl:EOF}
 
 %build
-scl enable %{scl} - <<"EOF"
-xmvn -o install org.apache.maven.plugins:maven-javadoc-plugin:aggregate
-EOF
+%{?scl:scl enable %{scl_maven} %{scl} - <<EOF}
+%mvn_build -j
+%{?scl:EOF}
 
 %install
-install -d -m 755 %{buildroot}%{_javadir}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-
-# Pom
-install -p -m 644 org.swtchart/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{pkg_name}.pom
+%{?scl:scl enable %{scl_maven} %{scl} - <<EOF}
+%mvn_install
+%{?scl:EOF}
 
-# Jar
-install -p -m 644 org.swtchart/target/org.swtchart-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{pkg_name}.jar
-
-scl enable %{scl} - <<"EOF"
-%add_maven_depmap JPP-%{pkg_name}.pom %{pkg_name}.jar
-EOF
-
-# Javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{pkg_name}
-cp -rp target/site/apidocs %{buildroot}%{_javadocdir}/%{pkg_name}
+%files -f .mfiles
+%dir %{_mavenpomdir}/swt-chart
 
+%changelog
+* Thu Jan 15 2015 Mat Booth <mat.booth@redhat.com> - 0.9.0-4.1
+- Related: rhbz#1175105 - Import into DTS 3.1
 
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/%{pkg_name}
+* Thu Jan 15 2015 Mat Booth <mat.booth@redhat.com> - 0.9.0-4
+- Fix failure to build from source
+- Minor spec file clean ups
 
-%files javadoc
-%doc %{_javadocdir}/%{pkg_name}
+* Thu Aug 14 2014 Mat Booth <mat.booth@redhat.com> - 0.9.0-3
+- Fix unowned directory
 
-%changelog
-* Thu May 22 2014 Jeff Johnston <jjohnstn@redhat.com> 0.8.0-11
-- Update to rawhide 0.9.0 release
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-* Fri Oct 25 2013 Roland Grunberg <rgrunber@redhat.com> 0.8.0-10
-- Resolves: bug 1023473.
+* Thu Feb 27 2014 Roland Grunberg <rgrunber@redhat.com> - 0.9.0-1
+- Update to 0.9.0 Release.
 
-* Wed Apr 17 2013 Krzysztof Daniel <kdaniel@redhat.com> 0.8.0-9
-- Add build dependency to JDT.
+* Wed Feb 26 2014 Roland Grunberg <rgrunber@redhat.com> - 0.8.0-9
+- Change R:java to R:java-headless (Bug 1068558).
 
-* Wed Apr 17 2013 Krzysztof Daniel <kdaniel@redhat.com> 0.8.0-8
-- Rebuild to get proper dist macro value.
+* Wed Oct 23 2013 Roland Grunberg <rgrunber@redhat.com> 0.8.0-8
+- Fix Bug 1022166.
 
-* Fri Dec 7 2012 Alexander Kurtakov <akurtako@redhat.com> 0.8.0-7
-- SCL-ize.
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
-* Thu Dec 6 2012 Roland Grunberg <rgrunber@redhat.com> 0.8.0-6
-- Make changes to build in SCL environment.
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
 * Tue Aug 14 2012 Roland Grunberg <rgrunber@redhat.com> 0.8.0-5
 - Remove deprecated tycho.targetPlatform due to p2 support.