Hello community, here is the log from the commit of package xscreensaver for openSUSE:Factory checked in at 2014-09-01 16:58:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xscreensaver (Old) and /work/SRC/openSUSE:Factory/.xscreensaver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xscreensaver" Changes: -------- --- /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver.changes 2014-06-26 10:42:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xscreensaver.new/xscreensaver.changes 2014-09-01 16:58:49.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 15 18:09:43 UTC 2014 - gber@opensuse.org + +- add xscreensaver-disable-upgrade-nagging-message.patch in order + to disable nagging messages about upgrading to a newer version + (bnc#890595) + +------------------------------------------------------------------- New: ---- xscreensaver-disable-upgrade-nagging-message.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xscreensaver.spec ++++++ --- /var/tmp/diff_new_pack.XZUVL9/_old 2014-09-01 16:58:52.000000000 +0200 +++ /var/tmp/diff_new_pack.XZUVL9/_new 2014-09-01 16:58:52.000000000 +0200 @@ -55,8 +55,10 @@ Patch24: xscreensaver-slideshow-dri-detect.patch Patch29: xscreensaver-ignore-no-pwent-password.patch Patch32: xscreensaver-fireworkx-man.patch -# PATCH-FIX-OPENSUSE xscreensaver-webcollage-dictpath.patch -- add /var/lib/dict/words to search path for word dictionaries -- seife+obs@b1-systems.com +# PATCH-FIX-OPENSUSE xscreensaver-webcollage-dictpath.patch seife+obs@b1-systems.com -- add /var/lib/dict/words to search path for word dictionaries Patch42: xscreensaver-webcollage-dictpath.patch +# PATCH-FEATURE-OPENSUSE xscreensaver-disable-upgrade-nagging.patch bnc#890595 gber@opensuse.org -- Disable nagging messages about upgrading to a newer version +Patch43: xscreensaver-disable-upgrade-nagging-message.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -119,6 +121,7 @@ %patch29 %patch32 %patch42 -p1 +%patch43 -p1 # KDE and GNOME have its own screensavers: echo 'NotShowIn=KDE;GNOME;' >>driver/screensaver-properties.desktop.in ++++++ xscreensaver-disable-upgrade-nagging-message.patch ++++++ Index: xscreensaver-5.29/driver/prefs.c =================================================================== --- xscreensaver-5.29.orig/driver/prefs.c +++ xscreensaver-5.29/driver/prefs.c @@ -1659,35 +1659,5 @@ stop_the_insanity (saver_preferences *p) Bool senescent_p (void) { - time_t now = time ((time_t *) 0); - struct tm *tm = localtime (&now); - const char *s = screensaver_id; - char mon[4], year[5]; - int m, y, months; - s = strchr (s, ' '); if (!s) abort(); s++; - s = strchr (s, '('); if (!s) abort(); s++; - s = strchr (s, '-'); if (!s) abort(); s++; - strncpy (mon, s, 3); - mon[3] = 0; - s = strchr (s, '-'); if (!s) abort(); s++; - strncpy (year, s, 4); - year[4] = 0; - y = atoi (year); - if (!strcmp(mon, "Jan")) m = 0; - else if (!strcmp(mon, "Feb")) m = 1; - else if (!strcmp(mon, "Mar")) m = 2; - else if (!strcmp(mon, "Apr")) m = 3; - else if (!strcmp(mon, "May")) m = 4; - else if (!strcmp(mon, "Jun")) m = 5; - else if (!strcmp(mon, "Jul")) m = 6; - else if (!strcmp(mon, "Aug")) m = 7; - else if (!strcmp(mon, "Sep")) m = 8; - else if (!strcmp(mon, "Oct")) m = 9; - else if (!strcmp(mon, "Nov")) m = 10; - else if (!strcmp(mon, "Dec")) m = 11; - else abort(); - months = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) - - (y * 12 + m)); - - return (months > 12); + return False; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org