March 2010 - openSUSE Commits - openSUSE Mailing Lists

commit orage for openSUSE:Factory
by root＠Hilbert.suse.de 23 Mar '10

23 Mar '10

Hello community, here is the log from the commit of package orage for openSUSE:Factory checked in at Tue Mar 23 22:29:18 CET 2010. -------- --- orage/orage.changes 2010-03-18 10:18:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/orage/orage.changes 2010-03-23 12:06:12.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 23 10:47:42 UTC 2010 - puzel(a)novell.com + +- fix broken build: copy README.SUSE to build directory +- add orage-4.6.1-fix-undefined-operation.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- orage-4.6.1-fix-undefined-operation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ orage.spec ++++++ --- /var/tmp/diff_new_pack.rmrLTW/_old 2010-03-23 22:28:52.000000000 +0100 +++ /var/tmp/diff_new_pack.rmrLTW/_new 2010-03-23 22:28:52.000000000 +0100 @@ -23,12 +23,13 @@ BuildRequires: xfce4-panel-devel Summary: Time-managing application for the Xfce desktop environment Version: 4.6.1 -Release: 2 +Release: 3 License: GPLv2+ Url: http://www.xfce.org Source: %{name}-%{version}.tar.bz2 Source1: README.SUSE Patch0: %{name}-shared-libical.patch +Patch1: orage-4.6.1-fix-undefined-operation.patch Group: Productivity/Office/Organizers BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: xfcalendar = %{version} @@ -50,8 +51,10 @@ %prep %setup -q +cp %{SOURCE1} . # rm -rf libical # %patch0 +%patch1 -p1 %build %configure ++++++ orage-4.6.1-fix-undefined-operation.patch ++++++ --- src/day-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: orage-4.6.1/src/day-view.c =================================================================== --- orage-4.6.1.orig/src/day-view.c 2009-04-15 00:58:27.000000000 +0200 +++ orage-4.6.1/src/day-view.c 2010-03-23 11:56:19.000000000 +0100 @@ -896,7 +896,7 @@ static void build_day_view_table(day_win } /* some rare locales show weekday in the default date, so we need to * make it correct. Safer would be to call mktime() */ - tm_date.tm_wday = ++tm_date.tm_wday%7; + tm_date.tm_wday = (tm_date.tm_wday+1)%7; } fill_hour_arrow(dw, days+1); g_free(today); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 open-vm-tools for openSUSE:Factory
by root＠Hilbert.suse.de 23 Mar '10

23 Mar '10

Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at Tue Mar 23 22:27:13 CET 2010. -------- --- open-vm-tools/open-vm-tools.changes 2010-02-25 21:43:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/open-vm-tools/open-vm-tools.changes 2010-03-23 12:32:20.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Mar 23 09:27:23 UTC 2010 - dimstar(a)opensuse.org + +- Disabled vmxnet3 building. this only did not give an error anyhow + as there was a typo, thus having the module already disabled for + quite some time. +- bnc#590329: Re-add lost 50-vmnics.conf file. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- open-vm-tools-modprobe.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.Ff69xT/_old 2010-03-23 22:26:11.000000000 +0100 +++ /var/tmp/diff_new_pack.Ff69xT/_new 2010-03-23 22:26:11.000000000 +0100 @@ -24,7 +24,7 @@ Group: System/Emulators/PC Summary: Open Virtual Machine Tools Version: 2010.02.23 -Release: 1 +Release: 2 %define svn_rev 236320 Url: http://open-vm-tools.sourceforge.net/ License: BSD3c ; GPLv2 ; LGPLv2.1 @@ -34,6 +34,7 @@ Source3: vmware-toolbox.desktop Source4: open-vm-tools.permissions Source5: vmware-user-autostart-wrapper +Source6: open-vm-tools-modprobe.conf Source98: preamble BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ @@ -59,9 +60,6 @@ Requires: vmware-guest-kmp Supplements: modalias(pci:v000015ADd*sv*sd*bc*sc*i*) %define vm_modules vmblock vmhgfs vmmemctl vmsync vmxnet vmci vsock pvscsi -%if 0%{suse_version} <= 1120 -%define vm_module %{vm_modules} vmxnet3 -%endif %suse_kernel_module_package -n vmware-guest -p %{SOURCE98} xen um @@ -214,6 +212,7 @@ # which checks for /proc/fs/vmblock/dev to appear and then starts vmware-user-suid-wrapper install -D -m 0755 %{S:5} $RPM_BUILD_ROOT%{_bindir}/vmware-user-autostart-wrapper install -D -m 0644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop +install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.conf # handle the .destop files for translations %suse_update_desktop_file vmware-user-autostart @@ -284,6 +283,7 @@ %config(noreplace) %{_sysconfdir}/pam.d/vmtoolsd %{_sysconfdir}/vmware-tools %{_sysconfdir}/init.d/vmtoolsd +%{_sysconfdir}/modprobe.d/50-vmnics.conf %{_sbindir}/rcvmtoolsd %exclude %{_libdir}/*.so ++++++ open-vm-tools-modprobe.conf ++++++ install pcnet32 /sbin/modprobe -q --ignore-install vmxnet; /sbin/modprobe -q --ignore-install pcnet32 $CMDLINE_OPTS; /bin/true; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lxdm-conf for openSUSE:Factory
by root＠Hilbert.suse.de 23 Mar '10

23 Mar '10

Hello community, here is the log from the commit of package lxdm-conf for openSUSE:Factory checked in at Tue Mar 23 22:22:03 CET 2010. -------- --- lxdm-conf/lxdm-conf.changes 2010-02-28 17:28:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/lxdm-conf/lxdm-conf.changes 2010-03-23 11:52:57.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Mar 23 10:52:29 UTC 2010 - andrea(a)opensuse.org + +- added missing COPYING file (gpl v3) bnc#590414 + +------------------------------------------------------------------- +Mon Mar 22 20:45:39 UTC 2010 - andrea(a)opensuse.org + +- fixed typo into Summary + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxdm-conf.spec ++++++ --- /var/tmp/diff_new_pack.jYPqcK/_old 2010-03-23 22:21:23.000000000 +0100 +++ /var/tmp/diff_new_pack.jYPqcK/_new 2010-03-23 22:21:23.000000000 +0100 @@ -19,9 +19,9 @@ Name: lxdm-conf -Summary: LXDM configuration tool' +Summary: LXDM configuration tool Version: 0.2.0+svn727 -Release: 1 +Release: 2 License: GPLv3 Group: System/GUI/Other Url: https://noc.sidux.com/lxde @@ -29,10 +29,12 @@ Source1: README.SUSE BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes python-devel update-desktop-files +BuildRequires: licenses BuildArch: noarch Requires: lxdm Requires: python-gtk >= 2.0 Requires: python-gobject2 +Requires: licenses %py_requires %description @@ -48,6 +50,7 @@ %__mkdir_p %buildroot/ %__cp -r usr %buildroot/ %suse_update_desktop_file lxdmconf +ln -sf /usr/share/doc/licenses/gpl-3.0.txt COPYING %fdupes -s %buildroot %clean @@ -55,7 +58,7 @@ %files %defattr (-,root,root,-) -%doc COPYRIGHT README.SUSE +%doc COPYRIGHT COPYING README.SUSE %{_sbindir}/lxdmconf %{_datadir}/applications/* %{_datadir}/locale/*/LC_MESSAGES/lxdmconf.moo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 lxde-common-branding-openSUSE for openSUSE:Factory
by root＠Hilbert.suse.de 23 Mar '10

23 Mar '10

