Hello community, here is the log from the commit of package otrs for openSUSE:Factory checked in at 2011-12-06 16:23:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/otrs (Old) and /work/SRC/openSUSE:Factory/.otrs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "otrs", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/otrs/otrs.changes 2011-09-23 12:21:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.otrs.new/otrs.changes 2011-12-06 16:23:30.000000000 +0100 @@ -1,0 +2,16 @@ +Fri Dec 2 21:14:19 UTC 2011 - [email protected] + +- Fix wrong tests in init script; +- Fix permissions in bin to properly functioning of cron tasks; +- Fix sysconfig variable for OTRS_CLEANUP; +- Refresh all patches with -p0. + +------------------------------------------------------------------- +Fri Nov 18 10:13:06 UTC 2011 - [email protected] + +- update to 3.0.11 + o several OTRS bug fixes (http://bugs.otrs.org/) + for more info please see CHANGES file + http://otrs.org/releases/3.0.11/ + +------------------------------------------------------------------- Old: ---- otrs-3.0.10.tar.bz2 otrs-3.0.7-init.patch New: ---- otrs-3.0.11-init.patch otrs-3.0.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ otrs.spec ++++++ --- /var/tmp/diff_new_pack.zB1br6/_old 2011-12-06 16:23:33.000000000 +0100 +++ /var/tmp/diff_new_pack.zB1br6/_new 2011-12-06 16:23:33.000000000 +0100 @@ -16,7 +16,7 @@ # -%define otrs_ver 3.0.10 +%define otrs_ver 3.0.11 %define itsm_ver 3.0.5 %define itsm_min 3.0 %define otrs_root /srv @@ -39,7 +39,7 @@ Source14: itsm.README.en Source15: itsm.README.de Source16: ZZZAuto.pm -Patch0: %{name}-3.0.7-init.patch +Patch0: %{name}-3.0.11-init.patch Patch1: %{name}-3.0.9-httpd_conf.patch Patch2: %{name}-3.0.7-perm.patch BuildArch: noarch @@ -116,9 +116,9 @@ %prep %setup -q -n %{name}-%{otrs_ver} -a 1 -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch0 +%patch1 +%patch2 ##### rpmlint #### incorrect-fsf-address ### http://www.fsf.org/about/contact/ @@ -327,10 +327,11 @@ ############### ## {otrs,www} ############### -%defattr(0644,%{name},www,0775) - +%defattr(0744,%{name},www,0775) # bin %{otrs_root}/%{name}/bin + +%defattr(0644,%{name},www,0775) %exclude %{otrs_root}/%{name}/bin/%{name}.DeleteSessionIDs.pl %exclude %{otrs_root}/%{name}/bin/%{name}.UnlockTickets.pl %exclude %{otrs_root}/%{name}/bin/%{name}.GetConfig.pl ++++++ otrs-3.0.7-init.patch -> otrs-3.0.11-init.patch ++++++ --- /work/SRC/openSUSE:Factory/otrs/otrs-3.0.7-init.patch 2011-09-23 12:21:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.otrs.new/otrs-3.0.11-init.patch 2011-12-06 16:23:30.000000000 +0100 @@ -1,7 +1,8 @@ -diff -ruN otrs-3.0.7-orig/scripts/suse-rcotrs otrs-3.0.7/scripts/suse-rcotrs ---- otrs-3.0.7-orig/scripts/suse-rcotrs 2010-10-11 19:21:09.000000000 +0200 -+++ otrs-3.0.7/scripts/suse-rcotrs 2011-05-07 13:12:38.000000000 +0200 -@@ -12,25 +12,39 @@ +Index: scripts/suse-rcotrs +=================================================================== +--- scripts/suse-rcotrs.orig ++++ scripts/suse-rcotrs +@@ -12,25 +12,57 @@ ### BEGIN INIT INFO # Provides: otrs @@ -26,34 +27,50 @@ -# -CONFIGFILE="rcconfig file not found!" -test -r /etc/rc.config && . /etc/rc.config -- --test -r /etc/rc.config.d/otrs && . /etc/rc.config.d/otrs && CONFIGFILE=/etc/rc.config.d/otrs -- --test -r /etc/sysconfig/otrs && . /etc/sysconfig/otrs && CONFIGFILE=/etc/sysconfig/otrs +# Check for existence of needed config file and read it +OTRS_SYSCONFIG=/etc/sysconfig/otrs +test -r $OTRS_SYSCONFIG || { echo "$OTRS_SYSCONFIG not existing"; + if [ "$1" = "stop" ]; then exit 0; + else exit 6; fi; } + -+# Read config ++# Read config +. $OTRS_SYSCONFIG + -+test -z $OTRS_ROOT || { echo "OTRS_ROOT not set"; -+ echo "check config: $OTRS_SYSCONFIG"; -+ exit 6; } ++if [ -z $OTRS_ROOT ]; then ++ echo "OTRS_ROOT not set"; ++ echo "check config: $OTRS_SYSCONFIG"; ++ exit 6; ++fi + -+test -z $OTRS_POSTMASTER || { echo "OTRS_POSTMASTER not set"; -+ echo "check config: $OTRS_SYSCONFIG"; -+ exit 6; } ++if [ -z $OTRS_POSTMASTER ]; then ++ echo "OTRS_POSTMASTER not set"; ++ echo "check config: $OTRS_SYSCONFIG"; ++ exit 6; ++fi + +-test -r /etc/rc.config.d/otrs && . /etc/rc.config.d/otrs && CONFIGFILE=/etc/rc.config.d/otrs ++if [ -z $OTRS_CHECKDB ]; then ++ echo "OTRS_CHECKDB not set"; ++ echo "check config: $OTRS_SYSCONFIG"; ++ exit 6; ++fi + +-test -r /etc/sysconfig/otrs && . /etc/sysconfig/otrs && CONFIGFILE=/etc/sysconfig/otrs ++if [ -z $OTRS_CLEANUP ]; then ++ echo "OTRS_CLEANUP not set"; ++ echo "check config: $OTRS_SYSCONFIG"; ++ exit 6; ++fi + -+test -z $OTRS_SPOOLDIR || { echo "OTRS_SPOOLDIR not set"; -+ echo "check config: $OTRS_SYSCONFIG"; -+ exit 6; } ++if [ -z $OTRS_SPOOLDIR ]; then ++ echo "OTRS_SPOOLDIR not set"; ++ echo "check config: $OTRS_SYSCONFIG"; ++ exit 6; ++fi # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status -@@ -41,64 +55,22 @@ +@@ -41,64 +73,22 @@ test -r /etc/sysconfig/otrs && . /etc/sy # rc_failed <num> set local and overall rc status to <num> # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status @@ -131,7 +148,7 @@ case "$1" in # ------------------------------------------------------ # start -@@ -394,6 +366,16 @@ +@@ -394,6 +384,16 @@ case "$1" in rc_status ;; # ------------------------------------------------------ ++++++ otrs-3.0.10.tar.bz2 -> otrs-3.0.11.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/otrs/otrs-3.0.10.tar.bz2 /work/SRC/openSUSE:Factory/.otrs.new/otrs-3.0.11.tar.bz2 differ: char 11, line 1 ++++++ otrs-3.0.7-perm.patch ++++++ --- /var/tmp/diff_new_pack.zB1br6/_old 2011-12-06 16:23:33.000000000 +0100 +++ /var/tmp/diff_new_pack.zB1br6/_new 2011-12-06 16:23:33.000000000 +0100 @@ -1,7 +1,8 @@ -diff -ruN otrs-3.0.7-orig/Kernel/System/Package.pm otrs-3.0.7/Kernel/System/Package.pm ---- otrs-3.0.7-orig/Kernel/System/Package.pm 2010-09-23 10:44:35.000000000 +0200 -+++ otrs-3.0.7/Kernel/System/Package.pm 2011-05-07 13:13:24.000000000 +0200 -@@ -2436,7 +2436,7 @@ +Index: Kernel/System/Package.pm +=================================================================== +--- Kernel/System/Package.pm.orig ++++ Kernel/System/Package.pm +@@ -2436,7 +2436,7 @@ sub _FileSystemCheck { } # create test files in following directories ++++++ otrs-3.0.9-httpd_conf.patch ++++++ --- /var/tmp/diff_new_pack.zB1br6/_old 2011-12-06 16:23:33.000000000 +0100 +++ /var/tmp/diff_new_pack.zB1br6/_new 2011-12-06 16:23:33.000000000 +0100 @@ -1,6 +1,7 @@ -diff -ruN otrs-3.0.9-orig/scripts/apache2-httpd.include.conf otrs-3.0.9/scripts/apache2-httpd.include.conf ---- otrs-3.0.9-orig/scripts/apache2-httpd.include.conf 2011-04-20 00:09:24.000000000 +0200 -+++ otrs-3.0.9/scripts/apache2-httpd.include.conf 2011-07-09 19:02:32.000000000 +0200 +Index: scripts/apache2-httpd.include.conf +=================================================================== +--- scripts/apache2-httpd.include.conf.orig ++++ scripts/apache2-httpd.include.conf @@ -4,8 +4,8 @@ # -- @@ -12,7 +13,7 @@ # activate this if you are using an Oracle database #SetEnv ORACLE_HOME /path/to/your/oracle/ -@@ -17,7 +17,7 @@ +@@ -17,7 +17,7 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht <IfModule mod_perl.c> # load all otrs modules @@ -21,7 +22,7 @@ # Apache::Reload - Reload Perl Modules when Changed on Disk PerlModule Apache2::Reload -@@ -40,26 +40,53 @@ +@@ -40,26 +40,53 @@ Alias /otrs-web/ "/opt/otrs/var/httpd/ht </IfModule> # directory settings ++++++ sysconfig.otrs ++++++ --- /var/tmp/diff_new_pack.zB1br6/_old 2011-12-06 16:23:34.000000000 +0100 +++ /var/tmp/diff_new_pack.zB1br6/_new 2011-12-06 16:23:34.000000000 +0100 @@ -104,25 +104,25 @@ OTRS_HTTP_LOCATION="otrs" ## Type: string -## Default: $OTRS_ROOT/bin/PostMaster.pl +## Default: $OTRS_ROOT/bin/otrs.PostMaster.pl # # Location of the PostMaster.pl script. # -OTRS_POSTMASTER="$OTRS_ROOT/bin/PostMaster.pl" +OTRS_POSTMASTER="$OTRS_ROOT/bin/otrs.PostMaster.pl" ## Type: string -## Default: $OTRS_ROOT/bin/CheckDB.pl +## Default: $OTRS_ROOT/bin/otrs.CheckDB.pl # # Location of the CheckDB.pl script. # -OTRS_CHECKDB="$OTRS_ROOT/bin/CheckDB.pl" +OTRS_CHECKDB="$OTRS_ROOT/bin/otrs.CheckDB.pl" ## Type: string -## Default: $OTRS_ROOT/bin/CleanUp.pl +## Default: $OTRS_ROOT/bin/otrs.CleanUp.pl # # Location of the CleanUp.pl script. # -OTRS_CHECKDB="$OTRS_ROOT/bin/CleanUp.pl" +OTRS_CLEANUP="$OTRS_ROOT/bin/otrs.CleanUp.pl" ## Type: string ## Default: $OTRS_ROOT/var/spool -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
