From 809638fd4f4c76c21638413cee79600460dd8691 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Dec 05 2014 14:23:22 +0000
Subject: Build with xmvn.


---

diff --git a/eclipse-checkstyle.spec b/eclipse-checkstyle.spec
index 73690ff..25eb180 100644
--- a/eclipse-checkstyle.spec
+++ b/eclipse-checkstyle.spec
@@ -4,7 +4,7 @@
 Summary:   Checkstyle plugin for Eclipse
 Name:      eclipse-checkstyle
 Version:   5.6.1
-Release:   3%{?dist}
+Release:   4%{?dist}
 License:   LGPLv2+
 Group:     Development/Tools
 URL:       http://eclipse-cs.sourceforge.net
@@ -37,7 +37,6 @@ BuildRequires: jpackage-utils
 BuildRequires: maven-local
 BuildRequires: tycho
 BuildRequires: xml-maven-plugin
-BuildRequires: feclipse-maven-plugin
 BuildRequires: eclipse-pde
 
 BuildRequires: checkstyle >= 0:%{cs_ver}
@@ -71,6 +70,9 @@ find -name '*.zip' -exec rm -f '{}' \;
 sed -i -e "s|checkstyle-%{cs_ver}-all.jar|checkstyle.jar,antlr.jar,guava.jar,commons-beanutils.jar,commons-collections.jar,commons-logging.jar|g" \
   net.sf.eclipsecs.checkstyle/META-INF/MANIFEST.MF net.sf.eclipsecs.checkstyle/build.properties
 
+sed -i -e "s|Bundle-ActivationPolicy: lazy|Bundle-ActivationPolicy: lazy\nEclipse-BundleShape: dir|g" net.sf.eclipsecs.core/META-INF/MANIFEST.MF
+sed -i -e "s|Bundle-ActivationPolicy: lazy|Bundle-ActivationPolicy: lazy\nEclipse-BundleShape: dir|g" net.sf.eclipsecs.ui/META-INF/MANIFEST.MF
+
 pushd net.sf.eclipsecs.checkstyle
 ln -s $(build-classpath checkstyle) checkstyle.jar
 ln -s $(build-classpath guava)      guava.jar
@@ -91,21 +93,17 @@ ln -s %{_javadir}/jcommon/jcommon.jar                   lib/jcommon-1.0.16.jar
 ln -s %{_javadir}/jfreechart/jfreechart.jar     lib/jfreechart-1.0.14.jar
 ln -s %{_javadir}/jfreechart/jfreechart-swt.jar lib/jfreechart-1.0.14-swt.jar
 popd
+%pom_disable_module ../net.sf.eclipsecs-updatesite net.sf.eclipsecs.parent/pom.xml
 
 %build
-pushd net.sf.eclipsecs.parent
-mvn-rpmbuild clean package -DskipTychoVersionCheck
-popd
+%mvn_build -j -- -f net.sf.eclipsecs.parent/pom.xml
 
 %install
-pushd net.sf.eclipsecs.parent
-mvn-rpmbuild org.fedoraproject:feclipse-maven-plugin:install -DskipTychoVersionCheck \
-  -DsourceRepo=../net.sf.eclipsecs-updatesite/target/site \
-  -DtargetLocation=$RPM_BUILD_ROOT%{install_loc}/eclipse
-popd
+%mvn_install
 
 pushd $RPM_BUILD_ROOT%{install_loc}/eclipse/plugins/net.sf.eclipsecs.checkstyle_*
 rm *.jar
+
 ln -s $(build-classpath checkstyle) checkstyle.jar
 ln -s $(build-classpath guava)      guava.jar
 ln -s $(build-classpath antlr)      antlr.jar
@@ -128,11 +126,13 @@ ln -s %{_javadir}/jfreechart/jfreechart.jar     lib/jfreechart-1.0.14.jar
 ln -s %{_javadir}/jfreechart/jfreechart-swt.jar lib/jfreechart-1.0.14-swt.jar
 popd
 
-%files
+%files -f .mfiles
 %doc net.sf.eclipsecs-feature/license.html
-%{install_loc}
 
 %changelog
+* Fri Dec 5 2014 Alexander Kurtakov <akurtako@redhat.com> 5.6.1-4
+- Build with xmvn.
+
 * Wed Sep 17 2014 Alexander Kurtakov <akurtako@redhat.com> 5.6.1-3
 - Fix build for new jcommon path.