Obsolete demo, remove dependency on glassfish-servlet-api

This commit is contained in:
Marian Koncek 2019-09-16 11:22:32 +02:00
parent b89e063e37
commit f3f997067e

View File

@ -59,7 +59,6 @@ BuildRequires: bcel
BuildRequires: java_cup
BuildRequires: regexp
BuildRequires: sed
BuildRequires: glassfish-servlet-api
BuildRequires: xerces-j2 >= 0:2.7.1
BuildRequires: xml-commons-apis >= 0:1.3
@ -100,15 +99,6 @@ License: ASL 2.0
%description javadoc
Javadoc for %{name}.
%package demo
Summary: Demo for %{name}
License: ASL 2.0
Requires: %{name} = %{version}-%{release}
Requires: glassfish-servlet-api
%description demo
Demonstrations and samples for %{name}.
%prep
%setup -q -n xalan-j_%{cvs_version}
%patch0 -p0
@ -151,9 +141,7 @@ ant \
xalan-interpretive.jar\
xsltc.unbundledjar \
docs \
javadocs \
samples \
servlet
javadocs
# inject OSGi manifests
jar ufm build/serializer.jar %{SOURCE1}
@ -166,14 +154,6 @@ jar ufm build/xalan-interpretive.jar %{SOURCE5}
%install
%mvn_install -J build/docs/apidocs
# demo
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
install -p -m 644 build/xalansamples.jar \
$RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-samples.jar
install -p -m 644 build/xalanservlet.war \
$RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-servlet.war
cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
# fix link between manual and javadoc
(cd build/docs; ln -sf %{_javadocdir}/%{name} apidocs)
@ -200,9 +180,6 @@ mv %{_javadir}/jaxp_transform_impl.jar{.tmp,} || :
%license LICENSE.txt NOTICE.txt
%doc %{_javadocdir}/%{name}
%files demo
%{_datadir}/%{name}
%changelog
* Wed Jul 31 2019 Marian Koncek <mkoncek@redhat.com> - 2.7.2-1
- Update to upstream version 2.7.2