X-Git-Url: http://git.pld-linux.org/?p=packages%2Frt.git;a=blobdiff_plain;f=rt.spec;h=31b7f3f539d3a62f3c159392d9836b8b0103776d;hp=98505e14de19dc93a98106a4a40dfcf8f6faf447;hb=8d5552e2fe7c98e617dc07da1faf78e52c2e3979;hpb=4f0eeacff7f8d897d4a86f4b787b52d58421d610

diff --git a/rt.spec b/rt.spec
index 98505e1..31b7f3f 100644
--- a/rt.spec
+++ b/rt.spec
@@ -1,35 +1,38 @@
 # TODO:
 # - check file permissions
-# - check files in /usr/share/rt3/
+# - check files in /usr/share/rt/
 # - check Requires (meta-packages for configurations with mod_perl/fcgi,
 #   apache[12]/standalone server...?)
 # - separate standalone server
 #
 %define	perl_ver				5.8.3
 %define	perl_apache_session_ver			1.53
-%define	perl_cgi_ver				3.38
+%define	perl_cgi_ver				4.00
 %define	perl_class_returnvalue_ver		0.40
 %define	perl_css_squish_ver			0.06
 %define	perl_dbd_mysql				2.1018
 %define	perl_dbi_ver				1.37
-%define	perl_dbix_searchbuilder_ver		1.59
+%define	perl_dbix_searchbuilder_ver		1.65
 %define	perl_devel_stacktrace_ver		1.19
 %define	perl_digest_md5_ver			2.27
-%define	perl_file_spec_ver			0.8
+%define	perl_gd_ver				1.48
 %define	perl_html_mason_ver			3:1.43
-%define	perl_html_rewriteattributes_ver		0.04
+%define	perl_html_rewriteattributes_ver		0.05
 %define	perl_html_scrubber_ver			0.08
 %define	perl_http_server_simple_mason_ver	0.09
 %define	perl_http_server_simple_ver		0.34
 %define	perl_locale_maketext_lexicon_ver	0.32
 %define	perl_locale_maketext_ver		1.06
-%define	perl_log_dispatch_ver			2.0
-%define	perl_mailtools_ver			1.57
+%define	perl_log_dispatch_ver			2.30
+%define	perl_mailtools_ver			2.12
 %define	perl_mime_tools_ver			5.425
 %define	perl_module_versions_report_ver		1.05
 %define	perl_cgi_psgi				0.12
+%define	perl_plack_ver				1.0002
+%define	perl_starlet_ver			0.20
 %define	perl_storable_ver			2.08
-%define	perl_text_quoted_ver			2.02
+%define	perl_symbol_global_name_ver		0.05
+%define	perl_text_quoted_ver			2.07
 %define	perl_text_wikiformat_ver		0.76
 %define	perl_tree_simple_ver			1.18
 %define	perl_text_template_ver			1.45
@@ -41,17 +44,20 @@
 Summary:	Request Tracker
 Summary(pl.UTF-8):	Request Tracker - system do śledzenia zleceń
 Name:		rt
-Version:	4.0.4
+Version:	4.2.10
 Release:	1
 License:	GPL v2
 Group:		Applications
 Source0:	http://download.bestpractical.com/pub/rt/release/%{name}-%{version}.tar.gz
-# Source0-md5:	7bbfe24c3e3b6fb64c62a43769780093
+# Source0-md5:	077f3ed99d36eb744fe25c2bfd70e996
 Source1:	%{name}-apache_dir.conf
 Source2:	%{name}-apache_vhost.conf
 Source3:	%{name}-apache.conf
+Source4:	%{name}.logrotate
+Source5:	lighttpd.conf
 Patch0:		%{name}-layout.patch
 Patch1:		%{name}-config.patch
+Patch2:		content-id.patch
 URL:		http://www.bestpractical.com/rt/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -68,26 +74,38 @@ BuildRequires:	perl-Calendar-Simple
 BuildRequires:	perl-Class-ISA
 BuildRequires:	perl-Class-ReturnValue >= %{perl_class_returnvalue_ver}
 BuildRequires:	perl-Convert-Color
+BuildRequires:	perl-Crypt-Eksblowfish
+BuildRequires:	perl-Crypt-SSLeay
+BuildRequires:	perl-Crypt-X509
 BuildRequires:	perl-DBD-mysql >= %{perl_dbd_mysql}
 BuildRequires:	perl-DBI >= %{perl_dbi_ver}
 BuildRequires:	perl-DBIx-DataSource >= 0.02
 BuildRequires:	perl-DBIx-SearchBuilder >= %{perl_dbix_searchbuilder_ver}
