rpm/tomcat
SHA256
1
0
Fork 0
forked from pool/tomcat
Code Pull Requests Activity

Accepting request 544792 from home:RBrownSUSE:branches:Java:packages

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544792
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=114
This commit is contained in:
Matei Albu 2017-11-28 21:04:57 +00:00 committed by Git OBS Bridge
parent ee237b5c60
commit 7e1ec194df
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tomcat.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:50:29 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 23 09:42:48 UTC 2017 - malbu@suse.com Mon Oct 23 09:42:48 UTC 2017 - malbu@suse.com

11
tomcat.spec
View File

@ -17,6 +17,11 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define jspspec 2.3 %define jspspec 2.3
%define servletspec 3.1 %define servletspec 3.1
%define elspec 3.0 %define elspec 3.0
@ -354,7 +359,7 @@ install -d -m 0775 %{buildroot}%{tempdir}
install -d -m 0775 %{buildroot}%{workdir} install -d -m 0775 %{buildroot}%{workdir}
install -d -m 0755 %{buildroot}%{_unitdir} install -d -m 0755 %{buildroot}%{_unitdir}
install -d -m 0755 %{buildroot}%{_libexecdir}/%{name} install -d -m 0755 %{buildroot}%{_libexecdir}/%{name}
install -d -m 0755 %{buildroot}%{_localstatedir}/adm/fillup-templates install -d -m 0755 %{buildroot}%{_fillupdir}
# move things into place # move things into place
# First copy supporting libs to tomcat lib # First copy supporting libs to tomcat lib
@ -385,7 +390,7 @@ sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
-e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \
> %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} > %{buildroot}%{_fillupdir}/sysconfig.%{name}
install -m 0644 %{SOURCE4} \ install -m 0644 %{SOURCE4} \
%{buildroot}%{_sbindir}/%{name} %{buildroot}%{_sbindir}/%{name}
install -m 0644 %{SOURCE11} \ install -m 0644 %{SOURCE11} \
@ -686,7 +691,7 @@ rm -f \
%{homedir}/work %{homedir}/work
%{homedir}/logs %{homedir}/logs
%{homedir}/conf %{homedir}/conf
%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} %{_fillupdir}/sysconfig.%{name}
%files admin-webapps %files admin-webapps
%{appdir}/host-manager %{appdir}/host-manager