- Remove few deps not really needed for sle11.
- Drop unused files obs.bl and local.lb - Drop unused collections-tomcat-build.xml OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=47
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
c03a07e884
commit
d82dd1d1df
@ -1,70 +0,0 @@
|
||||
<project name="commons-collections-tomcat5" default="build" basedir=".">
|
||||
|
||||
<property name="tomcat-collections.home" value="collections-tomcat5"/>
|
||||
<property name="commons-collections.home" value="."/>
|
||||
<property name="tomcat-collections.jar" value="commons-collections-tomcat5.jar"/>
|
||||
|
||||
<!-- Java Options -->
|
||||
<property name="compile.debug" value="true"/>
|
||||
<property name="compile.deprecation" value="false"/>
|
||||
<property name="compile.source" value="1.4"/>
|
||||
|
||||
<target name="clean">
|
||||
<delete dir="${tomcat-collections.home}"/>
|
||||
</target>
|
||||
|
||||
<target name="build">
|
||||
<copy todir="${tomcat-collections.home}">
|
||||
<fileset dir="${commons-collections.home}" >
|
||||
<include name="**/collections/CursorableLinkedList.java" />
|
||||
<include name="**/collections/KeyValue.java" />
|
||||
<include name="**/collections/LRUMap.java" />
|
||||
<include name="**/collections/SequencedHashMap.java" />
|
||||
</fileset>
|
||||
<!-- <fileset dir="${commons-pool.home}">
|
||||
<include name="**/*.java" />
|
||||
<exclude name="**/Stack*.java" />
|
||||
<exclude name="**/SoftReferenceObjectPool.java" />
|
||||
<exclude name="**/test/**" />
|
||||
</fileset>
|
||||
<fileset dir="${commons-dbcp.home}">
|
||||
<include name="**/*.java" />
|
||||
<exclude name="**/test/**" />
|
||||
<exclude name="${tomcat-dbcp.home}/**"/>
|
||||
</fileset> -->
|
||||
</copy>
|
||||
<replace dir="${tomcat-collections.home}/src/java/org/apache/commons">
|
||||
<replacefilter token="return UnmodifiableList.decorate(l);"
|
||||
value="return l;" />
|
||||
<replacefilter token="import org.apache.commons.collections.list.UnmodifiableList;"
|
||||
value=" " />
|
||||
</replace>
|
||||
<replace dir="${tomcat-collections.home}/src/java/org/apache/commons" >
|
||||
<replacefilter token="org.apache.commons"
|
||||
value="org.apache.tomcat.dbcp" />
|
||||
</replace>
|
||||
<mkdir dir="${tomcat-collections.home}/src/java/org/apache/tomcat/dbcp" />
|
||||
<move todir="${tomcat-collections.home}/src/java/org/apache/tomcat/dbcp">
|
||||
<fileset dir="${tomcat-collections.home}/src/java/org/apache/commons" />
|
||||
</move>
|
||||
<mkdir dir="${tomcat-collections.home}/classes"/>
|
||||
<javac destdir="${tomcat-collections.home}/classes"
|
||||
optimize="off"
|
||||
debug="${compile.debug}"
|
||||
deprecation="${compile.deprecation}"
|
||||
source="${compile.source}"
|
||||
sourcepath="${tomcat-collections.home}/src/java"
|
||||
srcdir="${tomcat-collections.home}/src/java" >
|
||||
<include name="**" />
|
||||
</javac>
|
||||
<jar destfile="${tomcat-collections.home}/${tomcat-collections.jar}"
|
||||
index="true">
|
||||
<fileset dir="${tomcat-collections.home}/classes">
|
||||
<include name="**/*.class" />
|
||||
<include name="**/*.properties" />
|
||||
</fileset>
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 10 14:47:30 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
- Remove few deps not really needed for sle11.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 10 14:42:03 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
- Drop unused files obs.bl and local.lb
|
||||
- Drop unused collections-tomcat-build.xml
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat May 24 09:58:55 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
|
||||
14
tomcat.spec
14
tomcat.spec
@ -88,12 +88,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: ant >= 1.8.1
|
||||
%if 0%{?suse_version} == 1110
|
||||
BuildRequires: ant-antlr
|
||||
BuildRequires: ant-nodeps
|
||||
BuildRequires: ant-trax
|
||||
#BuildRequires: saxon
|
||||
%endif
|
||||
BuildRequires: ecj >= 4.2.1
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: findutils
|
||||
@ -305,7 +300,7 @@ touch HACK
|
||||
%{__mkdir_p} HACKDIR
|
||||
touch HACKDIR/build.xml
|
||||
|
||||
%{ant} -Dbase.path="." \
|
||||
ant -Dbase.path="." \
|
||||
-Djava.7.home="%{java_home}" \
|
||||
-Dbuild.compiler="modern" \
|
||||
-Dcommons-collections.jar="$(build-classpath commons-collections)" \
|
||||
@ -370,7 +365,6 @@ zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF
|
||||
%if 0%{?suse_version} == 1110
|
||||
export NO_BRP_CHECK_BYTECODE_VERSION=true
|
||||
%endif
|
||||
|
||||
# build initial path structure
|
||||
%{__install} -d -m 0755 %{buildroot}%{_bindir}
|
||||
%{__install} -d -m 0755 %{buildroot}%{_sbindir}
|
||||
@ -578,9 +572,6 @@ echo "%{name}/catalina-ant" > %{buildroot}/%{_sysconfdir}/ant.d/catalina-ant
|
||||
ln -sf %{_sbindir}/d%{name} %{buildroot}/%{bindir}/catalina.sh
|
||||
%endif
|
||||
|
||||
%clean
|
||||
%{__rm} -rf $RPM_BUILD_ROOT
|
||||
|
||||
%pre
|
||||
# add the tomcat user and group
|
||||
%{_sbindir}/groupadd -r tomcat 2>/dev/null || :
|
||||
@ -615,7 +606,6 @@ fi
|
||||
%restart_on_update %{name}
|
||||
%endif
|
||||
|
||||
# start - systemd services
|
||||
%if %{with_systemd}
|
||||
%pre jsvc
|
||||
%service_add_pre %{name}-jsvc.service
|
||||
@ -628,9 +618,7 @@ fi
|
||||
|
||||
%postun jsvc
|
||||
%service_del_postun %{name}-jsvc.service
|
||||
|
||||
%endif
|
||||
# end - systemd services
|
||||
|
||||
%post el-2_2-api
|
||||
%{_sbindir}/update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
|
||||
|
||||
Loading…
Reference in New Issue
Block a user