+BuildRequires:	perl-Data-GUID
 BuildRequires:	perl-Data-ICal
+BuildRequires:	perl-Date-Extract
+BuildRequires:	perl-Date-Manip
+BuildRequires:	perl-DateTime-Format-Natural
 BuildRequires:	perl-Devel-GlobalDestruction
 BuildRequires:	perl-Devel-StackTrace >= %{perl_devel_stacktrace_ver}
 BuildRequires:	perl-Digest-MD5 >= %{perl_digest_md5_ver}
 BuildRequires:	perl-Email-Address
+BuildRequires:	perl-Email-Address-List
 BuildRequires:	perl-Exception-Class
 BuildRequires:	perl-FCGI
 BuildRequires:	perl-FCGI-ProcManager
 BuildRequires:	perl-File-ShareDir
-BuildRequires:	perl-File-Spec >= %{perl_file_spec_ver}
 BuildRequires:	perl-File-Temp
+BuildRequires:	perl-File-Which
 BuildRequires:	perl-FreezeThaw
-BuildRequires:	perl-GD
+BuildRequires:	perl-GD >= %{perl_gd_ver}
 BuildRequires:	perl-GD-Graph
 BuildRequires:	perl-GD-TextUtil
 BuildRequires:	perl-GnuPG-Interface
+BuildRequires:	perl-GraphViz
+BuildRequires:	perl-HTML-FormatExternal
+BuildRequires:	perl-HTML-FormatText-WithLinks-AndTables
+BuildRequires:	perl-HTML-Gumbo
 BuildRequires:	perl-HTML-Mason >= %{perl_html_mason_ver}
 BuildRequires:	perl-HTML-Mason-PSGIHandler
 BuildRequires:	perl-HTML-Parser
