Hello community, here is the log from the commit of package kdebase3 checked in at Fri Aug 25 15:00:58 CEST 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-08-24 15:22:03.000000000 +0200 +++ kdebase3/kdebase3.changes 2006-08-25 14:36:36.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 25 14:36:30 CEST 2006 - coolo@suse.de + +- fix more default values for kdmrc + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.1ZNyFW/_old 2006-08-25 14:59:54.000000000 +0200 +++ /var/tmp/diff_new_pack.1ZNyFW/_new 2006-08-25 14:59:54.000000000 +0200 @@ -37,7 +37,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.4 -Release: 6 +Release: 7 %define kde_version 3.5.4 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -310,7 +310,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 107 +Release: 108 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -479,11 +479,6 @@ --with-kdm-pam=xdm \ --with-kcp-pam=xdm \ --with-kss-pam=xdm -%if %suse_version == 920 -%ifarch x86_64 -echo "#undef HAVE_XFIXES" >> config.h -%endif -%endif do_make %{?jobs:-j %jobs} cd ../fileshareset2 ./configure --prefix=%{fileshare_prefix} @@ -531,16 +526,12 @@ # # install pixmaps and configuration # -mkdir -p $RPM_BUILD_ROOT/etc/opt/kde3/share/config/kdm mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/UnitedLinux/addon-scripts/ -rm $RPM_BUILD_ROOT/opt/kde3/share/config/kdm/X* mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT/etc/init.d/ install -m 0644 %SOURCE9 ${RPM_BUILD_ROOT}/opt/kde3/share/apps/kdewizard/pics/wizard_small.png install -m 0744 %SOURCE6 $RPM_BUILD_ROOT/etc/init.d/ksysguardd -%if %suse_version > 920 install -m 0744 %SOURCE10 $RPM_BUILD_ROOT/etc/init.d/earlykdm -%endif mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/ ln -s ../pics/users/root1.png $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/root.face.icon ln -s ../pics/users/default2.png $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/.default.face.icon @@ -552,7 +543,6 @@ # # install kde session file # -%if %suse_version > 920 install -m 0755 -d $RPM_BUILD_ROOT/usr/share/xsessions/ mv $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/sessions/kde.desktop $RPM_BUILD_ROOT/usr/share/xsessions/ # for those we have a package for remove the backup and rely on the package @@ -560,7 +550,6 @@ rm -f $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/sessions/$wm.desktop done %suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/kde.desktop -%endif # # delete unwanted/double files # @@ -653,13 +642,8 @@ %post kdm %{fillup_only -an windowmanager-kdebase3} -%if %suse_version > 920 %{fillup_and_insserv -npY kdebase3-kdm earlykdm} /opt/kde3/bin/genkdmconf -%else -%{fillup_and_insserv -npY kdebase3-kdm} -/opt/kde3/bin/genkdmconf --old-kde /etc/opt/kde3/share/config/ --in /etc/opt/kde3/share/config/kdm/ --old-confs -%endif %if %suse_version > 1000 if test -f /etc/sysconfig/displaymanager ; then . /etc/sysconfig/displaymanager @@ -1290,9 +1274,7 @@ %files kdm %defattr(-,root,root) %dir /opt/kde3/share/doc/kdm -%if %suse_version > 920 /etc/init.d/earlykdm -%endif /opt/kde3/bin/genkdmconf /opt/kde3/bin/kdm* /opt/kde3/bin/krootimage @@ -1300,7 +1282,9 @@ /opt/kde3/share/apps/kdm %doc /opt/kde3/share/doc/kdm/README %config /etc/pam.d/xdm-np -%config(noreplace) /opt/kde3/share/config/kdm +%dir /opt/kde3/share/config/kdm +%config /opt/kde3/share/config/kdm/kdmrc +%config /opt/kde3/share/config/kdm/backgroundrc %ghost /var/run/xdmctl /usr/sbin/rckdm @@ -1311,9 +1295,7 @@ %else /usr/X11R6/bin/kde %endif -%if %suse_version > 920 /usr/share/xsessions -%endif %files extra %defattr(-,root,root) @@ -1364,6 +1346,8 @@ %endif %changelog -n kdebase3 +* Fri Aug 25 2006 - coolo@suse.de +- fix more default values for kdmrc * Wed Aug 23 2006 - coolo@suse.de - rework the way kdmrc is handled (rather experimental): - the KDE defaults are changed right in the build where the value ++++++ kdm-fix-default-kdmrc.diff ++++++ --- /var/tmp/diff_new_pack.1ZNyFW/_old 2006-08-25 14:59:56.000000000 +0200 +++ /var/tmp/diff_new_pack.1ZNyFW/_new 2006-08-25 14:59:56.000000000 +0200 @@ -1,16 +1,35 @@ Index: kdm/config.def =================================================================== ---- kdm/config.def (Revision 567799) +--- kdm/config.def (Revision 576916) +++ kdm/config.def (Arbeitskopie) -@@ -901,7 +901,7 @@ +@@ -874,10 +874,10 @@ + + Key: PidFile + Type: string +-Default: "" ++Default: "/var/run/kdm.pid" + User: core +-Instance: "/var/run/kdm.pid" +-Merge: xdm ++Instance: "" ++Update: reset_sec + Comment: + Where &kdm; should store its PID (do not store if empty). + Description: +@@ -901,10 +901,10 @@ Key: AuthDir Type: path # differs from XDM -Default: "/var/run/xauth" +Default: "/var/lib/xdm/authdir/authfiles" User: core - Instance: #"/tmp" - Merge: xdm(P_authDir) +-Instance: #"/tmp" +-Merge: xdm(P_authDir) ++Instance: #"" ++Update: reset_sec + Comment: + Where to store authorization files. + Description: @@ -930,7 +930,7 @@ Key: ExportList @@ -20,7 +39,19 @@ User: core Instance: #"LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR" Merge: xdm(P_List) -@@ -1102,7 +1102,7 @@ +@@ -1063,9 +1063,10 @@ + + Key: Enable + Type: bool +-Default: true ++Default: false + User: dep(xdmcpEnable) + Instance: false ++Update: reset_sec + Comment: & + Description: + Whether &kdm; should listen to incoming &XDMCP; requests. +@@ -1102,11 +1103,10 @@ Key: Xaccess Type: string # differs from xdm @@ -28,8 +59,13 @@ +Default: *"/etc/X11/xdm/Xaccess" User: config(Xaccess) Instance: #"" - Update: mk_xaccess -@@ -1164,7 +1164,7 @@ +-Update: mk_xaccess +-Merge: xdm:accessFile ++Update: reset_sec + Comment: + &XDMCP; access control file in the usual XDM-Xaccess format. + Description: +@@ -1164,13 +1164,11 @@ Key: Willing Type: string @@ -38,7 +74,14 @@ User: core # will be overwritten Instance: # -@@ -1244,7 +1244,7 @@ +-Update: mk_willing +-Merge: xdm +-Merge: kdm:Xwilling ++Update: reset_sec + Comment: + The program which is invoked to dynamically generate replies to &XDMCP; + DirectQuery or BroadcastQuery requests. +@@ -1244,7 +1242,7 @@ None/BO_NONE: no boot manager Grub/BO_GRUB: Grub boot manager Lilo/BO_LILO: Lilo boot manager (Linux on i386 & x86-64 only) @@ -47,7 +90,24 @@ User: core User: greeter Instance: #Grub -@@ -1549,7 +1549,7 @@ +@@ -1347,6 +1345,7 @@ + DDefault: - + User: core + Instance: :*/DEF_SERVER_CMD ++Update: reset_sec + Comment: + The command line to start the &X-Server;, without display number and VT spec. + This string is subject to word splitting. +@@ -1355,7 +1354,7 @@ + This string is subject to word splitting. + </para><para> + The default is something reasonable for the system on which &kdm; was built, +- like <command>/usr/X11R6/bin/X</command>. ++ like <command>/usr/bin/X</command>. + + Key: ServerArgsLocal + Type: string +@@ -1549,11 +1548,10 @@ Key: Resources # XXX strictly speaking this is supposed to be a string list, i think. Type: string @@ -55,8 +115,13 @@ +Default: "/etx/X11/xdm/Xresources" User: core Instance: #*/"" - Update: cp_resources -@@ -1581,7 +1581,7 @@ +-Update: cp_resources +-Merge: xdm ++Update: reset_sec + Comment: + Specify a file with X-resources for the greeter, chooser and background. + The KDE frontend does not use this file, so you do not need it unless you +@@ -1581,12 +1579,11 @@ Key: Setup Type: string @@ -65,7 +130,13 @@ User: core # will be overwritten Instance: #*/"" -@@ -1602,7 +1602,7 @@ +-Update: mk_setup +-Merge: xdm ++Update: reset_sec + Comment: + A program to run before the greeter is shown. Can be used to start an + xconsole or an alternative background generator. Subject to word splitting. +@@ -1602,12 +1599,11 @@ Key: Startup Type: string @@ -74,7 +145,13 @@ User: core # will be overwritten Instance: #*/"" -@@ -1620,7 +1620,7 @@ +-Update: mk_startup +-Merge: xdm ++Update: reset_sec + Comment: + A program to run before a user session starts. Subject to word splitting. + Description: +@@ -1620,12 +1616,11 @@ Key: Reset Type: string @@ -83,7 +160,13 @@ User: core # will be overwritten Instance: #*/"" -@@ -1638,7 +1638,7 @@ +-Update: mk_reset +-Merge: xdm ++Update: reset_sec + Comment: + A program to run after a user session exits. Subject to word splitting. + Description: +@@ -1638,12 +1633,12 @@ Key: Session Type: string @@ -92,16 +175,89 @@ #Merge: xdm - incompatible! User: core # will be overwritten -@@ -1921,7 +1921,7 @@ + Instance: #*/"" +-Update: mk_session ++Update: reset_sec + Comment: + The program which is run as the user which logs in. It is supposed to + interpret the session argument (see SessionsDirs) and start an appropriate +@@ -1764,6 +1759,7 @@ + # sensible? + Instance: */false + Instance: :*/true ++Update: reset_sec + Merge: xdm + Comment: + Allow to log in, when user has set an empty password? +@@ -1779,8 +1775,9 @@ + User: core + User: greeter + Instance: */Root +-Instance: :*/All +-Merge: kdm:-Greeter/ ++Instance: #:*/All ++Update: reset_sec ++#Merge: kdm:-Greeter/ + Comment: & + Description: + Who is allowed to shut down the system. This applies both to the +@@ -1857,6 +1854,7 @@ + Default: false + User: dep + Instance: #:0/true ++Update: reset_sec + Comment: & + Description: + Enable automatic login. <emphasis>Use with extreme care!</emphasis> +@@ -1890,7 +1888,7 @@ + PostProc: PautoLoginX + User: core(autoUser) + User: greeter +-Instance: #:0/"fred" ++Instance: #:0/"" + Merge: xdm:autoUser(P_autoUser) + Comment: & + Description: +@@ -1921,10 +1919,10 @@ Key: SessionsDirs Type: list -Default: KDMDATA "/sessions" -+Default: KDMDATA "/sessions,/usr/share/xsessions" ++Default: "/etc/X11/sessions," KDMDATA "/sessions,/usr/share/xsessions" User: core User: greeter-c - Instance: #*/"/etc/X11/sessions,/usr/share/xsessions" -@@ -2360,7 +2360,7 @@ +-Instance: #*/"/etc/X11/sessions,/usr/share/xsessions" ++Instance: #*/"" + Comment: + The directories containing session type definitions in .desktop format. + Description: +@@ -1999,7 +1997,8 @@ + Clock/LOGO_CLOCK: a neat analog clock + Default: Clock + User: greeter +-Instance: */Logo ++Instance: */Clock ++Update: reset_sec + Comment: + What should be shown in the greeter's logo are: + Description: +@@ -2214,7 +2213,7 @@ + + Key: HiddenUsers + Type: list +-Default: "" ++Default: "root" + User: greeter-c(noUsers) + Instance: #*/"root" + # depends on {Min,Max}ShowUID +@@ -2354,13 +2353,14 @@ + Default: OneStar + User: greeter + Instance: #*/NoEcho ++Update: reset_sec + Comment: & + Description: + The password input fields cloak the typed in text. Specify, how to do it: Key: UseBackground Type: bool @@ -110,7 +266,29 @@ User: greeter Instance: #*/! Comment: -@@ -2597,7 +2597,7 @@ +@@ -2498,6 +2498,7 @@ + Default: false + User: greeter + Instance: :0/true ++Update: reset_sec + Comment: + Enable &kdm;'s built-in xconsole. Note that this can be enabled for only + one display at a time. +@@ -2586,10 +2587,11 @@ + + Key: Preloader + Type: string +-Default: "" ++Default: KDE_BINDIR "/preloadkde" + User: greeter-c +-Instance: */KDE_BINDIR "/preloadkde" ++Instance: */"" + Comment: & ++Update: reset_sec + Description: + A program to run while the greeter is visible. It is supposed to preload + as much as possible of the session that is going to be started (most +@@ -2597,7 +2599,7 @@ Key: UseTheme Type: bool @@ -119,12 +297,34 @@ User: greeter Instance: #*/true Comment: & -@@ -2608,7 +2608,7 @@ +@@ -2606,9 +2608,10 @@ + + Key: Theme Type: string - Default: "" +-Default: "" ++Default: KDMDATA "/themes/SUSE" User: greeter -Instance: */KDMDATA "/themes/circles" -+Instance: */KDMDATA "/themes/SUSE" ++Instance: */"" ++Update: reset_sec Comment: & Description: The theme to use for the greeter. Can point to either a directory or an XML +Index: kdm/kfrontend/genkdmconf.c +=================================================================== +--- kdm/kfrontend/genkdmconf.c (Revision 576916) ++++ kdm/kfrontend/genkdmconf.c (Arbeitskopie) +@@ -1363,6 +1363,13 @@ + } + #endif + ++static void ++reset_sec( Entry *ce, Section *cs ATTR_UNUSED ) ++{ ++ ce->active = 0; ++ return; ++} ++ + #ifdef XDMCP + static void + cp_keyfile( Entry *ce, Section *cs ATTR_UNUSED ) ++++++ kdm-sysconfig-values.diff ++++++ --- /var/tmp/diff_new_pack.1ZNyFW/_old 2006-08-25 14:59:56.000000000 +0200 +++ /var/tmp/diff_new_pack.1ZNyFW/_new 2006-08-25 14:59:56.000000000 +0200 @@ -265,7 +265,7 @@ + return; + confread++; + -+ system("/opt/kde3/share/apps/kdm/read_config.sh"); ++ system("/opt/kde3/share/apps/kdm/read_sysconfig.sh"); + ReadConfFile("/var/adm/kdm/kdmrc.sysconfig"); + ReadConfFile(kdmrc); +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org