September 2008 - openSUSE Commits - openSUSE Mailing Lists

commit blender
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package blender checked in at Mon Sep 29 18:31:37 CEST 2008. -------- --- blender/blender.changes 2008-09-02 11:10:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/blender/blender.changes 2008-09-29 01:08:00.443427000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 29 01:07:47 CEST 2008 - ro(a)suse.de + +- fix build: python version is 2.6 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.N20884/_old 2008-09-29 18:31:23.000000000 +0200 +++ /var/tmp/diff_new_pack.N20884/_new 2008-09-29 18:31:23.000000000 +0200 @@ -31,7 +31,7 @@ AutoReqProv: on Requires: yafray Version: 2.47 -Release: 1 +Release: 6 %if %DISTRIBUTABLE <= 0 Source: %{name}-%{version}.tar.bz2 %else @@ -123,8 +123,8 @@ %build rm -rf ../build scons BF_QUIET=0 \ - BF_PYTHON_VERSION=2.5 \ - BF_PYTHON_INC=/usr/include/python2.5 \ + BF_PYTHON_VERSION=2.6 \ + BF_PYTHON_INC=/usr/include/python2.6 \ WITH_BF_OPENAL=yes \ BF_OPENAL_LIBPATH=/usr/include/AL \ WITH_BF_SDL=yes \ @@ -148,8 +148,8 @@ CFLAGS="$RPM_OPT_FLAGS" %if %DISTRIBUTABLE <= 0 scons BF_QUIET=0 \ - BF_PYTHON_VERSION=2.5 \ - BF_PYTHON_INC=/usr/include/python2.5 \ + BF_PYTHON_VERSION=2.6 \ + BF_PYTHON_INC=/usr/include/python2.6 \ WITH_BF_OPENAL=yes \ BF_OPENAL_LIBPATH=/usr/include/AL \ WITH_BF_SDL=yes \ @@ -265,6 +265,8 @@ %{_libdir}/%{name}/plugins/include/* %changelog +* Mon Sep 29 2008 ro(a)suse.de +- fix build: python version is 2.6 * Tue Sep 02 2008 pnemec(a)suse.cz - updated to 2.47 New tools and improvement have been made to the Snapping tools. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alpine
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package alpine checked in at Mon Sep 29 18:30:53 CEST 2008. -------- --- alpine/alpine.changes 2008-04-26 14:18:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/alpine/alpine.changes 2008-09-29 17:31:15.000000000 +0200 @@ -1,0 +2,21 @@ +Mon Sep 29 17:23:42 CEST 2008 - max(a)suse.de + +- Update to version 2.00 and the related Chappa patches. +- Changes include: + * Experimental S/MIME support added in UNIX versions of Alpine + * Enhance address completion in the composer (TAB command) + * Add line wrapping when displaying PRE formatted sections of + HTML + * Fix a crash when using tab-completion for selecting a Save + filename + * Fix viewing, printing, exporting, replying, and bouncing of + message digests. + * The Unknown Character Set option did not work correctly + interpreting unknown characters in message headers + * Crash when TABing to next folder, the next folder with new + mail is a POP folder, and there is a more than 10 minute + pause between typing the TAB and typing the Yes +- For more details, see: + http://www.washington.edu/alpine/changes/1.10-to-2.00.html + +------------------------------------------------------------------- Old: ---- alpine-1.10.tar.lzma chappa-cherrypick.sh chappa-patches.tar.lzma hide-release_number-in-titlebar.c New: ---- alpine-2.00.tar.bz2 chappa-colortext.patch.gz chappa-fancy.patch.gz chappa-ignoresize.patch.gz chappa-insertpat.patch.gz chappa-maildir.patch.gz chappa-searchheader.patch.gz chappa-WrtAcc.patch.gz pine-nonvoid-function.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alpine.spec ++++++ --- /var/tmp/diff_new_pack.Q17627/_old 2008-09-29 18:30:20.000000000 +0200 +++ /var/tmp/diff_new_pack.Q17627/_new 2008-09-29 18:30:20.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package alpine (Version 1.10) +# spec file for package alpine (Version 2.00) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -21,19 +28,14 @@ %define obsolete_pine 0 %define provide_pico_and_pilot 0 %endif -%define build_alpined 0 # # For debugging only: %define use_mudflap 0 %define build_vanilla 0 -# Set this if you want to apply Eduardo Chappa's patches.all.gz: -%define apply_all_in_one_patch 0 # -Summary: Alpine mail user agent -BuildRequires: imap-devel krb5-devel libgssapi lzma ncurses-devel openldap2-devel openssl-devel pam-devel update-desktop-files -%if %build_alpined -BuildRequires: blt tcl-devel -%endif +Summary: Alpine mail user agent (formerly pine) +BuildRequires: imap-devel krb5-devel libgssapi lzma ncurses-devel +BuildRequires: openldap2-devel openssl-devel pam-devel update-desktop-files %if %{use_mudflap} BuildRequires: libmudflap %endif @@ -47,39 +49,17 @@ Conflicts: pine4 %endif # -Version: 1.10 -Release: 2 +Version: 2.00 +Release: 1 License: The Apache Software License Group: Productivity/Networking/Email/Clients AutoReqProv: on Url: http://www.washington.edu/alpine/ -# -# Fix for #308533: Remove files with unclear license, which are not needed -# from the distributed source tarball: -# -%define USE_CLEANED_UP_TARBALL_FORBUILD 1 -%if %USE_CLEANED_UP_TARBALL_FORBUILD == 1 -#This caret is only here to prevent confusing spec file checking tools: -#%( - cd %{_sourcedir};cp %{name}-%{version}{,-build}.tar.lzma - lzma -d %{name}-%{version}-build.tar.lzma - tar --delete --file=%{name}-%{version}-build.tar \ - ./%{name}-%{version}/pico/msmem.c ./%{name}-%{version}/imap/docs - echo >%{name}-%{version}.README.SUSE <<END -Some files which are not needed for compilation have been removed from -this tarball. You can get the full tarball from %{URL}. -END - tar --append ./%{name}-%{version}.README.SUSE \ - --file=%{name}-%{version}-build.tar - lzma -9 %{name}-%{version}-build.tar -) -%endif -Source: %{name}-%{version}.tar.lzma -# +Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source1: %name.png Source2: %name.desktop -Patch1: hide-release_number-in-titlebar.c +Patch1: pine-nonvoid-function.patch Patch2: make-use-of-strncat-safer.diff Patch3: operation-may-be-undefined-warning.diff Patch10: pico-fix-spurious-undef-warnings.diff @@ -87,24 +67,35 @@ Patch40: pico-stripwhitespace.diff Patch60: signal-and-panic-improvements.diff # -# Eduardo Chappa's patches. Currently, We only use the 'all_in_one' version: +# Eduardo Chappa's patches. +# http://staff.washington.edu/chappa/alpine/patches # -%if !%{apply_all_in_one_patch} -Source600: chappa-cherrypick.sh -Source601: chappa-patches.tar.lzma -%else -#Patch500: staff.washington.edu/chappa/alpine/patches/alpine-%{version}/all.patch.gz -%endif +Patch600: chappa-colortext.patch.gz +Patch601: chappa-fancy.patch.gz +Patch602: chappa-ignoresize.patch.gz +Patch603: chappa-insertpat.patch.gz +Patch604: chappa-maildir.patch.gz +Patch605: chappa-searchheader.patch.gz +Patch606: chappa-WrtAcc.patch.gz %description -Alpine is an major update of Pine, most importantly featuring improved -support for UTF-8 (Unicode) and is licensed under an OSI-approved -license (the Apache License). - Though originally designed for inexperienced email users, Alpine supports many advanced features, and an ever-growing number of configuration and personal-preference options. +Alpine (formerly Pine) features improved support for UTF-8 and the code +is licensed under the Apache License. + +Despite many improvements "under the hood" (the bugs which were +introduced by them were ironed out during more than a full year of +public beta testing), the user interface stays the same, so pine users +can switch painlessly to alpine and notice no change at all. + +It uses the same configuration files as pine, so it's a clean update. + +The biggest user-visible change are the new animations which are shown +when operations take a long time. + %package -n pico @@ -149,17 +140,19 @@ >compile-warnings-allowed.log fi # -# People which want, can use the full all.patch.gz with apply_all_in_one_patch: +# "Chappa" patches # -%if %{apply_all_in_one_patch} -%patch500 -p1 -%else -sh %{SOURCE600} --apply %{SOURCE601} -%endif +%patch600 -p1 +%patch601 -p1 +%patch602 -p1 +%patch603 -p1 +%patch604 -p1 +%patch605 -p1 +%patch606 -p1 # # SuSE patches - warning fixes, etc: # -%patch1 -p1 +%patch1 %patch2 -p1 %patch3 -p1 %patch10 -p1 @@ -180,7 +173,7 @@ # export CFLAGS="${RPM_OPT_FLAGS/-O2/-Os} \ %if %{suse_version} >= 1010 - -Wno-unused-value -Wno-strict-aliasing -Wno-pointer-sign -Wno-unused \ + -Wno-unused-value -fno-strict-aliasing -Wno-pointer-sign -Wno-unused \ %endif %if %{suse_version} >= 1030 -Wno-address \ @@ -221,7 +214,7 @@ LDFLAGS="$LDFLAGS $EXTRALDFLAGS" %endif : -%configure --with-tcl-lib=tcl8.4 \ +%configure \ %if %{use_mudflap} %( : 'mudflap(th) does not work with with threads:' )\ --without-pthread \ @@ -236,6 +229,7 @@ --with-debug-files=2 \ --with-file=.alpine-debug \ --with-default-mail-directory=Mail \ + --with-web-bin=%_libdir/%name \ --with-passfile=.pinepw || { grep -B9 -A20 'failed program was' config.log | grep -A24 checking exit 5 @@ -243,22 +237,15 @@ # # imap does not use CFLAGS from configure, needs EXTRACFLAGS/EXTRALDFLAGS: # -make EXTRACFLAGS="$CFLAGS" EXTRALDFLAGS="$EXTRALDFLAGS" 2>&1 | tee make.log | - grep -v -e '^mv ' -e '/usr/bin/[a-z]*' -e '^echo ' -e ' -l' | - sed 's/.*gcc .* -o .*\.o /-----> /;/^-----/s/;.*//;/^then/d' +make %{?jobs:-j%jobs} EXTRACFLAGS="$CFLAGS" EXTRALDFLAGS="$EXTRALDFLAGS" %install -install -D -m755 alpine/alpine $RPM_BUILD_ROOT%{_bindir}/alpine -: +make install DESTDIR=%buildroot # # When called as alpinef, alpine uses function keys instead of Control keys: # ln $RPM_BUILD_ROOT%{_bindir}/alpine $RPM_BUILD_ROOT%{_bindir}/alpinef -: -install -m755 alpine/{rpload,rpdump} $RPM_BUILD_ROOT%{_bindir} install -m755 imap/mailutil/mailutil $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 -install -m644 doc/{alpine.1,rpdump.1,rpload.1} $RPM_BUILD_ROOT%{_mandir}/man1/ install -m644 imap/src/mailutil/mailutil.1 $RPM_BUILD_ROOT%{_mandir}/man1/ install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/pixmaps/%name.png install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications/%name.desktop @@ -327,14 +314,14 @@ fi %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +rm -rf %buildroot %files %defattr(-, root, root) -%doc %{_mandir}/man1/alpine.1.gz -%doc %{_mandir}/man1/rpdump.1.gz -%doc %{_mandir}/man1/rpload.1.gz -%doc %{_mandir}/man1/mailutil.1.gz +%doc %{_mandir}/man1/alpine.* +%doc %{_mandir}/man1/rpdump.* +%doc %{_mandir}/man1/rpload.* +%doc %{_mandir}/man1/mailutil.* %doc README NOTICE LICENSE %doc doc/mailcap.unx doc/mime.types doc/tech-notes.txt doc/tech-notes/*.html %{_bindir}/*pine @@ -348,15 +335,33 @@ %files -n pico %defattr(-, root, root) %{_bindir}/pico -%doc %{_mandir}/man1/pico.1.gz +%doc %{_mandir}/man1/pico.* %files -n pilot %defattr(-, root, root) %{_bindir}/pilot -%doc %{_mandir}/man1/pilot.1.gz +%doc %{_mandir}/man1/pilot.* %endif %changelog +* Mon Sep 29 2008 max(a)suse.de +- Update to version 2.00 and the related Chappa patches. +- Changes include: + * Experimental S/MIME support added in UNIX versions of Alpine + * Enhance address completion in the composer (TAB command) + * Add line wrapping when displaying PRE formatted sections of + HTML + * Fix a crash when using tab-completion for selecting a Save + filename + * Fix viewing, printing, exporting, replying, and bouncing of + message digests. + * The Unknown Character Set option did not work correctly + interpreting unknown characters in message headers + * Crash when TABing to next folder, the next folder with new + mail is a POP folder, and there is a more than 10 minute + pause between typing the TAB and typing the Yes +- For more details, see: + http://www.washington.edu/alpine/changes/1.10-to-2.00.html * Sat Apr 26 2008 coolo(a)suse.de - fix build * Fri Apr 25 2008 bk(a)suse.de ++++++ chappa-colortext.patch.gz ++++++ diff -rc alpine-2.00/alpine/confscroll.c alpine-2.00.colortext/alpine/confscroll.c *** alpine-2.00/alpine/confscroll.c 2008-08-21 15:14:45.000000000 -0700 --- alpine-2.00.colortext/alpine/confscroll.c 2008-08-26 20:56:51.000000000 -0700 *************** *** 5176,5181 **** --- 5176,5184 ---- clear_index_cache(ps->mail_stream, 0); } + else if(var == &ps->vars[V_SPECIAL_TEXT]){ + regex_pattern(ps->VAR_SPECIAL_TEXT); + } else if(var == &ps->vars[V_INIT_CMD_LIST]){ if(!revert) q_status_message(SM_ASYNC, 0, 3, diff -rc alpine-2.00/pith/conf.c alpine-2.00.colortext/pith/conf.c *** alpine-2.00/pith/conf.c 2008-08-22 17:07:05.000000000 -0700 --- alpine-2.00.colortext/pith/conf.c 2008-08-26 20:56:51.000000000 -0700 *************** *** 225,230 **** --- 225,232 ---- CONF_TXT_T cf_text_fillcol[] = "Specifies the column of the screen where the composer should wrap."; + CONF_TXT_T cf_special_text_color[] = "Specifies a comma separated list of text and regular expresions that Pine\n# will highlight"; + CONF_TXT_T cf_text_replystr[] = "Specifies the string to insert when replying to a message."; CONF_TXT_T cf_text_quotereplstr[] = "Specifies the string to replace quotes with when viewing a message."; *************** *** 557,562 **** --- 559,566 ---- NULL, cf_text_speller}, {"composer-wrap-column", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, NULL, cf_text_fillcol}, + {"special-text-color", 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, + NULL, cf_special_text_color}, {"reply-indent-string", 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, NULL, cf_text_replystr}, {"reply-leadin", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, *************** *** 808,813 **** --- 812,819 ---- {"incoming-unseen-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"signature-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"signature-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, + {"special-text-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, + {"special-text-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"prompt-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"prompt-background-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, {"header-general-foreground-color", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0}, *************** *** 1943,1948 **** --- 1949,1956 ---- set_current_val(&vars[V_FORM_FOLDER], TRUE, TRUE); set_current_val(&vars[V_EDITOR], TRUE, TRUE); set_current_val(&vars[V_SPELLER], TRUE, TRUE); + set_current_val(&vars[V_SPECIAL_TEXT], TRUE, TRUE); + regex_pattern(VAR_SPECIAL_TEXT); set_current_val(&vars[V_IMAGE_VIEWER], TRUE, TRUE); set_current_val(&vars[V_BROWSER], TRUE, TRUE); set_current_val(&vars[V_SMTP_SERVER], TRUE, TRUE); *************** *** 6379,6384 **** --- 6387,6393 ---- set_color_val(&vars[V_IND_OP_FORE_COLOR], 0); set_color_val(&vars[V_INCUNSEEN_FORE_COLOR], 0); set_color_val(&vars[V_SIGNATURE_FORE_COLOR], 0); + set_color_val(&vars[V_SPECIAL_TEXT_FORE_COLOR], 0); set_current_val(&ps->vars[V_VIEW_HDR_COLORS], TRUE, TRUE); set_current_val(&ps->vars[V_KW_COLORS], TRUE, TRUE); *************** *** 7554,7559 **** --- 7563,7570 ---- return(h_config_scroll_margin); case V_DEADLETS : return(h_config_deadlets); + case V_SPECIAL_TEXT : + return(h_config_special_text_to_color); case V_FILLCOL : return(h_config_composer_wrap_column); case V_TCPOPENTIMEO : *************** *** 7713,7718 **** --- 7724,7732 ---- case V_SIGNATURE_FORE_COLOR : case V_SIGNATURE_BACK_COLOR : return(h_config_signature_color); + case V_SPECIAL_TEXT_FORE_COLOR : + case V_SPECIAL_TEXT_BACK_COLOR : + return(h_config_special_text_color); case V_PROMPT_FORE_COLOR : case V_PROMPT_BACK_COLOR : return(h_config_prompt_color); diff -rc alpine-2.00/pith/conf.h alpine-2.00.colortext/pith/conf.h *** alpine-2.00/pith/conf.h 2008-08-19 17:27:11.000000000 -0700 --- alpine-2.00.colortext/pith/conf.h 2008-08-26 20:56:51.000000000 -0700 *************** *** 160,165 **** --- 160,167 ---- #define GLO_EDITOR vars[V_EDITOR].global_val.l #define VAR_SPELLER vars[V_SPELLER].current_val.p #define GLO_SPELLER vars[V_SPELLER].global_val.p + #define VAR_SPECIAL_TEXT vars[V_SPECIAL_TEXT].current_val.l + #define GLO_SPECIAL_TEXT vars[V_SPECIAL_TEXT].global_val.l #define VAR_FILLCOL vars[V_FILLCOL].current_val.p #define GLO_FILLCOL vars[V_FILLCOL].global_val.p #define VAR_DEADLETS vars[V_DEADLETS].current_val.p *************** *** 443,448 **** --- 445,452 ---- #define GLO_SIGNATURE_FORE_COLOR vars[V_SIGNATURE_FORE_COLOR].global_val.p #define VAR_SIGNATURE_BACK_COLOR vars[V_SIGNATURE_BACK_COLOR].current_val.p #define GLO_SIGNATURE_BACK_COLOR vars[V_SIGNATURE_BACK_COLOR].global_val.p + #define VAR_SPECIAL_TEXT_FORE_COLOR vars[V_SPECIAL_TEXT_FORE_COLOR].current_val.p + #define VAR_SPECIAL_TEXT_BACK_COLOR vars[V_SPECIAL_TEXT_BACK_COLOR].current_val.p #define VAR_PROMPT_FORE_COLOR vars[V_PROMPT_FORE_COLOR].current_val.p #define VAR_PROMPT_BACK_COLOR vars[V_PROMPT_BACK_COLOR].current_val.p #define VAR_VIEW_HDR_COLORS vars[V_VIEW_HDR_COLORS].current_val.l diff -rc alpine-2.00/pith/conftype.h alpine-2.00.colortext/pith/conftype.h *** alpine-2.00/pith/conftype.h 2008-08-19 17:27:11.000000000 -0700 --- alpine-2.00.colortext/pith/conftype.h 2008-08-26 20:56:51.000000000 -0700 *************** *** 79,84 **** --- 79,85 ---- , V_EDITOR , V_SPELLER , V_FILLCOL + , V_SPECIAL_TEXT , V_REPLY_STRING , V_REPLY_INTRO , V_QUOTE_REPLACE_STRING *************** *** 223,228 **** --- 224,231 ---- , V_INCUNSEEN_BACK_COLOR , V_SIGNATURE_FORE_COLOR , V_SIGNATURE_BACK_COLOR + , V_SPECIAL_TEXT_FORE_COLOR + , V_SPECIAL_TEXT_BACK_COLOR , V_PROMPT_FORE_COLOR , V_PROMPT_BACK_COLOR , V_HEADER_GENERAL_FORE_COLOR diff -rc alpine-2.00/pith/mailview.c alpine-2.00.colortext/pith/mailview.c *** alpine-2.00/pith/mailview.c 2008-07-11 16:20:32.000000000 -0700 --- alpine-2.00.colortext/pith/mailview.c 2008-08-26 20:56:51.000000000 -0700 *************** *** 281,286 **** --- 281,294 ---- if((flgs & FM_DISPLAY) && !(flgs & FM_NOCOLOR) && pico_usingcolor() + && ps_global->VAR_SPECIAL_TEXT_FORE_COLOR + && ps_global->VAR_SPECIAL_TEXT_BACK_COLOR){ + gf_link_filter(gf_line_test, gf_line_test_opt(color_this_text, NULL)); + } + + if((flgs & FM_DISPLAY) + && !(flgs & FM_NOCOLOR) + && pico_usingcolor() && ps_global->VAR_SIGNATURE_FORE_COLOR && ps_global->VAR_SIGNATURE_BACK_COLOR){ gf_link_filter(gf_line_test, gf_line_test_opt(color_signature, &is_in_sig)); *************** *** 2488,2493 **** --- 2496,2716 ---- return(color_pair); } + void + interval_free(ival) + IVAL_S **ival; + { + if (!(*ival)) + return; + + if ((*ival)->next) + interval_free(&((*ival)->next)); + + fs_give((void **)(ival)); + } + + IVAL_S * + compute_interval (string, endm) + char *string; + int endm; + { + IVAL_S *ival = NULL, *nextival= NULL, *d; + regmatch_t pmatch; + + if(ps_global->paterror == 0) + if (regexec(&ps_global->colorpat, string, 1, &pmatch, 0) == 0){ + ival = (IVAL_S *) fs_get(sizeof(IVAL_S)); + memset (ival, 0, sizeof(IVAL_S)); + ival->start = endm + pmatch.rm_so; + ival->end = endm + pmatch.rm_eo; + nextival = compute_interval(string+pmatch.rm_so+1, ival->start+1); + if (nextival){ + if (nextival->start <= ival->end){ + ival->end = nextival->end; + d = nextival->next; + nextival->next = NULL; + ival->next = d; + interval_free(&nextival); + } + else + ival->next = nextival; + } + } + return ival; + } + + void + regex_pattern(plist) + char **plist; + { + int i = 0, j = 0, len = 0; + char *pattern = NULL; + regex_t preg; + + if(ps_global->paterror == 0) + regfree(&ps_global->colorpat); + + if(plist && *plist && *plist){ + for (i = 0; plist[i] && plist[i][0]; i++) + len += strlen(plist[i]) + 1; + pattern = (char *) fs_get(len * sizeof(char)); + *pattern = '\0'; + for (j = 0; j < i; j++){ + strcat(pattern, plist[j]); + strcat(pattern, (j paterror = regcomp(&preg, pattern, REG_EXTENDED)) != 0) + regfree(&preg); + else + ps_global->colorpat = preg; + } + if(pattern) + fs_give((void **)&pattern); + } + + LT_INS_S ** + insert_color_special_text(ins, p, ival, last_end, col) + LT_INS_S **ins; + char **p; + IVAL_S *ival; + int last_end; + COLOR_PAIR *col; + { + struct variable *vars = ps_global->vars; + + if (ival){ + *p += ival->start - last_end; + ins = gf_line_test_new_ins(ins, *p, color_embed(col->fg, col->bg), + (2 * RGBLEN) + 4); + *p += ival->end - ival->start; + ins = gf_line_test_new_ins(ins, *p, color_embed(VAR_NORM_FORE_COLOR, + VAR_NORM_BACK_COLOR), (2 * RGBLEN) + 4); + ins = insert_color_special_text(ins, p, ival->next, ival->end, col); + } + return ins; + } + + int + length_color(p, begin_color) + char *p; + int begin_color; + { + int len = 0, done = begin_color ? 0 : -1; + char *orig = p; + + while (*p && done <= 0){ + switch(*p++){ + case TAG_HANDLE : + p += *p + 1; + done++; + break; + + case TAG_FGCOLOR : + case TAG_BGCOLOR : + p += RGBLEN; + if (!begin_color) + done++; + break; + + default : + break; + } + } + len = p - orig; + return len; + } + + int + any_color_in_string(p) + char *p; + { + int rv = 0; + char *orig = p; + while (*p && !rv) + if (*p++ == TAG_EMBED) + rv = p - orig; + return rv; + } + + void + remove_spaces_ival(ivalp, p) + IVAL_S **ivalp; + char *p; + { + IVAL_S *ival; + int i; + if (!ivalp || !*ivalp) + return; + ival = *ivalp; + for (i = 0; isspace((unsigned char) p[ival->start + i]); i++); + if (ival->start + i < ival->end) /* do not do this if match only spaces */ + ival->start += i; + else + return; + for (i = 0; isspace((unsigned char) p[ival->end - i - 1]); i++); + ival->end -= i; + if (ival->next) + remove_spaces_ival(&(ival->next), p); + } + + int + color_this_text(linenum, line, ins, local) + long linenum; + char *line; + LT_INS_S **ins; + void *local; + { + struct variable *vars = ps_global->vars; + COLOR_PAIR *col = NULL; + char *p; + int i = 0; + static char *pattern = NULL; + /* char *buf; + + select_quote(linenum, line, ins, (void *)code); + for (i = 0; tmp_20k_buf[i] && (buf[i] = tmp_20k_buf[i]); i++); + buf[i] = '\0'; */ + p = line + i; + + if(VAR_SPECIAL_TEXT_FORE_COLOR && VAR_SPECIAL_TEXT_BACK_COLOR + && (col = new_color_pair(VAR_SPECIAL_TEXT_FORE_COLOR, + VAR_SPECIAL_TEXT_BACK_COLOR)) + && !pico_is_good_colorpair(col)) + free_color_pair(&col); + + if(ps_global->VAR_SPECIAL_TEXT && *ps_global->VAR_SPECIAL_TEXT + && **ps_global->VAR_SPECIAL_TEXT && col){ + IVAL_S *ival; + int done = 0, begin_color = 0; + + while (!done){ + if (i = any_color_in_string(p)){ + begin_color = (begin_color + 1) % 2; + if (begin_color){ + p[i - 1] = '\0'; + ival = compute_interval(p, 0); + remove_spaces_ival(&ival, p); + p[i - 1] = TAG_EMBED; + ins = insert_color_special_text(ins, &p, ival, 0, col); + } + for (;*p++ != TAG_EMBED; ); + p += length_color(p, begin_color); + } + else{ + ival = compute_interval(p, 0); + remove_spaces_ival(&ival, p); + ins = insert_color_special_text(ins, &p, ival, 0, col); + done++; + } + interval_free(&ival); + if (!*p) + done++; + } + free_color_pair(&col); + } + + return 0; + } /* * The argument fieldname is something like "Subject:..." or "Subject". diff -rc alpine-2.00/pith/mailview.h alpine-2.00.colortext/pith/mailview.h *** alpine-2.00/pith/mailview.h 2008-06-03 08:54:15.000000000 -0700 --- alpine-2.00.colortext/pith/mailview.h 2008-08-26 20:56:51.000000000 -0700 *************** *** 29,34 **** --- 29,40 ---- #include "../pith/color.h" + typedef struct IVAL { + int start; + int end; + struct IVAL *next; + } IVAL_S; + /* format_message flags */ #define FM_DISPLAY 0x0001 /* result is headed for display */ #define FM_NEW_MESS 0x0002 /* a new message so zero out attachment descrip */ *************** *** 125,130 **** --- 131,145 ---- int url_hilite(long, char *, LT_INS_S **, void *); int handle_start_color(char *, size_t, int *, int); int handle_end_color(char *, size_t, int *); + IVAL_S *compute_interval(char *, int); + void remove_spaces_ival(IVAL_S **, char *); + void interval_free(IVAL_S **); + void regex_pattern(char **); + LT_INS_S **insert_color_special_text(LT_INS_S **, char **, IVAL_S *, + int, COLOR_PAIR *); + int any_color_in_string(char *); + int length_color(char *, int); + int color_this_text(long, char *, LT_INS_S **, void *); /* * BUG: BELOW IS UNIX/PC ONLY since config'd browser means nothing to webpine diff -rc alpine-2.00/pith/pine.hlp alpine-2.00.colortext/pith/pine.hlp *** alpine-2.00/pith/pine.hlp 2008-08-22 17:07:05.000000000 -0700 --- alpine-2.00.colortext/pith/pine.hlp 2008-08-26 20:56:52.000000000 -0700 *************** *** 3402,3407 **** --- 3402,3408 ---- <li><a href="h_config_print_cat">OPTION: </a> <li><a href="h_config_print_command">OPTION: </a> <li><a href="h_config_post_char_set">OPTION: </a> + <li><a href="h_config_special_text_to_color">OPTION: </a> <li><a href="h_config_postponed_folder">OPTION: </a> <li><a href="h_config_print_font_char_set">OPTION: Print-Font-Char-Set</a> <li><a href="h_config_print_font_name">OPTION: Print-Font-Name</a> *************** *** 3430,3435 **** --- 3431,3437 ---- <li><a href="h_config_sending_filter">OPTION: </a> <li><a href="h_config_sendmail_path">OPTION: </a> <li><a href="h_config_signature_color">OPTION: Signature Color</a> + <li><a href="h_config_special_text_color">OPTION: Special Text Color</a> <li><a href="h_config_signature_file">OPTION: </a> <li><a href="h_config_smtp_server">OPTION: </a> <li><a href="h_config_sort_key">OPTION: </a> *************** *** 22592,22597 **** --- 22594,22636 ---- <End of help on this topic> </BODY> </HTML> + ====== h_config_special_text_to_color ===== + <HTML> + <HEAD> + <TITLE>OPTION: </TITLE> + </HEAD> + <BODY> + <H1>OPTION: </H1> + + Use this option to enter patterns (text or regular expressions) that + Alpine will highlight in the body of the text that is not part of a handle + (an internal or external link that Alpine paints in a different color). + + + Enter each pattern in a different line. Pine will internally merge these + patterns (by adding a "|" character), or you can add them all in one line + by separating them by a "|" character. There is only a <A + HREF="h_regex_text">set</A> of regular expressions that are matched. + + + Pine will use the colors defined in the + <A HREF="h_config_special_text_color">Special Text Color</A> variable. + to paint any match. + + + If the Special Text Color is not set, setting this variable will not + cause that special text to be indicated in any special way. It will look + like any normal text. You must set those colors in order to make Pine + paint the screen differently when it finds the patterns specified in this + variable. + + + <UL> + <LI><A HREF="h_finding_help">Finding more information and requesting help</A> + </UL> + <End of help on this topic> + </BODY> + </HTML> ====== h_config_display_filters ===== <HTML> <HEAD> *************** *** 31197,31202 **** --- 31236,31265 ---- <End of help on this topic> </BODY> </HTML> + ====== h_config_special_text_color ===== + <HTML> + <HEAD> + <TITLE>OPTION: Special Text Color</TITLE> + </HEAD> + <BODY> + <H1>OPTION: Special Text Color</H1> + + Sets the color Pine uses for coloring any text in the body of the message + that is not part of a handle (and internal or external link that Pine + paints in a different color). By default, this variable is not defined, + which means that text that matches the pattern is not painted in any + particular way. This variable must be set in a special form if you + want text to be painted. + + + <A HREF="h_color_setup">Descriptions of the available commands</A> + + Look <A HREF="h_edit_nav_cmds">here</A> + to see the available Editing and Navigation commands. + + <End of help on this topic> + </BODY> + </HTML> ====== h_config_prompt_color ===== <HTML> <HEAD> diff -rc alpine-2.00/pith/state.c alpine-2.00.colortext/pith/state.c *** alpine-2.00/pith/state.c 2008-06-03 15:31:05.000000000 -0700 --- alpine-2.00.colortext/pith/state.c 2008-08-26 20:56:52.000000000 -0700 *************** *** 130,135 **** --- 130,138 ---- if((*pps)->folders_dir != NULL) fs_give((void **)&(*pps)->folders_dir); + if((*pps)->paterror == 0) + regfree(&(*pps)->colorpat); + if((*pps)->ui.homedir) fs_give((void **)&(*pps)->ui.homedir); diff -rc alpine-2.00/pith/state.h alpine-2.00.colortext/pith/state.h *** alpine-2.00/pith/state.h 2008-06-03 08:54:15.000000000 -0700 --- alpine-2.00.colortext/pith/state.h 2008-08-26 20:56:52.000000000 -0700 *************** *** 317,322 **** --- 317,324 ---- char *display_charmap; /* needs to be freed */ char *keyboard_charmap; /* needs to be freed */ void *input_cs; + regex_t colorpat; + int paterror; char *posting_charmap; /* needs to be freed */ diff -rc alpine-2.00/pith/text.c alpine-2.00.colortext/pith/text.c *** alpine-2.00/pith/text.c 2008-03-18 10:24:31.000000000 -0700 --- alpine-2.00.colortext/pith/text.c 2008-08-26 20:56:52.000000000 -0700 *************** *** 170,175 **** --- 170,184 ---- gf_url_hilite_opt(&uh,handlesp,0)); } + if((flags & FM_DISPLAY) + && !(flags & FM_NOCOLOR) + && pico_usingcolor() + && VAR_SPECIAL_TEXT_FORE_COLOR + && VAR_SPECIAL_TEXT_BACK_COLOR){ + filters[filtcnt].filter = gf_line_test; + filters[filtcnt++].data = gf_line_test_opt(color_this_text, NULL); + } + /* * First, paint the signature. * Disclaimers noted below for coloring quotes apply here as well. ++++++ chappa-fancy.patch.gz ++++++ ++++ 4014 lines (skipped) ++++++ chappa-ignoresize.patch.gz ++++++ diff -rc alpine-2.00/alpine/mailcmd.c alpine-2.00.ignoresize/alpine/mailcmd.c *** alpine-2.00/alpine/mailcmd.c 2008-08-21 15:14:45.000000000 -0700 --- alpine-2.00.ignoresize/alpine/mailcmd.c 2008-08-26 20:57:34.000000000 -0700 *************** *** 3347,3352 **** --- 3347,3355 ---- {-1, 0, NULL, NULL} }; + if(F_ON(F_IGNORE_SIZE, ps_global)) + return 'y'; + if(flags & SSCP_INIT || flags & SSCP_END){ if(flags & SSCP_END && possible_corruption) q_status_message(SM_ORDER, 3, 3, "There is possible data corruption, check the results"); diff -rc alpine-2.00/pith/conf.c alpine-2.00.ignoresize/pith/conf.c *** alpine-2.00/pith/conf.c 2008-08-22 17:07:05.000000000 -0700 --- alpine-2.00.ignoresize/pith/conf.c 2008-08-26 20:57:34.000000000 -0700 *************** *** 3044,3049 **** --- 3044,3051 ---- F_FULL_AUTO_EXPUNGE, h_config_full_auto_expunge, PREF_MISC, 0}, {"force-arrow-cursor", NULL, F_FORCE_ARROW, h_config_force_arrow, PREF_MISC, 0}, + {"ignore-size-changes", NULL, + F_IGNORE_SIZE, h_config_ignore_size, PREF_MISC, 0}, {"maildrops-preserve-state", NULL, F_MAILDROPS_PRESERVE_STATE, h_config_maildrops_preserve_state, PREF_MISC, 0}, diff -rc alpine-2.00/pith/conftype.h alpine-2.00.ignoresize/pith/conftype.h *** alpine-2.00/pith/conftype.h 2008-08-19 17:27:11.000000000 -0700 --- alpine-2.00.ignoresize/pith/conftype.h 2008-08-26 20:57:34.000000000 -0700 *************** *** 334,339 **** --- 334,340 ---- F_FORCE_ARROW, F_PRUNE_USES_ISO, F_ALT_ED_NOW, + F_IGNORE_SIZE, F_SHOW_DELAY_CUE, F_CANCEL_CONFIRM, F_AUTO_OPEN_NEXT_UNREAD, diff -rc alpine-2.00/pith/pine.hlp alpine-2.00.ignoresize/pith/pine.hlp *** alpine-2.00/pith/pine.hlp 2008-08-22 17:07:05.000000000 -0700 --- alpine-2.00.ignoresize/pith/pine.hlp 2008-08-26 20:57:34.000000000 -0700 *************** *** 3136,3141 **** --- 3136,3142 ---- <li><a href="h_config_full_auto_expunge">FEATURE: </a> <li><a href="h_config_no_fcc_attach">FEATURE: </a> <li><a href="h_config_force_arrow">FEATURE: </a> + <li><a href="h_config_ignore_size">FEATURE: </a> <li><a href="h_config_forward_as_attachment">FEATURE: </a> <li><a href="h_config_quell_empty_dirs">FEATURE: </a> <li><a href="h_config_hide_nntp_path">FEATURE: </a> *************** *** 30209,30214 **** --- 30210,30249 ---- <End of help on this topic> </BODY> </HTML> + ====== h_config_ignore_size ===== + <HTML> + <HEAD> + <TITLE>FEATURE: </TITLE> + </HEAD> + <BODY> + <H1>FEATURE: </H1> + + When you have an account residing in an IMAP server, Alpine gets the size of + each message from the server. However, when Alpine saves a message residing + in an IMAP server, Alpine computes the size of the message independently. If + these two numbers do not match for a message, Alpine asks you if you still + want to take the risk of saving the message, since data corruption or loss + of data could result of this save. + + + Sometimes the root of this problem is that the server is defective, and + there will not be loss of information when saving such message. Enabling + this feature will make Aline ignore such error and continue saving the + message. If you can determine that this is the case, enable this feature + so that the saving operation will succeed. An example of a defective server + is the Gmail IMAP server. Another example is some versions of the Exchange + server. + + + It is recommended that this feature be disabled most of the time and only + enabled when you find a server which you can determine that has the above + mentioned defect, but be disabled again after making this operation + succeed. + + + <End of help on this topic> + </BODY> + </HTML> ====== h_config_force_low_speed ===== <HTML> <HEAD> diff -rc alpine-2.00/pith/save.c alpine-2.00.ignoresize/pith/save.c *** alpine-2.00/pith/save.c 2008-05-02 14:58:34.000000000 -0700 --- alpine-2.00.ignoresize/pith/save.c 2008-08-26 20:57:34.000000000 -0700 *************** *** 1136,1141 **** --- 1136,1142 ---- snprintf(buf, sizeof(buf), "Message to save shrank: source msg # %ld may be saved incorrectly", mn_raw2m(pkg->msgmap, raw)); + if(F_OFF(F_IGNORE_SIZE, ps_global)) q_status_message(SM_ORDER, 0, 3, buf); } else{ ++++++ chappa-insertpat.patch.gz ++++++ diff -rc alpine-2.00/pico/display.c alpine-2.00.insertpat/pico/display.c *** alpine-2.00/pico/display.c 2008-03-26 10:27:45.000000000 -0700 --- alpine-2.00.insertpat/pico/display.c 2008-08-26 20:56:48.000000000 -0700 *************** *** 1759,1764 **** --- 1759,1776 ---- continue; + case (CTRL|'N'): /* Insert pattern */ + if (pat[0] != '\0'){ + ucs4_strncpy(buf+ucs4_strlen(buf), pat, NPAT); + pputs(pat,1); + b = &buf[ucs4_strlen(buf)]; + dline.vused += ucs4_strlen(pat); + changed = TRUE; + } + else + (*term.t_beep)(); + continue; + case (CTRL|'G') : /* CTRL-G help */ if(term.t_mrow == 0 && km_popped == 0){ movecursor(term.t_nrow-2, 0); diff -rc alpine-2.00/pico/search.c alpine-2.00.insertpat/pico/search.c *** alpine-2.00/pico/search.c 2008-01-04 14:49:15.000000000 -0800 --- alpine-2.00.insertpat/pico/search.c 2008-08-26 20:56:48.000000000 -0700 *************** *** 75,80 **** --- 75,84 ---- N_("~ Hitting only ~R~e~t~u~r~n or at the prompt will cause the"), N_(" search to be made with the default value."), " ", + N_("~ Hitting ~^~N will reinsert the last string you searched for"), + N_(" so that you can edit it (in case you made a mistake entering the"), + N_(" search pattern the first time)."), + " ", N_(" The text search is not case sensitive, and will examine the"), N_(" entire message."), " ", ++++++ chappa-maildir.patch.gz ++++++ ++++ 3624 lines (skipped) ++++++ chappa-searchheader.patch.gz ++++++ diff -rc alpine-2.00/alpine/mailcmd.c alpine-2.00.searchheader/alpine/mailcmd.c *** alpine-2.00/alpine/mailcmd.c 2008-08-21 15:14:45.000000000 -0700 --- alpine-2.00.searchheader/alpine/mailcmd.c 2008-08-26 20:57:00.000000000 -0700 *************** *** 253,258 **** --- 253,259 ---- {'r', 'r', "R", N_("Recipient")}, {'p', 'p', "P", N_("Participant")}, {'b', 'b', "B", N_("Body")}, + {'h', 'h', "H", N_("Header")}, {-1, 0, NULL, NULL} }; *************** *** 7670,7676 **** int not = 0, me = 0; char sstring[80], savedsstring[80], tmp[128]; char *p, *sval = NULL; ! char buftmp[MAILTMPLEN]; ESCKEY_S ekey[8]; ENVELOPE *env = NULL; HelpType help; --- 7671,7677 ---- int not = 0, me = 0; char sstring[80], savedsstring[80], tmp[128]; char *p, *sval = NULL; ! char buftmp[MAILTMPLEN], namehdr[80]; ESCKEY_S ekey[8]; ENVELOPE *env = NULL; HelpType help; *************** *** 7757,7762 **** --- 7758,7797 ---- sval = "BODYTEXT"; break; + case 'h' : + strcpy(tmp, "Name of HEADER to match : "); + flags = OE_APPEND_CURRENT; + namehdr[0] = '\0'; + r = 'x'; + while (r == 'x'){ + int done = 0; + + r = optionally_enter(namehdr, -FOOTER_ROWS(ps_global), 0, + sizeof(namehdr), tmp, ekey, NO_HELP, &flags); + if (r == 1){ + cmd_cancelled("Selection by text"); + return(1); + } + removing_leading_white_space(namehdr); + while(!done){ + while ((namehdr[0] != '\0') && /* remove trailing ":" */ + (namehdr[strlen(namehdr) - 1] == ':')) + namehdr[strlen(namehdr) - 1] = '\0'; + if ((namehdr[0] != '\0') + && isspace((unsigned char) namehdr[strlen(namehdr) - 1])) + removing_trailing_white_space(namehdr); + else + done++; + } + if (strchr(namehdr,' ') || strchr(namehdr,'\t') || + strchr(namehdr,':')) + namehdr[0] = '\0'; + if (namehdr[0] == '\0') + r = 'x'; + } + sval = namehdr; + break; + case 'x': break; *************** *** 7953,7959 **** flagsforhist = (not ? 0x1 : 0) + (me ? 0x2 : 0); save_hist(history, sstring, flagsforhist, NULL); ! rv = agg_text_select(stream, msgmap, type, not, me, sstring, "utf-8", limitsrch); if(we_cancel) cancel_busy_cue(0); --- 7988,7994 ---- flagsforhist = (not ? 0x1 : 0) + (me ? 0x2 : 0); save_hist(history, sstring, flagsforhist, NULL); ! rv = agg_text_select(stream, msgmap, type, namehdr, not, me, sstring, "utf-8", limitsrch); if(we_cancel) cancel_busy_cue(0); diff -rc alpine-2.00/pith/mailcmd.c alpine-2.00.searchheader/pith/mailcmd.c *** alpine-2.00/pith/mailcmd.c 2008-07-09 22:01:13.000000000 -0700 --- alpine-2.00.searchheader/pith/mailcmd.c 2008-08-26 20:57:00.000000000 -0700 *************** *** 2158,2165 **** int ! agg_text_select(MAILSTREAM *stream, MSGNO_S *msgmap, char type, int not, ! int check_for_my_addresses, char *sstring, char *charset, SEARCHSET **limitsrch) { int old_imap, we_cancel; --- 2158,2165 ---- int ! agg_text_select(MAILSTREAM *stream, MSGNO_S *msgmap, char type, char *namehdr, ! int not, int check_for_my_addresses, char *sstring, char *charset, SEARCHSET **limitsrch) { int old_imap, we_cancel; *************** *** 2308,2313 **** --- 2308,2317 ---- if(!mepgm) switch(type){ + case 'h' : /* Any header */ + pgm->header = mail_newsearchheader (namehdr, sstring); + break; + case 'r' : /* TO or CC */ if(old_imap){ /* No OR on old servers */ diff -rc alpine-2.00/pith/mailcmd.h alpine-2.00.searchheader/pith/mailcmd.h *** alpine-2.00/pith/mailcmd.h 2008-07-09 22:01:13.000000000 -0700 --- alpine-2.00.searchheader/pith/mailcmd.h 2008-08-26 20:57:00.000000000 -0700 *************** *** 65,71 **** void cross_delete_crossposts(MAILSTREAM *); long zoom_index(struct pine *, MAILSTREAM *, MSGNO_S *, int); int unzoom_index(struct pine *, MAILSTREAM *, MSGNO_S *); ! int agg_text_select(MAILSTREAM *, MSGNO_S *, char, int, int, char *, char *, SEARCHSET **); int agg_flag_select(MAILSTREAM *, int, int, SEARCHSET **); char *get_uname(char *, char *, int); --- 65,71 ---- void cross_delete_crossposts(MAILSTREAM *); long zoom_index(struct pine *, MAILSTREAM *, MSGNO_S *, int); int unzoom_index(struct pine *, MAILSTREAM *, MSGNO_S *); ! int agg_text_select(MAILSTREAM *, MSGNO_S *, char, char *, int, int, char *, char *, SEARCHSET **); int agg_flag_select(MAILSTREAM *, int, int, SEARCHSET **); char *get_uname(char *, char *, int); diff -rc alpine-2.00/web/src/alpined.d/alpined.c alpine-2.00.searchheader/web/src/alpined.d/alpined.c *** alpine-2.00/web/src/alpined.d/alpined.c 2008-08-22 13:41:37.000000000 -0700 --- alpine-2.00.searchheader/web/src/alpined.d/alpined.c 2008-08-26 20:57:00.000000000 -0700 *************** *** 6848,6854 **** /* BUG: fix charset not to be NULL below */ if(agg_text_select(ps_global->mail_stream, sp_msgmap(ps_global->mail_stream), ! field, not, 0, text, NULL, NULL)) /* BUG: plug in "charset" above? */ return(peSelectError(interp, "programmer botch")); } --- 6848,6854 ---- /* BUG: fix charset not to be NULL below */ if(agg_text_select(ps_global->mail_stream, sp_msgmap(ps_global->mail_stream), ! field, NULL, not, 0, text, NULL, NULL)) /* BUG: plug in "charset" above? */ return(peSelectError(interp, "programmer botch")); } ++++++ chappa-WrtAcc.patch.gz ++++++ diff -rc alpine-2.00/pico/basic.c alpine-2.00.WrtAcc/pico/basic.c *** alpine-2.00/pico/basic.c 2007-11-26 15:45:22.000000000 -0800 --- alpine-2.00.WrtAcc/pico/basic.c 2008-08-26 20:56:33.000000000 -0700 *************** *** 343,348 **** --- 343,531 ---- return(TRUE); } + unsigned char GetAccent() + { + UCS c,d; + c = GetKey(); + if ((c == '?') || (c == '!')) { + d = c; + c = '\\'; + } + else + if ((c == 's') || (c == 'S')){ + c = d = 's'; + } + else + if ((c == 'l') || (c == 'L')){ + c = d = 'l'; + } + else + d = GetKey(); + return accent(c,d); + } + + int pineaccent(f,n) + int f,n; + { unsigned char e; + + if (e = GetAccent()) + execute(e, 0, 1); + return 1; + } + + unsigned char accent(f,n) + UCS f,n; + { UCS c,d; + + c = f; + d = n; + switch(c){ + case '~' : + switch(d){ + case 'a' : return '\343'; + case 'n' : return '\361'; + case 'o' : return '\365'; + case 'A' : return '\303'; + case 'N' : return '\321'; + case 'O' : return '\325'; + } + break; + case '\047' : + switch(d){ + case 'a' : return '\341'; + case 'e' : return '\351'; + case 'i' : return '\355'; + case 'o' : return '\363'; + case 'u' : return '\372'; + case 'y' : return '\375'; + case 'A' : return '\301'; + case 'E' : return '\311'; + case 'I' : return '\315'; + case 'O' : return '\323'; + case 'U' : return '\332'; + case 'Y' : return '\335'; + } + break; + case '"' : + switch(d){ + case 'a' : return '\344'; + case 'e' : return '\353'; + case 'i' : return '\357'; + case 'o' : return '\366'; + case 'u' : return '\374'; + case 'y' : return '\377'; + case 'A' : return '\304'; + case 'E' : return '\313'; + case 'I' : return '\317'; + case 'O' : return '\326'; + case 'U' : return '\334'; + } + break; + case '^' : + switch(d){ + case 'a' : return '\342'; + case 'e' : return '\352'; + case 'i' : return '\356'; + case 'o' : return '\364'; + case 'u' : return '\373'; + case 'A' : return '\302'; + case 'E' : return '\312'; + case 'I' : return '\316'; + case 'O' : return '\324'; + case 'U' : return '\333'; + case '0' : return '\260'; + case '1' : return '\271'; + case '2' : return '\262'; + case '3' : return '\263'; + } + break; + case '`' : + switch(d){ + case 'a' : return '\340'; + case 'e' : return '\350'; + case 'i' : return '\354'; + case 'o' : return '\362'; + case 'u' : return '\371'; + case 'A' : return '\300'; + case 'E' : return '\310'; + case 'I' : return '\314'; + case 'O' : return '\322'; + case 'U' : return '\331'; + } + break; + case 'o' : + switch(d){ + case 'a' : return '\345'; + case 'A' : return '\305'; + case '/' : return '\370'; + case 'r' : return '\256'; + case 'R' : return '\256'; + case 'c' : return '\251'; + case 'C' : return '\251'; + } + break; + case '-' : + switch(d){ + case 'o' : return '\272'; + case 'O' : return '\272'; + case '0' : return '\272'; + case 'a' : return '\252'; + case 'A' : return '\252'; + case 'l' : return '\243'; + case 'L' : return '\243'; + } + break; + case 'O' : + switch(d){ + case '/' : return '\330'; + case 'r' : return '\256'; + case 'R' : return '\256'; + case 'c' : return '\251'; + case 'C' : return '\251'; + } + case '/' : + switch(d){ + case 'o' : return '\370'; + case 'O' : return '\330'; + } + break; + case 'a' : + switch(d){ + case 'e' : return '\346'; + case 'E' : return '\346'; + } + break; + case 'A' : + switch(d){ + case 'E' : return '\306'; + case 'e' : return '\306'; + } + break; + case ',' : + switch(d){ + case 'c' : return '\347'; + case 'C' : return '\307'; + } + break; + case '\\' : + switch(d){ + case '?' : return '\277'; + case '!' : return '\241'; + } + break; + case 's' : + switch(d){ + case 's' : return '\337'; + } + break; + case 'l' : + switch(d){ + case 'l' : return '\243'; + } + break; + } + return '\0'; + } /* * go forword to the end of the current paragraph diff -rc alpine-2.00/pico/composer.c alpine-2.00.WrtAcc/pico/composer.c *** alpine-2.00/pico/composer.c 2008-03-21 14:31:58.000000000 -0700 --- alpine-2.00.WrtAcc/pico/composer.c 2008-08-26 20:56:33.000000000 -0700 *************** *** 1990,1996 **** tbufp = &strng[ods.p_len]; if(VALID_KEY(ch)){ /* char input */ ! /* * if we are allowing editing, insert the new char * end up leaving tbufp pointing to newly * inserted character in string, and offset to the --- 1990,1996 ---- tbufp = &strng[ods.p_len]; if(VALID_KEY(ch)){ /* char input */ ! insert_char:/* * if we are allowing editing, insert the new char * end up leaving tbufp pointing to newly * inserted character in string, and offset to the *************** *** 2070,2075 **** --- 2070,2082 ---- } else { /* interpret ch as a command */ switch (ch = normalize_cmd(ch, ckm, 2)) { + case (CTRL|'\\') : + if (ch = GetAccent()) + goto insert_char; + else + clearcursor(); + break; + case (CTRL|KEY_LEFT): /* word skip left */ if(ods.p_ind > 0) /* Scoot one char left if possible */ ods.p_ind--; diff -rc alpine-2.00/pico/display.c alpine-2.00.WrtAcc/pico/display.c *** alpine-2.00/pico/display.c 2008-03-26 10:27:45.000000000 -0700 --- alpine-2.00.WrtAcc/pico/display.c 2008-08-26 20:56:33.000000000 -0700 *************** *** 1750,1755 **** --- 1750,1760 ---- b = &buf[ucs4_strlen(buf)]; continue; + case (CTRL|'\\'): + if (c = GetAccent()) + goto text; + continue; + case (CTRL|'F') : /* CTRL-F forward a char*/ case KEY_RIGHT : if(*b == '\0') *************** *** 1868,1874 **** #endif default : ! /* look for match in extra_v */ for(i = 0; i < 12; i++) if(c && c == extra_v[i]){ --- 1873,1879 ---- #endif default : ! text: /* look for match in extra_v */ for(i = 0; i < 12; i++) if(c && c == extra_v[i]){ diff -rc alpine-2.00/pico/ebind.h alpine-2.00.WrtAcc/pico/ebind.h *** alpine-2.00/pico/ebind.h 2007-11-06 15:51:13.000000000 -0800 --- alpine-2.00.WrtAcc/pico/ebind.h 2008-08-26 20:56:33.000000000 -0700 *************** *** 61,67 **** #ifdef MOUSE {KEY_MOUSE, mousepress}, #ifndef _WINDOWS ! {CTRL|'\\', toggle_xterm_mouse}, #endif #endif {CTRL|'A', gotobol}, --- 61,67 ---- #ifdef MOUSE {KEY_MOUSE, mousepress}, #ifndef _WINDOWS ! {CTRL|'|', toggle_xterm_mouse}, #endif #endif {CTRL|'A', gotobol}, *************** *** 100,106 **** {CTRL|KEY_HOME, gotobob}, {CTRL|KEY_END, gotoeob}, {0x7F, backdel}, ! {0, NULL} }; --- 100,108 ---- {CTRL|KEY_HOME, gotobob}, {CTRL|KEY_END, gotoeob}, {0x7F, backdel}, ! {CTRL|'\\', pineaccent}, ! {0, ! NULL} }; *************** *** 123,129 **** #ifdef MOUSE {KEY_MOUSE, mousepress}, #ifndef _WINDOWS ! {CTRL|'\\', toggle_xterm_mouse}, #endif #endif {CTRL|'A', gotobol}, --- 125,131 ---- #ifdef MOUSE {KEY_MOUSE, mousepress}, #ifndef _WINDOWS ! {CTRL|'|', toggle_xterm_mouse}, #endif #endif {CTRL|'A', gotobol}, diff -rc alpine-2.00/pico/efunc.h alpine-2.00.WrtAcc/pico/efunc.h *** alpine-2.00/pico/efunc.h 2007-11-06 15:51:13.000000000 -0800 --- alpine-2.00.WrtAcc/pico/efunc.h 2008-08-26 20:56:33.000000000 -0700 *************** *** 53,58 **** --- 53,61 ---- extern int backline(int, int); extern int gotobop(int, int); extern int gotoeop(int, int); + extern int pineaccent(int, int); + extern unsigned char accent(UCS, UCS); + extern unsigned char GetAccent(void); extern int forwpage(int, int); extern int backpage(int, int); extern int scrollupline(int, int); diff -rc alpine-2.00/pico/main.c alpine-2.00.WrtAcc/pico/main.c *** alpine-2.00/pico/main.c 2008-04-02 15:09:20.000000000 -0700 --- alpine-2.00.WrtAcc/pico/main.c 2008-08-26 20:56:33.000000000 -0700 *************** *** 415,420 **** --- 415,426 ---- emlwrite(_("You may possibly have new mail."), NULL); } + if (c == (CTRL|'\\')){ + c = GetAccent(); + if (!c) + c = NODATA; + } + if(km_popped) switch(c){ case NODATA: diff -rc alpine-2.00/pico/search.c alpine-2.00.WrtAcc/pico/search.c *** alpine-2.00/pico/search.c 2008-01-04 14:49:15.000000000 -0800 --- alpine-2.00.WrtAcc/pico/search.c 2008-08-26 20:56:33.000000000 -0700 *************** *** 273,279 **** } if(status + curwp->w_doto >= llength(curwp->w_dotp) || ! !eq(defpat[status],lgetc(curwp->w_dotp, curwp->w_doto + status).c)) break; /* do nothing! */ status++; } --- 273,279 ---- } if(status + curwp->w_doto >= llength(curwp->w_dotp) || ! !eq((unsigned char)defpat[status],lgetc(curwp->w_dotp, curwp->w_doto + status).c)) break; /* do nothing! */ status++; } *************** *** 924,930 **** c = lgetc(curline, curoff++).c; /* get the char */ /* test it against first char in pattern */ ! if (eq(c, patrn[0]) != FALSE) { /* if we find it..*/ /* setup match pointers */ matchline = curline; matchoff = curoff; --- 924,930 ---- c = lgetc(curline, curoff++).c; /* get the char */ /* test it against first char in pattern */ ! if (eq(c, (unsigned char)patrn[0]) != FALSE) { /* if we find it..*/ /* setup match pointers */ matchline = curline; matchoff = curoff; *************** *** 945,951 **** return(FALSE); /* and test it against the pattern */ ! if (eq(*patptr, c) == FALSE) goto fail; } --- 945,951 ---- return(FALSE); /* and test it against the pattern */ ! if (eq((unsigned char) *patptr, c) == FALSE) goto fail; } ++++++ pine-nonvoid-function.patch ++++++ --- pith/filter.c +++ pith/filter.c @@ -6871,6 +6871,7 @@ gf_error("Incompatible RSS version"); } + return(1); /* Is this correct? */ } /* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ycp-ui-bindings
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package yast2-ycp-ui-bindings checked in at Mon Sep 29 18:30:01 CEST 2008. -------- --- yast2-ycp-ui-bindings/yast2-ycp-ui-bindings.changes 2008-09-25 12:00:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ycp-ui-bindings/yast2-ycp-ui-bindings.changes 2008-09-29 14:40:17.090708000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 26 15:54:34 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #418443: Yast modules windows have no title +- V 2.17.8 + +------------------------------------------------------------------- Old: ---- yast2-ycp-ui-bindings-2.17.7.tar.bz2 New: ---- yast2-ycp-ui-bindings-2.17.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ycp-ui-bindings.spec ++++++ --- /var/tmp/diff_new_pack.Z15367/_old 2008-09-29 18:29:44.000000000 +0200 +++ /var/tmp/diff_new_pack.Z15367/_new 2008-09-29 18:29:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ycp-ui-bindings (Version 2.17.7) +# spec file for package yast2-ycp-ui-bindings (Version 2.17.8) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-ycp-ui-bindings -Version: 2.17.7 +Version: 2.17.8 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ycp-ui-bindings-2.17.7.tar.bz2 +Source0: yast2-ycp-ui-bindings-2.17.8.tar.bz2 Prefix: /usr BuildRequires: gcc-c++ BuildRequires: yast2-devtools @@ -37,8 +37,8 @@ Conflicts: yast2-core < 2.16.38 # libycp includes crypto built-ins BuildRequires: libxcrypt-devel -Requires: yast2-libyui >= 2.17.11 -BuildRequires: yast2-libyui-devel >= 2.17.11 +Requires: yast2-libyui >= 2.17.12 +BuildRequires: yast2-libyui-devel >= 2.17.12 # libyui ImplPtr BuildRequires: boost-devel Summary: YaST2 - YCP Bindings for the YaST2 User Interface Engine @@ -84,7 +84,7 @@ Matthias Kettner %prep -%setup -n yast2-ycp-ui-bindings-2.17.7 +%setup -n yast2-ycp-ui-bindings-2.17.8 %build %{prefix}/bin/y2tool y2autoconf @@ -123,6 +123,9 @@ %{_libdir}/pkgconfig/yast2-ycp-ui-bindings.pc %doc %{prefix}/share/doc/packages/yast2-ycp-ui-bindings %changelog +* Fri Sep 26 2008 tgoettlicher(a)suse.de +- Fixed bnc #418443: Yast modules windows have no title +- V 2.17.8 * Thu Sep 25 2008 sh(a)suse.de - Require latest libyui (API change!) - V 2.17.7 ++++++ yast2-ycp-ui-bindings-2.17.7.tar.bz2 -> yast2-ycp-ui-bindings-2.17.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ycp-ui-bindings-2.17.7/aclocal.m4 new/yast2-ycp-ui-bindings-2.17.8/aclocal.m4 --- old/yast2-ycp-ui-bindings-2.17.7/aclocal.m4 2008-09-25 12:00:22.000000000 +0200 +++ new/yast2-ycp-ui-bindings-2.17.8/aclocal.m4 2008-09-04 15:33:30.000000000 +0200 @@ -7519,162 +7519,6 @@ AC_MSG_RESULT([$SED]) ]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# -# Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi - -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - ifelse([$4], , [AC_MSG_ERROR(dnl -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) -elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], - [$4]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) -fi[]dnl -])# PKG_CHECK_MODULES - dnl check for docbook -*- autoconf -*- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ycp-ui-bindings-2.17.7/configure new/yast2-ycp-ui-bindings-2.17.8/configure --- old/yast2-ycp-ui-bindings-2.17.7/configure 2008-09-25 12:00:25.000000000 +0200 +++ new/yast2-ycp-ui-bindings-2.17.8/configure 2008-09-04 15:33:33.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-ycp-ui-bindings 2.17.7. +# Generated by GNU Autoconf 2.61 for yast2-ycp-ui-bindings 2.17.3. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ycp-ui-bindings' PACKAGE_TARNAME='yast2-ycp-ui-bindings' -PACKAGE_VERSION='2.17.7' -PACKAGE_STRING='yast2-ycp-ui-bindings 2.17.7' +PACKAGE_VERSION='2.17.3' +PACKAGE_STRING='yast2-ycp-ui-bindings 2.17.3' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -907,9 +907,6 @@ am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP -PKG_CONFIG -Y2CORE_CFLAGS -Y2CORE_LIBS AGENT_LIBADD SED GREP @@ -941,9 +938,6 @@ CXXFLAGS CCC CPP -PKG_CONFIG -Y2CORE_CFLAGS -Y2CORE_LIBS CXXCPP F77 FFLAGS' @@ -1449,7 +1443,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-ycp-ui-bindings 2.17.7 to adapt to many kinds of systems. +\`configure' configures yast2-ycp-ui-bindings 2.17.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1520,7 +1514,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ycp-ui-bindings 2.17.7:";; + short | recursive ) echo "Configuration of yast2-ycp-ui-bindings 2.17.3:";; esac cat <<\_ACEOF @@ -1559,10 +1553,6 @@ CXX C++ compiler command CXXFLAGS C++ compiler flags CPP C preprocessor - PKG_CONFIG path to pkg-config utility - Y2CORE_CFLAGS - C compiler flags for Y2CORE, overriding pkg-config - Y2CORE_LIBS linker flags for Y2CORE, overriding pkg-config CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags @@ -1631,7 +1621,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ycp-ui-bindings configure 2.17.7 +yast2-ycp-ui-bindings configure 2.17.3 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1645,7 +1635,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-ycp-ui-bindings $as_me 2.17.7, which was +It was created by yast2-ycp-ui-bindings $as_me 2.17.3, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2466,7 +2456,7 @@ # Define the identity of the package. PACKAGE='yast2-ycp-ui-bindings' - VERSION='2.17.7' + VERSION='2.17.3' cat >>confdefs.h <<_ACEOF @@ -2694,7 +2684,7 @@ -VERSION="2.17.7" +VERSION="2.17.3" RPMNAME="yast2-ycp-ui-bindings" MAINTAINER="Stefan Hundhammer <sh(a)suse.de>" @@ -6105,247 +6095,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -# If we have core, get its Y2CORE_CFLAGS. -# When building core itself, it has set Y2CORE_CFLAGS elsewhere already - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf(a)gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf(a)gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - PKG_CONFIG="" - fi - -fi -if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5 - ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - - -pkg_failed=no -{ echo "$as_me:$LINENO: checking for Y2CORE" >&5 -echo $ECHO_N "checking for Y2CORE... $ECHO_C" >&6; } - -if test -n "$Y2CORE_CFLAGS"; then - pkg_cv_Y2CORE_CFLAGS="$Y2CORE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5 - ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_Y2CORE_CFLAGS=`$PKG_CONFIG --cflags "yast2-core" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$Y2CORE_LIBS"; then - pkg_cv_Y2CORE_LIBS="$Y2CORE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5 - ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_Y2CORE_LIBS=`$PKG_CONFIG --libs "yast2-core" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - Y2CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "yast2-core" 2>&1` - else - Y2CORE_PKG_ERRORS=`$PKG_CONFIG --print-errors "yast2-core" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$Y2CORE_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (yast2-core) were not met: - -$Y2CORE_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables Y2CORE_CFLAGS -and Y2CORE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (yast2-core) were not met: - -$Y2CORE_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables Y2CORE_CFLAGS -and Y2CORE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables Y2CORE_CFLAGS -and Y2CORE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." >&5 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables Y2CORE_CFLAGS -and Y2CORE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else - Y2CORE_CFLAGS=$pkg_cv_Y2CORE_CFLAGS - Y2CORE_LIBS=$pkg_cv_Y2CORE_LIBS - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - : -fi - -fi - -CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" -CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" +CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" +CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2" : ${AGENT_LIBADD:='-L$(libdir) -lscr'} @@ -7064,7 +6815,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7067 "configure"' > conftest.$ac_ext + echo '#line 6818 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9419,11 +9170,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9422: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9173: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9426: \$? = $ac_status" >&5 + echo "$as_me:9177: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9709,11 +9460,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9712: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9463: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9716: \$? = $ac_status" >&5 + echo "$as_me:9467: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9813,11 +9564,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9816: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9567: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9820: \$? = $ac_status" >&5 + echo "$as_me:9571: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12177,7 +11928,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12180 "configure" +#line 11931 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12277,7 +12028,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 12280 "configure" +#line 12031 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14678,11 +14429,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14681: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14432: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14685: \$? = $ac_status" >&5 + echo "$as_me:14436: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14782,11 +14533,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14785: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14536: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14789: \$? = $ac_status" >&5 + echo "$as_me:14540: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16365,11 +16116,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16368: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16119: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16372: \$? = $ac_status" >&5 + echo "$as_me:16123: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16469,11 +16220,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16472: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16223: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16476: \$? = $ac_status" >&5 + echo "$as_me:16227: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18676,11 +18427,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18679: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18430: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18683: \$? = $ac_status" >&5 + echo "$as_me:18434: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18966,11 +18717,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18969: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18720: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18973: \$? = $ac_status" >&5 + echo "$as_me:18724: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19070,11 +18821,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19073: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18824: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19077: \$? = $ac_status" >&5 + echo "$as_me:18828: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -22895,7 +22646,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ycp-ui-bindings $as_me 2.17.7, which was +This file was extended by yast2-ycp-ui-bindings $as_me 2.17.3, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22948,7 +22699,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-ycp-ui-bindings config.status 2.17.7 +yast2-ycp-ui-bindings config.status 2.17.3 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -23310,9 +23061,6 @@ am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim CPP!$CPP$ac_delim -PKG_CONFIG!$PKG_CONFIG$ac_delim -Y2CORE_CFLAGS!$Y2CORE_CFLAGS$ac_delim -Y2CORE_LIBS!$Y2CORE_LIBS$ac_delim AGENT_LIBADD!$AGENT_LIBADD$ac_delim SED!$SED$ac_delim GREP!$GREP$ac_delim @@ -23332,7 +23080,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ycp-ui-bindings-2.17.7/configure.in new/yast2-ycp-ui-bindings-2.17.8/configure.in --- old/yast2-ycp-ui-bindings-2.17.7/configure.in 2008-09-25 12:00:02.000000000 +0200 +++ new/yast2-ycp-ui-bindings-2.17.8/configure.in 2008-09-04 15:33:18.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ycp-ui-bindings dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ycp-ui-bindings, 2.17.7, http://bugs.opensuse.org/, yast2-ycp-ui-bindings) +AC_INIT(yast2-ycp-ui-bindings, 2.17.3, http://bugs.opensuse.org/, yast2-ycp-ui-bindings) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.7" +VERSION="2.17.3" RPMNAME="yast2-ycp-ui-bindings" MAINTAINER="Stefan Hundhammer <sh(a)suse.de>" @@ -150,14 +150,8 @@ AC_PROG_CC AC_PROG_CPP -# If we have core, get its Y2CORE_CFLAGS. -# When building core itself, it has set Y2CORE_CFLAGS elsewhere already -PKG_CHECK_EXISTS([yast2-core],[ - PKG_CHECK_MODULES(Y2CORE, yast2-core) -]) - -CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" -CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" +CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" +CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2" : ${AGENT_LIBADD:='-L$(libdir) -lscr'} AC_SUBST(AGENT_LIBADD) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ycp-ui-bindings-2.17.7/examples/bullshit.ycp new/yast2-ycp-ui-bindings-2.17.8/examples/bullshit.ycp --- old/yast2-ycp-ui-bindings-2.17.7/examples/bullshit.ycp 2008-09-24 18:16:25.000000000 +0200 +++ new/yast2-ycp-ui-bindings-2.17.8/examples/bullshit.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -{ - UI::OpenDialog( - `VBox( - `Label("Hello, World!"), - `ReplacePoint(`id(`rep), - `PushButton(`opt(`default), "&OK 99") ) - ) - ); - - integer i=10; - - while ( i > 0 ) - { - // UI::PollInput(); - i=i-1; - UI::ReplaceWidget(`rep, - `PushButton(`opt(`default), - sformat( "&OK %1", i ) ) ); - UI::TimeoutUserInput( 2000 ); - } - - - UI::CloseDialog(); -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ycp-ui-bindings-2.17.7/examples/Makefile.in new/yast2-ycp-ui-bindings-2.17.8/examples/Makefile.in --- old/yast2-ycp-ui-bindings-2.17.7/examples/Makefile.in 2008-09-25 12:00:28.000000000 +0200 +++ new/yast2-ycp-ui-bindings-2.17.8/examples/Makefile.in 2008-09-04 15:33:36.000000000 +0200 @@ -125,7 +125,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = @RPMNAME@ @@ -143,8 +142,6 @@ XML_CATALOG = @XML_CATALOG@ XSLTPROC = @XSLTPROC@ XSLTPROC_FLAGS = @XSLTPROC_FLAGS@ -Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ -Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ abs_builddir = @abs_builddir@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ycp-ui-bindings-2.17.7/examples/screenshots/Makefile.in new/yast2-ycp-ui-bindings-2.17.8/examples/screenshots/Makefile.in --- old/yast2-ycp-ui-bindings-2.17.7/examples/screenshots/Makefile.in 2008-09-25 12:00:29.000000000 +0200 +++ new/yast2-ycp-ui-bindings-2.17.8/examples/screenshots/Makefile.in 2008-09-04 15:33:36.000000000 +0200 @@ -127,7 +127,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = @RPMNAME@ @@ -145,8 +144,6 @@ XML_CATALOG = @XML_CATALOG@ XSLTPROC = @XSLTPROC@ XSLTPROC_FLAGS = @XSLTPROC_FLAGS@ -Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ -Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ abs_builddir = @abs_builddir@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ycp-ui-bindings-2.17.7/examples/screenshots/resized-larger/Makefile.in new/yast2-ycp-ui-bindings-2.17.8/examples/screenshots/resized-larger/Makefile.in --- old/yast2-ycp-ui-bindings-2.17.7/examples/screenshots/resized-larger/Makefile.in 2008-09-25 12:00:29.000000000 +0200 +++ new/yast2-ycp-ui-bindings-2.17.8/examples/screenshots/resized-larger/Makefile.in 2008-09-04 15:33:36.000000000 +0200 @@ -115,7 +115,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = @RPMNAME@ @@ -133,8 +132,6 @@ XML_CATALOG = @XML_CATALOG@ XSLTPROC = @XSLTPROC@ XSLTPROC_FLAGS = @XSLTPROC_FLAGS@ -Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ -Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ abs_builddir = @abs_builddir@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ycp-ui-bindings-2.17.7/examples/screenshots/resized-smaller/Makefile.in new/yast2-ycp-ui-bindings-2.17.8/examples/screenshots/resized-smaller/Makefile.in --- old/yast2-ycp-ui-bindings-2.17.7/examples/screenshots/resized-smaller/Makefile.in 2008-09-25 12:00:29.000000000 +0200 +++ new/yast2-ycp-ui-bindings-2.17.8/examples/screenshots/resized-smaller/Makefile.in 2008-09-04 15:33:36.000000000 +0200 @@ -115,7 +115,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = @RPMNAME@ @@ -133,8 +132,6 @@ XML_CATALOG = @XML_CATALOG@ XSLTPROC = @XSLTPROC@ XSLTPROC_FLAGS = @XSLTPROC_FLAGS@ -Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ -Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ abs_builddir = @abs_builddir@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ycp-ui-bindings-2.17.7/examples/WizBench.ycp new/yast2-ycp-ui-bindings-2.17.8/examples/WizBench.ycp --- old/yast2-ycp-ui-bindings-2.17.7/examples/WizBench.ycp 2008-09-19 13:42:29.000000000 +0200 +++ new/yast2-ycp-ui-bindings-2.17.8/examples/WizBench.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -// Example of using the Wizard widget. -// -// Note: YCP applications are discouraged from using the Wizard widget directly. -// Use the Wizard module instead. - -{ - if ( ! UI::HasSpecialWidget(`Wizard) ) - { - y2error( "This works only with UIs that provide the wizard widget!" ); - return; - } - - string help_text = - "This is a help text." - + "It should be helpful." - + "If it isn't helpful, it should rather not be called a help text."; - - UI::OpenDialog(`opt(`defaultsize ), - `Wizard(`opt(`stepsEnabled), - `back, "&Back", - `abort, "Ab&ort", - `next, "&Next" ) ); - - // UI::DumpWidgetTree(); - - UI::WizardCommand(`SetDialogIcon( "/usr/share/YaST2/theme/current/icons/22x22/apps/YaST.png" ) ); - UI::WizardCommand(`SetDialogHeading( "Welcome to the YaST2 installation" ) ); - UI::WizardCommand(`SetHelpText( help_text ) ); - - UI::WizardCommand(`AddStepHeading( "Base Installation" ) ); - UI::WizardCommand(`AddStep( "Language", "lang" ) ); - UI::WizardCommand(`AddStep( "Installation Settings", "proposal" ) ); - UI::WizardCommand(`AddStep( "Perform Installation", "doit" ) ); - - UI::WizardCommand(`AddStepHeading( "Configuration" ) ); - UI::WizardCommand(`AddStep( "Root Password", "root_pw" ) ); - UI::WizardCommand(`AddStep( "Network", "net" ) ); - UI::WizardCommand(`AddStep( "Online Update", "you" ) ); - UI::WizardCommand(`AddStep( "Users", "auth" ) ); - UI::WizardCommand(`AddStep( "Clean Up", "suse_config" ) ); - UI::WizardCommand(`AddStep( "Release Notes", "rel_notes" ) ); - UI::WizardCommand(`AddStep( "Device Configuration", "hw_proposal" ) ); - UI::WizardCommand(`UpdateSteps() ); - - if ( false ) - { - UI::WizardCommand(`SetAbortButtonLabel( "&Cancel" ) ); - UI::WizardCommand(`SetBackButtonLabel( "" ) ); - UI::WizardCommand(`SetNextButtonLabel( "&Accept" ) ); - } - - UI::WizardCommand(`SetCurrentStep( "net" ) ); - - map event = UI::WaitForEvent( 10 ); - - UI::CloseDialog(); - -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ycp-ui-bindings-2.17.7/Makefile.in new/yast2-ycp-ui-bindings-2.17.8/Makefile.in --- old/yast2-ycp-ui-bindings-2.17.7/Makefile.in 2008-09-25 12:00:29.000000000 +0200 +++ new/yast2-ycp-ui-bindings-2.17.8/Makefile.in 2008-09-04 15:33:37.000000000 +0200 @@ -149,7 +149,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -167,8 +166,6 @@ XML_CATALOG = @XML_CATALOG@ XSLTPROC = @XSLTPROC@ XSLTPROC_FLAGS = @XSLTPROC_FLAGS@ -Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ -Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ abs_builddir = @abs_builddir@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ycp-ui-bindings-2.17.7/src/Makefile.in new/yast2-ycp-ui-bindings-2.17.8/src/Makefile.in --- old/yast2-ycp-ui-bindings-2.17.7/src/Makefile.in 2008-09-25 12:00:29.000000000 +0200 +++ new/yast2-ycp-ui-bindings-2.17.8/src/Makefile.in 2008-09-04 15:33:37.000000000 +0200 @@ -148,7 +148,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ RANLIB = @RANLIB@ RPMNAME = @RPMNAME@ @@ -166,8 +165,6 @@ XML_CATALOG = @XML_CATALOG@ XSLTPROC = @XSLTPROC@ XSLTPROC_FLAGS = @XSLTPROC_FLAGS@ -Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ -Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ abs_builddir = @abs_builddir@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ycp-ui-bindings-2.17.7/src/YCPWizardCommandParser.cc new/yast2-ycp-ui-bindings-2.17.8/src/YCPWizardCommandParser.cc --- old/yast2-ycp-ui-bindings-2.17.7/src/YCPWizardCommandParser.cc 2008-04-11 18:10:08.000000000 +0200 +++ new/yast2-ycp-ui-bindings-2.17.8/src/YCPWizardCommandParser.cc 2008-09-24 16:20:27.000000000 +0200 @@ -31,6 +31,7 @@ { if ( isCommand( "SetHelpText ( string )", cmd ) ) { wizard->setHelpText ( stringArg( cmd, 0 ) ); return true; } if ( isCommand( "SetDialogIcon ( string )", cmd ) ) { wizard->setDialogIcon ( stringArg( cmd, 0 ) ); return true; } + if ( isCommand( "SetDialogTitle ( string )", cmd ) ) { wizard->setDialogTitle( stringArg( cmd, 0 ) ); return true; } if ( isCommand( "SetDialogHeading ( string )", cmd ) ) { wizard->setDialogHeading( stringArg( cmd, 0 ) ); return true; } if ( isCommand( "SetCurrentStep ( string )", cmd ) ) { wizard->setCurrentStep( stringArg( cmd, 0 ) ); return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ycp-ui-bindings-2.17.7/VERSION new/yast2-ycp-ui-bindings-2.17.8/VERSION --- old/yast2-ycp-ui-bindings-2.17.7/VERSION 2008-09-25 11:58:25.000000000 +0200 +++ new/yast2-ycp-ui-bindings-2.17.8/VERSION 2008-09-26 15:54:16.000000000 +0200 @@ -1 +1 @@ -2.17.7 +2.17.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-support
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package yast2-support checked in at Mon Sep 29 18:29:57 CEST 2008. -------- --- yast2-support/yast2-support.changes 2008-09-26 16:19:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-support/yast2-support.changes 2008-09-29 15:51:26.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Sep 29 15:37:11 CEST 2008 - mzugec(a)suse.cz + +- added support for new identifiers (fate#305243) +- 2.17.6 + +------------------------------------------------------------------- +Mon Sep 29 14:29:09 CEST 2008 - mzugec(a)suse.cz + +- split Overview into Overview and Upload +- test and run browser with specified URL +- 2.17.5 + +------------------------------------------------------------------- Old: ---- yast2-support-2.17.4.tar.bz2 New: ---- yast2-support-2.17.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-support.spec ++++++ --- /var/tmp/diff_new_pack.G14987/_old 2008-09-29 18:29:38.000000000 +0200 +++ /var/tmp/diff_new_pack.G14987/_new 2008-09-29 18:29:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-support (Version 2.17.4) +# spec file for package yast2-support (Version 2.17.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-support -Version: 2.17.4 +Version: 2.17.6 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-support-2.17.4.tar.bz2 +Source0: yast2-support-2.17.6.tar.bz2 Prefix: /usr Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -38,7 +38,7 @@ %prep -%setup -n yast2-support-2.17.4 +%setup -n yast2-support-2.17.6 %build %{prefix}/bin/y2tool y2autoconf @@ -72,6 +72,13 @@ /usr/share/YaST2/scrconf/*.scr %doc %{prefix}/share/doc/packages/yast2-support %changelog +* Mon Sep 29 2008 mzugec(a)suse.cz +- added support for new identifiers (fate#305243) +- 2.17.6 +* Mon Sep 29 2008 mzugec(a)suse.cz +- split Overview into Overview and Upload +- test and run browser with specified URL +- 2.17.5 * Fri Sep 26 2008 mzugec(a)suse.cz - changed workflow - overview dialog - 2.17.4 ++++++ yast2-support-2.17.4.tar.bz2 -> yast2-support-2.17.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.4/configure new/yast2-support-2.17.6/configure --- old/yast2-support-2.17.4/configure 2008-09-26 16:01:27.000000000 +0200 +++ new/yast2-support-2.17.6/configure 2008-09-29 15:36:31.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-support 2.17.3. +# Generated by GNU Autoconf 2.61 for yast2-support 2.17.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-support' PACKAGE_TARNAME='yast2-support' -PACKAGE_VERSION='2.17.3' -PACKAGE_STRING='yast2-support 2.17.3' +PACKAGE_VERSION='2.17.5' +PACKAGE_STRING='yast2-support 2.17.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-support 2.17.3 to adapt to many kinds of systems. +\`configure' configures yast2-support 2.17.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-support 2.17.3:";; + short | recursive ) echo "Configuration of yast2-support 2.17.5:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-support configure 2.17.3 +yast2-support configure 2.17.5 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-support $as_me 2.17.3, which was +It was created by yast2-support $as_me 2.17.5, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-support' - VERSION='2.17.3' + VERSION='2.17.5' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.3" +VERSION="2.17.5" RPMNAME="yast2-support" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-support $as_me 2.17.3, which was +This file was extended by yast2-support $as_me 2.17.5, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-support config.status 2.17.3 +yast2-support config.status 2.17.5 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.4/configure.in new/yast2-support-2.17.6/configure.in --- old/yast2-support-2.17.4/configure.in 2008-09-26 16:01:19.000000000 +0200 +++ new/yast2-support-2.17.6/configure.in 2008-09-29 15:36:23.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-support, 2.17.3, http://bugs.opensuse.org/, yast2-support) +AC_INIT(yast2-support, 2.17.5, http://bugs.opensuse.org/, yast2-support) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.3" +VERSION="2.17.5" RPMNAME="yast2-support" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.4/src/dialogs.ycp new/yast2-support-2.17.6/src/dialogs.ycp --- old/yast2-support-2.17.4/src/dialogs.ycp 2008-09-26 16:02:57.000000000 +0200 +++ new/yast2-support-2.17.6/src/dialogs.ycp 2008-09-29 15:36:00.000000000 +0200 @@ -36,7 +36,6 @@ import "Wizard"; import "Support"; import "Map"; - include "support/helps.ycp"; @@ -46,6 +45,7 @@ string caption = _("Supportconfig Overview Dialog"); /* Support configure1 dialog contents */ +/* term contents = `VBox( `Left( `HBox( @@ -60,7 +60,35 @@ )), `PushButton(`id(`browser), `opt(`disabled), _("Execute web browser")) ); - +*/ + term contents = `VBox( + `Left( + `Frame(_("Open Novell Support Center"), + `VBox( + `Label("This will start a browser with Novell Support Center Portal."), + `PushButton(`id(`browser), _("Open")) + ) + ) + ), + `VSpacing(2), + `Left( + `Frame(_("Collect Data"), + `VBox( + `Label(_("This will create tarball with collected log files.")), + `PushButton(`id(`tarball), _("Create report tarball")) + ) + ) + ), + `VSpacing(2), + `Left( + `Frame(_("Upload Data"), + `VBox( + `Label(_("This will upload collected logs into specified URL.")), + `PushButton(`id(`upload), _("Upload")) + ) + ) + ) + ); Wizard::SetContentsButtons(caption, contents, HELPS["c1"]:"", Label::BackButton(), Label::NextButton()); @@ -69,24 +97,66 @@ any ret = nil; while(true) { ret = UI::UserInput(); - if (ret == `abort || ret == `tarball) + if (ret == `abort || ret == `tarball || ret == `upload) break; - if (ret == `browse){ + else + if (ret == `browser){ + string url="www.novell.com"; + y2milestone("Executing browser %1 with URL %2", Support::browser, url); + SCR::Execute(.target.bash, sformat("su $(env|grep LOGNAME|cut -d'=' -f2-) -c \"%1 %2\"", Support::browser, url)); + } + } + return ret; +} + +any UploadDialog(){ + string caption = _("Supportconfig Upload Dialog"); + + string url=""; + if(SCR::Read(.target.size,"/etc/install.inf") > 0) { + url = (string)SCR::Read(.etc.install_inf.supporturl); + y2milestone("URL value from /etc/install.inf : %1", url); + } else y2warning("/etc/install.inf not found"); + if(url==nil){ + url=Support::options["VAR_OPTION_UPLOAD_TARGET"]:""; + y2milestone("URL value from /etc/supportconfig.conf : %1", url); + } + y2milestone("%1", Support::log_files); + /* Support configure1 dialog contents */ + term contents = `VBox( + `Left( + `HBox( + `InputField(`id(`tarball_file), _("Package with log files"), Support::log_files["tarball"]:""), + `VBox(`Label(""), `PushButton(`id(`browse), Label::BrowseButton())) + )), + `Left( + `HBox( + `InputField(`id(`url), _("Upload URL"), url), + `VBox(`Label(""), `PushButton(`id(`upload), `opt(`disabled), _("Upload log files tarball into URL"))) + )) + ); + Wizard::SetContentsButtons(caption, contents, HELPS["c1"]:"", + Label::BackButton(), Label::NextButton()); + + any ret = nil; + while(true) { + ret = UI::UserInput(); + if (ret == `abort || ret == `next || ret == `back) + break; + if (ret == `browse){ string tarball_file = UI::AskForExistingFile("/", "*.tgz *.tbz", _("Choose Log Files Tarball File") ); if (tarball_file != nil && size(tarball_file)>0){ - UI::ChangeWidget(`tarball_file, `Value, tarball_file); - Support::log_files["tarball"]=tarball_file; - } + UI::ChangeWidget(`tarball_file, `Value, tarball_file); + Support::log_files["tarball"]=tarball_file; + } else y2error("Empty or invalid logs tarball path"); continue; - } + } } return ret; } - - /** * Command line parameters dialog * @return dialog result @@ -276,7 +346,9 @@ `Left(`InputField(`id(`company), _("Company"), Support::options["VAR_OPTION_CONTACT_COMPANY"]:"")), `Left(`InputField(`id(`email), _("Email Address"), Support::options["VAR_OPTION_CONTACT_EMAIL"]:"")), `Left(`InputField(`id(`name), _("Name"), Support::options["VAR_OPTION_CONTACT_NAME"]:"")), - `Left(`InputField(`id(`phone), _("Phone Number"), Support::options["VAR_OPTION_CONTACT_PHONE"]:"")) + `Left(`InputField(`id(`phone), _("Phone Number"), Support::options["VAR_OPTION_CONTACT_PHONE"]:"")), + `Left(`InputField(`id(`storeid), _("Store ID"), Support::options["VAR_OPTION_CONTACT_STOREID"]:"")), + `Left(`InputField(`id(`terminalid), _("Terminal ID"), Support::options["VAR_OPTION_CONTACT_TERMINALID"]:"")) )), `Frame (_("Upload Informations"), `VBox( `Left(`InputField(`id(`target), _("Upload Target"), Support::options["VAR_OPTION_UPLOAD_TARGET"]:"")), @@ -301,6 +373,8 @@ Support::options["VAR_OPTION_CONTACT_EMAIL"]=(string)UI::QueryWidget(`email, `Value); Support::options["VAR_OPTION_CONTACT_NAME"]=(string)UI::QueryWidget(`name, `Value); Support::options["VAR_OPTION_CONTACT_PHONE"]=(string)UI::QueryWidget(`phone, `Value); + Support::options["VAR_OPTION_CONTACT_STOREID"]=(string)UI::QueryWidget(`storeid, `Value); + Support::options["VAR_OPTION_CONTACT_TERMINALID"]=(string)UI::QueryWidget(`terminalid, `Value); Support::options["VAR_OPTION_UPLOAD_TARGET"]=(string)UI::QueryWidget(`target, `Value); Support::novell_number=(string)UI::QueryWidget(`novell_number, `Value); Support::WriteConfig(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.4/src/Support.ycp new/yast2-support-2.17.6/src/Support.ycp --- old/yast2-support-2.17.4/src/Support.ycp 2008-09-26 15:25:24.000000000 +0200 +++ new/yast2-support-2.17.6/src/Support.ycp 2008-09-29 14:19:00.000000000 +0200 @@ -40,6 +40,7 @@ import "Summary"; import "Message"; import "Map"; +import "PackageSystem"; /** * Prototypes @@ -142,6 +143,7 @@ global map<string, any> log_files=$[]; //global string created_directory=""; +global string browser=nil; global string GetParameterList(){ string parameters=""; @@ -221,6 +223,10 @@ // read current settings if(Abort()) return false; Progress::NextStage(); + if (PackageSystem::Installed("MozillaFirefox")) browser="firefox"; + else if (PackageSystem::Installed("kde4-konqueror")||PackageSystem::Installed("kdebase3")) browser="konqueror"; + else if (PackageSystem::Installed("opera")) browser="opera"; + else y2error("Couldn't find any supported browser installed."); /* Error message */ if(false) Report::Error(Message::CannotReadCurrentSettings()); sleep(sl); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.4/src/wizards.ycp new/yast2-support-2.17.6/src/wizards.ycp --- old/yast2-support-2.17.4/src/wizards.ycp 2008-09-26 10:41:21.000000000 +0200 +++ new/yast2-support-2.17.6/src/wizards.ycp 2008-09-29 10:52:30.000000000 +0200 @@ -47,6 +47,7 @@ /* FIXME: adapt to your needs */ map aliases = $[ "overview" : ``(OverviewDialog()), + "upload" : ``(UploadDialog()), "parameters" : ``(ParametersDialog()), "expert" : ``( ExpertDialog() ), "contact" : ``(ContactDialog()), @@ -61,8 +62,14 @@ `abort : `abort, `back : `back, `tarball : "parameters", + `upload : "upload", `next : `next, ], + "upload" : $[ + `abort : `abort, + `back : "overview", + `next : "overview" + ], "parameters" : $[ `abort : `abort, `expert : "expert", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-support-2.17.4/VERSION new/yast2-support-2.17.6/VERSION --- old/yast2-support-2.17.4/VERSION 2008-09-26 16:06:24.000000000 +0200 +++ new/yast2-support-2.17.6/VERSION 2008-09-29 15:37:09.000000000 +0200 @@ -1 +1 @@ -2.17.4 +2.17.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-slp-server
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package yast2-slp-server checked in at Mon Sep 29 18:29:36 CEST 2008. -------- --- yast2-slp-server/yast2-slp-server.changes 2008-07-21 13:12:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-slp-server/yast2-slp-server.changes 2008-09-29 09:32:19.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 29 09:17:22 CEST 2008 - mzugec(a)suse.de + +- fixed menu category for gnome (bnc#429429) +- 2.17.1 + +------------------------------------------------------------------- Old: ---- yast2-slp-server-2.17.0.tar.bz2 New: ---- yast2-slp-server-2.17.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-slp-server.spec ++++++ --- /var/tmp/diff_new_pack.w14080/_old 2008-09-29 18:29:14.000000000 +0200 +++ /var/tmp/diff_new_pack.w14080/_new 2008-09-29 18:29:14.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-slp-server (Version 2.17.0) +# spec file for package yast2-slp-server (Version 2.17.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,12 +20,12 @@ Url: http://forge.novell.com/modules/xfmod/project/?yast Name: yast2-slp-server -Version: 2.17.0 +Version: 2.17.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-slp-server-2.17.0.tar.bz2 +Source0: yast2-slp-server-2.17.1.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2 @@ -36,7 +43,7 @@ Michal Zugec %prep -%setup -n yast2-slp-server-2.17.0 +%setup -n yast2-slp-server-2.17.1 %build %{prefix}/bin/y2tool y2autoconf @@ -70,6 +77,9 @@ /usr/share/YaST2/scrconf/slp*.scr %doc %{prefix}/share/doc/packages/yast2-slp-server %changelog +* Mon Sep 29 2008 mzugec(a)suse.de +- fixed menu category for gnome (bnc#429429) +- 2.17.1 * Mon Jul 21 2008 mzugec(a)suse.cz - use correct cases for configuration options (bnc#291301) - 2.17.0 ++++++ yast2-slp-server-2.17.0.tar.bz2 -> yast2-slp-server-2.17.1.tar.bz2 ++++++ ++++ 3077 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-slp-server-2.17.0/configure.in new/yast2-slp-server-2.17.1/configure.in --- old/yast2-slp-server-2.17.0/configure.in 2008-07-21 13:00:57.000000000 +0200 +++ new/yast2-slp-server-2.17.1/configure.in 2008-09-25 19:46:12.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-slp-server dnl -dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-slp-server, 2.16.2, http://bugs.opensuse.org/, yast2-slp-server) +AC_INIT(yast2-slp-server, 2.17.0, http://bugs.opensuse.org/, yast2-slp-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.2" +VERSION="2.17.0" RPMNAME="yast2-slp-server" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-slp-server-2.17.0/src/slp-server.desktop new/yast2-slp-server-2.17.1/src/slp-server.desktop --- old/yast2-slp-server-2.17.0/src/slp-server.desktop 2008-07-16 18:22:18.000000000 +0200 +++ new/yast2-slp-server-2.17.1/src/slp-server.desktop 2008-09-25 19:46:01.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced; X-KDE-ModuleType=Library X-KDE-RootOnly=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-slp-server-2.17.0/VERSION new/yast2-slp-server-2.17.1/VERSION --- old/yast2-slp-server-2.17.0/VERSION 2008-07-21 13:10:05.000000000 +0200 +++ new/yast2-slp-server-2.17.1/VERSION 2008-09-25 19:48:02.000000000 +0200 @@ -1 +1 @@ -2.17.0 +2.17.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-schema
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package yast2-schema checked in at Mon Sep 29 18:29:29 CEST 2008. -------- --- yast2-schema/yast2-schema.changes 2008-09-16 09:47:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-schema/yast2-schema.changes 2008-09-26 17:15:44.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 26 17:14:50 CEST 2008 - locilka(a)suse.cz + +- Adding some more BuildIgnores to build the package (bnc #427684). +- 2.17.1 + +------------------------------------------------------------------- Old: ---- yast2-schema-2.17.0.tar.bz2 New: ---- yast2-schema-2.17.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-schema.spec ++++++ --- /var/tmp/diff_new_pack.D13954/_old 2008-09-29 18:29:12.000000000 +0200 +++ /var/tmp/diff_new_pack.D13954/_new 2008-09-29 18:29:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-schema (Version 2.17.0) +# spec file for package yast2-schema (Version 2.17.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ Url: http://www.suse.com/ Name: yast2-schema -Version: 2.17.0 +Version: 2.17.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-schema-2.17.0.tar.bz2 +Source0: yast2-schema-2.17.1.tar.bz2 Prefix: /usr BuildRequires: java2-devel-packages trang yast2-all-packages #!BuildIgnore: yast2-build-test yast2-online-update @@ -34,6 +34,10 @@ # ignoring conflicting packages #!BuildIgnore: yast2-branding-SLED yast2-branding-openSUSE #!BuildIgnore: yast2-theme yast2-theme-SLED yast2-theme-openSUSE +# Hotfix to build a package, bnc #427684 +#!BuildIgnore: xerces-j2-bootstrap libusb-0_1-4 crimson +# Speedup +#!BuildIgnore: yast2-pkg-bindings-devel-doc yast2-pkg-bindings zypper BuildArch: noarch Summary: YaST2 - AutoYaST Schema @@ -48,7 +52,7 @@ Martin Vidner <mvidner(a)suse.cz> %prep -%setup -n yast2-schema-2.17.0 +%setup -n yast2-schema-2.17.1 %build %{prefix}/bin/y2tool y2autoconf @@ -81,6 +85,9 @@ /usr/share/YaST2/schema/autoyast/rng/*.rng %doc %{prefix}/share/doc/packages/yast2-schema %changelog +* Fri Sep 26 2008 locilka(a)suse.cz +- Adding some more BuildIgnores to build the package (bnc #427684). +- 2.17.1 * Tue Sep 16 2008 locilka(a)suse.cz - Ignoring conflicting packages (yast2-branding-*, yast2-theme-*). - 2.17.0 ++++++ yast2-schema-2.17.0.tar.bz2 -> yast2-schema-2.17.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.17.0/configure new/yast2-schema-2.17.1/configure --- old/yast2-schema-2.17.0/configure 2008-09-16 09:32:47.000000000 +0200 +++ new/yast2-schema-2.17.1/configure 2008-09-16 09:55:53.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-schema 2.15.0. +# Generated by GNU Autoconf 2.61 for yast2-schema 2.17.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-schema' PACKAGE_TARNAME='yast2-schema' -PACKAGE_VERSION='2.15.0' -PACKAGE_STRING='yast2-schema 2.15.0' +PACKAGE_VERSION='2.17.0' +PACKAGE_STRING='yast2-schema 2.17.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-schema 2.15.0 to adapt to many kinds of systems. +\`configure' configures yast2-schema 2.17.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-schema 2.15.0:";; + short | recursive ) echo "Configuration of yast2-schema 2.17.0:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-schema configure 2.15.0 +yast2-schema configure 2.17.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-schema $as_me 2.15.0, which was +It was created by yast2-schema $as_me 2.17.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-schema' - VERSION='2.15.0' + VERSION='2.17.0' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.15.0" +VERSION="2.17.0" RPMNAME="yast2-schema" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-schema $as_me 2.15.0, which was +This file was extended by yast2-schema $as_me 2.17.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-schema config.status 2.15.0 +yast2-schema config.status 2.17.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.17.0/configure.in new/yast2-schema-2.17.1/configure.in --- old/yast2-schema-2.17.0/configure.in 2008-09-16 09:32:44.000000000 +0200 +++ new/yast2-schema-2.17.1/configure.in 2008-09-16 09:55:51.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-schema, 2.15.0, http://bugs.opensuse.org/, yast2-schema) +AC_INIT(yast2-schema, 2.17.0, http://bugs.opensuse.org/, yast2-schema) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.15.0" +VERSION="2.17.0" RPMNAME="yast2-schema" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.17.0/VERSION new/yast2-schema-2.17.1/VERSION --- old/yast2-schema-2.17.0/VERSION 2008-09-16 09:35:01.000000000 +0200 +++ new/yast2-schema-2.17.1/VERSION 2008-09-26 17:15:47.000000000 +0200 @@ -1 +1 @@ -2.17.0 +2.17.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-qt
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package yast2-qt checked in at Mon Sep 29 18:29:06 CEST 2008. -------- --- yast2-qt/yast2-qt.changes 2008-09-24 18:34:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2008-09-29 14:22:51.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 26 15:52:16 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #418443: Yast modules windows have no title +- V 2.17.12 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt.spec ++++++ --- /var/tmp/diff_new_pack.l12741/_old 2008-09-29 18:28:54.000000000 +0200 +++ /var/tmp/diff_new_pack.l12741/_new 2008-09-29 18:28:54.000000000 +0200 @@ -19,7 +19,7 @@ Name: yast2-qt Version: 2.17.10 -Release: 1 +Release: 2 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -119,6 +119,9 @@ %_includedir/* %changelog +* Fri Sep 26 2008 tgoettlicher(a)suse.de +- Fixed bnc #418443: Yast modules windows have no title +- V 2.17.12 * Wed Sep 24 2008 sh(a)suse.de - Improved robustness against already-deleted widgets (bnc #421794) - Require latest libyui ++++++ yast2-qt-2.17.10.tar.bz2 ++++++ ++++ 6282 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-pkg-bindings
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Mon Sep 29 18:29:02 CEST 2008. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-09-25 17:56:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-09-29 15:54:49.437572000 +0200 @@ -1,0 +2,11 @@ +Mon Sep 29 14:27:21 CEST 2008 - lslezak(a)suse.cz + +- do not autorefresh remote repositories when there is no network + connection (affected calls Pkg::SourceLoad(), + Pkg::SourceStartManager() and PkgFunctions::SourceStartCache()) + (bnc#401966) +- ResolvableProperties() - return more info about product + ("register_target", "register_release" and "flavor" keys) +- 2.17.16 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.17.15.tar.bz2 New: ---- yast2-pkg-bindings-2.17.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.P12533/_old 2008-09-29 18:28:50.000000000 +0200 +++ /var/tmp/diff_new_pack.P12533/_new 2008-09-29 18:28:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings-devel-doc (Version 2.17.15) +# spec file for package yast2-pkg-bindings-devel-doc (Version 2.17.16) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-pkg-bindings-devel-doc -Version: 2.17.15 +Version: 2.17.16 Release: 1 License: GPL v2 or later Group: Documentation/HTML BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.17.15.tar.bz2 +Source0: yast2-pkg-bindings-2.17.16.tar.bz2 Prefix: %_prefix # same as in the main package (because we use the same configure.in.in) BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools @@ -45,7 +45,7 @@ Ladislav Slez�k <lslezak(a)novell.com> %prep -%setup -n yast2-pkg-bindings-2.17.15 +%setup -n yast2-pkg-bindings-2.17.16 # build only documentation, ignore all other directories echo "doc" > SUBDIRS @@ -76,7 +76,6 @@ %dir %{prefix}/share/doc/packages/yast2-pkg-bindings %exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/COPYING %exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/README - %changelog * Fri May 16 2008 lslezak(a)suse.cz - documented lock API ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.P12533/_old 2008-09-29 18:28:50.000000000 +0200 +++ /var/tmp/diff_new_pack.P12533/_new 2008-09-29 18:28:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.17.15) +# spec file for package yast2-pkg-bindings (Version 2.17.16) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-pkg-bindings -Version: 2.17.15 +Version: 2.17.16 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.17.15.tar.bz2 +Source0: yast2-pkg-bindings-2.17.16.tar.bz2 Prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 5.10.0 @@ -47,7 +47,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.17.15 +%setup -n yast2-pkg-bindings-2.17.16 # build only the library, ignore documentation (it is in devel-doc package) echo "src" > SUBDIRS @@ -78,8 +78,15 @@ %{_libdir}/YaST2/plugin/libpy2Pkg.so.* %{_libdir}/YaST2/plugin/libpy2Pkg.so %doc %{prefix}/share/doc/packages/yast2-pkg-bindings - %changelog +* Mon Sep 29 2008 lslezak(a)suse.cz +- do not autorefresh remote repositories when there is no network + connection (affected calls Pkg::SourceLoad(), + Pkg::SourceStartManager() and PkgFunctions::SourceStartCache()) + (bnc#401966) +- ResolvableProperties() - return more info about product + ("register_target", "register_release" and "flavor" keys) +- 2.17.16 * Thu Sep 25 2008 lslezak(a)suse.cz - removed another usage of the old logging (bnc#429954) - 2.17.15 ++++++ yast2-pkg-bindings-2.17.15.tar.bz2 -> yast2-pkg-bindings-2.17.16.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.15/configure new/yast2-pkg-bindings-2.17.16/configure --- old/yast2-pkg-bindings-2.17.15/configure 2008-09-25 17:55:55.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.16/configure 2008-09-29 15:53:54.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-pkg-bindings 2.17.15. +# Generated by GNU Autoconf 2.61 for yast2-pkg-bindings 2.17.16. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.17.15' -PACKAGE_STRING='yast2-pkg-bindings 2.17.15' +PACKAGE_VERSION='2.17.16' +PACKAGE_STRING='yast2-pkg-bindings 2.17.16' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1453,7 +1453,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-pkg-bindings 2.17.15 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 2.17.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1524,7 +1524,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.17.15:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.17.16:";; esac cat <<\_ACEOF @@ -1636,7 +1636,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 2.17.15 +yast2-pkg-bindings configure 2.17.16 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1650,7 +1650,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-pkg-bindings $as_me 2.17.15, which was +It was created by yast2-pkg-bindings $as_me 2.17.16, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2471,7 +2471,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.17.15' + VERSION='2.17.16' cat >>confdefs.h <<_ACEOF @@ -2699,7 +2699,7 @@ -VERSION="2.17.15" +VERSION="2.17.16" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" @@ -21700,7 +21700,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-pkg-bindings $as_me 2.17.15, which was +This file was extended by yast2-pkg-bindings $as_me 2.17.16, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21753,7 +21753,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-pkg-bindings config.status 2.17.15 +yast2-pkg-bindings config.status 2.17.16 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.15/configure.in new/yast2-pkg-bindings-2.17.16/configure.in --- old/yast2-pkg-bindings-2.17.15/configure.in 2008-09-25 17:55:42.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.16/configure.in 2008-09-29 15:53:41.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.17.15, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.17.16, http://bugs.opensuse.org/, yast2-pkg-bindings) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.15" +VERSION="2.17.16" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.15/src/Makefile.am new/yast2-pkg-bindings-2.17.16/src/Makefile.am --- old/yast2-pkg-bindings-2.17.15/src/Makefile.am 2008-09-01 17:28:58.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.16/src/Makefile.am 2008-09-29 14:52:12.000000000 +0200 @@ -54,6 +54,7 @@ PkgService.cc PkgService.h \ ServiceManager.cc ServiceManager.h \ Service.cc \ + Network.cc \ HelpTexts.h i18n.h log.h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.15/src/Makefile.in new/yast2-pkg-bindings-2.17.16/src/Makefile.in --- old/yast2-pkg-bindings-2.17.15/src/Makefile.in 2008-09-25 17:55:59.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.16/src/Makefile.in 2008-09-29 15:53:57.000000000 +0200 @@ -68,7 +68,7 @@ Source_Resolvables.lo Source_Save.lo Source_Set.lo Keyring.lo \ GPGMap.lo Callbacks.YCP.lo Callbacks.lo Callbacks_Register.lo \ Y2PkgFunction.lo YRepo.lo PkgService.lo ServiceManager.lo \ - Service.lo + Service.lo Network.lo libpy2Pkg_la_OBJECTS = $(am_libpy2Pkg_la_OBJECTS) libpy2Pkg_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ @@ -305,6 +305,7 @@ PkgService.cc PkgService.h \ ServiceManager.cc ServiceManager.h \ Service.cc \ + Network.cc \ HelpTexts.h i18n.h log.h libpy2Pkg_la_LDFLAGS = -version-info 2:0 @@ -395,6 +396,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Keyring.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Locale.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Locks.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Network.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Package.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Patch.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PkgError.Plo@am__quote@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.15/src/Network.cc new/yast2-pkg-bindings-2.17.16/src/Network.cc --- old/yast2-pkg-bindings-2.17.15/src/Network.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-pkg-bindings-2.17.16/src/Network.cc 2008-09-29 14:49:58.000000000 +0200 @@ -0,0 +1,68 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2008 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/* + File: $Id: Source_Load.cc 49526 2008-07-30 13:28:18Z mvidner $ + Author: Ladislav Slezák <lslezak(a)novell.com> + Summary: Network related functions + Namespace: Pkg +*/ + + +#include <PkgFunctions.h> +#include "log.h" + +// system() +#include <cstdlib> + +#include <zypp/Url.h> + +/* + Textdomain "pkg-bindings" +*/ + +/* + A helper function + Detect whether there is a network connection. + See isNetworkRunning() function in NetworkService.ycp +*/ +bool PkgFunctions::NetworkDetected() +{ + y2milestone("Checking the network status..."); + int result = ::system("ip addr|grep -v 'inet6 ::1\\|inet6 fe80'|grep -c inet6"); + y2milestone("Network is running: %s", (result == 0) ? "yes" : "no"); + + return !result; +} + +/* + A helper function + Is the URL remote? +*/ +bool PkgFunctions::remoteRepo(const zypp::Url &url) +{ + // is it a remote repository? + std::string scheme(zypp::str::toLower(url.getScheme())); + + y2debug("Repository schema: %s", scheme.c_str()); + + return (scheme == "ftp" || scheme == "http" || scheme == "https" || scheme == "nfs" + || scheme == "smb"); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.15/src/PkgFunctions.h new/yast2-pkg-bindings-2.17.16/src/PkgFunctions.h --- old/yast2-pkg-bindings-2.17.15/src/PkgFunctions.h 2008-09-25 17:50:54.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.16/src/PkgFunctions.h 2008-09-29 14:54:51.000000000 +0200 @@ -112,13 +112,19 @@ YCPValue SourceRefreshHelper(const YCPInteger &id, bool forced = false); + // helper - is the network running? + bool NetworkDetected(); + + // is the URL remote? + bool remoteRepo(const zypp::Url &url); + // conversion methods for type string between Yast and libzypp (for backward compatibility) std::string zypp2yastType(const std::string &type); std::string yast2zyppType(const std::string &type); void RemoveResolvablesFrom(const std::string &alias); bool AnyResolvableFrom(const std::string &alias); - bool LoadResolvablesFrom(const zypp::RepoInfo &repoinfo, const zypp::ProgressData::ReceiverFnc & progressrcv = zypp::ProgressData::ReceiverFnc()); + bool LoadResolvablesFrom(const zypp::RepoInfo &repoinfo, const zypp::ProgressData::ReceiverFnc & progressrcv = zypp::ProgressData::ReceiverFnc(), bool network_check = false); std::string UniqueAlias(const std::string &alias); YCPValue GetPkgLocation(const YCPString& p, bool full_path); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.15/src/Resolvable_Properties.cc new/yast2-pkg-bindings-2.17.16/src/Resolvable_Properties.cc --- old/yast2-pkg-bindings-2.17.15/src/Resolvable_Properties.cc 2008-09-24 08:54:31.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.16/src/Resolvable_Properties.cc 2008-09-26 08:48:36.000000000 +0200 @@ -92,6 +92,9 @@ + "optional_urls" + "register_urls" + "smolt_urls" + + "register_target" + + "register_release" + + "flavor" + "replaces" + "name" + "version" @@ -397,6 +400,13 @@ info->add(YCPString("smolt_urls"), smoltUrls); } + // registration data + info->add(YCPString("register_target"), YCPString(product->registerTarget())); + info->add(YCPString("register_release"), YCPString(product->registerRelease())); + + // Live CD, FTP Edition... + info->add(YCPString("flavor"), YCPString(product->flavor())); + // get the installed Products it would replace. zypp::Product::ReplacedProducts replaced(product->replacedProducts()); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.15/src/Source_Load.cc new/yast2-pkg-bindings-2.17.16/src/Source_Load.cc --- old/yast2-pkg-bindings-2.17.15/src/Source_Load.cc 2008-08-05 15:38:46.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.16/src/Source_Load.cc 2008-09-29 15:51:38.000000000 +0200 @@ -19,7 +19,7 @@ */ /* - File: $Id: Source_Load.cc 49526 2008-07-30 13:28:18Z mvidner $ + File: $Id: Source_Load.cc 51657 2008-09-29 13:51:36Z lslezak $ Author: Ladislav Slezák <lslezak(a)novell.com> Summary: Functions for initializing the package manager Namespace: Pkg @@ -190,6 +190,8 @@ autorefresh_skipped = false; CallRefreshStarted(); + bool network_is_running = NetworkDetected(); + if (repos_to_refresh > 0) { // refresh metadata @@ -216,6 +218,19 @@ // autorefresh the source if ((*it)->repoInfo().autorefresh() || raw_metadata_status.empty()) { + // do not autorefresh remote repositories when the network is not running + if (!network_is_running) + { + zypp::Url url = *((*it)->repoInfo().baseUrlsBegin()); + + if (remoteRepo(url)) + { + y2warning("No network connection, skipping autorefresh of remote repository %s (%s)", + (*it)->repoInfo().alias().c_str(), url.asString().c_str()); + continue; + } + } + try { y2milestone("Autorefreshing source: %s", (*it)->repoInfo().alias().c_str()); @@ -279,16 +294,13 @@ // autorefresh the source if ((*it)->repoInfo().autorefresh()) { - if (autorefresh_skipped) - { - zypp::RepoStatus raw_metadata_status = repomanager.metadataStatus((*it)->repoInfo()); + zypp::RepoStatus raw_metadata_status = repomanager.metadataStatus((*it)->repoInfo()); - // autorefresh the source - if (raw_metadata_status.empty() ) - { - y2error("Missinga metadata, not rebuilding the cache"); - continue; - } + // autorefresh the source + if (raw_metadata_status.empty() ) + { + y2error("Missinga metadata, not rebuilding the cache"); + continue; } try @@ -352,8 +364,8 @@ } else { - // load objects - success = LoadResolvablesFrom((*it)->repoInfo(), load_subprogress) && success; + // load objects, do network status check + success = LoadResolvablesFrom((*it)->repoInfo(), load_subprogress, true) && success; } } y2debug("Progress status: %lld", prog_total.val()); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.15/src/Source_Resolvables.cc new/yast2-pkg-bindings-2.17.16/src/Source_Resolvables.cc --- old/yast2-pkg-bindings-2.17.15/src/Source_Resolvables.cc 2008-06-17 14:44:14.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.16/src/Source_Resolvables.cc 2008-09-29 15:51:38.000000000 +0200 @@ -19,7 +19,7 @@ */ /* - File: $Id: Source_Resolvables.cc 48353 2008-06-17 12:44:13Z lslezak $ + File: $Id: Source_Resolvables.cc 51657 2008-09-29 13:51:36Z lslezak $ Author: Ladislav Slezák <lslezak(a)novell.com> Summary: Functions for adding/removing resolvables in the pool Namespace: Pkg @@ -64,7 +64,7 @@ * A helper function - load resolvable from the repository into the pool * Warning: Use AnyResolvableFrom() method for checing if the resolvables might be already loaded */ -bool PkgFunctions::LoadResolvablesFrom(const zypp::RepoInfo &repoinfo, const zypp::ProgressData::ReceiverFnc &progressrcv) +bool PkgFunctions::LoadResolvablesFrom(const zypp::RepoInfo &repoinfo, const zypp::ProgressData::ReceiverFnc &progressrcv, bool network_check) { bool success = true; unsigned int size_start = zypp_ptr()->pool().size(); @@ -78,6 +78,7 @@ try { zypp::RepoManager repomanager = CreateRepoManager(); + bool refresh = true; // build cache if needed if (!repomanager.isCached(repoinfo) && !autorefresh_skipped) @@ -85,17 +86,36 @@ zypp::RepoStatus raw_metadata_status = repomanager.metadataStatus(repoinfo); if (raw_metadata_status.empty()) { - y2milestone("Missing metadata for source '%s', downloading...", repoinfo.alias().c_str()); + if (network_check) + { + zypp::Url url = *(repoinfo.baseUrlsBegin()); - CallRefreshStarted(); + if (remoteRepo(url) && !NetworkDetected()) + { + y2warning("No network connection, skipping autorefresh of remote repository %s (%s)", + repoinfo.alias().c_str(), url.asString().c_str()); - RefreshWithCallbacks(repoinfo); + refresh = false; + } + } - CallRefreshDone(); + if (refresh) + { + y2milestone("Missing metadata for source '%s', downloading...", repoinfo.alias().c_str()); + + CallRefreshStarted(); + + RefreshWithCallbacks(repoinfo); + + CallRefreshDone(); + } } - y2milestone("Caching source '%s'...", repoinfo.alias().c_str()); - repomanager.buildCache(repoinfo, zypp::RepoManager::BuildIfNeeded, load_subprogress); + if (refresh) + { + y2milestone("Caching source '%s'...", repoinfo.alias().c_str()); + repomanager.buildCache(repoinfo, zypp::RepoManager::BuildIfNeeded, load_subprogress); + } } repomanager.loadFromCache(repoinfo); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.15/VERSION new/yast2-pkg-bindings-2.17.16/VERSION --- old/yast2-pkg-bindings-2.17.15/VERSION 2008-09-25 17:54:46.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.16/VERSION 2008-09-29 15:53:27.000000000 +0200 @@ -1 +1 @@ -2.17.15 +2.17.16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-perl-bindings
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package yast2-perl-bindings checked in at Mon Sep 29 18:28:45 CEST 2008. -------- --- yast2-perl-bindings/yast2-perl-bindings.changes 2008-07-18 12:01:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-perl-bindings/yast2-perl-bindings.changes 2008-09-29 14:56:50.825745000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 29 14:25:15 CEST 2008 - visnov(a)suse.cz + +- Fixed testsuite +- 2.17.2 + +------------------------------------------------------------------- Old: ---- yast2-perl-bindings-2.17.1.tar.bz2 New: ---- yast2-perl-bindings-2.17.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-perl-bindings.spec ++++++ --- /var/tmp/diff_new_pack.K11384/_old 2008-09-29 18:28:39.000000000 +0200 +++ /var/tmp/diff_new_pack.K11384/_new 2008-09-29 18:28:39.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-perl-bindings (Version 2.17.1) +# spec file for package yast2-perl-bindings (Version 2.17.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-perl-bindings -Version: 2.17.1 +Version: 2.17.2 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-perl-bindings-2.17.1.tar.bz2 +Source0: yast2-perl-bindings-2.17.2.tar.bz2 Prefix: /usr BuildRequires: blocxx-devel curl-devel gcc-c++ libxcrypt-devel rpm-devel yast2-core-devel yast2-devtools yast2-ycp-ui-bindings-devel # YCPValue::valuetype_str() @@ -42,7 +49,7 @@ Martin Vidner <mvidner(a)suse.cz> %prep -%setup -n yast2-perl-bindings-2.17.1 +%setup -n yast2-perl-bindings-2.17.2 %build %{prefix}/bin/y2tool y2autoconf @@ -83,6 +90,9 @@ /usr/share/YaST2/data/devtools/admin/aminclude/pluglib-bindings.ami %doc %{prefix}/share/doc/packages/yast2-perl-bindings %changelog +* Mon Sep 29 2008 visnov(a)suse.cz +- Fixed testsuite +- 2.17.2 * Fri Jul 18 2008 mvidner(a)suse.cz - Fixed a missing declaration uncovered by a change in yast2-core. - 2.17.1 ++++++ yast2-perl-bindings-2.17.1.tar.bz2 -> yast2-perl-bindings-2.17.2.tar.bz2 ++++++ ++++ 15549 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-perl-bindings-2.17.1/configure.in new/yast2-perl-bindings-2.17.2/configure.in --- old/yast2-perl-bindings-2.17.1/configure.in 2008-07-18 12:02:32.000000000 +0200 +++ new/yast2-perl-bindings-2.17.2/configure.in 2008-09-26 09:26:11.000000000 +0200 @@ -1,6 +1,6 @@ dnl configure.in for yast2-perl-bindings dnl -dnl -- This file is generated by y2autoconf 2.17.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-perl-bindings, 2.17.1, http://bugs.opensuse.org/, yast2-perl-bindings) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-perl-bindings-2.17.1/doc/YaPI.html new/yast2-perl-bindings-2.17.2/doc/YaPI.html --- old/yast2-perl-bindings-2.17.1/doc/YaPI.html 2008-07-18 12:02:55.000000000 +0200 +++ new/yast2-perl-bindings-2.17.2/doc/YaPI.html 2008-09-26 09:27:00.000000000 +0200 @@ -4,13 +4,15 @@ <head> <title>YaPI - common functions for modules implementing YaST API</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> -<link rev="made" href="mailto:root@localhost" /> +<link rev="made" href="mailto:feedback@suse.de" /> </head> <body style="background-color: white"> -<a name="__index__"></a> +  +<div name="index"> +<a name="__index__"></a> <ul> @@ -37,9 +39,11 @@ </ul> </ul> + +<hr name="index" /> +</div>  -<hr /> <h1><a name="name">NAME</a></h1> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-perl-bindings-2.17.1/doc/YaST__YCP.html new/yast2-perl-bindings-2.17.2/doc/YaST__YCP.html --- old/yast2-perl-bindings-2.17.1/doc/YaST__YCP.html 2007-11-13 14:14:52.000000000 +0100 +++ new/yast2-perl-bindings-2.17.2/doc/YaST__YCP.html 2008-09-03 14:29:04.000000000 +0200 @@ -9,8 +9,10 @@ <body style="background-color: white"> -<a name="__index__"></a> +  +<div name="index"> +<a name="__index__"></a> <ul> @@ -36,9 +38,11 @@ </ul> </ul> + +<hr name="index" /> +</div>  -<hr /> <h1><a name="name">NAME</a></h1> @@ -65,25 +69,25 @@ an argument to a YCP function, it will convert a Perl scalar to the desired type. On the other hand, if the type is not known, expressed -in YCP as <a href="#item_any"><code>any</code></a>, scalars will be passed as strings. If you want +in YCP as <a href="#any"><code>any</code></a>, scalars will be passed as strings. If you want a specific data type, use one of the data classes like <a href="#integer">YaST::YCP::Integer</a>. Of course these work also when the type is known. <dl> -<dt><a name="item_void">void</a> +<dt><a name="void" class="item">void</a> <dd> Has only one value, <code>nil</code>, which is represented as <code>undef</code>. Any data type can have <code>nil</code> as a value. </dd> </li> -<dt><a name="item_any">any</a> +<dt><a name="any" class="item">any</a> <dd> A union of all data types. Any data type can be assigned to it. </dd> </li> -<dt><a name="item_string_2c_integer_2c_float_2c_boolean">string, integer, float, boolean</a> +<dt><a name="string_integer_float_boolean" class="item">string, integer, float, boolean</a> <dd> YCP to Perl: Becomes a scalar @@ -95,7 +99,7 @@ if you want a specific data type. </dd> </li> -<dt><a name="item_list__3ct_3e">list <T></a> +<dt><a name="list_t" class="item">list <T></a> <dd> YCP to Perl: A list becomes a reference to an array. @@ -109,7 +113,7 @@ even if the result is assigned to a list. </dd> </li> -<dt><a name="item_map__3ct1_2c_t2_3e">map <T1, T2></a> +<dt><a name="map_t1_t2" class="item">map <T1, T2></a> <dd> YCP to Perl: A map becomes a reference to a hash. @@ -119,7 +123,7 @@ Perl to YCP: A reference to a hash becomes a map. </dd> </li> -<dt><a name="item_path">path</a> +<dt><a name="path" class="item">path</a> <dd> YCP to Perl: NOT IMPLEMENTED YET. @@ -130,7 +134,7 @@ Otherwise use <a href="#path">Path</a> (which is NOT IMPLEMENTED YET). </dd> </li> -<dt><a name="item_symbol">symbol</a> +<dt><a name="symbol" class="item">symbol</a> <dd> YCP to Perl: Becomes a <a href="#symbol">Symbol</a>. @@ -141,7 +145,7 @@ Otherwise use <a href="#symbol">Symbol</a>. </dd> </li> -<dt><a name="item_term">term</a> +<dt><a name="term" class="item">term</a> <dd> YCP to Perl: Becomes a <a href="#term">Term</a>. @@ -150,7 +154,7 @@ Perl to YCP: Use <a href="#term">Term</a>. </dd> </li> -<dt><a name="item_byteblock">byteblock</a> +<dt><a name="byteblock" class="item">byteblock</a> <dd> YCP to Perl: Becomes a scalar. @@ -161,7 +165,7 @@ Otherwise use <a href="#byteblock">Byteblock</a>. </dd> </li> -<dt><a name="item_locale_2c_block__3ct_3e_2c__2e_2e_2e">locale, block <T>, ...</a> +<dt><a name="locale_block_t" class="item">locale, block <T>, ...</a> <dd> Not implemented. @@ -188,7 +192,7 @@ <pre> YaST::YCP::init_ui (); YaST::YCP::init_ui "qt";</pre> -Initializes the user interface, ``ncurses'' (the default) or ``qt''. +Initializes the user interface, "ncurses" (the default) or "qt". <h2><a name="import">Import</a></h2> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-perl-bindings-2.17.1/testsuite/Makefile.am new/yast2-perl-bindings-2.17.2/testsuite/Makefile.am --- old/yast2-perl-bindings-2.17.1/testsuite/Makefile.am 2006-10-10 14:05:36.000000000 +0200 +++ new/yast2-perl-bindings-2.17.2/testsuite/Makefile.am 2008-09-29 14:18:07.000000000 +0200 @@ -1,7 +1,7 @@ TESTS_ENVIRONMENT = PERL5LIB=$(DESTDIR)$(PERL_VENDORARCH) prefix=$(prefix) libdir=$(libdir) # test-perl writes to the log :( # but so does test-perl-min -TESTS = test-perl-min test-yast# test-perl -EXTRA_DIST = $(TESTS) tests/*.ycp tests/*.pm tests/A/*.pm tests/*.out tests/*.err tests.pl/*.pl tests.pl/*.ycp tests.pl/*.out tests.pl/*.err +TESTS = test-perl-script test-yast# test-perl +EXTRA_DIST = $(TESTS) test-perl-min tests/*.ycp tests/*.pm tests/A/*.pm tests/*.out tests/*.err tests.pl/*.pl tests.pl/*.ycp tests.pl/*.out tests.pl/*.err clean-local: rm -f tmp.out.* tmp.err.* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-perl-bindings-2.17.1/testsuite/test-perl-script new/yast2-perl-bindings-2.17.2/testsuite/test-perl-script --- old/yast2-perl-bindings-2.17.1/testsuite/test-perl-script 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-perl-bindings-2.17.2/testsuite/test-perl-script 2008-09-29 14:12:32.000000000 +0200 @@ -0,0 +1,7 @@ +#!/bin/bash + +export Y2SILENTSEARCH=1 + +./test-perl-min + +exit $? diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-perl-bindings-2.17.1/testsuite/tests/long.err new/yast2-perl-bindings-2.17.2/testsuite/tests/long.err --- old/yast2-perl-bindings-2.17.1/testsuite/tests/long.err 2008-03-12 14:30:18.000000000 +0100 +++ new/yast2-perl-bindings-2.17.2/testsuite/tests/long.err 2008-09-29 14:47:09.000000000 +0200 @@ -30,3 +30,4 @@ <1> [YCP] tests/long.ycp:19 loop 7 * 2**30: 7516192768 class <1> [wfm] WFMSubAgent.cc(~WFMSubAgent):XXX Deleting SubAgent: 0 scr <1> [liby2] genericfrontend.cc(main):XXX Finished YaST2 component 'y2base' +<1> [liby2] genericfrontend.cc(main):XXX Exiting with client return value 'nil' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-perl-bindings-2.17.1/testsuite/tests/reference.err new/yast2-perl-bindings-2.17.2/testsuite/tests/reference.err --- old/yast2-perl-bindings-2.17.1/testsuite/tests/reference.err 2008-03-12 14:30:18.000000000 +0100 +++ new/yast2-perl-bindings-2.17.2/testsuite/tests/reference.err 2008-09-29 14:47:25.000000000 +0200 @@ -12,3 +12,4 @@ <1> [YCP] tests/reference.ycp:24 map: $["a":"A", "b":"y-ok", "d":"123"] <1> [wfm] WFMSubAgent.cc(~WFMSubAgent):XXX Deleting SubAgent: 0 scr <1> [liby2] genericfrontend.cc(main):XXX Finished YaST2 component 'y2base' +<1> [liby2] genericfrontend.cc(main):XXX Exiting with client return value 'nil' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-perl-bindings-2.17.1/testsuite/tests/simple1.err new/yast2-perl-bindings-2.17.2/testsuite/tests/simple1.err --- old/yast2-perl-bindings-2.17.1/testsuite/tests/simple1.err 2008-03-12 14:30:18.000000000 +0100 +++ new/yast2-perl-bindings-2.17.2/testsuite/tests/simple1.err 2008-09-29 14:34:41.000000000 +0200 @@ -7,3 +7,4 @@ <1> [YCP] tests/simple1.ycp:6 Hello, world <1> [wfm] WFMSubAgent.cc(~WFMSubAgent):XXX Deleting SubAgent: 0 scr <1> [liby2] genericfrontend.cc(main):XXX Finished YaST2 component 'y2base' +<1> [liby2] genericfrontend.cc(main):XXX Exiting with client return value 'nil' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-perl-bindings-2.17.1/testsuite/tests/testpfunc1.err new/yast2-perl-bindings-2.17.2/testsuite/tests/testpfunc1.err --- old/yast2-perl-bindings-2.17.1/testsuite/tests/testpfunc1.err 2008-03-12 14:30:18.000000000 +0100 +++ new/yast2-perl-bindings-2.17.2/testsuite/tests/testpfunc1.err 2008-09-29 14:35:33.000000000 +0200 @@ -10,3 +10,4 @@ <1> [YCP] tests/testpfunc1.ycp:13 amap ($["one":"two"]): $["a":"1", "b":"two"] <1> [wfm] WFMSubAgent.cc(~WFMSubAgent):XXX Deleting SubAgent: 0 scr <1> [liby2] genericfrontend.cc(main):XXX Finished YaST2 component 'y2base' +<1> [liby2] genericfrontend.cc(main):XXX Exiting with client return value 'nil' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-perl-bindings-2.17.1/testsuite/tests/testpfunc2.err new/yast2-perl-bindings-2.17.2/testsuite/tests/testpfunc2.err --- old/yast2-perl-bindings-2.17.1/testsuite/tests/testpfunc2.err 2008-03-12 14:30:18.000000000 +0100 +++ new/yast2-perl-bindings-2.17.2/testsuite/tests/testpfunc2.err 2008-09-29 14:35:53.000000000 +0200 @@ -7,4 +7,5 @@ <1> [YCP] tests/testpfunc2.ycp:5 nested: Hello, world <1> [wfm] WFMSubAgent.cc(~WFMSubAgent):XXX Deleting SubAgent: 0 scr <1> [liby2] genericfrontend.cc(main):XXX Finished YaST2 component 'y2base' +<1> [liby2] genericfrontend.cc(main):XXX Exiting with client return value 'nil' <1> [Y2Perl] YPerl.cc(destroy):XXX Shutting down embedded Perl interpreter. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-perl-bindings-2.17.1/testsuite/tests/types2.err new/yast2-perl-bindings-2.17.2/testsuite/tests/types2.err --- old/yast2-perl-bindings-2.17.1/testsuite/tests/types2.err 2008-03-12 14:30:18.000000000 +0100 +++ new/yast2-perl-bindings-2.17.2/testsuite/tests/types2.err 2008-09-29 14:36:11.000000000 +0200 @@ -9,3 +9,4 @@ <1> [YCP] tests/types2.ycp:8 termreverse: `mreTyM ("42", "Hi") <1> [wfm] WFMSubAgent.cc(~WFMSubAgent):XXX Deleting SubAgent: 0 scr <1> [liby2] genericfrontend.cc(main):XXX Finished YaST2 component 'y2base' +<1> [liby2] genericfrontend.cc(main):XXX Exiting with client return value 'nil' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-perl-bindings-2.17.1/testsuite/tests/types.err new/yast2-perl-bindings-2.17.2/testsuite/tests/types.err --- old/yast2-perl-bindings-2.17.1/testsuite/tests/types.err 2008-03-12 14:30:18.000000000 +0100 +++ new/yast2-perl-bindings-2.17.2/testsuite/tests/types.err 2008-09-29 14:36:04.000000000 +0200 @@ -8,3 +8,4 @@ <1> [YCP] tests/types.ycp:5 bool2: false <1> [wfm] WFMSubAgent.cc(~WFMSubAgent):XXX Deleting SubAgent: 0 scr <1> [liby2] genericfrontend.cc(main):XXX Finished YaST2 component 'y2base' +<1> [liby2] genericfrontend.cc(main):XXX Exiting with client return value 'nil' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-perl-bindings-2.17.1/testsuite/test-yast new/yast2-perl-bindings-2.17.2/testsuite/test-yast --- old/yast2-perl-bindings-2.17.1/testsuite/test-yast 2006-10-10 14:05:36.000000000 +0200 +++ new/yast2-perl-bindings-2.17.2/testsuite/test-yast 2008-09-29 14:13:27.000000000 +0200 @@ -37,7 +37,7 @@ echo ----- $BASE CASEOK=true # y2log to stderr, take specified namespace from Perl - $Y2BASE -l - -n $BASE=perl $SCRIPT testsuite > tmp.out.$BASE 2> tmp.err.$BASE + Y2SILENTSEARCH=1 $Y2BASE -l - -n $BASE=perl $SCRIPT testsuite > tmp.out.$BASE 2> tmp.err.$BASE # filter out variable information sed --in-place -e 's/^....-..-.. ..:..:.. $<.> $[^ ]* /\1/' tmp.err.$BASE sed --in-place -e 's/$([^)]*)$:[0-9]\+/\1:XXX/' tmp.err.$BASE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-perl-bindings-2.17.1/VERSION new/yast2-perl-bindings-2.17.2/VERSION --- old/yast2-perl-bindings-2.17.1/VERSION 2008-07-18 11:59:59.000000000 +0200 +++ new/yast2-perl-bindings-2.17.2/VERSION 2008-09-29 14:25:12.000000000 +0200 @@ -1 +1 @@ -2.17.1 +2.17.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-packager
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package yast2-packager checked in at Mon Sep 29 18:28:40 CEST 2008. -------- --- yast2-packager/yast2-packager.changes 2008-09-26 15:33:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-09-29 16:43:37.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 29 16:41:40 CEST 2008 - locilka(a)suse.cz + +- Always initialize Packages before SlideShowSetup (bnc #427935). +- 2.17.22 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.17.21.tar.bz2 New: ---- yast2-packager-2.17.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.k10780/_old 2008-09-29 18:28:31.000000000 +0200 +++ /var/tmp/diff_new_pack.k10780/_new 2008-09-29 18:28:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.17.21) +# spec file for package yast2-packager (Version 2.17.22) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-packager -Version: 2.17.21 +Version: 2.17.22 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.17.21.tar.bz2 +Source0: yast2-packager-2.17.22.tar.bz2 Prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml # HTTP.ycp @@ -79,7 +79,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.17.21 +%setup -n yast2-packager-2.17.22 %build %{prefix}/bin/y2tool y2autoconf @@ -115,6 +115,9 @@ %{prefix}/lib/YaST2/servers_non_y2/ag_* %doc %{prefix}/share/doc/packages/yast2-packager %changelog +* Mon Sep 29 2008 locilka(a)suse.cz +- Always initialize Packages before SlideShowSetup (bnc #427935). +- 2.17.22 * Fri Sep 26 2008 lslezak(a)suse.cz - do not use obsoleted Pkg::TargetLogfile() function (bnc#429954) - inst_kickoff.ycp - remove nonexisting directories from /etc/mtab ++++++ yast2-packager-2.17.21.tar.bz2 -> yast2-packager-2.17.22.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.21/configure new/yast2-packager-2.17.22/configure --- old/yast2-packager-2.17.21/configure 2008-09-26 15:32:49.000000000 +0200 +++ new/yast2-packager-2.17.22/configure 2008-09-23 17:27:42.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-packager 2.17.21. +# Generated by GNU Autoconf 2.61 for yast2-packager 2.17.19. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.17.21' -PACKAGE_STRING='yast2-packager 2.17.21' +PACKAGE_VERSION='2.17.19' +PACKAGE_STRING='yast2-packager 2.17.19' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-packager 2.17.21 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.17.19 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.17.21:";; + short | recursive ) echo "Configuration of yast2-packager 2.17.19:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.17.21 +yast2-packager configure 2.17.19 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-packager $as_me 2.17.21, which was +It was created by yast2-packager $as_me 2.17.19, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.17.21' + VERSION='2.17.19' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.21" +VERSION="2.17.19" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.17.21, which was +This file was extended by yast2-packager $as_me 2.17.19, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-packager config.status 2.17.21 +yast2-packager config.status 2.17.19 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.21/configure.in new/yast2-packager-2.17.22/configure.in --- old/yast2-packager-2.17.21/configure.in 2008-09-26 15:32:44.000000000 +0200 +++ new/yast2-packager-2.17.22/configure.in 2008-09-23 17:27:38.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.17.21, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.17.19, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.21" +VERSION="2.17.19" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.21/packager.pot new/yast2-packager-2.17.22/packager.pot --- old/yast2-packager-2.17.21/packager.pot 2008-09-10 10:47:12.000000000 +0200 +++ new/yast2-packager-2.17.22/packager.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,99 +0,0 @@ -# translation of packager.po to -# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the PACKAGE package. -# -# Andrew Spackman <kiwilinux(a)gmail.com>, 2008. -msgid "" -msgstr "" -"Project-Id-Version: packager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-04 13:54+0200\n" -"PO-Revision-Date: 2008-08-27 21:38+1200\n" -"Last-Translator: Andrew Spackman <kiwilinux(a)gmail.com>\n" -"Language-Team: <en(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" - -#: src/clients/inst_packages.ycp:76 -msgid "" -"\n" -"\t\t This dialog allows you to define this system's tasks and what software to install.\n" -"\t\t Available tasks and software for this system are shown by category in the left\n" -"\t\t column. To view a description for an item, select it in the list.\n" -"\t\t " -msgstr "" -"\n" -"\t\t This dialog allows you to define this system's tasks and the software that has to be installed.\n" -"\t\t Available tasks and software for this system are shown by category in the left\n" -"\t\t column. To view a description for an item, select it in the list.\n" -"\t\t " - -#. TRANSLATORS: dialog help -#: src/clients/inst_productsources.ycp:600 -msgid "" -"Please wait while the packager is being initialized\n" -"and the list of servers dowloaded from Web.\n" -msgstr "" -"Please wait while the packager is being initialized\n" -"and the list of servers downloaded from the Web.\n" - -#. help, continued -#: src/clients/repositories.ycp:486 -msgid "" -"\n" -"Synchronize Changes with ZENworks will call <tt>rug</tt>\n" -"to also perform the changes in that package management system.\n" -msgstr "" -"\n" -"Synchronize Changes with ZENworks will also call <tt>rug</tt>\n" -"to perform the changes in that package management system.\n" - -#: src/clients/webpin_package_search.ycp:223 -msgid "" -"<big>Security</big> \n" -"The software found is often not part of the distribution itself and the level of trust\n" -"depends on yourself. We do not take any responsibilities for installing\n" -"such software." -msgstr "" -"<big>Security</big> \n" -"The software found is often not part of the distribution itself and the level of trust\n" -"depends on yourself. We do not take any responsibility for installing\n" -"such software." - -#. help text - media check 2/8 -#: src/include/checkmedia/ui.ycp:279 -msgid "" -"When you have a problem with\n" -"the installation and are using a CD or DVD installation medium, you should check\n" -"whether the medium is broken.\n" -msgstr "" -"When you have a problem with\n" -"the installation and you are using a CD or DVD installation medium, you should check\n" -"whether the medium is broken.\n" - -#: src/include/checkmedia/ui.ycp:432 -msgid "" -"The medium does not contain MD5 checksum.\n" -"The content of the medium cannot be verified.\n" -"\n" -"Only readability of the medium will be checked." -msgstr "" -"The medium does not contain a MD5 checksum.\n" -"The content of the medium cannot be verified.\n" -"\n" -"Only readability of the medium will be checked." - -#. (see bnc#178357 why these numbers) -#. translators: help text for software proposal -#: src/modules/Packages.ycp:302 -msgid "The propsal contains total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slighltly larger than the proposed value. Therefore it is a good idea to have at least 25% (or 300MB) free space before starting the installation." -msgstr "The propsal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slighltly larger than the proposed value. Therefore it is a good idea to have at least 25% (or 300MB) free space before starting the installation." - -#. help text for software proposal -#: src/modules/Packages.ycp:304 -msgid "The total size to download is size of packages which will be downloaded from remote (network) repositories. This value is important when the connection is slow or when there is a data limit for downloading." -msgstr "" -"The total 'size to download' is the size of the packages which will be downloaded from remote (network) repositories.\n" -" This value is important when the connection is slow or when there is a data limit for downloading." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.21/src/include/load_release_notes.ycp new/yast2-packager-2.17.22/src/include/load_release_notes.ycp --- old/yast2-packager-2.17.21/src/include/load_release_notes.ycp 2008-04-25 08:03:09.000000000 +0200 +++ new/yast2-packager-2.17.22/src/include/load_release_notes.ycp 2008-09-29 16:25:12.000000000 +0200 @@ -25,6 +25,11 @@ /* function to load release notes */ define boolean load_release_notes (integer source_id) { + if (source_id == nil || source_id < 0) { + y2error ("Source_id: %1", source_id); + return false; + } + string path_to_relnotes = "/docu"; string path_templ = path_to_relnotes + "/RELEASE-NOTES.%1.rtf"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.21/src/modules/Packages.ycp new/yast2-packager-2.17.22/src/modules/Packages.ycp --- old/yast2-packager-2.17.21/src/modules/Packages.ycp 2008-09-25 14:44:54.000000000 +0200 +++ new/yast2-packager-2.17.22/src/modules/Packages.ycp 2008-09-29 16:43:45.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 51513 2008-09-25 12:44:53Z lslezak $ + * $Id: Packages.ycp 51667 2008-09-29 14:43:43Z locilka $ */ { @@ -1098,7 +1098,13 @@ return ret; } +global void Init(boolean unused); + global void SlideShowSetUp (string wanted_language) { + // bnc #427935 + // Initialize the base_source_id first + Init (true); + integer source = base_source_id; string lang_long = ""; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.21/VERSION new/yast2-packager-2.17.22/VERSION --- old/yast2-packager-2.17.21/VERSION 2008-09-26 15:32:19.000000000 +0200 +++ new/yast2-packager-2.17.22/VERSION 2008-09-29 16:43:50.000000000 +0200 @@ -1 +1 @@ -2.17.21 +2.17.22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0