openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package otrs (Revision 728349f9b5314f79770f58bbb2ea6834)

Currently displaying revision 728349f9b5314f79770f58bbb2ea6834 , Show latest

--- ZZZAuto.pm.orig
+++ ZZZAuto.pm
@@ -9,9 +9,10 @@ $Self->{'DefaultCharset'} =  'utf-8';
 $Self->{'DefaultLanguage'} =  'de';
 $Self->{'LogModule'} =  'Kernel::System::Log::File';
 $Self->{'Package::RepositoryList'} =  {
-  'file://@OTRS_ROOT@/otrs/itsm/packages30/' => '[--OTRS::ITSM local repo]',
-  'http://ftp.otrs.org/pub/otrs/itsm/packages21/' => '[--OTRS::ITSM 2.1 Master--] http://ftp.otrs.org/',
+  'file://@OTRS_ROOT@/otrs/itsm/packages30/' => '[--OTRS::ITSM 3.0 local repo]',
+  'file://@OTRS_ROOT@/otrs/itsm/packages31/' => '[--OTRS::ITSM 3.1 local repo]',
   'http://ftp.otrs.org/pub/otrs/itsm/packages30/' => '[--OTRS::ITSM 3.0 Master--] http://ftp.otrs.org/'
+  'http://ftp.otrs.org/pub/otrs/itsm/packages31/' => '[--OTRS::ITSM 3.1 Master--] http://ftp.otrs.org/'
 };
 $Self->{'Package::RepositoryAccessRegExp'} =  '127\\.0\\.0\\.1';
 }
--- otrs.changes.orig
+++ otrs.changes
@@ -1,4 +1,36 @@
 -------------------------------------------------------------------
+Mon Feb 20 16:49:46 UTC 2012 - chris@computersalat.de
+
+- add init scripts
+  * otrs, otrs-scheduler
+  * remove init patch
+- rework sysconfig file
+
+-------------------------------------------------------------------
+Tue Feb 14 17:08:56 UTC 2012 - chris@computersalat.de
+
+- update to 3.1.1
+  * Fixed bug#8199 - Linked tickets open only in tabs.
+  * Fixed bug#8148 - Wrong presentation of queue structure in
+    CustomerTicketMessage.
+  * Fixed bug#8137 - Issues with Owner list refresh when selecting
+    a new Owner.
+  * Fixed bug#8180 - bin/otrs.LoaderCache.pl exit code is wrong.
+  * for more info please see CHANGES file
+    http://www.otrs.com/de/open-source/community-news/release-notes/\
+     release-notes-otrs-help-desk-311/
+- update OTRS::ITSM to 3.1.1
+  * for more info please see
+    http://www.otrs.com/de/open-source/community-news/release-notes/\
+     release-notes-otrs-itsm-311/
+- rebase patches
+  * perm, httpd_conf patch
+- rework init patch
+- update ZZZAuto.pm to reflect new versions (ITSM)
+- update sysconfig file
+- remove INSTALL from doc
+
+-------------------------------------------------------------------
 Fri Dec  2 21:14:19 UTC 2011 - alexandre@exatati.com.br
 
 - Fix wrong tests in init script;
--- otrs.spec.orig
+++ otrs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package otrs
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,11 +16,11 @@
 #
 
 
-%define otrs_ver 3.0.11
-%define itsm_ver 3.0.5
-%define itsm_min 3.0
+%define otrs_ver 3.1.1
+%define itsm_ver 3.1.1
+%define itsm_min 3.1
 %define otrs_root /srv
-%define otrsdoc_dir_files CHANGES COPYING* CREDITS INSTALL README* TODO UPGRADING doc
+%define otrsdoc_dir_files CHANGES COPYING* CREDITS README* UPGRADING doc
 
 Name:           otrs
 Summary:        The Open Ticket Request System
@@ -39,9 +39,11 @@ Source13:       %{name}.README.de
 Source14:       itsm.README.en
 Source15:       itsm.README.de
 Source16:       ZZZAuto.pm
-Patch0:         %{name}-3.0.11-init.patch
-Patch1:         %{name}-3.0.9-httpd_conf.patch
-Patch2:         %{name}-3.0.7-perm.patch
+Source20:       %{name}.init
+Source21:       %{name}-scheduler.init
+#atch0:         %{name}-3.1.1-init.patch
+Patch1:         %{name}-3.1.1-httpd_conf.patch
+Patch2:         %{name}-3.1.1-perm.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %insserv_prereq %fillup_prereq 
@@ -116,7 +118,7 @@ Authors list: see CREDITS
 
 %prep
 %setup -q -n %{name}-%{otrs_ver} -a 1
