November 2007 - openSUSE Commits - openSUSE Mailing Lists

commit dar
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package dar checked in at Fri Nov 2 01:09:35 CET 2007. -------- --- dar/dar.changes 2007-07-06 12:59:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/dar/dar.changes 2007-11-01 13:12:53.773725000 +0100 @@ -1,0 +2,25 @@ +Thu Nov 1 13:12:05 CET 2007 - coolo(a)suse.de + +- compile with gcc 4.3 + +------------------------------------------------------------------- +Thu Nov 1 12:36:11 CET 2007 - coolo(a)suse.de + +- update to 2.3.6 +- changed displayed message when adding a hard link to an archive while + performing a differential backup +- added back the possibility to use old blowfish implementation (bfw cipher) +- integrated optimization patch from Sonni Norlov +- updated Swedish translation by Peter Landgren +- updated French translation +- fixed broken Native Language Support in 2.3.x (where x<5) + +from 2.3.5 to 2.3.6 +- fixed Makefile.am in src/dar_suite (removed "/" after $(DESTDIR)) +- fixed bug in regex mask building when not using ordered masks +- fixing bug that led dar_manager to report no error while some files failed + to be restored due to command-line for dar being too large. +- fixed bug met when user aborts operation while dar is finalizing archive creation [SF #1800507] +- fixed problem with execvp when dar_manager launches dar + +------------------------------------------------------------------- Old: ---- dar-2.3.4.tar.bz2 New: ---- dar-2.3.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dar.spec ++++++ --- /var/tmp/diff_new_pack.H30690/_old 2007-11-02 01:07:56.000000000 +0100 +++ /var/tmp/diff_new_pack.H30690/_new 2007-11-02 01:07:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package dar (Version 2.3.4) +# spec file for package dar (Version 2.3.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,11 +11,11 @@ Name: dar BuildRequires: e2fsprogs-devel gcc-c++ libattr-devel libbz2-devel openssl-devel zlib-devel -URL: http://dar.linux.free.fr/ +Url: http://dar.linux.free.fr/ License: GPL v2 or later Group: System/Filesystems Summary: Backup and Restore Application -Version: 2.3.4 +Version: 2.3.6 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 @@ -27,14 +27,11 @@ %endif %description -Dar stands for disk archive and is a hardware-independent backup -solution. Dar uses catalogs (unlike tar), so it is possible to extract -a single file without having to read the entire archive. It is also -possible to create incremental backups. - -Dar archives can also be created or used with the libdar library (for -example, with KDar, a KDE application). - +Dar (Disk Archive) is a hardware-independent backup solution. Dar uses +catalogs (unlike tar),which it makes it possible to extract a single +file without having to read the entire archive. It is also possible to +create incremental backups. Dar archives can also be created or used +with the libdar library (for example, with KDar, a KDE application). This package contains the command line tools and documentation. @@ -138,8 +135,25 @@ %_libdir/libdar*.la %_libdir/libdar*.so %_libdir/pkgconfig/libdar*.pc - %changelog +* Thu Nov 01 2007 - coolo(a)suse.de +- compile with gcc 4.3 +* Thu Nov 01 2007 - coolo(a)suse.de +- update to 2.3.6 +- changed displayed message when adding a hard link to an archive while + performing a differential backup +- added back the possibility to use old blowfish implementation (bfw cipher) +- integrated optimization patch from Sonni Norlov +- updated Swedish translation by Peter Landgren +- updated French translation +- fixed broken Native Language Support in 2.3.x (where x<5) + from 2.3.5 to 2.3.6 +- fixed Makefile.am in src/dar_suite (removed "/" after $(DESTDIR)) +- fixed bug in regex mask building when not using ordered masks +- fixing bug that led dar_manager to report no error while some files failed + to be restored due to command-line for dar being too large. +- fixed bug met when user aborts operation while dar is finalizing archive creation [SF #1800507] +- fixed problem with execvp when dar_manager launches dar * Fri Jul 06 2007 - adrian(a)suse.de - update to version 2.3.4 * fixes a weakness in blowfish encryption (#289994) ++++++ dar-2.3.4.tar.bz2 -> dar-2.3.6.tar.bz2 ++++++ ++++ 19719 lines of diff (skipped) ++++++ dar.diff ++++++ --- /var/tmp/diff_new_pack.H30690/_old 2007-11-02 01:07:57.000000000 +0100 +++ /var/tmp/diff_new_pack.H30690/_new 2007-11-02 01:07:58.000000000 +0100 @@ -64,24 +64,6 @@ { --- src/testing/test_libdar.cpp +++ src/testing/test_libdar.cpp 2007/07/06 10:44:08 -@@ -101,7 +101,7 @@ - { - try - { -- printf("[%d]%s\n", (U_I)context, ptr); -+ printf("[%d]%s\n", (long)context, ptr); - } - catch(...) - { -@@ -130,7 +130,7 @@ - { - char r; - -- printf("[%d]%s\n", (U_I)context, ptr); -+ printf("[%d]%s\n", (long)context, ptr); - scanf("%c", &r); - rep = r == 'y'; - } @@ -161,7 +161,7 @@ bool has_children, void *context) @@ -91,3 +73,234 @@ } void f2() +--- src/libdar/erreurs.cpp 2005-12-29 03:32:41.000000000 +0100 ++++ src/libdar/erreurs.cpp 2007-11-01 12:27:27.000000000 +0100 +@@ -25,6 +25,7 @@ + #include "../my_config.h" + + #include <iostream> ++#include <cstdlib> + #include "erreurs.hpp" + #include "infinint.hpp" + #include "deci.hpp" +--- src/libdar/mask.cpp 2005-11-09 19:31:53.000000000 +0100 ++++ src/libdar/mask.cpp 2007-11-01 12:28:34.000000000 +0100 +@@ -31,6 +31,7 @@ + #endif + } // end extern "C" + ++#include <cstring> + #include "mask.hpp" + #include "tools.hpp" + #include "erreurs.hpp" +--- src/libdar/special_alloc.cpp 2005-06-01 20:54:23.000000000 +0200 ++++ src/libdar/special_alloc.cpp 2007-11-01 12:31:04.000000000 +0100 +@@ -28,6 +28,7 @@ + #include "user_interaction.hpp" + #include "tools.hpp" + ++#include <cstring> + #include <list> + #include <iostream> + #include <errno.h> +--- src/libdar/tools.cpp 2007-06-21 21:40:37.000000000 +0200 ++++ src/libdar/tools.cpp 2007-11-01 12:29:18.000000000 +0100 +@@ -41,6 +41,8 @@ + # endif + #endif + ++#include <cstdlib> ++ + #if HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif + +--- src/libdar/user_group_bases.cpp.orig 2007-11-01 12:55:42.000000000 +0100 ++++ src/libdar/user_group_bases.cpp 2007-11-01 12:55:53.000000000 +0100 +@@ -45,6 +45,7 @@ extern "C" + #endif + } + ++#include <cstring> + #include "erreurs.hpp" + #include "user_group_bases.hpp" + #include "tools.hpp" +--- src/libdar/string_file.cpp.orig 2007-11-01 12:53:00.000000000 +0100 ++++ src/libdar/string_file.cpp 2007-11-01 12:53:11.000000000 +0100 +@@ -26,6 +26,7 @@ + #include "../my_config.h" + + #include "string_file.hpp" ++#include <cstring> + + using namespace std; + +--- src/libdar/header_version.cpp.orig 2007-11-01 12:44:08.000000000 +0100 ++++ src/libdar/header_version.cpp 2007-11-01 12:44:40.000000000 +0100 +@@ -25,6 +25,7 @@ + + #include "../my_config.h" + ++#include <cstring> + #include "header_version.hpp" + #include "integers.hpp" + +--- src/libdar/statistics.cpp.orig 2007-11-01 12:54:02.000000000 +0100 ++++ src/libdar/statistics.cpp 2007-11-01 12:54:18.000000000 +0100 +@@ -33,6 +33,7 @@ extern "C" + } + + #include <string> ++#include <cstring> + + #include "statistics.hpp" + +--- src/libdar/tronconneuse.cpp.orig 2007-11-01 12:47:59.000000000 +0100 ++++ src/libdar/tronconneuse.cpp 2007-11-01 12:48:09.000000000 +0100 +@@ -24,6 +24,7 @@ + + #include "../my_config.h" + ++#include <cstring> + #include "tronconneuse.hpp" + #include "tools.hpp" + +--- src/libdar/storage.hpp.orig 2007-07-22 18:35:00.000000000 +0200 ++++ src/libdar/storage.hpp 2007-11-01 12:42:03.000000000 +0100 +@@ -215,6 +215,7 @@ namespace libdar + { + E_BEGIN; + if(cell != NULL) ++ { + if(offset > 0) + --offset; + else +@@ -225,6 +226,7 @@ namespace libdar + else + offset = OFF_BEGIN; + } ++ } + E_END("storage::iterator::slik_plus_one", ""); + } + +--- src/libdar/thread_cancellation.cpp.orig 2007-11-01 12:49:21.000000000 +0100 ++++ src/libdar/thread_cancellation.cpp 2007-11-01 12:49:31.000000000 +0100 +@@ -23,6 +23,7 @@ + /*********************************************************************/ + + #include "../my_config.h" ++#include <cstring> + + extern "C" + { +--- src/libdar/database_header.cpp.orig 2007-11-01 12:52:24.000000000 +0100 ++++ src/libdar/database_header.cpp 2007-11-01 12:52:40.000000000 +0100 +@@ -47,6 +47,7 @@ extern "C" + #endif + } // end extern "C" + ++#include <cstring> + #include "database_header.hpp" + #include "compressor.hpp" + #include "tools.hpp" +--- src/libdar/mask_list.cpp.orig 2007-11-01 12:51:42.000000000 +0100 ++++ src/libdar/mask_list.cpp 2007-11-01 12:51:53.000000000 +0100 +@@ -23,6 +23,7 @@ + /*********************************************************************/ + + #include "../my_config.h" ++#include <cstring> + + extern "C" + { +--- src/libdar/storage.cpp.orig 2007-11-01 12:45:49.000000000 +0100 ++++ src/libdar/storage.cpp 2007-11-01 12:45:58.000000000 +0100 +@@ -23,6 +23,7 @@ + /*********************************************************************/ + + #include "../my_config.h" ++#include <cstring> + #include "storage.hpp" + #include "infinint.hpp" + #include "generic_file.hpp" +--- src/dar_suite/dar_manager.cpp.orig 2007-11-01 12:58:23.000000000 +0100 ++++ src/dar_suite/dar_manager.cpp 2007-11-01 12:58:35.000000000 +0100 +@@ -29,6 +29,7 @@ extern "C" + #include "getopt_decision.h" + } // end extern "C" + ++#include <cstring> + #include <vector> + #include <string> + #include "dar_suite.hpp" +--- src/dar_suite/dar_cp.cpp.orig 2007-11-01 12:58:49.000000000 +0100 ++++ src/dar_suite/dar_cp.cpp 2007-11-01 12:59:38.000000000 +0100 +@@ -50,6 +50,8 @@ extern "C" + #endif + } + ++#include <cstring> ++#include <cstdlib> + #include <iostream> + + #include "dar_suite.hpp" +--- src/dar_suite/dar_suite.cpp.orig 2007-11-01 12:56:50.000000000 +0100 ++++ src/dar_suite/dar_suite.cpp 2007-11-01 12:57:06.000000000 +0100 +@@ -45,6 +45,7 @@ extern "C" + + } + ++#include <cstring> + #include <iostream> + #include <new> + +--- src/dar_suite/dar_xform.cpp.orig 2007-11-01 12:57:25.000000000 +0100 ++++ src/dar_suite/dar_xform.cpp 2007-11-01 12:57:36.000000000 +0100 +@@ -33,6 +33,7 @@ extern "C" + #include "getopt_decision.h" + } // end extern "C" + ++#include <cstring> + #include <iostream> + #include "sar.hpp" + #include "sar_tools.hpp" +--- src/testing/test_tronc.cpp.orig 2007-11-01 13:01:26.000000000 +0100 ++++ src/testing/test_tronc.cpp 2007-11-01 13:01:45.000000000 +0100 +@@ -44,6 +44,7 @@ extern "C" + } // end extern "C" + + #include <iostream> ++#include <cstring> + + #include "libdar.hpp" + #include "tronc.hpp" +--- src/testing/test_blowfish.cpp.orig 2007-11-01 13:02:40.000000000 +0100 ++++ src/testing/test_blowfish.cpp 2007-11-01 13:02:52.000000000 +0100 +@@ -40,6 +40,7 @@ extern "C" + #endif + } + ++#include <cstring> + #include <iostream> + + #include "libdar.hpp" +--- src/examples/prime.cpp.orig 2007-11-01 13:00:30.000000000 +0100 ++++ src/examples/prime.cpp 2007-11-01 13:00:41.000000000 +0100 +@@ -25,6 +25,7 @@ + + #include "../my_config.h" + #include <iostream> ++#include <cstdlib> + + #include "infinint.hpp" + #include "deci.hpp" +--- src/examples/factoriel.cpp.orig 2007-11-01 12:59:56.000000000 +0100 ++++ src/examples/factoriel.cpp 2007-11-01 13:00:17.000000000 +0100 +@@ -48,6 +48,7 @@ extern "C" + #endif + } // end extern "C" + ++#include <cstring> + #include <string> + #include <iostream> + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 dia
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package dia checked in at Fri Nov 2 01:09:35 CET 2007. -------- --- GNOME/dia/dia.changes 2007-08-17 14:42:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/dia/dia.changes 2007-10-31 23:41:51.051520000 +0100 @@ -1,0 +2,7 @@ +Wed Oct 31 16:30:00 MDT 2007 - btimothy(a)suse.de + +- Force xmldocs.make and doc/Makefile.am to use GNOME + configuration for help files (BNC #157798). +- Fix en language help file XML parsing (BGO #404535). + +------------------------------------------------------------------- New: ---- dia-0.96-pre3-docs.patch dia-help.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dia.spec ++++++ --- /var/tmp/diff_new_pack.IU3815/_old 2007-11-02 01:08:06.000000000 +0100 +++ /var/tmp/diff_new_pack.IU3815/_new 2007-11-02 01:08:06.000000000 +0100 @@ -20,10 +20,10 @@ # Warning: Missing "Requires: glibc-devel" in dependency chain (/usr/lib/dia/libdia.la from dia requires /usr/lib/libm.so). # Warning: Missing "Requires: zlib-devel" in dependency chain (/usr/lib/dia/libdia.la from dia requires /usr/lib/libz.so). # Requires: glibc-devel libpng-devel zlib-devel -Autoreqprov: on +AutoReqProv: on Summary: A Diagram Creation Program Version: 0.96.1 -Release: 1 +Release: 41 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2 Source1: font-test-japanese.dia Source2: font-test-czech.dia @@ -34,7 +34,11 @@ Patch8: dia-group-props-size.patch Patch13: dia-64bit-clean.patch Patch14: dia-python-acinclude.patch -URL: http://live.gnome.org/Dia +# PATCH-FIX-OPENSUSE dia-help.patch bnc157798 +Patch15: dia-help.patch +# PATCH-FIX-UPSTREAM dia-0.96-pre3-docs.patch bgo404535 +Patch16: dia-0.96-pre3-docs.patch +Url: http://live.gnome.org/Dia BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1020 Requires: %{name}-lang = %{version} @@ -69,6 +73,8 @@ %patch8 %patch13 %patch14 +%patch15 -p1 +%patch16 -p1 # Work around gettext bug #186174 LANG=en_US.UTF-8 msgconv po/ko.po -o po/ko.po.new mv po/ko.po.new po/ko.po @@ -82,17 +88,15 @@ --with-python\ --with-cairo\ --with-gnomeprint -make docdir=%{_docdir}/%{name} %{?jobs:-j%jobs} +make %{?jobs:-j%jobs} %install -%makeinstall docdir=%{_docdir}/%{name} +%makeinstall %suse_update_desktop_file -r -N Dia -C "" -G "Diagram Editor" dia Office FlowChart GNOME %find_lang %{name} -cp -a AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/*.dia font-test*dia $RPM_BUILD_ROOT%{_docdir}/%{name}/ # No need for mime-info-to-mime, application/x-dia-diagram is defined in freedesktop.org.xml rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info %if %suse_version > 1020 - %fdupes -s $RPM_BUILD_ROOT %endif @@ -101,17 +105,22 @@ %files %defattr(-,root,root) -%doc %{_docdir}/%{name} %{_bindir}/* %{_libdir}/dia %{_datadir}/applications/*.desktop %{_datadir}/dia %{_datadir}/pixmaps/* %doc %{_mandir}/man1/*.* +%doc AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/*.dia font-test*dia %files lang -f %{name}.lang - +%defattr(-,root,root) +%{_datadir}/gnome/help/dia/* %changelog +* Wed Oct 31 2007 - btimothy(a)suse.de +- Force xmldocs.make and doc/Makefile.am to use GNOME + configuration for help files (BNC #157798). +- Fix en language help file XML parsing (BGO #404535). * Thu Aug 16 2007 - jpr(a)suse.de - Update to 0.96.1 * Empty initial lines in shapes crashes Dia (BGO #421250). ++++++ dia-0.96-pre3-docs.patch ++++++ --- dia-0.96-pre3/doc/en/usage-layers.xml~ 2007-01-21 17:12:45.000000000 +0100 +++ dia-0.96-pre3/doc/en/usage-layers.xml 2007-02-05 10:23:02.000000000 +0100 @@ -26,7 +26,7 @@ </para> </tip> <para> - Each new diagram comes with the default layer labelled �Background�. Of course you can change its name and settings to customize it to your needs as you can do with any other layer. + Each new diagram comes with the default layer labelled “Background”. Of course you can change its name and settings to customize it to your needs as you can do with any other layer. </para> <para> You can use layers to create overlay slide show by drawing each incremental slide in a ++++++ dia-help.patch ++++++ Index: dia-0.96.1/doc/Makefile.am =================================================================== --- dia-0.96.1.orig/doc/Makefile.am +++ dia-0.96.1/doc/Makefile.am @@ -7,11 +7,11 @@ EXTRA_DIST = \ shape.dtd \ sheet.dtd -if HAVE_GNOME +#if HAVE_GNOME helpdir = $(datadir)/gnome/help/dia -else -helpdir = $(pkgdatadir)/help -endif +#else +#helpdir = $(pkgdatadir)/help +#endif # a simple rule to symlink en to C install-data-local: Index: dia-0.96.1/xmldocs.make =================================================================== --- dia-0.96.1.orig/xmldocs.make +++ dia-0.96.1/xmldocs.make @@ -36,11 +36,11 @@ # ********** Begin of section some packagers may need to modify ********** # This variable (docdir) specifies where the documents should be installed. # This default value should work for most packages. -if HAVE_GNOME +#if HAVE_GNOME docdir = $(datadir)/gnome/help/$(docname)/$(lang) -else -docdir = $(datadir)/help/$(docname)/$(lang) -endif +#else +#docdir = $(datadir)/help/$(docname)/$(lang) +#endif # ********** You should not have to edit below this line ********** xml_files = $(entities) $(docname).xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-runlevel
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package yast2-runlevel checked in at Fri Nov 2 01:07:55 CET 2007. -------- --- yast2-runlevel/yast2-runlevel.changes 2007-08-29 15:05:11.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-runlevel/yast2-runlevel.changes 2007-11-01 16:12:38.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Nov 1 16:10:27 CET 2007 - locilka(a)suse.cz + +- Removed dependency on yast2-update +- Client runlevel_finish doesn't rewrite runlevel configuration in + case of update - /etc/inittab is not owned by yast2-runlevel. +- 2.16.0 + +------------------------------------------------------------------- Old: ---- yast2-runlevel-2.15.3.tar.bz2 New: ---- yast2-runlevel-2.16.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-runlevel.spec ++++++ --- /var/tmp/diff_new_pack.P28107/_old 2007-11-02 01:07:50.000000000 +0100 +++ /var/tmp/diff_new_pack.P28107/_new 2007-11-02 01:07:50.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-runlevel (Version 2.15.3) +# spec file for package yast2-runlevel (Version 2.16.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,22 +11,20 @@ # norootforbuild Name: yast2-runlevel -Version: 2.15.3 +Version: 2.16.0 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-runlevel-2.15.3.tar.bz2 -prefix: /usr +Source0: yast2-runlevel-2.16.0.tar.bz2 +Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 -# Required only in Inst-Sys -# Requires: yast2-update Provides: yast2-config-runlevel Obsoletes: yast2-config-runlevel Provides: yast2-trans-runlevel Obsoletes: yast2-trans-runlevel -BuildArchitectures: noarch +BuildArch: noarch Summary: YaST2 - Runlevel Editor %description @@ -43,7 +41,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-runlevel-2.15.3 +%setup -n yast2-runlevel-2.16.0 %build %{prefix}/bin/y2tool y2autoconf @@ -84,8 +82,12 @@ /usr/share/YaST2/modules/RunlevelEd.ybc /usr/share/YaST2/schema/autoyast/rnc/runlevels.rnc %doc %{prefix}/share/doc/packages/yast2-runlevel - %changelog +* Thu Nov 01 2007 - locilka(a)suse.cz +- Removed dependency on yast2-update +- Client runlevel_finish doesn't rewrite runlevel configuration in + case of update - /etc/inittab is not owned by yast2-runlevel. +- 2.16.0 * Wed Aug 29 2007 - locilka(a)suse.cz - Fixed used buttons in runlevel proposal (#305899). - 2.15.3 ++++++ yast2-runlevel-2.15.3.tar.bz2 -> yast2-runlevel-2.16.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.15.3/src/runlevel_finish.ycp new/yast2-runlevel-2.16.0/src/runlevel_finish.ycp --- old/yast2-runlevel-2.15.3/src/runlevel_finish.ycp 2007-05-18 10:43:34.000000000 +0200 +++ new/yast2-runlevel-2.16.0/src/runlevel_finish.ycp 2007-11-01 16:13:31.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: runlevel_finish.ycp 27936 2006-02-13 20:01:14Z olh $ + * $Id: runlevel_finish.ycp 41712 2007-11-01 15:13:30Z locilka $ * */ @@ -19,7 +19,6 @@ import "Mode"; import "RunlevelEd"; import "Directory"; -import "Update"; any ret = nil; string func = ""; @@ -67,10 +66,7 @@ } else { - // Set default runlevel cause inittab will be overwritten by - // installing aaa_base - - set_runlevel (Update::last_runlevel != -1 ? Update::last_runlevel : 3); + y2milestone ("Update mode, no need to set runlevel again..."); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-runlevel-2.15.3/VERSION new/yast2-runlevel-2.16.0/VERSION --- old/yast2-runlevel-2.15.3/VERSION 2007-08-29 15:05:16.000000000 +0200 +++ new/yast2-runlevel-2.16.0/VERSION 2007-11-01 16:12:45.000000000 +0100 @@ -1 +1 @@ -2.15.3 +2.16.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 conglomerate
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package conglomerate checked in at Fri Nov 2 01:07:47 CET 2007. -------- --- GNOME/conglomerate/conglomerate.changes 2007-10-11 16:39:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/conglomerate/conglomerate.changes 2007-11-01 18:51:55.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 1 18:51:51 CET 2007 - sbrabec(a)suse.cz + +- Build with gtksourceview18. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conglomerate.spec ++++++ --- /var/tmp/diff_new_pack.I22570/_old 2007-11-02 01:07:39.000000000 +0100 +++ /var/tmp/diff_new_pack.I22570/_new 2007-11-02 01:07:39.000000000 +0100 @@ -11,10 +11,10 @@ # norootforbuild Name: conglomerate -BuildRequires: enchant-devel fdupes gnutls-devel gtk-doc gtksourceview-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel libxslt-devel perl-XML-Parser scrollkeeper sgml-skel shared-mime-info update-desktop-files +BuildRequires: enchant-devel fdupes gnutls-devel gtk-doc gtksourceview18-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel libxslt-devel perl-XML-Parser scrollkeeper sgml-skel shared-mime-info update-desktop-files Summary: XML Editor for GNOME Version: 0.9.1 -Release: 142 +Release: 157 Requires: %{name}-lang = %{version} Group: Productivity/Publishing/XML License: GPL v2 or later @@ -117,6 +117,8 @@ %defattr(-, root, root) %{_datadir}/gtk-doc/html/conglomerate %changelog +* Thu Nov 01 2007 - sbrabec(a)suse.cz +- Build with gtksourceview18. * Thu Oct 11 2007 - sbrabec(a)suse.cz - Removed bogus dependency on mDNSResponder. * Tue Aug 28 2007 - stbinner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-restore
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package yast2-restore checked in at Fri Nov 2 01:07:43 CET 2007. -------- --- yast2-restore/yast2-restore.changes 2007-08-29 17:32:11.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-restore/yast2-restore.changes 2007-11-01 11:06:35.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Nov 1 11:03:06 CET 2007 - locilka(a)suse.cz + +- All Bootloader function calls were moved to a separate YCP client + restore_bootloader to break the build-dependency on + yast2-bootloader. +- 2.16.0 + +------------------------------------------------------------------- Old: ---- yast2-restore-2.15.4.tar.bz2 New: ---- yast2-restore-2.16.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-restore.spec ++++++ --- /var/tmp/diff_new_pack.w20352/_old 2007-11-02 01:07:33.000000000 +0100 +++ /var/tmp/diff_new_pack.w20352/_new 2007-11-02 01:07:33.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-restore (Version 2.15.4) +# spec file for package yast2-restore (Version 2.16.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,21 +11,21 @@ # norootforbuild Name: yast2-restore -Version: 2.15.4 +Version: 2.16.0 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-restore-2.15.4.tar.bz2 -prefix: /usr -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-testsuite +Source0: yast2-restore-2.16.0.tar.bz2 +Prefix: /usr +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: aaa_base Requires: bzip2 Requires: gzip Requires: tar Requires: yast2 Requires: yast2-bootloader -BuildArchitectures: noarch +BuildArch: noarch Summary: YaST2 - System Restore %description @@ -39,7 +39,7 @@ Ladislav Slezak <lslezak(a)suse.cz> %prep -%setup -n yast2-restore-2.15.4 +%setup -n yast2-restore-2.16.0 %build %{prefix}/bin/y2tool y2autoconf @@ -73,8 +73,12 @@ %{prefix}/share/applications/YaST2/restore.desktop %{prefix}/lib/YaST2/bin/restore_parse_pkginfo.pl %doc %{prefix}/share/doc/packages/yast2-restore - %changelog +* Thu Nov 01 2007 - locilka(a)suse.cz +- All Bootloader function calls were moved to a separate YCP client + restore_bootloader to break the build-dependency on + yast2-bootloader. +- 2.16.0 * Wed Aug 29 2007 - locilka(a)suse.cz - Fixed evaluation of 'nil' value that prevented the restore from displaying the final dialog before restoration started (#301031). ++++++ yast2-restore-2.15.4.tar.bz2 -> yast2-restore-2.16.0.tar.bz2 ++++++ ++++ 3711 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.15.4/configure.in new/yast2-restore-2.16.0/configure.in --- old/yast2-restore-2.15.4/configure.in 2007-08-28 16:20:59.000000000 +0200 +++ new/yast2-restore-2.16.0/configure.in 2007-11-01 15:08:45.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-restore dnl -dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-restore, 2.15.3, http://bugs.opensuse.org/, yast2-restore) +AC_INIT(yast2-restore, 2.16.0, http://bugs.opensuse.org/, yast2-restore) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.3" +VERSION="2.16.0" RPMNAME="yast2-restore" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.15.4/COPYRIGHT.english new/yast2-restore-2.16.0/COPYRIGHT.english --- old/yast2-restore-2.15.4/COPYRIGHT.english 2007-08-29 17:41:05.000000000 +0200 +++ new/yast2-restore-2.16.0/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100 @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.15.4/Makefile.am new/yast2-restore-2.16.0/Makefile.am --- old/yast2-restore-2.15.4/Makefile.am 2007-08-28 16:21:00.000000000 +0200 +++ new/yast2-restore-2.16.0/Makefile.am 2007-11-01 15:08:45.000000000 +0100 @@ -23,14 +23,14 @@ ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) -COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english +COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.15.4/missing new/yast2-restore-2.16.0/missing --- old/yast2-restore-2.15.4/missing 2007-08-28 16:21:07.000000000 +0200 +++ new/yast2-restore-2.16.0/missing 2007-11-01 15:08:49.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.15.4/README new/yast2-restore-2.16.0/README --- old/yast2-restore-2.15.4/README 2007-08-29 17:41:05.000000000 +0200 +++ new/yast2-restore-2.16.0/README 2007-11-01 15:25:27.000000000 +0100 @@ -1,2 +1,2 @@ This program/library is part of YaST2 -See the file COPYRIGHT.english for license terms +See the file COPYING for license terms diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.15.4/src/Makefile.am new/yast2-restore-2.16.0/src/Makefile.am --- old/yast2-restore-2.15.4/src/Makefile.am 2007-05-18 10:43:25.000000000 +0200 +++ new/yast2-restore-2.16.0/src/Makefile.am 2007-11-01 14:59:02.000000000 +0100 @@ -1,14 +1,15 @@ # # Makefile.am for restore/src # -# $Id: Makefile.am 14039 2004-02-10 07:49:24Z lslezak $ +# $Id: Makefile.am 41704 2007-11-01 13:59:02Z locilka $ # yncludedir = @yncludedir@/restore client_DATA = \ restore.ycp \ - restore_auto.ycp + restore_auto.ycp \ + restore_bootloader.ycp ynclude_DATA = \ helps.ycp \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.15.4/src/restore_bootloader.ycp new/yast2-restore-2.16.0/src/restore_bootloader.ycp --- old/yast2-restore-2.15.4/src/restore_bootloader.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-restore-2.16.0/src/restore_bootloader.ycp 2007-11-01 15:09:23.000000000 +0100 @@ -0,0 +1,35 @@ +/** + * File: clients/restore_bootloader.ycp + * Package: Restore module + * Summary: Special client for restoring bootloader settings + * Authors: Ladislav Slezak <lslezak(a)suse.cz> + * Lukas Ocilka <locilka(a)suse.cz> + * + * $Id:$ + * + * All bootloader calls were moved here to break building dependency + * on yast2-bootloader + */ + + +{ + import "Bootloader"; + + boolean ret = nil; + + ret = Bootloader::Read(); + + if (ret == false) { + y2error("Boot loader read failed"); + } else { + // write configuration - force re-installation of boot loader + Bootloader::SetWriteMode( $["save_all" : true] ); + ret = Bootloader::Write(); + + if (ret == false) { + y2error("Boot loader write failed"); + } + } + + return ret; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.15.4/src/Restore.ycp new/yast2-restore-2.16.0/src/Restore.ycp --- old/yast2-restore-2.15.4/src/Restore.ycp 2007-05-18 10:43:25.000000000 +0200 +++ new/yast2-restore-2.16.0/src/Restore.ycp 2007-11-01 14:56:54.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: Restore.ycp 34708 2006-12-04 08:13:08Z locilka $ + * $Id: Restore.ycp 41703 2007-11-01 13:56:53Z locilka $ * Representation of the configuration of restore. * Input and output routines. @@ -26,7 +26,6 @@ import "Report"; import "Mode"; import "Summary"; - import "Bootloader"; import "Service"; import "Package"; import "Label"; @@ -1257,24 +1256,9 @@ { y2milestone("activating boot loader configuration"); - // read actual boot loader configuration - ret = Bootloader::Read(); - - if (ret == false) - { - y2error("Boot loader read failed"); - } - else - { - // write configuration - force re-installation of boot loader - Bootloader::SetWriteMode( $["save_all" : true] ); - ret = Bootloader::Write(); - - if (ret == false) - { - y2error("Boot loader write failed"); - } - } + // Bootloader function calls were moved to a client + // to break the build-dependency on yast2-bootloader + ret = (boolean) WFM::call ("restore_bootloader"); if (ret == false) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-restore-2.15.4/VERSION new/yast2-restore-2.16.0/VERSION --- old/yast2-restore-2.15.4/VERSION 2007-08-29 17:32:16.000000000 +0200 +++ new/yast2-restore-2.16.0/VERSION 2007-11-01 11:04:10.000000000 +0100 @@ -1 +1 @@ -2.15.4 +2.16.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 balsa
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package balsa checked in at Fri Nov 2 01:07:31 CET 2007. -------- --- GNOME/balsa/balsa.changes 2007-09-20 16:10:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/balsa/balsa.changes 2007-11-01 18:44:53.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 1 18:40:45 CET 2007 - sbrabec(a)suse.cz + +- Build feature complete with gtksourceview18. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ balsa.spec ++++++ --- /var/tmp/diff_new_pack.u17840/_old 2007-11-02 01:07:28.000000000 +0100 +++ /var/tmp/diff_new_pack.u17840/_new 2007-11-02 01:07:28.000000000 +0100 @@ -11,12 +11,12 @@ # norootforbuild Name: balsa -BuildRequires: bind bind-devel compface cyrus-sasl-gssapi fdupes gmime-devel gnutls-devel gpgme-devel gtksourceview-devel gtkspell-devel intltool krb5-devel libesmtp-devel libgnomeprintui-devel libgnomeui-devel libgtkhtml-devel libidl libnotify-devel openldap2 openldap2-devel pcre-devel perl-XML-Parser postfix scrollkeeper sqlite-devel update-desktop-files +BuildRequires: bind bind-devel compface cyrus-sasl-gssapi fdupes gmime-devel gnutls-devel gpgme-devel gtksourceview18-devel gtkspell-devel intltool krb5-devel libesmtp-devel libgnomeprintui-devel libgnomeui-devel libgtkhtml-devel libidl libnotify-devel openldap2 openldap2-devel pcre-devel perl-XML-Parser postfix scrollkeeper sqlite-devel update-desktop-files License: GPL v2 or later Group: Productivity/Networking/Email/Clients AutoReqProv: on Version: 2.3.20 -Release: 1 +Release: 20 Requires: %{name}-lang = %{version} Summary: The GNOME Mail Program Url: http://balsa.gnome.org/ @@ -85,7 +85,6 @@ # FIXME: Build as root modifies system! # balsa-2.3.17: --disable-scrollkeeper does not work properly. # NOTE: Use --enable-touch-ui for Touchscreen UI mode -# FIXME: Once balsa has been updated to use gtksourceview 2, re-add --with-gtksourceview %configure\ --disable-scrollkeeper\ --enable-more-warnings\ @@ -93,6 +92,7 @@ --with-ldap\ --with-gpgme\ --with-gtkspell\ + --with-gtksourceview\ --with-sqlite\ --with-ssl\ --with-gss\ @@ -126,6 +126,8 @@ %files lang -f balsa.lang %changelog +* Thu Nov 01 2007 - sbrabec(a)suse.cz +- Build feature complete with gtksourceview18. * Thu Sep 20 2007 - sbrabec(a)suse.cz - Updated to version 2.3.20: * fix buffer overflow (#474366) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-product-creator
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package yast2-product-creator checked in at Fri Nov 2 01:07:26 CET 2007. -------- --- yast2-product-creator/yast2-product-creator.changes 2007-10-29 11:25:33.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-product-creator/yast2-product-creator.changes 2007-11-01 16:22:49.339882000 +0100 @@ -1,0 +2,10 @@ +Thu Nov 1 11:01:12 CET 2007 - jsuchome(a)suse.cz + +- fixed checking if repository has 'plaindir' format (#338115) +- show which repositories YaST failed to add (#337618) +- added support for "format" and "locale" tags in config.xml +- added support for OEM image type +- call kiwi with --nocolor to shorten the output +- 2.16.4 + +------------------------------------------------------------------- Old: ---- yast2-product-creator-2.16.3.tar.bz2 New: ---- yast2-product-creator-2.16.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.G12842/_old 2007-11-02 01:07:15.000000000 +0100 +++ /var/tmp/diff_new_pack.G12842/_new 2007-11-02 01:07:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-product-creator (Version 2.16.3) +# spec file for package yast2-product-creator (Version 2.16.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-product-creator -Version: 2.16.3 +Version: 2.16.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-product-creator-2.16.3.tar.bz2 +Source0: yast2-product-creator-2.16.4.tar.bz2 Prefix: /usr BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-security yast2-testsuite PreReq: %fillup_prereq @@ -36,7 +36,7 @@ %prep -%setup -n yast2-product-creator-2.16.3 +%setup -n yast2-product-creator-2.16.4 %build %{prefix}/bin/y2tool y2autoconf @@ -83,6 +83,13 @@ /usr/lib/YaST2/servers_non_y2/ag_* /var/adm/fillup-templates/sysconfig.product-creator %changelog +* Thu Nov 01 2007 - jsuchome(a)suse.cz +- fixed checking if repository has 'plaindir' format (#338115) +- show which repositories YaST failed to add (#337618) +- added support for "format" and "locale" tags in config.xml +- added support for OEM image type +- call kiwi with --nocolor to shorten the output +- 2.16.4 * Mon Oct 29 2007 - jsuchome(a)suse.cz - package kernel-bigsmp has been renamed to kernel-pae - make a conflict with old yast2-storage ++++++ yast2-product-creator-2.16.3.tar.bz2 -> yast2-product-creator-2.16.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.3/agent-kiwi/ag_kiwi new/yast2-product-creator-2.16.4/agent-kiwi/ag_kiwi --- old/yast2-product-creator-2.16.3/agent-kiwi/ag_kiwi 2007-10-04 09:44:31.000000000 +0200 +++ new/yast2-product-creator-2.16.4/agent-kiwi/ag_kiwi 2007-10-31 10:32:04.000000000 +0100 @@ -70,12 +70,9 @@ # <type boot="vmxboot/suse-10.3" filesystem="ext3">vmx</type> my @ntag = $prefs -> getElementsByTagName ("type") -> get_nodelist(); foreach my $element (@ntag) { - my $primary = $element -> getAttribute ("primary"); - my $boot = $element -> getAttribute ("boot"); - my $flags = $element -> getAttribute ("flags"); my $type = $element -> textContent (); my %typemap = (); - foreach my $attr ("primary", "boot", "flags", "filesystem") { + foreach my $attr ("primary", "boot", "flags", "filesystem", "format") { my $val = $element -> getAttribute ($attr); $typemap{$attr} = $val if defined $val; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.3/src/complex.ycp new/yast2-product-creator-2.16.4/src/complex.ycp --- old/yast2-product-creator-2.16.3/src/complex.ycp 2007-10-26 10:07:00.000000000 +0200 +++ new/yast2-product-creator-2.16.4/src/complex.ycp 2007-11-01 16:15:14.000000000 +0100 @@ -595,8 +595,8 @@ `VWeight (1, `RichText (`id (`descr), "")), `HBox ( `PushButton (`id (`add), `opt (`key_F3), Label::AddButton ()), - `PushButton (`id (`delete), `opt (`key_F5), Label::DeleteButton ()), `PushButton (`id (`edit), `opt (`key_F4), Label::EditButton ()), + `PushButton (`id (`delete), `opt (`key_F5), Label::DeleteButton ()), `HStretch () ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.3/src/kiwi_dialogs.ycp new/yast2-product-creator-2.16.4/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.16.3/src/kiwi_dialogs.ycp 2007-10-26 10:38:57.000000000 +0200 +++ new/yast2-product-creator-2.16.4/src/kiwi_dialogs.ycp 2007-11-01 12:11:29.000000000 +0100 @@ -1506,7 +1506,9 @@ // combo box item "usb" : _("USB Stick Image"), // combo box item - "vmx" : _("Virtual Disk Image") + "vmx" : _("Virtual Disk Image"), + // combo box item + "oem" : _("OEM Image") ]; list type_items = basic_type_items; @@ -1521,7 +1523,7 @@ if (haskey (task2label, type)) { type_items = add (type_items, - `item (`id (type), task2label[type]:type)); + `item (`id (type),task2label[type]:type,type == kiwi_task)); } }); default_type_items = type_items; @@ -1532,7 +1534,7 @@ //solve `back here (=no import) foreach (string type, map data, Config["type"]:$[], { type_its = add (type_its, - `item (`id (type), task2label[type]:type)); + `item (`id (type), task2label[type]:type, type == kiwi_task)); }); if (type_its != []) type_items = type_its; @@ -1799,14 +1801,16 @@ continue; map parsed = URL::Parse(url); + boolean plaindir = false; if (parsed["scheme"]:"" == "pkg") { - parsed["scheme"] = "dir"; + parsed["scheme"] = "dir"; + plaindir = true; url = URL::Build (parsed); } repositories[url] = $[ "url" : url, - "plaindir" : parsed["scheme"]:"" == "dir" + "plaindir" : plaindir, ]; update_repo_table (); } @@ -1831,14 +1835,16 @@ // remove current url + add new one repositories = remove (repositories, selected_url); map parsed = URL::Parse(url); + plaindir = false; if (parsed["scheme"]:"" == "pkg") { parsed["scheme"] = "dir"; + plaindir = true; url = URL::Build (parsed); } repositories[url] = $[ "url" : url, - "plaindir" : parsed["scheme"]:"" == "dir" + "plaindir" : plaindir ]; update_repo_table (); } @@ -1897,6 +1903,56 @@ } kiwi_task = (string) UI::QueryWidget (`id (`type), `Value); + + list<string> failed_repositories = []; + if (size (repositories) > 0) + { + map<string,integer> current_sources = $[]; + // delete current repos, that won't be used in config + foreach (map source, Pkg::SourceEditGet (), { + integer srcid = source["SrcId"]:-1; + map data = Pkg::SourceGeneralData (srcid); + string url = data["url"]:""; + current_sources[url] = srcid; + }); + // initialize new repos now + repositories = filter (string url, map repo, repositories, { + if (substring (url, 0, 1) == "/") + url = "dir://" + url; + if (haskey (current_sources, url)) + { + current_sources = remove (current_sources, url); + return true; + } + integer source_ret = -1; + if (repo["plaindir"]:false) + source_ret = Pkg::SourceCreateType (url, "", "Plaindir"); + else + source_ret = Pkg::SourceCreate (url, ""); + if (source_ret == -1) + { + failed_repositories = add (failed_repositories, url); + return false; + } + else return true; + }); + foreach (string url, integer srcid, current_sources, { + Pkg::SourceDelete (srcid); + }); + } + if (failed_repositories != []) + { + // continue/cancel popup %1 is a \n separated list + if (!Popup::ContinueCancel (sformat (_("Failed to add these repositories: + +%1. + +Continue anyway?"), mergestring (failed_repositories, "\n")))) + { + update_repo_table (); + continue; + } + } break; } } @@ -1908,44 +1964,19 @@ } if (ret == `next) { + if (size (repositories) > 0) + { + ProductCreator::enable_sources = false; + Pkg::SourceLoad(); + } Config["kiwi_configuration_" + kiwi_task] = kiwi_configuration; Config["_imported"] = true; Config["iso-directory"] = out_dir + (new_configuration ? "/" + name : ""); Config["name"] = name; + Config["new_configuration"] = new_configuration; Config["sources"] = maplist ( string url, map repo, repositories, ``(url)); - Config["new_configuration"] = new_configuration; - if (Config["sources"]:[] != []) - { - ProductCreator::enable_sources = false; - map<string,integer> current_sources = $[]; - // delete current repos, that won't be used in config - foreach (map source, Pkg::SourceEditGet (), { - integer srcid = source["SrcId"]:-1; - map data = Pkg::SourceGeneralData (srcid); - string url = data["url"]:""; - current_sources[url] = srcid; - }); - // initialize new repos now - foreach (string url, map repo, repositories, { - if (substring (url, 0, 1) == "/") - url = "dir://" + url; - if (haskey (current_sources, url)) - { - current_sources = remove (current_sources, url); - return; - } - if (repo["plaindir"]:false) - Pkg::SourceCreateType (url, "", "Plaindir"); - else - Pkg::SourceCreate (url, ""); - }); - foreach (string url, integer srcid, current_sources, { - Pkg::SourceDelete (srcid); - }); - Pkg::SourceLoad(); - } ProductCreator::Config = Config; Kiwi::current_repositories = repositories; Kiwi::kiwi_task = kiwi_task; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.3/src/Kiwi.ycp new/yast2-product-creator-2.16.4/src/Kiwi.ycp --- old/yast2-product-creator-2.16.3/src/Kiwi.ycp 2007-10-29 08:53:50.000000000 +0100 +++ new/yast2-product-creator-2.16.4/src/Kiwi.ycp 2007-11-01 16:17:32.000000000 +0100 @@ -154,25 +154,47 @@ return deletechars (name, " \t"); } + /** - * generate the value for image type + * generate the values for image type */ - map get_type_value (map config, string task) { + list<map> get_type_values (map config, string task) { string boot_image = sformat ("%1boot/%2", task, config[task + "boot"]:"suse-10.2"); - if (config["type",task,"boot"]:"" != "") - boot_image = config["type",task,"boot"]:""; - map ret = $[ - "__key" : "type", - "__value" : task, - "primary" : "true", - "boot" : boot_image, - ]; - if (task != "iso") - ret["filesystem"] = config["type",task,"filesystem"]:"ext3"; - if (config["type",task,"flags"]:"" != "") - ret["flags"] = config["type",task,"flags"]:""; - return ret; + list<map> retlist = maplist ( + string type, map typemap, (map<string,map>)config["type"]:$[], { + + if (typemap["boot"]:"" != "") + boot_image = typemap["boot"]:""; + + map ret = $[ + "__key" : "type", + "__value" : type, + "boot" : boot_image, + ]; + if (type != "iso") + ret["filesystem"] = typemap["filesystem"]:"ext3"; + if (typemap["flags"]:"" != "") + ret["flags"] = typemap["flags"]:""; + if (typemap["format"]:"" != "") + ret["format"] = typemap["format"]:""; + if (type == task) + ret["primary"] = "true"; + return ret; + }); + if (retlist == []) + { + map ret = $[ + "__key" : "type", + "__value" : task, + "boot" : boot_image, + "primary" : "true" + ]; + if (task != "iso") + ret["filesystem"] = "ext3"; + retlist = [ ret ]; + } + return retlist; } /** @@ -287,7 +309,7 @@ foreach (string key, [ "author", "contact", "specification", "packagemanager", "version", "rpm-check-signatures", "rpm-force", "sizeunit", "type", "name", "repository", "defaultdestination", - "schemeversion", "defaultroot", "inherit"], + "schemeversion", "defaultroot", "inherit", "locale"], { if (config[key]:nil != nil) ret[key] = config[key]:nil; @@ -400,7 +422,6 @@ map preferences = $[ "__key" : "preferences", "__children" : [ - get_type_value (KiwiConfig, task), $[ "__key" : "version", "__value" : KiwiConfig["version"]:"1", @@ -428,6 +449,10 @@ ], ], ]; + foreach (map typemap, get_type_values (KiwiConfig, task), { + preferences["__children"] = prepend (preferences["__children"]:[], + typemap); + }); if (KiwiConfig["defaultroot"]:"" != "") { preferences["__children"] = add (preferences["__children"]:[], $[ @@ -435,6 +460,14 @@ "__value" : KiwiConfig["defaultroot"]:"", ]); } + if (KiwiConfig["locale"]:"" != "") + { + preferences["__children"] = add (preferences["__children"]:[], $[ + "__key" : "locale", + "__value" : KiwiConfig["locale"]:"", + ]); + } + list write_list = [ $[ @@ -602,7 +635,7 @@ }); } - string cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir); + string cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --nocolor --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir); y2milestone ("calling '%1'", cmd); @@ -640,7 +673,7 @@ // now continue with creating UI::ChangeWidget (`id(`log), `LastLine, "\n"); - cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --create %1 -d %2 --logfile terminal", chroot_dir, out_dir); + cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --nocolor --create %1 -d %2 --logfile terminal", chroot_dir, out_dir); y2milestone ("calling '%1'", cmd); // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image")))); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.3/VERSION new/yast2-product-creator-2.16.4/VERSION --- old/yast2-product-creator-2.16.3/VERSION 2007-10-29 11:13:50.000000000 +0100 +++ new/yast2-product-creator-2.16.4/VERSION 2007-11-01 16:17:07.000000000 +0100 @@ -1 +1 @@ -2.16.3 +2.16.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 anjuta
by root＠Hilbert.suse.de 02 Nov '07

02 Nov '07

Hello community, here is the log from the commit of package anjuta checked in at Fri Nov 2 01:07:19 CET 2007. -------- --- GNOME/anjuta/anjuta.changes 2007-10-26 12:50:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/anjuta/anjuta.changes 2007-11-01 18:23:00.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 1 18:22:49 CET 2007 - sbrabec(a)suse.cz + +- Build with gtksourceview18. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ anjuta.spec ++++++ --- /var/tmp/diff_new_pack.zi8343/_old 2007-11-02 01:07:05.000000000 +0100 +++ /var/tmp/diff_new_pack.zi8343/_new 2007-11-02 01:07:05.000000000 +0100 @@ -11,8 +11,7 @@ # norootforbuild Name: anjuta -BuildRequires: autogen binutils-devel devhelp-devel fdupes gcc-c++ gdl-devel gnome-build-devel gnome-common gnome-doc-utils-devel gnome-icon-theme gnutls-devel graphviz-devel gtk-doc intltool libapr-util1-devel libapr1-devel libglade2-devel libgladeui-1_0-devel libgnomeprintui-devel libgnomeui-devel libneon-devel libwnck-devel libxslt-devel pcre-devel perl-XML-Parser scrollkeeper shared-mime-info subversion-devel update-desktop-files valgrind-devel vte-devel -# FIXME: gtksourceview-devel is too new for anjuta +BuildRequires: autogen binutils-devel devhelp-devel fdupes gcc-c++ gdl-devel gnome-build-devel gnome-common gnome-doc-utils-devel gnome-icon-theme gnutls-devel graphviz-devel gtk-doc gtksourceview18-devel intltool libapr-util1-devel libapr1-devel libglade2-devel libgladeui-1_0-devel libgnomeprintui-devel libgnomeui-devel libneon-devel libwnck-devel libxslt-devel pcre-devel perl-XML-Parser scrollkeeper shared-mime-info subversion-devel update-desktop-files valgrind-devel vte-devel # FIXME: Introduced by other packages: BuildRequires: sqlite-devel License: GPL v2 or later @@ -21,7 +20,7 @@ Requires: autogen Requires: automake autoconf libtool gettext alsa alsa-devel audiofile devhelp esound esound-devel gconf2 gconf2-devel gconf2-doc gnome-terminal gnome-vfs2 gnome-vfs2-devel gnome-vfs2-doc libart_lgpl libart_lgpl-devel libbonobo libbonobo-devel libbonobo-doc libbonoboui libbonoboui-devel libbonoboui-doc libglade2 libglade2-devel libglade2-doc libgnome libgnome-devel libgnome-doc libgnomecanvas libgnomecanvas-devel libgnomecanvas-doc libgnomeui libgnomeui-devel libgnomeui-doc libwnck libwnck-devel libxml2 libxml2-devel openssl openssl-devel orbit2 orbit2-devel popt popt-devel libgnomeprint libgnomeprint-devel libgnomeprint-doc libgnomeprintui libgnomeprintui-devel libgnomeprintui-doc yelp gnome-doc-utils Version: 2.2.2 -Release: 9 +Release: 18 Requires: %{name}-lang = %{version} Summary: GNOME IDE for C and C++ Source: anjuta-%{version}.tar.bz2 @@ -191,6 +190,8 @@ %files lang -f %name.lang %changelog +* Thu Nov 01 2007 - sbrabec(a)suse.cz +- Build with gtksourceview18. * Fri Oct 26 2007 - sbrabec(a)suse.cz - Require autogen (#336176). - Fixed shared libbfd detection. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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