Fridrich Strba 2019-11-05 13:22:49 +00:00 committed by Git OBS Bridge
parent 649938d6b3
commit c769d80a50
5 changed files with 4 additions and 18 deletions

View File

@ -54,8 +54,7 @@ This package contains annotations module for Jetty
%package javadoc
Summary: Javadoc for %{name}
# some MIT-licensed code (from Utf8Appendable) is used to generate javadoc
License: (Apache-2.0 OR EPL-1.0) AND MIT
License: Apache-2.0 OR EPL-1.0
%description javadoc
%{summary}.
@ -166,8 +165,6 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
%pom_remove_dep -r :jetty-alpn-conscrypt-client
rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
cp %{SOURCE6} .
# the default location is not allowed by SELinux
sed -i '/<SystemProperty name="jetty.state"/d' \
jetty-home/src/main/resources%{_sysconfdir}/jetty-started.xml

View File

@ -51,8 +51,7 @@ This package contains jndi module for Jetty
%package javadoc
Summary: Javadoc for %{name}
# some MIT-licensed code (from Utf8Appendable) is used to generate javadoc
License: (Apache-2.0 OR EPL-1.0) AND MIT
License: Apache-2.0 OR EPL-1.0
%description javadoc
%{summary}.
@ -161,8 +160,6 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
%pom_remove_dep -r :jetty-alpn-conscrypt-client
rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
cp %{SOURCE6} .
# the default location is not allowed by SELinux
sed -i '/<SystemProperty name="jetty.state"/d' \
jetty-home/src/main/resources%{_sysconfdir}/jetty-started.xml

View File

@ -163,8 +163,6 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
%pom_remove_dep -r :jetty-alpn-conscrypt-client
rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
cp %{SOURCE6} .
# the default location is not allowed by SELinux
sed -i '/<SystemProperty name="jetty.state"/d' \
jetty-home/src/main/resources%{_sysconfdir}/jetty-started.xml

View File

@ -125,8 +125,7 @@ License: Apache-2.0 OR EPL-1.0
%package -n %{base_name}-util
Summary: util module for Jetty
# Utf8Appendable.java is additionally under MIT license
License: (Apache-2.0 OR EPL-1.0) AND MIT
License: Apache-2.0 OR EPL-1.0
%description -n %{base_name}-util
%{extdesc} %{summary}.
@ -161,8 +160,7 @@ License: Apache-2.0 OR EPL-1.0
%package javadoc
Summary: Javadoc for %{name}
# some MIT-licensed code (from Utf8Appendable) is used to generate javadoc
License: (Apache-2.0 OR EPL-1.0) AND MIT
License: Apache-2.0 OR EPL-1.0
%description javadoc
%{summary}.
@ -271,8 +269,6 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
%pom_remove_dep -r :jetty-alpn-conscrypt-client
rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
cp %{SOURCE6} .
# the default location is not allowed by SELinux
sed -i '/<SystemProperty name="jetty.state"/d' \
jetty-home/src/main/resources/etc/jetty-started.xml

View File

@ -160,8 +160,6 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
%pom_remove_dep -r :jetty-alpn-conscrypt-client
rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
cp %{SOURCE6} .
# the default location is not allowed by SELinux
sed -i '/<SystemProperty name="jetty.state"/d' \
jetty-home/src/main/resources%{_sysconfdir}/jetty-started.xml