April 2009 - openSUSE Commits - openSUSE Mailing Lists

commit xorg-x11-server for openSUSE:Factory
by root＠Hilbert.suse.de 30 Apr '09

30 Apr '09

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Fri May 1 00:51:46 CEST 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-04-28 20:14:08.000000000 +0200 +++ xorg-x11-server/xorg-x11-server.changes 2009-04-30 15:05:24.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Apr 30 15:04:14 CEST 2009 - sndirsch(a)suse.de + +- instead of require do provide + INPUT_ABI_VERSION/VIDEO_ABI_VERSION to fix dependancy loop + +------------------------------------------------------------------- +Thu Apr 30 12:21:40 CEST 2009 - sndirsch(a)suse.de + +- xkeyboard-config should be required by xorg-x11-driver-input +- require INPUT_ABI_VERSION = 4 (provided by xorg-x11-driver-input) +- require VIDEO_ABI_VERSION = 5 (provided by xorg-x11-driver-video) +- require libpixman-1-0 >= 0.15.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.wW4181/_old 2009-05-01 00:50:30.000000000 +0200 +++ /var/tmp/diff_new_pack.wW4181/_new 2009-05-01 00:50:30.000000000 +0200 @@ -32,17 +32,19 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 35 -License: X11/MIT +Release: 36 +License: GPL v2 or later; X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 %ifnarch s390 s390x PreReq: %fillup_prereq %endif -Requires: pkgconfig xorg-x11-fonts-core xorg-x11 xkeyboard-config +Requires: pkgconfig xorg-x11-fonts-core xorg-x11 %if %suse_version > 1010 %ifnarch s390 s390x -Requires: xorg-x11-driver-input xorg-x11-driver-video +Provides: VIDEO_ABI_VERSION = 5 +Provides: INPUT_ABI_VERSION = 4 +Requires: libpixman-1-0 >= 0.15.2 %endif %endif Provides: xorg-x11-server-glx @@ -116,7 +118,7 @@ %package extra -License: X11/MIT +License: GPL v2 or later; X11/MIT Summary: Additional Xservers (Xdmx, Xephyr, Xnest, Xvfb) Group: System/X11/Servers/XF86_4 Provides: xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-server:/usr/bin/Xdmx @@ -130,7 +132,7 @@ %package sdk -License: X11/MIT +License: GPL v2 or later; X11/MIT Summary: X.Org Server SDK. Group: System/Libraries Provides: xorg-x11-sdk @@ -146,7 +148,7 @@ %if %vnc %package -n xorg-x11-Xvnc -License: GPL v2 or later +License: GPL v2 or later; X11/MIT Summary: VNC Server for the X Window System Group: System/X11/Servers/XF86_4 Requires: xorg-x11-fonts-core xorg-x11 @@ -550,6 +552,14 @@ %endif %changelog +* Thu Apr 30 2009 sndirsch(a)suse.de +- instead of require do provide + INPUT_ABI_VERSION/VIDEO_ABI_VERSION to fix dependancy loop +* Thu Apr 30 2009 sndirsch(a)suse.de +- xkeyboard-config should be required by xorg-x11-driver-input +- require INPUT_ABI_VERSION = 4 (provided by xorg-x11-driver-input) +- require VIDEO_ABI_VERSION = 5 (provided by xorg-x11-driver-video) +- require libpixman-1-0 >= 0.15.2 * Tue Apr 28 2009 sndirsch(a)suse.de - enable DRI2 build * Tue Apr 14 2009 sndirsch(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 for openSUSE:Factory
by root＠Hilbert.suse.de 30 Apr '09

30 Apr '09

Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Fri May 1 00:49:25 CEST 2009. -------- --- yast2-packager/yast2-packager.changes 2009-04-23 15:46:25.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2009-04-29 17:53:48.000000000 +0200 @@ -1,0 +2,26 @@ +Wed Apr 29 14:46:46 CEST 2009 - lslezak(a)suse.cz + +- replace only changed cells in the table after chaging repository + URL - keep the current sorting order (bnc#475961), do not change + the current item (bnc#411585) +- preserve repository priority when changing URL +- open create repository dialog in a new window, fixes broken UI + caused by the previous fix (bnc#269034) +- confirm adding of an already known repository (URL) (bnc#471054) +- 2.18.7 + +------------------------------------------------------------------- +Tue Apr 28 16:33:41 CEST 2009 - lslezak(a)suse.cz + +- use URL.ycp for processing smb:// URLs (bnc#495109) +- removed the extra error popup when adding a repository fails + (bnc#269034) + +------------------------------------------------------------------- +Thu Apr 23 17:16:36 CEST 2009 - lslezak(a)suse.cz + +- added a new progress dialog when registering a new repository, + download progresses are embedded into the progress dialog instead + of separate popups for each file (bnc#466808) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.18.6.tar.bz2 New: ---- yast2-packager-2.18.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.fuM505/_old 2009-05-01 00:36:28.000000000 +0200 +++ /var/tmp/diff_new_pack.fuM505/_new 2009-05-01 00:36:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.18.6) +# spec file for package yast2-packager (Version 2.18.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-packager -Version: 2.18.6 +Version: 2.18.7 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.18.6.tar.bz2 +Source0: yast2-packager-2.18.7.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 @@ -78,7 +78,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.18.6 +%setup -n yast2-packager-2.18.7 %build %{prefix}/bin/y2tool y2autoconf @@ -114,6 +114,23 @@ %{prefix}/lib/YaST2/servers_non_y2/ag_* %doc %{prefix}/share/doc/packages/yast2-packager %changelog +* Wed Apr 29 2009 lslezak(a)suse.cz +- replace only changed cells in the table after chaging repository + URL - keep the current sorting order (bnc#475961), do not change + the current item (bnc#411585) +- preserve repository priority when changing URL +- open create repository dialog in a new window, fixes broken UI + caused by the previous fix (bnc#269034) +- confirm adding of an already known repository (URL) (bnc#471054) +- 2.18.7 +* Tue Apr 28 2009 lslezak(a)suse.cz +- use URL.ycp for processing smb:// URLs (bnc#495109) +- removed the extra error popup when adding a repository fails + (bnc#269034) +* Thu Apr 23 2009 lslezak(a)suse.cz +- added a new progress dialog when registering a new repository, + download progresses are embedded into the progress dialog instead + of separate popups for each file (bnc#466808) * Thu Apr 23 2009 lslezak(a)suse.cz - display an additional help when adding an ISO repository over FTP or HTTP protocol fails (bnc#341668) ++++++ yast2-packager-2.18.6.tar.bz2 -> yast2-packager-2.18.7.tar.bz2 ++++++ ++++ 5917 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-packager-2.18.6/agents/zypp_repos.scr new/yast2-packager-2.18.7/agents/zypp_repos.scr --- old/yast2-packager-2.18.6/agents/zypp_repos.scr 2007-07-30 11:41:32.000000000 +0200 +++ new/yast2-packager-2.18.7/agents/zypp_repos.scr 2009-04-29 12:58:11.000000000 +0200 @@ -7,7 +7,7 @@ * * Example: SCR::Read (.zypp_repos, "/etc/zypp/repo.d/") * - * $Id:$ + * $Id: zypp_repos.scr 57028 2009-04-29 10:58:09Z lslezak $ */ .zypp_repos 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-packager-2.18.6/configure.in new/yast2-packager-2.18.7/configure.in --- old/yast2-packager-2.18.6/configure.in 2009-04-23 15:51:34.000000000 +0200 +++ new/yast2-packager-2.18.7/configure.in 2009-04-29 17:49:21.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-packager, 2.18.6, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.18.7, 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.18.6" +VERSION="2.18.7" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(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-packager-2.18.6/Makefile.am new/yast2-packager-2.18.7/Makefile.am --- old/yast2-packager-2.18.6/Makefile.am 2009-04-23 15:51:35.000000000 +0200 +++ new/yast2-packager-2.18.7/Makefile.am 2009-04-29 17:49:21.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ 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-packager-2.18.6/src/clients/inst_check_memsize.ycp new/yast2-packager-2.18.7/src/clients/inst_check_memsize.ycp --- old/yast2-packager-2.18.6/src/clients/inst_check_memsize.ycp 2007-11-09 13:37:09.000000000 +0100 +++ new/yast2-packager-2.18.7/src/clients/inst_check_memsize.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Checking whether system has enough memory (bugzilla #305554) * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: inst_check_memsize.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ 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-packager-2.18.6/src/clients/inst_custom_packages.ycp new/yast2-packager-2.18.7/src/clients/inst_custom_packages.ycp --- old/yast2-packager-2.18.6/src/clients/inst_custom_packages.ycp 2008-10-02 12:38:35.000000000 +0200 +++ new/yast2-packager-2.18.7/src/clients/inst_custom_packages.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Client for 3rd prodcuts/addon products package installations * - * $Id:$ + * $Id: inst_custom_packages.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { 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-packager-2.18.6/src/clients/inst_source.ycp new/yast2-packager-2.18.7/src/clients/inst_source.ycp --- old/yast2-packager-2.18.6/src/clients/inst_source.ycp 2007-08-21 11:16:27.000000000 +0200 +++ new/yast2-packager-2.18.7/src/clients/inst_source.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -1,7 +1,7 @@ /** * Author: Ladislav Slezak <lslezak(a)suse.cz> * Summary: Alias for "repositories" module - * $Id:$ + * $Id: inst_source.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { string target = "repositories"; 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-packager-2.18.6/src/clients/key_manager.ycp new/yast2-packager-2.18.7/src/clients/key_manager.ycp --- old/yast2-packager-2.18.6/src/clients/key_manager.ycp 2008-06-10 15:18:36.000000000 +0200 +++ new/yast2-packager-2.18.7/src/clients/key_manager.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Manages GPG keys in the package manager * - * $Id$ + * $Id: key_manager.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { 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-packager-2.18.6/src/clients/repositories.ycp new/yast2-packager-2.18.7/src/clients/repositories.ycp --- old/yast2-packager-2.18.6/src/clients/repositories.ycp 2009-04-23 15:45:12.000000000 +0200 +++ new/yast2-packager-2.18.7/src/clients/repositories.ycp 2009-04-29 17:48:42.000000000 +0200 @@ -7,7 +7,7 @@ * Purpose: * Adding, removing and prioritizing of repositories for packagemanager. * - * $Id: repositories.ycp 56760 2009-04-10 15:36:36Z lslezak $ + * $Id: repositories.ycp 57037 2009-04-29 15:48:41Z lslezak $ * */ @@ -455,7 +455,7 @@ } ); - y2milestone("New service config: %1", sourceStatesOut); + y2milestone("New service config: %1", serviceStatesOut); foreach(map<string,any> s, serviceStatesOut, { string alias = s["alias"]:""; @@ -972,6 +972,8 @@ boolean same_url = (url == old_url); + y2debug("same_url: %1 (old: %2, new: %3)", same_url, old_url, url); + // special check for cd:// and dvd:// repositories if (!same_url) { @@ -1013,28 +1015,56 @@ boolean auto_refresh = sourceState["autorefresh"]:true; boolean keeppackages = sourceState["keeppackages"]:false; boolean enabled = sourceState["enabled"]:true; - y2milestone("Restoring the original properties: enabled: %1, autorefresh: %2, keeppackages: %3", enabled, auto_refresh, keeppackages); + integer priority = sourceState["priority"]:default_priority; + y2milestone("Restoring the original properties: enabled: %1, autorefresh: %2, keeppackages: %3, priority: %4", enabled, auto_refresh, keeppackages, priority); // set the original properties addedSource["autorefresh"] = auto_refresh; addedSource["keeppackages"] = keeppackages; addedSource["enabled"] = enabled; + addedSource["priority"] = priority; - sourceStatesOut[idx] = addedSource; - } + // get the ID of the old repo and mark it for removal + integer srcid = sourceStatesOut[global_current, "SrcId"]:-1; + if (srcid != -1) + { + sourcesToDelete = add (sourcesToDelete, srcid); + SourceManager::just_removed_sources = add (SourceManager::just_removed_sources, srcid); + } + + // replace the data + sourceStatesOut[global_current] = addedSource; + // remove the duplicate at the end + sourceStatesOut = remove(sourceStatesOut, idx); + + // refresh only the name and URL in the table + UI::ChangeWidget(`id(`table), `Cell( global_current, 3), addedSource["name"]:""); + UI::ChangeWidget(`id(`table), `Cell( global_current, 5), url); - deleteSource( global_current ); - fillTable(repository_view, displayed_service); - fillCurrentRepoInfo(); + fillCurrentRepoInfo(); + } } } else { y2milestone ("URL is the same, not recreating the source"); - sourceState["name"] = SourceDialogs::GetRepoName (); - sourceStatesOut[ global_current ] = sourceState; - fillTable(repository_view, displayed_service); - fillCurrentRepoInfo(); + + string new_name = SourceDialogs::GetRepoName(); + if (new_name != sourceState["name"]:"") + { + sourceState["name"] = new_name; + sourceStatesOut[ global_current ] = sourceState; + + // update only the name cell in the table + UI::ChangeWidget(`id(`table), `Cell( global_current, 3), new_name); + + fillCurrentRepoInfo(); + } + else + { + y2milestone("The repository name has not been changed"); + } + createResult = `ok; } @@ -1445,10 +1475,72 @@ return ret; } +boolean KnownURL(string url) +{ + string scheme = tolower(URL::Parse(url)["scheme"]:""); + + // alway create CD/DVD repository + if (scheme == "cd" || scheme == "dvd") + { + return false; + } + + boolean ret = false; + + foreach (map<string,any> src, sourceStatesOut, + { + integer src_id = tointeger(src["SrcId"]:nil); + map generalData = Pkg::SourceGeneralData(src_id); + string src_url = generalData["url"]:""; + + if (src_url == url) + { + ret = true; + } + } + ); + + y2milestone("URL exists: %1", ret); + + return ret; +} + symbol StartEditDialog() { y2milestone("Edit URL with protocol %1", selected_url_scheme); - symbol ret = SourceDialogs::EditDialogProtocol(selected_url_scheme); + symbol ret = nil; + + do + { + ret = SourceDialogs::EditDialogProtocol(selected_url_scheme); + + if (ret == `next) + { + string url = SourceDialogs::GetURL(); + boolean known_url = KnownURL(url); + + if (known_url) + { + // popup question, %1 is repository URL + if (!Popup::AnyQuestion("", + sformat(_("Repository %1 +has been already added. Each repository should be added only once. + +Really add the repository again?"), URL::HidePassword(url)), + Label::YesButton(), + Label::NoButton(), + `focus_no + ) + ) + { + // ask again + ret = nil; + } + } + } + } + while (ret == nil); + y2milestone("Result: %1", ret); return ret; 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-packager-2.18.6/src/clients/software_simple_proposal.ycp new/yast2-packager-2.18.7/src/clients/software_simple_proposal.ycp --- old/yast2-packager-2.18.6/src/clients/software_simple_proposal.ycp 2007-08-21 11:16:27.000000000 +0200 +++ new/yast2-packager-2.18.7/src/clients/software_simple_proposal.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -7,7 +7,7 @@ * * See also file proposal-API.txt for details. * - * $Id:$ + * $Id: software_simple_proposal.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { 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-packager-2.18.6/src/clients/webpin_package_search.ycp new/yast2-packager-2.18.7/src/clients/webpin_package_search.ycp --- old/yast2-packager-2.18.6/src/clients/webpin_package_search.ycp 2009-03-06 08:22:23.000000000 +0100 +++ new/yast2-packager-2.18.7/src/clients/webpin_package_search.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -4,7 +4,7 @@ * Authors: Katarina Machalkova <kmachalkova(a)suse.cz> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: webpin_package_search.ycp 57028 2009-04-29 10:58:09Z lslezak $ * * This client provides UI for searching for packages * via Webpin XML. 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-packager-2.18.6/src/clients/wrapper_slideshow_callbacks.ycp new/yast2-packager-2.18.7/src/clients/wrapper_slideshow_callbacks.ycp --- old/yast2-packager-2.18.6/src/clients/wrapper_slideshow_callbacks.ycp 2008-04-03 14:10:05.000000000 +0200 +++ new/yast2-packager-2.18.7/src/clients/wrapper_slideshow_callbacks.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -7,7 +7,7 @@ * required for removing the cyclic import dependency * between SlideShowCallbacks.ycp and SlideShow.ycp * - * $Id$ + * $Id: wrapper_slideshow_callbacks.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { 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-packager-2.18.6/src/clients/wrapper_storage.ycp new/yast2-packager-2.18.7/src/clients/wrapper_storage.ycp --- old/yast2-packager-2.18.6/src/clients/wrapper_storage.ycp 2008-10-23 12:58:54.000000000 +0200 +++ new/yast2-packager-2.18.7/src/clients/wrapper_storage.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: A wrapper for Storage:: module, required for removing yast2-storage dependency * - * $Id$ + * $Id: wrapper_storage.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { 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-packager-2.18.6/src/include/key_manager_dialogs.ycp new/yast2-packager-2.18.7/src/include/key_manager_dialogs.ycp --- old/yast2-packager-2.18.6/src/include/key_manager_dialogs.ycp 2008-09-25 12:41:22.000000000 +0200 +++ new/yast2-packager-2.18.7/src/include/key_manager_dialogs.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Manages GPG keys in the package manager * - * $Id$ + * $Id: key_manager_dialogs.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { 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-packager-2.18.6/src/include/repositories_include.ycp new/yast2-packager-2.18.7/src/include/repositories_include.ycp --- old/yast2-packager-2.18.6/src/include/repositories_include.ycp 2009-04-23 15:45:13.000000000 +0200 +++ new/yast2-packager-2.18.7/src/include/repositories_include.ycp 2009-04-29 14:52:51.000000000 +0200 @@ -7,7 +7,7 @@ * * Purpose: Include file to be shared by yast2-packager and yast2-add-on * - * $Id:$ + * $Id: repositories_include.ycp 57033 2009-04-29 12:52:50Z lslezak $ * */ @@ -21,6 +21,7 @@ import "Label"; import "SourceDialogs"; import "Report"; + import "Progress"; textdomain "packager"; @@ -36,13 +37,12 @@ boolean download_meta = true; boolean LicenseAccepted (integer id) { - Wizard::CreateDialog (); boolean ret = AddOnProduct::AcceptedLicenseAndInfoFile (id); - UI::CloseDialog (); return ret; } - define symbol createSource( string url, boolean plaindir, boolean download, string preffered_name ) ``{ + define symbol createSourceImpl(string url, boolean plaindir, boolean download, string preffered_name) + { y2milestone("createSource: %1, plaindir: %2, download: %3, name: %4", URL::HidePassword(url), plaindir, download, preffered_name); if ( url != "" ) @@ -64,6 +64,18 @@ PackageSystem::CheckAndInstallPackages(["cifs-mount"]); } + Progress::New ( + // TRANSLATORS: dialog caption + _("Adding a New Repository"), + " ", + 3, + [ _("Check Repository Type"), _("Add Repository"), _("Read Repository License") ], + [ _("Checking Repository Type"), _("Adding Repository"), _("Reading Repository License") ], + // TRANSLATORS: dialog help + _("<p>Please wait while the repository manager downloads the repository details...</p>") + ); + + Progress::NextStage(); string service_type = Pkg::ServiceProbe(url); y2milestone("Probed service type: %1", service_type); @@ -148,7 +160,7 @@ const string iso_prefix = "iso:"; if (substring(url, 0, size(iso_prefix)) == iso_prefix) { - y2milestone("ISO image detected, disabling autorefresh (%1)", url); + y2milestone("ISO image detected, disabling autorefresh (%1)", URL::HidePassword(url)); auto_refresh = false; } @@ -156,7 +168,7 @@ boolean cd_scheme = contains(["cd", "dvd"], tolower(URL::Parse(url)["scheme"]:"")); if (cd_scheme) { - y2milestone("CD/DVD repository detected, disabling autorefresh (%1)", url); + y2milestone("CD/DVD repository detected, disabling autorefresh (%1)", URL::HidePassword(url)); auto_refresh = false; } @@ -242,8 +254,12 @@ repo_prop["base_urls"] = [ url ]; repo_prop["type"] = repo_type; + Progress::NextStage(); integer new_repo_id = Pkg::RepositoryAdd(repo_prop); - y2milestone("Added repository: %1: %2", new_repo_id, repo_prop); + + map<string,any> repo_prop_log = repo_prop; + repo_prop_log["base_urls"] = [ URL::HidePassword(url) ]; + y2milestone("Added repository: %1: %2", new_repo_id, repo_prop_log); newSources = add(newSources, new_repo_id); @@ -267,30 +283,36 @@ if ( size( newSources ) == 0 ) { - // popup message part 1 - string _msg1 = sformat( _("Unable to create repository -from URL '%1'."), URL::HidePassword(url) ); + y2error("Cannot add the repository"); if (regexpmatch(url, "\\.iso$")) { + // popup message part 1 + string msg = sformat( _("Unable to create repository +from URL '%1'."), URL::HidePassword(url) ); + map parsed_url = URL::Parse(url); string scheme = tolower(parsed_url["scheme"]:""); if (contains(["ftp", "sftp", "http", "https"], scheme)) { // error message - _msg1 = _msg1 + "\n\n" + _("Using an ISO image over ftp or http protocol is not possible.\nChange the protocol or unpack the ISO image on the server side."); + msg = msg + "\n\n" + _("Using an ISO image over ftp or http protocol is not possible. +Change the protocol or unpack the ISO image on the server side."); + + // popup message part 2 + msg = msg + "\n\n" + _("Change the URL and try again?"); + + boolean tryagain = Popup::YesNo(msg); + if (tryagain) return `again; } } - // popup message part 2 - string _msg2 = _("Try again?"); - boolean tryagain = Popup::YesNo( _msg1 + "\n" + Pkg::LastError() + "\n" + _msg2 ); - if ( tryagain ) return `again; - else return `cancel; + return `cancel; } else { + Progress::NextStage(); foreach( integer id, newSources, ``{ if (! LicenseAccepted (id)) { @@ -319,6 +341,15 @@ } } +// start createSource() function in extra wizard dialog +symbol createSource(string url, boolean plaindir, boolean download, string preffered_name) +{ + Wizard::CreateDialog(); + symbol ret = createSourceImpl(url, plaindir, download, preffered_name); + Wizard::CloseDialog(); + return ret; +} + symbol StoreSource () { string url = SourceDialogs::GetURL (); string name = SourceDialogs::GetRepoName (); 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-packager-2.18.6/src/include/storage_include.ycp new/yast2-packager-2.18.7/src/include/storage_include.ycp --- old/yast2-packager-2.18.6/src/include/storage_include.ycp 2007-05-18 10:05:58.000000000 +0200 +++ new/yast2-packager-2.18.7/src/include/storage_include.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Storage calls * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: storage_include.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { 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-packager-2.18.6/src/modules/DefaultDesktop.ycp new/yast2-packager-2.18.7/src/modules/DefaultDesktop.ycp --- old/yast2-packager-2.18.6/src/modules/DefaultDesktop.ycp 2008-12-02 13:02:57.000000000 +0100 +++ new/yast2-packager-2.18.7/src/modules/DefaultDesktop.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -4,7 +4,7 @@ * Authors: Jiri Srain <jsrain(a)suse.cz> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id:$ + * $Id: DefaultDesktop.ycp 57028 2009-04-29 10:58:09Z lslezak $ */ { 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-packager-2.18.6/src/modules/KeyManager.ycp new/yast2-packager-2.18.7/src/modules/KeyManager.ycp --- old/yast2-packager-2.18.6/src/modules/KeyManager.ycp 2008-02-13 12:19:16.000000000 +0100 +++ new/yast2-packager-2.18.7/src/modules/KeyManager.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Manages GPG keys in the package manager * Authors: Ladislav Slezák <lslezak(a)novell.com> * - * $Id$ + * $Id: KeyManager.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ 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-packager-2.18.6/src/modules/SourceDialogs.ycp new/yast2-packager-2.18.7/src/modules/SourceDialogs.ycp --- old/yast2-packager-2.18.6/src/modules/SourceDialogs.ycp 2009-04-23 15:45:13.000000000 +0200 +++ new/yast2-packager-2.18.7/src/modules/SourceDialogs.ycp 2009-04-27 14:31:38.000000000 +0200 @@ -1262,7 +1262,7 @@ { string workgroup = (string)UI::QueryWidget (`id (`workgroup), `Value); if (type == `samba && size (workgroup) > 0) - directory = directory + ";workgroup=" + workgroup; + parsed["domain"] = workgroup; } parsed["path"] = directory; @@ -1494,14 +1494,7 @@ dir = sharepath[1]:""; if (dir == nil) dir = "/"; - string workgroup = ""; - if (regexpmatch (dir, "^.*;workgroup=[^;]+$")) - { - workgroup = regexpsub (dir, - "^.*;workgroup=([^;]+)$", "\\1"); - dir = regexpsub (dir, "^(.*);workgroup=[^;]+$", "\\1"); - } - UI::ChangeWidget (`id (`workgroup), `Value, workgroup); + UI::ChangeWidget (`id (`workgroup), `Value, parsed["domain"]:""); UI::ChangeWidget (`id (`share), `Value, share); } UI::ChangeWidget (`id (`dir), `Value, dir); 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-packager-2.18.6/src/modules/SourceManagerSLP.ycp new/yast2-packager-2.18.7/src/modules/SourceManagerSLP.ycp --- old/yast2-packager-2.18.6/src/modules/SourceManagerSLP.ycp 2008-04-01 10:21:24.000000000 +0200 +++ new/yast2-packager-2.18.7/src/modules/SourceManagerSLP.ycp 2009-04-29 12:58:11.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Lukas Ocilka <locilka(a)suse.cz> * Status: Work in Progress * - * $Id:$ + * $Id: SourceManagerSLP.ycp 57028 2009-04-29 10:58:09Z lslezak $ * * This module provides a complete set of functions that allows you to search * and select a new SLP repository. 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-packager-2.18.6/VERSION new/yast2-packager-2.18.7/VERSION --- old/yast2-packager-2.18.6/VERSION 2009-04-23 15:45:19.000000000 +0200 +++ new/yast2-packager-2.18.7/VERSION 2009-04-29 17:45:52.000000000 +0200 @@ -1 +1 @@ -2.18.6 +2.18.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-ncurses for openSUSE:Factory
by root＠Hilbert.suse.de 30 Apr '09

30 Apr '09

Hello community, here is the log from the commit of package yast2-ncurses for openSUSE:Factory checked in at Fri May 1 00:30:24 CEST 2009. -------- --- yast2-ncurses/yast2-ncurses.changes 2009-03-31 13:15:27.000000000 +0200 +++ yast2-ncurses/yast2-ncurses.changes 2009-04-29 12:23:30.000000000 +0200 @@ -1,0 +2,22 @@ +Wed Apr 29 11:27:35 CEST 2009 - gs(a)suse.de + +- NCursesWindow: revert the patch which sets back_color_erase to + FALSE (isn't necessary any longer, see bnc #418613). Except for + this the improvements from bce_workaround_by_werner.diff remain + in place. +- V 2.18.8 + +------------------------------------------------------------------- +Mon Apr 27 12:14:05 CEST 2009 - gs(a)suse.de + +- Allow empty labels for NCInputField, NCComboBox etc. (bnc#289600) + +------------------------------------------------------------------- +Fri Apr 17 18:35:52 CEST 2009 - kmachalkova(a)suse.cz + +- Fixed chaotic behaviour of cursor keys after the table has been + sorted (Ctrl-O) - bnc#493884 +- Improved table sort: sort in reversed order, if the same column + is selected repeatedly + +------------------------------------------------------------------- @@ -13 +35 @@ - license text (bug #484163), + license text (bnc #484163), calling whatdependson for head-i586 Old: ---- yast2-ncurses-2.18.7.tar.bz2 New: ---- yast2-ncurses-2.18.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.H23081/_old 2009-05-01 00:24:08.000000000 +0200 +++ /var/tmp/diff_new_pack.H23081/_new 2009-05-01 00:24:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.18.7) +# spec file for package yast2-ncurses (Version 2.18.8) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-ncurses -Version: 2.18.7 +Version: 2.18.8 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.18.7.tar.bz2 +Source0: yast2-ncurses-2.18.8.tar.bz2 Prefix: /usr BuildRequires: dejagnu doxygen gcc-c++ yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel @@ -56,7 +56,7 @@ %prep -%setup -n yast2-ncurses-2.18.7 +%setup -n yast2-ncurses-2.18.8 %build %{prefix}/bin/y2tool y2autoconf @@ -93,6 +93,19 @@ %{prefix}/include/YaST2/ncurses/ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog +* Wed Apr 29 2009 gs(a)suse.de +- NCursesWindow: revert the patch which sets back_color_erase to + FALSE (isn't necessary any longer, see bnc #418613). Except for + this the improvements from bce_workaround_by_werner.diff remain + in place. +- V 2.18.8 +* Mon Apr 27 2009 gs(a)suse.de +- Allow empty labels for NCInputField, NCComboBox etc. (bnc#289600) +* Fri Apr 17 2009 kmachalkova(a)suse.cz +- Fixed chaotic behaviour of cursor keys after the table has been + sorted (Ctrl-O) - bnc#493884 +- Improved table sort: sort in reversed order, if the same column + is selected repeatedly * Thu Mar 26 2009 gs(a)suse.de - Bugfix for IntField widget: draw the value correctly (was hidden in some cases, e.g. in Image Creator, bnc #488757) @@ -100,7 +113,7 @@ * Tue Mar 17 2009 gs(a)suse.de - NCRichText widget: bugfixes for text in <pre>...</pre> tags: show DOS files correctly, add missing PadNL(), show complete - license text (bug #484163), + license text (bnc #484163), only take printable chars into account in method textWidth() - V 2.18.6 * Sun Feb 22 2009 coolo(a)suse.de @@ -202,7 +215,7 @@ correct argument for YNCursesUI::setConsoleFont() (last argument is current language not the encoding) - V 2.16.26 -* Mon Apr 14 2008 tgoettlicher(a)suse.de +* Tue Apr 15 2008 tgoettlicher(a)suse.de - fixed keyboard shortcuts in popup menu (bnc #377098) - V 2.16.25 * Sat Apr 12 2008 coolo(a)suse.de @@ -915,7 +928,7 @@ * Mon Mar 15 2004 gs(a)suse.de - V 2.9.15 - show license (EULA), bug #33584 -* Fri Mar 12 2004 sh(a)suse.de +* Sat Mar 13 2004 sh(a)suse.de - V 2.9.14 - Adapted to const ref fix in libyui for all widget constructors * Fri Mar 12 2004 gs(a)suse.de ++++++ yast2-ncurses-2.18.7.tar.bz2 -> yast2-ncurses-2.18.8.tar.bz2 ++++++ ++++ 16374 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 gnu-jaf for openSUSE:Factory
by root＠Hilbert.suse.de 30 Apr '09

30 Apr '09

Hello community, here is the log from the commit of package gnu-jaf for openSUSE:Factory checked in at Fri May 1 00:21:03 CEST 2009. -------- --- gnu-jaf/gnu-jaf.changes 2008-12-01 10:58:40.000000000 +0100 +++ gnu-jaf/gnu-jaf.changes 2009-04-29 08:48:33.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 28 11:57:32 CEST 2009 - mvyskocil(a)suse.cz + +- update to 1.1.1: + * CommandMap.java, MailcapCommandMap.java: Updated to JAF 1.1 + * ObjectDataContentHandler.java, MimeTypeParameterList.java: Fixed typos + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- activation-1.0.tar.bz2 New: ---- activation-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnu-jaf.spec ++++++ --- /var/tmp/diff_new_pack.ql7561/_old 2009-05-01 00:20:30.000000000 +0200 +++ /var/tmp/diff_new_pack.ql7561/_new 2009-05-01 00:20:30.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package gnu-jaf (Version 1.0) +# spec file for package gnu-jaf (Version 1.1.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,13 @@ Name: gnu-jaf -BuildRequires: ant antlr classpath java-1_4_2-gcj-compat-devel unzip +BuildRequires: ant antlr classpath java-1_5_0-gcj-compat-devel unzip %define official_name activation License: GPL v2 or later Group: Development/Libraries/Java AutoReqProv: on -Version: 1.0 -Release: 226 +Version: 1.1.1 +Release: 1 Summary: GNU implementation of the JavaBeans Activation Framework Url: http://java.sun.com/products/javabeans/glasgow/jaf.html Source: %{official_name}-%{version}.tar.bz2 @@ -57,7 +57,7 @@ Nic Ferrier %prep -%setup -n %{official_name}-%{version} +%setup -q -n %{official_name}-%{version} #<< prep #>> build @@ -83,6 +83,10 @@ # vim: foldcolumn=4 foldmarker=>>,<< foldmethod=marker foldlevel=42 %changelog +* Tue Apr 28 2009 mvyskocil(a)suse.cz +- update to 1.1.1: + * CommandMap.java, MailcapCommandMap.java: Updated to JAF 1.1 + * ObjectDataContentHandler.java, MimeTypeParameterList.java: Fixed typos * Mon Dec 01 2008 mvyskocil(a)suse.cz - added a conflicts to geronimo-1_0_2-jaf-api * Wed May 07 2008 coolo(a)suse.de ++++++ activation-1.0.tar.bz2 -> activation-1.1.1.tar.bz2 ++++++ ++++ 18189 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 ant-contrib for openSUSE:Factory
by root＠Hilbert.suse.de 30 Apr '09

30 Apr '09

Hello community, here is the log from the commit of package ant-contrib for openSUSE:Factory checked in at Fri May 1 00:20:19 CEST 2009. -------- --- ant-contrib/ant-contrib.changes 2008-09-11 15:53:00.000000000 +0200 +++ ant-contrib/ant-contrib.changes 2009-04-30 15:49:33.591414000 +0200 @@ -1,0 +2,11 @@ +Thu Apr 30 15:49:13 CEST 2009 - mrueckert(a)suse.de + +- rename ant_version to ant_minimal_version +- use requires_eq for the ant package + +------------------------------------------------------------------- +Thu Apr 30 14:25:51 CEST 2009 - ro(a)suse.de + +- bump ant-version to 1.7.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-contrib.spec ++++++ --- /var/tmp/diff_new_pack.m32681/_old 2009-05-01 00:19:26.000000000 +0200 +++ /var/tmp/diff_new_pack.m32681/_new 2009-05-01 00:19:26.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ant-contrib (Version 1.0b2) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,12 @@ %define with_junit 0 %define section free -%define ant_version 1.7.0 +%define ant_minimal_version 1.7.1 Summary: Collection of tasks for Ant Name: ant-contrib Version: 1.0b2 -Release: 39 +Release: 40 License: The Apache Software License Url: http://ant-contrib.sourceforge.net/ Group: Development/Libraries/Java @@ -36,14 +36,14 @@ Patch1: ant-contrib-ant-1.7.0.patch Patch2: ant-contrib-BuildFileTest_java.patch BuildRequires: jpackage-utils >= 1.6 -BuildRequires: ant = %{ant_version} +BuildRequires: ant >= %{ant_minimal_version} BuildRequires: bcel >= 5.1 BuildRequires: java-1_5_0-gcj-compat-devel %if %{with_junit} -BuildRequires: ant-junit = %{ant_version} +BuildRequires: ant-junit >= %{ant_minimal_version} Requires: junit >= 3.8.1 %endif -Requires: ant = %{ant_version} +%requires_eq ant Requires: bcel >= 5.1 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -151,6 +151,11 @@ # ----------------------------------------------------------------------------- %changelog +* Thu Apr 30 2009 mrueckert(a)suse.de +- rename ant_version to ant_minimal_version +- use requires_eq for the ant package +* Thu Apr 30 2009 ro(a)suse.de +- bump ant-version to 1.7.1 * Thu Sep 11 2008 mvyskocil(a)suse.cz - Use a gcc-java to build * Fri Aug 08 2008 mvyskocil(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 for openSUSE:Factory
by root＠Hilbert.suse.de 30 Apr '09

30 Apr '09

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Fri May 1 00:19:13 CEST 2009. -------- --- yast2/yast2.changes 2009-04-07 15:38:41.000000000 +0200 +++ yast2/yast2.changes 2009-04-29 09:25:45.000000000 +0200 @@ -1,0 +2,32 @@ +Wed Apr 29 09:15:49 CEST 2009 - lslezak(a)suse.cz + +- media change popup - display also the URL in the short summary + (bnc#439069) +- 2.18.15 + +------------------------------------------------------------------- +Tue Apr 28 15:18:49 CEST 2009 - lslezak(a)suse.cz + +- URL.ycp - escape also non-ASCII characters in URL, added + URLRecode.pm module (bnc#446395) +- URL.ycp - fixed processing of smb:// URLs (bnc#495109) + +------------------------------------------------------------------- +Mon Apr 20 16:11:35 CEST 2009 - jsrain(a)suse.cz + +- at start-up, check that /sys, /proc and /dev are not empty and + prevent YaST from start if they are (bnc#450643) + +------------------------------------------------------------------- +Thu Apr 9 10:04:19 CEST 2009 - lslezak(a)suse.cz + +- PackageSystem.ycp - check nil result of Pkg::PkgCommit() call + which indicates an error (bnc#157551) + +------------------------------------------------------------------- +Wed Apr 8 11:27:13 CEST 2009 - lslezak(a)suse.cz + +- PackageCallbacks.ycp - don't read non existing y2logRPM file + (bnc#456446) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.18.14.tar.bz2 New: ---- yast2-2.18.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.Q15923/_old 2009-05-01 00:17:12.000000000 +0200 +++ /var/tmp/diff_new_pack.Q15923/_new 2009-05-01 00:17:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.18.14) +# spec file for package yast2 (Version 2.18.15) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2 -Version: 2.18.14 +Version: 2.18.15 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.18.14.tar.bz2 +Source0: yast2-2.18.15.tar.bz2 Prefix: /usr Source1: yast2-rpmlintrc BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite @@ -147,7 +147,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.18.14 +%setup -n yast2-2.18.15 %build %{prefix}/bin/y2tool y2autoconf @@ -250,7 +250,25 @@ %doc %{prefix}/share/doc/packages/yast2/system %doc %{prefix}/share/doc/packages/yast2/types %doc %{prefix}/share/doc/packages/yast2/wizard + %changelog +* Wed Apr 29 2009 lslezak(a)suse.cz +- media change popup - display also the URL in the short summary + (bnc#439069) +- 2.18.15 +* Tue Apr 28 2009 lslezak(a)suse.cz +- URL.ycp - escape also non-ASCII characters in URL, added + URLRecode.pm module (bnc#446395) +- URL.ycp - fixed processing of smb:// URLs (bnc#495109) +* Mon Apr 20 2009 jsrain(a)suse.cz +- at start-up, check that /sys, /proc and /dev are not empty and + prevent YaST from start if they are (bnc#450643) +* Thu Apr 09 2009 lslezak(a)suse.cz +- PackageSystem.ycp - check nil result of Pkg::PkgCommit() call + which indicates an error (bnc#157551) +* Wed Apr 08 2009 lslezak(a)suse.cz +- PackageCallbacks.ycp - don't read non existing y2logRPM file + (bnc#456446) * Tue Apr 07 2009 jreidinger(a)suse.cz - Add to CWM widget for unified table CWMTable - 2.18.14 ++++++ yast2-2.18.14.tar.bz2 -> yast2-2.18.15.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/configure new/yast2-2.18.15/configure --- old/yast2-2.18.14/configure 2009-03-30 11:01:53.000000000 +0200 +++ new/yast2-2.18.15/configure 2009-04-29 09:17:41.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2 2.18.13. +# Generated by GNU Autoconf 2.63 for yast2 2.18.15. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.18.13' -PACKAGE_STRING='yast2 2.18.13' +PACKAGE_VERSION='2.18.15' +PACKAGE_STRING='yast2 2.18.15' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1277,7 +1277,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 2.18.13 to adapt to many kinds of systems. +\`configure' configures yast2 2.18.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1348,7 +1348,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.18.13:";; + short | recursive ) echo "Configuration of yast2 2.18.15:";; esac cat <<\_ACEOF @@ -1428,7 +1428,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.18.13 +yast2 configure 2.18.15 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1442,7 +1442,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 $as_me 2.18.13, which was +It was created by yast2 $as_me 2.18.15, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2289,7 +2289,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.18.13' + VERSION='2.18.15' cat >>confdefs.h <<_ACEOF @@ -2513,7 +2513,7 @@ -VERSION="2.18.13" +VERSION="2.18.15" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -3574,7 +3574,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.18.13, which was +This file was extended by yast2 $as_me 2.18.15, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3624,7 +3624,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2 config.status 2.18.13 +yast2 config.status 2.18.15 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/configure.in new/yast2-2.18.15/configure.in --- old/yast2-2.18.14/configure.in 2009-03-30 11:01:49.000000000 +0200 +++ new/yast2-2.18.15/configure.in 2009-04-29 09:17:37.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, 2.18.13, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.18.15, http://bugs.opensuse.org/, yast2) 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.18.13" +VERSION="2.18.15" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/library/cwm/src/CWMTable.ycp new/yast2-2.18.15/library/cwm/src/CWMTable.ycp --- old/yast2-2.18.14/library/cwm/src/CWMTable.ycp 2009-04-02 15:07:53.000000000 +0200 +++ new/yast2-2.18.15/library/cwm/src/CWMTable.ycp 2009-04-10 12:04:42.000000000 +0200 @@ -328,9 +328,9 @@ ? `VBox ( `VStretch (), // push button - `PushButton (`id (`_tw_up), `opt(`notify,`immediate), _("&Up")), + `PushButton (`id (`_tw_up), `opt(`notify), _("&Up")), // push button - `PushButton (`id (`_tw_down), `opt(`notify,`immediate), _("&Down")), + `PushButton (`id (`_tw_down), `opt(`notify), _("&Down")), `VStretch () ) : `HSpacing (0); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/library/modules/Version.ycp new/yast2-2.18.15/library/modules/Version.ycp --- old/yast2-2.18.14/library/modules/Version.ycp 2009-04-07 15:33:39.000000000 +0200 +++ new/yast2-2.18.15/library/modules/Version.ycp 2009-04-29 09:17:51.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.18.14"; +global string yast2 = "2.18.15"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/library/packages/src/PackageCallbacks.ycp new/yast2-2.18.15/library/packages/src/PackageCallbacks.ycp --- old/yast2-2.18.14/library/packages/src/PackageCallbacks.ycp 2009-03-30 11:04:43.000000000 +0200 +++ new/yast2-2.18.15/library/packages/src/PackageCallbacks.ycp 2009-04-29 09:17:32.000000000 +0200 @@ -7,7 +7,7 @@ * * Purpose: provides the default Callbacks for Pkg:: * - * $Id: PackageCallbacks.ycp 56393 2009-03-25 15:43:11Z lslezak $ + * $Id: PackageCallbacks.ycp 57018 2009-04-29 07:17:31Z lslezak $ * */ @@ -547,11 +547,6 @@ { y2milestone("DonePackage(error: %1, reason: '%2')", error, reason); - string infopath = (string) SCR::Read (.target.tmpdir) + "/rpmlog"; - SCR::Execute (.target.bash, "/usr/bin/tail '" + String::Quote (Installation::destdir) - + Directory::logdir + "/y2logRPM' > " + infopath); - string info = reason + "\n---\n" + (string) SCR::Read (.target.string, [infopath, "-?-"]); - string message = sformat ( _deleting_package ? // error popup during package installation, %1 is the name of the package _("Removal of package %1 failed.") @@ -561,7 +556,7 @@ if (Mode::commandline()) { CommandLine::Print(message); - CommandLine::Print(info); + CommandLine::Print(reason); // ask user in the interactive mode if (CommandLine::Interactive()) @@ -599,7 +594,7 @@ if ( showLongInfo ) { UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 10, true) ); - UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), info) ); + UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), reason) ); } else { @@ -616,7 +611,7 @@ showLongInfo = ShowLogInfo (message, button_box); if (showLongInfo) { - UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), info) ); + UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), reason) ); } else { @@ -645,6 +640,16 @@ // default: ignore } + else + { + // no error, there is additional info (rpm output), see bnc#456446 + y2milestone("Additional RPM otput: %1", reason); + + if (Mode::commandline()) + { + CommandLine::Print(reason); + } + } return "I"; } @@ -792,17 +797,19 @@ // with network repository it doesn't make sense to ask for disk if (url_scheme == "dir") { - // report error while accessing local directory with product (%1 == "SuSE Linux ...") + // report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...") message = sformat (_("Cannot access installation media -%1. -Check whether the directory is accessible."), wanted_label); +%1 +%2. +Check whether the directory is accessible."), URL::HidePassword(url), wanted_label); } else if (url_scheme != "cd" && url_scheme != "dvd") { - // report error while accessing network media of product (%1 == "SuSE Linux ...") + // report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...") message = sformat (_("Cannot access installation media -%1. -Check whether the server is accessible."), wanted_label); +%1 +%2. +Check whether the server is accessible."), URL::HidePassword(url), wanted_label); } // currently unused diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/library/packages/src/PackageSystem.ycp new/yast2-2.18.15/library/packages/src/PackageSystem.ycp --- old/yast2-2.18.14/library/packages/src/PackageSystem.ycp 2009-04-07 15:30:38.000000000 +0200 +++ new/yast2-2.18.15/library/packages/src/PackageSystem.ycp 2009-04-09 14:35:41.000000000 +0200 @@ -6,7 +6,7 @@ * Michal Svec <msvec(a)suse.cz> * Flags: Stable * - * $Id: PackageSystem.ycp 56617 2009-04-03 11:55:57Z lslezak $ + * $Id: PackageSystem.ycp 56733 2009-04-09 12:35:41Z lslezak $ * * The documentation is maintained at * <a href="../index.html">.../docs/index.html</a>. @@ -315,7 +315,7 @@ //[int successful, list failed, list remaining, list srcremaining] list result = Pkg::PkgCommit (0); y2debug ("PkgCommit: %1", result); - if(result[1]:[] != []) { + if(result == nil || result[1]:[] != []) { y2error("Package commit failed: %1", result[1]:[]); return false; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/library/types/src/Makefile.am new/yast2-2.18.15/library/types/src/Makefile.am --- old/yast2-2.18.14/library/types/src/Makefile.am 2008-06-05 10:41:40.000000000 +0200 +++ new/yast2-2.18.15/library/types/src/Makefile.am 2009-04-27 16:44:37.000000000 +0200 @@ -1,6 +1,6 @@ # Makefile.am for yast2/library/types/src -module_DATA = $(wildcard *.ycp) +module_DATA = $(wildcard *.ycp) $(wildcard *.pm) EXTRA_DIST = $(module_DATA) include $(top_srcdir)/Makefile.am.common diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/library/types/src/Makefile.in new/yast2-2.18.15/library/types/src/Makefile.in --- old/yast2-2.18.14/library/types/src/Makefile.in 2009-03-30 11:01:58.000000000 +0200 +++ new/yast2-2.18.15/library/types/src/Makefile.in 2009-04-29 09:17:48.000000000 +0200 @@ -179,7 +179,7 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ -module_DATA = $(wildcard *.ycp) +module_DATA = $(wildcard *.ycp) $(wildcard *.pm) EXTRA_DIST = $(module_DATA) modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) modulebindir = $(moduledir) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/library/types/src/URLRecode.pm new/yast2-2.18.15/library/types/src/URLRecode.pm --- old/yast2-2.18.14/library/types/src/URLRecode.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.18.15/library/types/src/URLRecode.pm 2009-04-28 14:12:28.000000000 +0200 @@ -0,0 +1,87 @@ +#!/usr/bin/perl -w +# +# Author: Ladislav Slezák <lslezak(a)novell.com> +# +# $Id:$ +# +# URLRecode.pm +# +# This is a replacement for URI::Encode perl module which cannot be used in inst-sys +# and to decrease the package dependencies +# + +package URLRecode; + +use strict; +use YaST::YCP qw(:LOGGING Boolean sformat);; + +our %TYPEINFO; +use strict; + +# local cache for char -> hex string conversion +our %escape_cache; + +# fill the cache +sub InitCache +{ + for(0..255) {$escape_cache{chr($_)} = sprintf("%%%02x", $_);} +} + + +# Escape password, user name and fragment part of URL string +# @param input input string +# @return string Escaped string +BEGIN{ $TYPEINFO{EscapePassword} = ["function", "string", "string"];} +sub EscapePassword +{ + my ($self, $escaped) = @_; + + if (!defined %escape_cache) { InitCache(); } + + $escaped =~ s/([^A-Za-z0-9\\-_.!~*'()])/$escape_cache{$1}/ge; + return $escaped; +} + +# Escape path part of URL string +# @param input input string +# @return string Escaped string +BEGIN{ $TYPEINFO{EscapePath} = ["function", "string", "string"];} +sub EscapePath +{ + my ($self, $escaped) = @_; + + if (!defined %escape_cache) { InitCache() }; + + $escaped =~ s/([^A-Za-z0-9\-_.!~*'()\/])/$escape_cache{$1}/ge; + return $escaped; +} + +# Escape query part of URL string +# @param input input string +# @return string Escaped string +BEGIN{ $TYPEINFO{EscapeQuery} = ["function", "string", "string"];} +sub EscapeQuery +{ + my ($self, $escaped) = @_; + + if (!defined %escape_cache) { InitCache(); } + + $escaped =~ s/([^A-Za-z0-9\\-_.!~*'()\/:=&])/$escape_cache{$1}/ge; + return $escaped; +} + + +# UnEscape an URL string, replace %<Hexnum><HexNum> sequences +# by character +# @param input input string +# @return string Unescaped string +BEGIN{ $TYPEINFO{UnEscape} = ["function", "string", "string"];} +sub UnEscape +{ + my ($self, $input) = @_; + + $input =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/ge; + return $input +} + +1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/library/types/src/URL.ycp new/yast2-2.18.15/library/types/src/URL.ycp --- old/yast2-2.18.14/library/types/src/URL.ycp 2009-01-27 15:03:44.000000000 +0100 +++ new/yast2-2.18.15/library/types/src/URL.ycp 2009-04-28 17:09:56.000000000 +0200 @@ -6,7 +6,7 @@ * Anas Nashif <nashif(a)suse.cz> * Flags: Stable * - * $Id: URL.ycp 54779 2009-01-19 17:15:00Z lslezak $ + * $Id: URL.ycp 57013 2009-04-28 15:09:55Z lslezak $ */ { @@ -17,6 +17,7 @@ import "Hostname"; import "String"; import "IP"; +import "URLRecode"; /** * TODO: @@ -149,6 +150,9 @@ return ret; } +global map <string, string> MakeMapFromParams (string params); +global string MakeParamsFromMap (map <string, string> params_map); + /** * Tokenize URL * @param url URL to be parsed @@ -200,9 +204,9 @@ pth = substring (pth, 1); } } - tokens["path"] = UnEscapeString(pth, transform_map_filename); - tokens["query"] = UnEscapeString(rawtokens[5]:"", transform_map_query); - tokens["fragment"] = UnEscapeString(rawtokens[7]:"", transform_map_passwd); + tokens["path"] = URLRecode::UnEscape(pth); + tokens["query"] = URLRecode::UnEscape(rawtokens[5]:""); + tokens["fragment"] = URLRecode::UnEscape(rawtokens[7]:""); /* Extract username:pass@host:port */ list userpass = regexptokenize(rawtokens[2]:"", "^" + @@ -216,8 +220,8 @@ ); y2debug("userpass=%1", userpass); - tokens["user"] = UnEscapeString(userpass[1]:"", transform_map_passwd); - tokens["pass"] = UnEscapeString(userpass[3]:"", transform_map_passwd); + tokens["user"] = URLRecode::UnEscape(userpass[1]:""); + tokens["pass"] = URLRecode::UnEscape(userpass[3]:""); tokens["port"] = userpass[7]:""; if(userpass[5]:"" != "") @@ -241,14 +245,19 @@ } // some exceptions for samba scheme (there is optional extra option "domain") - if (tokens["scheme"]:""=="samba" || tokens["scheme"]:""=="smb"){ - list<string> tmp_list = filter(string row, splitstring(tokens["path"]:"", "/"), {return (size(row)>0);}); - if (size(tmp_list)>1){ - tokens["domain"] = tokens["host"]:""; - tokens["host"] = tmp_list[0]:""; - tokens["path"] = tmp_list[1]:""; - } - else tokens["path"] = deletechars(tokens["path"]:"", "/"); + if (tokens["scheme"]:""=="samba" || tokens["scheme"]:""=="smb") + { + // Note: CUPS uses different URL syntax for Samba printers: + // smb://username:password@workgroup/server/printer + // Fortunately yast2-printer does not use URL.ycp, so we can safely support libzypp syntax only: + // smb://username:passwd@servername/share/path/on/the/share?workgroup=mygroup + + map<string,string> options = MakeMapFromParams(tokens["query"]:""); + + if (haskey(options, "workgroup")) + { + tokens["domain"] = options["workgroup"]:""; + } } y2debug("tokens=%1", tokens); return tokens; @@ -310,6 +319,8 @@ string url = ""; string userpass = ""; + y2debug("URL::Build(): input: %1", tokens); + if(regexpmatch(tokens["scheme"]:"", "^[[:alpha:]]*$")) { /* if (tokens["scheme"]:"" == "samba") url="smb"; @@ -318,22 +329,18 @@ y2debug("url: %1", url); if (tokens["user"]:"" != "") { - userpass = EscapeString(tokens["user"]:"", transform_map_passwd); + userpass = URLRecode::EscapePassword(tokens["user"]:""); y2milestone("Escaped username '%1' => '%2'", tokens["user"]:"", userpass); } if (size(userpass) != 0 && tokens["pass"]:"" != "" ) { - userpass = sformat("%1:%2", userpass, EscapeString(tokens["pass"]:"", transform_map_passwd) ); + userpass = sformat("%1:%2", userpass, URLRecode::EscapePassword(tokens["pass"]:"") ); } if (size(userpass) > 0 ) userpass = userpass + "@"; url = sformat("%1://%2", url, userpass); y2debug("url: %1", url); - if (tokens["scheme"]:"" == "smb" && size(tokens["domain"]:"")>0 ){ - url = sformat("%1%2/", url, tokens["domain"]:""); - } - if(Hostname::CheckFQ(tokens["host"]:"") || IP::Check(tokens["host"]:"")) { // enclose an IPv6 address in square brackets @@ -351,25 +358,36 @@ // path is not empty and doesn't start with "/" if (tokens["path"]:"" != "" && ! regexpmatch (tokens["path"]:"", "^/")) - url = sformat("%1/%2", url, EscapeString(tokens["path"]:"", transform_map_filename)); + url = sformat("%1/%2", url, URLRecode::EscapePath(tokens["path"]:"")); // patch is not empty and starts with "/" else if (tokens["path"]:"" != "" && regexpmatch (tokens["path"]:"", "^/")) { while (substring (tokens["path"]:"", 0, 2) == "//") tokens["path"] = substring (tokens["path"]:"", 1); if (tokens["scheme"]:"" == "ftp") { - url = sformat("%1/%%2f%2", url, substring(EscapeString(tokens["path"]:"", transform_map_filename), 1)); + url = sformat("%1/%%2f%2", url, substring(URLRecode::EscapePath(tokens["path"]:""), 1)); } else { - url = sformat("%1%2", url, EscapeString(tokens["path"]:"", transform_map_filename)); + url = sformat("%1%2", url, URLRecode::EscapePath(tokens["path"]:"")); } } y2debug("url: %1", url); + + map<string,string> query_map = MakeMapFromParams(tokens["query"]:""); + + if (tokens["scheme"]:"" == "smb" && size(tokens["domain"]:"")>0 && query_map["workgroup"]:"" != tokens["domain"]:"") + { + query_map["workgroup"] = tokens["domain"]:""; + + tokens["query"] = MakeParamsFromMap(query_map); + } + if (tokens["query"]:"" != "" ) - url = sformat("%1?%2", url, EscapeString(tokens["query"]:"", transform_map_query)); + url = sformat("%1?%2", url, URLRecode::EscapeQuery(tokens["query"]:"")); + if (tokens["fragment"]:"" != "" ) - url = sformat("%1#%2", url, EscapeString(tokens["fragment"]:"", transform_map_passwd)); + url = sformat("%1#%2", url, URLRecode::EscapePassword(tokens["fragment"]:"")); y2debug("url: %1", url); if (!Check(url)) { @@ -377,6 +395,8 @@ return ""; } + y2debug("URL::Build(): result: %1", url); + return url; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/library/types/testsuite/tests/URL.out new/yast2-2.18.15/library/types/testsuite/tests/URL.out --- old/yast2-2.18.14/library/types/testsuite/tests/URL.out 2009-01-27 15:03:45.000000000 +0100 +++ new/yast2-2.18.15/library/types/testsuite/tests/URL.out 2009-04-28 16:48:30.000000000 +0200 @@ -21,11 +21,16 @@ Return ftp://ftp.example.com/%2fpath/to/dir Return ftp://ftp.example.com/%2fpath/to/dir Return ftp://ftp.example.com/%2fpath/to/dir +Return ftp://ftp.example.com/%2fpath/to/dir?param1=val1&param2=val2 +Return dir:///path/to/%c4%9b%c5%a1%c4%8d%c5%99%c5%be%c3%bd%c3%a1%c3%ad%c3%a9/dir Return ftp://[2001:de8:0:f123::1]/%2fpath/to/dir Return http://[2001:de8:0:f123::1]:8080/path/to/dir Return $["fragment":"", "host":"2001:de8:0:f123::1", "pass":"", "path":"/path/to/dir", "port":"", "query":"", "scheme":"http", "user":""] Return $["fragment":"", "host":"2001:de8:0:f123::1", "pass":"password", "path":"/path/to/dir", "port":"8080", "query":"", "scheme":"http", "user":"user"] Return http://user:password@[2001:de8:0:f123::1]:8080/path/to/dir +Return $["domain":"group", "fragment":"", "host":"servername", "pass":"passwd", "path":"/share/path/on/the/share", "port":"", "query":"mountoptions=ro&workgroup=group", "scheme":"smb", "user":"username"] +Return true +Return smb://username:passwd@myserver.com/share%24%24share/path/on/the/share?workgroup=workgroup Return dir:/// Return http://download.opensuse.org/very/log/path/which/will/be/truncated/target_f… Return http://download.opensuse.org/.../target_file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/library/types/testsuite/tests/URLRecode.out new/yast2-2.18.15/library/types/testsuite/tests/URLRecode.out --- old/yast2-2.18.14/library/types/testsuite/tests/URLRecode.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.18.15/library/types/testsuite/tests/URLRecode.out 2009-04-28 14:17:46.000000000 +0200 @@ -0,0 +1,7 @@ +Return nil +Return +Return /%40%23%24%25%5e%26/dir/%c4%8d%c3%bd%c4%9b%c5%a1%c4%8d%c3%bd%c3%a1/file +Return true +Return %20!%40%23%24%25%5e%26*()/%3f%2b%3d +Return %20!%40%23%24%25^%26*()%2f%3f%2b%3d +Return %20!%40%23%24%25^&*()/%3f%2b= diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/library/types/testsuite/tests/URLRecode.ycp new/yast2-2.18.15/library/types/testsuite/tests/URLRecode.ycp --- old/yast2-2.18.14/library/types/testsuite/tests/URLRecode.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.18.15/library/types/testsuite/tests/URLRecode.ycp 2009-04-28 14:17:43.000000000 +0200 @@ -0,0 +1,27 @@ +/** + * Testsuite for URLRecode.pm module + * + * $Id:$ + */ + +{ + +include "testsuite.ycp"; +import "URLRecode"; + + +TEST(``(URLRecode::EscapePath(nil)), [], nil); +TEST(``(URLRecode::EscapePath("")), [], nil); + +string test_path = "/@#$%^&/dir/čýěščýá/file"; + +TEST(``(URLRecode::EscapePath(test_path)), [], nil); +TEST(``(URLRecode::UnEscape(URLRecode::EscapePath(test_path)) == test_path), [], nil); + + +TEST(``(URLRecode::EscapePath(" !@#$%^&*()/?+=")), [], nil); +TEST(``(URLRecode::EscapePassword(" !@#$%^&*()/?+=")), [], nil); +TEST(``(URLRecode::EscapeQuery(" !@#$%^&*()/?+=")), [], nil); + +/* EOF */ +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/library/types/testsuite/tests/URL.ycp new/yast2-2.18.15/library/types/testsuite/tests/URL.ycp --- old/yast2-2.18.14/library/types/testsuite/tests/URL.ycp 2009-01-27 15:03:45.000000000 +0100 +++ new/yast2-2.18.15/library/types/testsuite/tests/URL.ycp 2009-04-28 17:09:56.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: XXXXXX * Author: Michal Svec <msvec(a)suse.cz> * - * $Id: URL.ycp 54779 2009-01-19 17:15:00Z lslezak $ + * $Id: URL.ycp 57013 2009-04-28 15:09:55Z lslezak $ */ { @@ -50,6 +50,10 @@ TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"/path/to/dir"])), [], nil); TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"//path/to/dir"])), [], nil); TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"///path/to/dir"])), [], nil); +TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"///path/to/dir", "query" : "param1=val1&param2=val2" ])), [], nil); + +// bnc #446395 - non-ASCII chars in path must be escaped +TEST(``(URL::Build($["scheme":"dir", "path":"/path/to/ěščřžýáíé/dir"])), [], nil); // IPv6 tests TEST(``(URL::Build($["scheme":"ftp","host":"2001:de8:0:f123::1","path":"///path/to/dir"])), [], nil); @@ -58,6 +62,13 @@ TEST(``(URL::Parse("http://user:password@[2001:de8:0:f123::1]:8080/path/to/dir")), [], nil); TEST(``(URL::Build(URL::Parse("http://user:password@[2001:de8:0:f123::1]:8080/path/to/dir"))), [], nil); +// smb:// tests +string smb_url = "smb://username:passwd@servername/share/path/on/the/share?mountoptions=ro&workgroup=group"; +TEST(``(URL::Parse(smb_url)), [], nil); +// parse->build must return the orginal value +TEST(``(URL::Build(URL::Parse(smb_url)) == smb_url), [], nil); +// bnc#491482 +TEST(``(URL::Build( $["domain":"workgroup", "host":"myserver.com", "pass":"passwd", "path":"/share$$share/path/on/the/share", "scheme":"smb", "user":"username"])), [], nil); TEST(``(URL::Build(URL::Parse("dir:///"))), [], nil); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/Makefile.am new/yast2-2.18.15/Makefile.am --- old/yast2-2.18.14/Makefile.am 2009-03-30 11:01:49.000000000 +0200 +++ new/yast2-2.18.15/Makefile.am 2009-04-29 09:17:37.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/Makefile.in new/yast2-2.18.15/Makefile.in --- old/yast2-2.18.14/Makefile.in 2009-03-30 11:01:59.000000000 +0200 +++ new/yast2-2.18.15/Makefile.in 2009-04-29 09:17:49.000000000 +0200 @@ -229,10 +229,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec POT_DST = $(shell find -type d -name testsuite -prune , \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/scripts/yast2 new/yast2-2.18.15/scripts/yast2 --- old/yast2-2.18.14/scripts/yast2 2009-03-30 11:04:43.000000000 +0200 +++ new/yast2-2.18.15/scripts/yast2 2009-04-21 19:40:55.000000000 +0200 @@ -30,6 +30,16 @@ . $YAST_PREFIX/lib/YaST2/bin/yast2-funcs +# check that system directories are non-empty - bnc #450643 +mount_ok=1; +test -z `ls /proc |head -n1` && echo "The /proc filesystem is not mounted." && mount_ok=0; +test -z `ls /sys |head -n1` && echo "The /sys filesystem is not mounted." && mount_ok=0; +test -z `ls /dev |head -n1` && echo "The /dev filesystem is not mounted." && mount_ok=0; +if test $mount_ok -eq 0 ; then + echo "If you are running in a chroot environment, bind-mount missing filesystems."; + exit 1; +fi + # #211392, #265263 # if we are in X and do not have _input_ from terminal, # save the output and display it via xmessage in case of error. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.18.14/VERSION new/yast2-2.18.15/VERSION --- old/yast2-2.18.14/VERSION 2009-04-07 15:31:17.000000000 +0200 +++ new/yast2-2.18.15/VERSION 2009-04-29 09:17:17.000000000 +0200 @@ -1 +1 @@ -2.18.14 +2.18.15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 for openSUSE:Factory
by root＠Hilbert.suse.de 30 Apr '09

30 Apr '09

Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at Fri May 1 00:16:51 CEST 2009. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2009-03-30 17:00:47.000000000 +0200 +++ yast2-pkg-bindings/yast2-pkg-bindings.changes 2009-04-29 09:00:08.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Apr 29 08:45:52 CEST 2009 - lslezak(a)suse.cz + +- report also the URL when repository metadata are not found + (bnc#439069) +- 2.18.4 + +------------------------------------------------------------------- +Tue Apr 21 19:18:16 CEST 2009 - lslezak(a)suse.cz + +- Pkg::ResolvableDependencies() - also return raw (unresolved) + dependencies in the result (key "deps"), remove duplicated + dependencies in the result (bnc#479575) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-pkg-bindings-2.18.3.tar.bz2 New: ---- yast2-pkg-bindings-2.18.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.b12019/_old 2009-05-01 00:16:05.000000000 +0200 +++ /var/tmp/diff_new_pack.b12019/_new 2009-05-01 00:16:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings-devel-doc (Version 2.18.3) +# spec file for package yast2-pkg-bindings-devel-doc (Version 2.18.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-pkg-bindings-devel-doc -Version: 2.18.3 +Version: 2.18.4 Release: 1 License: GPL v2 or later Group: Documentation/HTML BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.18.3.tar.bz2 +Source0: yast2-pkg-bindings-2.18.4.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.18.3 +%setup -n yast2-pkg-bindings-2.18.4 # build only documentation, ignore all other directories echo "doc" > SUBDIRS @@ -76,6 +76,7 @@ %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.b12019/_old 2009-05-01 00:16:05.000000000 +0200 +++ /var/tmp/diff_new_pack.b12019/_new 2009-05-01 00:16:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.18.3) +# spec file for package yast2-pkg-bindings (Version 2.18.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-pkg-bindings -Version: 2.18.3 +Version: 2.18.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.18.3.tar.bz2 +Source0: yast2-pkg-bindings-2.18.4.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.24.7 @@ -47,7 +47,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.18.3 +%setup -n yast2-pkg-bindings-2.18.4 # build only the library, ignore documentation (it is in devel-doc package) echo "src" > SUBDIRS @@ -78,7 +78,16 @@ %{_libdir}/YaST2/plugin/libpy2Pkg.so.* %{_libdir}/YaST2/plugin/libpy2Pkg.so %doc %{prefix}/share/doc/packages/yast2-pkg-bindings + %changelog +* Wed Apr 29 2009 lslezak(a)suse.cz +- report also the URL when repository metadata are not found + (bnc#439069) +- 2.18.4 +* Tue Apr 21 2009 lslezak(a)suse.cz +- Pkg::ResolvableDependencies() - also return raw (unresolved) + dependencies in the result (key "deps"), remove duplicated + dependencies in the result (bnc#479575) * Mon Mar 30 2009 lslezak(a)suse.cz - return "is_update_repo" flag in Pkg::SourceGeneralData() call (requires loaded pool) (bnc#459527) ++++++ yast2-pkg-bindings-2.18.3.tar.bz2 -> yast2-pkg-bindings-2.18.4.tar.bz2 ++++++ ++++ 16406 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 xmlto for openSUSE:Factory
by root＠Hilbert.suse.de 30 Apr '09

30 Apr '09

Hello community, here is the log from the commit of package xmlto for openSUSE:Factory checked in at Fri May 1 00:15:32 CEST 2009. -------- --- xmlto/xmlto.changes 2008-09-09 09:52:03.000000000 +0200 +++ xmlto/xmlto.changes 2009-04-29 12:01:24.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 28 19:50:22 CEST 2009 - pth(a)suse.de + +- Fix comiler warnings. +- BuildRequire flex and remove xmlif.c to get it regenerated. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xmlto-codecleanup.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlto.spec ++++++ --- /var/tmp/diff_new_pack.IR1991/_old 2009-05-01 00:14:17.000000000 +0200 +++ /var/tmp/diff_new_pack.IR1991/_new 2009-05-01 00:14:17.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xmlto (Version 0.0.18) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,10 +19,10 @@ Name: xmlto -BuildRequires: docbook-xsl-stylesheets libxslt sgml-skel +BuildRequires: docbook-xsl-stylesheets flex libxslt sgml-skel Summary: Tool for Converting XML Files to Various Formats Version: 0.0.18 -Release: 182 +Release: 185 License: GPL v2 or later Group: Productivity/Publishing/XML Url: http://cyberelk.net/tim/xmlto/ @@ -32,15 +32,14 @@ Patch1: xmlto-0.0.18-overflow.patch Patch2: xmlto-find-cmd.diff Patch3: xmlto-0.0.18-xsltopts.diff +Patch4: xmlto-codecleanup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # We rely entirely on the DocBook XSL stylesheets! Requires: docbook-xsl-stylesheets >= 1.56.0 # For full functionality, we need passivetex. Requires: texlive-xmltex >= 2007 Requires: libxslt -#Does not work; split libxml2 and libxslt -#Requires: /usr/bin/xsltproc -#Requires: /usr/bin/xmllint +Requires: libxml2 Requires: docbook_4 %description @@ -53,8 +52,12 @@ %prep %setup -q %patch -%patch -p 1 -P 1 -p 1 -P 2 -p 1 -P 3 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 cp %{S:10} README.SuSE +rm -f xmlif/xmlif.c %build %configure @@ -80,6 +83,9 @@ %{_datadir}/xmlto %changelog +* Tue Apr 28 2009 pth(a)suse.de +- Fix comiler warnings. +- BuildRequire flex and remove xmlif.c to get it regenerated. * Tue Sep 09 2008 ke(a)suse.de - Improve README.SUSE; bnc#67190. * Mon Mar 17 2008 werner(a)suse.de ++++++ xmlto-codecleanup.patch ++++++ --- xmlif/xmlif.l +++ xmlif/xmlif.l @@ -30,7 +30,7 @@ static char **selections; /* selection tokens */ static int nselections; /* number of selections */ -static ifsense; /* sense of last `if' or unless seen */ +static int ifsense; /* sense of last `if' or unless seen */ static char *attribute; /* last attribute scanned */ struct stack_t { @@ -71,7 +71,7 @@ } } -static void stash_attribute(char *attr) +static void stash_attribute(const char *attr) /* stash an attribute away for comparison */ { #ifdef DEBUG @@ -163,7 +163,7 @@ end->suppressed = suppress(attribute, val); } -static void process_else() +static void process_else(void) /* process <?xmlif else> tag */ { end->suppressed = end->matched; @@ -217,9 +217,12 @@ #include "config.h" -int yywrap() {exit(0);}; +int yywrap(void) +{ + exit(0); +} -main(int argc, char *argv[]) +int main(int argc, char *argv[]) { int i; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openmotif for openSUSE:Factory
by root＠Hilbert.suse.de 30 Apr '09

30 Apr '09

Hello community, here is the log from the commit of package openmotif for openSUSE:Factory checked in at Fri May 1 00:14:09 CEST 2009. -------- --- openmotif/openmotif.changes 2009-03-18 14:42:05.000000000 +0100 +++ openmotif/openmotif.changes 2009-04-30 14:00:00.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 30 09:52:52 CEST 2009 - mseben(a)suse.cz + +- removed deprecated datadir.patch - we don't build demos , + added version dependency of openmotif-libs for openmotif-devel + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- datadir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmotif.spec ++++++ --- /var/tmp/diff_new_pack.n31444/_old 2009-05-01 00:13:41.000000000 +0200 +++ /var/tmp/diff_new_pack.n31444/_new 2009-05-01 00:13:41.000000000 +0200 @@ -26,7 +26,7 @@ %endif BuildRequires: bison flex freetype2-devel libjpeg-devel libpng-devel lzma pkgconfig update-desktop-files xorg-x11-devel Version: 2.3.1 -Release: 7 +Release: 8 License: MOTIF LICENSE (http://www.opengroup.org/openmotif/license) Group: System/Libraries AutoReqProv: on @@ -39,7 +39,6 @@ Source1: mwm.desktop Patch: openmotif-%{version}.diff Patch1: warn.patch -Patch2: datadir.patch Patch3: strcmp.diff Patch4: openmotif-xpm.diff Patch5: sentinel.diff @@ -86,7 +85,7 @@ Obsoletes: openmotif-devel-64bit %endif # -Requires: openmotif-libs xorg-x11-devel zlib-devel libjpeg-devel libpng-devel +Requires: openmotif-libs = %{version} xorg-x11-devel zlib-devel libjpeg-devel libpng-devel Conflicts: lesstifd lestif2d lesstif-devel PreReq: coreutils @@ -102,7 +101,6 @@ %setup -q %patch %patch1 -%patch2 %patch3 %patch4 %patch5 @@ -204,6 +202,9 @@ %{_mandir}/man5/*.gz %changelog +* Thu Apr 30 2009 mseben(a)suse.cz +- removed deprecated datadir.patch - we don't build demos , + added version dependency of openmotif-libs for openmotif-devel * Wed Mar 18 2009 crrodriguez(a)suse.de - fix build, deleting la files in wrong rpm spec section * Tue Mar 03 2009 crrodriguez(a)suse.de @@ -335,7 +336,7 @@ - Fix permission of site.def after modifying. * Thu Apr 04 2002 schwab(a)suse.de - Remove dependency on libXmu to allow static linking. -* Wed Apr 03 2002 schwab(a)suse.de +* Thu Apr 04 2002 schwab(a)suse.de - Update to openMotif 2.2.2. - New subpackage openmotif-demo. * Fri Jan 04 2002 adrian(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openldap2 for openSUSE:Factory
by root＠Hilbert.suse.de 30 Apr '09

30 Apr '09

Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at Fri May 1 00:11:04 CEST 2009. -------- --- openldap2/openldap2.changes 2009-04-06 15:42:05.000000000 +0200 +++ openldap2/openldap2.changes 2009-04-29 17:08:32.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 29 17:07:33 CEST 2009 - rhafer(a)novell.com + +- gcc 4.4 fixes + +------------------------------------------------------------------- openldap2-client.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.C31433/_old 2009-05-01 00:09:32.000000000 +0200 +++ /var/tmp/diff_new_pack.C31433/_new 2009-05-01 00:09:32.000000000 +0200 @@ -27,7 +27,7 @@ BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif Version: 2.4.16 -Release: 1 +Release: 2 Url: http://www.openldap.org License: BSD 3-Clause %if "%{name}" == "openldap2" @@ -536,6 +536,8 @@ %endif %changelog +* Wed Apr 29 2009 rhafer(a)novell.com +- gcc 4.4 fixes * Mon Apr 06 2009 rhafer(a)suse.de - Update to 2.4.16. Most important fixes: * Fixed libldap segfault in checking cert/DN (ITS#5976) ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.C31433/_old 2009-05-01 00:09:32.000000000 +0200 +++ /var/tmp/diff_new_pack.C31433/_new 2009-05-01 00:09:32.000000000 +0200 @@ -27,7 +27,7 @@ BuildRequires: -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel %endif Version: 2.4.16 -Release: 1 +Release: 2 Url: http://www.openldap.org License: BSD 3-Clause; openldap 2.8 %if "%{name}" == "openldap2" @@ -539,6 +539,8 @@ %endif %changelog +* Wed Apr 29 2009 rhafer(a)novell.com +- gcc 4.4 fixes * Mon Apr 06 2009 rhafer(a)suse.de - Update to 2.4.16. Most important fixes: * Fixed libldap segfault in checking cert/DN (ITS#5976) ++++++ openldap-2.3.37.dif ++++++ --- /var/tmp/diff_new_pack.C31433/_old 2009-05-01 00:09:32.000000000 +0200 +++ /var/tmp/diff_new_pack.C31433/_new 2009-05-01 00:09:32.000000000 +0200 @@ -52,7 +52,7 @@ =================================================================== --- libraries/liblunicode/Makefile.in.orig +++ libraries/liblunicode/Makefile.in -@@ -35,6 +35,9 @@ $(XXDIR)/uctable.h: $(XXDIR)/ucgendat.c +@@ -35,6 +35,9 @@ $(XXDIR)/uctable.h: $(XXDIR)/ucgendat.c $(MAKE) ucgendat ./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt @@ -317,3 +317,29 @@ BUILD_OPT = "--enable-meta" BUILD_MOD = @BUILD_META@ +Index: libraries/libldap/os-ip.c +=================================================================== +--- libraries/libldap/os-ip.c.orig ++++ libraries/libldap/os-ip.c +@@ -646,7 +646,7 @@ ldap_host_connected_to( Sockbuf *sb, con + char *herr; + #ifdef NI_MAXHOST + char hbuf[NI_MAXHOST]; +-#elif defined( MAXHOSTNAMELEN ++#elif defined( MAXHOSTNAMELEN ) + char hbuf[MAXHOSTNAMELEN]; + #else + char hbuf[256]; +Index: include/ldap_pvt_thread.h +=================================================================== +--- include/ldap_pvt_thread.h.orig ++++ include/ldap_pvt_thread.h +@@ -61,8 +61,6 @@ ldap_pvt_thread_set_concurrency LDAP_P(( + /* LARGE stack. Will be twice as large on 64 bit machine. */ + #define LDAP_PVT_THREAD_STACK_SIZE ( 1 * 1024 * 1024 * sizeof(void *) ) + /* May be explicitly defined to zero to disable it */ +-#elif LDAP_PVT_THREAD_STACK_SIZE == 0 +-#undef LDAP_PVT_THREAD_SET_STACK_SIZE + #endif + #endif /* !LDAP_PVT_THREAD_H_DONE */ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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