@@ -100,6 +118,7 @@ BuildRequires:	perl-HTTP-Server-Simple-Mason >= %{perl_http_server_simple_mason_
 BuildRequires:	perl-IPC-Run3
 BuildRequires:	perl-JSON
 BuildRequires:	perl-JavaScript-Minifier
+BuildRequires:	perl-LWP-Protocol-https
 BuildRequires:	perl-Locale-Maketext >= %{perl_locale_maketext_ver}
 BuildRequires:	perl-Locale-Maketext-Fuzzy
 BuildRequires:	perl-Locale-Maketext-Lexicon >= %{perl_locale_maketext_lexicon_ver}
@@ -109,17 +128,21 @@ BuildRequires:	perl-MIME-tools >= %{perl_mime_tools_ver}
 BuildRequires:	perl-MLDBM
 BuildRequires:	perl-MailTools >= %{perl_mailtools_ver}
 BuildRequires:	perl-Module-Versions-Report >= %{perl_module_versions_report_ver}
+BuildRequires:	perl-Mozilla-CA
 BuildRequires:	perl-Net-CIDR
 BuildRequires:	perl-Net-Server >= 0.34
 BuildRequires:	perl-PSGI
 BuildRequires:	perl-Params-Validate >= 0.02
 BuildRequires:	perl-PerlIO-eol
-BuildRequires:	perl-Plack
+BuildRequires:	perl-Plack >= %{perl_plack_ver}
 BuildRequires:	perl-Regexp-Common
 BuildRequires:	perl-Regexp-Common-net-CIDR
 BuildRequires:	perl-Regexp-IPv6
-BuildRequires:	perl-Starlet
+BuildRequires:	perl-Role-Basic
+BuildRequires:	perl-Starlet >= %{perl_starlet_ver}
 BuildRequires:	perl-Storable >= %{perl_storable_ver}
+BuildRequires:	perl-String-ShellQuote
+BuildRequires:	perl-Symbol-Global-Name >= %{perl_symbol_global_name_ver}
 BuildRequires:	perl-Term-ReadKey
 BuildRequires:	perl-Test-Inline
 BuildRequires:	perl-Text-Autoformat
@@ -140,9 +163,6 @@ BuildRequires:	perl-libnet
 %endif
 BuildRequires:	perl-base >= %{perl_ver}
 BuildRequires:	rpm-perlprov
-Requires:	apache-base >= 2.2.0
-Requires:	apache-mod_authz_host >= 2.2.0
-Requires:	apache-mod_perl >= 2.0
 Requires:	fonts-TTF-Google-Droid
 Requires:	perl-Apache-DBI
 Requires:	perl-Apache-Session >= %{perl_apache_session_ver}
@@ -150,22 +170,36 @@ Requires:	perl-CGI >= %{perl_cgi_ver}
 Requires:	perl-CGI-Emulate-PSGI
 Requires:	perl-CGI-PSGI >= %{perl_cgi_psgi}
 Requires:	perl-CSS-Squish >= %{perl_css_squish_ver}
+Requires:	perl-Cache-Cache
 Requires:	perl-Calendar-Simple
 Requires:	perl-Class-ISA
 Requires:	perl-Class-ReturnValue >= %{perl_class_returnvalue_ver}
 Requires:	perl-Convert-Color
+Requires:	perl-Crypt-Eksblowfish
+Requires:	perl-Crypt-SSLeay
+Requires:	perl-Crypt-X509
 Requires:	perl-DBD-mysql >= %{perl_dbd_mysql}
 Requires:	perl-DBI >= %{perl_dbi_ver}
 Requires:	perl-DBIx-SearchBuilder >= %{perl_dbix_searchbuilder_ver}
+Requires:	perl-Data-GUID
 Requires:	perl-Data-ICal
+Requires:	perl-Date-Extract
+Requires:	perl-Date-Manip
+Requires:	perl-DateTime-Format-Natural
 Requires:	perl-Devel-GlobalDestruction
 Requires:	perl-Devel-StackTrace >= %{perl_devel_stacktrace_ver}
 Requires:	perl-Digest-MD5 >= %{perl_digest_md5_ver}
-Requires:	perl-Encode >= 2.38
+Requires:	perl-Email-Address-List
+Requires:	perl-Encode >= 2.64
 Requires:	perl-FCGI-ProcManager
-Requires:	perl-File-Spec >= %{perl_file_spec_ver}
+Requires:	perl-File-Which
+Requires:	perl-GD >= %{perl_gd_ver}
 Requires:	perl-GD-Graph
 Requires:	perl-GnuPG-Interface
+Requires:	perl-GraphViz
+Requires:	perl-HTML-FormatExternal
+Requires:	perl-HTML-FormatText-WithLinks-AndTables
+Requires:	perl-HTML-Gumbo
 Requires:	perl-HTML-Mason >= %{perl_html_mason_ver}
 Requires:	perl-HTML-Mason-PSGIHandler
 Requires:	perl-HTML-Quoted
@@ -176,6 +210,7 @@ Requires:	perl-HTTP-Server-Simple-Mason >= %{perl_http_server_simple_mason_ver}
 Requires:	perl-IPC-Run3
 Requires:	perl-JSON
 Requires:	perl-JavaScript-Minifier
+Requires:	perl-LWP-Protocol-https
 Requires:	perl-Locale-Maketext >= %{perl_locale_maketext_ver}
 Requires:	perl-Locale-Maketext-Fuzzy
 Requires:	perl-Locale-Maketext-Lexicon >= %{perl_locale_maketext_lexicon_ver}
@@ -184,14 +219,18 @@ Requires:	perl-MIME-tools >= %{perl_mime_tools_ver}
 Requires:	perl-MailTools >= %{perl_mailtools_ver}
 Requires:	perl-Module-Versions-Report >= %{perl_module_versions_report_ver}
 Requires:	perl-Moose
+Requires:	perl-Mozilla-CA
 Requires:	perl-Net-CIDR
 Requires:	perl-PSGI
 Requires:	perl-PerlIO-eol
-Requires:	perl-Plack
+Requires:	perl-Plack >= %{perl_plack_ver}
 Requires:	perl-Regexp-Common-net-CIDR
 Requires:	perl-Regexp-IPv6
-Requires:	perl-Starlet
+Requires:	perl-Role-Basic
+Requires:	perl-Starlet >= %{perl_starlet_ver}
 Requires:	perl-Storable >= %{perl_storable_ver}
+Requires:	perl-String-ShellQuote
+Requires:	perl-Symbol-Global-Name >= %{perl_symbol_global_name_ver}
 Requires:	perl-Text-Password-Pronounceable
 Requires:	perl-Text-Quoted >= %{perl_text_quoted_ver}
 Requires:	perl-Text-WikiFormat >= %{perl_text_wikiformat_ver}
@@ -203,15 +242,15 @@ Suggests:	perl-FCGI
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_noautoreq	'perl().*' 'perl(RT.*)' 'perl(Encode::compat)' 'perl(CGI::Fast)' 'perl(Exception::Class::Base)'
+%define		_noautoreq	'perl().*' 'perl(RT.*)' 'perl(Encode::compat)' 'perl(CGI::Fast)' 'perl(Exception::Class::Base)' 'perl(HTML::Mason::Request::PSGI)'
 # workarounds for bug in perl.req ("perl()") and ,,famous'' rpm's feature (RT::*)
 
 %define         _webapps        /etc/webapps
 %define         _webapp         %{name}
 %define         _webappsdir     %{_webapps}/%{_webapp}
-%define		_sysconfdir	/etc/rt3
+%define		_sysconfdir	/etc/rt
 %define		_libdir		%{perl_vendorlib}
-%define		htmldir		%{_datadir}/rt3/html
+%define		htmldir		%{_datadir}/rt/html
 %define		masonstatedir	%{_localstatedir}/cache/mason_data
 %define		masonsessiondir	%{_localstatedir}/cache/session_data
 
@@ -244,17 +283,38 @@ 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
 %patch1 -p1
+%patch2 -p1
 
 mv aclocal.m4 acinclude.m4
 
 sed -i -e 's#libdir:.*#libdir:	%{_libdir}#g' config.layout
 
+# prevent configure from using git
+sed -i -e 's#git describe --tags#false#g' configure.ac
+
 %build
-%{__aclocal} -I m4
+%{__aclocal}
 %{__autoconf}
 USER=$(id -un) \
 %configure \
@@ -263,7 +323,6 @@ USER=$(id -un) \
 	exp_htmldir=%{htmldir} \
 	masonstatedir=%{masonstatedir} \
 	masonsessiondir=%{masonstatedir} \
-	--with-apachectl=%{_sbindir}/apachectl \
 	--with-my-user-group \
 	--with-db-type=mysql \
 	--with-web-handler=fastcgi,modperl2
@@ -273,7 +332,7 @@ USER=$(id -un) \
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_libdir}} \
+install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,cron.daily},%{_libdir}} \
 	$RPM_BUILD_ROOT%{masonstatedir} \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
 	$RPM_BUILD_ROOT%{_webappsdir}
