rpms/struts/devel struts.spec,1.28,1.29
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Feb 24 22:16:54 UTC 2006
- Previous message (by thread): rpms/kernel/devel patch-2.6.16-rc4-git7.bz2.sign, NONE, 1.1 .cvsignore, 1.359, 1.360 kernel-2.6.spec, 1.1979, 1.1980 sources, 1.301, 1.302 upstream, 1.276, 1.277
- Next message (by thread): rpms/chkconfig/devel .cvsignore, 1.30, 1.31 chkconfig.spec, 1.37, 1.38 sources, 1.31, 1.32
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rafaels
Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18186
Modified Files:
struts.spec
Log Message:
Removed webapps-tomcat{3,4} subpackages.
Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- struts.spec 22 Feb 2006 04:46:42 -0000 1.28
+++ struts.spec 24 Feb 2006 22:16:51 -0000 1.29
@@ -1,9 +1,7 @@
%define name struts
%define full_name jakarta-%{name}
%define version 1.2.8
-%define release 2jpp_8fc
-%define tomcat3appsdir %{_localstatedir}/tomcat3/webapps
-%define tomcat4appsdir %{_localstatedir}/lib/tomcat4/webapps
+%define release 2jpp_9fc
%define tomcat5appsdir %{_localstatedir}/lib/tomcat5/webapps
%define tomcat5ctxdir %{_sysconfdir}/tomcat5/Catalina/localhost
%define section free
@@ -88,28 +86,6 @@
%description javadoc
Javadoc for %{name}.
-%package webapps-tomcat3
-Summary: Sample %{name} webapps for tomcat3
-Group: Development/Java
-Requires: %{name} = %{version}-%{release}
-Prereq: tomcat3
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-
-%description webapps-tomcat3
-Sample %{name} webapps for tomcat3.
-
-%package webapps-tomcat4
-Summary: Sample %{name} webapps for tomcat4
-Group: Development/Java
-Requires: %{name} = %{version}-%{release}
-Prereq: tomcat4
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-
-%description webapps-tomcat4
-Sample %{name} webapps for tomcat4.
-
%package webapps-tomcat5
Summary: Sample %{name} webapps for tomcat5
Group: Development/Java
@@ -166,34 +142,6 @@
install -m 644 target/library/*.tld $RPM_BUILD_ROOT%{_datadir}/%{name}
install -m 644 target/library/*.dtd $RPM_BUILD_ROOT%{_datadir}/%{name}
-# tomcat 3 webapps
-install -d -m 755 $RPM_BUILD_ROOT%{tomcat3appsdir}
-for webapp in %{webapps}; do
- cp -pr target/$webapp $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp
- # tomcat3 doesn't support allowLinking, this might not work
- # XXX: move to %%post/preun
- for jar in %{webapplibs}; do
- (cd $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp/WEB-INF/lib \
- && ln -sf ../../../../../..%{_javadir}/$jar.jar .)
- done
- (cd $RPM_BUILD_ROOT%{tomcat3appsdir}/%{name}-$webapp/WEB-INF \
- && for tld in ../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done)
-done
-
-# tomcat 4 webapps
-install -d -m 755 $RPM_BUILD_ROOT%{tomcat4appsdir}
-for webapp in %{webapps}; do
- cp -pr target/$webapp $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp
- cat %{SOURCE2} | sed -e "s/@@@APPNAME@@@/$webapp/g;" > $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp.xml
- # XXX: move to %%post/preun
- for jar in %{webapplibs}; do
- (cd $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp/WEB-INF/lib \
- && ln -sf ../../../../../../..%{_javadir}/$jar.jar .)
- done
- (cd $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp/WEB-INF \
- && for tld in ../../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done)
-done
-
# tomcat 5 webapps
install -d -m 755 $RPM_BUILD_ROOT%{tomcat5appsdir}
install -d -m 755 $RPM_BUILD_ROOT%{tomcat5ctxdir}
@@ -217,18 +165,6 @@
%postun
%{_bindir}/rebuild-gcj-db
-%post webapps-tomcat3
-%{_bindir}/rebuild-gcj-db
-
-%postun webapps-tomcat3
-%{_bindir}/rebuild-gcj-db
-
-%post webapps-tomcat4
-%{_bindir}/rebuild-gcj-db
-
-%postun webapps-tomcat4
-%{_bindir}/rebuild-gcj-db
-
%post webapps-tomcat5
%{_bindir}/rebuild-gcj-db
@@ -258,35 +194,6 @@
%defattr(-,root,root)
%{_javadocdir}/%{name}-%{version}
-%files webapps-tomcat3
-%defattr(-,tomcat3,tomcat3)
-%dir %{tomcat3appsdir}/%{name}-blank
-%{tomcat3appsdir}/%{name}-blank/*
-%dir %{tomcat3appsdir}/%{name}-documentation
-%{tomcat3appsdir}/%{name}-documentation/*
-%dir %{tomcat3appsdir}/%{name}-example
-%{tomcat3appsdir}/%{name}-example/*
-%dir %{tomcat3appsdir}/%{name}-examples
-%{tomcat3appsdir}/%{name}-examples/*
-%dir %{tomcat3appsdir}/%{name}-tiles-documentation
-%{tomcat3appsdir}/%{name}-tiles-documentation/*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
-
-%files webapps-tomcat4
-%defattr(-,tomcat,tomcat)
-%dir %{tomcat4appsdir}/%{name}-blank
-%{tomcat4appsdir}/%{name}-blank/*
-%dir %{tomcat4appsdir}/%{name}-documentation
-%{tomcat4appsdir}/%{name}-documentation/*
-%dir %{tomcat4appsdir}/%{name}-example
-%{tomcat4appsdir}/%{name}-example/*
-%dir %{tomcat4appsdir}/%{name}-examples
-%{tomcat4appsdir}/%{name}-examples/*
-%dir %{tomcat4appsdir}/%{name}-tiles-documentation
-%{tomcat4appsdir}/%{name}-tiles-documentation/*
-%{tomcat4appsdir}/%{name}-*.xml
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
-
%files webapps-tomcat5
%defattr(-,tomcat,tomcat)
%dir %{tomcat5appsdir}/%{name}-blank
@@ -303,6 +210,9 @@
%attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.*
%changelog
+* Fri Feb 24 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.2.8-2jpp_9fc
+- Removed the webapps-tomcat{3,4} subpackages.
+
* Tue Feb 21 2006 Rafael Schloming <rafaels at redhat.com> - 0:1.2.8-2jpp_8fc
- Updated to 1.2.8
- Previous message (by thread): rpms/kernel/devel patch-2.6.16-rc4-git7.bz2.sign, NONE, 1.1 .cvsignore, 1.359, 1.360 kernel-2.6.spec, 1.1979, 1.1980 sources, 1.301, 1.302 upstream, 1.276, 1.277
- Next message (by thread): rpms/chkconfig/devel .cvsignore, 1.30, 1.31 chkconfig.spec, 1.37, 1.38 sources, 1.31, 1.32
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list