commit 65d01457beef7827f6bb1e2850dc3e2d84d1717c Author: Stanislav Ochotnicky sochotnicky@redhat.com Date: Fri Jun 17 08:52:56 2011 +0200
Add osgi metadata to jar file (#713935)
snakeyaml-add-osgi-metadata.patch | 26 ++++++++++++++++++++++++++ snakeyaml.spec | 7 ++++++- 2 files changed, 32 insertions(+), 1 deletions(-) --- diff --git a/snakeyaml-add-osgi-metadata.patch b/snakeyaml-add-osgi-metadata.patch new file mode 100644 index 0000000..0993191 --- /dev/null +++ b/snakeyaml-add-osgi-metadata.patch @@ -0,0 +1,26 @@ +diff --git a/pom.xml b/pom.xml +index 4bf5a5e..8bc6e54 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -3,7 +3,7 @@ + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.8</version> +- <packaging>jar</packaging> ++ <packaging>bundle</packaging> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> +@@ -226,6 +226,12 @@ + </execution> + </executions> + </plugin> ++ <plugin> ++ <groupId>org.apache.felix</groupId> ++ <artifactId>maven-bundle-plugin</artifactId> ++ <version>2.3.4</version> ++ <extensions>true</extensions> ++ </plugin> + </plugins> + </build> + <reporting> diff --git a/snakeyaml.spec b/snakeyaml.spec index bc51b3c..324068b 100644 --- a/snakeyaml.spec +++ b/snakeyaml.spec @@ -3,7 +3,7 @@
Name: snakeyaml Version: 1.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML parser and emitter for the Java programming language License: ASL 2.0 Group: Development/Libraries @@ -17,6 +17,7 @@ Patch0: %{name}-spring-removal-workaround.patch Patch1: %{name}-test-fails-workaround.patch Patch2: %{name}-gdata+base64coder+cobertura-addition.patch Patch3: %{name}-issue121-file-handle-leaks.patch +Patch4: %{name}-add-osgi-metadata.patch
BuildArch: noarch
@@ -63,6 +64,7 @@ This package contains the API documentation for %{name}. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1
# remove bundled stuff rm -rf target @@ -108,6 +110,9 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name}
%changelog +* Fri Jun 17 2011 Stanislav Ochotnicky sochotnicky@redhat.com - 1.8-5 +- Add osgi metadata to jar file (#713935) + * Thu Jun 09 2011 Jaromir Capik jcapik@redhat.com - 1.8-4 - File handle leaks patched