August 2008 - openSUSE Commits - openSUSE Mailing Lists

commit petitboot
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package petitboot checked in at Thu Aug 7 01:13:15 CEST 2008. -------- --- arch/ppc/petitboot/petitboot.changes 2008-07-03 15:27:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/petitboot/petitboot.changes 2008-08-07 01:12:50.282983000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 7 01:12:40 CEST 2008 - ro(a)suse.de + +- add exclusivearch to specfile + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ petitboot.spec ++++++ --- /var/tmp/diff_new_pack.Y12972/_old 2008-08-07 01:13:03.000000000 +0200 +++ /var/tmp/diff_new_pack.Y12972/_new 2008-08-07 01:13:03.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package petitboot (Version 0.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,7 +20,7 @@ Name: petitboot Version: 0.2 -Release: 48 +Release: 61 Url: http://ozlabs.org/~jk/projects/petitboot/ Summary: Petitboot is a graphical bootloader for the PlayStation 3 License: GPL v2 only @@ -42,6 +49,7 @@ Patch14: petitboot.picture-permissions.patch Patch15: petitboot.new-udev-uses-udevadm.patch Group: System/Boot +ExclusiveArch: ppc ppc64 %description Petitboot is a graphical bootloader for the PlayStation 3. It's based @@ -116,6 +124,8 @@ %endif %changelog +* Thu Aug 07 2008 ro(a)suse.de +- add exclusivearch to specfile * Thu Jul 03 2008 sassmann(a)suse.de - fix gen-initrd.sh script because udev changed. udevsettle and udevtrigger got replaced by udevadm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 apparmor-profiles
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package apparmor-profiles checked in at Thu Aug 7 01:10:04 CEST 2008. -------- --- apparmor-profiles/apparmor-profiles.changes 2008-05-07 14:46:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/apparmor-profiles/apparmor-profiles.changes 2008-08-06 20:19:36.193544000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 6 20:19:12 CEST 2008 - ro(a)suse.de + +- add dac_override to ntp profile to let it write its pid file + +------------------------------------------------------------------- New: ---- ntp-dac_override-pidfile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor-profiles.spec ++++++ --- /var/tmp/diff_new_pack.k27430/_old 2008-08-07 01:09:46.000000000 +0200 +++ /var/tmp/diff_new_pack.k27430/_new 2008-08-07 01:09:46.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package apparmor-profiles (Version 2.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,7 +24,7 @@ %endif Summary: AppArmor profiles that are loaded into the apparmor kernel module Version: 2.3 -Release: 6 +Release: 23 Group: Productivity/Security Source0: %{name}-%{version}-1112.tar.gz License: GPL v2 or later @@ -32,6 +39,7 @@ Patch2: sbin.syslog-ng-bnc#334557.patch Patch3: usr.sbin.ntpd-bnc#230700.patch Patch4: ntp-chroot-bnc#256291.patch +Patch5: ntp-dac_override-pidfile.patch # hrm, still need to enumerate each directory in these paths in files :( %define extras_dir %{_sysconfdir}/apparmor/profiles/extras/ %define profiles_dir %{_sysconfdir}/apparmor.d/ @@ -60,6 +68,7 @@ %patch2 -p2 %patch3 -p2 %patch4 -p2 +%patch5 -p0 %build # nothing to do here @@ -87,6 +96,8 @@ %preun %changelog +* Wed Aug 06 2008 ro(a)suse.de +- add dac_override to ntp profile to let it write its pid file * Wed May 07 2008 jjohansen(a)suse.de - patch usr.bin.opera so that it will allow startup bnc#307365 - patch sbin.syslogd to allow locking of log file bnc#33144 ++++++ ntp-dac_override-pidfile.patch ++++++ --- apparmor.d/usr.sbin.ntpd +++ apparmor.d/usr.sbin.ntpd @@ -17,6 +17,7 @@ #include <abstractions/nameservice> #include <abstractions/xad> + capability dac_override, capability ipc_lock, capability net_bind_service, capability setgid, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 alsa-utils
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package alsa-utils checked in at Thu Aug 7 01:09:35 CEST 2008. -------- --- alsa-utils/alsa-utils.changes 2008-07-15 18:35:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/alsa-utils/alsa-utils.changes 2008-08-06 16:08:12.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 6 16:07:41 CEST 2008 - tiwai(a)suse.de + +- alsactl init implementation (still non-working status, though) +- iecset utility updates for new IEC958 status bits + +------------------------------------------------------------------- New: ---- alsa-utils-git-fixes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-utils.spec ++++++ --- /var/tmp/diff_new_pack.L26373/_old 2008-08-07 01:08:44.000000000 +0200 +++ /var/tmp/diff_new_pack.L26373/_new 2008-08-07 01:08:44.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package alsa-utils (Version 1.0.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,7 +19,7 @@ Name: alsa-utils -BuildRequires: alsa-devel ncurses-devel +BuildRequires: alsa-devel ncurses-devel xmlto %define package_version 1.0.17 License: GPL v2 or later Group: Productivity/Multimedia/Sound/Players @@ -21,9 +28,9 @@ AutoReqProv: on Summary: Advanced Linux Sound Architecture Utilities Version: 1.0.17 -Release: 1 +Release: 10 Source: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2 -# Patch: alsa-utils-git-fixes.diff +Patch: alsa-utils-git-fixes.diff Url: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,7 +47,7 @@ %prep %setup -q -n %{name}-%{package_version} -# %patch -p1 +%patch -p1 mv alsamixer/README alsamixer/README-alsamixer %build @@ -69,6 +76,9 @@ %{_datadir}/alsa %changelog +* Wed Aug 06 2008 tiwai(a)suse.de +- alsactl init implementation (still non-working status, though) +- iecset utility updates for new IEC958 status bits * Tue Jul 15 2008 tiwai(a)suse.de - updated to 1.0.17-final: * just a version bump ++++++ alsa-utils-git-fixes.diff ++++++ ++++ 3842 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa-plugins
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package alsa-plugins checked in at Thu Aug 7 01:08:31 CEST 2008. -------- --- alsa-plugins/alsa-plugins.changes 2008-08-02 02:21:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/alsa-plugins/alsa-plugins.changes 2008-08-06 15:48:10.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 6 15:40:34 CEST 2008 - tiwai(a)suse.de + +- updated to git snapshot 20080806: + * added usb-stream PCM plugin for US122L devices +- add config tag to pulse-related config files + +------------------------------------------------------------------- @@ -4 +11 @@ -- fix silent output of short streams (bnc#409645) +- fix slient output of short streams (bnc#409645) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-plugins-a52.spec ++++++ --- /var/tmp/diff_new_pack.g25351/_old 2008-08-07 01:08:18.000000000 +0200 +++ /var/tmp/diff_new_pack.g25351/_new 2008-08-07 01:08:18.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package alsa-plugins-a52 (Version 1.0.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,7 +24,7 @@ Url: http://www.alsa-project.org/ Summary: A52 Encoding Plug-In for the ALSA Library Version: 1.0.17 -Release: 12 +Release: 18 License: GPL v2 or later; LGPL v2.1 or later Group: System/Libraries AutoReqProv: on ++++++ alsa-plugins.spec ++++++ --- /var/tmp/diff_new_pack.g25351/_old 2008-08-07 01:08:18.000000000 +0200 +++ /var/tmp/diff_new_pack.g25351/_new 2008-08-07 01:08:18.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package alsa-plugins (Version 1.0.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,7 +24,7 @@ Url: http://www.alsa-project.org/ Summary: Extra Plug-Ins for the ALSA Library Version: 1.0.17 -Release: 14 +Release: 20 License: BSD 3-Clause; LGPL v2.1 or later Group: System/Libraries AutoReqProv: on @@ -132,6 +139,7 @@ %{_libdir}/alsa-lib/libasound_module_pcm_oss.so %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so +%{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so %{_libdir}/alsa-lib/libasound_module_rate_speexrate*.so %files jack @@ -147,8 +155,8 @@ %{_libdir}/alsa-lib/libasound_module_ctl_pulse.so %{_libdir}/alsa-lib/libasound_module_pcm_pulse.so %{_libdir}/alsa-lib/libasound_module_conf_pulse.so -/etc/asound-pulse.conf -/etc/alsa-pulse.conf +%config /etc/asound-pulse.conf +%config /etc/alsa-pulse.conf %files maemo %defattr(-, root, root) @@ -164,8 +172,12 @@ %{_libdir}/alsa-lib/libasound_module_rate_samplerate*.so %changelog +* Wed Aug 06 2008 tiwai(a)suse.de +- updated to git snapshot 20080806: + * added usb-stream PCM plugin for US122L devices +- add config tag to pulse-related config files * Mon Jul 28 2008 tiwai(a)suse.de -- fix silent output of short streams (bnc#409645) +- fix slient output of short streams (bnc#409645) * Wed Jul 16 2008 tiwai(a)suse.de - don't use assert() for sanity checks (bnc#409532) * Tue Jul 15 2008 tiwai(a)suse.de ++++++ alsa-plugins-git-fixes.diff ++++++ ++++ 658 lines (skipped) ++++ between alsa-plugins/alsa-plugins-git-fixes.diff ++++ and /mounts/work_src_done/STABLE/alsa-plugins/alsa-plugins-git-fixes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 alsa
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package alsa checked in at Thu Aug 7 01:08:07 CEST 2008. -------- --- alsa/alsa.changes 2008-07-28 18:17:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/alsa/alsa.changes 2008-08-06 15:52:05.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 6 15:32:54 CEST 2008 - tiwai(a)suse.de + +- fix the detection of non-interleaved format in dmix code +- fix the detection of old timer tread support in dmix +- update IEC958 status bits for recent additions of consumer mode +- move alsa-info.sh to sbindir + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.x24162/_old 2008-08-07 01:07:43.000000000 +0200 +++ /var/tmp/diff_new_pack.x24162/_new 2008-08-07 01:07:43.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package alsa (Version 1.0.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -22,7 +29,7 @@ AutoReqProv: on Summary: Advanced Linux Sound Architecture Version: 1.0.17 -Release: 6 +Release: 10 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source8: 40-alsa.rules Source11: alsasound @@ -178,8 +185,8 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-lib cp COPYING ChangeLog INSTALL TODO MEMORY-LEAK $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-lib cp doc/asoundrc.txt $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-lib -# install alsa-info.sh to docdir -install -c -m 0755 %{SOURCE33} $RPM_BUILD_ROOT%{_docdir}/%{name} +# install alsa-info.sh to sbindir +install -c -m 0755 %{SOURCE33} $RPM_BUILD_ROOT%{_sbindir} %post %{rename_sysconfig_variable START_ALSA_SEQ LOAD_SEQUENCER} @@ -252,6 +259,11 @@ %{_datadir}/alsa %changelog +* Wed Aug 06 2008 tiwai(a)suse.de +- fix the detection of non-interleaved format in dmix code +- fix the detection of old timer tread support in dmix +- update IEC958 status bits for recent additions of consumer mode +- move alsa-info.sh to sbindir * Mon Jul 28 2008 tiwai(a)suse.de - fix snd_pcm_rewind() and snd_pcm_forward() for plugins, mainly for pulseaudio ++++++ alsa-lib-git-fixes.diff ++++++ --- /var/tmp/diff_new_pack.x24162/_old 2008-08-07 01:07:43.000000000 +0200 +++ /var/tmp/diff_new_pack.x24162/_new 2008-08-07 01:07:43.000000000 +0200 @@ -1,3 +1,151 @@ +diff --git a/include/asoundef.h b/include/asoundef.h +index e780c65..c6c4eec 100644 +--- a/include/asoundef.h ++++ b/include/asoundef.h +@@ -69,35 +69,56 @@ extern "C" { + #define IEC958_AES1_PRO_USERBITS_UDEF (12<<4) /**< user defined application */ + #define IEC958_AES1_CON_CATEGORY 0x7f /**< consumer category */ + #define IEC958_AES1_CON_GENERAL 0x00 /**< general category */ +-#define IEC958_AES1_CON_EXPERIMENTAL 0x40 /**< experimental category */ +-#define IEC958_AES1_CON_SOLIDMEM_MASK 0x0f /**< ??? */ +-#define IEC958_AES1_CON_SOLIDMEM_ID 0x08 /**< ??? */ +-#define IEC958_AES1_CON_BROADCAST1_MASK 0x07 /**< ??? */ +-#define IEC958_AES1_CON_BROADCAST1_ID 0x04 /**< ??? */ +-#define IEC958_AES1_CON_DIGDIGCONV_MASK 0x07 /**< digital<->digital converter mask */ +-#define IEC958_AES1_CON_DIGDIGCONV_ID 0x02 /**< digital<->digital converter id */ +-#define IEC958_AES1_CON_ADC_COPYRIGHT_MASK 0x1f /**< ADC Copyright mask */ +-#define IEC958_AES1_CON_ADC_COPYRIGHT_ID 0x06 /**< ADC Copyright ID */ +-#define IEC958_AES1_CON_ADC_MASK 0x1f /**< ADC Mask */ +-#define IEC958_AES1_CON_ADC_ID 0x16 /**< ADC ID */ +-#define IEC958_AES1_CON_BROADCAST2_MASK 0x0f /**< Broadcast mask */ +-#define IEC958_AES1_CON_BROADCAST2_ID 0x0e /**< Broadcast ID */ + #define IEC958_AES1_CON_LASEROPT_MASK 0x07 /**< Laser-optical mask */ + #define IEC958_AES1_CON_LASEROPT_ID 0x01 /**< Laser-optical ID */ +-#define IEC958_AES1_CON_MUSICAL_MASK 0x07 /**< Musical device mask */ +-#define IEC958_AES1_CON_MUSICAL_ID 0x05 /**< Musical device ID */ +-#define IEC958_AES1_CON_MAGNETIC_MASK 0x07 /**< Magnetic device mask */ +-#define IEC958_AES1_CON_MAGNETIC_ID 0x03 /**< Magnetic device ID */ + #define IEC958_AES1_CON_IEC908_CD (IEC958_AES1_CON_LASEROPT_ID|0x00) /**< IEC958 CD compatible device */ + #define IEC958_AES1_CON_NON_IEC908_CD (IEC958_AES1_CON_LASEROPT_ID|0x08) /**< non-IEC958 CD compatible device */ ++#define IEC958_AES1_CON_MINI_DISC (IEC958_AES1_CON_LASEROPT_ID|0x48) /**< Mini-Disc device */ ++#define IEC958_AES1_CON_DVD (IEC958_AES1_CON_LASEROPT_ID|0x18) /**< DVD device */ ++#define IEC958_AES1_CON_LASTEROPT_OTHER (IEC958_AES1_CON_LASEROPT_ID|0x78) /**< Other laser-optical product */ ++#define IEC958_AES1_CON_DIGDIGCONV_MASK 0x07 /**< digital<->digital converter mask */ ++#define IEC958_AES1_CON_DIGDIGCONV_ID 0x02 /**< digital<->digital converter id */ + #define IEC958_AES1_CON_PCM_CODER (IEC958_AES1_CON_DIGDIGCONV_ID|0x00) /**< PCM coder */ +-#define IEC958_AES1_CON_SAMPLER (IEC958_AES1_CON_DIGDIGCONV_ID|0x20) /**< PCM sampler */ +-#define IEC958_AES1_CON_MIXER (IEC958_AES1_CON_DIGDIGCONV_ID|0x10) /**< Mixer */ ++#define IEC958_AES1_CON_MIXER (IEC958_AES1_CON_DIGDIGCONV_ID|0x10) /**< Digital signal mixer */ + #define IEC958_AES1_CON_RATE_CONVERTER (IEC958_AES1_CON_DIGDIGCONV_ID|0x18) /**< Rate converter */ +-#define IEC958_AES1_CON_SYNTHESIZER (IEC958_AES1_CON_MUSICAL_ID|0x00) /**< Synthesizer */ +-#define IEC958_AES1_CON_MICROPHONE (IEC958_AES1_CON_MUSICAL_ID|0x08) /**< Microphone */ ++#define IEC958_AES1_CON_SAMPLER (IEC958_AES1_CON_DIGDIGCONV_ID|0x20) /**< PCM sampler */ ++#define IEC958_AES1_CON_DSP (IEC958_AES1_CON_DIGDIGCONV_ID|0x28) /**< Digital sound processor */ ++#define IEC958_AES1_CON_DIGDIGCONV_OTHER (IEC958_AES1_CON_DIGDIGCONV_ID|0x78) /**< Other digital<->digital product */ ++#define IEC958_AES1_CON_MAGNETIC_MASK 0x07 /**< Magnetic device mask */ ++#define IEC958_AES1_CON_MAGNETIC_ID 0x03 /**< Magnetic device ID */ + #define IEC958_AES1_CON_DAT (IEC958_AES1_CON_MAGNETIC_ID|0x00) /**< Digital Audio Tape */ + #define IEC958_AES1_CON_VCR (IEC958_AES1_CON_MAGNETIC_ID|0x08) /**< Video recorder */ ++#define IEC958_AES1_CON_DCC (IEC958_AES1_CON_MAGNETIC_ID|0x40) /**< Digital compact cassette */ ++#define IEC958_AES1_CON_MAGNETIC_DISC (IEC958_AES1_CON_MAGNETIC_ID|0x18) /**< Magnetic disc digital audio device */ ++#define IEC958_AES1_CON_MAGNETIC_OTHER (IEC958_AES1_CON_MAGNETIC_ID|0x78) /**< Other magnetic device */ ++#define IEC958_AES1_CON_BROADCAST1_MASK 0x07 /**< Broadcast mask */ ++#define IEC958_AES1_CON_BROADCAST1_ID 0x04 /**< Broadcast ID */ ++#define IEC958_AES1_CON_DAB_JAPAN (IEC958_AES1_CON_BROADCAST1_ID|0x00) /**< Digital audio broadcast (Japan) */ ++#define IEC958_AES1_CON_DAB_EUROPE (IEC958_AES1_CON_BROADCAST1_ID|0x08) /**< Digital audio broadcast (Europe) */ ++#define IEC958_AES1_CON_DAB_USA (IEC958_AES1_CON_BROADCAST1_ID|0x60) /**< Digital audio broadcast (USA) */ ++#define IEC958_AES1_CON_SOFTWARE (IEC958_AES1_CON_BROADCAST1_ID|0x40) /**< Electronic software delivery */ ++#define IEC958_AES1_CON_IEC62105 (IEC958_AES1_CON_BROADCAST1_ID|0x20) /**< Used by another standard (IEC 62105) */ ++#define IEC958_AES1_CON_BROADCAST1_OTHER (IEC958_AES1_CON_BROADCAST1_ID|0x78) /**< Other broadcast product */ ++#define IEC958_AES1_CON_BROADCAST2_MASK 0x0f /**< Broadcast alternative mask */ ++#define IEC958_AES1_CON_BROADCAST2_ID 0x0e /**< Broadcast alternative ID */ ++#define IEC958_AES1_CON_MUSICAL_MASK 0x07 /**< Musical device mask */ ++#define IEC958_AES1_CON_MUSICAL_ID 0x05 /**< Musical device ID */ ++#define IEC958_AES1_CON_SYNTHESIZER (IEC958_AES1_CON_MUSICAL_ID|0x00) /**< Synthesizer */ ++#define IEC958_AES1_CON_MICROPHONE (IEC958_AES1_CON_MUSICAL_ID|0x08) /**< Microphone */ ++#define IEC958_AES1_CON_MUSICAL_OTHER (IEC958_AES1_CON_MUSICAL_ID|0x78) /**< Other musical device */ ++#define IEC958_AES1_CON_ADC_MASK 0x1f /**< ADC Mask */ ++#define IEC958_AES1_CON_ADC_ID 0x06 /**< ADC ID */ ++#define IEC958_AES1_CON_ADC (IEC958_AES1_CON_ADC_ID|0x00) /**< ADC without copyright information */ ++#define IEC958_AES1_CON_ADC_OTHER (IEC958_AES1_CON_ADC_ID|0x60) /**< Other ADC product (with no copyright information) */ ++#define IEC958_AES1_CON_ADC_COPYRIGHT_MASK 0x1f /**< ADC Copyright mask */ ++#define IEC958_AES1_CON_ADC_COPYRIGHT_ID 0x16 /**< ADC Copyright ID */ ++#define IEC958_AES1_CON_ADC_COPYRIGHT (IEC958_AES1_CON_ADC_COPYRIGHT_ID|0x00) /**< ADC with copyright information */ ++#define IEC958_AES1_CON_ADC_COPYRIGHT_OTHER (IEC958_AES1_CON_ADC_COPYRIGHT_ID|0x60) /**< Other ADC with copyright information product */ ++#define IEC958_AES1_CON_SOLIDMEM_MASK 0x0f /**< Solid memory based products mask */ ++#define IEC958_AES1_CON_SOLIDMEM_ID 0x08 /**< Solid memory based products ID */ ++#define IEC958_AES1_CON_SOLIDMEM_DIGITAL_RECORDER_PLAYER (IEC958_AES1_CON_SOLIDMEM_ID|0x00) /**< Digital audio recorder and player using solid state memory */ ++#define IEC958_AES1_CON_SOLIDMEM_OTHER (IEC958_AES1_CON_SOLIDMEM_ID|0x70) /**< Other solid state memory based product */ ++#define IEC958_AES1_CON_EXPERIMENTAL 0x40 /**< experimental category */ + #define IEC958_AES1_CON_ORIGINAL (1<<7) /**< this bits depends on the category code */ + #define IEC958_AES2_PRO_SBITS (7<<0) /**< mask - sample bits */ + #define IEC958_AES2_PRO_SBITS_20 (2<<0) /**< 20-bit - coordination */ +@@ -115,8 +136,16 @@ extern "C" { + #define IEC958_AES2_CON_CHANNEL_UNSPEC (0<<4) /**< channel number unspecified */ + #define IEC958_AES3_CON_FS (15<<0) /**< mask - sample frequency */ + #define IEC958_AES3_CON_FS_44100 (0<<0) /**< 44.1kHz */ ++#define IEC958_AES3_CON_FS_NOTID (1<<0) /**< sample frequency non indicated */ + #define IEC958_AES3_CON_FS_48000 (2<<0) /**< 48kHz */ + #define IEC958_AES3_CON_FS_32000 (3<<0) /**< 32kHz */ ++#define IEC958_AES3_CON_FS_22050 (4<<0) /**< 22.05kHz */ ++#define IEC958_AES3_CON_FS_24000 (6<<0) /**< 24kHz */ ++#define IEC958_AES3_CON_FS_88200 (8<<0) /**< 88.2kHz */ ++#define IEC958_AES3_CON_FS_768000 (9<<0) /**< 768kHz */ ++#define IEC958_AES3_CON_FS_96000 (10<<0) /**< 96kHz */ ++#define IEC958_AES3_CON_FS_176400 (12<<0) /**< 176.4kHz */ ++#define IEC958_AES3_CON_FS_192000 (14<<0) /**< 192kHz */ + #define IEC958_AES3_CON_CLOCK (3<<4) /**< mask - clock accuracy */ + #define IEC958_AES3_CON_CLOCK_1000PPM (0<<4) /**< 1000 ppm */ + #define IEC958_AES3_CON_CLOCK_50PPM (1<<4) /**< 50 ppm */ +@@ -129,6 +158,26 @@ extern "C" { + #define IEC958_AES4_CON_WORDLEN_23_19 (4<<1) /**< 23-bit or 19-bit */ + #define IEC958_AES4_CON_WORDLEN_24_20 (5<<1) /**< 24-bit or 20-bit */ + #define IEC958_AES4_CON_WORDLEN_21_17 (6<<1) /**< 21-bit or 17-bit */ ++#define IEC958_AES4_CON_ORIGFS (15<<4) /**< mask - original sample frequency */ ++#define IEC958_AES4_CON_ORIGFS_NOTID (0<<4) /**< original sample frequency not indicated */ ++#define IEC958_AES4_CON_ORIGFS_192000 (1<<4) /**< 192kHz */ ++#define IEC958_AES4_CON_ORIGFS_12000 (2<<4) /**< 12kHz */ ++#define IEC958_AES4_CON_ORIGFS_176400 (3<<4) /**< 176.4kHz */ ++#define IEC958_AES4_CON_ORIGFS_96000 (5<<4) /**< 96kHz */ ++#define IEC958_AES4_CON_ORIGFS_8000 (6<<4) /**< 8kHz */ ++#define IEC958_AES4_CON_ORIGFS_88200 (7<<4) /**< 88.2kHz */ ++#define IEC958_AES4_CON_ORIGFS_16000 (8<<4) /**< 16kHz */ ++#define IEC958_AES4_CON_ORIGFS_24000 (9<<4) /**< 24kHz */ ++#define IEC958_AES4_CON_ORIGFS_11025 (10<<4) /**< 11.025kHz */ ++#define IEC958_AES4_CON_ORIGFS_22050 (11<<4) /**< 22.05kHz */ ++#define IEC958_AES4_CON_ORIGFS_32000 (12<<4) /**< 32kHz */ ++#define IEC958_AES4_CON_ORIGFS_48000 (13<<4) /**< 48kHz */ ++#define IEC958_AES4_CON_ORIGFS_44100 (15<<4) /**< 44.1kHz */ ++#define IEC958_AES5_CON_CGMSA (3<<0) /**< mask - CGMS-A */ ++#define IEC958_AES5_CON_CGMSA_COPYFREELY (0<<0) /**< copying is permitted without restriction */ ++#define IEC958_AES5_CON_CGMSA_COPYONCE (1<<0) /**< one generation of copies may be made */ ++#define IEC958_AES5_CON_CGMSA_COPYNOMORE (2<<0) /**< condition not be used */ ++#define IEC958_AES5_CON_CGMSA_COPYNEVER (3<<0) /**< no copying is permitted */ + + /** \} */ + +diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c +index a884b12..1170963 100644 +--- a/src/pcm/pcm_direct.c ++++ b/src/pcm/pcm_direct.c +@@ -1107,7 +1107,7 @@ int snd_pcm_direct_initialize_poll_fd(snd_pcm_direct_t *dmix) + snd_pcm_info_get_subdevice(info) * 2 + capture); + ret = snd_timer_open(&dmix->timer, name, SND_TIMER_OPEN_NONBLOCK | SND_TIMER_OPEN_TREAD); + if (ret < 0) { +- dmix->tread = 1; ++ dmix->tread = 0; + ret = snd_timer_open(&dmix->timer, name, SND_TIMER_OPEN_NONBLOCK); + if (ret < 0) { + SNDERR("unable to open timer '%s'", name); +@@ -1293,7 +1293,7 @@ int snd_pcm_direct_check_interleave(snd_pcm_direct_t *dmix, snd_pcm_t *pcm) + const snd_pcm_channel_area_t *dst_areas; + const snd_pcm_channel_area_t *src_areas; + +- bits = snd_pcm_format_physical_width(dmix->type); ++ bits = snd_pcm_format_physical_width(pcm->format); + if ((bits % 8) != 0) + interleaved = 0; + channels = dmix->channels; diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c index c73a02b..c4f5b4a 100644 --- a/src/pcm/pcm_plugin.c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-storage
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package yast2-storage checked in at Wed Aug 6 02:01:24 CEST 2008. -------- --- yast2-storage/yast2-storage.changes 2008-08-02 17:19:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2008-08-05 21:13:37.994658000 +0200 @@ -1,0 +2,23 @@ +Tue Aug 05 12:07:10 CEST 2008 - aschnell(a)suse.de + +- removed EVMS functions from StorageInterface.h +- version 2.17.11 + +------------------------------------------------------------------- +Mon Aug 04 15:00:26 CEST 2008 - aschnell(a)suse.de + +- changed default mount-by to path on s390 (fate #303557) +- version 2.17.10 + +------------------------------------------------------------------- +Mon Aug 04 11:37:49 CEST 2008 - aschnell(a)suse.de + +- fixed handling of renamed devices during update (bnc #392086) + +------------------------------------------------------------------- +Sun Aug 03 16:01:46 CEST 2008 - aschnell(a)suse.de + +- implemented global lock for libstorage (fate #302971) +- version 2.17.9 + +------------------------------------------------------------------- Old: ---- yast2-storage-2.17.8.tar.bz2 New: ---- yast2-storage-2.17.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.C28480/_old 2008-08-06 02:01:13.000000000 +0200 +++ /var/tmp/diff_new_pack.C28480/_new 2008-08-06 02:01:13.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-storage (Version 2.17.8) +# spec file for package yast2-storage (Version 2.17.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-storage -Version: 2.17.8 +Version: 2.17.11 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.17.8.tar.bz2 +Source0: yast2-storage-2.17.11.tar.bz2 Prefix: /usr BuildRequires: blocxx-devel boost-devel docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-perl-bindings yast2-testsuite Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid kpartx cryptsetup @@ -50,7 +57,7 @@ Arvin Schnell <aschnell(a)suse.de> %prep -%setup -n yast2-storage-2.17.8 +%setup -n yast2-storage-2.17.11 %build %{prefix}/bin/y2tool y2autoconf @@ -61,6 +68,9 @@ %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} make %{?jobs:-j%jobs} +%ifarch s390 s390x +sed -i -e 's/DEVICE_NAMES=".*"/DEVICE_NAMES="path"/' data/sysconfig.storage +%endif %install make install DESTDIR="$RPM_BUILD_ROOT" @@ -71,6 +81,7 @@ done rm -f $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2StorageCallbacks.la rm -f $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2StorageCallbacks.so +install -d -m 755 $RPM_BUILD_ROOT/var/lock/libstorage %clean rm -rf "$RPM_BUILD_ROOT" @@ -133,6 +144,7 @@ %files lib %defattr(-,root,root) %{_libdir}/liby2storage.so.* +%dir /var/lock/libstorage %post lib /sbin/ldconfig @@ -167,6 +179,17 @@ %doc %{prefix}/share/doc/packages/yast2-storage/libstorage %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description %changelog +* Tue Aug 05 2008 aschnell(a)suse.de +- removed EVMS functions from StorageInterface.h +- version 2.17.11 +* Mon Aug 04 2008 aschnell(a)suse.de +- changed default mount-by to path on s390 (fate #303557) +- version 2.17.10 +* Mon Aug 04 2008 aschnell(a)suse.de +- fixed handling of renamed devices during update (bnc #392086) +* Sun Aug 03 2008 aschnell(a)suse.de +- implemented global lock for libstorage (fate #302971) +- version 2.17.9 * Fri Aug 01 2008 aschnell(a)suse.de - redesigned expert partitioner (fate #302054) - added dialog to choose partition table type (fate #303924 and ++++++ yast2-storage-2.17.8.tar.bz2 -> yast2-storage-2.17.11.tar.bz2 ++++++ ++++ 10479 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-samba-server
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package yast2-samba-server checked in at Wed Aug 6 02:01:06 CEST 2008. -------- --- yast2-samba-server/yast2-samba-server.changes 2008-05-16 21:59:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-samba-server/yast2-samba-server.changes 2008-08-05 10:39:00.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 5 10:36:39 CEST 2008 - locilka(a)suse.cz + +- Adjusted to the newest LDAP SCR agent (patch written by jsuchome) + (FATE #303596). +- 2.17.0 + +------------------------------------------------------------------- Old: ---- yast2-samba-server-2.16.3.tar.bz2 New: ---- yast2-samba-server-2.17.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-server.spec ++++++ --- /var/tmp/diff_new_pack.X27712/_old 2008-08-06 02:01:00.000000000 +0200 +++ /var/tmp/diff_new_pack.X27712/_new 2008-08-06 02:01:00.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-samba-server (Version 2.16.3) +# spec file for package yast2-samba-server (Version 2.17.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-samba-server -Version: 2.16.3 -Release: 7 +Version: 2.17.0 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-samba-server-2.16.3.tar.bz2 +Source0: yast2-samba-server-2.17.0.tar.bz2 Prefix: /usr BuildRequires: libsmbclient libsmbclient-devel perl-Crypt-SmbHash perl-X500-DN perl-XML-Writer samba-client update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-samba-client yast2-testsuite yast2-users Requires: perl-Crypt-SmbHash @@ -45,7 +52,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-samba-server-2.16.3 +%setup -n yast2-samba-server-2.17.0 %build %{prefix}/bin/y2tool y2autoconf @@ -79,6 +86,10 @@ /usr/share/YaST2/schema/autoyast/rnc/samba-server.rnc %doc %{prefix}/share/doc/packages/yast2-samba-server %changelog +* Tue Aug 05 2008 locilka(a)suse.cz +- Adjusted to the newest LDAP SCR agent (patch written by jsuchome) + (FATE #303596). +- 2.17.0 * Fri May 16 2008 jsrain(a)suse.cz - added categories Settings and System into desktop file (bnc #382778) ++++++ yast2-samba-server-2.16.3.tar.bz2 -> yast2-samba-server-2.17.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/configure new/yast2-samba-server-2.17.0/configure --- old/yast2-samba-server-2.16.3/configure 2008-05-16 22:31:26.000000000 +0200 +++ new/yast2-samba-server-2.17.0/configure 2008-08-05 10:39:34.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-samba-server 2.16.3. +# Generated by GNU Autoconf 2.61 for yast2-samba-server 2.17.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-samba-server' PACKAGE_TARNAME='yast2-samba-server' -PACKAGE_VERSION='2.16.3' -PACKAGE_STRING='yast2-samba-server 2.16.3' +PACKAGE_VERSION='2.17.0' +PACKAGE_STRING='yast2-samba-server 2.17.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-samba-server 2.16.3 to adapt to many kinds of systems. +\`configure' configures yast2-samba-server 2.17.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-samba-server 2.16.3:";; + short | recursive ) echo "Configuration of yast2-samba-server 2.17.0:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-samba-server configure 2.16.3 +yast2-samba-server configure 2.17.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-samba-server $as_me 2.16.3, which was +It was created by yast2-samba-server $as_me 2.17.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-samba-server' - VERSION='2.16.3' + VERSION='2.17.0' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.16.3" +VERSION="2.17.0" RPMNAME="yast2-samba-server" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-samba-server $as_me 2.16.3, which was +This file was extended by yast2-samba-server $as_me 2.17.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-samba-server config.status 2.16.3 +yast2-samba-server config.status 2.17.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/configure.in new/yast2-samba-server-2.17.0/configure.in --- old/yast2-samba-server-2.16.3/configure.in 2008-05-16 22:31:22.000000000 +0200 +++ new/yast2-samba-server-2.17.0/configure.in 2008-08-05 10:39:30.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-samba-server dnl -dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-samba-server, 2.16.3, http://bugs.opensuse.org/, yast2-samba-server) +AC_INIT(yast2-samba-server, 2.17.0, http://bugs.opensuse.org/, yast2-samba-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.3" +VERSION="2.17.0" RPMNAME="yast2-samba-server" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/src/SambaBackendLDAP.pm new/yast2-samba-server-2.17.0/src/SambaBackendLDAP.pm --- old/yast2-samba-server-2.16.3/src/SambaBackendLDAP.pm 2007-04-13 08:51:30.000000000 +0200 +++ new/yast2-samba-server-2.17.0/src/SambaBackendLDAP.pm 2008-08-05 10:39:17.000000000 +0200 @@ -3,7 +3,7 @@ # Authors: Stanislav Visnovsky <visnov(a)suse.cz> # Martin Lazar <mlazar(a)suse.cz> # -# $Id: SambaBackendLDAP.pm 37433 2007-04-13 06:51:30Z locilka $ +# $Id: SambaBackendLDAP.pm 49671 2008-08-05 08:39:17Z locilka $ # # Representation of the configuration of samba-server. # Input and output routines. @@ -280,14 +280,14 @@ my $templates = Ldap->GetTemplates(); while(my ($dn, $content) = each %$templates) { - my %objectclass = map {lc $_, 1} @{$content->{objectclass}}; - my %suseplugin = map {$_, 1} @{$content->{suseplugin}}; - if ($objectclass{suseusertemplate} and not $suseplugin{UsersPluginSamba}) { - push @{$content->{suseplugin}}, "UsersPluginSamba"; + my %objectClass = map {$_, 1} @{$content->{objectClass}}; + my %susePlugin = map {$_, 1} @{$content->{susePlugin}}; + if ($objectClass{suseUserTemplate} and not $susePlugin{UsersPluginSamba}) { + push @{$content->{susePlugin}}, "UsersPluginSamba"; $modified = $content->{modified} = "edited"; } - if ($objectclass{susegrouptemplate} and not $suseplugin{UsersPluginSambaGroup}) { - push @{$content->{suseplugin}}, "UsersPluginSambaGroup"; + if ($objectClass{suseGroupTemplate} and not $susePlugin{UsersPluginSambaGroup}) { + push @{$content->{susePlugin}}, "UsersPluginSambaGroup"; $modified = $content->{modified} = "edited"; } } @@ -326,8 +326,8 @@ y2milestone("Creating dn: $dn"); my $map; given($attr) { - when ("dc") {$map = {objectclass => ["top", "dcobject"], dc => $value}} - when ("ou") {$map = {objectclass => ["top", "organizationalunit"], ou => $value}} + when ("dc") {$map = {objectClass => ["top", "dcobject"], dc => $value}} + when ("ou") {$map = {objectClass => ["top", "organizationalunit"], ou => $value}} # translators: error message, followed by class giving error default {return __("Unknown Class:")." $dn\n".__("Only dcObject (dc) and organizationalUnit (ou) classes are supported.")} }; @@ -476,9 +476,9 @@ Ldap->ReadConfigModules(); my $conf = Ldap->GetConfigModules(); while(my ($dn, $c) = each %$conf) { - my %classes = map {lc $_, 1} @{$c->{objectclass}}; - @user = split ",", $c->{susedefaultbase}[0] if $classes{"suseuserconfiguration"}; - @group = split ",", $c->{susedefaultbase}[0] if $classes{"susegroupconfiguration"}; + my %classes = map {$_, 1} @{$c->{objectClass}}; + @user = split ",", $c->{suseDefaultBase}[0] if $classes{"suseUserConfiguration"}; + @group = split ",", $c->{suseDefaultBase}[0] if $classes{"suseGroupConfiguration"}; } y2milestone("SuseDefaultBase: user=".join(",",@user)." group=",join(",",@group)); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/users-plugin/UsersPluginSambaGroups.pm new/yast2-samba-server-2.17.0/users-plugin/UsersPluginSambaGroups.pm --- old/yast2-samba-server-2.16.3/users-plugin/UsersPluginSambaGroups.pm 2007-03-07 11:21:28.000000000 +0100 +++ new/yast2-samba-server-2.17.0/users-plugin/UsersPluginSambaGroups.pm 2008-08-05 10:36:15.000000000 +0200 @@ -132,7 +132,7 @@ my $config = shift; my $data = shift; - if ( grep /^sambagroupmapping$/i, @{$data->{'objectclass'}} ) { + if ( grep /^sambagroupmapping$/i, @{$data->{'objectClass'}} ) { y2milestone( "SambaPlugin: Plugin Present"); return 1; } else { @@ -285,10 +285,10 @@ my $oc = "sambaGroupMapping"; # define the object class for new user/groupa - if (defined $data->{"objectclass"} && ref $data->{"objectclass"} eq "ARRAY") + if (defined $data->{"objectClass"} && ref $data->{"objectClass"} eq "ARRAY") { - if ( ! grep /^$oc$/i, @{$data->{'objectclass'}} ) { - push @{$data->{'objectclass'}}, $oc; + if ( ! grep /^$oc$/i, @{$data->{'objectClass'}} ) { + push @{$data->{'objectClass'}}, $oc; #y2milestone("added ObjectClass $oc"); } } @@ -309,22 +309,22 @@ if (defined $data->{'sambainternal'}->{'sambalocalsid'}); my $gidNumber = 0; - $gidNumber = $data->{'gidnumber'} - if (defined $data->{'gidnumber'}); + $gidNumber = $data->{'gidNumber'} + if (defined $data->{'gidNumber'}); my $ridbase = 0; $ridbase = $data->{'sambainternal'}->{'ridbase'} if (defined $data->{'sambainternal'}->{'ridbase'}); if ( $gidNumber ) { - if ( (! $data->{'sambasid'}) || ($data->{'sambasid'} eq "") ) { - $data->{'sambasid'} = $SID."-". (2 * $gidNumber + $ridbase + 1); + if ( (! $data->{'sambaSID'}) || ($data->{'sambaSID'} eq "") ) { + $data->{'sambaSID'} = $SID."-". (2 * $gidNumber + $ridbase + 1); } } - if( ! $data->{'displayname'} ) { - $data->{'displayname'} = (defined $data->{'cn'} ? $data->{'cn'}:""); + if( ! $data->{'displayName'} ) { + $data->{'displayName'} = (defined $data->{'cn'} ? $data->{'cn'}:""); } - $data->{'sambagrouptype'} = "2"; + $data->{'sambaGroupType'} = "2"; return undef; } @@ -337,7 +337,7 @@ my $res = SCR->Read(".ldap.search", { base_dn => $base_dn, scope => YaST::YCP::Integer(2), filter => "(objectClass=sambaDomain)", - attrs => ['sambasid', 'sambaalgorithmicridbase'] + attrs => ['sambaSID', 'sambaAlgorithmicRidBase'] } ); if ( ! $res ){ @@ -347,9 +347,9 @@ y2internal("$ldaperr->{'msg'}"); } else { #y2milestone( Data::Dumper->Dump( [$res] )); - if ( $res->[0]->{'sambasid'}->[0] ) { - $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambasid'}->[0]; - $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaalgorithmicridbase'}->[0]; + if ( $res->[0]->{'sambaSID'}->[0] ) { + $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambaSID'}->[0]; + $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaAlgorithmicRidBase'}->[0]; return undef; } else { return "error reading samba sid"; @@ -362,28 +362,28 @@ my ( $self, $config, $data ) = @_; my @updated_oc; - foreach my $oc ( @{$data->{'objectclass'}} ) { + foreach my $oc ( @{$data->{'objectClass'}} ) { if ( lc($oc) ne "sambagroupmapping" ) { push @updated_oc, $oc; } } # delete( $data->{'sambainternal'}); -# delete( $data->{'sambapwdmustchange'}); -# delete( $data->{'sambapwdlastset'}); -# delete( $data->{'sambapwdcanchange'}); +# delete( $data->{'sambaPwdMustChange'}); +# delete( $data->{'sambaPwdLastSet'}); +# delete( $data->{'sambaPwdCanChange'}); # delete( $data->{'sambantpassword'}); # delete( $data->{'sambalmpassword'}); # delete( $data->{'sambaacctflags'}); -# delete( $data->{'sambahomedrive'}); -# delete( $data->{'sambahomepath'}); -# delete( $data->{'sambaprofilepath'}); -# delete( $data->{'sambalogonscript'}); -# delete( $data->{'sambasid'}); -# delete( $data->{'sambaprimarygroupssid'}); +# delete( $data->{'sambaHomeDrive'}); +# delete( $data->{'sambaHomePath'}); +# delete( $data->{'sambaProfilePath'}); +# delete( $data->{'sambaLogonScript'}); +# delete( $data->{'sambaSID'}); +# delete( $data->{'sambaPrimaryGroupSID'}); # delete( $data->{'sambanoexprire'}); # delete( $data->{'sambadisabled'}); - $data->{'objectclass'} = \@updated_oc; + $data->{'objectClass'} = \@updated_oc; return undef; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/users-plugin/users_plugin_samba_groups.ycp new/yast2-samba-server-2.17.0/users-plugin/users_plugin_samba_groups.ycp --- old/yast2-samba-server-2.16.3/users-plugin/users_plugin_samba_groups.ycp 2007-04-16 12:56:41.000000000 +0200 +++ new/yast2-samba-server-2.17.0/users-plugin/users_plugin_samba_groups.ycp 2008-08-05 10:39:17.000000000 +0200 @@ -9,7 +9,7 @@ * This is part GUI of UsersPluginSambaGroups - plugin for editing all LDAP * attributes for Samba groups. * - * $Id: users_plugin_samba_groups.ycp 37483 2007-04-16 10:56:41Z locilka $ + * $Id: users_plugin_samba_groups.ycp 49671 2008-08-05 08:39:17Z locilka $ */ @@ -77,7 +77,7 @@ contents = `HBox(`HSpacing (1.5), `VBox( `VSpacing(0.5), - `TextEntry(`id(`smbName), _("Samba Group Name"), data["displayname"]:"" ), + `TextEntry(`id(`smbName), _("Samba Group Name"), data["displayName"]:"" ), `VSpacing (0.5) ), `HSpacing (1.5) @@ -99,7 +99,7 @@ if ( ret == `next ) { string err = UsersPluginSambaGroups::Check ( config, data); - data["displayname"] = UI::QueryWidget(`id(`smbName), `Value ); + data["displayName"] = UI::QueryWidget(`id(`smbName), `Value ); if (err != "") { Report::Error (err); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/users-plugin/UsersPluginSamba.pm new/yast2-samba-server-2.17.0/users-plugin/UsersPluginSamba.pm --- old/yast2-samba-server-2.16.3/users-plugin/UsersPluginSamba.pm 2005-09-19 13:53:25.000000000 +0200 +++ new/yast2-samba-server-2.17.0/users-plugin/UsersPluginSamba.pm 2008-08-05 10:36:18.000000000 +0200 @@ -137,7 +137,7 @@ my $config = shift; my $data = shift; - if ( grep /^sambasamaccount$/i, @{$data->{'objectclass'}} ) { + if ( grep /^sambasamaccount$/i, @{$data->{'objectClass'}} ) { y2milestone( "SambaPlugin: Plugin Present"); return 1; } else { @@ -204,8 +204,8 @@ } my $ret = $self->update_object_classes( $config, $data ); if( $ret ) { - y2internal("Could not update objectclass attribute"); - $error = __("Could not update objectclass attribute."); + y2internal("Could not update objectClass attribute"); + $error = __("Could not update objectClass attribute."); return undef; } return $data; @@ -293,7 +293,7 @@ if( ! $data->{'sambainternal'}->{'initialized'} ) { $self->init_internal_keys( $config, $data ); $data->{'sambainternal'}->{'initialized'} = 1; - } elsif ( (! $data->{'sambalmpassword'}) && + } elsif ( (! $data->{'sambaLMPassword'}) && ( (! $data->{'text_userpassword'} ) || ($data->{'text_userpassword'} eq "" )) ){ $error = __("Change the password to create the Samba account"); return undef; @@ -306,7 +306,7 @@ } $self->update_attributes ($config, $data); - if ( (! $data->{'sambalmpassword'}) ) { + if ( (! $data->{'sambaLMPassword'}) ) { y2debug ("no samba password hashes present yet"); } @@ -329,10 +329,10 @@ my $oc = "sambaSamAccount"; # define the object class for new user/groupa - if (defined $data->{"objectclass"} && ref $data->{"objectclass"} eq "ARRAY") + if (defined $data->{"objectClass"} && ref $data->{"objectClass"} eq "ARRAY") { - if ( ! grep /^$oc$/i, @{$data->{'objectclass'}} ) { - push @{$data->{'objectclass'}}, $oc; + if ( ! grep /^$oc$/i, @{$data->{'objectClass'}} ) { + push @{$data->{'objectClass'}}, $oc; y2milestone("added ObjectClass $oc"); } } @@ -342,10 +342,10 @@ sub init_internal_keys { my ($self, $config, $data) = @_; - if ( $data->{'sambaacctflags'} ) { + if ( $data->{'sambaAcctFlags'} ) { if ( ! defined( $data->{'sambadisabled'} ) ) { y2internal(" UsersPluginSamba::init_internal_keys sambadisabled undefined "); - if ( $data->{'sambaacctflags'} =~ /^\[.*D.*\]/ ) { + if ( $data->{'sambaAcctFlags'} =~ /^\[.*D.*\]/ ) { $data->{'sambadisabled'} = "1"; } else { $data->{'sambadisabled'} = "0"; @@ -353,7 +353,7 @@ } if ( ! defined( $data->{'sambanoexpire'} ) ) { y2internal(" UsersPluginSamba::init_internal_keys sambanoexpire undefined "); - if ( $data->{'sambaacctflags'} =~ /^\[.*X.*\]/ ) { + if ( $data->{'sambaAcctFlags'} =~ /^\[.*X.*\]/ ) { $data->{'sambanoexpire'} = "1"; } else { $data->{'sambanoexpire'} = "0"; @@ -367,18 +367,18 @@ my ( $self, $config, $data ) = @_; my $SID = $data->{'sambainternal'}->{'sambalocalsid'}; - my $uidNumber = $data->{'uidnumber'}; + my $uidNumber = $data->{'uidNumber'}; if ( $uidNumber ) { - if ( (! $data->{'sambasid'}) || ($data->{'sambasid'} eq "") ) { - $data->{'sambasid'} = $SID."-". ( 2 * $uidNumber + + if ( (! $data->{'sambaSID'}) || ($data->{'sambaSID'} eq "") ) { + $data->{'sambaSID'} = $SID."-". ( 2 * $uidNumber + $data->{'sambainternal'}->{'ridbase'} ); } } - my $gidNumber = $data->{'gidnumber'}; + my $gidNumber = $data->{'gidNumber'}; if ( $gidNumber ) { - if ( (! $data->{'sambaprimarygroupsid'}) || - ($data->{'sambaprimarygroupsid'} eq "") ) { - $data->{'sambaprimarygroupsid'} = $SID."-". (2 * $gidNumber + + if ( (! $data->{'sambaPrimaryGroupSID'}) || + ($data->{'sambaPrimaryGroupSID'} eq "") ) { + $data->{'sambaPrimaryGroupSID'} = $SID."-". (2 * $gidNumber + $data->{'sambainternal'}->{'ridbase'} + 1 ); } } @@ -398,7 +398,7 @@ sub update_samba_acctflags { my ($self, $config, $data) = @_; - my $acctflags = $data->{'sambaacctflags'} || "[U ]"; + my $acctflags = $data->{'sambaAcctFlags'} || "[U ]"; $acctflags =~ s/^\[(\w+)\s*\]$/$1/g; @@ -425,7 +425,7 @@ for( my $i=0; $i < ( 11 - $len ); $i++ ) { $acctflags .= " "; } - $data->{'sambaacctflags'} = "[". $acctflags ."]"; + $data->{'sambaAcctFlags'} = "[". $acctflags ."]"; return undef; } @@ -435,19 +435,19 @@ if ( $data->{'sambainternal'}->{'sambacleartextpw'} ) { my $update_timestamp = 0; my ($lmHash, $ntHash) = ntlmgen($data->{'sambainternal'}->{'sambacleartextpw'}); - if ( (!$data->{'sambalmpassword'}) || ($lmHash ne $data->{'sambalmpassword'}) ) { - $data->{'sambalmpassword'} = $lmHash; + if ( (!$data->{'sambaLMPassword'}) || ($lmHash ne $data->{'sambaLMPassword'}) ) { + $data->{'sambaLMPassword'} = $lmHash; $update_timestamp = 1; } - if ( (! $data->{'sambantpassword'}) || ( $ntHash ne $data->{'sambantpassword'} ) ) { - $data->{'sambantpassword'} = $ntHash; + if ( (! $data->{'sambaNTPassword'}) || ( $ntHash ne $data->{'sambaNTPassword'} ) ) { + $data->{'sambaNTPassword'} = $ntHash; $update_timestamp = 1; } if ( $update_timestamp ) { - $data->{'sambapwdlastset'} = time (); - $data->{'sambapwdcanchange'} = $data->{'sambapwdlastset'}; + $data->{'sambaPwdLastSet'} = time (); + $data->{'sambaPwdCanChange'} = $data->{'sambaPwdLastSet'}; } - $data->{'sambapwdmustchange'} = ( 1 << 31 ) - 1; + $data->{'sambaPwdMustChange'} = ( 1 << 31 ) - 1; } return undef; } @@ -460,7 +460,7 @@ my $res = SCR->Read(".ldap.search", { base_dn => $base_dn, scope => YaST::YCP::Integer(2), filter => "(objectClass=sambaDomain)", - attrs => ['sambasid', 'sambaalgorithmicridbase'] + attrs => ['sambaSID', 'sambaAlgorithmicRidBase'] } ); if ( ! $res ){ @@ -471,9 +471,9 @@ return "error reading samba sid"; } else { #y2milestone( Data::Dumper->Dump( [$res] )); - if ( $res->[0]->{'sambasid'}->[0] ) { - $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambasid'}->[0]; - $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaalgorithmicridbase'}->[0]; + if ( $res->[0]->{'sambaSID'}->[0] ) { + $data->{'sambainternal'}->{'sambalocalsid'} = $res->[0]->{'sambaSID'}->[0]; + $data->{'sambainternal'}->{'ridbase'} = $res->[0]->{'sambaAlgorithmicRidBase'}->[0]; return undef; } else { return "error reading samba sid"; @@ -486,7 +486,7 @@ my ( $self, $config, $data ) = @_; my @updated_oc; - foreach my $oc ( @{$data->{'objectclass'}} ) { + foreach my $oc ( @{$data->{'objectClass'}} ) { if ( lc($oc) ne "sambasamaccount" ) { push @updated_oc, $oc; } @@ -495,7 +495,7 @@ delete( $data->{'sambadisabled'}); delete( $data->{'sambainternal'}); - $data->{'objectclass'} = \@updated_oc; + $data->{'objectClass'} = \@updated_oc; } 1; # EOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/users-plugin/users_plugin_samba.ycp new/yast2-samba-server-2.17.0/users-plugin/users_plugin_samba.ycp --- old/yast2-samba-server-2.16.3/users-plugin/users_plugin_samba.ycp 2004-08-10 15:18:43.000000000 +0200 +++ new/yast2-samba-server-2.17.0/users-plugin/users_plugin_samba.ycp 2008-08-05 10:39:17.000000000 +0200 @@ -9,7 +9,7 @@ * This is part GUI of UsersPluginSamba - plugin for editing all LDAP * user/group attributes. * - * $Id: users_plugin_samba.ycp 18486 2004-08-10 13:18:43Z mlazar $ + * $Id: users_plugin_samba.ycp 49671 2008-08-05 08:39:17Z locilka $ */ @@ -74,33 +74,33 @@ `VSpacing(0.5), `Frame ( _("Home Drive"), `VBox( - `TextEntry(`id(`homeDrive), "", data["sambahomedrive"]:"" ), + `TextEntry(`id(`homeDrive), "", data["sambaHomeDrive"]:"" ), `Left(`CheckBox( `id(`defhomeDrive ), `opt(`notify), _("Use Default Values"), - size (data["sambahomedrive"]:"") <= 0 + size (data["sambaHomeDrive"]:"") <= 0 )) ) ), `Frame ( _("Home Path"), `VBox( - `TextEntry(`id(`homePath), "", data["sambahomepath"]:"" ), + `TextEntry(`id(`homePath), "", data["sambaHomePath"]:"" ), `Left(`CheckBox( `id(`defhomePath ), `opt(`notify), _("Use Default Values"), - size (data["sambahomepath"]:"") <= 0 + size (data["sambaHomePath"]:"") <= 0 )) ) ), `Frame ( _("Profile Path"), `VBox( - `TextEntry(`id(`profilePath), "", data["sambaprofilepath"]:"" ), + `TextEntry(`id(`profilePath), "", data["sambaProfilePath"]:"" ), `Left(`CheckBox( `id(`defprofilePath ), `opt(`notify), _("Use Default Values"), - size (data["sambaprofilepath"]:"") <= 0)) + size (data["sambaProfilePath"]:"") <= 0)) ) ), // translators: logon is the Windows synonym for login `Frame ( _("Logon Script"), `VBox( - `TextEntry(`id(`logonScript), "", data["sambalogonscript"]:"" ), + `TextEntry(`id(`logonScript), "", data["sambaLogonScript"]:"" ), `Left(`CheckBox( `id(`deflogonScript ), `opt(`notify), _("Use Default Values"), - size (data["sambalogonscript"]:"") <= 0)) + size (data["sambaLogonScript"]:"") <= 0)) ) ), `VSpacing (1.5), @@ -138,35 +138,35 @@ string err = UsersPluginSamba::Check ( config, data); if ((boolean) UI::QueryWidget(`id(`defhomeDrive), `Value)) { - data["sambahomedrive"] = ""; + data["sambaHomeDrive"] = ""; } else { - data["sambahomedrive"] = UI::QueryWidget(`id(`homeDrive), `Value ); + data["sambaHomeDrive"] = UI::QueryWidget(`id(`homeDrive), `Value ); } if ((boolean) UI::QueryWidget(`id(`defhomePath), `Value)) { - data["sambahomepath"] = ""; + data["sambaHomePath"] = ""; } else { - data["sambahomepath"] = UI::QueryWidget(`id(`homePath), `Value ); + data["sambaHomePath"] = UI::QueryWidget(`id(`homePath), `Value ); } if ((boolean) UI::QueryWidget(`id(`defprofilePath), `Value)) { - data["sambaprofilepath"] = ""; + data["sambaProfilePath"] = ""; } else { - data["sambaprofilepath"] = UI::QueryWidget(`id(`profilePath), `Value ); + data["sambaProfilePath"] = UI::QueryWidget(`id(`profilePath), `Value ); } if ((boolean) UI::QueryWidget(`id(`deflogonScript), `Value)) { - data["sambalogonscript"] = ""; + data["sambaLogonScript"] = ""; } else { - data["sambalogonscript"] = UI::QueryWidget(`id(`logonScript), `Value ); + data["sambaLogonScript"] = UI::QueryWidget(`id(`logonScript), `Value ); } data["sambanoexpire"] = ( UI::QueryWidget(`id(`noExpire), `Value ) == true ) ? "1" : "0"; data["sambadisabled"] = ( UI::QueryWidget(`id(`disable), `Value ) == true ) ? "1" : "0"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-server-2.16.3/VERSION new/yast2-samba-server-2.17.0/VERSION --- old/yast2-samba-server-2.16.3/VERSION 2008-05-06 11:21:52.000000000 +0200 +++ new/yast2-samba-server-2.17.0/VERSION 2008-08-05 10:39:09.000000000 +0200 @@ -1 +1 @@ -2.16.3 +2.17.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-qt
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package yast2-qt checked in at Wed Aug 6 02:01:00 CEST 2008. -------- --- yast2-qt/yast2-qt.changes 2008-07-16 14:35:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2008-08-05 11:15:48.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Aug 5 11:14:01 CEST 2008 - tgoettlicher(a)suse.de + +- V 2.18.5 + +------------------------------------------------------------------- +Tue Aug 5 10:54:04 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #409612: popup menu during installation becomes + hidden because of NULL parent + +------------------------------------------------------------------- +Tue Jul 29 11:21:53 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed sorting in Table (bnc #399206) + +------------------------------------------------------------------- Old: ---- yast2-qt-2.17.4.tar.bz2 New: ---- yast2-qt-2.17.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt.spec ++++++ --- /var/tmp/diff_new_pack.g27254/_old 2008-08-06 02:00:52.000000000 +0200 +++ /var/tmp/diff_new_pack.g27254/_new 2008-08-06 02:00:52.000000000 +0200 @@ -1,22 +1,29 @@ # -# spec file for package yast2-qt (Version 2.17.4) +# spec file for package yast2-qt (Version 2.17.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: yast2-qt -Version: 2.17.4 +Version: 2.17.5 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-2.17.4.tar.bz2 +Source0: yast2-qt-2.17.5.tar.bz2 BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: libdrm-devel @@ -112,6 +119,13 @@ %_includedir/* %changelog +* Tue Aug 05 2008 tgoettlicher(a)suse.de +- V 2.18.5 +* Tue Aug 05 2008 tgoettlicher(a)suse.de +- Fixed bnc #409612: popup menu during installation becomes + hidden because of NULL parent +* Tue Jul 29 2008 tgoettlicher(a)suse.de +- Fixed sorting in Table (bnc #399206) * Tue Jul 15 2008 sh(a)suse.de - Implemented fate #303492: Multi selection for table widget - V 2.17.4 ++++++ yast2-qt-2.17.4.tar.bz2 -> yast2-qt-2.17.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/package/yast2-qt.changes new/yast2-qt-2.17.5/package/yast2-qt.changes --- old/yast2-qt-2.17.4/package/yast2-qt.changes 2008-07-16 14:35:11.000000000 +0200 +++ new/yast2-qt-2.17.5/package/yast2-qt.changes 2008-08-05 11:15:28.000000000 +0200 @@ -1,4 +1,20 @@ ------------------------------------------------------------------- +Tue Aug 5 11:14:01 CEST 2008 - tgoettlicher(a)suse.de + +- V 2.18.5 + +------------------------------------------------------------------- +Tue Aug 5 10:54:04 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #409612: popup menu during installation becomes + hidden because of NULL parent + +------------------------------------------------------------------- +Tue Jul 29 11:21:53 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed sorting in Table (bnc #399206) + +------------------------------------------------------------------- Tue Jul 15 19:13:57 CEST 2008 - sh(a)suse.de - Implemented fate #303492: Multi selection for table widget diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQApplication.cc new/yast2-qt-2.17.5/src/YQApplication.cc --- old/yast2-qt-2.17.4/src/YQApplication.cc 2008-07-16 14:35:11.000000000 +0200 +++ new/yast2-qt-2.17.5/src/YQApplication.cc 2008-08-05 11:15:28.000000000 +0200 @@ -483,12 +483,18 @@ QString fileName; bool tryAgain = false; + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + + do { // Leave the mouse cursor alone - this function might be called from // some other widget, not only from UI::AskForSaveFileName(). - fileName = QFileDialog::getSaveFileName( 0, // parent + fileName = QFileDialog::getSaveFileName( parent, // parent headline, // caption startWith, // dir filter ); // filter @@ -512,7 +518,7 @@ msg = ( _( "%1 exists and is write-protected!\nReally overwrite?" ) ).arg( fileName ); } - int buttonNo = QMessageBox::information( 0, // parent widget + int buttonNo = QMessageBox::information( parent, // Translators: Window title for confirmation dialog _( "Confirm" ), msg, @@ -588,7 +594,13 @@ "\n" "Switch left and right mouse buttons?" ); - int button = QMessageBox::question( 0, + + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + + int button = QMessageBox::question( parent, // Popup dialog caption _( "Unexpected Click" ), message, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQDialog.cc new/yast2-qt-2.17.5/src/YQDialog.cc --- old/yast2-qt-2.17.4/src/YQDialog.cc 2008-07-16 14:35:11.000000000 +0200 +++ new/yast2-qt-2.17.5/src/YQDialog.cc 2008-08-05 11:15:28.000000000 +0200 @@ -576,8 +576,13 @@ if ( YQUI::ui()->usingVisionImpairedPalette() ) { + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + yuiMilestone() << "Switched to vision impaired palette" << endl; - QMessageBox::information( 0, // parent + QMessageBox::information( parent, // parent _("Color switching"), // caption _( "Switching to color palette for vision impaired users -\n" "press Shift-F4 again to switch back to normal colors." ), // text diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQMenuButton.cc new/yast2-qt-2.17.5/src/YQMenuButton.cc --- old/yast2-qt-2.17.4/src/YQMenuButton.cc 2008-07-16 14:35:11.000000000 +0200 +++ new/yast2-qt-2.17.5/src/YQMenuButton.cc 2008-08-05 11:15:28.000000000 +0200 @@ -96,9 +96,7 @@ { for ( YItemIterator it = begin; it != end; ++it ) { - YMenuItem * item = dynamic_cast<YMenuItem *> (*it); - YUI_CHECK_PTR( item ); - + YItem * item = *it; QPixmap icon; if ( item->hasIconName() ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQTable.cc new/yast2-qt-2.17.5/src/YQTable.cc --- old/yast2-qt-2.17.4/src/YQTable.cc 2008-07-16 14:35:11.000000000 +0200 +++ new/yast2-qt-2.17.5/src/YQTable.cc 2008-08-05 11:15:28.000000000 +0200 @@ -47,7 +47,7 @@ YUI_CHECK_NEW( _qt_listView ); layout->addWidget( _qt_listView ); _qt_listView->setAllColumnsShowFocus( true ); - _qt_listView->setSortingEnabled( ! keepSorting() ); + setKeepSorting( keepSorting() ); if ( multiSelectionMode ) _qt_listView->setSelectionMode( QAbstractItemView::ExtendedSelection ); @@ -147,6 +147,8 @@ clone->setTextAlignment( i, qt_alignment ); } + + _qt_listView->sortItems ( 0, Qt::AscendingOrder) ; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQTable.cc.bak new/yast2-qt-2.17.5/src/YQTable.cc.bak --- old/yast2-qt-2.17.4/src/YQTable.cc.bak 2008-07-16 14:35:11.000000000 +0200 +++ new/yast2-qt-2.17.5/src/YQTable.cc.bak 1970-01-01 01:00:00.000000000 +0100 @@ -1,408 +0,0 @@ -/*---------------------------------------------------------------------\ -| | -| __ __ ____ _____ ____ | -| \ \ / /_ _/ ___|_ _|___ \ | -| \ V / _` \___ \ | | __) | | -| | | (_| |___) || | / __/ | -| |_|\__,_|____/ |_| |_____| | -| | -| core system | -| (C) SuSE GmbH | -\----------------------------------------------------------------------/ - - File: YQTable.cc - - Author: Stefan Hundhammer <sh(a)suse.de> - -/-*/ - -#include <QHeaderView> -#include <QVBoxLayout> -#include <QString> -#define YUILogComponent "qt-ui" -#include "YUILog.h" - -#include "utf8.h" -#include "YQUI.h" -#include "YEvent.h" -#include "YQSignalBlocker.h" -#include "YUIException.h" - -#include "QY2ListView.h" -#include "YQTable.h" - - -YQTable::YQTable( YWidget * parent, YTableHeader * tableHeader, bool multiSelectionMode ) - : QFrame( (QWidget *) parent->widgetRep() ) - , YTable( parent, tableHeader, multiSelectionMode ) -{ - setWidgetRep( this ); - QVBoxLayout* layout = new QVBoxLayout( this ); - layout->setSpacing( 0 ); - setLayout( layout ); - - layout->setMargin( YQWidgetMargin ); - - _qt_listView = new QY2ListView( this ); - YUI_CHECK_NEW( _qt_listView ); - layout->addWidget( _qt_listView ); - _qt_listView->setAllColumnsShowFocus( true ); - _qt_listView->setSortingEnabled( ! keepSorting() ); - - if ( multiSelectionMode ) - _qt_listView->setSelectionMode( QAbstractItemView::ExtendedSelection ); - - - // - // Add columns - // - - QStringList headers; - _qt_listView->setColumnCount( columns() ); - - for ( int i=0; i < columns(); i++ ) - { - headers << fromUTF8(header(i)); - } - - - _qt_listView->setHeaderLabels( headers ); - _qt_listView->header()->setResizeMode( QHeaderView::ResizeToContents ); - - // - // Connect signals and slots - // - - connect( _qt_listView, SIGNAL( itemDoubleClicked ( QTreeWidgetItem *, int ) ), - this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) ); - - connect( _qt_listView, SIGNAL( itemActivated ( QTreeWidgetItem *, int ) ), - this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) ); - - connect( _qt_listView, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem * ) ), - this, SLOT ( slotSelected ( QTreeWidgetItem * ) ) ); - - if ( multiSelectionMode ) - { - // This is the exceptional case - avoid performance drop in the normal case - - connect( _qt_listView, SIGNAL( itemSelectionChanged() ), - this, SLOT ( slotSelectionChanged() ) ); - - } -} - - -YQTable::~YQTable() -{ - // NOP -} - - -void -YQTable::setKeepSorting( bool keepSorting ) -{ - YTable::setKeepSorting( keepSorting ); - _qt_listView->setSortByInsertionSequence( keepSorting ); - _qt_listView->setSortingEnabled( ! keepSorting ); -} - - -void -YQTable::addItem( YItem * yitem ) -{ - YTableItem * item = dynamic_cast<YTableItem *> (yitem); - YUI_CHECK_PTR( item ); - - YTable::addItem( item ); - - YQTableListViewItem * clone = new YQTableListViewItem( this, _qt_listView, item ); - YUI_CHECK_NEW( clone ); - - if ( item->selected() ) - { - // YTable enforces single selection, if appropriate - - YQSignalBlocker sigBlocker( _qt_listView ); - YQTable::selectItem( YSelectionWidget::selectedItem(), true ); - } - - - // - // Set column alignment - // - - for ( int i=0; i < columns(); i++ ) - { - int qt_alignment = Qt::AlignLeft; - - switch ( alignment( i ) ) - { - case YAlignBegin: qt_alignment = Qt::AlignLeft; break; - case YAlignCenter: qt_alignment = Qt::AlignCenter; break; - case YAlignEnd: qt_alignment = Qt::AlignRight; break; - - case YAlignUnchanged: break; - } - - clone->setTextAlignment(i, qt_alignment); - } -} - - -void -YQTable::selectItem( YItem * yitem, bool selected ) -{ - YQSignalBlocker sigBlocker( _qt_listView ); - - YTableItem * item = dynamic_cast<YTableItem *> (yitem); - YUI_CHECK_PTR( item ); - - YQTableListViewItem * clone = (YQTableListViewItem *) item->data(); - YUI_CHECK_PTR( clone ); - - //FIXME selected first - if ( ! selected && clone == _qt_listView->currentItem() ) - { - deselectAllItems(); - } - else - { - _qt_listView->setCurrentItem( clone ); - clone->setSelected( true ); - YTable::selectItem( item, selected ); - } -} - - -void -YQTable::deselectAllItems() -{ - YQSignalBlocker sigBlocker( _qt_listView ); - - YTable::deselectAllItems(); - _qt_listView->clearSelection(); -} - - -void -YQTable::deleteAllItems() -{ - _qt_listView->clear(); - YTable::deleteAllItems(); -} - - -void -YQTable::cellChanged( const YTableCell * cell ) -{ - YTableItem * item = cell->parent(); - YUI_CHECK_PTR( item ); - - YQTableListViewItem * clone = (YQTableListViewItem *) item->data(); - YUI_CHECK_PTR( clone ); - - clone->updateCell( cell ); -} - - -void -YQTable::selectOrigItem( QTreeWidgetItem * listViewItem ) -{ - if ( listViewItem ) - { - YQTableListViewItem * tableListViewItem = dynamic_cast<YQTableListViewItem *> (listViewItem); - YUI_CHECK_PTR( tableListViewItem ); - - YTable::selectItem( tableListViewItem->origItem(), true ); - } -} - - -void -YQTable::slotSelected( QTreeWidgetItem * listViewItem ) -{ - if ( listViewItem ) - selectOrigItem( listViewItem ); - else - { - // Qt might select nothing if a user clicks outside the items in the widget - - if ( hasItems() && YSelectionWidget::hasSelectedItem() ) - YQTable::selectItem( YSelectionWidget::selectedItem(), true ); - } - - if ( immediateMode() ) - { - if ( ! YQUI::ui()->eventPendingFor( this ) ) - { - // Avoid overwriting a (more important) Activated event with a SelectionChanged event - - yuiDebug() << "Sending SelectionChanged event" << endl; - YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::SelectionChanged ) ); - } - } -} - - -void -YQTable::slotSelectionChanged() -{ - YSelectionWidget::deselectAllItems(); - yuiDebug() << endl; - - QList<QTreeWidgetItem *> selItems = _qt_listView->selectedItems(); - - for ( QList<QTreeWidgetItem *>::iterator it = selItems.begin(); - it != selItems.end(); - ++it ) - { - YQTableListViewItem * tableListViewItem = dynamic_cast<YQTableListViewItem *> (*it); - - if ( tableListViewItem ) - { - tableListViewItem->origItem()->setSelected( true ); - - yuiDebug() << "Selected item: " << tableListViewItem->origItem()->label() << endl; - } - } - - if ( immediateMode() ) - { - if ( ! YQUI::ui()->eventPendingFor( this ) ) - { - // Avoid overwriting a (more important) Activated event with a SelectionChanged event - - yuiDebug() << "Sending SelectionChanged event" << endl; - YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::SelectionChanged ) ); - } - } -} - - -void -YQTable::slotActivated( QTreeWidgetItem * listViewItem ) -{ - selectOrigItem( listViewItem ); - - if ( notify() ) - { - yuiDebug() << "Sending Activated event" << endl; - YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::Activated ) ); - } -} - - -void -YQTable::setEnabled( bool enabled ) -{ - _qt_listView->setEnabled( enabled ); - //FIXME _qt_listView->triggerUpdate(); - YWidget::setEnabled( enabled ); -} - - - -int -YQTable::preferredWidth() -{ - // Arbitrary value. - // Use a MinSize widget to set a size that is useful for the application. - - return 30; -} - - -int -YQTable::preferredHeight() -{ - // Arbitrary value. - // Use a MinSize widget to set a size that is useful for the application. - - return 30; -} - - -void -YQTable::setSize( int newWidth, int newHeight ) -{ - resize( newWidth, newHeight ); -} - - -bool -YQTable::setKeyboardFocus() -{ - _qt_listView->setFocus(); - - return true; -} - - - - - - -YQTableListViewItem::YQTableListViewItem( YQTable * table, - QY2ListView * parent, - YTableItem * origItem ) - : QY2ListViewItem( parent ) - , _table( table ) - , _origItem( origItem ) -{ - YUI_CHECK_PTR( _table ); - YUI_CHECK_PTR( _origItem ); - - _origItem->setData( this ); - - for ( YTableCellIterator it = _origItem->cellsBegin(); - it != _origItem->cellsEnd(); - ++it ) - { - updateCell( *it ); - } -} - - -void -YQTableListViewItem::updateCell( const YTableCell * cell ) -{ - if ( ! cell ) - return; - - int column = cell->column(); - - // - // Set label text - // - - setText( column, fromUTF8( cell->label() ) ); - - - // - // Set icon (if specified) - // - - if ( cell->hasIconName() ) - { - // _table is checked against 0 in the constructor - - string iconName = _table->iconFullPath( cell->iconName() ); - QPixmap icon = QPixmap( iconName.c_str() ); - - if ( icon.isNull() ) - yuiWarning() << "Can't load icon " << iconName << endl; - else - setData( column, Qt::DecorationRole, icon ); - } - else // No pixmap name - { - if ( ! data( column, Qt::DecorationRole ).isNull() ) // Was there a pixmap before? - { - setData( column, Qt::DecorationRole, QPixmap() ); // Set empty pixmap - } - } -} - - -#include "YQTable.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQTable.h.bak new/yast2-qt-2.17.5/src/YQTable.h.bak --- old/yast2-qt-2.17.4/src/YQTable.h.bak 2008-07-16 14:35:11.000000000 +0200 +++ new/yast2-qt-2.17.5/src/YQTable.h.bak 1970-01-01 01:00:00.000000000 +0100 @@ -1,197 +0,0 @@ -/*---------------------------------------------------------------------\ -| | -| __ __ ____ _____ ____ | -| \ \ / /_ _/ ___|_ _|___ \ | -| \ V / _` \___ \ | | __) | | -| | | (_| |___) || | / __/ | -| |_|\__,_|____/ |_| |_____| | -| | -| core system | -| (C) SuSE GmbH | -\----------------------------------------------------------------------/ - - File: YQTable.h - - Author: Stefan Hundhammer <sh(a)suse.de> - -/-*/ - -#ifndef YQTable_h -#define YQTable_h - -#include <QFrame> -#include "QY2ListView.h" -#include "YTable.h" - - -class QY2ListView; -class QTreeWidgetItem; -class YQListViewItem; - -class YQTable : public QFrame, public YTable -{ - Q_OBJECT - -public: - - /** - * Constructor. - **/ - YQTable( YWidget * parent, YTableHeader * header ); - - /** - * Destructor. - **/ - virtual ~YQTable(); - - /** - * Switch between sorting by item insertion order (keepSorting: true) or - * allowing the user to sort by an arbitrary column (by clicking on the - * column header). - * - * Reimplemented from YTable. - **/ - virtual void setKeepSorting( bool keepSorting ); - - /** - * Add an item. - * - * Reimplemented from YSelectionWidget. - **/ - virtual void addItem( YItem * item ); - - /** - * Select or deselect an item. - * - * Reimplemented from YSelectionWidget. - **/ - virtual void selectItem( YItem * item, bool selected = true ); - - /** - * Deselect all items. - * - * Reimplemented from YSelectionWidget. - **/ - virtual void deselectAllItems(); - - /** - * Delete all items. - * - * Reimplemented from YSelectionWidget. - **/ - virtual void deleteAllItems(); - - /** - * Notification that a cell (its text and/or its icon) was changed from the - * outside. Applications are required to call this whenever a table cell is - * changed after adding the corresponding table item (the row) to the table - * widget. - * - * Reimplemented from YTable. - **/ - virtual void cellChanged( const YTableCell * cell ); - - /** - * Set enabled/disabled state. - * - * Reimplemented from YWidget. - **/ - virtual void setEnabled( bool enabled ); - - /** - * Preferred width of the widget. - * - * Reimplemented from YWidget. - **/ - virtual int preferredWidth(); - - /** - * Preferred height of the widget. - * - * Reimplemented from YWidget. - **/ - virtual int preferredHeight(); - - /** - * Set the new size of the widget. - * - * Reimplemented from YWidget. - **/ - virtual void setSize( int newWidth, int newHeight ); - - /** - * Accept the keyboard focus. - * - * Reimplemented from YWidget. - **/ - virtual bool setKeyboardFocus(); - - -protected slots: - - /** - * Notification that an item is selected (single click or keyboard). - **/ - void slotSelected( QTreeWidgetItem * ); - - /** - * Notification that an item is activated (double click or keyboard). - **/ - void slotActivated( QTreeWidgetItem * ); - - -protected: - - /** - * Select the original item (the YTableItem) that corresponds to the - * specified listViewItem. - **/ - void selectOrigItem( QTreeWidgetItem * listViewItem ); - - // - // Data members - // - - QY2ListView * _qt_listView; -}; - - - -/** - * Visual representation of a YTableItem. - **/ -class YQTableListViewItem: public QY2ListViewItem -{ -public: - - /** - * Constructor. - **/ - YQTableListViewItem( YQTable * table, - QY2ListView * parent, - YTableItem * origItem ); - - /** - * Return the parent table widget. - **/ - YQTable * table() const { return _table; } - - /** - * Return the corresponding YTableItem. - **/ - YTableItem * origItem() const { return _origItem; } - - /** - * Update this item's display with the content of 'cell'. - **/ - void updateCell( const YTableCell * cell ); - -protected: - - YQTable * _table; - YTableItem * _origItem; -}; - - - -#endif // YQLabel_h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQUI_builtins.cc new/yast2-qt-2.17.5/src/YQUI_builtins.cc --- old/yast2-qt-2.17.4/src/YQUI_builtins.cc 2008-07-16 14:35:11.000000000 +0200 +++ new/yast2-qt-2.17.5/src/YQUI_builtins.cc 2008-08-05 11:15:28.000000000 +0200 @@ -182,7 +182,12 @@ if ( interactive ) { - QMessageBox::warning( 0, // parent + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + + QMessageBox::warning( parent, // parent "Error", // caption QString( "Couldn't save screen shot\nto %1" ).arg( fileName ), QMessageBox::Ok | QMessageBox::Default, // button0 @@ -199,6 +204,12 @@ QString( "*.tgz *.tar.gz" ), // filter QString( "Save y2logs to..." ) ); // headline + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + + if ( ! fileName.isEmpty() ) { QString saveLogsCommand = "/sbin/save_y2logs"; @@ -215,7 +226,7 @@ << "\" exited with " << result << endl; - QMessageBox::warning( 0, // parent + QMessageBox::warning( parent, // parent "Error", // caption QString( "Couldn't save y2logs to %1 - " "exit code %2" ).arg( fileName ).arg( result ), @@ -234,7 +245,7 @@ << saveLogsCommand << "\" not found" << endl; - QMessageBox::warning( 0, // parent + QMessageBox::warning( parent, // parent "Error", // caption QString( "Couldn't save y2logs to %1:\n" "Command %2 not found" ).arg( fileName ).arg( saveLogsCommand ), @@ -253,7 +264,13 @@ items << "Debug logging off" << "Debug logging on"; - QString result = QInputDialog::getItem( 0, + + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + + QString result = QInputDialog::getItem( parent, _("YaST2 Logging"), _("Configure YaST2 Logging:"), items, 0, @@ -269,12 +286,18 @@ void YQUI::toggleRecordMacro() { + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + + if ( YMacro::recording() ) { YMacro::endRecording(); normalCursor(); - QMessageBox::information( 0, // parent + QMessageBox::information( parent, // parent "YaST2 Macro Recorder", // caption "Macro recording done.", // text QMessageBox::Ok | QMessageBox::Default, // button0 @@ -286,7 +309,7 @@ normalCursor(); QString filename = - QFileDialog::getSaveFileName( 0, + QFileDialog::getSaveFileName( parent, "Select Macro File to Record to", DEFAULT_MACRO_FILE_NAME, // startWith "*.ycp" // filter @@ -304,8 +327,14 @@ { normalCursor(); + QWidget* parent = 0; + YDialog * currentDialog = YDialog::currentDialog( false ); + if (currentDialog) + parent = (QWidget *) currentDialog->widgetRep(); + + QString filename = - QFileDialog::getOpenFileName( 0, + QFileDialog::getOpenFileName( parent, "Select Macro File to Play", DEFAULT_MACRO_FILE_NAME, // startWith "*.ycp" ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQWidgetFactory.cc.bak new/yast2-qt-2.17.5/src/YQWidgetFactory.cc.bak --- old/yast2-qt-2.17.4/src/YQWidgetFactory.cc.bak 2008-07-16 14:35:11.000000000 +0200 +++ new/yast2-qt-2.17.5/src/YQWidgetFactory.cc.bak 1970-01-01 01:00:00.000000000 +0100 @@ -1,404 +0,0 @@ -/*---------------------------------------------------------------------\ -| | -| __ __ ____ _____ ____ | -| \ \ / /_ _/ ___|_ _|___ \ | -| \ V / _` \___ \ | | __) | | -| | | (_| |___) || | / __/ | -| |_|\__,_|____/ |_| |_____| | -| | -| core system | -| (C) SuSE GmbH | -\----------------------------------------------------------------------/ - - File: YQWidgetFactory.cc - - Author: Stefan Hundhammer <sh(a)suse.de> - -/-*/ - -#include <QColorGroup> -#define YUILogComponent "qt-ui" -#include "YUILog.h" - -#include "YQWidgetFactory.h" -#include "YQApplication.h" -#include "YUIException.h" -#include "YQPackageSelectorPluginStub.h" -#include "YQMainWinDock.h" - -#include <string> - -using std::string; - - -YQWidgetFactory::YQWidgetFactory() - : YWidgetFactory() -{ - // NOP -} - - -YQWidgetFactory::~YQWidgetFactory() -{ - // NOP -} - - - - -// -// Dialogs -// - -YQDialog * -YQWidgetFactory::createDialog( YDialogType dialogType, YDialogColorMode colorMode ) -{ - YQDialog * dialog = new YQDialog( dialogType, colorMode ); - YUI_CHECK_NEW( dialog ); - - return dialog; -} - - - -// -// Layout Boxes -// - -YQLayoutBox * -YQWidgetFactory::createLayoutBox( YWidget * parent, YUIDimension dim ) -{ - YQLayoutBox * layoutBox = new YQLayoutBox( parent, dim ); - YUI_CHECK_NEW( layoutBox ); - - return layoutBox; -} - - - -// -// Common Leaf Widgets -// - -YQPushButton * -YQWidgetFactory::createPushButton( YWidget * parent, const string & label ) -{ - YQPushButton * pushButton = new YQPushButton( parent, label ); - YUI_CHECK_NEW( pushButton ); - - return pushButton; -} - - - -YQLabel * -YQWidgetFactory::createLabel( YWidget * parent, - const string & text, - bool isHeading, - bool isOutputField ) -{ - YQLabel * label = new YQLabel( parent, text, isHeading, isOutputField ); - YUI_CHECK_NEW( label ); - - return label; -} - - - -YQInputField * -YQWidgetFactory::createInputField( YWidget * parent, const string & label, bool passwordMode ) -{ - YQInputField * inputField = new YQInputField( parent, label, passwordMode ); - YUI_CHECK_NEW( inputField ); - - return inputField; -} - - - -YQCheckBox * -YQWidgetFactory::createCheckBox( YWidget * parent, const string & label, bool isChecked ) -{ - YQCheckBox * checkBox = new YQCheckBox( parent, label, isChecked ); - YUI_CHECK_NEW( checkBox ); - - return checkBox; -} - - - -YQRadioButton * -YQWidgetFactory::createRadioButton( YWidget * parent, const string & label, bool isChecked ) -{ - YQRadioButton * radioButton = new YQRadioButton( parent, label, isChecked ); - YUI_CHECK_NEW( radioButton ); - - // Register radio button with its button group. - // This has to be done after all constructors are done so virtual functions - // can be used. - - if ( radioButton->buttonGroup() ) - radioButton->buttonGroup()->addRadioButton( radioButton ); - - return radioButton; -} - - - -YQComboBox * -YQWidgetFactory::createComboBox( YWidget * parent, const string & label, bool editable ) -{ - YQComboBox * comboBox = new YQComboBox( parent, label, editable ); - YUI_CHECK_NEW( comboBox ); - - return comboBox; -} - - - -YQSelectionBox * -YQWidgetFactory::createSelectionBox( YWidget * parent, const string & label ) -{ - YQSelectionBox * selectionBox = new YQSelectionBox( parent, label ); - YUI_CHECK_NEW( selectionBox ); - - return selectionBox; -} - - - -YQTree * -YQWidgetFactory::createTree( YWidget * parent, const string & label ) -{ - YQTree * tree = new YQTree( parent, label ); - YUI_CHECK_NEW( tree ); - - return tree; -} - - - -YQTable * -YQWidgetFactory::createTable( YWidget * parent, YTableHeader * header ) -{ - YQTable * table = new YQTable( parent, header ); - YUI_CHECK_NEW( table ); - - return table; -} - - - -YQProgressBar * -YQWidgetFactory::createProgressBar( YWidget * parent, const string & label, int maxValue ) -{ - YQProgressBar * progressBar = new YQProgressBar( parent, label, maxValue ); - YUI_CHECK_NEW( progressBar ); - - return progressBar; -} - - - -YQRichText * -YQWidgetFactory::createRichText( YWidget * parent, const string & text, bool plainTextMode ) -{ - YQRichText * richText = new YQRichText( parent, text, plainTextMode ); - YUI_CHECK_NEW( richText ); - - return richText; -} - - -YQBusyIndicator * -YQWidgetFactory::createBusyIndicator( YWidget * parent, const string & label, int maxValue ) -{ - YQBusyIndicator * busyIndicator = new YQBusyIndicator( parent, label, maxValue ); - YUI_CHECK_NEW( busyIndicator ); - - return busyIndicator; -} - - - - -// -// Less Common Leaf Widgets -// - -YQIntField * -YQWidgetFactory::createIntField( YWidget * parent, const string & label, int minVal, int maxVal, int initialVal ) -{ - YQIntField * intField = new YQIntField( parent, label, minVal, maxVal, initialVal ); - YUI_CHECK_NEW( intField ); - - return intField; -} - - - -YQMenuButton * -YQWidgetFactory::createMenuButton( YWidget * parent, const string & label ) -{ - YQMenuButton * menuButton = new YQMenuButton( parent, label ); - YUI_CHECK_NEW( menuButton ); - - return menuButton; -} - - - -YQMultiLineEdit * -YQWidgetFactory::createMultiLineEdit( YWidget * parent, const string & label ) -{ - YQMultiLineEdit * multiLineEdit = new YQMultiLineEdit( parent, label ); - YUI_CHECK_NEW( multiLineEdit ); - - return multiLineEdit; -} - - - -YQImage * -YQWidgetFactory::createImage( YWidget * parent, const string & imageFileName, bool animated ) -{ - YQImage * image = new YQImage( parent, imageFileName, animated ); - YUI_CHECK_NEW( image ); - - return image; -} - - -YQLogView * -YQWidgetFactory::createLogView( YWidget * parent, const string & label, int visibleLines, int storedLines ) -{ - YQLogView * logView = new YQLogView( parent, label, visibleLines, storedLines ); - YUI_CHECK_NEW( logView ); - - return logView; -} - - - -YQMultiSelectionBox * -YQWidgetFactory::createMultiSelectionBox( YWidget * parent, const string & label ) -{ - YQMultiSelectionBox * multiSelectionBox = new YQMultiSelectionBox( parent, label ); - YUI_CHECK_NEW( multiSelectionBox ); - - return multiSelectionBox; -} - -YPackageSelector* -YQWidgetFactory::createPackageSelector(YWidget* parent, long modeFlags) -{ - YQPackageSelectorPluginStub * plugin = YQApplication::packageSelectorPlugin(); - YUI_CHECK_PTR( plugin ); - - - YPackageSelector * pkgSel = plugin->createPackageSelector( parent, modeFlags ); - YUI_CHECK_NEW( pkgSel ); - - return pkgSel; -} - -YWidget * -YQWidgetFactory::createPkgSpecial( YWidget * , const string & ) -{ - YUI_THROW( YUIUnsupportedWidgetException( "YQPkgSpecial" ) ); // NCurses only - return 0; -} - - -// -// Layout Helpers -// - -YQSpacing * -YQWidgetFactory::createSpacing( YWidget * parent, YUIDimension dim, bool stretchable, YLayoutSize_t size ) -{ - YQSpacing * spacing = new YQSpacing( parent, dim, stretchable, size ); - YUI_CHECK_NEW( spacing ); - - return spacing; -} - - -YQEmpty * -YQWidgetFactory::createEmpty( YWidget * parent ) -{ - YQEmpty * empty = new YQEmpty( parent ); - YUI_CHECK_NEW( empty ); - - return empty; -} - - - -YQAlignment * -YQWidgetFactory::createAlignment( YWidget * parent, - YAlignmentType horAlignment, - YAlignmentType vertAlignment ) -{ - YQAlignment * alignment = new YQAlignment( parent, horAlignment, vertAlignment ); - YUI_CHECK_NEW( alignment ); - - return alignment; -} - - -YQSquash * -YQWidgetFactory::createSquash( YWidget * parent, bool horSquash, bool vertSquash ) -{ - YQSquash * squash = new YQSquash( parent, horSquash, vertSquash ); - YUI_CHECK_NEW( squash ); - - return squash; -} - - - -YQFrame * -YQWidgetFactory::createFrame( YWidget * parent, const string & label ) -{ - YQFrame * frame = new YQFrame( parent, label ); - YUI_CHECK_NEW( frame ); - - return frame; -} - - - -YQCheckBoxFrame * -YQWidgetFactory::createCheckBoxFrame( YWidget * parent, const string & label, bool checked ) -{ - YQCheckBoxFrame * checkBoxFrame = new YQCheckBoxFrame( parent, label, checked ); - YUI_CHECK_NEW( checkBoxFrame ); - - return checkBoxFrame; -} - - - -YQRadioButtonGroup * -YQWidgetFactory::createRadioButtonGroup( YWidget * parent ) -{ - YQRadioButtonGroup * radioButtonGroup = new YQRadioButtonGroup( parent ); - YUI_CHECK_NEW( radioButtonGroup ); - - return radioButtonGroup; -} - - - -YQReplacePoint * -YQWidgetFactory::createReplacePoint( YWidget * parent ) -{ - YQReplacePoint * replacePoint = new YQReplacePoint( parent ); - YUI_CHECK_NEW( replacePoint ); - - return replacePoint; -} - - - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQWidgetFactory.h.bak new/yast2-qt-2.17.5/src/YQWidgetFactory.h.bak --- old/yast2-qt-2.17.4/src/YQWidgetFactory.h.bak 2008-07-16 14:35:11.000000000 +0200 +++ new/yast2-qt-2.17.5/src/YQWidgetFactory.h.bak 1970-01-01 01:00:00.000000000 +0100 @@ -1,155 +0,0 @@ -/*---------------------------------------------------------------------\ -| | -| __ __ ____ _____ ____ | -| \ \ / /_ _/ ___|_ _|___ \ | -| \ V / _` \___ \ | | __) | | -| | | (_| |___) || | / __/ | -| |_|\__,_|____/ |_| |_____| | -| | -| core system | -| (C) SuSE GmbH | -\----------------------------------------------------------------------/ - - File: YQWidgetFactory.h - - Author: Stefan Hundhammer <sh(a)suse.de> - -/-*/ - -#ifndef YQWidgetFactory_h -#define YQWidgetFactory_h - - -#include "YWidgetFactory.h" - -#include "YQAlignment.h" -#include "YQCheckBox.h" -#include "YQCheckBoxFrame.h" -#include "YQComboBox.h" -#include "YQDialog.h" -#include "YQEmpty.h" -#include "YQFrame.h" -#include "YQImage.h" -#include "YQInputField.h" -#include "YQIntField.h" -#include "YQLabel.h" -#include "YQLayoutBox.h" -#include "YQLogView.h" -#include "YQMenuButton.h" -#include "YQMultiLineEdit.h" -#include "YQMultiSelectionBox.h" -#include "YQProgressBar.h" -#include "YQPushButton.h" -#include "YQRadioButton.h" -#include "YQRadioButtonGroup.h" -#include "YQReplacePoint.h" -#include "YQRichText.h" -#include "YQSelectionBox.h" -#include "YQSpacing.h" -#include "YQSquash.h" -#include "YQTable.h" -#include "YQTimeField.h" -#include "YQTree.h" -#include "YQBusyIndicator.h" - -using std::string; - - -/** - * Concrete widget factory for mandatory widgets. - **/ -class YQWidgetFactory: public YWidgetFactory -{ -public: - // Note: Using covariant return types for all createSomeWidget() methods - // (returning YQSomeWidget where the base class declares virtual methods that - // return YSomeWidget) - - - // - // Dialogs - // - - virtual YQDialog * createDialog ( YDialogType dialogType, YDialogColorMode colorMode = YDialogNormalColor ); - - // - // Layout Boxes - // - - virtual YQLayoutBox * createLayoutBox ( YWidget * parent, YUIDimension dim ); - - // - // Common Leaf Widgets - // - - virtual YQPushButton * createPushButton ( YWidget * parent, const string & label ); - virtual YQLabel * createLabel ( YWidget * parent, const string & text, bool isHeading = false, bool isOutputField = false ); - virtual YQInputField * createInputField ( YWidget * parent, const string & label, bool passwordMode = false ); - virtual YQCheckBox * createCheckBox ( YWidget * parent, const string & label, bool isChecked = false ); - virtual YQRadioButton * createRadioButton ( YWidget * parent, const string & label, bool isChecked = false ); - virtual YQComboBox * createComboBox ( YWidget * parent, const string & label, bool editable = false ); - virtual YQSelectionBox * createSelectionBox ( YWidget * parent, const string & label ); - virtual YQTree * createTree ( YWidget * parent, const string & label ); - virtual YQTable * createTable ( YWidget * parent, YTableHeader * header, bool multiSelection = false ); - virtual YQProgressBar * createProgressBar ( YWidget * parent, const string & label, int maxValue = 100 ); - virtual YQRichText * createRichText ( YWidget * parent, const string & text = string(), bool plainTextMode = false ); - virtual YQBusyIndicator * createBusyIndicator ( YWidget * parent, const string & label, int maxValue = 100 ); - - // - // Less Common Leaf Widgets - // - - virtual YQIntField * createIntField ( YWidget * parent, const string & label, int minVal, int maxVal, int initialVal ); - virtual YQMenuButton * createMenuButton ( YWidget * parent, const string & label ); - virtual YQMultiLineEdit * createMultiLineEdit ( YWidget * parent, const string & label ); - virtual YQImage * createImage ( YWidget * parent, const string & imageFileName, bool animated = false ); - virtual YQLogView * createLogView ( YWidget * parent, const string & label, int visibleLines, int storedLines = 0 ); - virtual YQMultiSelectionBox *createMultiSelectionBox( YWidget * parent, const string & label ); - - virtual YPackageSelector * createPackageSelector ( YWidget * parent, long modeFlags = 0 ); - virtual YWidget * createPkgSpecial ( YWidget * parent, const string & name ); // NCurses only, will throw exception in the Qt UI - - // - // Layout Helpers - // - - virtual YQSpacing * createSpacing ( YWidget * parent, YUIDimension dim, bool stretchable = false, YLayoutSize_t size = 0.0 ); - virtual YQEmpty * createEmpty ( YWidget * parent ); - virtual YQAlignment * createAlignment ( YWidget * parent, YAlignmentType horAlignment, YAlignmentType vertAlignment ); - virtual YQSquash * createSquash ( YWidget * parent, bool horSquash, bool vertSquash ); - - // - // Visual Grouping - // - - virtual YQFrame * createFrame ( YWidget * parent, const string & label ); - virtual YQCheckBoxFrame * createCheckBoxFrame ( YWidget * parent, const string & label, bool checked ); - - // - // Logical Grouping - // - - virtual YQRadioButtonGroup *createRadioButtonGroup ( YWidget * parent ); - virtual YQReplacePoint * createReplacePoint ( YWidget * parent ); - - -protected: - - friend class YQUI; - - /** - * Constructor. - * - * Use YUI::widgetFactory() to get the singleton for this class. - **/ - YQWidgetFactory(); - - /** - * Destructory. - **/ - virtual ~YQWidgetFactory(); - -}; // class YWidgetFactory - - -#endif // YQWidgetFactory_h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/VERSION.cmake new/yast2-qt-2.17.5/VERSION.cmake --- old/yast2-qt-2.17.4/VERSION.cmake 2008-07-16 14:35:11.000000000 +0200 +++ new/yast2-qt-2.17.5/VERSION.cmake 2008-08-05 11:15:28.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "17") -SET(VERSION_PATCH "4") +SET(VERSION_PATCH "5") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/VERSION.cmake.bak new/yast2-qt-2.17.5/VERSION.cmake.bak --- old/yast2-qt-2.17.4/VERSION.cmake.bak 2008-07-16 14:35:11.000000000 +0200 +++ new/yast2-qt-2.17.5/VERSION.cmake.bak 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "17") -SET(VERSION_PATCH "3") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/yast2-qt.spec.in.bak new/yast2-qt-2.17.5/yast2-qt.spec.in.bak --- old/yast2-qt-2.17.4/yast2-qt.spec.in.bak 2008-07-16 14:35:11.000000000 +0200 +++ new/yast2-qt-2.17.5/yast2-qt.spec.in.bak 1970-01-01 01:00:00.000000000 +0100 @@ -1,77 +0,0 @@ -@HEADERCOMMENT@ - - -@HEADER@ -BuildRequires: docbook-xsl-stylesheets -BuildRequires: doxygen -BuildRequires: libdrm-devel -BuildRequires: libjpeg-devel -BuildRequires: libxcrypt-devel -BuildRequires: libxslt -BuildRequires: perl-XML-Writer -BuildRequires: libqt4-devel -BuildRequires: sgml-skel -BuildRequires: update-desktop-files -BuildRequires: cmake - -Summary: - -BuildRequires: yast2-devtools >= 2.16.3 -BuildRequires: yast2-libyui-devel >= 2.17.3 -Requires: yast2-libyui >= 2.17.3 -Requires: yast2_theme >= 2.16.1 -Provides: yast2_ui -Provides: y2base:/usr/lib/YaST2/servers/qt -Provides: y2base:/usr/lib/YaST2/plugin/libpy2qt.so.2 -Provides: yast2-ui-qt yast2-ui-qt-devel -Obsoletes: yast2-ui-qt yast2-ui-qt-devel -Provides: y2qt -Obsoletes: y2qt -Recommends: yast2-qt-pkg - -%description -- - -%package devel -Summary: - -Group: Development/Libraries -Requires: yast2-qt = %{version} -Requires: yast2-libyui-devel - -%description devel -- - -%prep -%setup - -%build -mkdir build -cd build -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$CFLAGS" -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DLIB=%{_lib} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=1 \ - .. -make %{?jobs:-j %jobs} VERBOSE=1 - -%install -cd build -make install DESTDIR=$RPM_BUILD_ROOT -cd .. - -%clean -rm -rf "$RPM_BUILD_ROOT" - - -%files -%defattr (-, root, root) -%dir %_libdir/YaST2 -%_libdir/YaST2/plugin/ -%_prefix/share/YaST2/data/lang_fonts - -%files devel -%defattr (-, root, root) -%_includedir/* - -%changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-pkg-bindings
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Wed Aug 6 02:00:48 CEST 2008. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-07-22 12:05:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-08-05 15:43:49.285640000 +0200 @@ -1,0 +2,23 @@ +Tue Aug 5 14:55:43 CEST 2008 - lslezak(a)suse.cz + +- fixed searching for the candidate package - prefer better + architecture to better version (bnc#413150) +- 2.17.4 + +------------------------------------------------------------------- +Wed Jul 30 11:52:01 CEST 2008 - lslezak(a)suse.cz + +- Pkg::Connect() - set LastError() (bnc#280537) + +------------------------------------------------------------------- +Wed Jul 30 10:41:19 CEST 2008 - lslezak(a)suse.cz + +- allow priority >99 in Pkg::SourceSet() (bnc#402135) + +------------------------------------------------------------------- +Wed Jul 23 16:12:56 CEST 2008 ma(a)suse.de + +- Remove references to obsolete freshens dependencies. +- 2.17.3 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.17.2.tar.bz2 New: ---- yast2-pkg-bindings-2.17.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.a26220/_old 2008-08-06 02:00:40.000000000 +0200 +++ /var/tmp/diff_new_pack.a26220/_new 2008-08-06 02:00:40.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-pkg-bindings-devel-doc (Version 2.17.2) +# spec file for package yast2-pkg-bindings-devel-doc (Version 2.17.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-pkg-bindings-devel-doc -Version: 2.17.2 +Version: 2.17.4 Release: 1 License: GPL v2 or later Group: Documentation/HTML BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.17.2.tar.bz2 +Source0: yast2-pkg-bindings-2.17.4.tar.bz2 Prefix: %_prefix # same as in the main package (because we use the same configure.in.in) BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools @@ -38,7 +45,7 @@ Ladislav Slez�k <lslezak(a)novell.com> %prep -%setup -n yast2-pkg-bindings-2.17.2 +%setup -n yast2-pkg-bindings-2.17.4 # build only documentation, ignore all other directories echo "doc" > SUBDIRS @@ -69,7 +76,6 @@ %dir %{prefix}/share/doc/packages/yast2-pkg-bindings %exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/COPYING %exclude %{prefix}/share/doc/packages/yast2-pkg-bindings/README - %changelog * Fri May 16 2008 lslezak(a)suse.cz - documented lock API ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.a26220/_old 2008-08-06 02:00:40.000000000 +0200 +++ /var/tmp/diff_new_pack.a26220/_new 2008-08-06 02:00:40.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-pkg-bindings (Version 2.17.2) +# spec file for package yast2-pkg-bindings (Version 2.17.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-pkg-bindings -Version: 2.17.2 +Version: 2.17.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.17.2.tar.bz2 +Source0: yast2-pkg-bindings-2.17.4.tar.bz2 Prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 5.0.0 @@ -40,7 +47,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.17.2 +%setup -n yast2-pkg-bindings-2.17.4 # build only the library, ignore documentation (it is in devel-doc package) echo "src" > SUBDIRS @@ -71,8 +78,18 @@ %{_libdir}/YaST2/plugin/libpy2Pkg.so.* %{_libdir}/YaST2/plugin/libpy2Pkg.so %doc %{prefix}/share/doc/packages/yast2-pkg-bindings - %changelog +* Tue Aug 05 2008 lslezak(a)suse.cz +- fixed searching for the candidate package - prefer better + architecture to better version (bnc#413150) +- 2.17.4 +* Wed Jul 30 2008 lslezak(a)suse.cz +- Pkg::Connect() - set LastError() (bnc#280537) +* Wed Jul 30 2008 lslezak(a)suse.cz +- allow priority >99 in Pkg::SourceSet() (bnc#402135) + Wed Jul 23 16:12:56 CEST 2008 ma(a)suse.de +- Remove references to obsolete freshens dependencies. +- 2.17.3 * Tue Jul 22 2008 coolo(a)suse.de - 2.17.2 (for add-on) * Thu Jul 17 2008 ma(a)suse.de ++++++ yast2-pkg-bindings-2.17.2.tar.bz2 -> yast2-pkg-bindings-2.17.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/configure new/yast2-pkg-bindings-2.17.4/configure --- old/yast2-pkg-bindings-2.17.2/configure 2008-07-22 12:05:10.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/configure 2008-08-05 15:31:43.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-pkg-bindings 2.17.2. +# Generated by GNU Autoconf 2.61 for yast2-pkg-bindings 2.17.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.17.2' -PACKAGE_STRING='yast2-pkg-bindings 2.17.2' +PACKAGE_VERSION='2.17.4' +PACKAGE_STRING='yast2-pkg-bindings 2.17.4' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -899,6 +899,9 @@ am__fastdepCC_TRUE am__fastdepCC_FALSE CPP +PKG_CONFIG +Y2CORE_CFLAGS +Y2CORE_LIBS AGENT_LIBADD SED GREP @@ -914,7 +917,6 @@ ac_ct_F77 LIBTOOL ALLOCA -PKG_CONFIG ZYPP_CFLAGS ZYPP_LIBS XSLTPROC @@ -941,10 +943,12 @@ CC CFLAGS CPP +PKG_CONFIG +Y2CORE_CFLAGS +Y2CORE_LIBS CXXCPP F77 FFLAGS -PKG_CONFIG ZYPP_CFLAGS ZYPP_LIBS' @@ -1449,7 +1453,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-pkg-bindings 2.17.2 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 2.17.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1520,7 +1524,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.17.2:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.17.4:";; esac cat <<\_ACEOF @@ -1558,10 +1562,13 @@ CC C compiler command CFLAGS C compiler flags CPP C preprocessor + PKG_CONFIG path to pkg-config utility + Y2CORE_CFLAGS + C compiler flags for Y2CORE, overriding pkg-config + Y2CORE_LIBS linker flags for Y2CORE, overriding pkg-config CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags - PKG_CONFIG path to pkg-config utility ZYPP_CFLAGS C compiler flags for ZYPP, overriding pkg-config ZYPP_LIBS linker flags for ZYPP, overriding pkg-config @@ -1629,7 +1636,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 2.17.2 +yast2-pkg-bindings configure 2.17.4 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1643,7 +1650,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-pkg-bindings $as_me 2.17.2, which was +It was created by yast2-pkg-bindings $as_me 2.17.4, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2464,7 +2471,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.17.2' + VERSION='2.17.4' cat >>confdefs.h <<_ACEOF @@ -2692,7 +2699,7 @@ -VERSION="2.17.2" +VERSION="2.17.4" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" @@ -4857,8 +4864,247 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" -CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2" +# If we have core, get its Y2CORE_CFLAGS. +# When building core itself, it has set Y2CORE_CFLAGS elsewhere already + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf(a)gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf(a)gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + PKG_CONFIG="" + fi + +fi +if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5 + ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for Y2CORE" >&5 +echo $ECHO_N "checking for Y2CORE... $ECHO_C" >&6; } + +if test -n "$Y2CORE_CFLAGS"; then + pkg_cv_Y2CORE_CFLAGS="$Y2CORE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5 + ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_Y2CORE_CFLAGS=`$PKG_CONFIG --cflags "yast2-core" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$Y2CORE_LIBS"; then + pkg_cv_Y2CORE_LIBS="$Y2CORE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5 + ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_Y2CORE_LIBS=`$PKG_CONFIG --libs "yast2-core" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + Y2CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "yast2-core" 2>&1` + else + Y2CORE_PKG_ERRORS=`$PKG_CONFIG --print-errors "yast2-core" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$Y2CORE_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (yast2-core) were not met: + +$Y2CORE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables Y2CORE_CFLAGS +and Y2CORE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (yast2-core) were not met: + +$Y2CORE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables Y2CORE_CFLAGS +and Y2CORE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables Y2CORE_CFLAGS +and Y2CORE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables Y2CORE_CFLAGS +and Y2CORE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + Y2CORE_CFLAGS=$pkg_cv_Y2CORE_CFLAGS + Y2CORE_LIBS=$pkg_cv_Y2CORE_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi + +fi + +CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" +CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" : ${AGENT_LIBADD:='-L$(libdir) -lscr'} @@ -5578,7 +5824,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5581 "configure"' > conftest.$ac_ext + echo '#line 5827 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7933,11 +8179,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7936: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8182: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7940: \$? = $ac_status" >&5 + echo "$as_me:8186: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8223,11 +8469,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8226: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8472: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8230: \$? = $ac_status" >&5 + echo "$as_me:8476: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8327,11 +8573,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8330: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8576: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8334: \$? = $ac_status" >&5 + echo "$as_me:8580: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10691,7 +10937,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10694 "configure" +#line 10940 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10791,7 +11037,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10794 "configure" +#line 11040 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13192,11 +13438,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13195: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13441: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13199: \$? = $ac_status" >&5 + echo "$as_me:13445: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13296,11 +13542,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13299: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13545: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13303: \$? = $ac_status" >&5 + echo "$as_me:13549: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14879,11 +15125,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14882: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15128: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14886: \$? = $ac_status" >&5 + echo "$as_me:15132: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14983,11 +15229,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14986: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15232: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14990: \$? = $ac_status" >&5 + echo "$as_me:15236: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17190,11 +17436,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17193: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17439: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17197: \$? = $ac_status" >&5 + echo "$as_me:17443: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17480,11 +17726,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17483: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17729: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17487: \$? = $ac_status" >&5 + echo "$as_me:17733: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17584,11 +17830,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17587: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17833: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17591: \$? = $ac_status" >&5 + echo "$as_me:17837: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20800,126 +21046,6 @@ - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf(a)gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf(a)gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - PKG_CONFIG="" - fi - -fi - pkg_failed=no { echo "$as_me:$LINENO: checking for ZYPP" >&5 echo $ECHO_N "checking for ZYPP... $ECHO_C" >&6; } @@ -21574,7 +21700,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-pkg-bindings $as_me 2.17.2, which was +This file was extended by yast2-pkg-bindings $as_me 2.17.4, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21627,7 +21753,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-pkg-bindings config.status 2.17.2 +yast2-pkg-bindings config.status 2.17.4 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -21981,6 +22107,9 @@ am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim CPP!$CPP$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +Y2CORE_CFLAGS!$Y2CORE_CFLAGS$ac_delim +Y2CORE_LIBS!$Y2CORE_LIBS$ac_delim AGENT_LIBADD!$AGENT_LIBADD$ac_delim SED!$SED$ac_delim GREP!$GREP$ac_delim @@ -21996,7 +22125,6 @@ ac_ct_F77!$ac_ct_F77$ac_delim LIBTOOL!$LIBTOOL$ac_delim ALLOCA!$ALLOCA$ac_delim -PKG_CONFIG!$PKG_CONFIG$ac_delim ZYPP_CFLAGS!$ZYPP_CFLAGS$ac_delim ZYPP_LIBS!$ZYPP_LIBS$ac_delim XSLTPROC!$XSLTPROC$ac_delim @@ -22011,7 +22139,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/configure.in new/yast2-pkg-bindings-2.17.4/configure.in --- old/yast2-pkg-bindings-2.17.2/configure.in 2008-07-22 12:04:59.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/configure.in 2008-08-05 15:31:30.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-pkg-bindings dnl -dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.17.2, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.17.4, http://bugs.opensuse.org/, yast2-pkg-bindings) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.2" +VERSION="2.17.4" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" @@ -144,8 +144,14 @@ AC_PROG_CC AC_PROG_CPP -CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" -CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2" +# If we have core, get its Y2CORE_CFLAGS. +# When building core itself, it has set Y2CORE_CFLAGS elsewhere already +PKG_CHECK_EXISTS([yast2-core],[ + PKG_CHECK_MODULES(Y2CORE, yast2-core) +]) + +CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" +CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" : ${AGENT_LIBADD:='-L$(libdir) -lscr'} AC_SUBST(AGENT_LIBADD) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/doc/autodocs/Makefile.in new/yast2-pkg-bindings-2.17.4/doc/autodocs/Makefile.in --- old/yast2-pkg-bindings-2.17.2/doc/autodocs/Makefile.in 2008-07-22 12:05:13.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/doc/autodocs/Makefile.in 2008-08-05 15:31:46.000000000 +0200 @@ -148,6 +148,8 @@ XML_CATALOG = @XML_CATALOG@ XSLTPROC = @XSLTPROC@ XSLTPROC_FLAGS = @XSLTPROC_FLAGS@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/doc/Makefile.in new/yast2-pkg-bindings-2.17.4/doc/Makefile.in --- old/yast2-pkg-bindings-2.17.2/doc/Makefile.in 2008-07-22 12:05:13.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/doc/Makefile.in 2008-08-05 15:31:46.000000000 +0200 @@ -145,6 +145,8 @@ XML_CATALOG = @XML_CATALOG@ XSLTPROC = @XSLTPROC@ XSLTPROC_FLAGS = @XSLTPROC_FLAGS@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/Makefile.in new/yast2-pkg-bindings-2.17.4/Makefile.in --- old/yast2-pkg-bindings-2.17.2/Makefile.in 2008-07-22 12:05:13.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/Makefile.in 2008-08-05 15:31:47.000000000 +0200 @@ -167,6 +167,8 @@ XML_CATALOG = @XML_CATALOG@ XSLTPROC = @XSLTPROC@ XSLTPROC_FLAGS = @XSLTPROC_FLAGS@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/pkg-bindings.pot new/yast2-pkg-bindings-2.17.4/pkg-bindings.pot --- old/yast2-pkg-bindings-2.17.2/pkg-bindings.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-pkg-bindings-2.17.4/pkg-bindings.pot 2007-12-12 16:36:49.000000000 +0100 @@ -0,0 +1,148 @@ +# 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: 2007-12-12 16:36+0100\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" + +#. help text +#: src/HelpTexts.h:36 +msgid "<BIG>Loading Available Packages</BIG>Loading available objects from the configured repositories is in progress. This may take a while..." +msgstr "" + +#. help text +#: src/HelpTexts.h:42 +msgid "<BIG>Loading Installed Packages<BIG>The package manager is reading installed packages..." +msgstr "" + +#. help text +#: src/HelpTexts.h:47 +msgid "<BIG>Registering a New Repository</BIG>A new repository is being registered. The package manager is reading list of available packages in the repository..." +msgstr "" + +#: src/HelpTexts.h:52 +msgid "<BIG>Saving Repositories</BIG>The package manager is updating configured repositories..." +msgstr "" + +#: src/HelpTexts.h:55 +msgid "<BIG>Refreshing the Repository</BIG>The package manager is updating the repository content..." +msgstr "" + +#: src/Source_Callbacks.cc:129 +msgid "Refreshing repository " +msgstr "" + +#: src/Source_Callbacks.cc:150 +msgid "Probing repository " +msgstr "" + +#: src/Source_Create.cc:51 +msgid "Scanning products in " +msgstr "" + +#: src/Source_Create.cc:593 +msgid "Search Available Products" +msgstr "" + +#: src/Source_Create.cc:598 +msgid "Probe Source Type" +msgstr "" + +#: src/Source_Create.cc:601 +msgid "Download Descriptions" +msgstr "" + +#: src/Source_Create.cc:602 src/Source_Download.cc:243 src/Source_Load.cc:112 +#: src/Source_Load.cc:304 +msgid "Rebuild Cache" +msgstr "" + +#: src/Source_Create.cc:606 src/Source_Load.cc:113 src/Source_Load.cc:305 +#: src/Source_Set.cc:75 +msgid "Load Data" +msgstr "" + +#: src/Source_Create.cc:609 +msgid "Adding the Repository..." +msgstr "" + +#: src/Source_Download.cc:45 src/Source_Download.cc:173 +msgid "Downloading " +msgstr "" + +#. stages: "download", "build cache" +#: src/Source_Download.cc:242 +msgid "Refresh Metadata" +msgstr "" + +#. 3 steps per repository (download, cache rebuild, load resolvables) +#: src/Source_Download.cc:250 +msgid "Refreshing Repository..." +msgstr "" + +#. error message (followed by detailed description) +#: src/Source_Installation.cc:69 +msgid "Error: Cannot copy the cache to the target directory\n" +msgstr "" + +#. error message (followed by directory name) +#: src/Source_Installation.cc:103 +msgid "Cannot create directory " +msgstr "" + +#. error message +#: src/Source_Installation.cc:133 +msgid "Copying failed" +msgstr "" + +#: src/Source_Load.cc:111 src/Source_Load.cc:303 +msgid "Refresh Sources" +msgstr "" + +#. 3 steps per repository (download, cache rebuild, load resolvables) +#: src/Source_Load.cc:118 src/Source_Load.cc:308 src/Source_Set.cc:82 +#: src/Target_Load.cc:65 src/Target_Load.cc:129 +msgid "Loading the Package Manager..." +msgstr "" + +#: src/Source_Load.cc:302 +msgid "Load Sources" +msgstr "" + +#. TODO: improve the error message +#: src/Source_Misc.cc:72 +msgid "Cannot find source" +msgstr "" + +#: src/Source_Save.cc:112 +msgid "Remove Repositories" +msgstr "" + +#. stages: "download", "build cache" +#: src/Source_Save.cc:117 +msgid "Save Repositories" +msgstr "" + +#. start the process +#: src/Source_Save.cc:125 +msgid "Saving Repositories..." +msgstr "" + +#: src/Target_Load.cc:61 +msgid "Initialize the Target System" +msgstr "" + +#: src/Target_Load.cc:62 src/Target_Load.cc:125 +msgid "Read Installed Packages" +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/Callbacks_Register.cc new/yast2-pkg-bindings-2.17.4/src/Callbacks_Register.cc --- old/yast2-pkg-bindings-2.17.2/src/Callbacks_Register.cc 2008-06-27 10:49:17.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/src/Callbacks_Register.cc 2008-08-05 15:38:46.000000000 +0200 @@ -19,7 +19,7 @@ */ /* - File: $Id: Callbacks_Register.cc 48572 2008-06-27 08:49:17Z lslezak $ + File: $Id: Callbacks_Register.cc 49526 2008-07-30 13:28:18Z mvidner $ Author: Ladislav Slezák <lslezak(a)novell.com> Summary: Functions for registering YCP callbacks from Yast Namespace: Pkg @@ -547,7 +547,7 @@ } /** - * @builtin CallbackSourceProbeStart + * @builtin CallbackSourceReportStart * @short Register callback function * @param string args Name of the callback handler function. Required callback prototype is <code>void(integer source_id, string url, string task)</code>. * @return void diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/Makefile.in new/yast2-pkg-bindings-2.17.4/src/Makefile.in --- old/yast2-pkg-bindings-2.17.2/src/Makefile.in 2008-07-22 12:05:13.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/src/Makefile.in 2008-08-05 15:31:46.000000000 +0200 @@ -173,6 +173,8 @@ XML_CATALOG = @XML_CATALOG@ XSLTPROC = @XSLTPROC@ XSLTPROC_FLAGS = @XSLTPROC_FLAGS@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/Package.cc new/yast2-pkg-bindings-2.17.4/src/Package.cc --- old/yast2-pkg-bindings-2.17.2/src/Package.cc 2008-07-14 14:59:08.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/src/Package.cc 2008-08-05 15:38:46.000000000 +0200 @@ -1892,7 +1892,7 @@ /** - * @builtin Reset + * @builtin PkgReset * * @short Reset most internal stuff on the package manager. @return boolean @@ -1922,7 +1922,7 @@ /** - * @builtin Reset + * @builtin PkgApplReset * * @short Reset most internal stuff on the package manager. Reset only packages set by the application, not by the user @@ -2047,7 +2047,7 @@ If it has, dependencies will be solved and the returned result might be false. */ - +#warning Freshens is obsolete YCPBoolean PkgFunctions::PkgFreshen() { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/PkgFunctions.cc new/yast2-pkg-bindings-2.17.4/src/PkgFunctions.cc --- old/yast2-pkg-bindings-2.17.2/src/PkgFunctions.cc 2008-06-13 14:07:25.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/src/PkgFunctions.cc 2008-08-05 15:38:46.000000000 +0200 @@ -43,6 +43,9 @@ // textdomain #include <libintl.h> +/* + Textdomain "pkg-bindings" +*/ ///////////////////////////////////////////////////////////////////////////// @@ -92,8 +95,13 @@ zypp_pointer = zypp::getZYpp(); return zypp_pointer; } - catch (...) + catch (const zypp::Exception &excpt) { + // is it the last attempt? + if (max_count == 1) + { + ZYPP_RETHROW(excpt); + } } max_count--; @@ -104,8 +112,12 @@ } } - // still not initialized, throw an exception - ZYPP_THROW (zypp::Exception(std::string("Cannot connect to the package manager"))); + if (zypp_pointer == NULL) + { + // still not initialized, throw an exception + // translators: this is an error message + ZYPP_THROW (zypp::Exception(std::string(_("Cannot connect to the package manager")))); + } return zypp_pointer; } @@ -143,8 +155,15 @@ { return YCPBoolean(zypp_ptr() != NULL); } - catch(...) + catch(const zypp::ZYppFactoryException &excpt) + { + y2error("Error in Connect: FactoryException: %s", excpt.asString().c_str()); + _last_error.setLastError(excpt.asString()); + } + catch (const zypp::Exception& excpt) { + y2error("Error in Connect: Exception: %s", excpt.asString().c_str()); + _last_error.setLastError(ExceptionAsString(excpt)); } return YCPBoolean(false); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/ProvideProcess.cc new/yast2-pkg-bindings-2.17.4/src/ProvideProcess.cc --- old/yast2-pkg-bindings-2.17.2/src/ProvideProcess.cc 2008-05-23 16:27:25.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/src/ProvideProcess.cc 2008-07-30 14:29:18.000000000 +0200 @@ -65,18 +65,24 @@ provider.status().resetTransact(whoWantsIt); } + // get the provider arch + zypp::Arch provider_arch(provider->arch()); + // regarding items which are installable only - if (!provider->arch().compatibleWith( _architecture )) { - y2milestone ("provider %s has incompatible arch '%s'", provider->name().c_str(), provider->arch().asString().c_str()); + if (!provider_arch.compatibleWith( _architecture )) { + y2milestone ("provider %s has incompatible arch '%s'", provider->name().c_str(), provider_arch.asString().c_str()); } else if (!item) { // no provider yet item = provider; } - else if (item->arch().compare( provider->arch() ) < 0) { // provider has better arch + else if (item->arch().compare( provider_arch ) < 0) { // provider has better arch item = provider; } - else if (item->edition().compare( provider->edition() ) < 0) { - item = provider; // provider has better edition + // provider has better edition, but doesn't have worse architecture (item has better or same) + else if (item->edition().compare( provider->edition() ) < 0 + && item->arch().compare( provider_arch ) <= 0) + { + item = provider; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/Resolvable_Properties.cc new/yast2-pkg-bindings-2.17.4/src/Resolvable_Properties.cc --- old/yast2-pkg-bindings-2.17.2/src/Resolvable_Properties.cc 2008-07-14 14:59:08.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/src/Resolvable_Properties.cc 2008-07-29 07:07:30.000000000 +0200 @@ -356,7 +356,6 @@ _kinds.insert("obsoletes"); _kinds.insert("recommends"); _kinds.insert("suggests"); - _kinds.insert("freshens"); _kinds.insert("enhances"); _kinds.insert("supplements"); YCPList ycpdeps; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/Source_Load.cc new/yast2-pkg-bindings-2.17.4/src/Source_Load.cc --- old/yast2-pkg-bindings-2.17.2/src/Source_Load.cc 2008-04-11 15:07:46.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/src/Source_Load.cc 2008-08-05 15:38:46.000000000 +0200 @@ -19,7 +19,7 @@ */ /* - File: $Id: Source_Load.cc 46410 2008-04-11 13:07:46Z lslezak $ + File: $Id: Source_Load.cc 49526 2008-07-30 13:28:18Z mvidner $ Author: Ladislav Slezák <lslezak(a)novell.com> Summary: Functions for initializing the package manager Namespace: Pkg @@ -157,14 +157,6 @@ return YCPVoid(); } -/**************************************************************************************** - * @builtin SourceLoad - * - * @short Load resolvables from the installation sources - * @description - * Refresh the pool - Add/remove resolvables from the enabled/disabled sources. - * @return boolean True on success - **/ YCPValue PkgFunctions::SourceLoadImpl(PkgProgress &progress) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/src/Source_Set.cc new/yast2-pkg-bindings-2.17.4/src/Source_Set.cc --- old/yast2-pkg-bindings-2.17.2/src/Source_Set.cc 2008-03-27 11:40:46.000000000 +0100 +++ new/yast2-pkg-bindings-2.17.4/src/Source_Set.cc 2008-07-30 10:42:04.000000000 +0200 @@ -19,7 +19,7 @@ */ /* - File: $Id: Source_Set.cc 45782 2008-03-27 10:40:46Z lslezak $ + File: $Id: Source_Set.cc 49505 2008-07-30 08:42:04Z lslezak $ Author: Ladislav Slezák <lslezak(a)novell.com> Summary: Functions for changing properties of a repository Namespace: Pkg @@ -205,16 +205,9 @@ { unsigned int priority = descr->value(YCPString("priority"))->asInteger()->value(); - if (priority > 99) - { - y2error("Wrong priority '%d', valid range is 0-99", priority); - } - else - { - // set the priority - repo->repoInfo().setPriority(priority); - y2debug("set priority: %d", priority); - } + // set the priority + repo->repoInfo().setPriority(priority); + y2debug("set priority: %d", priority); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/testsuite/devel/Makefile.in new/yast2-pkg-bindings-2.17.4/testsuite/devel/Makefile.in --- old/yast2-pkg-bindings-2.17.2/testsuite/devel/Makefile.in 2008-07-22 12:05:13.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/testsuite/devel/Makefile.in 2008-08-05 15:31:46.000000000 +0200 @@ -137,6 +137,8 @@ XML_CATALOG = @XML_CATALOG@ XSLTPROC = @XSLTPROC@ XSLTPROC_FLAGS = @XSLTPROC_FLAGS@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/testsuite/Makefile.in new/yast2-pkg-bindings-2.17.4/testsuite/Makefile.in --- old/yast2-pkg-bindings-2.17.2/testsuite/Makefile.in 2008-07-22 12:05:13.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/testsuite/Makefile.in 2008-08-05 15:31:46.000000000 +0200 @@ -135,6 +135,8 @@ XML_CATALOG = @XML_CATALOG@ XSLTPROC = @XSLTPROC@ XSLTPROC_FLAGS = @XSLTPROC_FLAGS@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.17.2/VERSION new/yast2-pkg-bindings-2.17.4/VERSION --- old/yast2-pkg-bindings-2.17.2/VERSION 2008-07-22 11:50:49.000000000 +0200 +++ new/yast2-pkg-bindings-2.17.4/VERSION 2008-08-05 14:57:21.000000000 +0200 @@ -1 +1 @@ -2.17.2 +2.17.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-network
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package yast2-network checked in at Wed Aug 6 02:00:42 CEST 2008. -------- --- yast2-network/yast2-network.changes 2008-08-04 13:26:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2008-08-04 15:59:15.053573000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 4 15:56:34 CEST 2008 - mzugec(a)suse.cz + +- for ssh/vnc installation don't reload/restart network because + possibility of IP change (bnc#347482) +- 2.17.15 + +------------------------------------------------------------------- Old: ---- yast2-network-2.17.14.tar.bz2 New: ---- yast2-network-2.17.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.F25563/_old 2008-08-06 02:00:33.000000000 +0200 +++ /var/tmp/diff_new_pack.F25563/_new 2008-08-06 02:00:33.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-network (Version 2.17.14) +# spec file for package yast2-network (Version 2.17.15) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-network -Version: 2.17.14 +Version: 2.17.15 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.17.14.tar.bz2 +Source0: yast2-network-2.17.15.tar.bz2 Prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm @@ -71,7 +78,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.17.14 +%setup -n yast2-network-2.17.15 %build %{prefix}/bin/y2tool y2autoconf @@ -136,6 +143,10 @@ %exclude %{prefix}/share/doc/packages/yast2-network/README %changelog * Mon Aug 04 2008 mzugec(a)suse.cz +- for ssh/vnc installation don't reload/restart network because + possibility of IP change (bnc#347482) +- 2.17.15 +* Mon Aug 04 2008 mzugec(a)suse.cz - improved Lan::Packages() function - added STARTMODE=onboot for tun/tap devices (FaTE#302184) - 2.17.14 ++++++ yast2-network-2.17.14.tar.bz2 -> yast2-network-2.17.15.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.14/configure new/yast2-network-2.17.15/configure --- old/yast2-network-2.17.14/configure 2008-08-04 13:21:38.000000000 +0200 +++ new/yast2-network-2.17.15/configure 2008-08-04 15:55:11.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-network 2.17.13. +# Generated by GNU Autoconf 2.61 for yast2-network 2.17.14. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.17.13' -PACKAGE_STRING='yast2-network 2.17.13' +PACKAGE_VERSION='2.17.14' +PACKAGE_STRING='yast2-network 2.17.14' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-network 2.17.13 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.17.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-network 2.17.13:";; + short | recursive ) echo "Configuration of yast2-network 2.17.14:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.17.13 +yast2-network configure 2.17.14 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-network $as_me 2.17.13, which was +It was created by yast2-network $as_me 2.17.14, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-network' - VERSION='2.17.13' + VERSION='2.17.14' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.13" +VERSION="2.17.14" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-network $as_me 2.17.13, which was +This file was extended by yast2-network $as_me 2.17.14, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-network config.status 2.17.13 +yast2-network config.status 2.17.14 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.14/configure.in new/yast2-network-2.17.15/configure.in --- old/yast2-network-2.17.14/configure.in 2008-08-04 13:21:32.000000000 +0200 +++ new/yast2-network-2.17.15/configure.in 2008-08-04 15:55:05.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.17.13, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.17.14, http://bugs.opensuse.org/, yast2-network) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.13" +VERSION="2.17.14" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.14/src/modules/Lan.ycp new/yast2-network-2.17.15/src/modules/Lan.ycp --- old/yast2-network-2.17.14/src/modules/Lan.ycp 2008-08-04 13:24:52.000000000 +0200 +++ new/yast2-network-2.17.15/src/modules/Lan.ycp 2008-08-04 15:57:15.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Network card data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: Lan.ycp 49627 2008-08-04 11:24:52Z mzugec $ + * $Id: Lan.ycp 49646 2008-08-04 13:57:14Z mzugec $ * * Representation of the configuration of network cards. * Input and output routines. @@ -39,6 +39,8 @@ import "PackageSystem"; import "LanItems"; import "ModuleLoading"; +import "Linuxrc"; +import "Stage"; include "network/complex.ycp"; include "network/runtime.ycp"; @@ -399,10 +401,12 @@ if(Abort()) return false; /* Progress step 6 */ ProgressNextStage(_("Writing hostname and DNS configuration...")); + // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) + if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc())) y2milestone("For ssh or vnc installation don't reload/restart network during installation."); + else if (LanItems::force_restart) SCR::Execute(.target.bash, "rcnetwork restart"); + else NetworkService::StartStop (); // write resolv.conf after change from dhcp to static (#327074) // reload/restart network before this to put correct resolv.conf from dhcp-backup - if (LanItems::force_restart) SCR::Execute(.target.bash, "rcnetwork restart"); - else NetworkService::StartStop (); DNS::Write(); Host::Write(); Progress::set (orig); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.14/VERSION new/yast2-network-2.17.15/VERSION --- old/yast2-network-2.17.14/VERSION 2008-08-04 13:22:34.000000000 +0200 +++ new/yast2-network-2.17.15/VERSION 2008-08-04 15:56:24.000000000 +0200 @@ -1 +1 @@ -2.17.14 +2.17.15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0