[RPM (6.0)] [DIST generic] ops4j-pax-url-1.3.3-1.jpp6
Ralph Apel <[email protected]>
| Newsgroups | gmane.linux.jpackage.announce |
|---|---|
| Message-ID | <[email protected]> |
Name : ops4j-pax-url Relocations: (not relocatable) Version : 1.3.3 Vendor: JPackage Project Release : 1.jpp6 Build Date: Sun 19 Aug 2012 07:56:36 PM CEST Install Date: (not installed) Build Host: linux.fritz.box Group : Development/Libraries Source RPM: (none) Size : 793920 License: Apache 2.0 License Signature : (none) Packager : Ralph Apel <[email protected]> URL : http://paxurl.ops4j.org/ Summary : Pax URL handlers Description : OPS4J Pax URL is a set of URL handlers mainly targeting OSGi URL Handler Service but which can be used in a standard Java environment. --------------- Ralph Apel <r.apel at r-apel.de> 0:1.3.3-1 - 1.3.3 - Add pax-url-aether - maven2 required --------------- ops4j-pax-url.src: W: source-or-patch-not-bzipped ops4j-pax-url-wrap-osgi-bnd.patch ops4j-pax-url.src: W: source-or-patch-not-bzipped ops4j-pax-url-aether-osgi.patch ops4j-pax-url.src: W: source-or-patch-not-bzipped ops4j-pax-url-dir-osgi-bnd.patch ops4j-pax-url.src: W: source-or-patch-not-bzipped ops4j-pax-url-war-osgi-bnd.patch ops4j-pax-url.src: W: source-or-patch-not-bzipped ops4j-pax-url-pom.patch ops4j-pax-url.src: W: no-signature ops4j-pax-url.src: W: invalid-license Apache 2.0 License 1 packages and 0 specfiles checked; 0 errors, 7 warnings. --------------- Index: ops4j-pax-url-dir-osgi-bnd.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/ops4j-pax-url/ops4j-pax-url-dir-osgi-bnd.patch,v retrieving revision 1.1 diff -u -r1.1 ops4j-pax-url-dir-osgi-bnd.patch --- ops4j-pax-url-dir-osgi-bnd.patch 6 Feb 2012 20:13:10 -0000 1.1 +++ ops4j-pax-url-dir-osgi-bnd.patch 19 Aug 2012 18:05:49 -0000 @@ -1,21 +1,16 @@ ---- pax-url-dir/osgi.bnd.sav1 2010-01-06 18:04:19.000000000 +0100 -+++ pax-url-dir/osgi.bnd 2012-02-06 12:22:59.000000000 +0100 -@@ -14,8 +14,17 @@ - org.osgi.service.cm; version="[1.0.0,2.0.0)"; resolution:=optional,\ - org.osgi.service.url; version="[1.0.0,2.0.0)",\ +--- pax-url-dir/osgi.bnd.sav 2012-02-16 00:12:41.402813865 +0100 ++++ pax-url-dir/osgi.bnd 2012-02-16 00:13:34.558810444 +0100 +@@ -22,8 +22,12 @@ + org.w3c.dom; resolution:=optional,\ + org.xml.sax; resolution:=optional,\ javax.xml.transform,\ - javax.xml.transform.stream - + javax.xml.transform.stream,\ -+ aQute.service.scripting,\ -+ javax.xml.parsers,\ -+ org.osgi.service.log,\ -+ org.w3c.dom,\ -+ org.xml.sax,\ -+ org.xml.sax.helpers,\ + javax.naming,\ + javax.xml.namespace,\ -+ javax.xml.xpath ++ javax.xml.xpath,\ ++ org.xml.sax.helpers + Export-Package:\ ${bundle.namespace}; version="${pom.version}" Index: ops4j-pax-url-jpp-depmap.xml =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/ops4j-pax-url/ops4j-pax-url-jpp-depmap.xml,v retrieving revision 1.1 diff -u -r1.1 ops4j-pax-url-jpp-depmap.xml --- ops4j-pax-url-jpp-depmap.xml 6 Feb 2012 20:13:10 -0000 1.1 +++ ops4j-pax-url-jpp-depmap.xml 19 Aug 2012 18:05:49 -0000 @@ -1,15 +1,15 @@ <dependencies> - <dependency> - <maven> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5-20081211</version> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>servlet_2_5_api</artifactId> - <version>2.5</version> - </jpp> - </dependency> + <dependency> + <maven> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.bundlerepository</artifactId> + <version>1.6.4</version> + </maven> + <jpp> + <groupId>JPP/apache-felix</groupId> + <artifactId>org.apache.felix.bundlerepository</artifactId> + <version>1.6.4</version> + </jpp> + </dependency> </dependencies> Index: ops4j-pax-url-pom.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/ops4j-pax-url/ops4j-pax-url-pom.patch,v retrieving revision 1.1 diff -u -r1.1 ops4j-pax-url-pom.patch --- ops4j-pax-url-pom.patch 6 Feb 2012 20:13:10 -0000 1.1 +++ ops4j-pax-url-pom.patch 19 Aug 2012 18:05:49 -0000 @@ -1,6 +1,6 @@ ---- pom.xml.sav 2011-02-21 23:52:47.000000000 +0100 -+++ pom.xml 2011-02-21 23:53:13.000000000 +0100 -@@ -38,6 +38,7 @@ +--- pom.xml.sav 2012-02-16 00:01:03.432821265 +0100 ++++ pom.xml 2012-02-16 00:01:29.082812894 +0100 +@@ -40,6 +40,7 @@ <build> <plugins> @@ -8,7 +8,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>retrotranslator-maven-plugin</artifactId> -@@ -54,6 +55,7 @@ +@@ -56,6 +57,7 @@ </execution> </executions> </plugin> @@ -16,10 +16,3 @@ </plugins> <pluginManagement> <plugins> -@@ -232,4 +234,4 @@ - </profile> - </profiles> - --</project> -\ No newline at end of file -+</project> Index: ops4j-pax-url-war-osgi-bnd.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/ops4j-pax-url/ops4j-pax-url-war-osgi-bnd.patch,v retrieving revision 1.1 diff -u -r1.1 ops4j-pax-url-war-osgi-bnd.patch --- ops4j-pax-url-war-osgi-bnd.patch 6 Feb 2012 20:13:10 -0000 1.1 +++ ops4j-pax-url-war-osgi-bnd.patch 19 Aug 2012 18:05:49 -0000 @@ -1,20 +1,15 @@ ---- pax-url-war/osgi.bnd.sav2 2010-01-06 18:04:19.000000000 +0100 -+++ pax-url-war/osgi.bnd 2012-02-06 12:32:10.000000000 +0100 -@@ -16,7 +16,16 @@ +--- pax-url-war/osgi.bnd.sav 2012-02-16 00:16:00.241813171 +0100 ++++ pax-url-war/osgi.bnd 2012-02-16 00:16:35.888810416 +0100 +@@ -27,7 +27,11 @@ org.apache.commons.logging; version="1.0.4"; resolution:=optional,\ org.osgi.framework; version="[1.0.0,2.0.0)",\ org.osgi.service.cm; version="[1.0.0,2.0.0)"; resolution:=optional,\ - org.osgi.service.url; version="[1.0.0,2.0.0)" + org.osgi.service.url; version="[1.0.0,2.0.0)",\ -+ aQute.service.scripting,\ -+ javax.xml.parsers,\ -+ org.osgi.service.log,\ -+ org.w3c.dom,\ -+ org.xml.sax,\ -+ org.xml.sax.helpers,\ + javax.naming,\ + javax.xml.namespace,\ -+ javax.xml.xpath ++ javax.xml.xpath,\ ++ org.xml.sax.helpers Export-Package:\ ${bundle.namespace}; version="${pom.version}",\ Index: ops4j-pax-url-wrap-osgi-bnd.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/ops4j-pax-url/ops4j-pax-url-wrap-osgi-bnd.patch,v retrieving revision 1.1 diff -u -r1.1 ops4j-pax-url-wrap-osgi-bnd.patch --- ops4j-pax-url-wrap-osgi-bnd.patch 6 Feb 2012 20:13:10 -0000 1.1 +++ ops4j-pax-url-wrap-osgi-bnd.patch 19 Aug 2012 18:05:49 -0000 @@ -1,20 +1,15 @@ ---- pax-url-wrap/osgi.bnd.sav3 2010-01-06 18:04:19.000000000 +0100 -+++ pax-url-wrap/osgi.bnd 2012-02-06 12:56:36.000000000 +0100 -@@ -15,7 +15,16 @@ +--- pax-url-wrap/osgi.bnd.sav 2012-02-16 00:18:27.443870338 +0100 ++++ pax-url-wrap/osgi.bnd 2012-02-16 00:19:16.203809662 +0100 +@@ -23,7 +23,11 @@ org.apache.commons.logging; version="1.0.4"; resolution:=optional,\ org.osgi.framework; version="[1.0.0,2.0.0)",\ org.osgi.service.cm; version="[1.0.0,2.0.0)"; resolution:=optional,\ - org.osgi.service.url; version="[1.0.0,2.0.0)" + org.osgi.service.url; version="[1.0.0,2.0.0)",\ -+ aQute.service.scripting,\ -+ javax.xml.parsers,\ -+ org.osgi.service.log,\ -+ org.w3c.dom,\ -+ org.xml.sax,\ -+ org.xml.sax.helpers,\ + javax.naming,\ + javax.xml.namespace,\ -+ javax.xml.xpath ++ javax.xml.xpath,\ ++ org.xml.sax.helpers Export-Package:\ ${bundle.namespace}; version="${pom.version}" Index: ops4j-pax-url.spec =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/ops4j-pax-url/ops4j-pax-url.spec,v retrieving revision 1.1 diff -u -r1.1 ops4j-pax-url.spec --- ops4j-pax-url.spec 6 Feb 2012 20:13:10 -0000 1.1 +++ ops4j-pax-url.spec 19 Aug 2012 18:05:49 -0000 @@ -29,18 +29,26 @@ # %define section free +%define _binary_payload w9.gzdio +%define _source_payload w9.gzdio +%define _binary_filedigest_algorithm 1 +%define _source_filedigest_algorithm 1 Name: ops4j-pax-url Summary: Pax URL handlers Url: http://paxurl.ops4j.org/ -Version: 1.1.3 -Release: 2%{?dist} +Version: 1.3.3 +Release: 1%{?dist} Epoch: 0 License: Apache 2.0 License Group: Development/Libraries -Source0: ops4j-pax-url-1.1.3.tgz -# svn export http://scm.ops4j.org/repos/ops4j/qa/pax/url-1.1.3/ ops4j-pax-url-1.1.3 -# tar czf ops4j-pax-url-1.1.3.tgz ops4j-pax-url-1.1.3/ +Source0: ops4j-pax-url-1.3.3.tar.gz +# +# git clone git://github.com/ops4j/org.ops4j.pax.url.git +# cd org.ops4j.pax.url/ +# git tag -l +# git archive url-1.3.3 > ../SOURCES/ops4j-pax-url-1.3.3.tar +# gzip ../SOURCES/ops4j-pax-url-1.3.3.tar Source1: %{name}-settings.xml Source2: %{name}-jpp-depmap.xml @@ -49,10 +57,12 @@ Patch1: ops4j-pax-url-dir-osgi-bnd.patch Patch2: ops4j-pax-url-war-osgi-bnd.patch Patch3: ops4j-pax-url-wrap-osgi-bnd.patch +Patch4: ops4j-pax-url-aether-osgi.patch BuildRequires: jpackage-utils >= 0:1.7.5 BuildRequires: java-devel >= 0:1.6.0 BuildRequires: ant >= 0:1.7.1 +BuildRequires: maven3 BuildRequires: maven2 >= 0:2.0.8 BuildRequires: maven2-plugin-compiler BuildRequires: maven2-plugin-idea @@ -69,6 +79,7 @@ BuildRequires: apache-felix-maven-bundle-plugin BuildRequires: apache-jar-resource-bundle BuildRequires: easymock2 +BuildRequires: jetty7 BuildRequires: junit44 BuildRequires: ops4j-pax-master @@ -105,7 +116,7 @@ %{summary}. %prep -%setup -q +%setup -q -c chmod -R go=u-w * for f in $(find . -name "*.jar"); do mv $f $f.no @@ -115,6 +126,7 @@ %patch1 -b .sav1 %patch2 -b .sav2 %patch3 -b .sav3 +%patch4 -b .sav4 %build sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml @@ -152,6 +164,10 @@ %add_to_maven_depmap org.ops4j.pax url %{version} JPP/%{name} url install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-url.pom +%add_to_maven_depmap org.ops4j.pax.url pax-url-aether %{version} JPP/%{name} url-aether +install -m 644 pax-url-aether/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-url-aether.pom +install -m 644 pax-url-aether/target/pax-url-aether-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/url-aether-%{version}.jar + %add_to_maven_depmap org.ops4j.pax.url pax-url-assembly %{version} JPP/%{name} url-assembly install -m 644 pax-url-assembly/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-url-assembly.pom install -m 644 pax-url-assembly/target/pax-url-assembly-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/url-assembly-%{version}.jar @@ -238,7 +254,13 @@ %doc %{_javadocdir}/* %changelog +* Sun Aug 19 2012 Ralph Apel <r.apel at r-apel.de> 0:1.3.3-1 +- 1.3.3 +- Add pax-url-aether +- maven2 required + * Mon Feb 06 2012 Ralph Apel <r.apel at r-apel.de> 0:1.1.3-2 - Promote to free + * Tue Jun 21 2011 Ralph Apel <r.apel at r-apel.de> 0:1.1.3-1 - First standalone release