xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2343 - resolve AWIPS II httpd depenency issue

Browse source 
Former-commit-id: 9a370ca614 [formerly 18756316ce [formerly b5081a38c6d90f47a625fde975f717ff4f63215f]]
Former-commit-id: 18756316ce
Former-commit-id: b6d787103b
This commit is contained in:
Bryan Kowal 2013-09-10 17:04:35 -05:00
parent b2871f542b
commit 5e9e23ffa6
3 changed files with 5 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
rpms/awips2.core/Installer.httpd-collaboration/component.spec
View file

@ -82,7 +82,7 @@ Provides: httpd-mmn = %{mmn}
Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache
Obsoletes: stronghold-htdocs, mod_put, mod_roaming
Conflicts: pcre < 4.0
Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
Requires: apr-util-ldap
%description
The Apache HTTP Server is a powerful, efficient, and extensible
@ -116,14 +116,6 @@ The httpd-manual package contains the complete manual and
reference guide for the Apache HTTP server. The information can
also be found at http://httpd.apache.org/docs/2.2/.
%package tools
Group: AWIPSII
Summary: Tools for use with the Apache HTTP Server
%description tools
The httpd-tools package contains tools which can be used with
the Apache HTTP Server.
%package -n mod_ssl
Group: AWIPSII
Summary: SSL/TLS module for the Apache HTTP Server
@ -559,14 +551,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(0700,awips,fxalpha) %dir /awips2/httpd_collaboration%{_localstatedir}/lib/dav
%attr(0700,awips,fxalpha) %dir /awips2/httpd_collaboration%{_localstatedir}/cache/mod_proxy
/awips2/httpd_collaboration/%{_mandir}/man8/*
%exclude /awips2/httpd_collaboration/%{_mandir}/man8/apxs.8*
%files tools
%defattr(-,root,root)
/awips2/httpd_collaboration/%{_bindir}/*
/awips2/httpd_collaboration/%{_mandir}/man1/*
%doc LICENSE
/awips2/httpd_collaboration/%{_mandir}/man8/*
%files manual
%defattr(-,root,root)

19
rpms/awips2.core/Installer.httpd-pypies/component.spec
View file

@ -85,7 +85,8 @@ Provides: httpd-mmn = %{mmn}
Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache
Obsoletes: stronghold-htdocs, mod_put, mod_roaming
Conflicts: pcre < 4.0
Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
Requires: apr-util-ldap
requires: awips2-pypies
%description
The Apache HTTP Server is a powerful, efficient, and extensible
@ -119,14 +120,6 @@ The httpd-manual package contains the complete manual and
reference guide for the Apache HTTP server. The information can
also be found at http://httpd.apache.org/docs/2.2/.
%package tools
Group: AWIPSII
Summary: Tools for use with the Apache HTTP Server
%description tools
The httpd-tools package contains tools which can be used with
the Apache HTTP Server.
%package -n mod_ssl
Group: AWIPSII
Summary: SSL/TLS module for the Apache HTTP Server
@ -599,14 +592,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(0700,awips,fxalpha) %dir /awips2/httpd_pypies%{_localstatedir}/lib/dav
%attr(0700,awips,fxalpha) %dir /awips2/httpd_pypies%{_localstatedir}/cache/mod_proxy
/awips2/httpd_pypies/%{_mandir}/man8/*
%exclude /awips2/httpd_pypies/%{_mandir}/man8/apxs.8*
%files tools
%defattr(-,root,root)
/awips2/httpd_pypies/%{_bindir}/*
/awips2/httpd_pypies/%{_mandir}/man1/*
%doc LICENSE
/awips2/httpd_pypies/%{_mandir}/man8/*
%files manual
%defattr(-,root,root)

1
rpms/awips2.core/Installer.pypies/component.spec
View file

@ -16,7 +16,6 @@ Packager: Nate Jensen
AutoReq: no
provides: awips2-pypies
requires: awips2-python >= 2.7-1
requires: awips2-httpd-pypies
requires: awips2-tools
%description