From d84e238f22694dc7b0ae36c73452c8cfdd0eb616 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Wed, 30 Mar 2011 10:12:44 +0300
Subject: [PATCH] Fix faulty compiler plugin settings setting source but not
 target.

---
 felix-parent-1.2.1-pom.patch | 18 ++++++++++++++++--
 felix-parent.spec            | 33 +++++++++++++--------------------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/felix-parent-1.2.1-pom.patch b/felix-parent-1.2.1-pom.patch
index 4385fba..d75f601 100644
--- a/felix-parent-1.2.1-pom.patch
+++ b/felix-parent-1.2.1-pom.patch
@@ -1,5 +1,5 @@
---- pom.xml.orig	2009-09-22 15:16:43.000000000 +0800
-+++ pom.xml	2010-07-19 11:39:09.000000000 +0800
+--- pom.xml.sav	2009-09-22 10:16:43.000000000 +0300
++++ pom.xml	2011-03-30 10:09:03.907508489 +0300
 @@ -202,12 +202,6 @@
        <version>2.4</version>
        <scope>test</scope>
@@ -13,3 +13,17 @@
    </dependencies>
    <build>
      <pluginManagement>
+@@ -302,13 +296,6 @@
+     <plugins>
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-compiler-plugin</artifactId>
+-        <configuration>
+-          <target>1.3</target>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-resources-plugin</artifactId>
+         <configuration>
+           <encoding>UTF-8</encoding>
diff --git a/felix-parent.spec b/felix-parent.spec
index 420ac70..c9727cf 100644
--- a/felix-parent.spec
+++ b/felix-parent.spec
@@ -1,6 +1,6 @@
 Name:           felix-parent
 Version:        1.2.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Parent POM file for Apache Felix Specs
 
 Group:          Development/Libraries
@@ -12,12 +12,12 @@ Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-depmap.xml
 #Remove mockito-all dependency which is not in koji
 Patch0:        %{name}-%{version}-pom.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
 BuildRequires: jpackage-utils
 BuildRequires: junit
+BuildRequires: maven
 BuildRequires: easymock2
 BuildRequires: maven-plugin-plugin
 BuildRequires: maven-compiler-plugin
@@ -32,13 +32,14 @@ BuildRequires: maven-gpg-plugin
 BuildRequires: maven-site-plugin
 BuildRequires: maven-project-info-reports-plugin
 BuildRequires: maven-release-plugin
-BuildRequires: maven-surefire-maven-plugin
-BuildRequires: maven-surefire-report-maven-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-report-plugin
 BuildRequires: maven-plugin-build-helper
 BuildRequires: maven-plugin-jxr
 
 Requires: junit
 Requires: easymock2
+Requires: maven
 Requires: maven-plugin-plugin
 Requires: maven-compiler-plugin
 Requires: maven-install-plugin
@@ -52,8 +53,8 @@ Requires: maven-gpg-plugin
 Requires: maven-site-plugin
 Requires: maven-project-info-reports-plugin
 Requires: maven-release-plugin
-Requires: maven-surefire-maven-plugin
-Requires: maven-surefire-report-maven-plugin
+Requires: maven-surefire-plugin
+Requires: maven-surefire-report-plugin
 Requires: maven-plugin-build-helper
 Requires: maven-plugin-jxr
 
@@ -66,23 +67,15 @@ Requires(postun):     jpackage-utils
 Parent POM file for Apache Felix Specs.
 
 %prep
-%setup -q #You may need to update this according to your Source0
-%patch0 -p0
+%setup -q 
+%patch0 -p0 -b .sav
 
 %build
-#mvn-jpp call is not really needed for the pom file. 
-#But it's good to have it there to see changes in dependencies when new version is released
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
         -Dmaven2.jpp.depmap.file=%{SOURCE1} \
         install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # depmap
 %add_to_maven_depmap org.apache.felix %{name} %{version} JPP/felix %{name}
 
@@ -100,9 +93,6 @@ install -pD -T -m 644 pom.xml \
 %postun
 %update_maven_depmap
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc LICENSE NOTICE
@@ -111,6 +101,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Mar 30 2011 Alexander Kurtakov <akurtako@redhat.com> 1.2.1-6
+- Fix faulty compiler plugin settings setting source but not target.
+
 * Sun Mar 13 2011 Mat Booth <fedora@matbooth.co.uk> 1.2.1-5
 - Add dep on maven-plugin-jxr.