October 2006 - openSUSE Commits - openSUSE Mailing Lists

commit SDL_net
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package SDL_net checked in at Thu Oct 26 20:39:06 CEST 2006. -------- --- SDL_net/SDL_net.changes 2006-01-27 10:46:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/SDL_net/SDL_net.changes 2006-10-26 11:19:00.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Oct 26 11:17:41 CEST 2006 - sndirsch(a)suse.de + +- removed wrong 'extra ;' in SDL_net.h (Bug #214645) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SDL_net.spec ++++++ --- /var/tmp/diff_new_pack.V0rODA/_old 2006-10-26 20:38:32.000000000 +0200 +++ /var/tmp/diff_new_pack.V0rODA/_new 2006-10-26 20:38:32.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,12 +13,12 @@ Name: SDL_net BuildRequires: SDL-devel gcc-c++ xorg-x11 URL: http://www.libsdl.org/projects/SDL_net/ -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Libraries/X11 #Requires: xforms Autoreqprov: on Version: 1.2.5 -Release: 224 +Release: 250 Summary: Simple DirectMedia Layer--Networking Library Source: %{name}-%{version}.tar.bz2 Patch: %{name}-%{version}.dif @@ -69,6 +69,8 @@ %_libdir/libSDL_net.so %changelog -n SDL_net +* Thu Oct 26 2006 - sndirsch(a)suse.de +- removed wrong 'extra ;' in SDL_net.h (Bug #214645) * Fri Jan 27 2006 - nadvornik(a)suse.cz - fixed BuildRequires * Wed Jan 25 2006 - mls(a)suse.de ++++++ SDL_net-1.2.5.dif ++++++ --- /var/tmp/diff_new_pack.V0rODA/_old 2006-10-26 20:38:32.000000000 +0200 +++ /var/tmp/diff_new_pack.V0rODA/_new 2006-10-26 20:38:32.000000000 +0200 @@ -7,3 +7,14 @@ lib_LTLIBRARIES = libSDL_net.la libSDL_netincludedir = $(includedir)/SDL +--- /usr/include/SDL/SDL_net.h 2006-09-24 11:06:01.000000000 +0300 ++++ SDL_net.h 2006-09-24 10:24:02.000000000 +0300 +@@ -413,7 +413,7 @@ + #endif + /* Ends C function definitions when using C++ */ + #ifdef __cplusplus +-}; ++} + #endif + #include "close_code.h" + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yaz
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package yaz checked in at Thu Oct 26 20:38:09 CEST 2006. -------- --- yaz/yaz.changes 2006-10-18 14:03:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/yaz/yaz.changes 2006-10-25 07:40:06.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Oct 25 07:38:48 CEST 2006 - ke(a)suse.de + +- Version 2.1.36 (from the NEWS file since 2.1.32): + * Implemented yaz_filepath_comp which splits a path into file path + components (required by Zebra 2.0.3+). + * Bugfixes: Missing log lines; CQL to PQF translation: preserve + double-quote escaping; add SRU diagnostics; fix printf specifiers [# + 214434, reported by David Binderman]; change type of optval from + long to int for invocation of setsockopt with the SO_REUSEADDR option. + * New ZOOM function, ZOOM_connection_is_idle, which checks + whether a connection is idle. + * Add support for specifying the max log file size for the Generic + Frontend Server. The size is given with option -r. +- Update yaz-codecleanup.diff as yaz-codecleanup.36.diff + +------------------------------------------------------------------- Old: ---- yaz-2.1.32.tar.gz yaz-codecleanup.diff New: ---- yaz-2.1.36.tar.gz yaz-codecleanup.36.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yaz.spec ++++++ --- /var/tmp/diff_new_pack.q2ksOD/_old 2006-10-26 20:37:48.000000000 +0200 +++ /var/tmp/diff_new_pack.q2ksOD/_new 2006-10-26 20:37:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yaz (Version 2.1.32) +# spec file for package yaz (Version 2.1.36) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,12 +13,12 @@ Name: yaz BuildRequires: libxslt-devel openssl-devel readline-devel tcpd-devel # libxml2-devel -Version: 2.1.32 -Release: 7 +Version: 2.1.36 +Release: 1 License: Other License(s), see package, BSD License and BSD-like Group: Development/Libraries/C and C++ Source: http://ftp.indexdata.dk/pub/yaz/%{name}-%{version}.tar.gz -Patch0: yaz-codecleanup.diff +Patch0: yaz-codecleanup.36.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.indexdata.dk/yaz/ Summary: Z39.50/SRW/SRU Programs @@ -67,13 +67,14 @@ %prep %setup -q -%patch0 +%patch0 -p 1 %build # --with-dsssl=/usr/share/sgml/docbook/dsssl-stylesheets \ # --with-dtd=/usr/share/sgml/db41xml export CFLAGS="%{optflags} -W" -./configure --prefix=%{_prefix} --libdir=%_libdir --mandir=%{_mandir} --enable-shared --enable-tcpd --with-openssl +./configure --prefix=%{_prefix} --libdir=%_libdir --mandir=%{_mandir} \ + --enable-shared --enable-tcpd --with-openssl make %install @@ -156,6 +157,19 @@ %{_mandir}/man1/yaz-asncomp.* %changelog -n yaz +* Wed Oct 25 2006 - ke(a)suse.de +- Version 2.1.36 (from the NEWS file since 2.1.32): + * Implemented yaz_filepath_comp which splits a path into file path + components (required by Zebra 2.0.3+). + * Bugfixes: Missing log lines; CQL to PQF translation: preserve + double-quote escaping; add SRU diagnostics; fix printf specifiers [# + 214434, reported by David Binderman]; change type of optval from + long to int for invocation of setsockopt with the SO_REUSEADDR option. + * New ZOOM function, ZOOM_connection_is_idle, which checks + whether a connection is idle. + * Add support for specifying the max log file size for the Generic + Frontend Server. The size is given with option -r. +- Update yaz-codecleanup.diff as yaz-codecleanup.36.diff * Wed Oct 18 2006 - pth(a)suse.de - Cleaned up the code a bit. - Fix an off-by-one error (#207880). @@ -302,68 +316,68 @@ - add %%defattr and %%run_ldconfig * Thu Oct 16 2003 - ke(a)suse.de - Update to version 2.0.4; changes: -- Allow any CQL relation (not just all,any,exact,scr). -- Fixes for OCLC UI ASN.1 to make it work with SilverPlatter targets + - Allow any CQL relation (not just all,any,exact,scr). + - Fixes for OCLC UI ASN.1 to make it work with SilverPlatter targets that features the same UI. -- Implement command update0 in YAZ client which is equivalent to + - Implement command update0 in YAZ client which is equivalent to update but uses old of Ext Update ASN.1. -- Use OID 1.2.840.10003.15.1000.81.1 for privately defined charsets + - Use OID 1.2.840.10003.15.1000.81.1 for privately defined charsets in charset negotiation. Added VAL_ID_CHARSET in oid.h. Previously no OID was used for this info. -- ZOOM uses smallSetUpperBound=1 instead of 0 for piggyback searches. + - ZOOM uses smallSetUpperBound=1 instead of 0 for piggyback searches. It apparantely upsets EBSCO Publishing IR Z39.50 Server which returns 'malformed search term' otherwise. -- SortResponse member resultCount now set to NULL in sort handler of + - SortResponse member resultCount now set to NULL in sort handler of frontend server. -- OPAC support ZOOM. ZOOM_record_get returns OPAC info (as XML) if + - OPAC support ZOOM. ZOOM_record_get returns OPAC info (as XML) if type is "opac". -- Add three new utility functions for translating OIDs between various + - Add three new utility functions for translating OIDs between various formats -- symbolic name such as "Usmarc", minus-1-terminated int arrays and dotted strings such as "1.2.840.10003.9.5.1". -- Revert modifications for ES Update definition for z_IU0Update + - Revert modifications for ES Update definition for z_IU0Update (OID 1.2.840.10003.9.5.1 and 1.2.840.10003.9.5). The definition is back to YAZ 2.0.2. -- String value attributes for CCL parser. -- Support for OCLC's locally registered "OCLC-UserInformation" PDU, + - String value attributes for CCL parser. + - Support for OCLC's locally registered "OCLC-UserInformation" PDU, which their FirstSearch server returns in Init responses, sometimes carrying useful diagnostic information when Init fails. This has the OID 1.2.840.10003.10.1000.17.1 and is defined in the file "z39.50/oclcui.asn", where its definition is somewhat different from what OCLC document on their web-site, as required to interoperate with their servers. -- Support for anonymous authentication in yaz-client. Use the command + - Support for anonymous authentication in yaz-client. Use the command "auth -". -- Fix the OID of the Index Data-local "admin" Extended Service from + - Fix the OID of the Index Data-local "admin" Extended Service from 1.2.840.10003.9.81.1 to 1.2.840.10003.9.1000.81.1. The omission of the 1000, which indicates a locally-defined OID, was a mistake. * Mon Jun 23 2003 - ke(a)suse.de - Update to version 2.0.3; changes: -- Fix CCL directive @case handling so that it affects string match for + - Fix CCL directive @case handling so that it affects string match for both CCL keywords and qualifiers. -- * ESFormat-Update updates. Packages with OID 1.2.840.10003.9.5.1 and + - * ESFormat-Update updates. Packages with OID 1.2.840.10003.9.5.1 and 1.2.840.10003.9.5 are now handled by the same decoder z_IU0Update . Decoder has been updated with ASN.1 changes as listed in http://lcweb.loc.gov/z3950/agency/defns/updateES.html -- ZOOM_record_get may now return a record in a specific character set. + - ZOOM_record_get may now return a record in a specific character set. For type use "form; charset=from[,to]" where form (render, xml, ..), "from" is the character set of record as returned by target. "to" is the character set to be returned. If omitted, "to" is UTF-8. -- YAZ ASN.1 compiler renamed from yaz-comp to yaz-asncomp -- New ODR utility, odr_getelement, which returns name of element for + - YAZ ASN.1 compiler renamed from yaz-comp to yaz-asncomp + - New ODR utility, odr_getelement, which returns name of element for which encoding/decoding failed. -- Fixed ODR so that it returns error code OREQUIRED rather than ONONE + - Fixed ODR so that it returns error code OREQUIRED rather than ONONE in cases where a required element was omitted. -- Bug fix: some MARC8 sequences were not converted. -- New ZOOM option "step" which specifies number of records to be + - Bug fix: some MARC8 sequences were not converted. + - New ZOOM option "step" which specifies number of records to be retrieved in one chunk. Used in conjunction with "start" and "count". -- SRW support for yaz-client. Use scheme http: to use it, e.g. + - SRW support for yaz-client. Use scheme http: to use it, e.g. http://host:port/db -- yaz-client no longer does (un)intelligent character set conversions + - yaz-client no longer does (un)intelligent character set conversions by default. Can be enabled with charset and marc_charset commands. -- New function, cql_strerror() translates SRW error codes, as returned + - New function, cql_strerror() translates SRW error codes, as returned by cql_transform_error(), into human-readable English strings. Used in yaz-client diagnostics when appropriate. -- New CQL2RPN query-type for the command-line yaz-client, parses CQL and + - New CQL2RPN query-type for the command-line yaz-client, parses CQL and converts it into a type-1 query which is sent to the server. This makes CQL available for use with all Z-servers, as opposed to the tiny minority that can handle CQL queries themselves. @@ -375,66 +389,66 @@ - Split subpackage libyaz into libyaz and libyaz-devel. * Thu May 22 2003 - ke(a)suse.de - Update to version 2.0.2; changes: -- New ZOOM events ZOOM_EVENT_RECV_{RECORD,SEARCH} for receiving a record + - New ZOOM events ZOOM_EVENT_RECV_{RECORD,SEARCH} for receiving a record and search result respectively. -- New member 'schema' in struct bend_fetch_rr which the name of requested + - New member 'schema' in struct bend_fetch_rr which the name of requested schema (SRW/SRU) for record (or NULL if none was given). The fetch handler MAY set this to reflect the schema of the returned record. -- New member 'display_term' in struct scan_entry. GFS now sets member entries + - New member 'display_term' in struct scan_entry. GFS now sets member entries and allocates scan entries to be filled by user scan handler. In previous version, entries member was allocated by the scan handler. That still works, but the GFS will ignore member display_term - assuming it was NOT set by the handler. The fact that the GFS now allocates the entries both allows for new members and makes a scan handler easier to write. -- SRW/SRU recordPacking. For SRW default recordPacking is string. For + - SRW/SRU recordPacking. For SRW default recordPacking is string. For SRU default recordPacking is string. -- SRU protocol support for frontend server. -- Add missing PQF transform rules for <= and >= . -- Added scan for the ZOOM shell (zoomsh). -- Bugfix: CQL lex buffer overflow. -- Split package into yaz and libyaz. + - SRU protocol support for frontend server. + - Add missing PQF transform rules for <= and >= . + - Added scan for the ZOOM shell (zoomsh). + - Bugfix: CQL lex buffer overflow. + - Split package into yaz and libyaz. * Wed Mar 26 2003 - ke(a)suse.de - Update to version 2.0; changes: Possible compatibility problems with earlier versions marked with '*'. -- * String Identifers for Schemas (Amendment 5). + - * String Identifers for Schemas (Amendment 5). http://lcweb.loc.gov/z3950/agency/amend/am5.html -- * resultCount parameter to Sort Response (Amendment 1). + - * resultCount parameter to Sort Response (Amendment 1). http://lcweb.loc.gov/z3950/agency/amend/am1.html -- Support for SRW 1.0 over HTTP. This is an optional feature and + - Support for SRW 1.0 over HTTP. This is an optional feature and requires libxml2 to operate. Enable SOAP by specifying --with-xml2 for configure (not enabled on SuSE Linux). -- Generic frontend server supports HTTP/SOAP/SRW and Z39.50/BER + - Generic frontend server supports HTTP/SOAP/SRW and Z39.50/BER on the same port. SRW SearchRetrieveRequests are mapped to bend_init,bend_search,bend_fetch,bend_close. -- Add Z39.50 Query Type-104 - to facilitate CQL within Z39.50. -- CQL support. Source is directory 'cql'. CQL is supported in ZOOM + - Add Z39.50 Query Type-104 - to facilitate CQL within Z39.50. + - CQL support. Source is directory 'cql'. CQL is supported in ZOOM (both SRW and Z39.50) and the YAZ client (Z39.50 only). -- ZOOM connections are SRW based if schem http is used for hostname + - ZOOM connections are SRW based if schem http is used for hostname in connect, e.g. z = ZOOM_connection_new("http://myserver"); ZOOM_query may be of type CQL, e.g. ZOOM_query_cql(q, "dc.title=x"); -- CCL proximity operators !n, %%n converts to PQF @prox 0 n 1 2 k 2 + - CCL proximity operators !n, %%n converts to PQF @prox 0 n 1 2 k 2 and @prox 0 n 0 1 k 2 respectively, meaning: exlusion=false, distance=n, order=true/false, relation=le, prox unit=word. If n is omitted, distance 1 is used. -- New MARC decode API. All new functions operate on a yaz_marc_t + - New MARC decode API. All new functions operate on a yaz_marc_t handle. The most important new functions are: yaz_marc_create, yaz_marc_decode_{buf,wrbuf}, yaz_marc_destroy, .. to create handler, decode and destroy respectively. Decoder can produce formats MARC line, simple XML, OAI MARC and MARC XML (LoC). See include/yaz/marcdisp.h. -- YAZ Iconv utility now supports MARC8 decoding (marc8.c). Converts + - YAZ Iconv utility now supports MARC8 decoding (marc8.c). Converts to UTF-8, UCS-32, wchar_t or Latin-1. -- * Prototypes for yaz_iconv_-functions moved to separate header + - * Prototypes for yaz_iconv_-functions moved to separate header include/yaz/yaz-iconv.h. -- Make a few private functions 'static' in unix.c. This prevents + - Make a few private functions 'static' in unix.c. This prevents duplicate unix_close in PHP with YAZ and imap. PHP Bug 20977. -- For ZOOM connection, the options targetImplementation{Id,Name,Version} + - For ZOOM connection, the options targetImplementation{Id,Name,Version} are set when Init Response is received. -- New function ZOOM_connection_error_x similar to ZOOM_connection_error + - New function ZOOM_connection_error_x similar to ZOOM_connection_error but returns diagnostic set as well. -- New function yaz_strerror which is a portable wrapper for + - New function yaz_strerror which is a portable wrapper for strerror/strerror_r/GetLastMessage. -- * ZOOM_record_get supports type "xml" in which case MARC XML (from LOC) + - * ZOOM_record_get supports type "xml" in which case MARC XML (from LOC) is returned for MARC. If type is "oai", then OAI MARC is returned. * Fri Nov 29 2002 - ke(a)suse.de - Update to version 1.9.2; changes: @@ -468,8 +482,8 @@ and readline. * Mon May 27 2002 - ke(a)suse.de - Update to version 1.8.7: -- Bug fixes. -- Better i18n support (ZOOM API and YAZ client). + - Bug fixes. + - Better i18n support (ZOOM API and YAZ client). * Wed May 08 2002 - ke(a)suse.de - Use %%_libdir macro. * Mon Apr 08 2002 - ke(a)suse.de ++++++ yaz-2.1.32.tar.gz -> yaz-2.1.36.tar.gz ++++++ ++++ 11102 lines of diff (skipped) ++++++ yaz-codecleanup.diff -> yaz-codecleanup.36.diff ++++++ --- yaz/yaz-codecleanup.diff 2006-10-18 14:15:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/yaz/yaz-codecleanup.36.diff 2006-10-25 07:32:42.000000000 +0200 @@ -1,14 +1,15 @@ ---- client/client.c -+++ client/client.c -@@ -2296,6 +2296,7 @@ - { +diff -ur yaz-2.1.36/client/client.c yaz-2.1.36.new/client/client.c +--- yaz-2.1.36/client/client.c 2006-10-04 09:26:00.000000000 +0200 ++++ yaz-2.1.36.new/client/client.c 2006-10-25 07:19:51.000000000 +0200 +@@ -2297,6 +2297,7 @@ + char *asn_buf = 0; int noread = 0; char oid_str[51]; + union { unsigned char **ucp; char **cp; }pun; int oid_value_xmles = VAL_XMLES; Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest); Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; -@@ -2308,7 +2309,7 @@ +@@ -2309,7 +2310,7 @@ ext->indirect_reference = 0; ext->descriptor = 0; ext->which = Z_External_octet; @@ -17,20 +18,22 @@ sscanf(arg, "%50s%n", oid_str, &noread); if (noread == 0) { -@@ -2322,8 +2323,9 @@ - printf("Bad OID: %s\n", oid_str); +@@ -2324,7 +2325,8 @@ return 0; } -- -- if (parse_cmd_doc(&arg, out, (char **) &ext->u.single_ASN1_type->buf, -+ + +- if (parse_cmd_doc(&arg, out, &asn_buf, + pun.ucp = &ext->u.single_ASN1_type->buf; -+ if (parse_cmd_doc(&arg, out, pun.cp, ++ if (parse_cmd_doc(&arg, out, pun.ucp, &ext->u.single_ASN1_type->len, 0) == 0) return 0; - req->packageType = yaz_oidval_to_z3950oid(out, CLASS_EXTSERV, ---- src/cqltransform.c -+++ src/cqltransform.c + +Only in yaz-2.1.36.new/client: client.c.orig +Only in yaz-2.1.36.new/client: client.c.rej +Only in yaz-2.1.36.new/client: client.c.~1~ +diff -ur yaz-2.1.36/src/cqltransform.c yaz-2.1.36.new/src/cqltransform.c +--- yaz-2.1.36/src/cqltransform.c 2006-10-05 18:12:23.000000000 +0200 ++++ yaz-2.1.36.new/src/cqltransform.c 2006-10-25 07:16:57.000000000 +0200 @@ -237,7 +237,7 @@ void *client_data) { @@ -40,20 +43,12 @@ int distance_defined = 0; int ordered = 0; int proxrel = 2; /* less than or equal */ ---- src/nfaxml.c -+++ src/nfaxml.c -@@ -45,7 +45,7 @@ - if (res == 0) { - /* should be caught earlier */ - yaz_log(YLOG_FATAL,"Illegal utf-8 sequence " -- "%d bytes into '%s' in %s, rule %d ", -+ "%ld bytes into '%s' in %s, rule %d ", - cp-content, content, filename, rulenumber); - xmlFree(content); - return -1; ---- src/zoom-c.c -+++ src/zoom-c.c -@@ -1331,7 +1331,7 @@ +Only in yaz-2.1.36.new/src: nfaxml.c.orig +Only in yaz-2.1.36.new/src: nfaxml.c.rej +diff -ur yaz-2.1.36/src/zoom-c.c yaz-2.1.36.new/src/zoom-c.c +--- yaz-2.1.36/src/zoom-c.c 2006-10-05 17:10:34.000000000 +0200 ++++ yaz-2.1.36.new/src/zoom-c.c 2006-10-25 07:16:57.000000000 +0200 +@@ -1336,7 +1336,7 @@ static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) { int i; @@ -62,19 +57,12 @@ ZOOM_resultset resultset = 0; Z_SRW_PDU *sr = 0; const char *option_val = 0; ---- util/marcdump.c -+++ util/marcdump.c -@@ -182,7 +182,7 @@ - if (len < 25 || len > 100000) - { - long off = ftell(inf) - 5; -- printf("Bad Length %d read at offset %ld (%lx)\n", -+ printf("Bad Length %z read at offset %ld (%lx)\n", - len, (long) off, (long) off); - break; - } ---- util/yaz-xmlquery.c -+++ util/yaz-xmlquery.c +Only in yaz-2.1.36.new/src: zoom-c.c.orig +Only in yaz-2.1.36.new/util: marcdump.c.orig +Only in yaz-2.1.36.new/util: marcdump.c.rej +diff -ur yaz-2.1.36/util/yaz-xmlquery.c yaz-2.1.36.new/util/yaz-xmlquery.c +--- yaz-2.1.36/util/yaz-xmlquery.c 2006-10-05 09:35:08.000000000 +0200 ++++ yaz-2.1.36.new/util/yaz-xmlquery.c 2006-10-25 07:16:57.000000000 +0200 @@ -62,19 +62,19 @@ } else @@ -99,8 +87,9 @@ xmlFreeDoc(doc); } } ---- zoom/zoom-benchmark.c -+++ zoom/zoom-benchmark.c +diff -ur yaz-2.1.36/zoom/zoom-benchmark.c yaz-2.1.36.new/zoom/zoom-benchmark.c +--- yaz-2.1.36/zoom/zoom-benchmark.c 2006-10-05 09:35:09.000000000 +0200 ++++ yaz-2.1.36.new/zoom/zoom-benchmark.c 2006-10-25 07:16:57.000000000 +0200 @@ -16,10 +16,10 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-users
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package yast2-users checked in at Thu Oct 26 20:37:48 CEST 2006. -------- --- yast2-users/yast2-users.changes 2006-09-25 16:02:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-users/yast2-users.changes 2006-10-26 14:45:51.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Oct 26 14:28:58 CEST 2006 - jsuchome(a)suse.cz + +- schema file moved from autoyast package (#215249) +- 2.13.33 + +------------------------------------------------------------------- +Tue Oct 24 15:34:31 CEST 2006 - jsuchome(a)suse.cz + +- fix initialization during read of /etc/group (#213025) +- 2.13.32 + +------------------------------------------------------------------- +Tue Oct 24 10:21:59 CEST 2006 - jsuchome(a)suse.cz + +- better check if LDAP user password was modified (#213574) +- 2.13.31 + +------------------------------------------------------------------- Old: ---- yast2-users-2.13.30.tar.bz2 New: ---- yast2-users-2.13.33.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.MMqiN9/_old 2006-10-26 20:37:31.000000000 +0200 +++ /var/tmp/diff_new_pack.MMqiN9/_new 2006-10-26 20:37:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-users (Version 2.13.30) +# spec file for package yast2-users (Version 2.13.33) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-users -Version: 2.13.30 +Version: 2.13.33 Release: 1 -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-users-2.13.30.tar.bz2 +Source0: yast2-users-2.13.33.tar.bz2 prefix: /usr BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-mail-aliases yast2-perl-bindings yast2-security yast2-testsuite Requires: yast2 yast2-perl-bindings yast2-country yast2-pam yast2-security yast2-mail-aliases cracklib perl-Digest-SHA1 perl-gettext yast2-ldap-client @@ -42,7 +42,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-users-2.13.30 +%setup -n yast2-users-2.13.33 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,7 @@ /usr/share/YaST2/modules/UsersUI.y* /usr/share/YaST2/modules/YaPI/USERS.pm /usr/share/YaST2/include/users/* +/usr/share/YaST2/schema/autoyast/rnc/users.rnc #agents: /usr/share/YaST2/scrconf/*.scr /usr/lib/YaST2/servers_non_y2/ag_nis @@ -85,6 +86,15 @@ %doc %{prefix}/share/doc/packages/yast2-users %changelog -n yast2-users +* Thu Oct 26 2006 - jsuchome(a)suse.cz +- schema file moved from autoyast package (#215249) +- 2.13.33 +* Tue Oct 24 2006 - jsuchome(a)suse.cz +- fix initialization during read of /etc/group (#213025) +- 2.13.32 +* Tue Oct 24 2006 - jsuchome(a)suse.cz +- better check if LDAP user password was modified (#213574) +- 2.13.31 * Mon Sep 25 2006 - jsuchome(a)suse.cz - do not offer importing users when there are not available (#207973) - 2.13.30 @@ -929,12 +939,12 @@ * Fri Dec 13 2002 - jsuchome(a)suse.de - new client for authentication: enables running NIS, LDAP, Kerberos modules - new kerberos module: -- basic configuration of kerberos client (agent for /etc/krb5.conf) -- basic PAM settings for pam_krb5 + - basic configuration of kerberos client (agent for /etc/krb5.conf) + - basic PAM settings for pam_krb5 - support for LDAP users: -- for generating list is the package perl-ldap used -- anonymous read access to LDAP server is required -- for modifications, cpu package is used + - for generating list is the package perl-ldap used + - anonymous read access to LDAP server is required + - for modifications, cpu package is used - script for reading splited, some data can be read later on demand (typically NIS/LDAP users) - autoinstalation ++++++ yast2-users-2.13.30.tar.bz2 -> yast2-users-2.13.33.tar.bz2 ++++++ ++++ 20495 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-users-2.13.30/Makefile.am new/yast2-users-2.13.33/Makefile.am --- old/yast2-users-2.13.30/Makefile.am 2006-07-11 08:09:59.000000000 +0200 +++ new/yast2-users-2.13.33/Makefile.am 2006-01-27 08:42:11.000000000 +0100 @@ -8,7 +8,6 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -96,7 +95,7 @@ done pot: - $(Y2TOOL) y2makepot -s $(srcdir) + y2tool y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -117,7 +116,7 @@ fi spellcheck: pot - $(Y2TOOL) pot-spellcheck + y2tool pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -144,20 +143,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(Y2TOOL); then \ - echo "$(Y2TOOL): not found."; \ + if ! test -x $(PREFIX)/bin/y2tool; then \ + echo "$(PREFIX)/bin/y2tool: not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages package-local -TAGVERSION = $(Y2TOOL) tagversion +TAGVERSION = $(PREFIX)/bin/y2tool tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -200,13 +199,10 @@ false; \ fi -check-textdomain: - $(Y2TOOL) check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package - $(Y2TOOL) checkin-stable + $(PREFIX)/bin/y2tool checkin-stable # For po/ modules 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-users-2.13.30/VERSION new/yast2-users-2.13.33/VERSION --- old/yast2-users-2.13.30/VERSION 2006-09-25 15:46:16.000000000 +0200 +++ new/yast2-users-2.13.33/VERSION 2006-10-26 14:29:36.000000000 +0200 @@ -1 +1 @@ -2.13.30 +2.13.33 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-users-2.13.30/configure.in new/yast2-users-2.13.33/configure.in --- old/yast2-users-2.13.30/configure.in 2006-07-11 08:09:58.000000000 +0200 +++ new/yast2-users-2.13.33/configure.in 2006-01-27 08:42:11.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-users dnl -dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-users, 2.13.19, http://bugs.opensuse.org/, yast2-users) +AC_INIT(yast2-users, 2.13.11, http://www.suse.de/feedback, yast2-users) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.19" +VERSION="2.13.11" RPMNAME="yast2-users" MAINTAINER="Jiri Suchomel <jsuchome(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-users-2.13.30/src/Makefile.am new/yast2-users-2.13.33/src/Makefile.am --- old/yast2-users-2.13.30/src/Makefile.am 2006-06-29 11:26:12.000000000 +0200 +++ new/yast2-users-2.13.33/src/Makefile.am 2006-10-25 10:01:40.000000000 +0200 @@ -1,13 +1,15 @@ # # Makefile.am for users/src # -# $Id: Makefile.am 31698 2006-06-29 09:27:24Z jsuchome $ +# $Id: Makefile.am 31699 2006-06-29 09:28:00Z jsuchome $ # YCPCFLAGS = -I . yncludedir = @yncludedir@/users +rncdir = $(schemadir)/autoyast/rnc + module_DATA = \ Users.pm \ UsersCache.pm \ @@ -40,13 +42,16 @@ users.desktop \ groups.desktop +rnc_DATA = \ + users.rnc + YaPI_perldir = @moduledir@/YaPI YaPI_perl_DATA = \ YaPI/USERS.pm -EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(YaPI_perl_DATA) +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(YaPI_perl_DATA) $(rnc_DATA) users: ln -sf . users 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-users-2.13.30/src/Users.pm new/yast2-users-2.13.33/src/Users.pm --- old/yast2-users-2.13.30/src/Users.pm 2006-09-21 16:11:08.000000000 +0200 +++ new/yast2-users-2.13.33/src/Users.pm 2006-09-21 16:11:08.000000000 +0200 @@ -4,7 +4,7 @@ # Package: Configuration of users and groups # Summary: I/O routines + main data structures # -# $Id: Users.pm 33027 2006-09-21 14:12:41Z jsuchome $ +# $Id: Users.pm 33028 2006-09-21 14:12:44Z jsuchome $ # package Users; 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-users-2.13.30/src/UsersLDAP.pm new/yast2-users-2.13.33/src/UsersLDAP.pm --- old/yast2-users-2.13.30/src/UsersLDAP.pm 2006-07-26 09:39:07.000000000 +0200 +++ new/yast2-users-2.13.33/src/UsersLDAP.pm 2006-10-23 15:32:46.000000000 +0200 @@ -1125,6 +1125,10 @@ next; } my $enc = lc ($encryption); + # check for unchanged password before prepending the hash (#213574) + if (defined $org_object && defined $org_object->{$key}) { + next if $val eq $org_object->{$key}; + } if ($enc ne "clear" && !($val =~ m/{$enc}/i)) { $val = sprintf ("{%s}%s", $enc, $val); } 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-users-2.13.30/src/UsersPasswd.pm new/yast2-users-2.13.33/src/UsersPasswd.pm --- old/yast2-users-2.13.30/src/UsersPasswd.pm 2006-09-18 11:32:57.000000000 +0200 +++ new/yast2-users-2.13.33/src/UsersPasswd.pm 2006-10-24 15:37:51.000000000 +0200 @@ -168,6 +168,7 @@ %groups = (); %gids = (); %groupnames = (); + %groups_by_gidnumber= (); @plus_lines_group = (); @comments_group = (); @@ -275,6 +276,7 @@ %uids = (); %usernames = (); %homes = (); + %users_by_uidnumber = (); @plus_lines_passwd = (); @comments_passwd = (); 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-users-2.13.30/src/inst_auth.ycp new/yast2-users-2.13.33/src/inst_auth.ycp --- old/yast2-users-2.13.30/src/inst_auth.ycp 2006-09-25 15:43:01.000000000 +0200 +++ new/yast2-users-2.13.33/src/inst_auth.ycp 2006-09-25 16:03:18.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Arvin Schnell <arvin(a)suse.de> * Michal Svec <msvec(a)suse.cz> * - * $Id: inst_auth.ycp 33027 2006-09-21 14:12:41Z jsuchome $ + * $Id: inst_auth.ycp 33096 2006-09-25 14:03:17Z jsuchome $ */ { 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-users-2.13.30/src/inst_user.ycp new/yast2-users-2.13.33/src/inst_user.ycp --- old/yast2-users-2.13.30/src/inst_user.ycp 2006-09-21 16:11:08.000000000 +0200 +++ new/yast2-users-2.13.33/src/inst_user.ycp 2006-09-21 16:11:08.000000000 +0200 @@ -6,7 +6,7 @@ * * Purpose: Start user management module from within installation workflow * - * $Id: inst_user.ycp 33027 2006-09-21 14:12:41Z jsuchome $ + * $Id: inst_user.ycp 33028 2006-09-21 14:12:44Z jsuchome $ */ { 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-users-2.13.30/src/users.desktop new/yast2-users-2.13.33/src/users.desktop --- old/yast2-users-2.13.30/src/users.desktop 2006-06-23 14:37:39.000000000 +0200 +++ new/yast2-users-2.13.33/src/users.desktop 2006-10-25 10:02:18.000000000 +0200 @@ -18,6 +18,7 @@ X-SuSE-YaST-AutoInstMerge=users,groups,user_defaults X-SuSE-YaST-AutoInstMergeTypes=list,list,map X-SuSE-YaST-AutoInstRequires=security +X-SuSE-YaST-AutoInstSchema=users.rnc Icon=yast-users Exec=/sbin/yast2 users 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-users-2.13.30/src/users.rnc new/yast2-users-2.13.33/src/users.rnc --- old/yast2-users-2.13.30/src/users.rnc 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-users-2.13.33/src/users.rnc 2006-10-25 10:06:14.000000000 +0200 @@ -0,0 +1,64 @@ +# <!ELEMENT group (gid, group_password, groupname, userlist)> + +default namespace = "http://www.suse.com/1.0/yast2ns" +namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" +namespace config = "http://www.suse.com/1.0/configns" + +gr_groups = + element groups { + LIST, + gr_group* + } +gr_group = element group { + element group_password { text }? & + element groupname { text }? & + element userlist { text }? +} + +user_defaults = + element user_defaults { + expire?, ud_group?, ud_groups?, home?, inactive?, shell?, skel? + } +expire = element expire { text } +ud_group = element group { text } +ud_groups = element groups { text } +inactive = element inactive { text } +shell = element shell { text } +skel = element skel { text } +user = element user { + encrypted? & + fullname? & + u_gid? & + home? & + shell? & + uid? & + user_password? & + username? & + u_group? & + u_groups? & + password_settings? +} +encrypted = element encrypted { BOOLEAN } +fullname = element fullname { text } +u_gid = element gid { text } +home = element home { text } +user_password = element user_password { text } +username = element username { text } +uid = element uid { text } +u_group = element group { text } +u_groups = element groups { text } + +password_settings = element password_settings { + element expire { text }? & + element flag { text }? & + element inact { text }? & + element max { text }? & + element min { text }? & + element warn { text }? +} + +users = + element users { + LIST, + user* + } 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-users-2.13.30/testsuite/tests/ReadShells.ycp new/yast2-users-2.13.33/testsuite/tests/ReadShells.ycp --- old/yast2-users-2.13.30/testsuite/tests/ReadShells.ycp 2006-09-07 11:39:23.000000000 +0200 +++ new/yast2-users-2.13.33/testsuite/tests/ReadShells.ycp 2006-08-01 11:03:24.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Petr Blahos <pblahos(a)suse.cz> * - * $Id: ReadShells.ycp 32065 2006-08-01 09:04:17Z jsuchome $ + * $Id: ReadShells.ycp 32068 2006-08-01 09:04:56Z jsuchome $ * */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-update
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package yast2-update checked in at Thu Oct 26 20:37:40 CEST 2006. -------- --- yast2-update/yast2-update.changes 2006-10-13 13:34:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2006-10-26 13:35:59.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Oct 26 13:33:27 CEST 2006 - locilka(a)suse.cz + +- Adding "major" and "minor" keys into the update map including + information From and To which system it is going to update. + (#153576) +- 2.14.2 + +------------------------------------------------------------------- Old: ---- yast2-update-2.14.1.tar.bz2 New: ---- yast2-update-2.14.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.5CpRUf/_old 2006-10-26 20:37:17.000000000 +0200 +++ /var/tmp/diff_new_pack.5CpRUf/_new 2006-10-26 20:37:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-update (Version 2.14.1) +# spec file for package yast2-update (Version 2.14.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-update -Version: 2.14.1 +Version: 2.14.2 Release: 1 -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.14.1.tar.bz2 +Source0: yast2-update-2.14.2.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-mouse yast2-packager yast2-testsuite yast2-xml Requires: yast2 yast2-installation yast2-storage yast2-packager @@ -40,7 +40,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-update-2.14.1 +%setup -n yast2-update-2.14.2 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,11 @@ %doc %{prefix}/share/doc/packages/yast2-update %changelog -n yast2-update +* Thu Oct 26 2006 - locilka(a)suse.cz +- Adding "major" and "minor" keys into the update map including + information From and To which system it is going to update. + (#153576) +- 2.14.2 * Fri Oct 13 2006 - locilka(a)suse.cz - Fixed handling of errors in log during update. - Skipping modprobe for sysfs and proc (both #211916) ++++++ yast2-update-2.14.1.tar.bz2 -> yast2-update-2.14.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.1/VERSION new/yast2-update-2.14.2/VERSION --- old/yast2-update-2.14.1/VERSION 2006-10-13 13:34:59.000000000 +0200 +++ new/yast2-update-2.14.2/VERSION 2006-10-26 13:36:04.000000000 +0200 @@ -1 +1 @@ -2.14.1 +2.14.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.1/src/modules/Update.ycp new/yast2-update-2.14.2/src/modules/Update.ycp --- old/yast2-update-2.14.1/src/modules/Update.ycp 2006-10-13 13:39:55.000000000 +0200 +++ new/yast2-update-2.14.2/src/modules/Update.ycp 2006-10-26 13:37:23.000000000 +0200 @@ -6,7 +6,7 @@ * * Purpose: Update module * - * $Id: Update.ycp 33392 2006-10-13 11:39:53Z locilka $ + * $Id: Update.ycp 33682 2006-10-26 11:37:22Z locilka $ */ { module "Update"; @@ -231,6 +231,9 @@ // Remove 'Beta...' from product release if (regexpmatch (old_name, "Beta")) { old_name = regexpsub (old_name, "^(.*)[ \t]+Beta.*$", "\\1"); + // Remove 'Alpha...' from product release + } else if (regexpmatch (old_name, "Alpha")) { + old_name = regexpsub (old_name, "^(.*)[ \t]+Alpha.*$", "\\1"); } integer p = findlastof (old_name, " "); @@ -273,6 +276,40 @@ updateVersion["version"] = new_product["productversion"]:"?"; fill_version_map (updateVersion); + // "minor" and "major" version keys + // bug #153576, "version" == "9" or "10.1" or ... + string inst_ver = installedVersion["version"]:""; + if (inst_ver != "" && inst_ver != nil) { + // SLE, SLD, OES... + if (regexpmatch (inst_ver, "^[0123456789]+$")) { + installedVersion["major"] = tointeger (inst_ver); + // openSUSE + } else if (regexpmatch (inst_ver, "^[0123456789]+\.[012456789]$")) { + installedVersion["major"] = tointeger (regexpsub (inst_ver, "^([0123456789]+)\.[012456789]$", "\\1")); + installedVersion["minor"] = tointeger (regexpsub (inst_ver, "^[0123456789]+\.([012456789])$", "\\1")); + } else { + y2error("Cannot find out major/minor from %1", inst_ver); + } + } else { + y2error("Cannot find out version: %1", installedVersion); + } + + string new_ver = updateVersion["version"]:""; + if (new_ver != "" && new_ver != nil) { + // SLE, SLD, OES... + if (regexpmatch (new_ver, "^[0123456789]+$")) { + updateVersion["major"] = tointeger (new_ver); + // openSUSE + } else if (regexpmatch (new_ver, "^[0123456789]+\.[012456789]$")) { + updateVersion["major"] = tointeger (regexpsub (new_ver, "^([0123456789]+)\.[012456789]$", "\\1")); + updateVersion["minor"] = tointeger (regexpsub (new_ver, "^[0123456789]+\.([012456789])$", "\\1")); + } else { + y2error("Cannot find out major/minor from %1", new_ver); + } + } else { + y2error("Cannot find out version: %1", updateVersion); + } + y2milestone ("update from %1 to %2", installedVersion, updateVersion); return true; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package yast2-qt checked in at Thu Oct 26 20:37:22 CEST 2006. -------- --- yast2-qt/yast2-qt.changes 2006-10-13 13:13:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2006-10-26 18:55:45.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Oct 26 17:26:25 CEST 2006 - sh(a)suse.de + +- Fixed bug #183735 - YOU should display only relevant patches by + default +- V 2.13.69 + +------------------------------------------------------------------- +Wed Oct 25 17:35:07 CEST 2006 - sh(a)suse.de + +- Implemented feature #300756: Added support for resolver test + case generation (PackageSelector -> "Extras" menu) +- V 2.13.68 + +------------------------------------------------------------------- +Tue Oct 24 18:29:08 CEST 2006 - sh(a)suse.de + +- Implemented feature #120142: View installed products +- Implemented feature #301229: Fold hidden patterns into parents +- V 2.13.67 + +------------------------------------------------------------------- Old: ---- yast2-qt-2.13.66.tar.bz2 New: ---- yast2-qt-2.13.69.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt.spec ++++++ --- /var/tmp/diff_new_pack.3b817O/_old 2006-10-26 20:36:49.000000000 +0200 +++ /var/tmp/diff_new_pack.3b817O/_new 2006-10-26 20:36:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-qt (Version 2.13.66) +# spec file for package yast2-qt (Version 2.13.69) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-qt -Version: 2.13.66 -Release: 2 -License: GPL +Version: 2.13.69 +Release: 1 +License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-2.13.66.tar.bz2 +Source0: yast2-qt-2.13.69.tar.bz2 prefix: /usr BuildRequires: boost-devel curl-devel dbus-1-devel docbook-xsl-stylesheets doxygen hal-devel libdrm-devel libjpeg-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer qt3-devel rpm-devel sgml-skel update-desktop-files yast2-core-devel yast2-devtools Summary: YaST2 - Graphical User Interface @@ -42,7 +42,7 @@ Stefan Hundhammer <sh(a)suse.de> %prep -%setup -n yast2-qt-2.13.66 +%setup -n yast2-qt-2.13.69 %build %{prefix}/bin/y2tool y2autoconf @@ -85,6 +85,18 @@ %doc %{prefix}/share/doc/packages/yast2-qt %changelog -n yast2-qt +* Thu Oct 26 2006 - sh(a)suse.de +- Fixed bug #183735 - YOU should display only relevant patches by + default +- V 2.13.69 +* Wed Oct 25 2006 - sh(a)suse.de +- Implemented feature #300756: Added support for resolver test + case generation (PackageSelector -> "Extras" menu) +- V 2.13.68 +* Tue Oct 24 2006 - sh(a)suse.de +- Implemented feature #120142: View installed products +- Implemented feature #301229: Fold hidden patterns into parents +- V 2.13.67 * Thu Oct 12 2006 - sh(a)suse.de - Implemented feature #301222: Easy access to updating all packages - V 2.13.66 @@ -366,9 +378,9 @@ * Thu Nov 17 2005 - sh(a)suse.de - V 2.13.2 - Added secondary filter views to installation sources filter view: -- All Packages -- RPM groups -- Search + - All Packages + - RPM groups + - Search * Wed Nov 16 2005 - sh(a)suse.de - V 2.13.2 - New filter view in package selector: installation sources @@ -414,10 +426,10 @@ - V 2.12.4 * Wed Jun 29 2005 - sh(a)suse.de - Support for `opt(`boldFont) for some widgets: -- Label -- ColoredLabel -- CheckBox -- RadioButton + - Label + - ColoredLabel + - CheckBox + - RadioButton * Tue Jun 07 2005 - sh(a)suse.de - Reverted wizard button order (postponed until changes can be done consistently) @@ -836,10 +848,10 @@ - Support enabling/disabling for container widgets as well - Show "auto changes" popup in package manager - YOU mode package manager changes: -- Show total download size -- Dropped "Packages" menu (pkgs are read-only there) -- Added "YOU Patches" menu instead -- Addes "Show raw patch info" dialog + - Show total download size + - Dropped "Packages" menu (pkgs are read-only there) + - Added "YOU Patches" menu instead + - Addes "Show raw patch info" dialog * Tue Jan 21 2003 - sh(a)suse.de - V 2.7.5 - Use textdomain "qt-packages" for all texts to avoid textdomain @@ -848,26 +860,26 @@ - Fixed busy cursors * Mon Jan 20 2003 - sh(a)suse.de - Package manager enhancements: -- Enhanced feedback while checking dependencies -- Changed default to "off" for auto dependency check -- Save/load ignored dependency conflicts to/from + - Enhanced feedback while checking dependencies + - Changed default to "off" for auto dependency check + - Save/load ignored dependency conflicts to/from /var/adm/YaST/ignored-conflicts - Bumped version to 2.7.4 * Tue Jan 14 2003 - sh(a)suse.de - Package manager enhancements: -- Added menu bar -- Added bubble help for all kinds of lists -- Rearranged pkg list columns (moved summary left) -- Re-enabled source RPM handling -- Added currently installed version to "versions" view + - Added menu bar + - Added bubble help for all kinds of lists + - Rearranged pkg list columns (moved summary left) + - Re-enabled source RPM handling + - Added currently installed version to "versions" view (non-editable) -- Status change actions for "all in current list" -- Show disk space for all available partitions -- Added "installation summary" filter view -- Dependency checking now for selections, too -- Added symbols help -- Added special keys help -- Auto check is now "off" by default + - Status change actions for "all in current list" + - Show disk space for all available partitions + - Added "installation summary" filter view + - Dependency checking now for selections, too + - Added symbols help + - Added special keys help + - Auto check is now "off" by default - Bumped version to 2.7.3 * Tue Dec 03 2002 - arvin(a)suse.de - added curl-devel and openssl-devel to neededforbuild @@ -1127,8 +1139,8 @@ * Thu Apr 19 2001 - sh(a)suse.de - V 2.3.9 Fixed bugs in RadioBox behaviour: -- second click on the same button will no longer deactivate it -- accept only one active RadioButton on RadioBox creation + - second click on the same button will no longer deactivate it + - accept only one active RadioButton on RadioBox creation (all but the last will be deactivated) * Thu Apr 12 2001 - sh(a)suse.de - V 2.3.8 @@ -1179,7 +1191,7 @@ * Thu Jan 11 2001 - sh(a)suse.de - V2.2.7 - Hide YQTextEntry label if empty label specified --> no empty space above TextEntry widgets without label + -> no empty space above TextEntry widgets without label * Tue Dec 19 2000 - ma(a)suse.de - V2.2.6 - pass YCPstrings to ui specific widgets @@ -1189,7 +1201,7 @@ * Fri Dec 08 2000 - sh(a)suse.de - More reliable nicesize() and setSize() behaviour for SelectionBox and TextEntry --> no more cut-off pixel lines at the bottom + -> no more cut-off pixel lines at the bottom - V2.2.4 * Tue Dec 05 2000 - sh(a)suse.de - New widget: MultiLineEdit ++++++ yast2-qt-2.13.66.tar.bz2 -> yast2-qt-2.13.69.tar.bz2 ++++++ ++++ 2334 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-qt-2.13.66/VERSION new/yast2-qt-2.13.69/VERSION --- old/yast2-qt-2.13.66/VERSION 2006-10-12 17:31:48.000000000 +0200 +++ new/yast2-qt-2.13.69/VERSION 2006-10-26 17:26:16.000000000 +0200 @@ -1 +1 @@ -2.13.66 +2.13.69 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-qt-2.13.66/configure.in new/yast2-qt-2.13.69/configure.in --- old/yast2-qt-2.13.66/configure.in 2006-10-13 13:10:24.000000000 +0200 +++ new/yast2-qt-2.13.69/configure.in 2006-10-26 18:54:28.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.27 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-qt, 2.13.66, http://bugs.opensuse.org/, yast2-qt) +AC_INIT(yast2-qt, 2.13.69, http://bugs.opensuse.org/, yast2-qt) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.66" +VERSION="2.13.69" RPMNAME="yast2-qt" MAINTAINER="Stefan Hundhammer <sh(a)suse.de>" @@ -192,6 +192,7 @@ esac AC_MSG_RESULT([$Xfontsdir]) AC_SUBST(Xfontsdir) +PKG_CHECK_MODULES([ZYPP], [libzypp]) AC_CONFIG_FILES(Makefile src/include/icons/Makefile src/include/Makefile 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-qt-2.13.66/configure.in.in new/yast2-qt-2.13.69/configure.in.in --- old/yast2-qt-2.13.66/configure.in.in 2006-08-18 15:53:52.000000000 +0200 +++ new/yast2-qt-2.13.69/configure.in.in 2006-10-24 14:45:25.000000000 +0200 @@ -21,6 +21,7 @@ esac AC_MSG_RESULT([$Xfontsdir]) AC_SUBST(Xfontsdir) +PKG_CHECK_MODULES([ZYPP], [libzypp]) ## and generate the output @YAST2-OUTPUT@ 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-qt-2.13.66/src/Makefile.am new/yast2-qt-2.13.69/src/Makefile.am --- old/yast2-qt-2.13.66/src/Makefile.am 2006-08-18 15:53:46.000000000 +0200 +++ new/yast2-qt-2.13.69/src/Makefile.am 2006-10-24 17:35:00.000000000 +0200 @@ -96,6 +96,8 @@ YQPkgPatchFilterView.cc \ YQPkgPatchList.cc \ YQPkgPatternList.cc \ + YQPkgProductDialog.cc \ + YQPkgProductList.cc \ YQPkgRpmGroupTagsFilterView.cc \ YQPkgSearchFilterView.cc \ YQPkgSelDescriptionView.cc \ @@ -193,6 +195,9 @@ YQPkgPatchFilterView.moc \ YQPkgPatchList.moc \ YQPkgPatternList.moc \ + YQPkgProductDialog.moc \ + YQPkgProductDialog.moc \ + YQPkgProductList.moc \ YQPkgRpmGroupTagsFilterView.moc \ YQPkgSearchFilterView.moc \ YQPkgSelDescriptionView.moc \ @@ -276,6 +281,8 @@ YQPkgPatchFilterView.o YQPkgPatchFilterView.lo: YQPkgPatchFilterView.moc YQPkgPatchList.o YQPkgPatchList.lo: YQPkgPatchList.moc YQPkgPatternList.o YQPkgPatternList.lo: YQPkgPatternList.moc +YQPkgProductDialog.o YQPkgProductDialog.lo: YQPkgProductDialog.moc +YQPkgProductList.o YQPkgProductList.lo: YQPkgProductList.moc YQPkgRpmGroupTagsFilterView.o YQPkgRpmGroupTagsFilterView.lo: YQPkgRpmGroupTagsFilterView.moc YQPkgSearchFilterView.o YQPkgSearchFilterView.lo: YQPkgSearchFilterView.moc YQPkgSelDescriptionView.o YQPkgSelDescriptionView.lo: YQPkgSelDescriptionView.moc @@ -357,6 +364,8 @@ YQPkgPatchFilterView.moc: include/YQPkgPatchFilterView.h YQPkgPatchList.moc: include/YQPkgPatchList.h YQPkgPatternList.moc: include/YQPkgPatternList.h +YQPkgProductDialog.moc: include/YQPkgProductDialog.h +YQPkgProductList.moc: include/YQPkgProductList.h YQPkgRpmGroupTagsFilterView.moc: include/YQPkgRpmGroupTagsFilterView.h YQPkgSearchFilterView.moc: include/YQPkgSearchFilterView.h YQPkgSelDescriptionView.moc: include/YQPkgSelDescriptionView.h 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-qt-2.13.66/src/YQIconPool.cc new/yast2-qt-2.13.69/src/YQIconPool.cc --- old/yast2-qt-2.13.66/src/YQIconPool.cc 2006-09-22 16:51:14.000000000 +0200 +++ new/yast2-qt-2.13.69/src/YQIconPool.cc 2006-10-26 13:07:20.000000000 +0200 @@ -50,6 +50,7 @@ #include "icons/update_disabled.xpm" #include "icons/tree_plus.xpm" #include "icons/tree_minus.xpm" +#include "icons/warning_sign.xpm" #include "icons/normal_conflict.xpm" #include "icons/select_conflict.xpm" @@ -104,6 +105,8 @@ QPixmap YQIconPool::treePlus() { return iconPool()->cachedIcon( tree_plus_xpm ); } QPixmap YQIconPool::treeMinus() { return iconPool()->cachedIcon( tree_minus_xpm ); } +QPixmap YQIconPool::warningSign() { return iconPool()->cachedIcon( warning_sign_xpm ); } + YQIconPool * YQIconPool::iconPool() { 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-qt-2.13.66/src/YQPackageSelector.cc new/yast2-qt-2.13.69/src/YQPackageSelector.cc --- old/yast2-qt-2.13.66/src/YQPackageSelector.cc 2006-10-12 16:59:12.000000000 +0200 +++ new/yast2-qt-2.13.69/src/YQPackageSelector.cc 2006-10-25 17:05:14.000000000 +0200 @@ -64,6 +64,7 @@ #include "YQPkgPatchFilterView.h" #include "YQPkgPatchList.h" #include "YQPkgPatternList.h" +#include "YQPkgProductDialog.h" #include "YQPkgRpmGroupTagsFilterView.h" #include "YQPkgSearchFilterView.h" #include "YQPkgSelList.h" @@ -700,22 +701,33 @@ CHECK_PTR( _extrasMenu ); _menuBar->insertItem( _( "&Extras" ), _extrasMenu ); + _extrasMenu->insertItem( _( "Show &Products" ), this, SLOT( showProducts() ) ); + _extrasMenu->insertItem( _( "Show &Automatic Package Changes" ), this, SLOT( showAutoPkgList() ), CTRL + Key_A ); + _extrasMenu->insertSeparator(); + + // Translators: This is about packages ending in "-devel", so don't translate that "-devel"! + _extrasMenu->insertItem( _( "Install All Matching -&devel Packages" ), this, SLOT( installDevelPkgs() ) ); + + // Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! + _extrasMenu->insertItem( _( "Install All Matching -de&buginfo Packages" ), this, SLOT( installDebugInfoPkgs() ) ); + + _extrasMenu->insertSeparator(); + + if ( _pkgConflictDialog ) + _extrasMenu->insertItem( _( "Generate Dependency Resolver &Test Case" ), + _pkgConflictDialog, SLOT( askCreateSolverTestCase() ) ); + if ( _actionResetIgnoredDependencyProblems ) _actionResetIgnoredDependencyProblems->addTo( _extrasMenu ); + #ifdef FIXME if ( _patchList ) _patchList->actionShowRawPatchInfo->addTo( _extrasMenu ); #endif - // Translators: This is about packages ending in "-devel", so don't translate that "-devel"! - _extrasMenu->insertItem( _( "Install All Matching -&devel Packages" ), this, SLOT( installDevelPkgs() ) ); - - // Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! - _extrasMenu->insertItem( _( "Install All Matching -de&buginfo Packages" ), this, SLOT( installDebugInfoPkgs() ) ); - // // Help menu @@ -1157,6 +1169,12 @@ void +YQPackageSelector::showProducts() +{ + YQPkgProductDialog::showProductDialog(); +} + +void YQPackageSelector::installDevelPkgs() { installSubPkgs( "-devel" ); 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-qt-2.13.66/src/YQPkgConflictDialog.cc new/yast2-qt-2.13.69/src/YQPkgConflictDialog.cc --- old/yast2-qt-2.13.66/src/YQPkgConflictDialog.cc 2006-08-18 15:53:46.000000000 +0200 +++ new/yast2-qt-2.13.69/src/YQPkgConflictDialog.cc 2006-10-26 13:52:39.000000000 +0200 @@ -32,6 +32,7 @@ #include <qpushbutton.h> #include <qdatetime.h> #include <qpainter.h> +#include <qmessagebox.h> #include "YQPkgConflictDialog.h" #include "YQPkgConflictList.h" @@ -321,6 +322,58 @@ } +void +YQPkgConflictDialog::askCreateSolverTestCase() +{ + QString testCaseDir = "/var/log/YaST2/solverTestcase"; + // Heading for popup dialog + QString heading = QString( "<h2>%1</h2>" ).arg( _( "Create Dependency Resolver Test Case" ) ); + + QString msg = + _( "Use this to generate extensive logs to help tracking down bugs in the dependency resolver." + "The logs will be stored in directory <tt>%1</tt>" ).arg( testCaseDir ); + + int button_no = QMessageBox::information( 0, // parent + _( "Solver Test Case" ), // caption + heading + msg, + _( "C&ontinue" ), // button #0 + _( "&Cancel" ) ); // button #1 + + if ( button_no == 1 ) // Cancel + return; + + y2milestone( "Generating solver test case START" ); + bool success = zypp::getZYpp()->resolver()->createSolverTestcase( testCaseDir.ascii() ); + y2milestone( "Generating solver test case END" ); + + if ( success ) + { + msg = + _( "Dependency resolver test case written to <tt>%1</tt>" + "Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?" ).arg( testCaseDir ), + button_no = QMessageBox::question( 0, // parent + _( "Success" ), // caption + msg, + QMessageBox::Yes | QMessageBox::Default, + QMessageBox::No, + QMessageBox::Cancel | QMessageBox::Escape ); + + if ( button_no & QMessageBox::Yes ) // really binary (not logical) '&' - QMessageBox::Default is still in there + YQUI::ui()->askSaveLogs(); + } + else // no success + { + QMessageBox::warning( 0, // parent + _( "Error" ), // caption + _( "Error creating dependency resolver test case" + "Please check disk space and permissions for <tt>%1</tt>" ).arg( testCaseDir ), + QMessageBox::Ok | QMessageBox::Default, + QMessageBox::NoButton, + QMessageBox::NoButton ); + } +} + + #include "YQPkgConflictDialog.moc" 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-qt-2.13.66/src/YQPkgDescriptionView.cc new/yast2-qt-2.13.69/src/YQPkgDescriptionView.cc --- old/yast2-qt-2.13.66/src/YQPkgDescriptionView.cc 2006-08-18 15:53:46.000000000 +0200 +++ new/yast2-qt-2.13.69/src/YQPkgDescriptionView.cc 2006-10-25 17:03:32.000000000 +0200 @@ -59,8 +59,6 @@ if ( ! description.contains( "" ) ) description = simpleHtmlParagraphs( description ); - else - y2debug( "Description for %s is preformatted in DT:Rich", selectable->theObj()->name().c_str() ); html_text += description; 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-qt-2.13.66/src/YQPkgPatchFilterView.cc new/yast2-qt-2.13.69/src/YQPkgPatchFilterView.cc --- old/yast2-qt-2.13.66/src/YQPkgPatchFilterView.cc 2006-09-22 11:29:34.000000000 +0200 +++ new/yast2-qt-2.13.69/src/YQPkgPatchFilterView.cc 2006-10-26 15:52:14.000000000 +0200 @@ -61,24 +61,20 @@ QHBox * hbox = new QHBox( vbox ); CHECK_PTR( hbox ); hbox->setSpacing( SPACING ); -#ifdef FIXME QLabel * label = new QLabel( _( "&Show Patch Category:" ), hbox ); - _patchCategory = new QComboBox( hbox ); - CHECK_PTR( _patchCategory ); + _patchFilter = new QComboBox( hbox ); + CHECK_PTR( _patchFilter ); - _patchCategory->insertItem( _( "Installable Patches" ), 0 ); - _patchCategory->insertItem( _( "Installable and Installed Patches" ), 1 ); - _patchCategory->insertItem( _( "All Patches" ), 2 ); - _patchCategory->setCurrentItem( 0 ); - _patchCategory->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert - label->setBuddy( _patchCategory ); + _patchFilter->insertItem( _( "Installable Patches" ), 0 ); + _patchFilter->insertItem( _( "Installable and Installed Patches" ), 1 ); + _patchFilter->insertItem( _( "All Patches" ), 2 ); + _patchFilter->setCurrentItem( 0 ); + _patchFilter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert + label->setBuddy( _patchFilter ); - connect( _patchCategory, SIGNAL( activated( int ) ), this, SLOT( fillPatchList() ) ); + connect( _patchFilter, SIGNAL( activated( int ) ), this, SLOT( fillPatchList() ) ); addVSpacing( vbox, 4 ); -#else - _patchCategory = 0; -#endif vbox = new QVBox( _splitter ); CHECK_PTR( vbox ); addVSpacing( vbox, 8 ); @@ -150,10 +146,9 @@ { ZyppPkg pkg = tryCastToZyppPkg( *contents_it ); ZyppSel sel; - + if ( pkg ) sel = _selMapper.findZyppSel( pkg ); - if ( sel ) { @@ -200,7 +195,7 @@ } _totalDownloadSize->setText( totalSize.asString().c_str() ); - + y2debug( "Calculated total download size in %d millisec", calcTime.elapsed() ); } @@ -208,19 +203,14 @@ void YQPkgPatchFilterView::fillPatchList() { -#ifdef FIXME - YQPkgPatchList::PatchCategory category; - - switch ( _patchCategory->currentItem() ) + switch ( _patchFilter->currentItem() ) { - case 0: category = YQPkgPatchList::InstallablePatches; break; - case 1: category = YQPkgPatchList::InstallableAndInstalledPatches; break; - case 2: category = YQPkgPatchList::AllPatches; break; - default: category = YQPkgPatchList::InstallablePatches; break; + case 0: _patchList->setFilterCriteria( YQPkgPatchList::RelevantPatches ); break; + case 1: _patchList->setFilterCriteria( YQPkgPatchList::RelevantAndInstalledPatches ); break; + case 2: _patchList->setFilterCriteria( YQPkgPatchList::AllPatches ); break; + default: _patchList->setFilterCriteria( YQPkgPatchList::RelevantPatches ); break; } - _patchList->setPatchCategory( category ); -#endif _patchList->fillList(); _patchList->selectSomething(); } 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-qt-2.13.66/src/YQPkgPatchList.cc new/yast2-qt-2.13.69/src/YQPkgPatchList.cc --- old/yast2-qt-2.13.66/src/YQPkgPatchList.cc 2006-10-10 12:02:35.000000000 +0200 +++ new/yast2-qt-2.13.69/src/YQPkgPatchList.cc 2006-10-26 18:53:16.000000000 +0200 @@ -34,6 +34,9 @@ #include "YQPkgTextDialog.h" +#define VERBOSE_PATCH_LIST 1 + + typedef zypp::ui::PatchContents ZyppPatchContents; typedef zypp::ui::PatchContents::const_iterator ZyppPatchContentsIterator; @@ -46,6 +49,8 @@ { y2debug( "Creating patch list" ); + _filterCriteria = RelevantPatches; + int numCol = 0; addColumn( "" ); _statusCol = numCol++; addColumn( _( "Patch" ) ); _summaryCol = numCol++; @@ -72,6 +77,13 @@ void +YQPkgPatchList::setFilterCriteria( FilterCriteria filterCriteria ) +{ + _filterCriteria = filterCriteria; +} + + +void YQPkgPatchList::fillList() { clear(); @@ -81,16 +93,81 @@ it != zyppPatchesEnd(); ++it ) { - ZyppPatch zyppPatch = tryCastToZyppPatch( (*it)->theObj() ); + ZyppSel selectable = *it; + ZyppPatch zyppPatch = tryCastToZyppPatch( selectable->theObj() ); if ( zyppPatch ) { -#ifdef FIXME - // filter for unneeded patches and patches that are already installed -#else - // y2debug( "Found patch %s", zyppPatch->name().c_str() ); - addPatchItem( *it, zyppPatch); + bool displayPatch = false; + + switch ( _filterCriteria ) + { + case RelevantPatches: // needed + broken + + if ( selectable->hasInstalledObj() ) // installed? + { + // display only if broken + + if ( selectable->installedPoolItem().status().isIncomplete() ) + { + displayPatch = true; + + y2warning( "Installed patch is broken: %s - %s", + zyppPatch->name().c_str(), + zyppPatch->summary().c_str() ); + } + } + else // not installed - display only if needed + { + if ( selectable->candidatePoolItem().status().isNeeded() ) + { + displayPatch = true; + } + else + { + y2milestone( "Patch not needed: %s - %s", + zyppPatch->name().c_str(), + zyppPatch->summary().c_str() ); + } + } + break; + + case RelevantAndInstalledPatches: // needed + broken + installed + + if ( selectable->hasInstalledObj() ) // installed? + { + displayPatch = true; + } + else // not installed - display only if needed + { + if ( selectable->candidatePoolItem().status().isNeeded() ) + { + displayPatch = true; + } + else + { + y2milestone( "Patch not needed: %s - %s", + zyppPatch->name().c_str(), + zyppPatch->summary().c_str() ); + } + } + break; + + case AllPatches: + displayPatch = true; + break; + + // Intentionally omitting "default" so the compiler + // can catch unhandled enum values + } + + if ( displayPatch ) + { +#if VERBOSE_PATCH_LIST + y2debug( "Displaying patch %s - %s", zyppPatch->name().c_str(), zyppPatch->summary().c_str() ); #endif + addPatchItem( *it, zyppPatch); + } } else { @@ -250,7 +327,7 @@ #if ENABLE_DELETING_PATCHES actionSetCurrentDelete->addTo( _installedContextMenu ); #endif - + actionSetCurrentUpdate->addTo( _installedContextMenu ); actionSetCurrentProtected->addTo( _installedContextMenu ); @@ -267,11 +344,11 @@ actionSetListInstall->addTo( submenu ); actionSetListDontInstall->addTo( submenu ); actionSetListKeepInstalled->addTo( submenu ); - + #if ENABLE_DELETING_PATCHES actionSetListDelete->addTo( submenu ); #endif - + actionSetListUpdate->addTo( submenu ); actionSetListUpdateForce->addTo( submenu ); actionSetListTaboo->addTo( submenu ); 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-qt-2.13.66/src/YQPkgPatternList.cc new/yast2-qt-2.13.69/src/YQPkgPatternList.cc --- old/yast2-qt-2.13.66/src/YQPkgPatternList.cc 2006-09-22 17:16:52.000000000 +0200 +++ new/yast2-qt-2.13.69/src/YQPkgPatternList.cc 2006-10-26 18:53:16.000000000 +0200 @@ -26,6 +26,7 @@ #include <zypp/Resolver.h> #include <qpainter.h> #include <qheader.h> +#include <zypp/ui/PatternContents.h> #include "YQi18n.h" #include "utf8.h" @@ -56,7 +57,7 @@ header()->setStretchEnabled( _statusCol , false ); header()->setStretchEnabled( _summaryCol, true ); - + setAllColumnsShowFocus( true ); setTreeStepSize( 0 ); @@ -155,7 +156,8 @@ if ( zyppPattern ) { - set<string> wanted = zyppPattern->install_packages(); + zypp::ui::PatternContents patternContents( zyppPattern ); + set<string> wanted = patternContents.install_packages(); for ( ZyppPoolIterator it = zyppPkgBegin(); it != zyppPkgEnd(); @@ -253,7 +255,7 @@ setSelected( item, true ); // emits signal, too return; } - + ++it; } } @@ -403,7 +405,7 @@ isOpen() ? YQIconPool::treeMinus() : YQIconPool::treePlus() ); - + } 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-qt-2.13.66/src/YQPkgProductDialog.cc new/yast2-qt-2.13.69/src/YQPkgProductDialog.cc --- old/yast2-qt-2.13.66/src/YQPkgProductDialog.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-qt-2.13.69/src/YQPkgProductDialog.cc 2006-10-24 18:24:48.000000000 +0200 @@ -0,0 +1,155 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YQPkgProductDialog.cc + + Author: Stefan Hundhammer <sh(a)suse.de> + + Textdomain "packages-qt" + +/-*/ + + +#define y2log_component "qt-pkg" +#include <ycp/y2log.h> + +#include <qapplication.h> +#include <qhbox.h> +#include <qlabel.h> +#include <qlayout.h> +#include <qpushbutton.h> +#include <qsplitter.h> +#include <qstyle.h> +#include <qtabwidget.h> +#include <qvaluelist.h> + +#include "YQPkgProductDialog.h" +#include "YQPkgProductList.h" +#include "YQPkgDependenciesView.h" +#include "QY2LayoutUtils.h" +#include "YQi18n.h" +#include "YQUI.h" + + +#define SPACING 2 // between subwidgets +#define MARGIN 4 // around the widget + + +YQPkgProductDialog::YQPkgProductDialog( QWidget * parent ) + : QDialog( parent ) +{ + // Dialog title + setCaption( _( "Products" ) ); + + // Enable dialog resizing even without window manager + setSizeGripEnabled( true ); + + // Layout for the dialog (can't simply insert a QVBox) + + QVBoxLayout * layout = new QVBoxLayout( this, MARGIN, SPACING ); + CHECK_PTR( layout ); + + + // VBox for splitter + + QSplitter * splitter = new QSplitter( QSplitter::Vertical, this ); + CHECK_PTR( splitter ); + layout->addWidget( splitter ); + splitter->setMargin( MARGIN ); + + + // Product list + + _productList = new YQPkgProductList( splitter ); + CHECK_PTR( _productList ); + _productList->resize( _productList->width(), 80 ); + + // Prevent status changes for now - this would require solver runs etc. + _productList->setEditable( false ); + + + // Tab widget for details views (looks better even just with one) + + _detailsViews = new QTabWidget( splitter ); + CHECK_PTR( _detailsViews ); + _detailsViews->setMargin( MARGIN ); + _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert + + // Dependencies view + + _dependenciesView = new YQPkgDependenciesView( _detailsViews ); + CHECK_PTR( _dependenciesView ); + _detailsViews->addTab( _dependenciesView, _( "Dependencies" ) ); + _dependenciesView->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert + + connect( _productList, SIGNAL( selectionChanged ( ZyppSel ) ), + _dependenciesView, SLOT ( showDetailsIfVisible( ZyppSel ) ) ); + + + // Button box (to center the single button) + + QHBox * hbox = new QHBox( this ); + CHECK_PTR( hbox ); + hbox->setSpacing( SPACING ); + hbox->setMargin ( MARGIN ); + layout->addWidget( hbox ); + + addHStretch( hbox ); + + + // "OK" button + + QPushButton * button = new QPushButton( _( "&OK" ), hbox ); + CHECK_PTR( button ); + button->setDefault( true ); + + connect( button, SIGNAL( clicked() ), + this, SLOT ( accept() ) ); + + addHStretch( hbox ); +} + + +void +YQPkgProductDialog::polish() +{ + // Delayed initialization after widget is fully created etc. + + // Only now send selectionChanged() signal so the details views display something + // (showDetailsIfVisible() shows only something if the widget is visible, + // as the method name implies) + _productList->selectSomething(); +} + + +QSize +YQPkgProductDialog::sizeHint() const +{ + QRect available = qApp->desktop()->availableGeometry( (QWidget *) this ); + QSize size = QDialog::sizeHint(); + size = size.boundedTo( QSize( available.width(), available.height() ) ); + + return size; +} + + +void +YQPkgProductDialog::showProductDialog() +{ + YQPkgProductDialog dialog( 0 ); + dialog.exec(); +} + + + + +#include "YQPkgProductDialog.moc" 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-qt-2.13.66/src/YQPkgProductList.cc new/yast2-qt-2.13.69/src/YQPkgProductList.cc --- old/yast2-qt-2.13.66/src/YQPkgProductList.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-qt-2.13.69/src/YQPkgProductList.cc 2006-10-23 15:47:31.000000000 +0200 @@ -0,0 +1,144 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YQPkgProductList.cc + + Author: Stefan Hundhammer <sh(a)suse.de> + + Textdomain "packages-qt" + +/-*/ + + +#define y2log_component "qt-pkg" +#include <ycp/y2log.h> + +#include "YQi18n.h" +#include "utf8.h" + +#include "YQPkgProductList.h" + +using std::list; +using std::set; + + +YQPkgProductList::YQPkgProductList( QWidget * parent ) + : YQPkgObjList( parent ) + , _vendorCol( -42 ) +{ + y2debug( "Creating product list" ); + + int numCol = 0; + addColumn( "" ); _statusCol = numCol++; + addColumn( _( "Product" ) ); _nameCol = numCol++; + addColumn( _( "Summary" ) ); _summaryCol = numCol++; + addColumn( _( "Version" ) ); _versionCol = numCol++; + addColumn( _( "Vendor" ) ); _vendorCol = numCol++; + setAllColumnsShowFocus( true ); + setColumnAlignment( sizeCol(), Qt::AlignRight ); + + setSorting( nameCol() ); + fillList(); + selectSomething(); + + y2debug( "Creating product list done" ); +} + + +YQPkgProductList::~YQPkgProductList() +{ + // NOP +} + + +void +YQPkgProductList::fillList() +{ + clear(); + y2debug( "Filling product list" ); + + for ( ZyppPoolIterator it = zyppProductsBegin(); + it != zyppProductsEnd(); + ++it ) + { + ZyppProduct zyppProduct = tryCastToZyppProduct( (*it)->theObj() ); + + if ( zyppProduct ) + { + addProductItem( *it, zyppProduct ); + } + else + { + y2error( "Found non-product selectable" ); + } + } + + y2debug( "product list filled" ); +} + + +void +YQPkgProductList::addProductItem( ZyppSel selectable, + ZyppProduct zyppProduct ) +{ + if ( ! selectable ) + { + y2error( "NULL ZyppSel!" ); + return; + } + + new YQPkgProductListItem( this, selectable, zyppProduct ); +} + + + + + + +YQPkgProductListItem::YQPkgProductListItem( YQPkgProductList * productList, + ZyppSel selectable, + ZyppProduct zyppProduct ) + : YQPkgObjListItem( productList, selectable, zyppProduct ) + , _productList( productList ) + , _zyppProduct( zyppProduct ) +{ + if ( ! _zyppProduct ) + _zyppProduct = tryCastToZyppProduct( selectable->theObj() ); + + if ( ! _zyppProduct ) + return; + + setStatusIcon(); + + if ( vendorCol() > -1 ) + setText( vendorCol(), zyppProduct->vendor() ); + +} + + +YQPkgProductListItem::~YQPkgProductListItem() +{ + // NOP +} + + + + +void +YQPkgProductListItem::applyChanges() +{ + solveResolvableCollections(); +} + + + +#include "YQPkgProductList.moc" 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-qt-2.13.66/src/include/YQIconPool.h new/yast2-qt-2.13.69/src/include/YQIconPool.h --- old/yast2-qt-2.13.66/src/include/YQIconPool.h 2006-09-22 16:52:05.000000000 +0200 +++ new/yast2-qt-2.13.69/src/include/YQIconPool.h 2006-10-26 13:07:36.000000000 +0200 @@ -69,6 +69,8 @@ static QPixmap treePlus(); static QPixmap treeMinus(); + + static QPixmap warningSign(); protected: 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-qt-2.13.66/src/include/YQPackageSelector.h new/yast2-qt-2.13.69/src/include/YQPackageSelector.h --- old/yast2-qt-2.13.66/src/include/YQPackageSelector.h 2006-10-12 17:29:46.000000000 +0200 +++ new/yast2-qt-2.13.69/src/include/YQPackageSelector.h 2006-10-23 15:06:59.000000000 +0200 @@ -185,6 +185,11 @@ */ void globalUpdatePkgForce() { globalUpdatePkg( true ); } + /** + * Show all products in a popup dialog. + **/ + void showProducts(); + protected: 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-qt-2.13.66/src/include/YQPkgConflictDialog.h new/yast2-qt-2.13.69/src/include/YQPkgConflictDialog.h --- old/yast2-qt-2.13.66/src/include/YQPkgConflictDialog.h 2006-08-18 15:53:44.000000000 +0200 +++ new/yast2-qt-2.13.69/src/include/YQPkgConflictDialog.h 2006-10-25 16:56:08.000000000 +0200 @@ -60,7 +60,7 @@ /** * Returns the average time in seconds used for solving or 0 if solving - * hasn't taken place yet. + * hasn't taken place yet. **/ double averageSolveTime() const; @@ -68,10 +68,10 @@ * Returns the total amount of time in seconds used for solving. **/ double totalSolveTime() const { return _totalSolveTime; } - + /** * Returns the times solving has taken place (with this dialog). - **/ + **/ int solveCount() const { return _solveCount; } /** @@ -79,7 +79,7 @@ **/ static void resetIgnoredDependencyProblems(); - + public slots: /** @@ -91,6 +91,19 @@ **/ int solveAndShowConflicts(); + /** + * Mini-wizard to generate solver test case: + * + * - Inform user what this is all about + * - Tell user where the files will go + * - Generate test case + * - Ask user if he would like to pack it all into y2logs.tgz + * - Prompt user for path for y2logs.tgz + * - Save y2logs.tgz + **/ + void askCreateSolverTestCase(); + + signals: /** @@ -104,7 +117,7 @@ YQPkgConflictList * _conflictList; QPopupMenu * _expertMenu; QLabel * _busyPopup; - + double _totalSolveTime; int _solveCount; }; 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-qt-2.13.66/src/include/YQPkgInstSrcList.h new/yast2-qt-2.13.69/src/include/YQPkgInstSrcList.h --- old/yast2-qt-2.13.66/src/include/YQPkgInstSrcList.h 2006-08-18 15:53:44.000000000 +0200 +++ new/yast2-qt-2.13.69/src/include/YQPkgInstSrcList.h 2006-10-23 14:50:47.000000000 +0200 @@ -31,7 +31,6 @@ class YQPkgInstSrcListItem; typedef zypp::Source_Ref ZyppSrc; -typedef zypp::Product::Ptr ZyppProduct; /** 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-qt-2.13.66/src/include/YQPkgPatchFilterView.h new/yast2-qt-2.13.69/src/include/YQPkgPatchFilterView.h --- old/yast2-qt-2.13.66/src/include/YQPkgPatchFilterView.h 2006-08-18 15:53:44.000000000 +0200 +++ new/yast2-qt-2.13.69/src/include/YQPkgPatchFilterView.h 2006-10-26 15:40:25.000000000 +0200 @@ -86,7 +86,7 @@ QSplitter * _splitter; YQPkgPatchList * _patchList; - QComboBox * _patchCategory; + QComboBox * _patchFilter; QTabWidget * _detailsViews; YQPkgDescriptionView * _descriptionView; QLabel * _totalDownloadSize; 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-qt-2.13.66/src/include/YQPkgPatchList.h new/yast2-qt-2.13.69/src/include/YQPkgPatchList.h --- old/yast2-qt-2.13.66/src/include/YQPkgPatchList.h 2006-10-04 17:16:30.000000000 +0200 +++ new/yast2-qt-2.13.69/src/include/YQPkgPatchList.h 2006-10-26 17:56:28.000000000 +0200 @@ -45,6 +45,7 @@ }; + /** * @short Display a list of zypp::Patch objects. **/ @@ -64,6 +65,14 @@ **/ virtual ~YQPkgPatchList(); + + enum FilterCriteria + { + RelevantPatches, // needed + broken + RelevantAndInstalledPatches, // needed + broken + installed + AllPatches // all + }; + public slots: @@ -82,15 +91,15 @@ void filterIfVisible(); /** - * Add a selection to the list. Connect a filter's filterMatch() signal to + * Add a patch to the list. Connect a filter's filterMatch() signal to * this slot. Remember to connect filterStart() to clear() (inherited from * QListView). **/ - void addPatchItem( ZyppSel selectable, - ZyppPatch zyppPatch ); + void addPatchItem( ZyppSel selectable, + ZyppPatch zyppPatch ); /** - * Fill the selection list. + * Fill the patch list according to filterCriteria(). **/ void fillList(); @@ -104,6 +113,16 @@ public: /** + * Set the filter criteria for fillList(). + **/ + void setFilterCriteria( FilterCriteria filterCriteria ); + + /** + * Returns the current filter criteria. + **/ + FilterCriteria filterCriteria() const { return _filterCriteria; } + + /** * Returns the currently selected item or 0 if there is none. **/ YQPkgPatchListItem * selection() const; @@ -179,6 +198,7 @@ int _categoryCol; YQPkgSelMapper _selMapper; + FilterCriteria _filterCriteria; }; 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-qt-2.13.66/src/include/YQPkgProductDialog.h new/yast2-qt-2.13.69/src/include/YQPkgProductDialog.h --- old/yast2-qt-2.13.66/src/include/YQPkgProductDialog.h 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-qt-2.13.69/src/include/YQPkgProductDialog.h 2006-10-24 18:25:05.000000000 +0200 @@ -0,0 +1,78 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YQPkgProductDialog.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +// -*- c++ -*- + + +#ifndef YQPkgProductDialog_h +#define YQPkgProductDialog_h + +#include <qdialog.h> + + +class QTabWidget; +class YQPkgProductList; +class YQPkgDependenciesView; + + +/** + * Products list with dependencies details view + **/ +class YQPkgProductDialog : public QDialog +{ + Q_OBJECT + +public: + + /** + * Static convenience method: Post a dialog with all products + **/ + static void showProductDialog(); + + /** + * Returns the preferred size. + * + * Reimplemented from QWidget to limit the dialog to the screen dimensions. + **/ + virtual QSize sizeHint () const; + + /** + * Delayed initialization after the dialog is fully created + * + * Reimplemented from QWidget + **/ + virtual void polish(); + + +protected: + + /** + * Constructor: Creates a description dialog for all packages that match 'pkgName'. + **/ + YQPkgProductDialog( QWidget * parent ); + + + // Data members + + YQPkgProductList * _productList; + QTabWidget * _detailsViews; + YQPkgDependenciesView * _dependenciesView; +}; + + +#endif // ifndef YQPkgProductDialog_h 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-qt-2.13.66/src/include/YQPkgProductList.h new/yast2-qt-2.13.69/src/include/YQPkgProductList.h --- old/yast2-qt-2.13.66/src/include/YQPkgProductList.h 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-qt-2.13.69/src/include/YQPkgProductList.h 2006-10-23 15:47:11.000000000 +0200 @@ -0,0 +1,141 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YQPkgProductList.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +// -*- c++ -*- + + +#ifndef YQPkgProductList_h +#define YQPkgProductList_h + +#include <string> +#include "YQPkgObjList.h" + +using std::string; + +class YQPkgProductListItem; + + +/** + * @short Display a list of zypp::Product objects. + **/ +class YQPkgProductList : public YQPkgObjList +{ + Q_OBJECT + +public: + + /** + * Constructor + **/ + YQPkgProductList( QWidget * parent ); + + /** + * Destructor + **/ + virtual ~YQPkgProductList(); + + +public slots: + + /** + * Add a product to the list. Connect a filter's filterMatch() signal to + * this slot. Remember to connect filterStart() to clear() (inherited from + * QListView). + **/ + void addProductItem( ZyppSel selectable, + ZyppProduct zyppProduct ); + + /** + * Fill the product list. + **/ + void fillList(); + + +public: + + /** + * Returns the currently selected item or 0 if there is none. + **/ + YQPkgProductListItem * selection() const; + + /** + * Returns the column for the product's vendor. + **/ + int vendorCol() const { return _vendorCol; } + + +protected: + + + // Data members + + int _vendorCol; +}; + + + +class YQPkgProductListItem: public YQPkgObjListItem +{ +public: + + /** + * Constructor. Creates a YQPkgProductList item that corresponds to + * zyppProduct. + **/ + YQPkgProductListItem( YQPkgProductList * productList, + ZyppSel selectable, + ZyppProduct zyppProduct ); + + /** + * Destructor + **/ + virtual ~YQPkgProductListItem(); + + /** + * Returns the original zyppProduct object. + **/ + ZyppProduct zyppProduct() const { return _zyppProduct; } + + + // Columns + + int statusCol() const { return _productList->statusCol(); } + int summaryCol() const { return _productList->summaryCol(); } + int versionCol() const { return _productList->versionCol(); } + int vendorCol() const { return _productList->vendorCol(); } + + +protected: + + /** + * Propagate status changes in this list to other lists: + * Have the solver transact all products, patterns, etc. + * + * Reimplemented from YQPkgObjListItem. + **/ + virtual void applyChanges(); + + + // Data members + + YQPkgProductList * _productList; + ZyppProduct _zyppProduct; +}; + + +#endif // ifndef YQPkgProductList_h 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-qt-2.13.66/src/include/YQZypp.h new/yast2-qt-2.13.69/src/include/YQZypp.h --- old/yast2-qt-2.13.66/src/include/YQZypp.h 2006-08-18 15:53:44.000000000 +0200 +++ new/yast2-qt-2.13.69/src/include/YQZypp.h 2006-10-26 16:27:24.000000000 +0200 @@ -30,6 +30,7 @@ #include <zypp/Pattern.h> #include <zypp/Language.h> #include <zypp/Patch.h> +#include <zypp/Product.h> #include <zypp/ZYppFactory.h> #include <zypp/ResPoolProxy.h> @@ -58,6 +59,7 @@ typedef zypp::Pattern::constPtr ZyppPattern; typedef zypp::Language::constPtr ZyppLang; typedef zypp::Patch::constPtr ZyppPatch; +typedef zypp::Product::constPtr ZyppProduct; typedef zypp::ResPoolProxy ZyppPool; typedef zypp::ResPoolProxy::const_iterator ZyppPoolIterator; @@ -83,6 +85,9 @@ inline ZyppPoolIterator zyppPatchesBegin() { return zyppBegin<zypp::Patch>(); } inline ZyppPoolIterator zyppPatchesEnd() { return zyppEnd<zypp::Patch>(); } +inline ZyppPoolIterator zyppProductsBegin() { return zyppBegin<zypp::Product>(); } +inline ZyppPoolIterator zyppProductsEnd() { return zyppEnd<zypp::Product>(); } + inline ZyppPkg tryCastToZyppPkg( ZyppObj zyppObj ) { @@ -109,6 +114,11 @@ return zypp::dynamic_pointer_cast<const zypp::Patch>( zyppObj ); } +inline ZyppProduct tryCastToZyppProduct( ZyppObj zyppObj ) +{ + return zypp::dynamic_pointer_cast<const zypp::Product>( zyppObj ); +} + template<typename T> bool contains( const std::set<T> & container, T search ) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-network
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package yast2-network checked in at Thu Oct 26 20:37:10 CEST 2006. -------- --- yast2-network/yast2-network.changes 2006-10-23 16:36:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2006-10-24 19:24:41.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 24 19:20:17 CEST 2006 - mzugec(a)suse.cz + +- #300604 - UI to disable IPv6 (installation) +- 2.14.5 + +------------------------------------------------------------------- Old: ---- yast2-network-2.14.4.tar.bz2 New: ---- yast2-network-2.14.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.ZP82U6/_old 2006-10-26 20:36:40.000000000 +0200 +++ /var/tmp/diff_new_pack.ZP82U6/_new 2006-10-26 20:36:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.14.4) +# spec file for package yast2-network (Version 2.14.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-network -Version: 2.14.4 +Version: 2.14.5 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.14.4.tar.bz2 +Source0: yast2-network-2.14.5.tar.bz2 prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig @@ -50,7 +50,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.14.4 +%setup -n yast2-network-2.14.5 %build %{prefix}/bin/y2tool y2autoconf @@ -105,6 +105,9 @@ /usr/share/YaST2/schema/autoyast/rnc/host.rnc %changelog -n yast2-network +* Tue Oct 24 2006 - mzugec(a)suse.cz +- #300604 - UI to disable IPv6 (installation) +- 2.14.5 * Mon Oct 23 2006 - mzugec(a)suse.cz - fate #100092 - command line support for netcards - 2.14.4 ++++++ yast2-network-2.14.4.tar.bz2 -> yast2-network-2.14.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.14.4/VERSION new/yast2-network-2.14.5/VERSION --- old/yast2-network-2.14.4/VERSION 2006-10-23 16:34:35.000000000 +0200 +++ new/yast2-network-2.14.5/VERSION 2006-10-24 19:17:13.000000000 +0200 @@ -1 +1 @@ -2.14.4 +2.14.5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.14.4/configure new/yast2-network-2.14.5/configure --- old/yast2-network-2.14.4/configure 2006-10-23 16:25:51.000000000 +0200 +++ new/yast2-network-2.14.5/configure 2006-10-24 18:58:11.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-network 2.14.3. +# Generated by GNU Autoconf 2.59 for yast2-network 2.14.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.14.3' -PACKAGE_STRING='yast2-network 2.14.3' +PACKAGE_VERSION='2.14.4' +PACKAGE_STRING='yast2-network 2.14.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,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-network 2.14.3 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.14.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-network 2.14.3:";; + short | recursive ) echo "Configuration of yast2-network 2.14.4:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.14.3 +yast2-network configure 2.14.4 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,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-network $as_me 2.14.3, which was +It was created by yast2-network $as_me 2.14.4, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-network' - VERSION='2.14.3' + VERSION='2.14.4' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.14.3" +VERSION="2.14.4" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-network $as_me 2.14.3, which was +This file was extended by yast2-network $as_me 2.14.4, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-network config.status 2.14.3 +yast2-network config.status 2.14.4 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.14.4/configure.in new/yast2-network-2.14.5/configure.in --- old/yast2-network-2.14.4/configure.in 2006-10-23 16:25:46.000000000 +0200 +++ new/yast2-network-2.14.5/configure.in 2006-10-24 18:58:04.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.14.3, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.14.4, http://bugs.opensuse.org/, yast2-network) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.3" +VERSION="2.14.4" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.14.4/src/clients/ipv6_proposal.ycp new/yast2-network-2.14.5/src/clients/ipv6_proposal.ycp --- old/yast2-network-2.14.4/src/clients/ipv6_proposal.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-2.14.5/src/clients/ipv6_proposal.ycp 2006-10-24 18:55:17.000000000 +0200 @@ -0,0 +1,100 @@ +/** + * File: clients/ipv6_proposal.ycp + * Package: Network configuration + * Summary: Network mode proposal + * Authors: Michal Zugec <mzugec(a)novell.com> + */ + +{ + +textdomain "network"; + +/* The main () */ +y2milestone("----------------------------------------"); +y2milestone("ipv6 proposal started"); +y2milestone("Arguments: %1", WFM::Args()); + +import "Lan"; +import "NetworkService"; + +include "network/lan/complex.ycp"; + +list args = WFM::Args(); + +string func = args[0]:""; +map param = args[1]:$[]; +map ret = $[]; + +/* create a textual proposal */ +if(func == "MakeProposal") { + string proposal = ""; + list<string> links = []; + string warning = nil; + symbol warning_level = nil; + + list sum = Lan::SummaryIPv6 (); + proposal = sum[0]:""; + links = sum[1]:[]; + + ret = $[ + "preformatted_proposal" : proposal, + "links" : links, + "warning_level" : warning_level, + "warning" : warning, + ]; +} +/* run the module */ +else if(func == "AskUser") { + string chosen_id = param["chosen_id"]:""; + symbol seq = `next; + + if (chosen_id == "ipv6-enable") + { + Lan::SetIPv6 (true); + } + else if (chosen_id == "ipv6-disable") + { + Lan::SetIPv6 (false); + } + else + { + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("lan"); + + seq = IPv6Dialog(); + Wizard::CloseDialog(); + } + Lan::proposal_valid = false; // repropose + Lan::SetModified (); + + ret = $[ + "workflow_sequence" : seq + ]; +} +/* create titles */ +else if(func == "Description") { + ret = $[ + /* RichText label */ + "rich_text_title" : _("IPv6"), + /* Menu label */ + "menu_title" : _("IPv6"), + "id" : "ipv6suport", + ]; +} +/* write the proposal */ +else if (func == "Write") { + y2debug ("lan_proposal did it"); +} +/* unknown function */ +else { + y2error("unknown function: %1", func); +} + +/* Finish */ +y2debug("ret=%1", ret); +y2milestone("ipv6 proposal finished"); +y2milestone("----------------------------------------"); +return ret; + +/* EOF */ +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-printer
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package yast2-printer checked in at Thu Oct 26 20:36:42 CEST 2006. -------- --- yast2-printer/yast2-printer.changes 2006-10-19 16:39:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2006-10-24 17:34:23.000000000 +0200 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Tue Oct 24 17:31:12 CEST 2006 - mzugec(a)suse.cz + +- #214265 - module crashes when reading old driver database +- 2.14.4 + Old: ---- yast2-printer-2.14.3.tar.bz2 New: ---- yast2-printer-2.14.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.hRTCUF/_old 2006-10-26 20:36:19.000000000 +0200 +++ /var/tmp/diff_new_pack.hRTCUF/_new 2006-10-26 20:36:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-printer (Version 2.14.3) +# spec file for package yast2-printer (Version 2.14.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-printer -Version: 2.14.3 +Version: 2.14.4 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.14.3.tar.bz2 +Source0: yast2-printer-2.14.4.tar.bz2 prefix: /usr BuildRequires: blocxx-devel cups-devel cups-drivers cups-drivers-stp docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite Requires: yast2 netcat zlib blocxx @@ -33,7 +33,7 @@ %prep -%setup -n yast2-printer-2.14.3 +%setup -n yast2-printer-2.14.4 %build %{prefix}/bin/y2tool y2autoconf @@ -52,6 +52,8 @@ d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done +PPD_DB=/var/lib/YaST2/ppd_db.ycp +if test -f $PPD_DB ; then rm $PPD_DB; fi %clean rm -rf "$RPM_BUILD_ROOT" @@ -99,14 +101,17 @@ %doc %{prefix}/share/doc/packages/yast2-printer %changelog -n yast2-printer +* Tue Oct 24 2006 - mzugec(a)suse.cz +- #214265 - module crashes when reading old driver database +- 2.14.4 * Fri Sep 01 2006 - mzugec(a)suse.cz - fate #416 - recognize iPrint -------------------------------------------------------------------- + ------------------------------------------------------------------- Tue Oct 17 10:22:55 CEST 2006 - mzugec(a)suse.cz -- fixed #206398 - serial printer test fails -------------------------------------------------------------------- + - fixed #206398 - serial printer test fails + ------------------------------------------------------------------- Mon Oct 9 10:00:14 CEST 2006 - mzugec(a)suse.cz -- #208005 - resize cups dialog + - #208005 - resize cups dialog -fixed #116446, #115888, #175323 - hp:// backend + testsuite change for CUPS1.2 * Fri Aug 18 2006 - jsrain(a)suse.cz ++++++ yast2-printer-2.14.3.tar.bz2 -> yast2-printer-2.14.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.3/VERSION new/yast2-printer-2.14.4/VERSION --- old/yast2-printer-2.14.3/VERSION 2006-10-19 15:56:06.000000000 +0200 +++ new/yast2-printer-2.14.4/VERSION 2006-10-24 17:30:58.000000000 +0200 @@ -1 +1 @@ -2.14.3 +2.14.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-control-center-gnome
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package yast2-control-center-gnome checked in at Thu Oct 26 20:36:32 CEST 2006. -------- --- yast2-control-center-gnome/yast2-control-center-gnome.changes 2006-10-09 13:10:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-control-center-gnome/yast2-control-center-gnome.changes 2006-10-24 17:51:27.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Oct 24 17:50:01 CEST 2006 - sreeves(a)suse.de + +- Fix to build with new gnome-main-menu + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-control-center-gnome.spec ++++++ --- /var/tmp/diff_new_pack.FujWob/_old 2006-10-26 20:35:06.000000000 +0200 +++ /var/tmp/diff_new_pack.FujWob/_new 2006-10-26 20:35:06.000000000 +0200 @@ -14,11 +14,11 @@ BuildRequires: gnome-main-menu-devel libgnome-devel libgnomeui-devel %define prefix /opt/gnome %define sysconfdir /etc%{prefix} -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/Management Autoreqprov: on Version: 0.1.1 -Release: 1 +Release: 4 Summary: GNOME control center Source: %{name}-%{version}.tar.gz URL: http://en.opensuse.org/YaST2-GTK @@ -94,5 +94,7 @@ /usr/share/YaST2/theme/SuSELinux/hicolor %changelog -n yast2-control-center-gnome +* Tue Oct 24 2006 - sreeves(a)suse.de +- Fix to build with new gnome-main-menu * Mon Oct 09 2006 - mmichael(a)suse.de - import 1st cut. ++++++ yast2-control-center-gnome-0.1.1.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-0.1.1/src/control-center.c new/yast2-control-center-gnome-0.1.1/src/control-center.c --- old/yast2-control-center-gnome-0.1.1/src/control-center.c 2006-10-09 15:01:22.000000000 +0200 +++ new/yast2-control-center-gnome-0.1.1/src/control-center.c 2006-10-24 02:08:13.000000000 +0200 @@ -13,99 +13,120 @@ void handle_static_action_clicked(Tile * tile, TileEvent * event, gpointer data); static GSList * get_actions_list(); -#define CONTROL_CENTER_ACTIONS_LIST_KEY "/desktop/gnome/applications/y2cc-gnome/cc_actions_list" -#define CONTROL_CENTER_ACTIONS_SEPARATOR ";" #define CONTROL_CENTER_PREFIX "/desktop/gnome/applications/y2cc-gnome/cc_" +#define CONTROL_CENTER_ACTIONS_LIST_KEY (CONTROL_CENTER_PREFIX "actions_list") +#define CONTROL_CENTER_ACTIONS_SEPARATOR ";" #define EXIT_SHELL_ON_STATIC_ACTION "exit_shell_on_static_action" -static GSList * get_actions_list() +static GSList * +get_actions_list () { - GSList * key_list; - GSList * actions_list = NULL; - AppAction * action; - - key_list = get_slab_gconf_slist(CONTROL_CENTER_ACTIONS_LIST_KEY); - if(!key_list) - { - g_warning ("key not found [%s]\n", CONTROL_CENTER_ACTIONS_LIST_KEY); + GSList *key_list; + GSList *actions_list = NULL; + AppAction *action; + + key_list = get_slab_gconf_slist (CONTROL_CENTER_ACTIONS_LIST_KEY); + if (!key_list) + { + g_warning (_("key not found [%s]\n"), CONTROL_CENTER_ACTIONS_LIST_KEY); return NULL; } - for( ; key_list; key_list = key_list->next) - { - const gchar * entry = (const gchar *) key_list->data; - - action = g_new(AppAction, 1); - gchar ** temp = g_strsplit(entry, CONTROL_CENTER_ACTIONS_SEPARATOR, 2); - action->name = g_strdup(temp[0]); - if((action->item = load_desktop_item_from_unknown(temp[1])) == NULL) - { - g_warning("get_actions_list() - PROBLEM - Can't load %s\n", temp[1]); - g_strfreev(temp); - continue; - } - g_strfreev(temp); - - actions_list = g_slist_append (actions_list, action); + for (; key_list; key_list = key_list->next) + { + gchar *entry = (gchar *) key_list->data; + + action = g_new (AppAction, 1); + gchar **temp = g_strsplit (entry, CONTROL_CENTER_ACTIONS_SEPARATOR, 2); + action->name = g_strdup (temp[0]); + if ((action->item = load_desktop_item_from_unknown (temp[1])) == NULL) + { + g_warning ("get_actions_list() - PROBLEM - Can't load %s\n", temp[1]); + } + else + { + actions_list = g_slist_append (actions_list, action); + } + g_strfreev (temp); + g_free (entry); } + g_slist_free (key_list); return actions_list; } -void handle_static_action_clicked(Tile * tile, TileEvent * event, gpointer data) +void +handle_static_action_clicked (Tile * tile, TileEvent * event, gpointer data) { - AppShellData * app_data = (AppShellData *) data; - GnomeDesktopItem * item = (GnomeDesktopItem *) g_object_get_data(G_OBJECT(tile), APP_ACTION_KEY); - open_desktop_item_exec(item); + gchar *temp; - if(get_slab_gconf_bool(g_strdup_printf("%s%s", app_data->gconf_prefix, EXIT_SHELL_ON_STATIC_ACTION))) - gtk_main_quit(); + AppShellData *app_data = (AppShellData *) data; + GnomeDesktopItem *item = + (GnomeDesktopItem *) g_object_get_data (G_OBJECT (tile), APP_ACTION_KEY); + open_desktop_item_exec (item); + + temp = g_strdup_printf("%s%s", app_data->gconf_prefix, EXIT_SHELL_ON_STATIC_ACTION); + if (get_slab_gconf_bool(temp)) + gtk_main_quit (); + g_free (temp); } -int main (int argc, char *argv []) +int +main (int argc, char *argv[]) { - BonoboApplication * bonobo_app = NULL; - gboolean hidden = FALSE; - - gtk_init (&argc, &argv); + BonoboApplication *bonobo_app = NULL; + gboolean hidden = FALSE; + gchar * startup_id; + +#ifdef ENABLE_NLS + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); +#endif + + if (argc > 1) + { + if (argc != 2 || strcmp ("-h", argv[1])) + { + printf ("Usage - y2controlcenter-gnome [-h]\n"); + printf ("Options: -h : hide on start\n"); + printf ("\tUseful if you want to autostart the control-center singleton so it can get all it's slow loading done\n"); + exit (1); + } + hidden = TRUE; + } - // gnome_program_init clears the env variable that we depend on, so call this first - if(apss_already_running(argc, argv, &bonobo_app, "YaST-gnome")) - { - gnome_program_init("YaST2 Gnome Control Center", "0.1", LIBGNOMEUI_MODULE, argc, argv, NULL, NULL); - gdk_notify_startup_complete(); - bonobo_debug_shutdown (); - exit(1); - } - - gnome_program_init("YaST2 Gnome Control Center", "0.1", LIBGNOMEUI_MODULE, argc, argv, NULL, NULL); - - if(argc > 1) - { - if(argc != 2 || strcmp("-h", argv[1])) - { - printf("Usage - y2cc-gnome [-h]\n"); - printf("Options: -h : hide on start\n"); - printf("\tUseful if you want to autostart the control-center singleton so it can get all it's slow loading done\n"); - exit(1); - } - hidden = TRUE; - } + startup_id = g_strdup (g_getenv (DESKTOP_STARTUP_ID)); + gnome_program_init ("YaST2 Gnome Control Center", "0.1", LIBGNOMEUI_MODULE, + argc, argv, NULL, NULL); + + if (apss_already_running (argc, argv, &bonobo_app, "YaST-gnome", startup_id)) + { + gdk_notify_startup_complete (); + bonobo_debug_shutdown (); + g_free (startup_id); + exit (1); + } GtkIconTheme * theme; theme = gtk_icon_theme_get_default(); gtk_icon_theme_prepend_search_path (theme, "/usr/share/YaST2/theme/NLD"); - AppShellData * app_data = appshelldata_new("YaST-gnome.menu", NULL, CONTROL_CENTER_PREFIX, GTK_ICON_SIZE_LARGE_TOOLBAR); - generate_categories(app_data); - GSList * actions = get_actions_list(); - layout_shell(app_data, _("Filter"), _("Groups"), _("Common Tasks"), actions, handle_static_action_clicked); - - g_signal_connect (bonobo_app, "new-instance", G_CALLBACK (apss_new_instance_cb), app_data); - create_main_window(app_data, "MyControlCenter", _("Control Center"), "y2cc-gnome", 975, 600, hidden); - - if(bonobo_app) bonobo_object_unref(bonobo_app); - bonobo_debug_shutdown(); - return 0; + AppShellData *app_data = appshelldata_new ( + "YaST-gnome.menu", NULL, CONTROL_CENTER_PREFIX, GTK_ICON_SIZE_LARGE_TOOLBAR); + generate_categories (app_data); + + GSList *actions = get_actions_list (); + layout_shell (app_data, _("Filter"), _("Groups"), _("Common Tasks"), actions, + handle_static_action_clicked); + + g_signal_connect (bonobo_app, "new-instance", G_CALLBACK (apss_new_instance_cb), app_data); + create_main_window (app_data, "MyControlCenter", _("Control Center"), + "y2cc-gnome", 975, 600, hidden); + + if (bonobo_app) + bonobo_object_unref (bonobo_app); + bonobo_debug_shutdown (); + g_free (startup_id); + return 0; }; - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-power-management
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package yast2-power-management checked in at Thu Oct 26 20:36:12 CEST 2006. -------- --- arch/i386/yast2-power-management/yast2-power-management.changes 2006-10-23 17:41:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-power-management/yast2-power-management.changes 2006-10-26 16:22:50.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 26 15:35:14 CEST 2006 - lslezak(a)suse.cz + +- UI change - use a push button instead of the menu button with + just one item, the help text has been adapted (#215280) +- 2.14.1 + +------------------------------------------------------------------- Old: ---- yast2-power-management-2.14.0.tar.bz2 New: ---- yast2-power-management-2.14.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-power-management.spec ++++++ --- /var/tmp/diff_new_pack.Svbxvc/_old 2006-10-26 20:35:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Svbxvc/_new 2006-10-26 20:35:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-power-management (Version 2.14.0) +# spec file for package yast2-power-management (Version 2.14.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-power-management -Version: 2.14.0 +Version: 2.14.1 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-power-management-2.14.0.tar.bz2 +Source0: yast2-power-management-2.14.1.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: gettext @@ -35,7 +35,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-power-management-2.14.0 +%setup -n yast2-power-management-2.14.1 %build %{prefix}/bin/y2tool y2autoconf @@ -70,6 +70,10 @@ %doc %{prefix}/share/doc/packages/yast2-power-management %changelog -n yast2-power-management +* Thu Oct 26 2006 - lslezak(a)suse.cz +- UI change - use a push button instead of the menu button with + just one item, the help text has been adapted (#215280) +- 2.14.1 * Mon Oct 23 2006 - lslezak(a)suse.cz - adapted to the new powermanagement implementation (fate #301180, bug #214272) ++++++ yast2-power-management-2.14.0.tar.bz2 -> yast2-power-management-2.14.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.14.0/VERSION new/yast2-power-management-2.14.1/VERSION --- old/yast2-power-management-2.14.0/VERSION 2006-10-23 17:37:03.000000000 +0200 +++ new/yast2-power-management-2.14.1/VERSION 2006-10-26 15:34:18.000000000 +0200 @@ -1 +1 @@ -2.14.0 +2.14.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.14.0/configure new/yast2-power-management-2.14.1/configure --- old/yast2-power-management-2.14.0/configure 2006-10-23 17:39:26.000000000 +0200 +++ new/yast2-power-management-2.14.1/configure 2006-10-26 16:10:24.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-power-management 2.14.0. +# Generated by GNU Autoconf 2.60 for yast2-power-management 2.14.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-power-management' PACKAGE_TARNAME='yast2-power-management' -PACKAGE_VERSION='2.14.0' -PACKAGE_STRING='yast2-power-management 2.14.0' +PACKAGE_VERSION='2.14.1' +PACKAGE_STRING='yast2-power-management 2.14.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1180,7 +1180,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-power-management 2.14.0 to adapt to many kinds of systems. +\`configure' configures yast2-power-management 2.14.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1251,7 +1251,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-power-management 2.14.0:";; + short | recursive ) echo "Configuration of yast2-power-management 2.14.1:";; esac cat <<\_ACEOF @@ -1329,7 +1329,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-power-management configure 2.14.0 +yast2-power-management configure 2.14.1 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1343,7 +1343,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-power-management $as_me 2.14.0, which was +It was created by yast2-power-management $as_me 2.14.1, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2144,7 +2144,7 @@ # Define the identity of the package. PACKAGE='yast2-power-management' - VERSION='2.14.0' + VERSION='2.14.1' cat >>confdefs.h <<_ACEOF @@ -2371,7 +2371,7 @@ -VERSION="2.14.0" +VERSION="2.14.1" RPMNAME="yast2-power-management" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -3227,7 +3227,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-power-management $as_me 2.14.0, which was +This file was extended by yast2-power-management $as_me 2.14.1, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3270,7 +3270,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-power-management config.status 2.14.0 +yast2-power-management config.status 2.14.1 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.14.0/configure.in new/yast2-power-management-2.14.1/configure.in --- old/yast2-power-management-2.14.0/configure.in 2006-10-23 17:39:21.000000000 +0200 +++ new/yast2-power-management-2.14.1/configure.in 2006-10-26 16:10:19.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-power-management, 2.14.0, http://bugs.opensuse.org/, yast2-power-management) +AC_INIT(yast2-power-management, 2.14.1, http://bugs.opensuse.org/, yast2-power-management) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.0" +VERSION="2.14.1" RPMNAME="yast2-power-management" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.14.0/src/helps.ycp new/yast2-power-management-2.14.1/src/helps.ycp --- old/yast2-power-management-2.14.0/src/helps.ycp 2006-10-23 17:39:11.000000000 +0200 +++ new/yast2-power-management-2.14.1/src/helps.ycp 2006-10-26 15:29:18.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Help texts of all the dialogs * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: helps.ycp 33611 2006-10-23 15:39:09Z lslezak $ + * $Id: helps.ycp 33701 2006-10-26 13:29:17Z lslezak $ */ { @@ -111,9 +111,9 @@ use Edit Schemes."), // Main dialog help 4/5 - "other_settings_menu_button" : _("<big>Other Settings</big> + "other_settings_menu_button" : _("<big>Permissions</big> To adjust whether users are allowed to switch the computer to the standby or -suspend mode, use Other Settings.\n")+ +suspend mode, use Suspend Permissions button.\n")+ // Main dialog help 5/5 _("Beginning with openSUSE 10.2, a lot of configuration options have been diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.14.0/src/widgets.ycp new/yast2-power-management-2.14.1/src/widgets.ycp --- old/yast2-power-management-2.14.0/src/widgets.ycp 2006-10-23 17:39:11.000000000 +0200 +++ new/yast2-power-management-2.14.1/src/widgets.ycp 2006-10-26 16:16:04.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: widgets.ycp 33611 2006-10-23 15:39:09Z lslezak $ + * $Id: widgets.ycp 33718 2006-10-26 14:16:00Z lslezak $ */ { @@ -395,16 +395,10 @@ * Get description map of a widget * @return a map widget description map */ -map<string,any> getOtherSettingsMenuButton () { +map<string,any> getOtherSettingsButton () { return $[ "widget" : `custom, - "custom_widget" : `MenuButton (`id ("other_settings_menu_button"), - // menu button - _("Other Settings..."), - [ - `item (`id ("enable_suspend_button"), - _("&Suspend Permissions...")), - ]), + "custom_widget" : `PushButton (`id("enable_suspend_button"), _("&Suspend Permissions...")), "help" : HELPS["other_settings_menu_button"]:"", "handle" : OtherSettingsMenuButtonHandle, "handle_events" : [ @@ -1220,7 +1214,7 @@ "enable_str" : getEnableSTRWidget (), "enable_standby" : getEnableStandbyWidget (), "str_standby_additional_info" : getStrStandbyAdditionalHelp (), - "other_settings_menu_button" : getOtherSettingsMenuButton (), + "other_settings_menu_button" : getOtherSettingsButton (), "scheme_selection" : getSchemeSelectionWidget (), "schemes_list" : getSchemesListWidget (), "scheme_name" : getSchemeNameWidget (), ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-nis-client
by root＠suse.de 26 Oct '06

26 Oct '06

Hello community, here is the log from the commit of package yast2-nis-client checked in at Thu Oct 26 20:35:35 CEST 2006. -------- --- yast2-nis-client/yast2-nis-client.changes 2006-09-08 15:23:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-nis-client/yast2-nis-client.changes 2006-10-26 16:39:01.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Oct 26 16:30:32 CEST 2006 - jsuchome(a)suse.cz + +- added schema name to desktop file (#215249) +- 2.13.8 + +------------------------------------------------------------------- +Thu Oct 26 15:26:55 CEST 2006 - jsuchome(a)suse.cz + +- schema file moved from autoyast package (#215249) +- 2.13.7 + +------------------------------------------------------------------- Old: ---- yast2-nis-client-2.13.6.tar.bz2 New: ---- yast2-nis-client-2.13.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nis-client.spec ++++++ --- /var/tmp/diff_new_pack.1LLKa5/_old 2006-10-26 20:35:23.000000000 +0200 +++ /var/tmp/diff_new_pack.1LLKa5/_new 2006-10-26 20:35:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-nis-client (Version 2.13.6) +# spec file for package yast2-nis-client (Version 2.13.8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-nis-client -Version: 2.13.6 +Version: 2.13.8 Release: 1 -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-nis-client-2.13.6.tar.bz2 +Source0: yast2-nis-client-2.13.8.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-pam yast2-testsuite Requires: yast2 yast2-pam @@ -42,7 +42,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-nis-client-2.13.6 +%setup -n yast2-nis-client-2.13.8 %build %{prefix}/bin/y2tool y2autoconf @@ -81,9 +81,16 @@ /usr/share/YaST2/scrconf/cfg_ypbind.scr /usr/share/YaST2/scrconf/yp_conf.scr /usr/share/YaST2/scrconf/ypserv.scr +/usr/share/YaST2/schema/autoyast/rnc/nis.rnc %doc %{prefix}/share/doc/packages/yast2-nis-client %changelog -n yast2-nis-client +* Thu Oct 26 2006 - jsuchome(a)suse.cz +- added schema name to desktop file (#215249) +- 2.13.8 +* Thu Oct 26 2006 - jsuchome(a)suse.cz +- schema file moved from autoyast package (#215249) +- 2.13.7 * Mon Sep 04 2006 - jsuchome(a)suse.cz - removed dia from doc/Makefiles - 2.13.6 ++++++ yast2-nis-client-2.13.6.tar.bz2 -> yast2-nis-client-2.13.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.13.6/VERSION new/yast2-nis-client-2.13.8/VERSION --- old/yast2-nis-client-2.13.6/VERSION 2006-09-04 11:36:39.000000000 +0200 +++ new/yast2-nis-client-2.13.8/VERSION 2006-10-26 16:30:49.000000000 +0200 @@ -1 +1 @@ -2.13.6 +2.13.8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.13.6/configure new/yast2-nis-client-2.13.8/configure --- old/yast2-nis-client-2.13.6/configure 2006-08-21 14:01:01.000000000 +0200 +++ new/yast2-nis-client-2.13.8/configure 2006-09-04 11:06:08.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-nis-client 2.13.4. +# Generated by GNU Autoconf 2.59 for yast2-nis-client 2.13.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='yast2-nis-client' PACKAGE_TARNAME='yast2-nis-client' -PACKAGE_VERSION='2.13.4' -PACKAGE_STRING='yast2-nis-client 2.13.4' +PACKAGE_VERSION='2.13.5' +PACKAGE_STRING='yast2-nis-client 2.13.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -959,7 +959,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-nis-client 2.13.4 to adapt to many kinds of systems. +\`configure' configures yast2-nis-client 2.13.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1026,7 +1026,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-nis-client 2.13.4:";; + short | recursive ) echo "Configuration of yast2-nis-client 2.13.5:";; esac cat <<\_ACEOF @@ -1169,7 +1169,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-nis-client configure 2.13.4 +yast2-nis-client configure 2.13.5 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1183,7 +1183,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-nis-client $as_me 2.13.4, which was +It was created by yast2-nis-client $as_me 2.13.5, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1913,7 +1913,7 @@ # Define the identity of the package. PACKAGE='yast2-nis-client' - VERSION='2.13.4' + VERSION='2.13.5' cat >>confdefs.h <<_ACEOF @@ -2124,7 +2124,7 @@ -VERSION="2.13.4" +VERSION="2.13.5" RPMNAME="yast2-nis-client" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" @@ -20159,7 +20159,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-nis-client $as_me 2.13.4, which was +This file was extended by yast2-nis-client $as_me 2.13.5, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20222,7 +20222,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-nis-client config.status 2.13.4 +yast2-nis-client config.status 2.13.5 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.13.6/configure.in new/yast2-nis-client-2.13.8/configure.in --- old/yast2-nis-client-2.13.6/configure.in 2006-08-21 14:00:49.000000000 +0200 +++ new/yast2-nis-client-2.13.8/configure.in 2006-09-04 11:05:57.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.21 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-nis-client, 2.13.4, http://bugs.opensuse.org/, yast2-nis-client) +AC_INIT(yast2-nis-client, 2.13.5, http://bugs.opensuse.org/, yast2-nis-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.4" +VERSION="2.13.5" RPMNAME="yast2-nis-client" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.13.6/doc/Makefile.am new/yast2-nis-client-2.13.8/doc/Makefile.am --- old/yast2-nis-client-2.13.6/doc/Makefile.am 2006-09-04 11:36:58.000000000 +0200 +++ new/yast2-nis-client-2.13.8/doc/Makefile.am 2006-09-08 15:23:25.000000000 +0200 @@ -1,7 +1,7 @@ # # Makefile.am for y2c_nis/doc # -# $Id: Makefile.am 20847 2005-01-24 14:10:56Z jsuchome $ +# $Id: Makefile.am 32779 2006-09-08 13:25:03Z jsuchome $ # SUBDIRS = autodocs diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.13.6/doc/Makefile.in new/yast2-nis-client-2.13.8/doc/Makefile.in --- old/yast2-nis-client-2.13.6/doc/Makefile.in 2006-09-04 12:30:16.000000000 +0200 +++ new/yast2-nis-client-2.13.8/doc/Makefile.in 2006-10-26 15:34:42.000000000 +0200 @@ -17,7 +17,7 @@ # # Makefile.am for y2c_nis/doc # -# $Id: Makefile.am 20847 2005-01-24 14:10:56Z jsuchome $ +# $Id: Makefile.am 32779 2006-09-08 13:25:03Z jsuchome $ # srcdir = @srcdir@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.13.6/nis.pot new/yast2-nis-client-2.13.8/nis.pot --- old/yast2-nis-client-2.13.6/nis.pot 2006-08-22 09:34:30.000000000 +0200 +++ new/yast2-nis-client-2.13.8/nis.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,512 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-22 09:34+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Translators: do not translate (none)! -#: src/Nis.ycp:245 -msgid "" -"A NIS domain name must not be empty,\n" -"it must not be \"(none)\",\n" -"and it must be at most 64 characters long.\n" -msgstr "" - -#. message popup -#: src/Nis.ycp:279 -msgid "" -"Only an IP address can be used\n" -"because host names are resolved using NIS.\n" -"\n" -msgstr "" - -#. Translators: popup message part, ends with a newline -#: src/Nis.ycp:346 -msgid "The automounter package will be installed.\n" -msgstr "" - -#. summary: Domain or servers are retrieved by the -#. Dynamic Host Configuration Protocol. -#. Will be placed after NIS Domain/NIS Servers instead of the -#. actual settings. -#. summary value, used in "Servers: by DHCP" or "Domain: by DHCP" -#: src/Nis.ycp:526 src/Nis.ycp:587 -msgid "by DHCP" -msgstr "" - -#. summary header -#: src/Nis.ycp:529 -msgid "NIS Client enabled" -msgstr "" - -#. summary item: an option is turned on -#: src/Nis.ycp:531 src/Nis.ycp:545 src/Nis.ycp:551 src/Nis.ycp:555 -#: src/Nis.ycp:562 src/Nis.ycp:597 src/nis.ycp:150 -msgid "Yes" -msgstr "" - -#. summary header -#: src/Nis.ycp:533 -msgid "NIS Domain" -msgstr "" - -#. summary header -#: src/Nis.ycp:538 -msgid "NIS Servers" -msgstr "" - -#. summary header -#. table header -#: src/Nis.ycp:543 src/ui.ycp:816 -msgid "Broadcast" -msgstr "" - -#. TODO: a full list -#: src/Nis.ycp:547 -msgid "Other domains" -msgstr "" - -#. summary header -#: src/Nis.ycp:549 -msgid "Answer to local host only" -msgstr "" - -#. summary header -#: src/Nis.ycp:553 -msgid "Broken server" -msgstr "" - -#. summary header -#: src/Nis.ycp:557 -msgid "ypbind options" -msgstr "" - -#. summary header -#: src/Nis.ycp:560 src/nis.ycp:150 -msgid "Automounter enabled" -msgstr "" - -#. summary item -#. table header -#: src/Nis.ycp:591 src/ui.ycp:820 -msgid "Servers" -msgstr "" - -#. summary item -#. table header -#: src/Nis.ycp:594 src/ui.ycp:814 -msgid "Domain" -msgstr "" - -#. summary item (yes/no follows) -#: src/Nis.ycp:597 -msgid "Client Enabled" -msgstr "" - -#: src/Nis.ycp:597 src/nis.ycp:150 -msgid "No" -msgstr "" - -#. dialog label -#: src/Nis.ycp:962 -msgid "Writing NIS Configuration..." -msgstr "" - -#. progress stage label -#: src/Nis.ycp:964 -msgid "Stop services" -msgstr "" - -#. progress stage label -#: src/Nis.ycp:966 -msgid "Start services" -msgstr "" - -#. progress step label -#: src/Nis.ycp:969 -msgid "Stopping services..." -msgstr "" - -#. progress step label -#: src/Nis.ycp:971 -msgid "Starting services..." -msgstr "" - -#. final progress step label -#: src/Nis.ycp:973 -msgid "Finished" -msgstr "" - -#. help text -#: src/Nis.ycp:977 -msgid "Writing NIS client settings" -msgstr "" - -#. error popup message -#: src/Nis.ycp:1000 -msgid "Error while running portmapper." -msgstr "" - -#. error popup message -#: src/Nis.ycp:1015 -msgid "Error while running ypclient." -msgstr "" - -#. error popup message -#: src/Nis.ycp:1025 -msgid "NIS server not found." -msgstr "" - -#. translators: command line help text for Ldap client module -#: src/nis.ycp:159 -msgid "NIS client configuration module." -msgstr "" - -#. command line help text for 'enable' action -#: src/nis.ycp:167 -msgid "Enable your machine as NIS client" -msgstr "" - -#. command line help text for 'disable' action -#: src/nis.ycp:172 -msgid "Disable the NIS client" -msgstr "" - -#. command line help text for 'summary' action -#: src/nis.ycp:177 -msgid "Configuration summary of NIS client" -msgstr "" - -#. command line help text for 'configure' action -#: src/nis.ycp:182 -msgid "Change the global settings of NIS client" -msgstr "" - -#. command line help text for 'find' action -#: src/nis.ycp:187 -msgid "Show available NIS servers for given domain" -msgstr "" - -#. command line help text for the 'server' option -#: src/nis.ycp:193 -msgid "NIS server name or address" -msgstr "" - -#. command line help text for the 'domain' option -#: src/nis.ycp:198 -msgid "NIS domain" -msgstr "" - -#. help text for the 'automounter' option -#: src/nis.ycp:203 -msgid "Start or stop automounter" -msgstr "" - -#. help text for the 'broadcast' option -#: src/nis.ycp:209 -msgid "Set or unset broadcast search" -msgstr "" - -#. const -#. Translators: network broadcast address -#: src/ui.ycp:48 -msgid "" -"The Broadcast option enables searching\n" -"in the local network to find a server after the specified servers\n" -"fail to respond. It is a security risk.\n" -msgstr "" - -#. const -#. Translators: help text -#. DHCP = Dynamic host configuration protocol -#: src/ui.ycp:56 -msgid "If you are using DHCP and the server provides the NIS domain name or servers, you can enable their use here. DHCP itself can be set up in the network module." -msgstr "" - -#. const -#. Translators: short for Expert settings -#: src/ui.ycp:60 -msgid "" -"Expert gives access to some\n" -"less frequently used settings.\n" -msgstr "" - -#. Translators: warning popup -#: src/ui.ycp:85 -msgid "" -"NIS configuration is not currently provided by DHCP.\n" -"Change the DHCP server configuration to provide it.\n" -msgstr "" - -#. pushbutton label -#. Select all items (in this case NIS servers) of a list -#: src/ui.ycp:110 -msgid "Select &All" -msgstr "" - -#. pushbutton label -#. Deselect all items (in this case NIS servers) of a list -#: src/ui.ycp:113 -msgid "Select &None" -msgstr "" - -#. popup window -#. LAN: local area network -#: src/ui.ycp:173 -#, ycp-format -msgid "Scanning for NIS servers in domain %1 on this LAN..." -msgstr "" - -#. selection box label -#: src/ui.ycp:184 -#, ycp-format -msgid "&NIS Servers in Domain %1" -msgstr "" - -#. help text -#: src/ui.ycp:204 -msgid "" -"Enter your NIS domain, such as example.com,\n" -" and the NIS server's address, such as nis.example.com or 10.20.1.1.\n" -msgstr "" - -#. help text -#: src/ui.ycp:209 -msgid "" -"Specify multiple servers\n" -"by separating their addresses with spaces.\n" -msgstr "" - -#. help text -#: src/ui.ycp:218 -msgid "" -"Automounter is a daemon that mounts directories automatically,\n" -"such as users' home directories.\n" -"It is assumed that its configuration files (auto.*) already exist,\n" -"either locally or over NIS." -msgstr "" - -#. radio button label -#: src/ui.ycp:265 -msgid "Au&tomatic Setup (via NetworkManager and DHCP)" -msgstr "" - -#. radio button label -#: src/ui.ycp:267 -msgid "Au&tomatic Setup (via DHCP)" -msgstr "" - -#. frame label -#: src/ui.ycp:271 src/ui.ycp:840 -msgid "NIS client" -msgstr "" - -#. radio button label -#: src/ui.ycp:278 -msgid "&Static Setup" -msgstr "" - -#. text entry label -#: src/ui.ycp:282 -msgid "N&IS Domain" -msgstr "" - -#. text entry label -#: src/ui.ycp:285 -msgid "&Addresses of NIS servers" -msgstr "" - -#. check box label -#: src/ui.ycp:288 -msgid "Br&oadcast" -msgstr "" - -#. pushbutton label, find nis servers -#. Shortcut must not conflict with Finish and Next (#29960) -#: src/ui.ycp:291 src/ui.ycp:669 -msgid "Fin&d" -msgstr "" - -#: src/ui.ycp:295 -msgid "Additional NIS Domains" -msgstr "" - -#. radio button label -#: src/ui.ycp:320 -msgid "Do &not use NIS" -msgstr "" - -#. radio button label -#: src/ui.ycp:322 -msgid "&Use NIS" -msgstr "" - -#: src/ui.ycp:327 -msgid "Start Auto&mounter" -msgstr "" - -#. button label -#. (short for Expert settings) -#: src/ui.ycp:332 -msgid "E&xpert..." -msgstr "" - -#. dialog title -#: src/ui.ycp:339 src/ui.ycp:847 -msgid "Configuration of NIS client" -msgstr "" - -#. Message popup. The user wants to Find servers -#. but the domain is unknown. -#: src/ui.ycp:386 src/ui.ycp:714 -msgid "Finding servers works only when the domain is known." -msgstr "" - -#. yes-no popup -#: src/ui.ycp:407 -msgid "" -"When you configure your machine as a NIS client,\n" -"you cannot retrieve the user data from LDAP.\n" -"Are you sure?" -msgstr "" - -#. firewall openning help -#: src/ui.ycp:486 -msgid "" -"Firewall Settings \n" -"To open the firewall to allow accessing the 'ypbind' service\n" -"from remote computers, set Open Port in Firewall.\n" -"To select interfaces on which to open the port, click Firewall Details.\n" -"This option is only available if the firewall is enabled.\n" -msgstr "" - -#. help text 1/4 -#: src/ui.ycp:496 -msgid "Normally, it is possible for any host to query which server a client is using. Disabling Answer Remote Hosts restricts this only to the local host." -msgstr "" - -#. help text 2/4 -#. Check, ie. turn on a check box -#: src/ui.ycp:500 -msgid "Check Broken server if answers from servers running on an unprivileged port should be accepted. It is a security risk and it is better to replace such a server." -msgstr "" - -#. help text 3/4 -#: src/ui.ycp:503 -msgid "See man ypbind for details on other options." -msgstr "" - -#. frame label -#. dialog title -#: src/ui.ycp:515 src/ui.ycp:535 -msgid "Expert settings" -msgstr "" - -#. check box label -#: src/ui.ycp:519 -msgid "Ans&wer Remote Hosts" -msgstr "" - -#. check box label -#: src/ui.ycp:521 -msgid "Br&oken server" -msgstr "" - -#. text entry label -#. ypbind is the daemon name -#: src/ui.ycp:525 -msgid "Other &ypbind options" -msgstr "" - -#. Translators: multilineedit label -#. comma: "," -#: src/ui.ycp:658 -msgid "&Servers (separated by spaces or commas)" -msgstr "" - -#. checkbox label -#: src/ui.ycp:663 -msgid "&Broadcast" -msgstr "" - -#. checkbox label -#: src/ui.ycp:666 -msgid "&SLP" -msgstr "" - -#. Translators: popup dialog heading -#: src/ui.ycp:680 -msgid "Domain Settings" -msgstr "" - -#. Add a domain, Adding a domain? Edit... -#. Translators: text entry label -#: src/ui.ycp:683 -msgid "&Domain name" -msgstr "" - -#. Translators: error message -#: src/ui.ycp:751 -msgid "This domain is already defined." -msgstr "" - -#. Translators: error message -#: src/ui.ycp:758 -#, ycp-format -msgid "The format of server address '%1' is not correct." -msgstr "" - -#. error message, 'Broadcast' and 'SLP' are checkboxes -#: src/ui.ycp:766 -msgid "" -"Enabling both Broadcast and SLP options\n" -"does not make any sense. Select just one option." -msgstr "" - -#. help text -#: src/ui.ycp:793 -msgid "Specify the servers for additional domains." -msgstr "" - -#. help text -#: src/ui.ycp:799 -msgid "The Service Location Protocol (SLP) can be used to find NIS server." -msgstr "" - -#. dialog label -#. dialog subtitle -#: src/ui.ycp:808 src/ui.ycp:849 -msgid "Additional Domains" -msgstr "" - -#. table header - Service Location Protocol -#: src/ui.ycp:818 -msgid "SLP" -msgstr "" - -#. button label -#: src/ui.ycp:825 -msgid "A&dd" -msgstr "" - -#. Translators: a yes-no popup -#: src/ui.ycp:926 -msgid "Really delete this domain?" -msgstr "" - -#. popup text FIXME better... -#: src/ui.ycp:1105 -msgid "NIS is now enabled." -msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.13.6/src/Makefile.am new/yast2-nis-client-2.13.8/src/Makefile.am --- old/yast2-nis-client-2.13.6/src/Makefile.am 2006-06-23 14:37:51.000000000 +0200 +++ new/yast2-nis-client-2.13.8/src/Makefile.am 2006-10-26 15:26:44.000000000 +0200 @@ -1,6 +1,7 @@ # Makefile.am for source/nis-client/src myyncludedir = $(yncludedir)/nis +rncdir = $(schemadir)/autoyast/rnc client_DATA = \ nis.ycp \ @@ -15,10 +16,12 @@ desktop_DATA = nis.desktop +rnc_DATA = nis.rnc + nis: ln -sf . $@ ycpchook = nis -EXTRA_DIST = $(client_DATA) $(myynclude_DATA) $(module_DATA) $(desktop_DATA) +EXTRA_DIST = $(client_DATA) $(myynclude_DATA) $(module_DATA) $(desktop_DATA) $(rnc_DATA) include $(top_srcdir)/Makefile.am.common diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.13.6/src/Makefile.in new/yast2-nis-client-2.13.8/src/Makefile.in --- old/yast2-nis-client-2.13.6/src/Makefile.in 2006-08-21 14:01:07.000000000 +0200 +++ new/yast2-nis-client-2.13.8/src/Makefile.in 2006-10-26 15:34:44.000000000 +0200 @@ -62,14 +62,15 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" \ "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" \ - "$(DESTDIR)$(myyncludedir)" + "$(DESTDIR)$(myyncludedir)" "$(DESTDIR)$(rncdir)" clientDATA_INSTALL = $(INSTALL_DATA) desktopDATA_INSTALL = $(INSTALL_DATA) moduleDATA_INSTALL = $(INSTALL_DATA) modulebinDATA_INSTALL = $(INSTALL_DATA) myyncludeDATA_INSTALL = $(INSTALL_DATA) +rncDATA_INSTALL = $(INSTALL_DATA) DATA = $(client_DATA) $(desktop_DATA) $(module_DATA) $(modulebin_DATA) \ - $(myynclude_DATA) + $(myynclude_DATA) $(rnc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AGENT_LIBADD = @AGENT_LIBADD@ @@ -214,6 +215,7 @@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ myyncludedir = $(yncludedir)/nis +rncdir = $(schemadir)/autoyast/rnc client_DATA = \ nis.ycp \ nis-client.ycp \ @@ -226,8 +228,9 @@ Nis.ycp desktop_DATA = nis.desktop +rnc_DATA = nis.rnc ycpchook = nis -EXTRA_DIST = $(client_DATA) $(myynclude_DATA) $(module_DATA) $(desktop_DATA) +EXTRA_DIST = $(client_DATA) $(myynclude_DATA) $(module_DATA) $(desktop_DATA) $(rnc_DATA) modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) modulebindir = $(moduledir) ybcfiles = $(filter %.ybc,$(modulebin_DATA)) @@ -367,6 +370,23 @@ echo " rm -f '$(DESTDIR)$(myyncludedir)/$$f'"; \ rm -f "$(DESTDIR)$(myyncludedir)/$$f"; \ done +install-rncDATA: $(rnc_DATA) + @$(NORMAL_INSTALL) + test -z "$(rncdir)" || $(mkdir_p) "$(DESTDIR)$(rncdir)" + @list='$(rnc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(rncDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rncdir)/$$f'"; \ + $(rncDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rncdir)/$$f"; \ + done + +uninstall-rncDATA: + @$(NORMAL_UNINSTALL) + @list='$(rnc_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(rncdir)/$$f'"; \ + rm -f "$(DESTDIR)$(rncdir)/$$f"; \ + done tags: TAGS TAGS: @@ -409,7 +429,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(myyncludedir)"; do \ + for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(myyncludedir)" "$(DESTDIR)$(rncdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -457,7 +477,8 @@ info-am: install-data-am: install-clientDATA install-desktopDATA \ - install-moduleDATA install-modulebinDATA install-myyncludeDATA + install-moduleDATA install-modulebinDATA install-myyncludeDATA \ + install-rncDATA install-exec-am: @@ -485,7 +506,7 @@ uninstall-am: uninstall-clientDATA uninstall-desktopDATA \ uninstall-info-am uninstall-moduleDATA uninstall-modulebinDATA \ - uninstall-myyncludeDATA + uninstall-myyncludeDATA uninstall-rncDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ dist-hook distclean distclean-generic distclean-libtool \ @@ -493,13 +514,14 @@ install-am install-clientDATA install-data install-data-am \ install-desktopDATA install-exec install-exec-am install-info \ install-info-am install-man install-moduleDATA \ - install-modulebinDATA install-myyncludeDATA install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-clientDATA uninstall-desktopDATA uninstall-info-am \ - uninstall-moduleDATA uninstall-modulebinDATA \ - uninstall-myyncludeDATA + install-modulebinDATA install-myyncludeDATA install-rncDATA \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-clientDATA \ + uninstall-desktopDATA uninstall-info-am uninstall-moduleDATA \ + uninstall-modulebinDATA uninstall-myyncludeDATA \ + uninstall-rncDATA nis: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.13.6/src/nis.desktop new/yast2-nis-client-2.13.8/src/nis.desktop --- old/yast2-nis-client-2.13.6/src/nis.desktop 2006-06-23 14:37:51.000000000 +0200 +++ new/yast2-nis-client-2.13.8/src/nis.desktop 2006-10-26 16:30:27.000000000 +0200 @@ -15,6 +15,7 @@ X-SuSE-YaST-Geometry= X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstClonable=true +X-SuSE-YaST-AutoInstSchema=nis.rnc Icon=yast-nis Exec=/sbin/yast2 nis diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.13.6/src/nis.rnc new/yast2-nis-client-2.13.8/src/nis.rnc --- old/yast2-nis-client-2.13.6/src/nis.rnc 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-nis-client-2.13.8/src/nis.rnc 2006-10-26 15:25:47.000000000 +0200 @@ -0,0 +1,33 @@ +nis = + element nis { + element start_nis { BOOLEAN }? & + element nis_by_dhcp {BOOLEAN }? & + nis_domain? & # may be set by dhcp + nis_servers? & + nis_broadcast? & + element nis_other_domains { + LIST, + element nis_other_domain { + nis_domain & # here it is mandatory + nis_servers? & + nis_broadcast? + }* + }? & + element nis_broken_server { BOOLEAN }? & + element nis_local_only { BOOLEAN }? & + element nis_options { text }? & + + element start_autofs { BOOLEAN }? + } + +nis_domain = + element nis_domain { text } + +nis_servers = + element nis_servers { + LIST, + element nis_server { text }* + } + +nis_broadcast = + element nis_broadcast { BOOLEAN } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-client-2.13.6/src/ui.ycp new/yast2-nis-client-2.13.8/src/ui.ycp --- old/yast2-nis-client-2.13.6/src/ui.ycp 2006-08-22 09:50:01.000000000 +0200 +++ new/yast2-nis-client-2.13.8/src/ui.ycp 2006-09-04 11:05:21.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: ui.ycp 32474 2006-08-22 07:51:37Z jsuchome $ + * $Id: ui.ycp 32473 2006-08-22 07:51:30Z jsuchome $ * * All user interface functions. * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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