Hello community, here is the log from the commit of package lxde-common-branding-openSUSE for openSUSE:Factory checked in at Tue Mar 23 22:21:08 CET 2010. -------- --- lxde-common-branding-openSUSE/lxde-common-branding-openSUSE.changes 2010-03-01 12:51:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/lxde-common-branding-openSUSE/lxde-common-branding-openSUSE.changes 2010-03-23 08:47:24.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 23 07:44:27 UTC 2010 - andrea(a)opensuse.org + +- added "print" keybind on openbox configuration + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxde-common-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.nVpKGz/_old 2010-03-23 22:20:26.000000000 +0100 +++ /var/tmp/diff_new_pack.nVpKGz/_new 2010-03-23 22:20:26.000000000 +0100 @@ -20,7 +20,7 @@ Name: lxde-common-branding-openSUSE Version: 11.3 -Release: 1 +Release: 2 License: GPL Source0: lxde-common-0.5.0.tar.bz2 Source1: suse.png ++++++ lxde-common-openbox-shortcut.patch ++++++ --- /var/tmp/diff_new_pack.nVpKGz/_old 2010-03-23 22:20:26.000000000 +0100 +++ /var/tmp/diff_new_pack.nVpKGz/_new 2010-03-23 22:20:26.000000000 +0100 @@ -1,6 +1,6 @@ diff -uNr old-lxde-common-0.5.0//openbox/rc.xml.in lxde-common-0.5.0/openbox/rc.xml.in --- old-lxde-common-0.5.0//openbox/rc.xml.in 2008-04-26 04:32:26.000000000 +0200 -+++ lxde-common-0.5.0/openbox/rc.xml.in 2009-12-15 23:00:53.413897622 +0100 ++++ lxde-common-0.5.0/openbox/rc.xml.in 2010-03-23 08:43:40.534105730 +0100 @@ -271,12 +271,19 @@ </action> </keybind> @@ -23,3 +23,17 @@ <keybind key="F11"> <action name="ToggleFullscreen"/> </keybind> +@@ -288,6 +295,13 @@ + </action> + </keybind> + ++  ++ <keybind key="Print"> ++ <action name="Execute"> ++ <command>mtpaint -s</command> ++ </action> ++ </keybind> ++ + </keyboard> + + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 filezilla for openSUSE:Factory
by root＠Hilbert.suse.de 23 Mar '10

23 Mar '10

Hello community, here is the log from the commit of package filezilla for openSUSE:Factory checked in at Tue Mar 23 22:18:13 CET 2010. -------- --- filezilla/filezilla.changes 2010-02-16 17:54:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/filezilla/filezilla.changes 2010-03-23 08:38:51.000000000 +0100 @@ -1,0 +2,37 @@ +Tue Mar 23 07:27:59 UTC 2010 - per(a)osbeck.com + +- update to v3.3.2.1 + - Remember location of update download directory + - Cancel file renaming on actions that change the file list, such as changing sort order or performing a refresh + - Cancel file renaming if starting a drag&drop operation + - Filter invalid characters if downloading through double-clicking files or if adding from the search dialog + - Fix site-specific bookmarks menu + - The menu did not reflect initial value of preserve timestamp option properly + - MSW: Keep FileZilla subdirectory in startmenu when updating, preserves custom order + - MSW: Add AppID support to installer + + +------------------------------------------------------------------- +Tue Mar 16 17:45:18 UTC 2010 - per(a)osbeck.com + +- update to v3.3.2 +- *nix: Add support for forward and backward mouse buttons +- Speed limits can be re-enabled on SFTP connections +- Changed settings did not come into effect unless FileZilla was restarted +- Small performance improvements +- Spelling fixes +- Rebuilt due to timer problems +- Speed limits can be quickly set using the menu and a new indicator in the status bar +- Display number of bytes transferred and duration of transfer in log +- MSW: React to back button of mouse in file lists +- Updated blukis icon set +- Refactored large parts of the toolbar and menubar code +- A race condition in the socket code could lead to crashes +- Fix connecting to addresses longer than 15 characters if using SOCKS proxy +- Get add to queue in local directory tree context menu working again +- Do not open request dialogs if user is holding a mouse button +- Forward all Ctrl+Tab key events to tab bar +- Do not report SFTP exitcodes that do not originate from the server + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- FileZilla_3.3.1_src.tar.bz2 New: ---- FileZilla_3.3.2.1_src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ filezilla.spec ++++++ --- /var/tmp/diff_new_pack.oJQBAQ/_old 2010-03-23 22:17:42.000000000 +0100 +++ /var/tmp/diff_new_pack.oJQBAQ/_new 2010-03-23 22:17:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package filezilla (Version 3.3.1) +# spec file for package filezilla (Version 3.3.2.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ Obsoletes: FileZilla < 3.0.3 PreReq: update-desktop-files Summary: A GUI FTP and SFTP Client -Version: 3.3.1 +Version: 3.3.2.1 Release: 1 License: GPLv2+ Url: http://www.filezilla.de ++++++ FileZilla_3.3.1_src.tar.bz2 -> FileZilla_3.3.2.1_src.tar.bz2 ++++++ ++++ 393713 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 dx for openSUSE:Factory
by root＠Hilbert.suse.de 23 Mar '10

23 Mar '10

