[felix-utils] Changing target from jsr14 to 1.5 (#842593)
by Jaromír Cápík
commit 59501f6630cf40bbc85877f3e16e0d73d5017e0b
Author: Jaromir Capik <jcapik(a)redhat.com>
Date: Thu Jan 3 17:15:18 2013 +0100
Changing target from jsr14 to 1.5 (#842593)
...x-utils-changing-target-from-jsr14-to-1.5.patch | 12 ++++++++++++
felix-utils.spec | 9 ++++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
---
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 @@
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+- <target>jsr14</target>
++ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
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}-pro...
+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 <jcapik(a)redhat.com> - 1.1.0-7
+- Changing target from jsr14 to 1.5 (#842593)
+
* Tue Sep 4 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.1.0-6
- Install NOTICE with javadoc pakcage
11 years, 2 months
[xz-java] Add patch for OSGi Manifest.
by Alexander Kurtakov
commit cd63efa72e4150b6303f995e829b31465bfcd6e9
Author: Krzysztof Daniel <kdaniel(a)redhat.com>
Date: Thu Jan 3 14:32:00 2013 +0100
Add patch for OSGi Manifest.
xz-java-osgi.patch | 12 ++++++++++++
xz-java.spec | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/xz-java-osgi.patch b/xz-java-osgi.patch
new file mode 100644
index 0000000..f396f74
--- /dev/null
+++ b/xz-java-osgi.patch
@@ -0,0 +1,12 @@
+--- build.xml.bak 2012-07-05 08:21:30.000000000 +0200
++++ build.xml 2013-01-03 14:23:51.411506995 +0100
+@@ -64,6 +64,9 @@
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-URL" value="${homepage}"/>
+ <attribute name="Sealed" value="true"/>
++ <attribute name="Bundle-SymbolicName" value="org.tukaani.xz"/>
++ <attribute name="Bundle-Version" value="1.1"/>
++ <attribute name="Export-Package" value="org.tukaani.xz"/>
+ </manifest>
+ </jar>
+
diff --git a/xz-java.spec b/xz-java.spec
index 55f0d58..2093668 100644
--- a/xz-java.spec
+++ b/xz-java.spec
@@ -1,6 +1,6 @@
Name: xz-java
Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java implementation of XZ data compression
Group: Development/Libraries
BuildArch: noarch
@@ -8,6 +8,7 @@ BuildArch: noarch
License: Public Domain
URL: http://tukaani.org/xz/java.html
Source0: http://tukaani.org/xz/xz-java-%{version}.zip
+Patch0: xz-java-osgi.patch
BuildRequires: jpackage-utils
BuildRequires: java-devel
@@ -33,6 +34,7 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -c %{name}-%{version}
+%patch0
%build
# During documentation generation the upstream build.xml tries to download
@@ -66,6 +68,9 @@ install -pm 644 build/maven/xz-%{version}.pom %{buildroot}/%{_mavenpomdir}/JPP-%
%{_javadocdir}/%{name}
%changelog
+* Thu Jan 3 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 1.1-2
+- Add patch for OSGi Manifest.
+
* Fri Aug 17 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.1-1
- Update to upstream version 1.1
11 years, 2 months