- subpackage for apache config and deps, so dropped bcond

diff --git a/rt.spec b/rt.spec
index 788409c276b92283eb08dfa4f3c8cc332786e4ff..0c932e0f4886f9081094e26f7896ec775f98d07c 100644 (file)
--- a/rt.spec
+++ b/rt.spec
@@ -35,7 +35,6 @@
 %define        perl_xml_rss_ver                        1.05
 #
 %bcond_with    testdeps        # used for checking dependencies
-%bcond_without apache          # no apache deps. TODO: make subpackage with apache config
 #
 %include       /usr/lib/rpm/macros.perl
 Summary:       Request Tracker
@@ -140,11 +139,6 @@ BuildRequires:     perl-libnet
 %endif
 BuildRequires: perl-base >= %{perl_ver}
 BuildRequires: rpm-perlprov
-%if %{with apache}
-Requires:      apache-base >= 2.2.0
-Requires:      apache-mod_authz_host >= 2.2.0
-Requires:      apache-mod_perl >= 2.0
-%endif
 Requires:      fonts-TTF-Google-Droid
 Requires:      perl-Apache-DBI
 Requires:      perl-Apache-Session >= %{perl_apache_session_ver}
@@ -200,9 +194,7 @@ Requires:   perl-Text-WikiFormat >= %{perl_text_wikiformat_ver}
 Requires:      perl-Tree-Simple >= %{perl_tree_simple_ver}
 Requires:      perl-XML-RSS >= %{perl_xml_rss_ver}
 Requires:      perl-base >= %{perl_ver}
-Requires:      webapps
 Suggests:      perl-FCGI
-Conflicts:     apache-base < 2.4.0-1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -247,6 +239,23 @@ Umożliwia on współdziałanie z serwerem RT po HTTP i oferuje interfejs
 do funkcjonalności RT bardziej dopasowany do automatyki i intergracji
 z innymi narzędziami.
 
+%package apache
+Summary:       Apache support files for RT
+Summary(pl.UTF-8):     Pliki wspomagające używanie RT z Apache
+Group:         Applications
+Requires:      %{name} = %{version}-%{release}
+Requires:      apache-base >= 2.2.0
+Requires:      apache-mod_authz_host >= 2.2.0
+Requires:      apache-mod_perl >= 2.0
+Requires:      webapps
+Conflicts:     apache-base < 2.4.0-1
+
+%description apache
+Apache support files for RT.
+
+%description apache -l pl.UTF-8
+Pliki wspomagające używanie RT z Apache.
+
 %prep
 %setup -q
 %patch0 -p0
@@ -303,10 +312,10 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/fonts/TTF
 # *.in, tests
 find $RPM_BUILD_ROOT -type f -name \*.in -exec rm '{}' \;
 
-%triggerin -- apache-base
+%triggerin apache -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache-base
+%triggerun apache -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %clean
@@ -342,3 +351,8 @@ rm -rf $RPM_BUILD_ROOT
 %files cli
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/rt
+
+%files apache
+%defattr(644,root,root,755)
+%dir %attr(750,root,http) %{_webappsdir}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappsdir}/httpd.conf