Hello community, here is the log from the commit of package dx for openSUSE:Factory checked in at Tue Mar 23 22:17:30 CET 2010. -------- --- dx/dx.changes 2010-02-09 14:58:24.000000000 +0100 +++ /mounts/work_src_done/STABLE/dx/dx.changes 2010-03-22 18:09:44.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 22 17:35:29 CET 2010 - pgajdos(a)suse.cz + +- fixed build with new ImageMagick + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dx.spec ++++++ --- /var/tmp/diff_new_pack.JX63hb/_old 2010-03-23 22:00:34.000000000 +0100 +++ /var/tmp/diff_new_pack.JX63hb/_new 2010-03-23 22:00:34.000000000 +0100 @@ -25,7 +25,7 @@ %endif BuildRequires: fdupes Version: 4.4.4 -Release: 228 +Release: 229 Summary: IBM Open Visualization Data Explorer License: IBM Public License .. Group: Productivity/Graphics/Visualization/Other ++++++ dx-4.4.4-imagemagick.patch ++++++ --- /var/tmp/diff_new_pack.JX63hb/_old 2010-03-23 22:00:34.000000000 +0100 +++ /var/tmp/diff_new_pack.JX63hb/_new 2010-03-23 22:00:34.000000000 +0100 @@ -1,6 +1,8 @@ ---- configure.ac.orig 2009-07-13 17:39:51.000000000 +0200 -+++ configure.ac 2009-07-13 17:41:42.000000000 +0200 -@@ -801,8 +801,8 @@ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -801,8 +801,8 @@ then failed=0; passed=0; @@ -10,7 +12,7 @@ AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,) AC_MSG_CHECKING(if ImageMagick package is complete) if test $passed -gt 0 -@@ -835,8 +835,13 @@ +@@ -835,8 +835,13 @@ dnl routine. This allows us to simplify dnl format configuration libraries. if test "$HAVE_MC" = "yes" ; then @@ -25,3 +27,43 @@ AC_MSG_CHECKING(if ImageMagick package is complete) if test $passed -gt 0 then +Index: src/exec/dxmods/_im_image.c +=================================================================== +--- src/exec/dxmods/_im_image.c.orig ++++ src/exec/dxmods/_im_image.c +@@ -329,7 +329,7 @@ static Error write_im(RWImageArgs *iargs + DestroyImageInfo(new_frame_info); + DestroyImageInfo(image_info); + #if MagickLibVersion > 0x0537 +- DestroyConstitute(); ++ ConstituteComponentTerminus(); + #endif + DXSetError(ERROR_INTERNAL, "reason = %s, description = %s", + image->exception.reason, +@@ -346,7 +346,7 @@ static Error write_im(RWImageArgs *iargs + DestroyImageInfo(new_frame_info); + DestroyImageInfo(image_info); + #if MagickLibVersion > 0x0537 +- DestroyConstitute(); ++ ConstituteComponentTerminus(); + #endif + DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer _im_image.c"); + } +@@ -375,7 +375,7 @@ static Error write_im(RWImageArgs *iargs + DestroyImageInfo(image_info); + DestroyImageInfo(new_frame_info); + #if MagickLibVersion > 0x0537 +- DestroyConstitute(); ++ ConstituteComponentTerminus(); + #endif + + DEBUGMESSAGE("back from DestroyImage"); +@@ -491,7 +491,7 @@ static Error write_im(RWImageArgs *iargs + DestroyImage(image); + DestroyImageInfo(image_info); + #if MagickLibVersion > 0x0537 +- DestroyConstitute(); ++ ConstituteComponentTerminus(); + #endif + } + return (OK); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 clutter-imcontext for openSUSE:Factory
by root＠Hilbert.suse.de 23 Mar '10

23 Mar '10

Hello community, here is the log from the commit of package clutter-imcontext for openSUSE:Factory checked in at Tue Mar 23 22:00:22 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/clutter-imcontext/clutter-imcontext.changes 2010-03-23 16:30:40.000000000 +0100 @@ -0,0 +1,44 @@ +------------------------------------------------------------------- +Tue Mar 23 15:31:26 UTC 2010 - awafaa(a)opensuse.org + +- Clean up spec file for submission to Factory + +------------------------------------------------------------------- +Wed Feb 3 18:57:59 UTC 2010 - abockover(a)novell.com + +- Change version from 0.1.5_20090918 to 0.2.0.1.5.20090918 since + the previous released version was 0.1.<YYYYMMDD>, which is a + higher version than 0.1.5; the upstream 0.2.1+ series will see a + return of sane/upstream-tracked version numbers + +------------------------------------------------------------------- +Mon Feb 1 10:04:42 UTC 2010 - jlee(a)novell.com + +- Remove enable_autoshow dummy file in RPM by add the following + statement in spec file: + rm -f %{buildroot}/%{_sysconfdir}/clutter-imcontext/enable_autoshow + To disable scim autoshow feature by default. (bnc#567393) + +------------------------------------------------------------------- +Wed Nov 11 10:48:32 UTC 2009 - glin(a)novell.com + +- Update to commit b0d19e5a3d481dbe30f4a9ed788fa258dcaeaf65 + +------------------------------------------------------------------- +Fri Aug 07 00:00:00 CET 2009 - glin(a)novell.com + +- Update to commit 2cb6f0ff153db639a489e58e36802e0e928b1968 +- Remove update-clutter-imtext-license.patch which is fixed in + upstream. +- Remove "rm -rf %%{buildroot}" due to the warning from build service + +------------------------------------------------------------------- +Fri Jul 10 00:00:00 CET 2009 - glin(a)novell.com + +- Remove all .la files. + +------------------------------------------------------------------- +Fri Jul 10 00:00:00 CET 2009 - glin(a)novell.com + +- Initial import from moblin + calling whatdependson for head-i586 New: ---- clutter-imcontext-0.1.5_20090918.tar.bz2 clutter-imcontext.changes clutter-imcontext.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clutter-imcontext.spec ++++++ # # spec file for package clutter-imcontext (Version 0.2.0.1.5.20090918) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # 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: clutter-imcontext Summary: IMContext Framework Library for Clutter Group: System/Libraries %define actual_version 0.1.5_20090918 Version: 0.2.0.1.5.20090918 Release: 1 License: LGPLv2.1 Url: http://moblin.org/ Source0: %{name}-%{actual_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: clutter-devel glib2-devel gtk-doc %description The IMContext Framework Library for Clutter %package devel License: LGPLv2.1 Summary: IMContext Framework Library for Clutter Group: Development/Libraries/C and C++ Requires: clutter-devel Requires: %{name} >= %{version} %description devel The IMContext Framework Library for Clutter %prep %setup -q -n %{name}-%{actual_version} %build #%autogen --disable-static ./autogen.sh %configure --disable-static --docdir=%{_datadir}/doc/%{name}-%{version} make %{?_smp_mflags} %install %makeinstall %find_lang clutter-imcontext || echo -n >> clutter-imcontext.lang rm -f %{buildroot}/%{_libdir}/*.la rm -f %{buildroot}/%{_sysconfdir}/clutter-imcontext/enable_autoshow %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf %{buildroot} %files -f clutter-imcontext.lang %defattr(-,root,root,-) %{_libdir}/libclutter-imcontext-0.1.so.0 %{_libdir}/libclutter-imcontext-0.1.so.0.0.0 %{_bindir}/clutter-scan-immodules %dir %{_sysconfdir}/clutter-imcontext #%{_sysconfdir}/clutter-imcontext/enable_autoshow %files devel %defattr(-,root,root,-) %{_libdir}/libclutter-imcontext-0.1.so %{_includedir}/clutter-imcontext-0.1/ %{_libdir}/pkgconfig/clutter-imcontext-0.1.pc %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 Terminal for openSUSE:Factory
by root＠Hilbert.suse.de 23 Mar '10

23 Mar '10

Hello community, here is the log from the commit of package Terminal for openSUSE:Factory checked in at Tue Mar 23 21:52:39 CET 2010. -------- --- Terminal/Terminal.changes 2010-02-02 13:54:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/Terminal/Terminal.changes 2010-03-22 17:51:26.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 22 16:50:48 UTC 2010 - puzel(a)novell.com + +- install documentation to proper location + - fix bnc#579327 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Terminal.spec ++++++ --- /var/tmp/diff_new_pack.9Y0axm/_old 2010-03-23 21:52:29.000000000 +0100 +++ /var/tmp/diff_new_pack.9Y0axm/_new 2010-03-23 21:52:29.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: exo-devel intltool Summary: This is the Terminal emulator application Version: 0.4.4 -Release: 1 +Release: 2 License: GPLv2+ Url: http://www.xfce.org/ Source: http://goodies.xfce.org/releases/terminal/%{name}-%{version}.tar.bz2 @@ -47,7 +47,8 @@ %setup -q %build -%configure +%configure \ + --docdir=%{_defaultdocdir}/%{name} make %{?jobs:-j%jobs} %install @@ -55,6 +56,7 @@ %suse_update_desktop_file -i Terminal System TerminalEmulator Utility install -m 0755 -d $RPM_BUILD_ROOT/usr/share/pixmaps/ install -c -m 644 icons/terminal.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/Terminal.xpm +install -m 0644 {README,ChangeLog,COPYING,AUTHORS,HACKING,NEWS,THANKS} $RPM_BUILD_ROOT%{_defaultdocdir}/Terminal/ %find_lang %{name} %clean @@ -62,18 +64,15 @@ %files -f %name.lang %defattr(-,root,root) -%doc README ChangeLog COPYING AUTHORS HACKING NEWS THANKS %{_bindir}/Terminal %{_bindir}/terminal %{_libexecdir}/Terminal* %{_datadir}/Terminal/*ui %{_datadir}/Terminal/Terminal.glade %{_datadir}/applications/Terminal.desktop -%doc %{_datadir}/doc/Terminal/*/* -%doc %{_datadir}/doc/Terminal/terminal.css %dir %{_datadir}/Terminal -%dir %{_datadir}/doc/Terminal -%dir %{_datadir}/doc/Terminal/* +%dir %{_datadir}/doc/packages/Terminal +%{_defaultdocdir}/Terminal/* %dir %{_datadir}/icons/hicolor/* %dir %{_datadir}/icons/hicolor/*/* %{_datadir}/icons/hicolor/*/*/* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-nfs-client for openSUSE:Factory
by root＠Hilbert.suse.de 22 Mar '10

22 Mar '10

Hello community, here is the log from the commit of package yast2-nfs-client for openSUSE:Factory checked in at Mon Mar 22 17:12:00 CET 2010. -------- --- yast2-nfs-client/yast2-nfs-client.changes 2010-02-04 15:04:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-nfs-client/yast2-nfs-client.changes 2010-03-22 15:19:42.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 22 15:22:12 CET 2010 - juhliarik(a)suse.cz + +- added fix for problem with OK button (bnc#589541) +- 2.19.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-nfs-client-2.19.1.tar.bz2 New: ---- yast2-nfs-client-2.19.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-client.spec ++++++ --- /var/tmp/diff_new_pack.vOJILA/_old 2010-03-22 17:11:48.000000000 +0100 +++ /var/tmp/diff_new_pack.vOJILA/_new 2010-03-22 17:11:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-nfs-client (Version 2.19.1) +# spec file for package yast2-nfs-client (Version 2.19.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,14 @@ Name: yast2-nfs-client -Version: 2.19.1 +Version: 2.19.2 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-nfs-client-2.19.1.tar.bz2 +Source0: yast2-nfs-client-2.19.2.tar.bz2 + Prefix: /usr + Group: System/YaST License: GPLv2+ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -33,12 +36,15 @@ Requires: yast2-nfs-common # showmount, #150382, #286300 Recommends: nfs-client + Provides: yast2-config-nfs yast2-config-nfs-devel Obsoletes: yast2-config-nfs yast2-config-nfs-devel Provides: yast2-trans-nfs Obsoletes: yast2-trans-nfs Provides: yast2-config-network:/usr/lib/YaST2/clients/lan_nfs_client.ycp + BuildArch: noarch + Summary: YaST2 - NFS Configuration %description @@ -46,14 +52,16 @@ file system access. It allows access to files on remote machines. %prep -%setup -n yast2-nfs-client-2.19.1 +%setup -n yast2-nfs-client-2.19.2 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) ++++++ yast2-nfs-client-2.19.1.tar.bz2 -> yast2-nfs-client-2.19.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.1/VERSION new/yast2-nfs-client-2.19.2/VERSION --- old/yast2-nfs-client-2.19.1/VERSION 2010-02-04 14:58:06.000000000 +0100 +++ new/yast2-nfs-client-2.19.2/VERSION 2010-03-22 15:22:55.000000000 +0100 @@ -1 +1 @@ -2.19.1 +2.19.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.1/configure new/yast2-nfs-client-2.19.2/configure --- old/yast2-nfs-client-2.19.1/configure 2010-02-03 15:05:31.000000000 +0100 +++ new/yast2-nfs-client-2.19.2/configure 2010-03-22 14:54:59.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-nfs-client 2.19.0. +# Generated by GNU Autoconf 2.63 for yast2-nfs-client 2.19.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-nfs-client' PACKAGE_TARNAME='yast2-nfs-client' -PACKAGE_VERSION='2.19.0' -PACKAGE_STRING='yast2-nfs-client 2.19.0' +PACKAGE_VERSION='2.19.1' +PACKAGE_STRING='yast2-nfs-client 2.19.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1276,7 +1276,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-nfs-client 2.19.0 to adapt to many kinds of systems. +\`configure' configures yast2-nfs-client 2.19.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1348,7 +1348,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-nfs-client 2.19.0:";; + short | recursive ) echo "Configuration of yast2-nfs-client 2.19.1:";; esac cat <<\_ACEOF @@ -1428,7 +1428,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-nfs-client configure 2.19.0 +yast2-nfs-client configure 2.19.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1442,7 +1442,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-nfs-client $as_me 2.19.0, which was +It was created by yast2-nfs-client $as_me 2.19.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2422,7 +2422,7 @@ # Define the identity of the package. PACKAGE='yast2-nfs-client' - VERSION='2.19.0' + VERSION='2.19.1' cat >>confdefs.h <<_ACEOF @@ -2544,7 +2544,7 @@ -VERSION="2.19.0" +VERSION="2.19.1" RPMNAME="yast2-nfs-client" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" @@ -3579,7 +3579,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-nfs-client $as_me 2.19.0, which was +This file was extended by yast2-nfs-client $as_me 2.19.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3629,7 +3629,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-nfs-client config.status 2.19.0 +yast2-nfs-client config.status 2.19.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.1/configure.in new/yast2-nfs-client-2.19.2/configure.in --- old/yast2-nfs-client-2.19.1/configure.in 2010-02-03 15:05:27.000000000 +0100 +++ new/yast2-nfs-client-2.19.2/configure.in 2010-03-22 14:54:53.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-nfs-client, 2.19.0, http://bugs.opensuse.org/, yast2-nfs-client) +AC_INIT(yast2-nfs-client, 2.19.1, http://bugs.opensuse.org/, yast2-nfs-client) 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.19.0" +VERSION="2.19.1" RPMNAME="yast2-nfs-client" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.1/src/ui.ycp new/yast2-nfs-client-2.19.2/src/ui.ycp --- old/yast2-nfs-client-2.19.1/src/ui.ycp 2010-02-04 13:16:14.000000000 +0100 +++ new/yast2-nfs-client-2.19.2/src/ui.ycp 2010-03-22 15:20:21.000000000 +0100 @@ -712,9 +712,9 @@ else HandleEvent( ret ); } - while (ret != `back && ret != `next && ret != `abort); + while (ret != `back && ret != `next && ret != `abort && ret != `ok); - if (ret == `next) + if (ret == `next || ret == `ok) { // grab current settings, store them to SuSEFirewall:: if( UI::WidgetExists(`id(`fstable)) ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2 for openSUSE:Factory
by root＠Hilbert.suse.de 22 Mar '10

22 Mar '10

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Mon Mar 22 17:11:25 CET 2010. -------- --- yast2/yast2.changes 2010-03-03 23:26:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2010-03-22 09:13:41.000000000 +0100 @@ -1,0 +2,25 @@ +Mon Mar 22 09:12:32 CET 2010 - mzugec(a)suse.cz + +- L3: autoinstallation with manual setup (bnc#568653) +- 2.19.10 + +------------------------------------------------------------------- +Tue Mar 16 15:28:33 CET 2010 - jsuchome(a)suse.cz + +- SERVICES.pm moved to webyast-services-ws (bnc#587876) +- 2.19.9 + +------------------------------------------------------------------- +Wed Mar 10 16:32:25 CET 2010 - locilka(a)suse.cz + +- Added special comments for translators to RTL languages + (BNC #584466). + +------------------------------------------------------------------- +Wed Mar 10 15:43:17 CET 2010 - mvidner(a)suse.cz + +- Mode::test(): check getenv instead of the UI + so that it works also in WebYaST (bnc#243624#c13). +- 2.19.8 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.19.7.tar.bz2 New: ---- yast2-2.19.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.UinzqM/_old 2010-03-22 17:11:03.000000000 +0100 +++ /var/tmp/diff_new_pack.UinzqM/_new 2010-03-22 17:11:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.19.7) +# spec file for package yast2 (Version 2.19.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2 -Version: 2.19.7 +Version: 2.19.10 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.19.7.tar.bz2 +Source0: yast2-2.19.10.tar.bz2 Prefix: /usr @@ -128,7 +128,7 @@ installation with YaST2. %prep -%setup -n yast2-2.19.7 +%setup -n yast2-2.19.10 %build %{prefix}/bin/y2tool y2autoconf @@ -185,7 +185,6 @@ %dir /usr/share/YaST2/images %dir /usr/share/YaST2/locale %dir /usr/share/YaST2/modules -%dir /usr/share/YaST2/modules/YaPI %dir /usr/share/YaST2/scrconf %dir %{prefix}/lib/YaST2/bin %dir /usr/share/YaST2/data @@ -203,7 +202,6 @@ /usr/share/YaST2/data/*.ycp /usr/share/YaST2/clients/* /usr/share/YaST2/modules/* -/usr/share/YaST2/modules/YaPI/*.pm /usr/share/YaST2/scrconf/* %{prefix}/lib/YaST2/bin/* /usr/lib/YaST2/servers_non_y2/ag_* ++++++ yast2-2.19.7.tar.bz2 -> yast2-2.19.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/VERSION new/yast2-2.19.10/VERSION --- old/yast2-2.19.7/VERSION 2010-03-03 23:09:50.000000000 +0100 +++ new/yast2-2.19.10/VERSION 2010-03-22 09:12:30.000000000 +0100 @@ -1 +1 @@ -2.19.7 +2.19.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/configure new/yast2-2.19.10/configure --- old/yast2-2.19.7/configure 2010-01-18 14:40:50.000000000 +0100 +++ new/yast2-2.19.10/configure 2009-11-10 15:53:52.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2 2.19.5. +# Generated by GNU Autoconf 2.63 for yast2 2.18.28. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.19.5' -PACKAGE_STRING='yast2 2.19.5' +PACKAGE_VERSION='2.18.28' +PACKAGE_STRING='yast2 2.18.28' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1277,7 +1277,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2 2.19.5 to adapt to many kinds of systems. +\`configure' configures yast2 2.18.28 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1348,7 +1348,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.19.5:";; + short | recursive ) echo "Configuration of yast2 2.18.28:";; esac cat <<\_ACEOF @@ -1428,7 +1428,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.19.5 +yast2 configure 2.18.28 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1442,7 +1442,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2 $as_me 2.19.5, which was +It was created by yast2 $as_me 2.18.28, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2422,7 +2422,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.19.5' + VERSION='2.18.28' cat >>confdefs.h <<_ACEOF @@ -2544,7 +2544,7 @@ -VERSION="2.19.5" +VERSION="2.18.28" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -3606,7 +3606,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.19.5, which was +This file was extended by yast2 $as_me 2.18.28, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3656,7 +3656,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2 config.status 2.19.5 +yast2 config.status 2.18.28 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/configure.in new/yast2-2.19.10/configure.in --- old/yast2-2.19.7/configure.in 2010-01-18 14:40:47.000000000 +0100 +++ new/yast2-2.19.10/configure.in 2009-11-10 15:53:48.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.19.5, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.18.28, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.5" +VERSION="2.18.28" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/agents/etc_ssh_sshd_config.scr new/yast2-2.19.10/library/agents/etc_ssh_sshd_config.scr --- old/yast2-2.19.7/library/agents/etc_ssh_sshd_config.scr 2009-06-01 13:16:00.000000000 +0200 +++ new/yast2-2.19.10/library/agents/etc_ssh_sshd_config.scr 2010-03-12 09:45:40.000000000 +0100 @@ -18,7 +18,7 @@ * Write(.etc.ssh.sshd_config.Compression, "no") * (true) * - * $Id: etc_ssh_sshd_config.scr 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: etc_ssh_sshd_config.scr 61236 2010-03-10 15:39:50Z mvidner $ * * For more information about possible keys and values * consult with the sshd_config man pages `man sshd_config`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/agents/proc_mounts.scr new/yast2-2.19.10/library/agents/proc_mounts.scr --- old/yast2-2.19.7/library/agents/proc_mounts.scr 2009-06-01 13:16:00.000000000 +0200 +++ new/yast2-2.19.10/library/agents/proc_mounts.scr 2010-03-12 09:45:40.000000000 +0100 @@ -28,7 +28,7 @@ * ... * ]) * - * $Id: proc_mounts.scr 57258 2009-05-20 10:55:51Z aschnell $ + * $Id: proc_mounts.scr 61236 2010-03-10 15:39:50Z mvidner $ * * Returns a <b>list of maps</b>. Each map (list-entry) corresponds to i * one mount. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/agents/system_freespace.scr new/yast2-2.19.10/library/agents/system_freespace.scr --- old/yast2-2.19.7/library/agents/system_freespace.scr 2009-02-27 12:24:08.000000000 +0100 +++ new/yast2-2.19.10/library/agents/system_freespace.scr 2010-03-12 09:45:40.000000000 +0100 @@ -27,7 +27,7 @@ * not exist', 'Object is not a directory', '/bin/df does not exist on the * system' or 'Directory not defined'. Every error should appear in the y2log. * - * $Id: system_freespace.scr 55091 2009-01-27 16:34:31Z locilka $ + * $Id: system_freespace.scr 61236 2010-03-10 15:39:50Z mvidner $ * */ .system.freespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/control/src/InstError.ycp new/yast2-2.19.10/library/control/src/InstError.ycp --- old/yast2-2.19.7/library/control/src/InstError.ycp 2009-06-01 13:15:59.000000000 +0200 +++ new/yast2-2.19.10/library/control/src/InstError.ycp 2010-03-12 09:45:40.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Module for reporting installation errors * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: InstError.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: InstError.ycp 61236 2010-03-10 15:39:50Z mvidner $ * * This module provides unified interface for reporting * installation errors. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/control/src/InstExtensionImage.ycp new/yast2-2.19.10/library/control/src/InstExtensionImage.ycp --- old/yast2-2.19.7/library/control/src/InstExtensionImage.ycp 2009-06-01 13:15:59.000000000 +0200 +++ new/yast2-2.19.10/library/control/src/InstExtensionImage.ycp 2010-03-12 09:45:40.000000000 +0100 @@ -5,7 +5,7 @@ * images for the inst-sys * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: InstExtensionImage.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: InstExtensionImage.ycp 61236 2010-03-10 15:39:50Z mvidner $ * * This module provides functions that download inst-sys extension images * (localization, fonts, ...) and merge them to the current int-sys. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/modules/Message.ycp new/yast2-2.19.10/library/modules/Message.ycp --- old/yast2-2.19.7/library/modules/Message.ycp 2008-12-18 14:46:52.000000000 +0100 +++ new/yast2-2.19.10/library/modules/Message.ycp 2010-03-12 09:45:40.000000000 +0100 @@ -6,7 +6,7 @@ * Copyright: Copyright 2004, Novell, Inc. All rights reserved. * Flags: Stable * - * $Id: Message.ycp 31242 2006-06-01 12:59:16Z locilka $ + * $Id: Message.ycp 61238 2010-03-10 15:42:02Z locilka $ * * Often used messages, for example error messages */ @@ -62,7 +62,11 @@ * @return string Cannot write settings to 'destination' */ global define string CannotWriteSettingsTo (string destination) { - /* TRANSLATORS: Popup message, %1 is file or service name like "/tmp/out" or "LDAP" */ + /* TRANSLATORS: Popup message, %1 is file or service name like "/tmp/out" or "LDAP" + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English filename + * (see BNC #584466 for details) + */ return sformat(_("Cannot write settings to '%1'"), destination); } @@ -73,7 +77,11 @@ * @return string Cannot write settings to 'destination'\n\nReason: reason */ global define string CannotWriteSettingsToBecause (string destination, string reason) { - /* TRANSLATORS: Popup message, %1 is file or service name like "/tmp/out" or "LDAP", %2 is the reason of error */ + /* TRANSLATORS: Popup message, %1 is file or service name like "/tmp/out" or "LDAP", %2 is the reason of error + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English filename + * (see BNC #584466 for details) + */ return sformat(_("Cannot write settings to '%1'. Reason: %2"), destination, reason); @@ -85,7 +93,11 @@ * @return string Error writing file 'file' */ global define string ErrorWritingFile (string file) { - /* TRANSLATORS: Popup message, %1 is a file name like "/tmp/out" */ + /* TRANSLATORS: Popup message, %1 is a file name like "/tmp/out" + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English filename + * (see BNC #584466 for details) + */ return sformat(_("Error writing file '%1'"), file); } @@ -96,7 +108,11 @@ * @return string Error writing file 'file'\n\nReason: reason */ global define string ErrorWritingFileBecause (string file, string reason) { - /* TRANSLATORS: Popup message, %1 is a file name like "/tmp/out", %2 is the reason of error */ + /* TRANSLATORS: Popup message, %1 is a file name like "/tmp/out", %2 is the reason of error + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English filename + * (see BNC #584466 for details) + */ return sformat(_("Error writing file '%1'. Reason: %2"), file, reason); @@ -108,7 +124,11 @@ * @return string Cannot open file 'file' */ global define string CannotOpenFile (string file) { - /* TRANSLATORS: Popup message, %1 is the name of file like "/tmp/in" */ + /* TRANSLATORS: Popup message, %1 is the name of file like "/tmp/in" + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English filename + * (see BNC #584466 for details) + */ return sformat(_("Cannot open file '%1'"), file); } @@ -119,7 +139,11 @@ * @return string Cannot open file 'file'\n\nReason: reason */ global define string CannotOpenFileBecause (string file, string reason) { - /* TRANSLATORS: Popup message, %1 is the name of file like "/tmp/in", %2 is the reason of error */ + /* TRANSLATORS: Popup message, %1 is the name of file like "/tmp/in", %2 is the reason of error + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English filename + * (see BNC #584466 for details) + */ return sformat(_("Cannot open file '%1'. Reason: %2"), file, reason); @@ -169,7 +193,11 @@ * @return string The directory '%1' does not exist.\nCreate it? */ global define string DirectoryDoesNotExistCreate (string directory) { - /* TRANSLATORS: Popup question */ + /* TRANSLATORS: Popup question + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English directory + * (see BNC #584466 for details) + */ return sformat(_("The directory '%1' does not exist. Create it?"), directory); } @@ -220,7 +248,11 @@ * @return string Unable to create directory '%1'. */ global define string UnableToCreateDirectory (string directory) { - /* TRANSLATORS: Popup message, %1 is a directory name */ + /* TRANSLATORS: Popup message, %1 is a directory name + * For Right-To-Left languages, you want to put %1 into its own empty line so + * the text renderer doesn't get trip with the English directory + * (see BNC #584466 for details) + */ return sformat(_("Cannot create directory '%1'."), directory); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/modules/Mode.ycp new/yast2-2.19.10/library/modules/Mode.ycp --- old/yast2-2.19.7/library/modules/Mode.ycp 2008-12-18 14:46:52.000000000 +0100 +++ new/yast2-2.19.10/library/modules/Mode.ycp 2010-03-12 09:45:40.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Klaus Kaempf <kkaempf(a)suse.de> * Flags: Stable * - * $Id: Mode.ycp 47249 2008-05-02 12:55:31Z lslezak $ + * $Id: Mode.ycp 61236 2010-03-10 15:39:50Z mvidner $ * * Provide installation mode information. * Mostly values from /etc/install.inf @@ -132,14 +132,9 @@ if (_test == nil) Initialize (); if (!test_autochecked) { - - // do not call GetDisplayInfo in command line mode (bnc#374259) - if (commandline()) - { - _test = "none"; - } - else if (UI::GetDisplayInfo () == nil) { - _test = "testsuite"; // testsuite runs with a dummy ui. + // bnc#243624#c13: Y2ALLGLOBAL is set by yast2-testsuite/skel/runtest.sh + if (getenv ("Y2MODETEST") != nil || getenv ("Y2ALLGLOBAL") != nil) { + _test = "testsuite"; } test_autochecked = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/modules/Version.ycp new/yast2-2.19.10/library/modules/Version.ycp --- old/yast2-2.19.7/library/modules/Version.ycp 2010-03-03 23:11:16.000000000 +0100 +++ new/yast2-2.19.10/library/modules/Version.ycp 2010-03-22 09:13:03.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.19.7"; +global string yast2 = "2.19.10"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/network/agents/network.scr.in new/yast2-2.19.10/library/network/agents/network.scr.in --- old/yast2-2.19.7/library/network/agents/network.scr.in 2008-12-18 14:46:52.000000000 +0100 +++ new/yast2-2.19.10/library/network/agents/network.scr.in 2010-03-12 09:45:40.000000000 +0100 @@ -13,7 +13,7 @@ * VAR2="val 2 #blah" # comment2 * VAR3='val3 x #blah2' # comment3 * - * $Id: network.scr.in 49978 2008-08-12 10:45:02Z mvidner $ + * $Id: network.scr.in 61236 2010-03-10 15:39:50Z mvidner $ * * <p>Reads/writes <tt>@IFCFG_DIR@/ifcfg-*</tt>. For more details * see its own documentation.</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/network/agents/sysconfig_SuSEfirewall2.scr new/yast2-2.19.10/library/network/agents/sysconfig_SuSEfirewall2.scr --- old/yast2-2.19.7/library/network/agents/sysconfig_SuSEfirewall2.scr 2008-12-18 14:46:52.000000000 +0100 +++ new/yast2-2.19.10/library/network/agents/sysconfig_SuSEfirewall2.scr 2010-03-12 09:45:40.000000000 +0100 @@ -17,7 +17,7 @@ * // Don't forget to write nil to sync the settings! * Write(.sysconfig.SuSEfirewall2, nil) * - * $Id: sysconfig_SuSEfirewall2.scr 46270 2008-04-09 08:34:03Z locilka $ + * $Id: sysconfig_SuSEfirewall2.scr 61236 2010-03-10 15:39:50Z mvidner $ * * Read/Sets the values defined in /etc/sysconfig/SuSEfirewall2 * in an easy manner. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/packages/src/PackagesProposal.ycp new/yast2-2.19.10/library/packages/src/PackagesProposal.ycp --- old/yast2-2.19.7/library/packages/src/PackagesProposal.ycp 2009-06-01 13:16:00.000000000 +0200 +++ new/yast2-2.19.10/library/packages/src/PackagesProposal.ycp 2010-03-12 09:45:40.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: API for selecting or de-selecting packages for installation * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: PackagesProposal.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: PackagesProposal.ycp 61236 2010-03-10 15:39:50Z mvidner $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/packages/src/PackagesUI.ycp new/yast2-2.19.10/library/packages/src/PackagesUI.ycp --- old/yast2-2.19.7/library/packages/src/PackagesUI.ycp 2009-02-27 12:24:08.000000000 +0100 +++ new/yast2-2.19.10/library/packages/src/PackagesUI.ycp 2010-03-12 09:45:40.000000000 +0100 @@ -7,7 +7,7 @@ * Purpose: Provides common dialogs related to * the package management. * - * $Id: PackagesUI.ycp 55107 2009-01-28 10:56:44Z lslezak $ + * $Id: PackagesUI.ycp 61236 2010-03-10 15:39:50Z mvidner $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/packages/src/SlideShow.ycp new/yast2-2.19.10/library/packages/src/SlideShow.ycp --- old/yast2-2.19.7/library/packages/src/SlideShow.ycp 2009-03-23 19:17:16.000000000 +0100 +++ new/yast2-2.19.10/library/packages/src/SlideShow.ycp 2010-03-12 09:45:40.000000000 +0100 @@ -6,7 +6,7 @@ * Author: Stefan Hundhammer <sh(a)suse.de> * Stanislav Visnovsky <visnov(a)suse.cz> * - * $Id: SlideShow.ycp 56166 2009-03-17 11:36:29Z jsrain $ + * $Id: SlideShow.ycp 61236 2010-03-10 15:39:50Z mvidner $ * * Usage: * This is a generic module for handling global progress bar with optional slideshow/release notes etc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/runlevel/src/Makefile.am new/yast2-2.19.10/library/runlevel/src/Makefile.am --- old/yast2-2.19.7/library/runlevel/src/Makefile.am 2009-08-11 15:01:20.000000000 +0200 +++ new/yast2-2.19.10/library/runlevel/src/Makefile.am 2010-03-18 11:06:04.000000000 +0100 @@ -6,12 +6,7 @@ module_DATA = Service.ycp Runlevel.ycp -YaPI_perldir = @moduledir@/YaPI - -YaPI_perl_DATA = \ - YaPI/SERVICES.pm - EXTRA_DIST = $(agent_SCRIPTS) \ - $(scrconf_DATA) $(module_DATA) $(YaPI_perl_DATA) + $(scrconf_DATA) $(module_DATA) include $(top_srcdir)/Makefile.am.common diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/runlevel/src/Makefile.in new/yast2-2.19.10/library/runlevel/src/Makefile.in --- old/yast2-2.19.7/library/runlevel/src/Makefile.in 2010-01-18 14:40:53.000000000 +0100 +++ new/yast2-2.19.10/library/runlevel/src/Makefile.in 2010-03-22 09:13:06.000000000 +0100 @@ -72,14 +72,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(YaPI_perldir)" \ - "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" \ - "$(DESTDIR)$(scrconfdir)" +am__installdirs = "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(moduledir)" \ + "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(scrconfdir)" SCRIPTS = $(agent_SCRIPTS) SOURCES = DIST_SOURCES = -DATA = $(YaPI_perl_DATA) $(module_DATA) $(modulebin_DATA) \ - $(scrconf_DATA) +DATA = $(module_DATA) $(modulebin_DATA) $(scrconf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -203,12 +201,8 @@ agent_SCRIPTS = ag_initscripts scrconf_DATA = initscripts.scr module_DATA = Service.ycp Runlevel.ycp -YaPI_perldir = @moduledir@/YaPI -YaPI_perl_DATA = \ - YaPI/SERVICES.pm - EXTRA_DIST = $(agent_SCRIPTS) \ - $(scrconf_DATA) $(module_DATA) $(YaPI_perl_DATA) + $(scrconf_DATA) $(module_DATA) modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) modulebindir = $(moduledir) @@ -290,26 +284,6 @@ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(agentdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(agentdir)" && rm -f $$files -install-YaPI_perlDATA: $(YaPI_perl_DATA) - @$(NORMAL_INSTALL) - test -z "$(YaPI_perldir)" || $(MKDIR_P) "$(DESTDIR)$(YaPI_perldir)" - @list='$(YaPI_perl_DATA)'; test -n "$(YaPI_perldir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(YaPI_perldir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(YaPI_perldir)" || exit $$?; \ - done - -uninstall-YaPI_perlDATA: - @$(NORMAL_UNINSTALL) - @list='$(YaPI_perl_DATA)'; test -n "$(YaPI_perldir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(YaPI_perldir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(YaPI_perldir)" && rm -f $$files install-moduleDATA: $(module_DATA) @$(NORMAL_INSTALL) test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @@ -414,7 +388,7 @@ check: check-am all-am: Makefile $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(YaPI_perldir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(scrconfdir)"; do \ + for dir in "$(DESTDIR)$(agentdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(scrconfdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -464,8 +438,8 @@ info-am: -install-data-am: install-YaPI_perlDATA install-agentSCRIPTS \ - install-moduleDATA install-modulebinDATA install-scrconfDATA +install-data-am: install-agentSCRIPTS install-moduleDATA \ + install-modulebinDATA install-scrconfDATA install-dvi: install-dvi-am @@ -509,24 +483,22 @@ ps-am: -uninstall-am: uninstall-YaPI_perlDATA uninstall-agentSCRIPTS \ - uninstall-moduleDATA uninstall-modulebinDATA \ - uninstall-scrconfDATA +uninstall-am: uninstall-agentSCRIPTS uninstall-moduleDATA \ + uninstall-modulebinDATA uninstall-scrconfDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic dist-hook \ distclean distclean-generic distdir dvi dvi-am html html-am \ - info info-am install install-YaPI_perlDATA \ - install-agentSCRIPTS install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-moduleDATA install-modulebinDATA \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-scrconfDATA install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-YaPI_perlDATA uninstall-agentSCRIPTS uninstall-am \ + info info-am install install-agentSCRIPTS install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-moduleDATA \ + install-modulebinDATA install-pdf install-pdf-am install-ps \ + install-ps-am install-scrconfDATA install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-agentSCRIPTS uninstall-am \ uninstall-moduleDATA uninstall-modulebinDATA \ uninstall-scrconfDATA diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/runlevel/src/YaPI/SERVICES.pm new/yast2-2.19.10/library/runlevel/src/YaPI/SERVICES.pm --- old/yast2-2.19.7/library/runlevel/src/YaPI/SERVICES.pm 2010-03-03 23:06:42.000000000 +0100 +++ new/yast2-2.19.10/library/runlevel/src/YaPI/SERVICES.pm 1970-01-01 01:00:00.000000000 +0100 @@ -1,343 +0,0 @@ -package YaPI::SERVICES; - -use strict; -use YaST::YCP qw(:LOGGING); -use YaPI; -use Data::Dumper; - -# ------------------- imported modules -YaST::YCP::Import ("Directory"); -YaST::YCP::Import ("FileUtils"); -YaST::YCP::Import ("Package"); -YaST::YCP::Import ("Service"); -YaST::YCP::Import ("SCR"); -# ------------------------------------- - -our $VERSION = '1.0.0'; -our @CAPABILITIES = ('SLES11'); -our %TYPEINFO; - -my $custom_services_file = "/etc/webyast/custom_services.yml"; - -my $error_message = ""; - -# check for key presence in given list -sub contains { - my ( $list, $key, $ignorecase ) = @_; - if ( $ignorecase ) { - if ( grep /^$key$/i, @{$list} ) { - return 1; - } - } else { - if ( grep /^$key$/, @{$list} ) { - return 1; - } - } - return 0; -} - -# log error message and fill it into $error_message variable -sub report_error { - $error_message = shift; - y2error ($error_message); -} - -# parse the file with custom services and return the hash describing the file -sub parse_custom_services { - - if (!FileUtils->Exists ($custom_services_file)) { - report_error ("$custom_services_file file not present"); - return {}; - } - - if (!Package->Installed ("yast2-ruby-bindings")) { - report_error ("yast2-ruby-bindings not installed, cannot read custom services"); - return {}; - } - - if (!FileUtils->Exists (Directory->moduledir()."/YML.rb")) { - report_error ("YML.rb not present, cannot parse config file"); - return {}; - } - - YaST::YCP::Import ("YML"); - - my $parsed = YML->parse ($custom_services_file); - - if (!defined $parsed || ref ($parsed) ne "HASH") { - report_error ("custom services file could not be read"); - return {}; - } - return $parsed; -} - -# read the list of custom services and return the information about them -# if requested, read the status of services -sub read_custom_services { - - my $args = shift; - my @ret = (); - my $services = parse_custom_services (); - foreach my $name (keys %$services) { - my $s = { - "name" => $name - }; - $s->{"description"} = ($services->{$name}{"description"} || "") if $args->{"description"} || 0; - $s->{"shortdescription"}= ($services->{$name}{"shortdescription"} || "") if $args->{"shortdescription"} || 0; - - # read list of available commands, it may be limited for 'custom service' - my @commands = (); - foreach my $key (keys %{$services->{$name}}) { - if (contains (["start","stop","restart","reload","try-restart"], $key, 1)) { - push @commands, $key; - } - } - $s->{"commands"} = \@commands; - - if ($args->{"read_status"} || 0) - { - my $cmd = $services->{$name}{"status"}; - if (!$cmd) { - report_error ("status script for $name not defined or empty"); - next; - } - my $out = SCR->Execute (".target.bash_output", $cmd); - $s->{"status"} = $out->{"exit"}; - } - - push @ret, $s; - } - return \@ret; -} - -# read infomation about custom service and execute given command with it -sub execute_custom_script { - - my $name = shift; - my $action = shift; - my $services = parse_custom_services (); - my $ret = { - "stdout" => "", - "stderr" => "failure", - "exit" => 255 - }; - - if (%$services) { - my $service = $services->{$name}; - if (!defined $service || ref ($service) ne "HASH" || ! %$service) { - report_error ("service $name not defined or empty in config file"); - $ret->{"stderr"} = $error_message; - return $ret; - } - my $cmd = $services->{$name}{$action}; - if (!$cmd) { - report_error ("'$action' script for $name not defined or empty"); - $ret->{"stderr"} = $error_message; - return $ret; - } - $ret = SCR->Execute (".target.bash_output", $cmd); - } - return $ret; -} - -# Return the list of services enabled in given runlevel, or even all available. -# -# Parameter is an argument map with possible keys: -# "service" : if defined, only the status of _this given service_ will be returned (= list with one item) -# "runlevel" : integer; if not defined, current runlevel will be used -# "read_status" : if true, service status will be queried and returned for each service -# "custom" : if true, custom services (defined in config file) will be read (otherwise list of init.d services) -# "description" : if true, read the description of each service -# "only_enabled" : if true, return only list of services enabled in given runlevel -# - neither "start_runlevels", nor "enabled" key will be part of resulting maps -# "start_runlevels" if true, each service's result map will contain list of runlevels where it is started -# - if not present (or false), "enabled" key with boolean value will be returned instead -# "filter" : list of strings; defines filtered list of services that should be returned -# @returns array of hashes -BEGIN{$TYPEINFO{Read} = ["function", - ["list", [ "map", "string", "any"]], - ["map", "string", "any"]]; -} -sub Read { - - my $self = shift; - my $args = shift; - my @ret = (); - my $runlevel = SCR->Read (".init.scripts.current_runlevel"); - $runlevel = $args->{"runlevel"} if defined $args->{"runlevel"}; - - my @filter = (); - @filter = @{$args->{"filter"}} if defined $args->{"filter"}; - my $filter_map= {}; - foreach my $s (@filter) { - $filter_map->{$s} = 1; - } - - # only read status of one service if the name was given - if ($args->{"service"} || "") { - my $exec = $self->Execute ({ - "name" => $args->{"service"} || "", - "action" => "status", - "custom" => $args->{"custom"} || 0 - }); - my $s = { - "name" => $args->{"service"} || "", - "status" => $exec->{"exit"} || 0 - }; - push @ret, $s; - return \@ret; - } - - # read only custom services - if ($args->{"custom"} || 0) { - return read_custom_services ($args); - } - - if ($args->{"only_enabled"}) { - # generate the output list - foreach my $name (@{Service->EnabledServices ($runlevel)}) { - next if (@filter && !defined $filter_map->{$name}); # should not be returned - my $s = { - "name" => $name, - }; - $s->{"status"} = Service->Status ($name) if ($args->{"read_status"} || 0); - if (($args->{"description"} || 0) || ($args->{"shortdescription"} || 0)) { - my $info = Service->Info ($name); - $s->{"description"} = ($info->{"description"} || "") if $args->{"description"} || 0; - $s->{"shortdescription"}= ($info->{"shortdescription"} || "") if $args->{"shortdescription"} || 0; - } - push @ret, $s; - } - } - else { - my $details = SCR->Read (".init.scripts.runlevels"); - - # copied from RunlevelEd::Read - my $full_services = SCR->Read (".init.scripts.comments"); - while (my ($name, $info) = each %$full_services) { - - next if (@filter && !defined $filter_map->{$name}); # should not be returned - - my $second_service = $details->{$name} || {}; - - my $s = { - "name" => $name - }; - next if (contains ($info->{"defstart"} || [], "B", 1)); - - if ($args->{"start_runlevels"} || 0) { - $s->{"start_runlevels"} = $second_service->{"start"} || []; - } - else { - my $start = $second_service->{"start"} || []; - # for "B" check, see RunlevelEd::StartContainsImplicitly - $s->{"enabled"} = YaST::YCP::Boolean (contains ($start, $runlevel, 1) || contains ($start, "B", 1)); - } - $s->{"status"} = Service->Status ($name) if ($args->{"read_status"} || 0); - $s->{"description"} = ($info->{"description"} || "") if $args->{"description"} || 0; - $s->{"shortdescription"}= ($info->{"shortdescription"} || "") if $args->{"shortdescription"} || 0; - push @ret, $s; - } - } - - return \@ret; -} - -# Return the status of given service -# return value is the exit code of status function -BEGIN{$TYPEINFO{Get} = ["function", - "integer", "string" ]; -} -sub Get { - - my $self = shift; - my $name = shift; - - return Service->Status ($name); -} - -# Executes an action (e.g. "restart") with given service -# If the action is start or stop, it will also enable (resp. disable) -# the service for current runlevel. -# -# parameter is a map where "name" is service name, "action" means what to do -# - if "only_execute" key is present, do not continue with enabling/disabling -# - if action is "enable" or "disable", only enables/disables service -# - if "custom" key is present (with true value), indicates custom service, which -# has special handling. Also, custom service will not be enabled/disabled. -# -# return value is map with "exit", "stdout" and "stderr" keys -BEGIN{$TYPEINFO{Execute} = ["function", - [ "map", "string", "any"], - [ "map", "string", "any"]]; -} -sub Execute { - - my $self = shift; - - my $args = shift; - my $name = $args->{"name"} || ""; - my $action = $args->{"action"} || ""; - - return self->Enable ($args) if ($action eq "enable" || $action eq "disable"); - - if ($args->{"custom"} || 0) { - return execute_custom_script ($name, $action); - } - else { - my $ret = Service->RunInitScriptOutput ($name, $action); - if (($action eq "start" || $action eq "stop") && !($args->{"only_execute"} || 0)) { - if (($ret->{"exit"} || 0) ne 0) { - y2error ("action '$action' failed"); - return $ret; - } - if ($action eq "start") { - $args->{"action"} = "enable"; - } - else { - $args->{"action"} = "disable"; - } - return $self->Enable ($args); - } - return $ret; - } -} - -# Enable/Disable given service in current runlevel -# parameter is a map where "name" is service name, "action" means what to do -# return value is map with "exit", "stdout" and "stderr" keys -BEGIN{$TYPEINFO{Enable} = ["function", - [ "map", "string", "any"], - [ "map", "string", "any"]]; -} -sub Enable { - - my $self = shift; - my $args = shift; - my $name = $args->{"name"} || ""; - my $action = $args->{"action"} || ""; - my $ret = { - "stdout" => "", - "stderr" => "", - "exit" => 0 - }; - if ($action eq "enable") { - unless (Service->Enable ($name)) { - $ret->{"stderr"} = "Failed to enable service $name."; - $ret->{"exit"} = 1000; - } - } - elsif ($action eq "disable") { - unless (Service->Disable ($name)) { - $ret->{"stderr"} = "Failed to disable service $name."; - $ret->{"exit"} = 2000; - } - } - else { - $ret->{"stderr"} = "Unknown action '$action'"; - $ret->{"exit"} = 3; - } - return $ret; -} - -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.19.7/library/wizard/src/Confirm.ycp new/yast2-2.19.10/library/wizard/src/Confirm.ycp --- old/yast2-2.19.7/library/wizard/src/Confirm.ycp 2008-12-18 14:46:52.000000000 +0100 +++ new/yast2-2.19.10/library/wizard/src/Confirm.ycp 2010-03-22 09:12:47.000000000 +0100 @@ -9,7 +9,7 @@ * * Flags: Stable * - * $Id: Confirm.ycp 53760 2008-12-01 10:47:25Z mzugec $ + * $Id: Confirm.ycp 61424 2010-03-22 08:12:46Z mzugec $ */ { @@ -38,6 +38,10 @@ global boolean Detection(string class, string icon_name) { if(Linuxrc::manual () != true) return true; + + // L3: no interaction in AY, just re-probe (bnc#568653) + if(Mode::autoinst () == true) return true; + if(Arch::s390()) return true; if( icon_name == nil ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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