From 59501f6630cf40bbc85877f3e16e0d73d5017e0b Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Thu, 3 Jan 2013 17:15:18 +0100 Subject: [PATCH] Changing target from jsr14 to 1.5 (#842593) --- felix-utils-changing-target-from-jsr14-to-1.5.patch | 12 ++++++++++++ felix-utils.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 felix-utils-changing-target-from-jsr14-to-1.5.patch diff --git a/felix-utils-changing-target-from-jsr14-to-1.5.patch b/felix-utils-changing-target-from-jsr14-to-1.5.patch new file mode 100644 index 0000000..741becf --- /dev/null +++ b/felix-utils-changing-target-from-jsr14-to-1.5.patch @@ -0,0 +1,12 @@ +diff -Naur org.apache.felix.utils-1.1.0.orig/pom.xml org.apache.felix.utils-1.1.0/pom.xml +--- org.apache.felix.utils-1.1.0.orig/pom.xml 2010-11-03 22:46:40.000000000 +0100 ++++ org.apache.felix.utils-1.1.0/pom.xml 2013-01-03 17:07:27.368682784 +0100 +@@ -46,7 +46,7 @@ + maven-compiler-plugin + + 1.5 +- jsr14 ++ 1.5 + + + diff --git a/felix-utils.spec b/felix-utils.spec index c428de1..84e3d14 100644 --- a/felix-utils.spec +++ b/felix-utils.spec @@ -3,7 +3,7 @@ Name: felix-utils Version: 1.1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Utility classes for OSGi License: ASL 2.0 Group: Development/Libraries @@ -11,6 +11,8 @@ URL: http://felix.apache.org Source0: http://www.fightrice.com/mirrors/apache/felix/%{site_name}-%{version}-project.tar.gz +Patch0: felix-utils-changing-target-from-jsr14-to-1.5.patch + BuildArch: noarch BuildRequires: java-devel @@ -38,6 +40,8 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{site_name}-%{version} +%patch0 -p1 + %build # one of the tests fails in mock (local build is ok) mvn-rpmbuild install javadoc:aggregate -Dmaven.test.failure.ignore=true @@ -66,6 +70,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Thu Jan 03 2013 Jaromir Capik - 1.1.0-7 +- Changing target from jsr14 to 1.5 (#842593) + * Tue Sep 4 2012 Mikolaj Izdebski - 1.1.0-6 - Install NOTICE with javadoc pakcage