diff --git a/otrs-2.3.4-perl-5.10.0.patch b/otrs-2.3.4-perl-5.10.0.patch deleted file mode 100644 index 3588729..0000000 --- a/otrs-2.3.4-perl-5.10.0.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru otrs-2.3.4.orig/Kernel/cpan-lib/File/Temp.pm otrs-2.3.4/Kernel/cpan-lib/File/Temp.pm ---- otrs-2.3.4.orig/Kernel/cpan-lib/File/Temp.pm 2008-07-01 09:39:25.000000000 +0200 -+++ otrs-2.3.4/Kernel/cpan-lib/File/Temp.pm 2009-03-13 21:07:32.000000000 +0100 -@@ -146,7 +146,6 @@ - use Fcntl 1.03; - use IO::Seekable; # For SEEK_* - use Errno; --require VMS::Stdio if $^O eq 'VMS'; - - # pre-emptively load Carp::Heavy. If we don't when we run out of file - # handles and attempt to call croak() we get an error message telling diff --git a/otrs-3.2.16-perl-5.16.patch b/otrs-3.2.16-perl-5.16.patch new file mode 100644 index 0000000..55837e0 --- /dev/null +++ b/otrs-3.2.16-perl-5.16.patch @@ -0,0 +1,10 @@ +--- otrs-3.2.16/Kernel/cpan-lib/File/Temp.pm.orig 2014-05-28 20:35:41.451616386 +0200 ++++ otrs-3.2.16/Kernel/cpan-lib/File/Temp.pm 2014-05-28 20:36:00.147264991 +0200 +@@ -146,7 +146,6 @@ + use Fcntl 1.03; + use IO::Seekable; # For SEEK_* + use Errno; +-require VMS::Stdio if $^O eq 'VMS'; + + # pre-emptively load Carp::Heavy. If we don't when we run out of file + # handles and attempt to call croak() we get an error message telling diff --git a/otrs.spec b/otrs.spec index 5734211..511961d 100644 --- a/otrs.spec +++ b/otrs.spec @@ -28,8 +28,8 @@ %endif Name: %{?sitename:%sitename-website-}otrs -Version: 3.2.9 -Release: 1mamba +Version: 3.2.16 +Release: 2mamba Summary: An Open source Ticket Request System (also well known as trouble ticket system) Group: Applications/Web Vendor: openmamba @@ -38,14 +38,74 @@ Packager: Silvan Calarco URL: http://www.otrs.org/ Source: http://ftp.otrs.org/pub/otrs/otrs-%{version}.tar.gz Source1: otrs-initscript -Patch0: otrs-2.3.4-perl-5.10.0.patch +Patch0: otrs-3.2.16-perl-5.16.patch License: GPL +## AUTOBUILDREQ-BEGIN +BuildRequires: apache-mod_perl +BuildRequires: libperl +BuildRequires: perl-Algorithm-Diff +BuildRequires: perl-Authen-NTLM +BuildRequires: perl-Authen-Radius +BuildRequires: perl-CSS-Minifier +BuildRequires: perl-Class-Inspector +BuildRequires: perl-Convert-BinHex +BuildRequires: perl-Crypt-PasswdMD5 +BuildRequires: perl-DBI +BuildRequires: perl-Date-Pcalc +BuildRequires: perl-Digest-HMAC +BuildRequires: perl-Email-Valid +BuildRequires: perl-Encode-Locale +BuildRequires: perl-FCGI +BuildRequires: perl-File-Listing +BuildRequires: perl-GSSAPI +BuildRequires: perl-HTTP-Date +BuildRequires: perl-HTTP-GHTTP +BuildRequires: perl-HTTP-Message +BuildRequires: perl-HTTP-Negotiate +BuildRequires: perl-IO-Interactive +BuildRequires: perl-IO-Socket-SSL +BuildRequires: perl-IO-stringy +BuildRequires: perl-JSON +BuildRequires: perl-JavaScript-Minifier +BuildRequires: perl-LWP-MediaTypes +BuildRequires: perl-MIME-Tools +BuildRequires: perl-Mail-IMAPClient +BuildRequires: perl-Mail-POP3Client +BuildRequires: perl-Mail-Tools +BuildRequires: perl-Net-HTTP +BuildRequires: perl-Net-IMAP-Simple +BuildRequires: perl-Net-LDAP +BuildRequires: perl-Net-SMTP-SSL +BuildRequires: perl-Net-SMTP-TLS-ButMaintained +BuildRequires: perl-Net-SSLeay +BuildRequires: perl-SOAP-Lite +BuildRequires: perl-Test-WWW-Selenium +BuildRequires: perl-Text-CSV +BuildRequires: perl-Text-Diff +BuildRequires: perl-TimeDate +BuildRequires: perl-URI +BuildRequires: perl-URI-urn +BuildRequires: perl-WWW-RobotRules +BuildRequires: perl-XML-FeedPP +BuildRequires: perl-XML-TreePP +BuildRequires: perl-YAML +BuildRequires: perl-devel +BuildRequires: perl-libwww +## AUTOBUILDREQ-END BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires(pre): httpd Requires: perl-Apache-Reload Requires: perl-Apache-Clean Requires: perl-DBD-mysql Requires: perl-Net-DNS +Requires: perl-YAML-LibYAML +Requires: perl-Crypt-SSLeay +Requires: perl-Encode-HanExtra +Requires: perl-GD +Requires: perl-GD-Text +Requires: perl-GD-Graph +Requires: perl-JSON-XS +Requires: perl-PDF-API2 Provides: perl(HTML::Safe) %description @@ -100,6 +160,9 @@ install -d %{buildroot}%{_sysconfdir}/httpd/httpd.d # install initscript install -D -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/otrs +# Don't package those files +rm -f %{buildroot}/opt/otrs/{find_provides.sh,find_requires.sh} + %if "%{?servername}" != "" cat > %{buildroot}%{_sysconfdir}/httpd/httpd.d/%{servername}.conf << EOF %else @@ -124,13 +187,14 @@ PerlModule Apache2::RequestRec Options +ExecCGI +Includes PerlOptions +ParseHeaders PerlOptions +SetupEnv + Require all granted Order allow,deny Allow from all AllowOverride All - RewriteEngine on + Require all granted Order allow,deny Allow from All @@ -163,11 +227,13 @@ exit 0 %post if [ $1 -eq 1 ]; then # new install + systemctl -q daemon-reload /sbin/chkconfig --add otrs /sbin/service otrs start fi if [ $1 -ge 1 ]; then - /opt/otrs/bin/SetPermissions.sh /opt/otrs otrs apache apache nobody >/dev/null + /opt/otrs/bin/otrs.SetPermissions.pl /opt/otrs --otrs-user=otrs \ + --otrs-group=apache --web-user=apache --web-group=nobody /opt/otrs >/dev/null fi exit 0 @@ -191,9 +257,17 @@ exit 0 %endif %attr(755,otrs,otrs) /opt/otrs %config(noreplace) /opt/otrs/Kernel/Config.pm +%config(noreplace) /opt/otrs/Kernel/Config/GenericAgent.pm %doc COPYING %changelog +* Wed May 28 2014 Silvan Calarco 3.2.16-2mamba +- added missing perl requirement checked with /opt/otrs/bin/otrs.CheckModules.pl + +* Wed May 28 2014 Silvan Calarco 3.2.16-1mamba +- update to 3.2.16 +- fix SetPermissions script name in post script + * Mon Aug 12 2013 Automatic Build System 3.2.9-1mamba - automatic update by autodist