Ana Guerrero 2024-10-17 16:40:46 +00:00 committed by Git OBS Bridge
commit ac1e28e11c
6 changed files with 12 additions and 7 deletions

View File

@ -139,7 +139,7 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
%pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml %pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml
# TODO remove when jetty-setuid is packaged # TODO remove when jetty-setuid is packaged
%pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-home/pom.xml %pom_xpath_remove "pom:execution[pom:id='copy-setuid-deps']" jetty-home/pom.xml
# We don't have gcloud-java-datastore # We don't have gcloud-java-datastore
%pom_disable_module jetty-gcloud %pom_disable_module jetty-gcloud

View File

@ -162,7 +162,7 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
%pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml %pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml
# TODO remove when jetty-setuid is packaged # TODO remove when jetty-setuid is packaged
%pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-home/pom.xml %pom_xpath_remove "pom:execution[pom:id='copy-setuid-deps']" jetty-home/pom.xml
# We don't have gcloud-java-datastore # We don't have gcloud-java-datastore
%pom_disable_module jetty-gcloud %pom_disable_module jetty-gcloud

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Oct 17 09:47:04 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
- Fix the Group tag for jetty-server subpackage
- Clean up spec files
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 15 21:27:27 UTC 2024 - Fridrich Strba <fstrba@suse.com> Tue Oct 15 21:27:27 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -209,8 +209,7 @@ Group: Productivity/Networking/Web/Servers
%package -n %{base_name}-server %package -n %{base_name}-server
Summary: The server module for Jetty Summary: The server module for Jetty
# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: Productivity/Networking/Web/Servers
Group: Productivity/Neorg.apache.maven.plugins:maven-dependency-plugintworking/Web/Servers
%description -n %{base_name}-server %description -n %{base_name}-server
%{extdesc} %{summary}. %{extdesc} %{summary}.
@ -333,7 +332,7 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
%pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml %pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml
# TODO remove when jetty-setuid is packaged # TODO remove when jetty-setuid is packaged
%pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-home/pom.xml %pom_xpath_remove "pom:execution[pom:id='copy-setuid-deps']" jetty-home/pom.xml
# We don't have gcloud-java-datastore # We don't have gcloud-java-datastore
%pom_disable_module jetty-gcloud %pom_disable_module jetty-gcloud

View File

@ -121,7 +121,7 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
%pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml %pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml
# TODO remove when jetty-setuid is packaged # TODO remove when jetty-setuid is packaged
%pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-home/pom.xml %pom_xpath_remove "pom:execution[pom:id='copy-setuid-deps']" jetty-home/pom.xml
# We don't have gcloud-java-datastore # We don't have gcloud-java-datastore
%pom_disable_module jetty-gcloud %pom_disable_module jetty-gcloud

View File

@ -174,7 +174,7 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
%pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml %pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]' jetty-home/pom.xml
# TODO remove when jetty-setuid is packaged # TODO remove when jetty-setuid is packaged
%pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-home/pom.xml %pom_xpath_remove "pom:execution[pom:id='copy-setuid-deps']" jetty-home/pom.xml
# We don't have gcloud-java-datastore # We don't have gcloud-java-datastore
%pom_disable_module jetty-gcloud %pom_disable_module jetty-gcloud