commit c3f728d965e4c12c9a93d2e0d1b1b521f9999879 Author: gil puntogil@libero.it Date: Wed Feb 4 23:00:50 2015 +0100
introduce license macro
grizzly.spec | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) --- diff --git a/grizzly.spec b/grizzly.spec index e2bc148..5c059db 100644 --- a/grizzly.spec +++ b/grizzly.spec @@ -2,7 +2,7 @@ %global namedversion %{version}%{?namedreltag} Name: grizzly Version: 2.3.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java NIO Server Framework # see Grizzly_THIRDPARTYLICENSEREADME.txt License: (CDDL or GPLv2 with exceptions) and BSD and ASL 2.0 and Public Domain @@ -78,6 +78,12 @@ find . -name '*.jar' -delete find . -name '*.class' -delete
%patch0 -p0 +sed -i "s|artifactId>jaxws-rt|artifactId>rt|" \ + extras/http-server-jaxws/pom.xml \ + samples/http-jaxws-samples/pom.xml +#com.sun.xml.ws.transport.http.HttpAdapterList#createPortAddressResolver(final String baseAddress, final Class<?> endpointImpl) +sed -i "s|createPortAddressResolver(getBaseAddress()|createPortAddressResolver(getBaseAddress(), null|" \ + extras/http-server-jaxws/src/main/java/org/glassfish/grizzly/jaxws/JaxwsConnection.javav
# unavailable deps # org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin @@ -189,17 +195,20 @@ modules/monitoring/http-server %files -f .mfiles %dir %{_javadir}/%{name} %{_javadir}/%{name}/%{name}.jar -%doc LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt +%license LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
# config
%files samples -f .mfiles-samples -%doc LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt +%license LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
%files javadoc -f .mfiles-javadoc -%doc LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt +%license LICENSE.txt Grizzly_THIRDPARTYLICENSEREADME.txt
%changelog +* Tue Feb 03 2015 gil cattaneo puntogil@libero.it 2.3.6-3 +- introduce license macro + * Sat Jun 07 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 2.3.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild