Hello community, here is the log from the commit of package qwebyast for openSUSE:12.3 checked in at 2013-02-07 10:47:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/qwebyast (Old) and /work/SRC/openSUSE:12.3/.qwebyast.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qwebyast", Maintainer is "tgoettlic...@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/qwebyast/qwebyast.changes 2013-01-31 01:36:08.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.qwebyast.new/qwebyast.changes 2013-02-07 10:47:52.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Jan 15 15:09:35 UTC 2013 - lsle...@suse.cz + +- updated desktop files (wrong port number) (bnc#790286) +- updated start script to work with the initscript (merged + services) +- 0.0.14 + +------------------------------------------------------------------- Old: ---- qwebyast-0.0.13.tar.bz2 New: ---- qwebyast-0.0.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qwebyast.spec ++++++ --- /var/tmp/diff_new_pack.4vypHa/_old 2013-02-07 10:47:52.000000000 +0100 +++ /var/tmp/diff_new_pack.4vypHa/_new 2013-02-07 10:47:52.000000000 +0100 @@ -22,7 +22,7 @@ Summary: WebYaST Desktop Applet License: GPL-3.0 or GPL-2.0 Group: System/Management -Version: 0.0.13 +Version: 0.0.14 Release: 0 Url: http://en.opensuse.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ qwebyast-0.0.13.tar.bz2 -> qwebyast-0.0.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qwebyast-0.0.13/AUTHORS new/qwebyast-0.0.14/AUTHORS --- old/qwebyast-0.0.13/AUTHORS 2011-09-20 11:30:12.000000000 +0200 +++ new/qwebyast-0.0.14/AUTHORS 2013-01-15 16:11:10.000000000 +0100 @@ -1 +1 @@ -Thomas Goettlicher <tgoettlic...@novell.com> +Thomas Goettlicher <tgoettlicher_at_novell.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qwebyast-0.0.13/README new/qwebyast-0.0.14/README --- old/qwebyast-0.0.13/README 2011-09-20 11:30:12.000000000 +0200 +++ new/qwebyast-0.0.14/README 2013-01-15 16:11:10.000000000 +0100 @@ -1,5 +1,10 @@ -SUSE Updater 0.1 -Narayan Newton <narayannew...@gmail.com> ----------------------------------------------------------------------- +QWebYaST Applet +--------------- + +This is a Qt based desktop applet for controlling WebYaST on the local machine. +(Although based on QT it can be used also in other desktops like GNOME...) + +It can start or stop WebYaST instance on the local machine or open WebYaST in a web browser. + +It is intended for users who want to use WebYaST on the local machine but do not want to keep it running all the time and just start it when needed. -This is a KDE updater applet for SUSE Linux. It currently supports the ZenWorks backend only, but should support multiple backends, including zypp and smart, in the future. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qwebyast-0.0.13/VERSION.cmake new/qwebyast-0.0.14/VERSION.cmake --- old/qwebyast-0.0.13/VERSION.cmake 2011-09-20 11:30:12.000000000 +0200 +++ new/qwebyast-0.0.14/VERSION.cmake 2013-01-15 16:11:10.000000000 +0100 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "0") -SET(VERSION_PATCH "13") +SET(VERSION_PATCH "14") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qwebyast-0.0.13/package/qwebyast.changes new/qwebyast-0.0.14/package/qwebyast.changes --- old/qwebyast-0.0.13/package/qwebyast.changes 2011-09-20 11:30:12.000000000 +0200 +++ new/qwebyast-0.0.14/package/qwebyast.changes 2013-01-15 16:11:10.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jan 15 15:09:35 UTC 2013 - lsle...@suse.cz + +- updated desktop files (wrong port number) (bnc#790286) +- updated start script to work with the initscript (merged + services) +- 0.0.14 + +------------------------------------------------------------------- Tue Sep 20 11:22:26 CEST 2011 - tgoettlic...@suse.de - fixed license diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qwebyast-0.0.13/qwebyast.spec.in new/qwebyast-0.0.14/qwebyast.spec.in --- old/qwebyast-0.0.13/qwebyast.spec.in 2011-09-20 11:30:12.000000000 +0200 +++ new/qwebyast-0.0.14/qwebyast.spec.in 2013-01-15 16:11:10.000000000 +0100 @@ -17,7 +17,7 @@ Summary: WebYaST Desktop Applet Version: @VERSION@ Release: 1 -URL: http://en.opensuse.org/ +URL: https://github.com/webyast/qwebyast BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 BuildRequires: update-desktop-files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qwebyast-0.0.13/src/chrome-webyast.desktop new/qwebyast-0.0.14/src/chrome-webyast.desktop --- old/qwebyast-0.0.13/src/chrome-webyast.desktop 2011-09-20 11:30:12.000000000 +0200 +++ new/qwebyast-0.0.14/src/chrome-webyast.desktop 2013-01-15 16:11:10.000000000 +0100 @@ -3,7 +3,7 @@ Version=1.0 GenericName=WebYaST Name=WebYaST -Exec=/opt/google/chrome/google-chrome --app="https://localhost:54984"; +Exec=/opt/google/chrome/google-chrome --app="https://localhost:4984"; Terminal=false Icon=qwebyast Type=Application diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qwebyast-0.0.13/src/chromium-webyast.desktop new/qwebyast-0.0.14/src/chromium-webyast.desktop --- old/qwebyast-0.0.13/src/chromium-webyast.desktop 2011-09-20 11:30:12.000000000 +0200 +++ new/qwebyast-0.0.14/src/chromium-webyast.desktop 2013-01-15 16:11:10.000000000 +0100 @@ -3,7 +3,7 @@ Version=1.0 GenericName=WebYaST Name=WebYaST -Exec=/usr/bin/chromium --app="https://localhost:54984"; +Exec=/usr/bin/chromium --app="https://localhost:4984"; Terminal=false Icon=qwebyast Type=Application diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qwebyast-0.0.13/src/constants.h new/qwebyast-0.0.14/src/constants.h --- old/qwebyast-0.0.13/src/constants.h 2011-09-20 11:30:12.000000000 +0200 +++ new/qwebyast-0.0.14/src/constants.h 2013-01-15 16:11:10.000000000 +0100 @@ -27,7 +27,7 @@ #define WEBYAST_CHECK_CMD "/usr/bin/webyast.sh status" #define WEBYAST_UP_CMD "kdesu /usr/bin/webyast.sh start" #define WEBYAST_DOWN_CMD "kdesu /usr/bin/webyast.sh stop" -#define BROWSER_URL "https://localhost:54984"; +#define BROWSER_URL "https://localhost:4984"; #define UPDATE_INTERVAL 15000 #define USE_EXTERNAL_BROWSER 1 #define IGNORE_SSL_ERRORS 1 @@ -36,4 +36,4 @@ #define FIREFOX_BIN "/usr/bin/firefox" #define CHROME_CMD "/usr/bin/env xdg-open /usr/share/applications/chrome-webyast.desktop" #define CHROMIUM_CMD "/usr/bin/env xdg-open /usr/share/applications/chromium-webyast.desktop" -#define FIREFOX_CMD "/usr/bin/firefox https://localhost:54984"; +#define FIREFOX_CMD "/usr/bin/firefox https://localhost:4984"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qwebyast-0.0.13/src/webyast.sh new/qwebyast-0.0.14/src/webyast.sh --- old/qwebyast-0.0.13/src/webyast.sh 2011-10-25 15:56:56.000000000 +0200 +++ new/qwebyast-0.0.14/src/webyast.sh 2013-01-15 16:11:10.000000000 +0100 @@ -2,22 +2,22 @@ case "$1" in start) - /usr/sbin/rcwebyast start && /usr/sbin/rccollectd start + /usr/sbin/rccollectd start + /usr/sbin/rcwebyast start RETVAL=$? ;; stop) - /usr/sbin/rcwebyast stop && /usr/sbin/rccollectd stop + /usr/sbin/rccollectd stop + /usr/sbin/rcwebyast stop RETVAL=$? ;; status) - - WS=`ps -ef | grep -E "(/usr/sbin/lighttpd -f /etc/yastws/|/usr/sbin/nginx -c /etc/yastws/nginx.conf)" | grep -v grep | wc -l` - WC=`ps -ef | grep -E "(/usr/sbin/lighttpd -f /srv/www/yast/config/lighttpd.conf|/usr/sbin/nginx -c /etc/yastwc/nginx.conf)" | grep -v grep | wc -l` + WY=`pgrep -c -f "/usr/sbin/nginx -c /etc/webyast/nginx.conf"` - if [ $WS -eq 1 ] && [ $WC -eq 1 ]; then - RETVAL=0 - else + if [ $WY -eq 0 ]; then RETVAL=3 + else + RETVAL=0 fi ;; esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qwebyast-0.0.13/src/webyast.sh~ new/qwebyast-0.0.14/src/webyast.sh~ --- old/qwebyast-0.0.13/src/webyast.sh~ 2011-09-20 11:30:12.000000000 +0200 +++ new/qwebyast-0.0.14/src/webyast.sh~ 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -#!/bin/bash - -case "$1" in - start) - /usr/sbin/rcyastws start && /usr/sbin/rcyastwc start && /usr/sbin/rccollectd start - RETVAL=$? - ;; - stop) - /usr/sbin/rcyastws stop && /usr/sbin/rcyastwc stop && /usr/sbin/rccollectd stop - RETVAL=$? - ;; - status) - - WS=`ps -ef | grep -E "(/usr/sbin/lighttpd -f /etc/yastws/|/usr/sbin/nginx -c /etc/yastws/nginx.conf)" | grep -v grep | wc -l` - WC=`ps -ef | grep -E "(/usr/sbin/lighttpd -f /srv/www/yast/config/lighttpd.conf|/usr/sbin/nginx -c /etc/yastwc/nginx.conf)" | grep -v grep | wc -l` - - if [ $WS -eq 1 ] && [ $WC -eq 1 ]; then - RETVAL=0 - else - RETVAL=3 - fi - ;; -esac - -exit $RETVAL - - -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
