From 63f535d4e28be8550bbba12d343a7e59d8a94801 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mar 29 2017 12:25:32 +0000 Subject: Keep Import-Package default value --- diff --git a/netty.spec b/netty.spec index 3d62ed5..6133c2f 100644 --- a/netty.spec +++ b/netty.spec @@ -7,7 +7,7 @@ Name: netty Version: 4.0.42 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An asynchronous event-driven network application framework and tools for Java License: ASL 2.0 URL: https://netty.io/ @@ -116,7 +116,7 @@ sed -i 's|taskdef|taskdef classpathref="maven.plugin.classpath"|' all/pom.xml %pom_xpath_inject "pom:execution[pom:id = 'build-native-lib']/pom:configuration" 'true' transport-native-epoll/pom.xml # Upstream has jctools bundled. -%pom_xpath_set "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-bundle-plugin']/pom:executions/pom:execution[pom:id = 'generate-manifest']/pom:configuration/pom:instructions/pom:Import-Package" 'org.jctools.*,sun.misc;resolution:=optional;*' common/pom.xml +%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-bundle-plugin']/pom:executions/pom:execution[pom:id = 'generate-manifest']/pom:configuration/pom:instructions/pom:Import-Package" common/pom.xml # Tell xmvn to install attached artifact, which it does not # do by default. In this case install all attached artifacts with @@ -137,6 +137,9 @@ export CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %doc LICENSE.txt NOTICE.txt %changelog +* Wed Mar 29 2017 Michael Simacek - 4.0.42-5 +- Keep Import-Package default value + * Thu Mar 16 2017 Michael Simacek - 4.0.42-4 - Remove maven-javadoc-plugin from POM