-%patch0
+#patch0
 %patch1
 %patch2
 ##### rpmlint
@@ -165,8 +167,8 @@ for file in var/cron/*.dist
 do
 %__mv $file var/cron/`basename $file .dist`
 done
-%__rm INSTALL.RedHat
-%__mv INSTALL.SuSE INSTALL
+%__rm INSTALL{,.RedHat,.SuSE}
+#%__mv INSTALL.SuSE INSTALL
 
 %install
 export DESTROOT="%{otrs_root}/%{name}/"
@@ -197,13 +199,15 @@ popd
 
 # remove unneeded files from scripts
 pushd ${RPM_BUILD_ROOT}/${DESTROOT}/scripts
-%__rm -rf apache{,2}*.conf auto_build* auto_docbuild.sh redhat-* suse-* *.spec test/* tool
+%__rm -rf apache{,2}*.conf auto_build* auto_docbuild.sh otrs-scheduler-* redhat-* suse-* *.spec test/* tool
 popd
 
 # install sysconfig file and init script
 %__install -D -m0644 ${RPM_SOURCE_DIR}/sysconfig.%{name} $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/sysconfig.%{name}
-%__install -D -m0755 scripts/suse-rc%{name} ${RPM_BUILD_ROOT}/etc/init.d/%{name}
+%__install -D -m0755 %{S:20} ${RPM_BUILD_ROOT}/etc/init.d/%{name}
 %__ln_s -f ../../etc/init.d/%{name} ${RPM_BUILD_ROOT}/%{_sbindir}/rc%{name}
+%__install -D -m0755 %{S:21} ${RPM_BUILD_ROOT}/etc/init.d/%{name}-scheduler
+%__ln_s -f ../../etc/init.d/%{name} ${RPM_BUILD_ROOT}/%{_sbindir}/rc%{name}-scheduler
 ## FIXME - nochown patch obsolete, cause script complete changed
 #${RPM_BUILD_ROOT}%{otrs_root}/%{name}/bin/SetPermissions.sh ${RPM_BUILD_ROOT}%{otrs_root}/%{name} %{name} wwwrun %{name} www echo
 
@@ -245,6 +249,7 @@ fi
 
 %post
 # fill otrs sysconfig file
+%{fillup_and_insserv -f otrs-scheduler}
 %{fillup_and_insserv otrs}
 /usr/sbin/a2enmod perl >/dev/null
 # if rpm is not in update mode
@@ -280,6 +285,7 @@ fi
 exit 0
 
 %postun
+%restart_on_update otrs-scheduler
 %restart_on_update otrs
 %restart_on_update apache2
 %insserv_cleanup
@@ -294,6 +300,8 @@ exit 0
 %config(noreplace) /etc/apache2/conf.d/%{name}.conf
 /etc/init.d/%{name}
 /usr/sbin/rc%{name}
+/etc/init.d/%{name}-scheduler
+/usr/sbin/rc%{name}-scheduler
 %{_var}/adm/fillup-templates/sysconfig.%{name}
 
 ###############
@@ -313,7 +321,6 @@ exit 0
 %{otrs_root}/%{name}/RELEASE
 
 # scripts
-%{otrs_root}/%{name}/scripts/*.php
 %{otrs_root}/%{name}/scripts/*.pl
 %{otrs_root}/%{name}/scripts/*.pm
 %{otrs_root}/%{name}/scripts/*.sql
@@ -405,8 +412,12 @@ exit 0
 %config(noreplace) %{otrs_root}/%{name}/Kernel/Config/GenericAgent.pm
 %{otrs_root}/%{name}/Kernel/Config/GenericAgent.pm.*
 %dir %{otrs_root}/%{name}/Kernel/Config/Files
+%{otrs_root}/%{name}/Kernel/Config/Files/Deprecated.xml
 %{otrs_root}/%{name}/Kernel/Config/Files/Framework.xml
+%{otrs_root}/%{name}/Kernel/Config/Files/GenericInterface.xml
+%{otrs_root}/%{name}/Kernel/Config/Files/Scheduler.xml
 %{otrs_root}/%{name}/Kernel/Config/Files/Ticket.xml
+%{otrs_root}/%{name}/Kernel/GenericInterface
 %{otrs_root}/%{name}/Kernel/cpan-lib
 %{otrs_root}/%{name}/Kernel/Language.pm
 %dir %{otrs_root}/%{name}/Kernel/Language
@@ -419,11 +430,14 @@ exit 0
 #dir %{otrs_root}/%{name}/Kernel/Output/HTML/Lite
 %dir %{otrs_root}/%{name}/Kernel/Output/HTML/Standard
 %{otrs_root}/%{name}/Kernel/Output/HTML/*.pm
+%{otrs_root}/%{name}/Kernel/Scheduler.pm
+%{otrs_root}/%{name}/Kernel/Scheduler
 %{otrs_root}/%{name}/Kernel/System/
 
 %files doc
-%defattr(-,root,root)
+%defattr(644,root,root,755)
 %doc %{otrsdoc_dir_files} scripts/apache2-httpd.include.conf
+%doc %{otrsdoc_dir_files} scripts/otrs-scheduler-*
 
 %files itsm
 %defattr(-,root,root)
--- sysconfig.otrs.orig
+++ sysconfig.otrs
@@ -7,6 +7,20 @@
 # 
 OTRS_PROG="OTRS"
 
+# Type:        string
+## Default:     otrs
+# 
+# OTRS User
+#
+OTRS_USER="otrs"
+
+## Type:        string
+## Default:     otrs
+# 
+# OTRS Group
+#
+OTRS_GROUP="otrs"
+
 ## Type:	string
 ## Default:	/srv/otrs
 # 
@@ -17,9 +31,16 @@ OTRS_ROOT="/srv/otrs"
 ## Type:	string(0,1)
 ## Default:	1
 #
+# The OTRS cron jobs run on this host? 1=yes, 0=no
+#
+OTRS_CRON_RUNNING="1"
+
+## Type:	string(0,1)
+## Default:	1
+#
 # The OTRS database is on this host? 1=yes, 0=no
 #
-OTRS_DB_RUNNING="1"
+OTRS_DB_RUNNING="0"
 
 ## Type:	string(0,1)
 ## Default:	1
@@ -31,9 +52,9 @@ OTRS_HTTP_RUNNING="1"
 ## Type:	string(0,1)
 ## Default:	1
 #
-# The OTRS cron jobs run on this host? 1=yes, 0=no
+# The OTRS scheduler server is on this host? 1=yes, 0=no
 #
-OTRS_CRON_RUNNING="1"
+OTRS_SCHEDULER_RUNNING="1"
 
 ## Type:	string(MySQL,PostgreSQL)
 ## Default:	MySQL
@@ -94,7 +115,7 @@ OTRS_CRON_USER=" -u otrs "
 # 
 # Command to get the systems hostname
 #
-OTRS_HOST="$( hostname -f)"
+OTRS_HOST="$(hostname -f)"
 
 ## Type:	string
 ## Default:	otrs
@@ -125,6 +146,28 @@ OTRS_CHECKDB="$OTRS_ROOT/bin/otrs.CheckD
 OTRS_CLEANUP="$OTRS_ROOT/bin/otrs.CleanUp.pl"
 
 ## Type:	string
+## Default:	$OTRS_ROOT/bin/otrs.Scheduler.pl
+#
+# Location of the Scheduler.pl script.
+#
+OTRS_SCHEDULER="$OTRS_ROOT/bin/otrs.Scheduler.pl"
+
+## Type:	string
+## Default:	"$OTRS_SCHEDULER -a status | grep 'Running'"
+#
+# Command to get status of Scheduler
+#
+OTRS_SCHEDULER_TEST="$OTRS_SCHEDULER -a status | grep 'Running'"
+
+# Type:        string
+## Default:     rcotrs-scheduler
+## ServiceRestart: otrs
+#
+# Init script to control the OTRS Scheduler
+#
+OTRS_USED_SCHEDULER_RCSCRIPT="rcotrs-scheduler"
+
+## Type:	string
 ## Default:	$OTRS_ROOT/var/spool
 # 
 # Location of the OTRS spool directory.

Places

File project.diff of Package otrs (Revision 728349f9b5314f79770f58bbb2ea6834)

Places