@@ -284,11 +343,14 @@ install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_libdir}} \
 
 install %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_webappsdir}/httpd.conf
+install %{SOURCE5} $RPM_BUILD_ROOT%{_webappsdir}/lighttpd.conf
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 
 ln -s %{_sbindir}/rt-clean-sessions $RPM_BUILD_ROOT/etc/cron.daily/rt-clean-sessions
 
 # unneeded in installed copy
 rm $RPM_BUILD_ROOT%{_sbindir}/rt-test-dependencies
+rm -r $RPM_BUILD_ROOT%{_datadir}/doc
 
 # we use fonts-TTF-Google-Droid
 rm -r $RPM_BUILD_ROOT%{_datadir}/fonts/TTF
@@ -296,18 +358,24 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/fonts/TTF
 # *.in, tests
 find $RPM_BUILD_ROOT -type f -name \*.in -exec rm '{}' \;
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin apache -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun apache -- apache-base
 %webapp_unregister httpd %{_webapp}
 
+%triggerin -- lighttpd
+%webapp_register lighttpd %{_webapp}
+
+%triggerun -- lighttpd
+%webapp_unregister lighttpd %{_webapp}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README* docs etc/upgrade
+%doc README* docs
 
 %dir %{_sysconfdir}
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/[a-z]*
@@ -315,9 +383,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/RT_SiteConfig.pm
 # this is generic config that SHOULDN'T BE TOUCHED. Change settings in your local (site) config.
 %attr(640,root,http) %config %{_sysconfdir}/RT_Config.pm
+%attr(750,root,http) %dir %{_webappsdir}
+# web server configs with no separate deps (so no need for subpackage)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappsdir}/lighttpd.conf
 
-%dir %attr(750,root,http) %{_webappsdir}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappsdir}/httpd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %attr(755,root,root) /etc/cron.daily/rt-clean-sessions
 %attr(755,root,root) %{_bindir}/rt-*
 %attr(755,root,root) %{_sbindir}/standalone_httpd
@@ -325,10 +395,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/rt
 %{_datadir}/rt/html
 %{_datadir}/rt/po
+%{_datadir}/rt/static
 %{_libdir}/*
-%dir %attr(770,root,http) %{masonstatedir}
+%attr(770,root,http) %dir %{masonstatedir}
 %{_examplesdir}/%{name}-%{version}
 
 %files cli
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/rt
+
+%files apache
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappsdir}/httpd.conf