[felix-osgi-compendium] Fix servlet api in pom

[Stanislav Ochotnicky]

commit 099cdb8515313621bdc733cbdb419120a1711981
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Feb 2 14:21:38 2011 +0100

    Fix servlet api in pom

 0001-Fix-servlet-api-dependency.patch |   27 +++++++++++++++++++++++++++
 0002-Fix-compile-target.patch         |   32 ++++++++++++++++++++++++++++++++
 felix-osgi-compendium.spec            |   20 +++++++++++++-------
 3 files changed, 72 insertions(+), 7 deletions(-)
---
diff --git a/0001-Fix-servlet-api-dependency.patch b/0001-Fix-servlet-api-dependency.patch
new file mode 100644
index 0000000..1a45582
--- /dev/null
+++ b/0001-Fix-servlet-api-dependency.patch
@@ -0,0 +1,27 @@
+From 3a7cfc3cf5cadca0e25854ccb85c65f46fd15737 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Wed, 2 Feb 2011 14:17:20 +0100
+Subject: [PATCH 1/2] Fix servlet api dependency
+
+---
+ pom.xml |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index d53eaa9..f45d162 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -38,8 +38,8 @@
+       <version>1.4.0</version>
+     </dependency>
+     <dependency>
+-      <groupId>${pom.groupId}</groupId>
+-      <artifactId>javax.servlet</artifactId>
++      <groupId>javax.servlet</groupId>
++      <artifactId>servlet-api</artifactId>
+       <version>1.0.0</version>
+     </dependency>
+     <dependency>
+-- 
+1.7.3.5
+
diff --git a/0002-Fix-compile-target.patch b/0002-Fix-compile-target.patch
new file mode 100644
index 0000000..363bf68
--- /dev/null
+++ b/0002-Fix-compile-target.patch
@@ -0,0 +1,32 @@
+From 5b80abcb5b2dbead332e1c77fa615d6f93fe2218 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Wed, 2 Feb 2011 14:50:17 +0100
+Subject: [PATCH 2/2] Fix compile target
+
+---
+ pom.xml |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index f45d162..2c1a7a9 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -67,6 +67,15 @@
+           </instructions>
+         </configuration>
+       </plugin>
++      <plugin>
++        <groupId>org.apache.maven.plugins</groupId>
++        <artifactId>maven-compiler-plugin</artifactId>
++        <version>2.3.2</version>
++        <configuration>
++          <source>1.5</source>
++          <target>1.5</target>
++        </configuration>
++      </plugin>
+     </plugins>
+   </build>
+ 
+-- 
+1.7.3.5
+
diff --git a/felix-osgi-compendium.spec b/felix-osgi-compendium.spec
index deeabdd..372b816 100644
--- a/felix-osgi-compendium.spec
+++ b/felix-osgi-compendium.spec
@@ -7,7 +7,7 @@
 
 Name:    felix-osgi-compendium
 Version: 1.4.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Felix OSGi R4 Compendium Bundle
 
 Group:   Development/Libraries
@@ -15,10 +15,9 @@ License: ASL 2.0
 URL:     http://felix.apache.org
 Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
 
-# Weird servlet depmap requirement
-Source1: %{name}.demap
-
-BuildArch: noarch
+Patch0:         0001-Fix-servlet-api-dependency.patch
+Patch1:         0002-Fix-compile-target.patch
+BuildArch:      noarch
 
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: jpackage-utils
@@ -31,7 +30,7 @@ BuildRequires: maven-plugin-bundle
 BuildRequires: maven-surefire-provider-junit4
 BuildRequires: felix-osgi-core
 BuildRequires: felix-osgi-foundation
-BuildRequires: tomcat6-servlet-2.5-api
+BuildRequires: servlet25
 
 Requires: felix-osgi-core
 Requires: felix-osgi-foundation
@@ -55,13 +54,17 @@ API documentation for %{name}.
 %prep
 %setup -q -n %{bundle}-%{version}
 
+# fix servlet api properly
+%patch0 -p1
+# fix compile source/target
+%patch1 -p1
+
 %build
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 %__mkdir_p $MAVEN_REPO_LOCAL
 
 mvn-jpp -e \
   -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-  -Dmaven2.jpp.depmap.file="%{SOURCE1}" \
   install javadoc:javadoc
 
 %install
@@ -100,6 +103,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Feb  2 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.4.0-5
+- Fix servlet api in pom
+
 * Mon Dec 27 2010 Mat Booth <fedora at matbooth.co.uk> 1.4.0-4
 - Fix POM names RHBZ #655800.
 - Versionless jars/docs, update maven plug-in BRs.