Remove maven artifacts from build as they aren't very useful
This commit is contained in:
Coty Sutherland
parent
8db0343ee9
commit
972b590988
103
tomcat.spec
103
tomcat.spec
@ -53,9 +53,6 @@
|
||||
%global workdir %{cachedir}/work
|
||||
%global _systemddir /lib/systemd/system
|
||||
|
||||
# Fedora doesn't seem to have this macro, so we define it if it doesn't exist
|
||||
%{!?_mavendepmapfragdir: %global _mavendepmapfragdir /usr/share/maven-metadata}
|
||||
|
||||
Name: tomcat
|
||||
Epoch: 1
|
||||
Version: %{major_version}.%{minor_version}.%{micro_version}
|
||||
@ -207,6 +204,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
|
||||
%patch3 -p0
|
||||
%patch4 -p0
|
||||
|
||||
|
||||
%build
|
||||
export OPT_JAR_LIST="xalan-j2-serializer"
|
||||
# we don't care about the tarballs and we're going to replace
|
||||
@ -236,7 +234,7 @@ export OPT_JAR_LIST="xalan-j2-serializer"
|
||||
-Dosgi-cmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \
|
||||
-Dversion="%{version}" \
|
||||
-Dversion.build="%{micro_version}" \
|
||||
deploy dist-source
|
||||
deploy
|
||||
|
||||
# remove some jars that we'll replace with symlinks later
|
||||
%{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar
|
||||
@ -337,9 +335,6 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
|
||||
%{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar .
|
||||
%{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar .
|
||||
%{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar
|
||||
|
||||
# Temporary copy the juli jar here from /usr/share/java/tomcat (for maven depmap)
|
||||
%{__cp} -a ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar ./
|
||||
popd
|
||||
|
||||
# symlink to the FHS locations where we've installed things
|
||||
@ -352,75 +347,6 @@ pushd ${RPM_BUILD_ROOT}%{homedir}
|
||||
%{__ln_s} %{workdir} work
|
||||
popd
|
||||
|
||||
# Install the maven metadata
|
||||
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir}
|
||||
pushd output/dist/src/res/maven
|
||||
for pom in *.pom; do
|
||||
# fix-up version in all pom files
|
||||
sed -i 's/@MAVEN.DEPLOY.VERSION@/%{version}/g' $pom
|
||||
done
|
||||
|
||||
# we won't install dbcp, juli-adapters and juli-extras pom files
|
||||
for libname in annotations-api catalina jasper-el jasper catalina-ha; do
|
||||
%{__cp} -a %{name}-$libname.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$libname.pom
|
||||
%add_maven_depmap JPP.%{name}-$libname.pom %{name}/$libname.jar -f "tomcat-lib"
|
||||
done
|
||||
|
||||
# tomcat-util-scan
|
||||
%{__cp} -a %{name}-util-scan.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-util-scan.pom
|
||||
%add_maven_depmap JPP.%{name}-util-scan.pom %{name}/%{name}-util-scan.jar -f "tomcat-lib"
|
||||
|
||||
# tomcat-jni
|
||||
%{__cp} -a %{name}-jni.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-jni.pom
|
||||
%add_maven_depmap JPP.%{name}-jni.pom %{name}/%{name}-jni.jar -f "tomcat-lib"
|
||||
|
||||
# servlet-api jsp-api and el-api are not in tomcat subdir, since they are widely re-used elsewhere
|
||||
%{__cp} -a tomcat-jsp-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom
|
||||
%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "org.eclipse.jetty.orbit:javax.servlet.jsp"
|
||||
|
||||
%{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom
|
||||
%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "org.eclipse.jetty.orbit:javax.el"
|
||||
|
||||
%{__cp} -a tomcat-servlet-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-servlet-api.pom
|
||||
# Generate a depmap fragment javax.servlet:servlet-api pointing to
|
||||
# tomcat-servlet-3.0-api for backwards compatibility
|
||||
# also provide jetty depmap (originally in jetty package, but it's cleaner to have it here
|
||||
%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f "tomcat-servlet-api"
|
||||
|
||||
# replace temporary copy with link
|
||||
%{__ln_s} -f $(abs2rel %{bindir}/tomcat-juli.jar %{libdir}) ${RPM_BUILD_ROOT}%{libdir}/
|
||||
|
||||
# two special pom where jar files have different names
|
||||
%{__cp} -a tomcat-tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
|
||||
%add_maven_depmap JPP.%{name}-catalina-tribes.pom %{name}/catalina-tribes.jar
|
||||
|
||||
%{__cp} -a tomcat-coyote.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-coyote.pom %{name}/tomcat-coyote.jar
|
||||
|
||||
%{__cp} -a tomcat-juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-juli.pom %{name}/tomcat-juli.jar
|
||||
|
||||
%{__cp} -a tomcat-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-api.pom %{name}/tomcat-api.jar
|
||||
|
||||
%{__cp} -a tomcat-util.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-util.pom %{name}/tomcat-util.jar
|
||||
|
||||
%{__cp} -a tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-jdbc.pom %{name}/tomcat-jdbc.jar
|
||||
|
||||
# tomcat-websocket-api
|
||||
%{__cp} -a tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-websocket-api.pom
|
||||
%add_maven_depmap JPP.%{name}-websocket-api.pom %{name}/websocket-api.jar
|
||||
|
||||
# tomcat-tomcat-websocket
|
||||
%{__cp} -a tomcat-websocket.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-websocket.pom %{name}/tomcat-websocket.jar
|
||||
|
||||
# tomcat-jaspic-api
|
||||
%{__cp} -a tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-jaspic-api.pom
|
||||
%add_maven_depmap JPP.%{name}-jaspic-api.pom %{name}/jaspic-api.jar
|
||||
|
||||
|
||||
%pre
|
||||
# add the tomcat user and group
|
||||
@ -534,39 +460,24 @@ fi
|
||||
%files docs-webapp
|
||||
%{appdir}/docs
|
||||
|
||||
%files jsp-%{jspspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-jsp-api
|
||||
%files jsp-%{jspspec}-api
|
||||
%{_javadir}/%{name}-jsp-%{jspspec}*.jar
|
||||
|
||||
%files lib -f output/dist/src/res/maven/.mfiles-tomcat-lib
|
||||
%files lib
|
||||
%dir %{libdir}
|
||||
%{libdir}/*.jar
|
||||
%{_javadir}/*.jar
|
||||
%{bindir}/tomcat-juli.jar
|
||||
%{_mavenpomdir}/JPP.%{name}-annotations-api.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-catalina-ha.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-catalina.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-jasper-el.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-jasper.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-jdbc.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-websocket-api.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-websocket.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-jaspic-api.pom
|
||||
%{_datadir}/maven-metadata/tomcat.xml
|
||||
%exclude %{libdir}/%{name}-el-%{elspec}-api.jar
|
||||
%exclude %{_javadir}/%{name}-servlet-%{servletspec}*.jar
|
||||
%exclude %{_javadir}/%{name}-el-%{elspec}-api.jar
|
||||
%exclude %{_javadir}/%{name}-jsp-%{jspspec}*.jar
|
||||
|
||||
%files servlet-%{servletspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-servlet-api
|
||||
%files servlet-%{servletspec}-api
|
||||
%doc LICENSE
|
||||
%{_javadir}/%{name}-servlet-%{servletspec}*.jar
|
||||
|
||||
%files el-%{elspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-el-api
|
||||
%files el-%{elspec}-api
|
||||
%doc LICENSE
|
||||
%{_javadir}/%{name}-el-%{elspec}-api.jar
|
||||
%{libdir}/%{name}-el-%{elspec}-api.jar
|
||||
@ -584,6 +495,8 @@ fi
|
||||
%changelog
|
||||
* Thu Jun 03 2021 Coty Sutherland <csutherl@redhat.com> 1:9.0.45-2
|
||||
- Remove examples webapps from subpackage
|
||||
- Updates to javapackages-local removed %%add_maven_depmap which broke the build,
|
||||
so I removed the maven artifacts as they aren't very useful anyway
|
||||
|
||||
* Thu Apr 22 2021 Hui Wang <huwang@redhat.com> - 1:9.0.45-1
|
||||
- Update to 9.0.45
|
||||
|
||||
Loading…
Reference in New Issue
Block a user