September 2008 - openSUSE Commits - openSUSE Mailing Lists

commit gnome-main-menu
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package gnome-main-menu checked in at Mon Sep 29 19:34:59 CEST 2008. -------- --- GNOME/gnome-main-menu/gnome-main-menu.changes 2008-09-13 07:02:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-main-menu/gnome-main-menu.changes 2008-09-28 03:14:18.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 27 06:52:02 CEST 2008 - sreeves(a)suse.de + +- Fix missing icon and tooltip from FATE#303677 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-main-menu.spec ++++++ --- /var/tmp/diff_new_pack.qE1137/_old 2008-09-29 19:31:29.000000000 +0200 +++ /var/tmp/diff_new_pack.qE1137/_new 2008-09-29 19:31:29.000000000 +0200 @@ -27,7 +27,7 @@ Group: System/GUI/GNOME AutoReqProv: on Version: 0.9.11 -Release: 14 +Release: 17 Summary: The GNOME Desktop Menu Source: %{name}-%{version}.tar.bz2 Source1: system-items-opensuse.xbel @@ -171,6 +171,8 @@ %{_prefix}/%{_lib}/nautilus/extensions-1.0/*.la %changelog +* Sat Sep 27 2008 sreeves(a)suse.de +- Fix missing icon and tooltip from FATE#303677 * Sat Sep 13 2008 sreeves(a)suse.de - Show network documents in recent section - FATE#303677 - Move to 0.9.11 ++++++ FATE_303677.patch ++++++ --- /var/tmp/diff_new_pack.qE1137/_old 2008-09-29 19:31:29.000000000 +0200 +++ /var/tmp/diff_new_pack.qE1137/_new 2008-09-29 19:31:29.000000000 +0200 @@ -30,7 +30,45 @@ =================================================================== --- libslab/document-tile.c (revision 501) +++ libslab/document-tile.c (working copy) -@@ -881,30 +881,29 @@ +@@ -139,8 +139,8 @@ + gchar *markup; + + AtkObject *accessible; +- +- gchar *filename; ++ ++ GFile * file; + gchar *tooltip_text; + + libslab_checkpoint ("document_tile_new(): start"); +@@ -158,14 +158,9 @@ + time_str = create_subheader_string (modified); + subheader = create_subheader (time_str); + +- filename = g_filename_from_uri (uri, NULL, NULL); +- +- if (filename) +- tooltip_text = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL); +- else +- tooltip_text = NULL; +- +- g_free (filename); ++ file = g_file_new_for_uri (uri); ++ tooltip_text = g_file_get_parse_name (file); ++ g_object_unref (file); + + context_menu = GTK_MENU (gtk_menu_new ()); + +@@ -417,7 +412,7 @@ + + libslab_checkpoint ("document-tile.c: load_image(): start for %s", TILE (tile)->uri); + +- if (priv->force_icon_name || ! priv->mime_type || ! strstr (TILE (tile)->uri, "file://")) { ++ if (priv->force_icon_name || ! priv->mime_type) { + if (priv->force_icon_name) + icon_id = priv->force_icon_name; + else +@@ -881,30 +876,29 @@ static void open_in_file_manager_trigger (Tile *tile, TileEvent *event, TileAction *action) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gnome-blog
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package gnome-blog checked in at Mon Sep 29 19:31:20 CEST 2008. -------- --- GNOME/gnome-blog/gnome-blog.changes 2007-09-07 00:42:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-blog/gnome-blog.changes 2008-09-28 21:05:38.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Sep 28 21:05:30 CEST 2008 - aj(a)suse.de + +- Cleanup buildrequires. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-blog.spec ++++++ --- /var/tmp/diff_new_pack.Bnx327/_old 2008-09-29 19:30:50.000000000 +0200 +++ /var/tmp/diff_new_pack.Bnx327/_new 2008-09-29 19:30:50.000000000 +0200 @@ -1,31 +1,37 @@ # # spec file for package gnome-blog (Version 0.9.1) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2008 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/ # # norootforbuild + Name: gnome-blog -BuildRequires: fdupes gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel python-devel python-gnome-devel python-gobject2-devel update-desktop-files +BuildRequires: fdupes intltool python-devel python-gnome-devel python-gobject2-devel update-desktop-files Version: 0.9.1 -Release: 119 +Release: 271 License: GPL v2 or later Group: Productivity/Networking/Web/Utilities Requires: python-gnome python-gnome-extras gnome-python-desktop Summary: A GNOME Panel Applet for Posting to bloggerAPI-Compatible Blogs -URL: http://www.gnome.org/~seth/gnome-blog/ +Url: http://www.gnome.org/~seth/gnome-blog/ Source: %{name}-%{version}.tar.bz2 Patch: gnome-blog-deprecation-warning.patch Requires: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build - %py_requires - %gconf_schemas_prereq %description @@ -59,18 +65,14 @@ cat %{name}.schemas_list >%{name}.lst # Some sites use different partitions for /usr/(lib|lib64) and /usr/share. Since you # can't create hardlinks across partitions, we'll do this more than once. - %fdupes $RPM_BUILD_ROOT/%{_libdir} - %fdupes $RPM_BUILD_ROOT/%{_datadir} - %fdupes $RPM_BUILD_ROOT/%{_bindir} %clean rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre - %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun @@ -89,33 +91,35 @@ %files lang -f %{name}.lang %changelog -* Fri Sep 07 2007 - maw(a)suse.de +* Sun Sep 28 2008 aj(a)suse.de +- Cleanup buildrequires. +* Fri Sep 07 2007 maw(a)suse.de - Fix last change. Duh. -* Thu Sep 06 2007 - maw(a)suse.de +* Thu Sep 06 2007 maw(a)suse.de - Don't run %%fdupes on directories where multiple partitions are liable to be mounted. -* Wed Aug 08 2007 - maw(a)suse.de +* Wed Aug 08 2007 maw(a)suse.de - Use %%fdupes - Split off a -lang subpackage. -* Thu Jun 07 2007 - sbrabec(a)suse.cz +* Thu Jun 07 2007 sbrabec(a)suse.cz - Removed invalid desktop Category "Application" (#254654). -* Thu Mar 22 2007 - sbrabec(a)suse.cz +* Thu Mar 22 2007 sbrabec(a)suse.cz - Fixed gconf scriptlets. -* Thu Jan 25 2007 - ro(a)suse.de +* Thu Jan 25 2007 ro(a)suse.de - GNOME moved to /usr -* Fri Nov 17 2006 - jhargadon(a)suse.de +* Fri Nov 17 2006 jhargadon(a)suse.de - applied a patch from upstream cvs that corrects some deprecation errors. Now the About... menu item works as intended. -* Tue Nov 14 2006 - jhargadon(a)suse.de +* Tue Nov 14 2006 jhargadon(a)suse.de - corrected the desktop category from Applet to TextEditor to resolve bug #219794 -* Mon Oct 30 2006 - jhargadon(a)suse.de +* Tue Oct 31 2006 jhargadon(a)suse.de - added gnome-python-desktop to Requires -* Wed Aug 16 2006 - cthiel(a)suse.de +* Wed Aug 16 2006 cthiel(a)suse.de - buildrequire python-gnome-devel instead of python-gnome -* Wed Aug 16 2006 - ro(a)suse.de +* Wed Aug 16 2006 ro(a)suse.de - added python-gobject2-devel to BuildRequires -* Thu Jun 22 2006 - jpr(a)suse.de +* Thu Jun 22 2006 jpr(a)suse.de - Update to 0.9.1 * Make add link dialog stay near and above the blog window (Tommi Komulainen) @@ -131,23 +135,23 @@ (Olav Vitters) * Fix blogs.gnome.org XML-RPC URL (Olav Vitters) * Translation updates -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Mon Sep 12 2005 - jpr(a)suse.de +* Mon Sep 12 2005 jpr(a)suse.de - Remove nautilus requires, looks like leftover cruft - Specify the libexecdir to use something relevant to gnome-blog - Remove GNOME_BlogApplet.server.in so that the correct directory propogates through to the .server file (114325) -* Mon Jun 13 2005 - gekker(a)suse.de +* Tue Jun 14 2005 gekker(a)suse.de - Update to version 0.9 - Add Requires python-gnome-extras -* Thu Feb 17 2005 - gekker(a)suse.de +* Thu Feb 17 2005 gekker(a)suse.de - Add gnome-blog-poster.patch to fix gconf problems - Add _makefile patch - Fix to install in correct directories -* Tue Feb 15 2005 - ro(a)suse.de +* Tue Feb 15 2005 ro(a)suse.de - ok, currently nautilus uses libdir ... -* Tue Feb 15 2005 - ro(a)suse.de +* Tue Feb 15 2005 ro(a)suse.de - fix build on lib64 -* Sat Feb 12 2005 - gekker(a)suse.de +* Sat Feb 12 2005 gekker(a)suse.de - Initial import of package, version 0.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 e2fsprogs
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package e2fsprogs checked in at Mon Sep 29 19:30:41 CEST 2008. -------- --- e2fsprogs/e2fsprogs.changes 2008-09-15 15:33:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/e2fsprogs/e2fsprogs.changes 2008-09-29 18:40:32.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 29 18:28:40 CEST 2008 - mkoenig(a)suse.de + +- e2fsck: shut off splash screen when check is needed [bnc#237283] + +------------------------------------------------------------------- New: ---- e2fsprogs-1.41.1-splash_support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ e2fsprogs.spec ++++++ --- /var/tmp/diff_new_pack.S28873/_old 2008-09-29 19:29:10.000000000 +0200 +++ /var/tmp/diff_new_pack.S28873/_new 2008-09-29 19:29:10.000000000 +0200 @@ -27,7 +27,7 @@ PreReq: %install_info_prereq AutoReqProv: on Version: 1.41.1 -Release: 8 +Release: 9 Summary: Utilities for the Second Extended File System Url: http://e2fsprogs.sourceforge.net Source: %{name}-%{version}.tar.bz2 @@ -43,6 +43,7 @@ Patch3: e2fsprogs-libvolume_id-support.patch Patch5: e2fsprogs-1.40.4-uuidd_pid_path.patch Patch6: e2fsprogs-1.41.1-link_fix.patch +Patch7: e2fsprogs-1.41.1-splash_support.patch # libcom_err patches # 66534 - [SL 10.0] et_list handling of krb5 and libcom_err.so.2 conflict Patch31: libcom_err-no-init_error_table.patch @@ -245,6 +246,7 @@ %patch3 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # libcom_err patches %patch31 -p1 %patch32 -p1 @@ -466,6 +468,8 @@ %{_mandir}/man3/com_err.3.gz %changelog +* Mon Sep 29 2008 mkoenig(a)suse.de +- e2fsck: shut off splash screen when check is needed [bnc#237283] * Mon Sep 15 2008 mkoenig(a)suse.de - remove recommends of uuid-runtime from libuuid [bnc#426278] - move uuid hints README.SUSE.uuidd to uuid-runtime package ++++++ e2fsprogs-1.41.1-splash_support.patch ++++++ Index: e2fsprogs-1.41.1/e2fsck/splash.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ e2fsprogs-1.41.1/e2fsck/splash.c 2008-09-29 16:42:50.000000000 +0200 @@ -0,0 +1,101 @@ +/* + * add support for switching the splash screen on boot + */ +#include <stdio.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> +#include <errno.h> +#include "splash.h" + +static int verbose = 0; + +/* nop implementation + */ +static void nop(void) +{ +} + +static struct splash_ops nop_ops = { + .splash_on = nop, + .splash_off = nop +}; + +/* + * bootsplash implementation + */ +#define BOOTSPLASH_CTL "/proc/splash" + +static int bootsplash_exists(void) +{ + struct stat sb; + + if (stat(BOOTSPLASH_CTL, &sb) == -1) + return 0; + + if (S_ISREG(sb.st_mode)) + return 1; + + return 0; +} + +/* write msg to splash control, must be \0 terminated */ +static void bootsplash_msg(const char *msg, size_t size) +{ + int fd; + size_t written; + + fd = open(BOOTSPLASH_CTL, O_WRONLY); + if (fd == -1) { + if (verbose) + printf("cannot open %s\n", BOOTSPLASH_CTL); + return; + } + + written = write(fd, msg, size); + if (written != size) { + if (verbose) + printf("size = %i, written = %i\n", size, written); + } + (void)write(fd, "\n", 1); + + close(fd); +} + +static void bootsplash_on(void) +{ + if (verbose) + printf("setting bootsplash silent\n"); + bootsplash_msg("silent", 6); +} + +static void bootsplash_off(void) +{ + if (verbose) + printf("setting bootsplash verbose\n"); + bootsplash_msg("verbose", 7); +} + +static struct splash_ops bootsplash_ops = { + .splash_on = bootsplash_on, + .splash_off = bootsplash_off +}; + +/* + * Initialisation + */ +void splash_init(struct splash_ops **ops) +{ + if (bootsplash_exists()) + *ops = &bootsplash_ops; + else + *ops = &nop_ops; +} + +void splash_set_verbose(void) +{ + verbose = 1; +} + Index: e2fsprogs-1.41.1/e2fsck/splash.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ e2fsprogs-1.41.1/e2fsck/splash.h 2008-09-29 16:42:23.000000000 +0200 @@ -0,0 +1,13 @@ +#ifndef _SPLASH_H +#define _SPLASH_H + +struct splash_ops { + void (*splash_on)(void); + void (*splash_off)(void); +}; + +void splash_init(struct splash_ops **ops); +void splash_set_verbose(void); + +#endif /* _SPLASH_H */ + Index: e2fsprogs-1.41.1/e2fsck/Makefile.in =================================================================== --- e2fsprogs-1.41.1.orig/e2fsck/Makefile.in 2008-09-29 16:28:15.000000000 +0200 +++ e2fsprogs-1.41.1/e2fsck/Makefile.in 2008-09-29 16:37:41.000000000 +0200 @@ -63,7 +63,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compil OBJS= crc32.o dict.o unix.o e2fsck.o super.o pass1.o pass1b.o pass2.o \ pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \ dx_dirinfo.o ehandler.o problem.o message.o recovery.o region.o \ - revoke.o ea_refcount.o rehash.o profile.o prof_err.o $(MTRACE_OBJ) + revoke.o ea_refcount.o rehash.o profile.o prof_err.o splash.o $(MTRACE_OBJ) PROFILED_OBJS= profiled/dict.o profiled/unix.o profiled/e2fsck.o \ profiled/super.o profiled/pass1.o profiled/pass1b.o \ @@ -101,6 +101,7 @@ SRCS= $(srcdir)/e2fsck.c \ $(srcdir)/rehash.c \ $(srcdir)/region.c \ $(srcdir)/profile.c \ + $(srcdir)/splash.c \ prof_err.c \ $(MTRACE_SRC) @@ -470,3 +471,5 @@ region.o: $(srcdir)/region.c $(srcdir)/e profile.o: $(srcdir)/profile.c $(top_srcdir)/lib/et/com_err.h \ $(srcdir)/profile.h prof_err.h prof_err.o: prof_err.c +splash.o: splash.c splash.h + Index: e2fsprogs-1.41.1/e2fsck/unix.c =================================================================== --- e2fsprogs-1.41.1.orig/e2fsck/unix.c 2008-09-01 17:34:28.000000000 +0200 +++ e2fsprogs-1.41.1/e2fsck/unix.c 2008-09-29 16:28:15.000000000 +0200 @@ -53,6 +53,7 @@ extern int optind; #include "e2p/e2p.h" #include "e2fsck.h" #include "problem.h" +#include "splash.h" #include "../version.h" /* Command line options */ @@ -895,6 +896,7 @@ int main (int argc, char *argv[]) int sysval, sys_page_size = 4096; __u32 features[3]; char *cp; + struct splash_ops *sops; clear_problem_context(&pctx); #ifdef MTRACE @@ -924,6 +926,7 @@ int main (int argc, char *argv[]) exit(FSCK_ERROR); } reserve_stdio_fds(); + splash_init(&sops); #ifdef RESOURCE_TRACK init_resource_track(&ctx->global_rtrack, NULL); @@ -1242,6 +1245,7 @@ print_unsupp_features: if (ctx->flags & E2F_FLAG_SIGNAL_MASK) fatal_error(ctx, 0); check_if_skip(ctx); + sops->splash_off(); if (bad_blocks_file) read_bad_blocks_file(ctx, bad_blocks_file, replace_bad_blocks); else if (cflag) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org-hyphen
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package OpenOffice_org-hyphen checked in at Mon Sep 29 18:42:16 CEST 2008. -------- --- OpenOffice_org-hyphen/OpenOffice_org-hyphen.changes 2008-04-14 14:33:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-hyphen/OpenOffice_org-hyphen.changes 2008-09-29 18:31:05.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 29 18:29:53 CEST 2008 - pmladek(a)suse.cz + +- updated: French, Norwegian Bokmaal, Norwegian Nynorsk + +------------------------------------------------------------------- Old: ---- hyph_fr_FR.tar.bz2 New: ---- hyph_fr_FR_2-0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-hyphen.spec ++++++ --- /var/tmp/diff_new_pack.c28752/_old 2008-09-29 18:42:04.000000000 +0200 +++ /var/tmp/diff_new_pack.c28752/_new 2008-09-29 18:42:04.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package OpenOffice_org-hyphen (Version 20080414) +# spec file for package OpenOffice_org-hyphen (Version 20080929) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -15,7 +22,7 @@ BuildRequires: recode License: GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; Public Domain, Freeware Group: Productivity/Office/Dictionary -Version: 20080414 +Version: 20080929 Release: 1 AutoReqProv: on Summary: Hyphen Dictionaries for OpenOffice.org @@ -70,7 +77,7 @@ Source10: hyph_et_EE.tar.bz2 Source11: hyph_fi_FI.tar.bz2 Source12: hyph_fr_BE.tar.bz2 -Source13: hyph_fr_FR.tar.bz2 +Source13: hyph_fr_FR_2-0.tar.bz2 Source14: hyph_ga_IE.tar.bz2 Source15: hyph_hr_HR.tar.bz2 Source16: hyph_hu_HU.tar.bz2 @@ -116,6 +123,9 @@ tar -xjf "$archive" -C "$name" done # +# French +mv hyph_fr_FR_2-0 hyph_fr_FR +# # fix permissions find . -type f -exec chmod 644 {} \; @@ -157,6 +167,8 @@ %{_datadir}/ooo/hyphen/* %changelog +* Mon Sep 29 2008 pmladek(a)suse.cz +- updated: French, Norwegian Bokmaal, Norwegian Nynorsk * Mon Apr 14 2008 lmichnovic(a)suse.cz - updated bg_BG, hu_HU, it_IT * Thu Jul 19 2007 pmladek(a)suse.cz ++++++ hyph_nb_NO.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/README_hyph_nb_NO.txt new/README_hyph_nb_NO.txt --- old/README_hyph_nb_NO.txt 2006-04-28 14:24:50.000000000 +0200 +++ new/README_hyph_nb_NO.txt 2008-03-10 11:48:12.000000000 +0100 @@ -1,8 +1,8 @@ Myspell hyphenation ------------------- -Language: Norwegian Bokmal (nb NO) -Origin: Generated from the spell-norwegian source v2.0.7 +Language: Norwegian Bokm�l (nb NO) +Origin: Generated from the spell-norwegian source v2.0.10 License: GNU General Public license Author: The spell-norwegian project, <URL:https://alioth.debian.org/projects/spell-norwegian/> ++++++ hyph_nn_NO.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/README_hyph_nn_NO.txt new/README_hyph_nn_NO.txt --- old/README_hyph_nn_NO.txt 2006-04-28 14:24:50.000000000 +0200 +++ new/README_hyph_nn_NO.txt 2008-03-10 11:48:12.000000000 +0100 @@ -2,7 +2,7 @@ ------------------- Language: Norwegian Nynorsk (nn NO) -Origin: Generated from the spell-norwegian source v2.0.7 +Origin: Generated from the spell-norwegian source v2.0.10 License: GNU General Public license Author: The spell-norwegian project, <URL:https://alioth.debian.org/projects/spell-norwegian/> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gegl
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package gegl checked in at Mon Sep 29 18:35:13 CEST 2008. -------- --- GNOME/gegl/gegl.changes 2008-08-14 10:22:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/gegl/gegl.changes 2008-09-29 18:06:09.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 29 17:49:46 CEST 2008 - sbrabec(a)suse.cz + +- Fixed dependencies. +- Fixed permissions of documentation. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gegl.spec ++++++ --- /var/tmp/diff_new_pack.X31200/_old 2008-09-29 18:34:34.000000000 +0200 +++ /var/tmp/diff_new_pack.X31200/_new 2008-09-29 18:34:34.000000000 +0200 @@ -23,6 +23,8 @@ # Use rpmbuild -D 'BUILD_ORIG 1' to build original code. # Use rpmbuild -D 'BUILD_ORIG 1' -D 'BUILD_ORIG_ADDON 1' to build patched build plus original as addon. BuildRequires: ImageMagick OpenEXR-devel SDL-devel asciidoc babl-devel enscript gcc-c++ glib2-devel graphviz gtk2-devel libjpeg-devel libpng-devel librsvg-devel libstdc++-devel lua-devel ruby +# To build documentation, babl-0_0 is a must, "Recommends" is not enough: +BuildRequires: babl-0_0 # Only for directory ownership: BuildRequires: gtk-doc %if 0%{?BUILD_ORIG} @@ -39,12 +41,13 @@ Requires: glib2 >= 2.14.0 Url: http://gegl.org/ Version: 0.0.18 -Release: 2 +Release: 3 License: GPL v3 or later; LGPL v3 or later Group: System/Libraries Summary: Generic Graphics Library Source: ftp://ftp.gimp.org/pub/gegl/v0.0/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +%define debug_package_requires libgegl-0_0-0 = %{version}-%{release} %description GEGL provides infratructure to do demand based cached non destructive @@ -94,6 +97,7 @@ License: GPL v3 or later; LGPL v3 or later Summary: Generic Graphics Library Group: System/Libraries +Requires: libbabl-0_0-0 >= %{version} %description 0_0 GEGL provides infratructure to do demand based cached non destructive @@ -199,7 +203,7 @@ License: GPL v3 or later; LGPL v3 or later Summary: Generic Graphics Library Group: System/Libraries -Recommends: %{name}-0_0 = %{version} +Recommends: %{name}-0_0 >= %{version} %description -n libgegl-0_0-0 GEGL provides infratructure to do demand based cached non destructive @@ -365,6 +369,7 @@ %endif rm $RPM_BUILD_ROOT%{_libdir}/gegl-0.0/*.la rm $RPM_BUILD_ROOT%{_libdir}/*.la +chmod -x $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/gegl/*.* %post -n libgegl-0_0-0 -p /sbin/ldconfig @@ -399,7 +404,6 @@ %files devel %defattr(-,root,root) %{_includedir}/* -#%{_libdir}/*.*a %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc @@ -408,5 +412,8 @@ %{_datadir}/gtk-doc/html/gegl %changelog +* Mon Sep 29 2008 sbrabec(a)suse.cz +- Fixed dependencies. +- Fixed permissions of documentation. * Mon Jul 21 2008 sbrabec(a)suse.cz - New SuSE package. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 tog-pegasus
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package tog-pegasus checked in at Mon Sep 29 18:35:12 CEST 2008. -------- --- tog-pegasus/tog-pegasus.changes 2008-08-18 15:50:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/tog-pegasus/tog-pegasus.changes 2008-09-22 16:54:29.000000000 +0200 @@ -1,0 +2,27 @@ +Fri Sep 19 11:15:38 MDT 2008 - bwhiteley(a)suse.de + +- Put %_libdir/*.so files back in the main package, as many of + them need to be there. +- Removed Python provider manager from this package. It is in a + separate package now due to pluggable provider manager support + in Pegasus 2.8. Also, CMPI-based Python providers are now + preferred (cmpi-bindings project within http://omc-project.org/) +- Disable building of most test code. +- Remove test-internal subpackage. + +------------------------------------------------------------------- +Fri Sep 19 15:36:19 CEST 2008 - mmarek(a)suse.cz + +- updated to 2.8.0 + new features in this version: + * Memory Resident Repository (PEP 307) + * WS-Management Support in CIM Server (PEP 311) + * Pluggable Provider Managers - Enhancement (PEP 313) + * Tracing in OpenPegasus - Enhancement (PEP 315) + * Profile Registration Profile Support (PEP 319) + * Track Generated Indications Data (PEP 322) + * DMTf Indication Profile Implementation, Stage 1 (DMTF DSP 1054) + (PEP 323) + * Track Generated Indications Data (PEP 322) + +------------------------------------------------------------------- Old: ---- pegasus-2.7.0.tar.bz2 pegasus-2.7.0-warnings.patch pegasus-enable-root-login.patch pegasus-http401-content-length.patch pegasus-local_connect_with_creds.patch pegasus-no-rpath.patch pegasus-pluggable-provider-managers.patch pegasus-python-provifc-manager.patch pegasus-sigchld.patch PGpython_provifc.patch PGpython_provifc.tar.bz2 New: ---- Makefile.pkg-config pegasus-2.8.0-notests.patch pegasus-2.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tog-pegasus.spec ++++++ --- /var/tmp/diff_new_pack.T30390/_old 2008-09-29 18:34:17.000000000 +0200 +++ /var/tmp/diff_new_pack.T30390/_new 2008-09-29 18:34:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package tog-pegasus (Version 2.7.0) +# spec file for package tog-pegasus (Version 2.8.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: tog-pegasus -BuildRequires: e2fsprogs-devel gcc-c++ libicu-devel net-snmp-devel openslp-devel openssl-devel pam-devel pwdutils python-devel -Version: 2.7.0 -Release: 87 +BuildRequires: cim-schema e2fsprogs-devel gcc-c++ libicu-devel net-snmp-devel openslp-devel openssl-devel pam-devel pwdutils +Version: 2.8.0 +Release: 1 # Summary: OpenPegasus WBEM Services for Linux Group: System/Management @@ -40,35 +40,27 @@ Source6: loadmof.sh Source7: rmmof.sh Source8: pegasus.init -Source9: PGpython_provifc.tar.bz2 Source10: pegutil.sh Source11: pegasus_build_env_vars.sh Source12: cimserver_planned.conf Source13: README.SUSE +Source14: Makefile.pkg-config # Patch1: pegasus-pam-wbem.patch Patch2: pegasus-config.patch Patch3: pegasus-no-strip.patch -Patch4: pegasus-no-rpath.patch Patch5: pegasus-local-or-remote-auth.patch -Patch6: pegasus-python-provifc-manager.patch -Patch7: PGpython_provifc.patch -Patch8: pegasus-sigchld.patch -Patch9: pegasus-enable-root-login.patch -Patch13: pegasus-pluggable-provider-managers.patch -# temporary patches -Patch10: pegasus-2.7.0-warnings.patch Patch11: pegasus-2.7.0-strncat.patch -Patch12: pegasus-http401-content-length.patch -Patch14: pegasus-local_connect_with_creds.patch +Patch12: pegasus-2.8.0-notests.patch # Provides: tog-pegasus-cimserver Provides: cim-server -Provides: pyprovifc = 1.0.0 # PreReq: pwdutils %insserv_prereq %fillup_prereq PreReq: python-pywbem >= 0.6.20080201.1 PreReq: cim-schema >= 2.17 +# due to bug in python package (bnc#427987) +PreReq: python-devel Requires: bash, sed, grep, coreutils, procps, openssl >= 0.9.6, pam Requires: bind-utils, net-tools Obsoletes: pegasus-wbem @@ -94,6 +86,7 @@ Obsoletes: tog-pegasus-sdk Requires: tog-pegasus >= %{version} Requires: gcc-c++ +Requires: pkg-config Requires(preun): make %description devel @@ -115,6 +108,7 @@ Group: System/Management Requires: tog-pegasus >= %{version} Requires: gcc-c++ +Requires: pkg-config Requires(preun): make %description devel-internal @@ -129,47 +123,20 @@ -------- The Open Group -%package test-internal -License: X11/MIT -Summary: OpenPegasus WBEM Services for Linux -Group: System/Management -Requires: tog-pegasus >= %{version}, make - -%description test-internal -OpenPegasus WBEM Services for Linux enables management solutions that -deliver increased control of enterprise resources. WBEM is a platform -and resource independent DMTF standard that defines a common -information model and communication protocol for monitoring and -controlling resources from diverse sources. - - - -Authors: --------- - The Open Group - %prep %setup -q -n pegasus -%setup -D -T -a 9 -n pegasus %patch1 %patch2 -b .pegasus-config.patch %patch3 -%patch4 %patch5 -%patch6 -b .pegasus-python-provifc-manager.patch -%patch7 -b .PGpython_provifc.patch -%patch8 -b .pegasus-sigchld.patch -%patch9 -b .pegasus-enable-root-login.patch -%patch13 -b .pegasus-pluggable-provider-managers.patch -%patch14 -b .pegasus-local_connect_with_creds.patch -%patch10 %patch11 -%patch12 -b .pegasus-http401-content-length.patch +%patch12 -b .pegasus-2.8.0-notests.patch %build cp -fp %_sourcedir/README.SUSE.Security doc cp -fp %_sourcedir/README.SUSE doc cp -fp %_sourcedir/genOpenPegasusSSLCerts rpm +cp -fp %_sourcedir/Makefile.pkg-config . case %_arch in i?86) PEGASUS_PLATFORM=LINUX_IX86_GNU;; @@ -201,6 +168,8 @@ export PATH="$PATH:\$PEGASUS_HOME/bin" export LD_LIBRARY_PATH=\$PEGASUS_HOME/lib export PEGASUS_BUILD_TEST_RPM=1 +export PEGASUS_ENABLE_MAKE_INSTALL=yes +export PEGASUS_SKIP_MOST_TEST_DIRS=true EOF . rpm-env # vvv remove this when #337901 / gcc.gnu.org/PR31081 gets fixed @@ -216,7 +185,6 @@ %install . rpm-env -export PEGASUS_ENABLE_MAKE_INSTALL=yes make -f Makefile.Release stage rm -r %buildroot/usr/share/doc/tog-pegasus-* # ghost configs @@ -234,7 +202,6 @@ install %{S:12} %{buildroot}/etc/Pegasus/cimserver_planned.conf # fix permissions chmod -v 0755 %{buildroot}/usr/share/Pegasus/scripts/* -chmod 755 %{buildroot}/var/lib/Pegasus/testrepository find %{buildroot}/usr/include/Pegasus -type f -print0 | xargs -r0 chmod -v a-x # add missing .so symlinks pushd %buildroot%_libdir @@ -245,6 +212,10 @@ fi done popd +rm %{buildroot}/var/lib/Pegasus/cimserver_planned.conf +# XXX: do we still need this? The upstream RPMS don't package all of CMPI/*.h +# either +#%{__install} -m 0644 src/Pegasus/Provider/CMPI/*.h %{buildroot}%{_includedir}/Pegasus/Provider/CMPI/ # install some extra MOF files that we'll need in %post rm -r %{buildroot}/var/lib/Pegasus/repository/root#cimv2 rm %{buildroot}/var/lib/Pegasus/repository/root#PG_InterOp/instances/* @@ -258,6 +229,20 @@ install -m644 $h %{buildroot}/usr/include/Pegasus-internal/$h done popd +# Create pkg-config file +install -d %{buildroot}/usr/%_lib/pkgconfig +cat > %{buildroot}/usr/%_lib/pkgconfig/%{name}.pc << EOS +prefix=/usr +exec_prefix=\${prefix} +libdir=\${exec_prefix}/lib +includedir=\${prefix}/include +Name: OpenPegasus +Description: OpenPegasus WBEM Services for Linux +Version: %{version} +URL: http://openpegasus.org/ +Libs: $(make -f Makefile.pkg-config pkg-config-libs) +Cflags: $(make -f Makefile.pkg-config pkg-config-cflags) +EOS ### end of %install %clean @@ -348,22 +333,9 @@ %files %defattr(-,root,root) -%_libdir/Pegasus/ -%_libdir/*.so.* -# dirty hack to find out which Pegasus libraries have extern "C" symbols -# (and can therefore be dlopened): -# $ cd $RPM_BUILD_ROOT/%_libdir -# $ find -name '*.so' | while read f; do t=`nm "$f" | grep 'T [^_]'`; if test $? = 0; then echo "$f"; echo "$t"; fi; done -# outputs something like -# ./Pegasus/providers/libComputerSystemProvider.so -# 00000000000049d0 T PegasusCreateProvider -# ... -# ./libCIMxmlIndicationHandler.so -# 00000000000035c0 T PegasusCreateHandler -# ./libsnmpIndicationHandler.so -# 0000000000004c80 T PegasusCreateHandler -# remaining .so symlinks can go to the -devel subpackage -%_libdir/lib*Handler.so +/usr/%{_lib}/Pegasus/ +/usr/%{_lib}/*.so.* +/usr/%{_lib}/*.so /usr/sbin/* /usr/bin/* /usr/share/Pegasus/scripts @@ -391,29 +363,43 @@ /usr/share/Pegasus/mof %doc /usr/share/man/man[18]/* %doc doc/license.txt doc/Admin_Guide_Release.pdf doc/PegasusSSLGuidelines.htm doc/SecurityGuidelinesForDevelopers.html doc/README.SUSE.Security doc/README.SUSE src/Clients/repupgrade/doc/repupgrade.html -# packaged in -test-internal -%exclude /var/lib/Pegasus/testrepository %files devel %defattr(-,root,root) -%_libdir/*.so -%exclude %_libdir/lib*Handler.so /usr/include/Pegasus /usr/share/Pegasus/samples /usr/share/Pegasus/html +/usr/%_lib/pkgconfig/* %files devel-internal %defattr(-,root,root) /usr/include/Pegasus-internal - -%files test-internal -%defattr(-,root,pegasus,-) -/usr/share/Pegasus/test -/var/lib/Pegasus/testrepository +/usr/%_lib/pkgconfig/* # NOTE: please use the tog-pegasus.changes file, this changelog will be # automatically updated from it in the binary RPMS %changelog +* Fri Sep 19 2008 bwhiteley(a)suse.de +- Put %%_libdir/*.so files back in the main package, as many of + them need to be there. +- Removed Python provider manager from this package. It is in a + separate package now due to pluggable provider manager support + in Pegasus 2.8. Also, CMPI-based Python providers are now + preferred (cmpi-bindings project within http://omc-project.org/) +- Disable building of most test code. +- Remove test-internal subpackage. +* Fri Sep 19 2008 mmarek(a)suse.cz +- updated to 2.8.0 + new features in this version: + * Memory Resident Repository (PEP 307) + * WS-Management Support in CIM Server (PEP 311) + * Pluggable Provider Managers - Enhancement (PEP 313) + * Tracing in OpenPegasus - Enhancement (PEP 315) + * Profile Registration Profile Support (PEP 319) + * Track Generated Indications Data (PEP 322) + * DMTf Indication Profile Implementation, Stage 1 (DMTF DSP 1054) + (PEP 323) + * Track Generated Indications Data (PEP 322) * Mon Aug 18 2008 mmarek(a)suse.de - use LSB keywords instead of X-UnitedLinux-* in the init script * Tue Jul 15 2008 mmarek(a)suse.cz @@ -431,10 +417,10 @@ - don't install internal headers executable * Thu Apr 17 2008 npaxton(a)novell.com - install non-frozen headers to /usr/include/Pegasus-internal -* Thu Apr 03 2008 bwhiteley(a)suse.de +* Wed Apr 02 2008 bwhiteley(a)suse.de - Renamed README.SuSE.Security to README.SUSE.Security. - Patch to allow connection to UDS with credentials (pegasus_bug:7563). -* Tue Mar 25 2008 npaxton(a)novell.com +* Mon Mar 24 2008 npaxton(a)novell.com - Add pluggable provider manager patch * Thu Mar 20 2008 mmarek(a)suse.cz - cim-schema is also used in %%post @@ -442,24 +428,24 @@ - Changed the python-pywbem dependency to PreReq, as it is used in %%post. - Synced *.changes and %%changelog in the specfile -* Thu Feb 28 2008 jcarey(a)novell.com +* Wed Feb 27 2008 jcarey(a)novell.com - Changed to use copy of given OperationContext when making up calls to the CIMOM. Fixes problem where the requesting user name was not being used when making these calls. The user identity was not available to providers. -* Sat Feb 23 2008 bwhiteley(a)suse.de +* Fri Feb 22 2008 bwhiteley(a)suse.de - Don't build root/cimv2 namespace during build. Create it during install instead with new python MOF compiler. Don't register any PG providers by default. -* Thu Feb 21 2008 jcarey(a)novell.com +* Wed Feb 20 2008 jcarey(a)novell.com - Changed to not allow exception to be thrown from the processMessage method of the provider manager. -* Sat Feb 16 2008 bwhiteley(a)suse.de +* Fri Feb 15 2008 bwhiteley(a)suse.de - Make cimsrvr user a member of the pegasus group. Otherwise, in-process providers do not work. -* Sat Feb 09 2008 bwhiteley(a)suse.de +* Fri Feb 08 2008 bwhiteley(a)suse.de - Allow root user to log in from remote (bnc#344466) -* Wed Feb 06 2008 jcarey(a)novell.com +* Tue Feb 05 2008 jcarey(a)novell.com - Changed so the default action is performed when a SIGCHLD signal is received (pegasus-sigchld.patch). * Fri Feb 01 2008 bwhiteley(a)suse.de @@ -495,7 +481,7 @@ [#341368] * Mon Dec 03 2007 mmarek(a)suse.cz - fixed incorrect strncat() call in OperatingSystem_Linux.cpp -* Wed Nov 28 2007 bwhiteley(a)suse.de +* Tue Nov 27 2007 bwhiteley(a)suse.de - Added python provider interface. * Thu Nov 15 2007 mmarek(a)suse.cz - add .so symlinks for all installed libraries [#341368] and move @@ -546,7 +532,7 @@ * Thu Jan 18 2007 mrueckert(a)suse.de - add symlink for libcmpiCppImpl.so.1 to libcmpiCppImpl.so and install the CMPI headers (#233452) -* Fri Nov 17 2006 mrueckert(a)suse.de +* Thu Nov 16 2006 mrueckert(a)suse.de - make sure all manpages are world readable (#209441) * Tue Jul 11 2006 mrueckert(a)suse.de - build tests rpm @@ -562,5 +548,5 @@ - comment out the Requires(post|pre|postun) for now * Fri Jul 07 2006 mrueckert(a)suse.de - dont package the debug files in the base package -* Fri Jul 07 2006 mrueckert(a)suse.de +* Thu Jul 06 2006 mrueckert(a)suse.de - Initial package based on the fedora core 6 package ++++++ cimserver_planned.conf ++++++ --- tog-pegasus/cimserver_planned.conf 2008-03-20 11:40:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/tog-pegasus/cimserver_planned.conf 2008-09-22 16:55:28.000000000 +0200 @@ -199,6 +199,53 @@ enableBinaryRepository=false ############################################################################## +# enableNormalization +# Description: If true, objects returned from instance +# providers are validated and normalized. +# Default Value: false +# Dynamic: No +############################################################################## +# TODO: see other related TODO +# enableNormalization=false + +############################################################################## +# enableSSLExportClientVerification +# Description: If true, the CIM Server allows HTTPS connection +# for CIMExport requests on the port specified by the service +# name "wbem-exp-https". +# Default Value: false +# Dynamic: No +############################################################################## +# TODO: figure out why this is unknown. +#enableSSLExportClientVerification=false + +############################################################################## +# excludeModulesFromNormalization +# Description: If the excludeModulesfromNormalization property +# is set, the value is interpreted as a list of comma-separated +# Provider Module names (as specified in PG_ProviderModule.Name) +# to exclude from validation and normalization. +# Default Value: "" +# Dynamic: No +############################################################################## +# TODO, enable PEGASUS_ENABLE_OBJECT_NORMALIZATION at build-time, or +# (recommended), remove from this file. +#excludeModulesFromNormalization="" + +############################################################################## +# exportSSLTrustStore +# Description: Specifies the location of the OpenSSL truststore +# for Indications. Consistent with the OpenSSL implementation, +# a truststore can be either a file or directory. If the +# truststore is a directory, all the certificates within the +# directory are considered trusted. +# Default Value: /etc/Pegasus/indication_trust.pem +# Dynamic: No +############################################################################## +# TODO: figure out why this option is unknown +#exportSSLTrustStore=/etc/Pegasus/indication_trust.pem + +############################################################################## # logLevel # Description: Defines the desired level of logging. Valid # values include: TRACE, INFORMATION, WARNING, SEVERE, FATAL. @@ -292,7 +339,8 @@ # Default Value: None # Dynamic: No ############################################################################## -# sslTrustStoreUserName= +# TODO, figure out why this option is unknown +#sslTrustStoreUserName= ############################################################################## # traceComponents ++++++ loadmof.sh ++++++ --- tog-pegasus/loadmof.sh 2008-05-12 15:32:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/tog-pegasus/loadmof.sh 2008-09-22 16:57:03.000000000 +0200 @@ -88,17 +88,35 @@ if [ -f $LOGFILE ]; then mv $LOGFILE $LOGFILE.0 fi - if [ "x$REMOVE" = "x1" ]; then - OPTS="-r" - else - OPTS="-s /usr/share/mof/cim-current" - fi - if [ "x$VERBOSE" = "x1" ]; then -# $CIMMOF -uc -aEV -n $NS $@ - $CIMMOF -v -n $NS $OPTS -u /var/run/tog-pegasus/cimxml.socket $@ + REG="" + case "$1" in + "/usr/share/sblim-cmpi-base/Linux_Base.mof") + REG="/usr/share/sblim-cmpi-base/Linux_BaseIndication.registration" + ;; + *) + REG="${1%%.mof}.registration" + ;; + esac + + if [ -f "$REG" ]; then + if [ "x$VERBOSE" = "x1" ]; then + $PROVIDER_REGISTER -t pegasus -r "$REG" -m "$1" -v + else + $PROVIDER_REGISTER -t pegasus -r "$REG" -m "$1" &> $LOGFILE + fi else -# $CIMMOF -uc -aEV -n $NS $@ &> $LOGFILE - $CIMMOF -n $NS $OPTS -u /var/run/tog-pegasus/cimxml.socket $@ &> $LOGFILE + if [ "x$REMOVE" = "x1" ]; then + OPTS="-r" + else + OPTS="-s /usr/share/mof/cim-current" + fi + if [ "x$VERBOSE" = "x1" ]; then +# $CIMMOF -uc -aEV -n $NS $@ + $CIMMOF -v -n $NS $OPTS -u /var/run/tog-pegasus/cimxml.socket $@ + else +# $CIMMOF -uc -aEV -n $NS $@ &> $LOGFILE + $CIMMOF -n $NS $OPTS -u /var/run/tog-pegasus/cimxml.socket $@ &> $LOGFILE + fi fi RVAL=$? if [ "x$RVAL" != "x0" -a "x$VERBOSE" != "x1" ]; then ++++++ pegasus-2.8.0-notests.patch ++++++ --- ./Makefile.Release.origjbw 2008-09-18 14:23:49.000000000 -0600 +++ ./Makefile.Release 2008-09-18 14:25:12.000000000 -0600 @@ -70,7 +70,7 @@ $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusEmptyFiles $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_genOpenPegasusSSLCertsFile $(MAKE) --directory=$(ROOT) -f mak/SDKMakefile stageSDK -ifdef PEGASUS_BUILD_TEST_RPM +ifdef DONTBUILDTHISSTUFF $(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest stageTEST endif @@ -716,17 +716,21 @@ @$(MAKE) --directory=$(ROOT) -f mak/SDKMakefile \ PEGASUS_RPM_SPEC_FILE_PATH=$(PEGASUS_RPM_SPEC_FILE_PATH) \ _append_preunSectionToSpecFile +ifdef DONTBUILDTHISSTUFF @$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest \ PEGASUS_RPM_SPEC_FILE_PATH=$(PEGASUS_RPM_SPEC_FILE_PATH) \ _append_preunSectionToSpecFile +endif @$(MAKE) --directory=$(ROOT) -f Makefile.Release _append_postunSectionToSpecFile @$(MAKE) --directory=$(ROOT) -f Makefile.Release _append_filesSectionToSpecFile @$(MAKE) --directory=$(ROOT) -f mak/SDKMakefile \ PEGASUS_RPM_SPEC_FILE_PATH=$(PEGASUS_RPM_SPEC_FILE_PATH) \ _append_filesSectionToSpecFile +ifdef DONTBUILDTHISSTUFF @$(MAKE) --directory=$(ROOT) -f Makefile.ReleaseTest \ PEGASUS_RPM_SPEC_FILE_PATH=$(PEGASUS_RPM_SPEC_FILE_PATH) \ _append_filesSectionToSpecFile +endif _append_OpenPegasusLicenseToSpecFile: FORCE @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-header.spec >> $(PEGASUS_RPM_SPEC_FILE_PATH) ++++++ pegasus-2.7.0.tar.bz2 -> pegasus-2.8.0.tar.bz2 ++++++ ++++ 302185 lines of diff (skipped) ++++++ pegasus_build_env_vars.sh ++++++ --- tog-pegasus/pegasus_build_env_vars.sh 2008-03-26 13:52:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/tog-pegasus/pegasus_build_env_vars.sh 2008-09-22 17:00:01.000000000 +0200 @@ -25,6 +25,7 @@ PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir endif +PEGASUS_SKIP_MOST_TEST_DIRS=true # PEGASUS_ENABLE_INTEROP_PROVIDER=true PEGASUS_ENABLE_EXECQUERY=true # PEGASUS_DISABLE_CQL=false ++++++ pegasus-config.patch ++++++ --- /var/tmp/diff_new_pack.T30390/_old 2008-09-29 18:34:34.000000000 +0200 +++ /var/tmp/diff_new_pack.T30390/_new 2008-09-29 18:34:34.000000000 +0200 @@ -14,27 +14,3 @@ # else # undef REPUPGRADE_USE_RELEASE_DIRS const String RepositoryUpgrade::_LOG_PATH = "./"; ---- ./Makefile.Release.pegasus-config.patch 2007-10-01 14:15:23.000000000 -0600 -+++ ./Makefile.Release 2007-12-14 22:01:56.000000000 -0700 -@@ -366,10 +366,10 @@ - $(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);) - - stage_PegasusVarDataDirectoryFiles: FORCE -- $(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE) -+ $(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_PLANNED_CONFIG_FILE_PATH) - - setpermissions_PegasusVarDataDirectoryFiles: FORCE -- $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE) -+ $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PLANNED_CONFIG_FILE_PATH) - - stage_genOpenPegasusSSLCertsFile: FORCE - @$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts -@@ -1037,7 +1037,7 @@ - "/etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH) - @$(ECHO-E) "%config(noreplace) %attr($(Prw_r__r__), " \ - "$(CIMSERVER_USR), $(CIMSERVER_GRP))" \ -- "$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \ -+ "$(PEGASUS_PLANNED_CONFIG_FILE_PATH)" \ - >> $(PEGASUS_RPM_SPEC_FILE_PATH) - @$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \ - >> $(PEGASUS_RPM_SPEC_FILE_PATH) ++++++ pegasus-local-or-remote-auth.patch ++++++ --- /var/tmp/diff_new_pack.T30390/_old 2008-09-29 18:34:34.000000000 +0200 +++ /var/tmp/diff_new_pack.T30390/_new 2008-09-29 18:34:34.000000000 +0200 @@ -34,7 +34,7 @@ + */ + Boolean isRemoteUser() const + { -+ _checkRep(); ++ CheckRep(_rep); + return _rep->isRemoteUser(); + } + @@ -42,7 +42,7 @@ + */ + void setRemoteUser(Boolean remoteUser) + { -+ _checkRep(); ++ CheckRep(_rep); + _rep->setRemoteUser(remoteUser); + } + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-bootloader
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package yast2-bootloader checked in at Mon Sep 29 18:34:07 CEST 2008. -------- --- yast2-bootloader/yast2-bootloader.changes 2008-09-25 18:50:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-09-29 17:29:54.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Sep 29 17:10:36 CEST 2008 - juhliarik(a)suse.cz + +- added new dialog for updating from lilo to grub (bnc #430579) +- 2.17.23 + +------------------------------------------------------------------- +Mon Sep 29 15:45:41 CEST 2008 - jsrain(a)suse.cz + +- fixed no scrren contents after changing loader type (bnc #427622) +- avoid mixing options of different bootloader after loaded type + change + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.17.22.tar.bz2 New: ---- yast2-bootloader-2.17.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.a28613/_old 2008-09-29 18:33:44.000000000 +0200 +++ /var/tmp/diff_new_pack.a28613/_new 2008-09-29 18:33:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.17.22) +# spec file for package yast2-bootloader (Version 2.17.23) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-bootloader -Version: 2.17.22 +Version: 2.17.23 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.17.22.tar.bz2 +Source0: yast2-bootloader-2.17.23.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite # to eliminate a cyclic dependency in autobuild: @@ -61,7 +61,7 @@ Daniel Fiser %prep -%setup -n yast2-bootloader-2.17.22 +%setup -n yast2-bootloader-2.17.23 %build %{prefix}/bin/y2tool y2autoconf @@ -100,13 +100,20 @@ /usr/share/YaST2/clients/bootloader*.ycp /usr/share/YaST2/clients/print-product.ycp /usr/share/YaST2/clients/inst_bootl*.ycp +/usr/share/YaST2/clients/inst_lilo_convert.ycp %{prefix}/lib/YaST2/bin/* /usr/lib/YaST2/servers_non_y2/ag_* /usr/share/YaST2/scrconf/*.scr /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc - %changelog +* Mon Sep 29 2008 juhliarik(a)suse.cz +- added new dialog for updating from lilo to grub (bnc #430579) +- 2.17.23 +* Mon Sep 29 2008 jsrain(a)suse.cz +- fixed no scrren contents after changing loader type (bnc #427622) +- avoid mixing options of different bootloader after loaded type + change * Thu Sep 25 2008 juhliarik(a)suse.cz - added fix for problem with changed default name (bnc #169062) - added fix for problem with editing custom boot (bnc #395009) ++++++ yast2-bootloader-2.17.22.tar.bz2 -> yast2-bootloader-2.17.23.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.22/src/clients/inst_lilo_convert.ycp new/yast2-bootloader-2.17.23/src/clients/inst_lilo_convert.ycp --- old/yast2-bootloader-2.17.22/src/clients/inst_lilo_convert.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.17.23/src/clients/inst_lilo_convert.ycp 2008-09-29 17:07:57.000000000 +0200 @@ -0,0 +1,151 @@ +/** + * File: + * bootloader/routines/inst_bootloader.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Functions to write "dummy" config files for kernel + * + * Authors: + * Jozef Uhliarik <juhliarik(a)suse.cz> + * + * + */ + +{ + +textdomain "bootloader"; + +import "Bootloader"; +import "BootCommon"; +import "Installation"; +import "GetInstArgs"; +import "Mode"; +import "Label"; +import "Wizard"; +import "Popup"; +import "Pkg"; + +y2milestone ("starting inst_lilo_convert"); + + + + + +void selectPackage() +{ + if (! Pkg::IsSelected("grub")) + { + Pkg::PkgInstall ("grub"); + Pkg::PkgSolve (false); + } +} + +void convertSettings() +{ + + string lilo_conf = (string) WFM::Read(.local.string, Installation::destdir + "/etc/lilo.conf"); + BootCommon::setLoaderType("lilo"); + map<string,string> new_files = $[]; + new_files["/etc/lilo.conf"] = lilo_conf; + y2milestone("/etc/lilo.conf : %1", new_files); + BootCommon::ProposeDeviceMap (); + BootCommon::SetDeviceMap(BootCommon::device_mapping); + map<string,string> old_files = BootCommon::GetFilesContents (); + new_files["/boot/grub/device.map"] = old_files["/boot/grub/device.map"]:""; + y2milestone("added device.map : %1", new_files); + BootCommon::SetFilesContents (new_files); + BootCommon::setLoaderType("grub"); + + map<string,string> tmp_files = BootCommon::GetFilesContents (); + + foreach (string file, string content, tmp_files, + { + + integer last=findlastof(file,"/"); + string path_file = substring (file, 0, last); + WFM::Execute(.local.mkdir, Installation::destdir + path_file); + y2milestone ("writing file: %1", file); + WFM::Write(.local.string, Installation::destdir + file, content); + }); +} + + + + +if ( GetInstArgs::going_back()) // going backwards? +{ + return `auto; // don't execute this once more +} + +if (Mode::update()) +{ + + // save some sysconfig variables + // register new agent pointing into the mounted filesystem + path sys_agent = .target.sysconfig.bootloader; + + string target_sysconfig_path = Installation::destdir + "/etc/sysconfig/bootloader"; + SCR::RegisterAgent (.target.sysconfig.bootloader, `ag_ini(`SysConfigFile(target_sysconfig_path))); + + string bl = (string) SCR::Read(add(sys_agent,.LOADER_TYPE)); + + term convert_question = `VBox( + `HBox ( + `HStretch(), + `RadioButtonGroup(`id(`convert), + `HSquash ( + `VBox(`Left(`Label("LILO is not supported. The recommended option is select convert LILO to GRUB")), + `Left(`Label("Do you want convert settings and install GRUB?")), + `Left(`RadioButton(`id("lilo"), _("Stay LILO"))), + `Left(`RadioButton(`id("grub"), _("Convert Settings and Install GRUB"), true )) + ) + ) + ), + `HStretch() + ) + ); + any ret = nil; + if (bl == "lilo") + { + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("bootloader"); + Wizard::SetContentsButtons("Converting LILO to GRUB", convert_question, + _("LILO is not supported. The recommended option is select convert LILO to GRUB"), + Label::BackButton(), Label::NextButton()); + UI::ChangeWidget(`id(`abort),`Label, Label::CancelButton()); + UI::ChangeWidget(`id(`abort), `Enabled, false); + + while (true) + { + ret = UI::UserInput(); + string current = (string) UI::QueryWidget(`id(`convert), `CurrentButton); + // One of those dialog buttons have been pressed + if (ret == `next) + { + selectPackage(); + convertSettings(); + SCR::Write (add(sys_agent,.LOADER_TYPE), "grub"); + SCR::Write (sys_agent, nil); + } + break; + + } + UI::CloseDialog(); + } + + if (ret == `back) + return `back; + + if (ret == `next) + return `next; + +} + +y2milestone ("finish inst_lilo_convert"); + +return `auto; + +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.22/src/clients/Makefile.am new/yast2-bootloader-2.17.23/src/clients/Makefile.am --- old/yast2-bootloader-2.17.22/src/clients/Makefile.am 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.23/src/clients/Makefile.am 2008-09-29 14:30:21.000000000 +0200 @@ -8,7 +8,8 @@ bootloader_proposal.ycp \ bootloader_finish.ycp \ print-product.ycp \ - inst_bootloader.ycp + inst_bootloader.ycp \ + inst_lilo_convert.ycp EXTRA_DIST = \ $(client_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.22/src/clients/Makefile.in new/yast2-bootloader-2.17.23/src/clients/Makefile.in --- old/yast2-bootloader-2.17.22/src/clients/Makefile.in 2008-07-21 18:26:00.000000000 +0200 +++ new/yast2-bootloader-2.17.23/src/clients/Makefile.in 2008-09-29 17:11:49.000000000 +0200 @@ -216,7 +216,8 @@ bootloader_proposal.ycp \ bootloader_finish.ycp \ print-product.ycp \ - inst_bootloader.ycp + inst_bootloader.ycp \ + inst_lilo_convert.ycp EXTRA_DIST = \ $(client_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.22/src/generic/dialogs.ycp new/yast2-bootloader-2.17.23/src/generic/dialogs.ycp --- old/yast2-bootloader-2.17.22/src/generic/dialogs.ycp 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.23/src/generic/dialogs.ycp 2008-09-29 16:40:24.000000000 +0200 @@ -12,7 +12,7 @@ * Joachim Plack <jplack(a)suse.de> * Olaf Dabrunz <od(a)suse.de> * - * $Id: dialogs.ycp 41373 2007-10-11 12:55:01Z odabrunz $ + * $Id: dialogs.ycp 51654 2008-09-29 13:46:03Z jsrain $ * */ @@ -50,6 +50,10 @@ global void importMetaData() { BootCommon::exports = BootCommon::GetMetaData (); + // clean option list, otherwise options of different bootloaders + // get mixed after bootloader switch + BootCommon::global_options = $[]; + BootCommon::section_options = $[]; // Extract type descriptions from exports foreach(string key, any value, BootCommon::exports, { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.22/src/routines/dialogs.ycp new/yast2-bootloader-2.17.23/src/routines/dialogs.ycp --- old/yast2-bootloader-2.17.22/src/routines/dialogs.ycp 2008-08-28 16:15:40.000000000 +0200 +++ new/yast2-bootloader-2.17.23/src/routines/dialogs.ycp 2008-09-29 16:40:24.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: dialogs.ycp 49775 2008-08-06 13:42:22Z juhliarik $ + * $Id: dialogs.ycp 51646 2008-09-29 12:58:18Z jsrain $ * */ @@ -125,8 +125,7 @@ ]); if (ret != `back && ret != `abort && ret != `cancel) { - return_tab = CWMTab::CurrentTab (); - // TODO store current tab here + return_tab = CWMTab::LastTab (); } return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.22/src/routines/section_widgets.ycp new/yast2-bootloader-2.17.23/src/routines/section_widgets.ycp --- old/yast2-bootloader-2.17.22/src/routines/section_widgets.ycp 2008-09-08 17:01:09.000000000 +0200 +++ new/yast2-bootloader-2.17.23/src/routines/section_widgets.ycp 2008-09-29 17:10:20.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: section_widgets.ycp 50815 2008-09-08 15:01:09Z juhliarik $ + * $Id: section_widgets.ycp 51672 2008-09-29 15:10:19Z juhliarik $ * */ @@ -318,7 +318,9 @@ else { BootCommon::current_section["name"] = ""; - BootCommon::current_section["original_name"] = ""; + // FIXME: the problem with missing YaST commnet in menu.lst + // it seems be correct if original_name stay same... + // BootCommon::current_section["original_name"] = ""; BootCommon::current_section["__auto"] = false; BootCommon::current_section["lines_cache_id"] = ""; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.22/VERSION new/yast2-bootloader-2.17.23/VERSION --- old/yast2-bootloader-2.17.22/VERSION 2008-09-25 17:47:44.000000000 +0200 +++ new/yast2-bootloader-2.17.23/VERSION 2008-09-29 17:11:37.000000000 +0200 @@ -1 +1 @@ -2.17.22 +2.17.23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sysconfig
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package sysconfig checked in at Mon Sep 29 18:33:59 CEST 2008. -------- --- sysconfig/sysconfig.changes 2008-09-25 17:54:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2008-09-29 17:33:14.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Sep 29 17:17:29 CEST 2008 - mt(a)suse.de + +- Set explicit permisions for netconfig generated files instead + of prereserveing [wrong] permissions from original (bnc#428458). +- Improved netconfig check_md5_and_move function to match special + comments additionally to the data to improve detection of user + modifications, added matching comments to configuration hints + and renamed it to netconfig_check_md5_and_move (bnc#428201). +- Removed incorrect check for empty dns search list skipping the + generation of the /etc/resolv.conf file (bnc#429132). + +------------------------------------------------------------------- Old: ---- sysconfig-0.71.6.tar.bz2 sysconfig-netconfig-set-umask.diff sysconfig-usr_on_nfs-fixes.285472.diff New: ---- sysconfig-0.71.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.E28212/_old 2008-09-29 18:33:35.000000000 +0200 +++ /var/tmp/diff_new_pack.E28212/_new 2008-09-29 18:33:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package sysconfig (Version 0.71.6) +# spec file for package sysconfig (Version 0.71.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: sysconfig -Version: 0.71.6 -Release: 2 +Version: 0.71.7 +Release: 1 Summary: The sysconfig scheme Group: System/Base License: GPL v2 or later @@ -30,8 +30,6 @@ BuildRequires: sysfsutils BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 -Patch0: sysconfig-usr_on_nfs-fixes.285472.diff -Patch1: sysconfig-netconfig-set-umask.diff %description This package provides the SuSE system configuration scheme. @@ -52,8 +50,6 @@ %prep %setup -n sysconfig-%{version} -%patch0 -p0 -%patch1 -p0 %build autoreconf --force --install @@ -235,6 +231,15 @@ %{stop_on_removal network} %changelog +* Mon Sep 29 2008 mt(a)suse.de +- Set explicit permisions for netconfig generated files instead + of prereserveing [wrong] permissions from original (bnc#428458). +- Improved netconfig check_md5_and_move function to match special + comments additionally to the data to improve detection of user + modifications, added matching comments to configuration hints + and renamed it to netconfig_check_md5_and_move (bnc#428201). +- Removed incorrect check for empty dns search list skipping the + generation of the /etc/resolv.conf file (bnc#429132). * Thu Sep 25 2008 mt(a)suse.de - Fixed netconfig scripts to avoid seq usage (bnc#285472). - Set umask explicitly to 0022 in netconfig to avoid that e.g. ++++++ sysconfig-0.71.6.tar.bz2 -> sysconfig-0.71.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.6/configure new/sysconfig-0.71.7/configure --- old/sysconfig-0.71.6/configure 2008-09-25 10:51:19.000000000 +0200 +++ new/sysconfig-0.71.7/configure 2008-09-29 18:10:20.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.13 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for sysconfig 0.71.6. +# Generated by GNU Autoconf 2.61 for sysconfig 0.71.7. # # Report bugs to <http://www.suse.de/feedback/>. # @@ -729,8 +729,8 @@ # Identity of this package. PACKAGE_NAME='sysconfig' PACKAGE_TARNAME='sysconfig' -PACKAGE_VERSION='0.71.6' -PACKAGE_STRING='sysconfig 0.71.6' +PACKAGE_VERSION='0.71.7' +PACKAGE_STRING='sysconfig 0.71.7' PACKAGE_BUGREPORT='http://www.suse.de/feedback/' ac_unique_file="scripts/ifup" @@ -1406,7 +1406,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 sysconfig 0.71.6 to adapt to many kinds of systems. +\`configure' configures sysconfig 0.71.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1476,7 +1476,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysconfig 0.71.6:";; + short | recursive ) echo "Configuration of sysconfig 0.71.7:";; esac cat <<\_ACEOF @@ -1579,7 +1579,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysconfig configure 0.71.6 +sysconfig configure 0.71.7 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1593,7 +1593,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sysconfig $as_me 0.71.6, which was +It was created by sysconfig $as_me 0.71.7, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -21217,7 +21217,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sysconfig $as_me 0.71.6, which was +This file was extended by sysconfig $as_me 0.71.7, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21264,7 +21264,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -sysconfig config.status 0.71.6 +sysconfig config.status 0.71.7 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.6/scripts/convert_for_getconfig new/sysconfig-0.71.7/scripts/convert_for_getconfig --- old/sysconfig-0.71.6/scripts/convert_for_getconfig 2008-08-18 14:14:17.000000000 +0200 +++ new/sysconfig-0.71.7/scripts/convert_for_getconfig 2008-09-25 16:02:40.000000000 +0200 @@ -376,7 +376,7 @@ # # first, process everything but aliases # -for i in `seq 1 $n`; do +for i in `eval "echo {0..$n}"`; do file=${old_names_array[$i]} # skip aliases diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.6/scripts/functions.netconfig new/sysconfig-0.71.7/scripts/functions.netconfig --- old/sysconfig-0.71.6/scripts/functions.netconfig 2008-09-25 09:51:50.000000000 +0200 +++ new/sysconfig-0.71.7/scripts/functions.netconfig 2008-09-29 18:09:12.000000000 +0200 @@ -18,7 +18,7 @@ # Authors: Michael Calmer <mc(a)suse.de> # Marius Tomaschewski <mt(a)suse.de> # -# $Id: functions.netconfig 1732 2008-09-23 09:06:48Z mt $ +# $Id: functions.netconfig 1753 2008-09-29 16:09:11Z mt $ # r=$ROOT @@ -65,12 +65,18 @@ } # -# Usage: check_md5_and_move <srcfile> <destfile> [suffix] [err_var] +# Usage: netconfig_check_md5_and_move <srcfile> <destfile> +# [suffix] [err_var] +# [additional match regex] # # This function checks the existence of a file and a corresponding # md5 checksum and tests whether the checksum of the file has changed. # If it has, nothing further will happen. If not, the "$srcfile" # will be moved to "$destfile". +# The additional match regex parameter (default "^###") additionally +# matches special comments in the generated config file an should avoid, +# that the user created/modified config gets overwritten when netconfig +# generates one with exactly same data inside (and modify it later). # # The return values of this function: # RET=0 : file successfuly copied @@ -79,12 +85,13 @@ # it still exists as $srcfile or in `readline $destfile`.$suffix; # the err_var variable is set to the name. # RET=3 : ERROR: another error occured, e.g. some file operation failed -check_md5_and_move() +netconfig_check_md5_and_move() { - local SRCFILE="$1" - local DSTFILE="$2" - local OSUFFIX="$3" - local ERR_VAR="$4" + local SRCFILE=${1} + local DSTFILE=${2} + local OSUFFIX=${3} + local ERR_VAR=${4} + local NEW_ERX=${5:-"^###"} local MD5FILE="$MD5DIR/$DSTFILE" # DSTFILE may be a symlink on a read only /-fs local OUTFILE=`read_symlink "${DSTFILE}"` @@ -96,42 +103,61 @@ mkdir -p "${MD5FILE%/*}" || return 3 local RET=0 - local NEWMD5SUM USERMD5SUM OLDMD5SUM DATE BAKFILE + local NEWMD5SUM SRCMD5SUM DSTMD5SUM OLDMD5SUM DATE BAKFILE OLD_ERX - # create new md5sum - NEWMD5SUM="`cat "$SRCFILE" | grep -Ev '^#|^[[:space:]]*$' | md5sum`" + _read_erx_data() + { + test "x${1}" = x && return 1 + awk -v erx="${2}" ' + { if(length(erx) && match($0, erx) > 0) { print $0; next; } } + !/^#|^[[:space:]]*$/ { print $0; } + ' "$1" + } + + # use old erx if set + OLD_ERX="${NEW_ERX}" + if test -s "$MD5FILE" ; then + OLD_ERX=`awk -- '/^#/ { if(NR==1) print substr($0,2); }' \ + "$MD5FILE" 2>/dev/null` + fi + SRCMD5SUM=`_read_erx_data "$SRCFILE" "$OLD_ERX" | md5sum` + test "x${OLD_ERX}" = "x${NEW_ERX}" && NEWMD5SUM="$SRCMD5SUM" || \ + NEWMD5SUM=`_read_erx_data "$SRCFILE" "$NEW_ERX" | md5sum` + + # create empty DSTFILE (via OUTFILE) and reset md5 + # when the DSTFILE is empty or does not exists ... if test ! -s "$OUTFILE" ; then - touch "$OUTFILE" || return 3 + touch "$OUTFILE" || return 3 + # check if it exists (via link) + test -e "$DSTFILE" || return 3 + DSTMD5SUM=`echo "" | md5sum` + OLDMD5SUM="$DSTMD5SUM" rm -f "$MD5FILE" + { echo "#$OLD_ERX"; echo "$DSTMD5SUM"; } > "$MD5FILE" + else + DSTMD5SUM=`_read_erx_data "$DSTFILE" "$OLD_ERX" | md5sum` + OLDMD5SUM=`grep -Ev "^#" "$MD5FILE" 2>/dev/null` fi if test "$FORCE_REPLACE" = true ; then - - USERMD5SUM="`cat "$DSTFILE" | grep -Ev '^#|^[[:space:]]*$' | md5sum`" - test -e "$MD5FILE" || echo "$USERMD5SUM" > "$MD5FILE" - OLDMD5SUM=`cat "$MD5FILE"` - # backup DSTFILE only if it exist with some content and # was really changed by the user and the new generated # file has a different content if [ -s "$OUTFILE" -a \ - "$USERMD5SUM" != "$OLDMD5SUM" -a \ - "$USERMD5SUM" != "$NEWMD5SUM" ]; then - + "$DSTMD5SUM" != "$OLDMD5SUM" -a \ + "$DSTMD5SUM" != "$SRCMD5SUM" ]; then DATE=$(date +%Y%m%d-%H%M%S) BAKFILE="${OUTFILE}.${DATE}" cp -p --backup=existing "$OUTFILE" "$BAKFILE" log "force replace set: backup created as $BAKFILE" fi - cp -p "$SRCFILE" "$OUTFILE" + cp -p "$SRCFILE" "$OUTFILE" # redundant, but... + DSTMD5SUM="$SRCMD5SUM" + OLDMD5SUM="$SRCMD5SUM" fi - USERMD5SUM="`cat "$DSTFILE" | grep -Ev '^#|^[[:space:]]*$' | md5sum`" - test -e "$MD5FILE" || echo "$USERMD5SUM" > "$MD5FILE" - OLDMD5SUM=`cat "$MD5FILE"` - if test "$USERMD5SUM" != "$OLDMD5SUM" -a \ - "$USERMD5SUM" != "$NEWMD5SUM" ; then - + if test "$DSTMD5SUM" != "$OLDMD5SUM" -a \ + "$DSTMD5SUM" != "$SRCMD5SUM" ; then log "ATTENTION: You have modified $DSTFILE. Leaving it untouched..." if test "x$OSUFFIX" != x -a \ "x$SRCFILE" != "${OUTFILE}${OSUFFIX}" && \ @@ -144,7 +170,8 @@ fi RET=2 else - if test "$USERMD5SUM" != "$NEWMD5SUM" -o \ + if test "$DSTMD5SUM" != "$SRCMD5SUM" -o \ + "$SRCMD5SUM" != "$NEWMD5SUM" -o \ "$FORCE_REPLACE" = "true" ; then debug "Installing new $DSTFILE" cp -p "$SRCFILE" "$OUTFILE" @@ -155,7 +182,11 @@ rm -f "$SRCFILE" fi rm -f "$MD5FILE" - echo "$NEWMD5SUM" > "$MD5FILE" + { + test "x${NEW_ERX}" != x && \ + echo "#${NEW_ERX}" + echo "$NEWMD5SUM" + } > "$MD5FILE" return $RET } @@ -172,7 +203,7 @@ test -z "$1" && return 1 test -z "$2" && return 1 - for i in `seq 0 3`; do + for i in {0..3}; do openLock "$1" if [ "$?" = "0" ]; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.6/scripts/ifup-dhcp new/sysconfig-0.71.7/scripts/ifup-dhcp --- old/sysconfig-0.71.6/scripts/ifup-dhcp 2008-09-23 16:34:55.000000000 +0200 +++ new/sysconfig-0.71.7/scripts/ifup-dhcp 2008-09-26 15:06:32.000000000 +0200 @@ -18,7 +18,7 @@ # Author: Christian Zoz <zoz(a)suse.de>, 2002-2006 # Peter Poeml <poeml(a)suse.de>, 2002-2006 # -# $Id: ifup-dhcp 1737 2008-09-23 14:04:25Z mt $ +# $Id: ifup-dhcp 1751 2008-09-26 13:06:31Z mt $ # usage () { @@ -368,10 +368,6 @@ case "$ACTION" in start|renew) - # avoid that the temporary resolv.conf will persist after the client stops - # just because there hasn't been any resolv.conf to back up - test -e /etc/resolv.conf || touch /etc/resolv.conf - # Create the ntp runtime cache dir before the dhcp client is started. # Netconfig writes the /var/run/ntp/servers-netconfig file containing # the ntp server list that is picked up by the ntp init script to apply diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.6/scripts/netconfig new/sysconfig-0.71.7/scripts/netconfig --- old/sysconfig-0.71.6/scripts/netconfig 2008-09-12 16:09:14.000000000 +0200 +++ new/sysconfig-0.71.7/scripts/netconfig 2008-09-25 17:51:25.000000000 +0200 @@ -18,7 +18,7 @@ # Author: Michael Calmer <mc(a)suse.de> # Marius Tomaschewski <mt(a)suse.de> # -# $Id: netconfig 1724 2008-09-12 14:09:13Z mt $ +# $Id: netconfig 1750 2008-09-25 15:51:24Z mt $ # # @@ -333,12 +333,16 @@ exit 1 fi -# FIXME: nfsroot support, don't abort when somebody just calls with "-h" +# Check if we can write in /tmp if ! touch $r/tmp &>/dev/null; then echo "Filesystem read only: Cannot modify anything" >&2 exit 1 fi +# Set usefull default umask +umask 0022 + +# Create state directory if ! mkdir -p "$STATEDIR" ; then echo "Unable to create netconfig state directory '$STATEDIR'" >&2 exit 1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.6/scripts/netconfig.d/dns-bind new/sysconfig-0.71.7/scripts/netconfig.d/dns-bind --- old/sysconfig-0.71.6/scripts/netconfig.d/dns-bind 2008-09-22 16:41:18.000000000 +0200 +++ new/sysconfig-0.71.7/scripts/netconfig.d/dns-bind 2008-09-29 17:15:02.000000000 +0200 @@ -64,16 +64,20 @@ TMP_FILE=`mktemp "${DST_FILE}.XXXXXX"` || return 1 if test ! -s "$DST_FILE" ; then - touch "$DST_FILE" + touch "$DST_FILE" ; chmod 644 "$DST_FILE" fi # * copy dest => tmp to get the file attributes # * remove the content # * print a warning on top of this file - cp -p "$DST_FILE" "$TMP_FILE" + #cp -p "$DST_FILE" "$TMP_FILE" + + # set explicit mode on tmp file instead to preserve the + # mode of original file that can be wrong (bnc#428458) + chmod 644 "$TMP_FILE" + cat << EOT > "$TMP_FILE" -# -# This file is autogenerated by netconfig! +### $DESTFILE file autogenerated by netconfig! # # Before you change this file manually, consider to define the # static DNS configuration using the following variables in the @@ -84,12 +88,14 @@ # or disable DNS configuration updates via netconfig by setting: # NETCONFIG_DNS_POLICY='' # +# See also the netconfig(8) manual page and other documentation. +# # Note: Manual change of this file disables netconfig too, but # may get lost when this file contains comments or empty lines -# only and in case of a "netconfig update -f" call. -# -# See also the netconfig(8) manual page and other documentation. +# only, the netconfig settings are same with settings in this +# file and in case of a "netconfig update -f" call. # +### Please remove (at least) this line when you modify the file! EOT for ns in $1; do @@ -111,7 +117,7 @@ echo "};" } >> "$TMP_FILE" - check_md5_and_move "$TMP_FILE" "$DESTFILE" ".netconfig" TMP_FILE + netconfig_check_md5_and_move "$TMP_FILE" "$DESTFILE" ".netconfig" TMP_FILE return $? } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.6/scripts/netconfig.d/dns-dnsmasq new/sysconfig-0.71.7/scripts/netconfig.d/dns-dnsmasq --- old/sysconfig-0.71.6/scripts/netconfig.d/dns-dnsmasq 2008-09-22 16:41:33.000000000 +0200 +++ new/sysconfig-0.71.7/scripts/netconfig.d/dns-dnsmasq 2008-09-29 17:14:35.000000000 +0200 @@ -61,16 +61,20 @@ TMP_FILE=`mktemp "${DST_FILE}.XXXXXX"` || return 1 if test ! -s "$DST_FILE" ; then - touch "$DST_FILE" + touch "$DST_FILE" ; chmod 644 "$DST_FILE" fi # * copy dest => tmp to get the file attributes # * remove the content # * print a warning on top of this file - cp -p "$DST_FILE" "$TMP_FILE" + #cp -p "$DST_FILE" "$TMP_FILE" + + # set explicit mode on tmp file instead to preserve the + # mode of original file that can be wrong (bnc#428458) + chmod 644 "$TMP_FILE" + cat << EOT > "$TMP_FILE" -# -# This file is autogenerated by netconfig! +### $DESTFILE file autogenerated by netconfig! # # Before you change this file manually, consider to define the # static DNS configuration using the following variables in the @@ -81,12 +85,14 @@ # or disable DNS configuration updates via netconfig by setting: # NETCONFIG_DNS_POLICY='' # +# See also the netconfig(8) manual page and other documentation. +# # Note: Manual change of this file disables netconfig too, but # may get lost when this file contains comments or empty lines -# only and in case of a "netconfig update -f" call. -# -# See also the netconfig(8) manual page and other documentation. +# only, the netconfig settings are same with settings in this +# file and in case of a "netconfig update -f" call. # +### Please remove (at least) this line when you modify the file! EOT for ns in $1; do @@ -110,7 +116,7 @@ } >> "$TMP_FILE" fi - check_md5_and_move "$TMP_FILE" "$DESTFILE" ".netconfig" TMP_FILE + netconfig_check_md5_and_move "$TMP_FILE" "$DESTFILE" ".netconfig" TMP_FILE return $? } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.6/scripts/netconfig.d/dns-resolver new/sysconfig-0.71.7/scripts/netconfig.d/dns-resolver --- old/sysconfig-0.71.6/scripts/netconfig.d/dns-resolver 2008-09-22 16:41:50.000000000 +0200 +++ new/sysconfig-0.71.7/scripts/netconfig.d/dns-resolver 2008-09-29 17:14:50.000000000 +0200 @@ -50,32 +50,40 @@ function write_resolv_conf() { - test -z "$1" && return 1 # - # empty nameserver is a valid value + # empty search list is a valid value + # + #test -z "$1" && return 1 + # + # empty nameserver is a valid value too + # (empty at least in the forwarder mode) # #test -z "$2" && return 1 - debug "write_resolv_conf: $1 $2" + debug "write_resolv_conf: '$1' '$2'" local SEARCHLIST=() local NAMESERVER=() # DESTFILE may be a symlink on a read only /-fs DST_FILE=`read_symlink "${DESTFILE}"` - TMP_FILE=`mktemp "${DESTFILE}.XXXXXX"` || return 1 + TMP_FILE=`mktemp "${DST_FILE}.XXXXXX"` || return 1 - if test ! -s "$DESTFILE" ; then - touch "$DESTFILE" + if test ! -s "$DST_FILE" ; then + touch "$DST_FILE" ; chmod 644 "$DST_FILE" fi # * copy dest => tmp to get the file attributes # * remove the content # * print a warning on top of this file - cp -p "$DESTFILE" "$TMP_FILE" + #cp -p "$DST_FILE" "$TMP_FILE" + + # set explicit mode on tmp file instead to preserve the + # mode of original file that can be wrong (bnc#428458) + chmod 644 "$TMP_FILE" + cat << EOT > "$TMP_FILE" -# -# This file is autogenerated by netconfig! +### $DESTFILE file autogenerated by netconfig! # # Before you change this file manually, consider to define the # static DNS configuration using the following variables in the @@ -86,12 +94,14 @@ # or disable DNS configuration updates via netconfig by setting: # NETCONFIG_DNS_POLICY='' # +# See also the netconfig(8) manual page and other documentation. +# # Note: Manual change of this file disables netconfig too, but # may get lost when this file contains comments or empty lines -# only and in case of a "netconfig update -f" call. -# -# See also the netconfig(8) manual page and other documentation. +# only, the netconfig settings are same with settings in this +# file and in case of a "netconfig update -f" call. # +### Please remove (at least) this line when you modify the file! EOT for nd in $1; do @@ -131,7 +141,7 @@ } >> "$TMP_FILE" fi - check_md5_and_move "$TMP_FILE" "$DESTFILE" ".netconfig" TMP_FILE + netconfig_check_md5_and_move "$TMP_FILE" "$DESTFILE" ".netconfig" TMP_FILE return $? } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.6/scripts/netconfig.d/nis new/sysconfig-0.71.7/scripts/netconfig.d/nis --- old/sysconfig-0.71.6/scripts/netconfig.d/nis 2008-09-22 16:44:38.000000000 +0200 +++ new/sysconfig-0.71.7/scripts/netconfig.d/nis 2008-09-29 17:14:30.000000000 +0200 @@ -132,16 +132,20 @@ TMP_FILE=`mktemp "${DST_FILE}.XXXXXX"` if test ! -s "$DST_FILE" ; then - touch "$DST_FILE" + touch "$DST_FILE" ; chmod 644 "$DST_FILE" fi # * copy dest => tmp to get the file attributes # * remove the content # * print a warning on top of this file - cp -p "$DST_FILE" "$TMP_FILE" + #cp -p "$DST_FILE" "$TMP_FILE" + + # set explicit mode on tmp file instead to preserve the + # mode of original file that can be wrong (bnc#428458) + chmod 644 "$TMP_FILE" + cat << EOT > "$TMP_FILE" -# -# This file is autogenerated by netconfig! +### $DESTFILE file autogenerated by netconfig! # # Before you change this file manually, consider to define the # static NIS configuration using the following variables in the @@ -151,12 +155,14 @@ # or disable NIS configuration updates via netconfig by setting: # NETCONFIG_NIS_POLICY='' # +# See also the netconfig(8) manual page and other documentation. +# # Note: Manual change of this file disables netconfig too, but # may get lost when this file contains comments or empty lines -# only and in case of a "netconfig update -f" call. -# -# See also the netconfig(8) manual page and other documentation. +# only, the netconfig settings are same with settings in this +# file and in case of a "netconfig update -f" call. # +### Please remove (at least) this line when you modify the file! EOT if [ ${#NIS_YPSRV_ENTRIES[@]} -gt 0 ]; then @@ -187,7 +193,7 @@ echo "broadcast" >> "$TMP_FILE" fi - check_md5_and_move "$TMP_FILE" "$DESTFILE" ".netconfig" TMP_FILE + netconfig_check_md5_and_move "$TMP_FILE" "$DESTFILE" ".netconfig" TMP_FILE return $? } @@ -201,7 +207,7 @@ "$NETCONFIG_NIS_STATIC_SERVERS" fi - for i in `seq 0 99`; do + for i in {0..99} ; do nis_dom="NETCONFIG_NIS_STATIC_DOMAIN_$i" nis_srv="NETCONFIG_NIS_STATIC_SERVERS_$i" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.6/scripts/netconfig.d/ntp-runtime new/sysconfig-0.71.7/scripts/netconfig.d/ntp-runtime --- old/sysconfig-0.71.6/scripts/netconfig.d/ntp-runtime 2008-09-22 16:45:25.000000000 +0200 +++ new/sysconfig-0.71.7/scripts/netconfig.d/ntp-runtime 2008-09-29 17:14:43.000000000 +0200 @@ -58,21 +58,24 @@ TMP_FILE=`mktemp "$r/tmp/ntp-servers-netconfig.XXXXXX"` || return 1 - # # make sure that the directory exists mkdir -p "${DESTFILE%/*}" if test ! -s "$DESTFILE" ; then - touch "$DESTFILE" + touch "$DESTFILE" ; chmod 644 "$DESTFILE" fi # * copy dest => tmp to get the file attributes # * remove the content # * print a warning on top of this file - cp -p "$DESTFILE" "$TMP_FILE" + #cp -p "$DESTFILE" "$TMP_FILE" + + # set explicit mode on tmp file instead to preserve the + # mode of original file that can be wrong (bnc#428458) + chmod 644 "$TMP_FILE" + cat << EOT > "$TMP_FILE" -# -# This file is autogenerated by netconfig! +### $DESTFILE file autogenerated by netconfig! # # Before you change this file manually, consider to define the # static NTP configuration using the following variables in the @@ -81,12 +84,14 @@ # or disable NTP configuration updates via netconfig by setting: # NETCONFIG_NTP_POLICY='' # +# See also the netconfig(8) manual page and other documentation. +# # Note: Manual change of this file disables netconfig too, but # may get lost when this file contains comments or empty lines -# only and in case of a "netconfig update -f" call. -# -# See also the netconfig(8) manual page and other documentation. +# only, the netconfig settings are same with settings in this +# file and in case of a "netconfig update -f" call. # +### Please remove (at least) this line when you modify the file! EOT for ns in $1; do @@ -101,7 +106,7 @@ echo "RUNTIME_SERVERS='${SERVERS[@]}'" >> "$TMP_FILE" fi - check_md5_and_move "$TMP_FILE" "$DESTFILE" + netconfig_check_md5_and_move "$TMP_FILE" "$DESTFILE" return $? } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.71.6/VERSION new/sysconfig-0.71.7/VERSION --- old/sysconfig-0.71.6/VERSION 2008-09-25 10:38:08.000000000 +0200 +++ new/sysconfig-0.71.7/VERSION 2008-09-29 17:35:46.000000000 +0200 @@ -1 +1 @@ -0.71.6 +0.71.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org-thesaurus
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package OpenOffice_org-thesaurus checked in at Mon Sep 29 18:33:12 CEST 2008. -------- --- OpenOffice_org-thesaurus/OpenOffice_org-thesaurus.changes 2008-04-14 14:53:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-thesaurus/OpenOffice_org-thesaurus.changes 2008-09-29 17:57:59.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Sep 29 17:56:01 CEST 2008 - pmladek(a)suse.cz + +- updated: French, Slovak, Romanian, Slovene +- added: Greek, Swedish +- removed obsolete triggerin and postun scripts; OOo-3.0 does not need + it anymore + +------------------------------------------------------------------- Old: ---- thes_fr_FR_v2.tar.bz2 thes_ro_RO_v2.tar.bz2 thes_sk_SK_v2.tar.bz2 New: ---- OOo-Thesaurus2-sk_SK.tar.bz2 th_el.tar.bz2 thes_fr_FR_v2_2-1.tar.bz2 thes_sv_SE_v2.tar.bz2 th_ro_RO.3.3-test3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-thesaurus.spec ++++++ --- /var/tmp/diff_new_pack.Q26579/_old 2008-09-29 18:32:56.000000000 +0200 +++ /var/tmp/diff_new_pack.Q26579/_new 2008-09-29 18:32:56.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package OpenOffice_org-thesaurus (Version 20070719) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,7 +24,7 @@ Group: Productivity/Office/Dictionary AutoReqProv: on Version: 20070719 -Release: 2 +Release: 3 Summary: A Source Package for OpenOffice.org Thesaurus Dictionaries Url: http://wiki.services.openoffice.org/wiki/Dictionaries # Extra source for Bulgarian dictionary because of missing license in @@ -27,19 +34,24 @@ Source1: thes_cs_CZ_v2.tar.bz2 Source2: thes_de_CH_v2.tar.bz2 Source3: thes_de_DE_v2.tar.bz2 -Source4: thes_en_US_v2.tar.bz2 -Source5: thes_es_ES_v2.tar.bz2 -Source6: thes_fr_FR_v2.tar.bz2 -Source7: thes_ga_IE_v2.tar.bz2 -Source8: thes_hu_HU_v2.tar.bz2 -Source9: thes_nb_NO_v2.tar.bz2 -Source10: thes_ne_NP_v2.tar.bz2 -Source11: thes_pl_PL_v2.tar.bz2 -Source12: thes_pt_PT_v2.tar.bz2 -Source13: thes_ro_RO_v2.tar.bz2 -Source14: thes_ru_RU_v2.tar.bz2 -Source15: thes_sk_SK_v2.tar.bz2 -Source16: thes_sl_SI_v2.tar.bz2 +Source4: th_el.tar.bz2 +Source5: thes_en_US_v2.tar.bz2 +Source6: thes_es_ES_v2.tar.bz2 +Source7: thes_fr_FR_v2_2-1.tar.bz2 +Source8: thes_ga_IE_v2.tar.bz2 +# from hu_HU-1.3-pack.zip +Source9: thes_hu_HU_v2.tar.bz2 +# from no_NO-pack2-2.0.10.zip +Source10: thes_nb_NO_v2.tar.bz2 +Source11: thes_ne_NP_v2.tar.bz2 +Source12: thes_pl_PL_v2.tar.bz2 +Source13: thes_pt_PT_v2.tar.bz2 +Source14: th_ro_RO.3.3-test3.tar.bz2 +Source15: thes_ru_RU_v2.tar.bz2 +# http://wiki.services.openoffice.org/wiki/Dictionaries#Slovak_.28Slovakia.29 +Source16: OOo-Thesaurus2-sk_SK.tar.bz2 +Source17: thes_sl_SI_v2.tar.bz2 +Source18: thes_sv_SE_v2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -52,7 +64,7 @@ %package bg License: GPL v2 or later Version: 20071210 -Release: 1 +Release: 37 Group: Productivity/Office/Dictionary Summary: Bulgarian Thesaurus Dictionary for OpenOffice.org Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_bg_BG_v2.dat @@ -67,7 +79,7 @@ %package cs License: BSD 3-Clause Version: 20070913 -Release: 1 +Release: 37 Group: Productivity/Office/Dictionary Summary: Czech Thesaurus Dictionary for OpenOffice.org Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_cs_CZ_v2.dat @@ -82,7 +94,7 @@ %package de License: LGPL v2.1 or later Version: 20080406 -Release: 1 +Release: 37 Group: Productivity/Office/Dictionary Summary: German Thesaurus Dictionary for OpenOffice.org Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_de_DE_v2.dat @@ -97,7 +109,7 @@ %package de-CH License: LGPL v2.1 or later Version: 20080406 -Release: 1 +Release: 37 Group: Productivity/Office/Dictionary Summary: German-Swiss Thesaurus Dictionary for OpenOffice.org Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_de_CH_v2.dat @@ -109,10 +121,25 @@ +%package el +License: GPL v2 or later +Version: 20061203 +Release: 1 +Group: Productivity/Office/Dictionary +Summary: Greek Thesaurus Dictionary for OpenOffice.org +Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_el_GR_v2.dat +Provides: locale(OpenOffice_org:el) + +%description el +The Greek thesaurus dictionary that can be used to look up for synonyms +and related words in the OpenOffice.org office suite. + + + %package en License: BSD 4-Clause Version: 20060111 -Release: 46 +Release: 82 Group: Productivity/Office/Dictionary Summary: English Thesaurus Dictionary for OpenOffice.org Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_en_US_v2.dat @@ -127,7 +154,7 @@ %package es License: LGPL v2.1 or later Version: 20050720 -Release: 46 +Release: 82 Group: Productivity/Office/Dictionary Summary: Spanish Thesaurus Dictionary for OpenOffice.org Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_es_ES_v2.dat @@ -141,8 +168,8 @@ %package fr License: LGPL v2.1 or later -Version: 20050329 -Release: 46 +Version: 20060511 +Release: 1 Group: Productivity/Office/Dictionary Summary: French Thesaurus Dictionary for OpenOffice.org Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_fr_FR_v2.dat @@ -157,7 +184,7 @@ %package ga License: GNU Free Documentation License, Version 1.2 (GFDL 1.2) Version: 20071002 -Release: 1 +Release: 37 Group: Productivity/Office/Dictionary Summary: Irish Thesaurus Dictionary for OpenOffice.org Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_ga_IE_v2.dat @@ -172,7 +199,7 @@ %package hu License: LGPL v2.1 or later Version: 20080319 -Release: 1 +Release: 37 Group: Productivity/Office/Dictionary Summary: Hungarian Thesaurus Dictionary for OpenOffice.org Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_hu_HU_v2.dat @@ -187,7 +214,7 @@ %package nb License: GPL v2 or later Version: 20080310 -Release: 1 +Release: 37 Group: Productivity/Office/Dictionary Summary: Norwegian Bokmaal Thesaurus Dictionary for OpenOffice.org Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_nb_NO_v2.dat @@ -202,7 +229,7 @@ %package ne License: LGPL v2.1 or later Version: 1.1 -Release: 46 +Release: 82 Group: Productivity/Office/Dictionary Summary: Nepali Thesaurus Dictionary for OpenOffice.org Provides: locale(OpenOffice_org:ne) @@ -216,7 +243,7 @@ %package pl License: LGPL v2.1 or later Version: 20061223 -Release: 46 +Release: 82 Group: Productivity/Office/Dictionary Summary: Polish Thesaurus Dictionary for OpenOffice.org Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_pl_PL_v2.dat @@ -231,7 +258,7 @@ %package pt License: GPL v2 or later Version: 20060817 -Release: 46 +Release: 82 Group: Productivity/Office/Dictionary Summary: Portuguese Thesaurus Dictionary for OpenOffice.org Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_pt_PT_v2.dat @@ -245,7 +272,7 @@ %package ro License: GPL v2 or later -Version: 20050526 +Version: 20080920 Release: 1 Group: Productivity/Office/Dictionary Summary: German Thesaurus Dictionary for OpenOffice.org @@ -261,7 +288,7 @@ %package ru License: LGPL v2.1 or later Version: 20061016 -Release: 1 +Release: 37 Group: Productivity/Office/Dictionary Summary: Russian Thesaurus Dictionary for OpenOffice.org Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_ru_RU_v2.dat @@ -275,7 +302,7 @@ %package sk License: BSD 3-Clause -Version: 20080404 +Version: 20080926 Release: 1 Group: Productivity/Office/Dictionary Summary: Slovak Thesaurus Dictionary for OpenOffice.org @@ -290,7 +317,7 @@ %package sl License: LGPL v2.1 or later -Version: 20080126 +Version: 20080601 Release: 1 Group: Productivity/Office/Dictionary Summary: Slovenian Thesaurus Dictionary for OpenOffice.org @@ -303,19 +330,59 @@ +%package sv +License: Public Domain, Freeware +Version: 20080609 +Release: 1 +Group: Productivity/Office/Dictionary +Summary: Swedish Thesaurus Dictionary for OpenOffice.org +Provides: OpenOffice_org:/usr/lib/ooo-2.0/share/dict/ooo/th_sv_SE_v2.dat +Provides: locale(OpenOffice_org:sv) + +%description sv +The Swedish thesaurus dictionary that can be used to look up for +synonyms and related words in the OpenOffice.org office suite. + + + %prep %setup -T -c # unpack sources for archive in %{S:0} %{S:1} %{S:2} %{S:3} %{S:4} \ %{S:5} %{S:6} %{S:7} %{S:8} %{S:9} \ %{S:10} %{S:11} %{S:12} %{S:13} %{S:14} \ - %{S:15} %{S:16} ; do + %{S:15} %{S:16} %{S:17} %{S:18} ; do name="${archive##*/}" name="${name%.tar.bz2}" install -m 755 -d $name tar -xjf "$archive" -C "$name" done # +# French dictionary +mv thes_fr_FR_v2_2-1 thes_fr_FR_v2 +# +# Greek dictionary +mv th_el thes_el_GR_v2 +# +# Romanian dictionary +mv th_ro_RO.3.3-test3 thes_ro_RO_v2 +mv thes_ro_RO_v2/README thes_ro_RO_v2/README_th_ro_RO_v2.txt +mv thes_ro_RO_v2/COPYING.GPL thes_ro_RO_v2/COPYING.GPL_th_ro_RO_v2.txt +mv thes_ro_RO_v2/th_ro_RO.dat thes_ro_RO_v2/th_ro_RO_v2.dat +mv thes_ro_RO_v2/th_ro_RO.idx thes_ro_RO_v2/th_ro_RO_v2.idx +rm thes_ro_RO_v2/*classic* +# +# Slovak dictionary +mv OOo-Thesaurus2-sk_SK thes_sk_SK_v2 +mv thes_sk_SK_v2/README_th_sk_SK.txt thes_sk_SK_v2/README_th_sk_SK_v2.txt +mv thes_sk_SK_v2/th_sk_SK.dat thes_sk_SK_v2/th_sk_SK_v2.dat +mv thes_sk_SK_v2/th_sk_SK.idx thes_sk_SK_v2/th_sk_SK_v2.idx +# +# Svedish dictionary +mv thes_sv_SE_v2/README_thes_sv_SE.txt thes_sv_SE_v2/README_thes_sv_SE_v2.txt +mv thes_sv_SE_v2/th_sv_SE.dat thes_sv_SE_v2/th_sv_SE_v2.dat +mv thes_sv_SE_v2/th_sv_SE.idx thes_sv_SE_v2/th_sv_SE_v2.idx +# # fix permissions find . -type f -exec chmod 644 {} \; @@ -340,125 +407,6 @@ %clean rm -rf $RPM_BUILD_ROOT -# bg - -%triggerin bg -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun bg -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# cs - -%triggerin cs -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun cs -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# de - -%triggerin de -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun de -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# de-CH - -%triggerin de-CH -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun de-CH -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# en - -%triggerin en -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun en -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# es - -%triggerin es -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun es -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# fr - -%triggerin fr -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun fr -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# ga - -%triggerin ga -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun ga -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# hu - -%triggerin hu -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun hu -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# nb - -%triggerin nb -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun nb -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# ne - -%triggerin ne -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun ne -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# pl - -%triggerin pl -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun pl -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# pt - -%triggerin pt -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun pt -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# ro - -%triggerin ro -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun ro -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# ru - -%triggerin ru -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun ru -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# sk - -%triggerin sk -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun sk -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true -# sl - -%triggerin sl -- perl, OpenOffice_org -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -s %{_datadir}/ooo/thesaurus || true - -%postun sl -test -x /usr/bin/perl -a -x /usr/sbin/ooinstdict && /usr/sbin/ooinstdict -r || true %files bg %defattr(-, root, root) @@ -492,6 +440,14 @@ %{_datadir}/ooo/thesaurus/th_de_CH_v2.dat %{_datadir}/ooo/thesaurus/th_de_CH_v2.idx +%files el +%defattr(-, root, root) +%doc thes_el_GR_v2/*.txt +%dir %{_datadir}/ooo +%dir %{_datadir}/ooo/thesaurus +%{_datadir}/ooo/thesaurus/th_el_GR_v2.dat +%{_datadir}/ooo/thesaurus/th_el_GR_v2.idx + %files en %defattr(-, root, root) %doc thes_en_US_v2/*.txt @@ -596,7 +552,20 @@ %{_datadir}/ooo/thesaurus/th_sl_SI_v2.dat %{_datadir}/ooo/thesaurus/th_sl_SI_v2.idx +%files sv +%defattr(-, root, root) +%doc thes_sv_SE_v2/*.txt +%dir %{_datadir}/ooo +%dir %{_datadir}/ooo/thesaurus +%{_datadir}/ooo/thesaurus/th_sv_SE_v2.dat +%{_datadir}/ooo/thesaurus/th_sv_SE_v2.idx + %changelog +* Mon Sep 29 2008 pmladek(a)suse.cz +- updated: French, Slovak, Romanian, Slovene +- added: Greek, Swedish +- removed obsolete triggerin and postun scripts; OOo-3.0 does not need + it anymore * Mon Apr 14 2008 lmichnovic(a)suse.cz - update: bg_BG, cs_CZ, de_DE, nb_NO, sk_SK - new packages: de_CH, ga_IE, hu_HU, ro_RO, ru_RU, sl_SI ++++++ thes_sl_SI_v2.tar.bz2 ++++++ ++++ 6277 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 kdebase4-workspace
by root＠Hilbert.suse.de 29 Sep '08

29 Sep '08

Hello community, here is the log from the commit of package kdebase4-workspace checked in at Mon Sep 29 18:32:40 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-09-25 13:15:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-09-29 18:31:59.067923000 +0200 @@ -1,0 +2,17 @@ +Sun Sep 28 17:47:54 CEST 2008 - stbinner(a)suse.de + +- fix wallpaper configuration (bnc#429971) + +------------------------------------------------------------------- +Thu Sep 25 18:59:04 CEST 2008 - dmueller(a)suse.de + +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php + +------------------------------------------------------------------- +Thu Sep 25 17:04:02 CEST 2008 - llunak(a)suse.cz + +- disable detecting monitor changes since X can't detect them + automatically and can't take polling that well either(bnc#427645) + +------------------------------------------------------------------- kdebase4-workspace.changes: same change Old: ---- kdebase-workspace-4.1.1.tar.bz2 New: ---- kdebase-workspace-4.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.M24160/_old 2008-09-29 18:32:22.000000000 +0200 +++ /var/tmp/diff_new_pack.M24160/_new 2008-09-29 18:32:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 4.1.1) +# spec file for package kdebase4-wallpapers (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.1.1 -Release: 16 +Version: 4.1.2 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -66,6 +66,14 @@ /usr/share/wallpapers %changelog +* Sun Sep 28 2008 stbinner(a)suse.de +- fix wallpaper configuration (bnc#429971) +* Thu Sep 25 2008 dmueller(a)suse.de +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php +* Thu Sep 25 2008 llunak(a)suse.cz +- disable detecting monitor changes since X can't detect them + automatically and can't take polling that well either(bnc#427645) * Thu Sep 25 2008 stbinner(a)suse.de - add diffs to plasma-4.1-openSUSE branch for backports and more: * allow to set folder view as desktop activity ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.M24160/_old 2008-09-29 18:32:22.000000000 +0200 +++ /var/tmp/diff_new_pack.M24160/_new 2008-09-29 18:32:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 4.1.1) +# spec file for package kdebase4-workspace (Version 4.1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,8 +33,8 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.1.1 -Release: 16 +Version: 4.1.2 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 Source1: rediff-plasma.sh Source2: titlebar_decor.png @@ -752,6 +752,14 @@ /usr/share/kde4/servicetypes/plasma-wallpaper.desktop %changelog +* Sun Sep 28 2008 stbinner(a)suse.de +- fix wallpaper configuration (bnc#429971) +* Thu Sep 25 2008 dmueller(a)suse.de +- update to 4.1.2 + * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php +* Thu Sep 25 2008 llunak(a)suse.cz +- disable detecting monitor changes since X can't detect them + automatically and can't take polling that well either(bnc#427645) * Thu Sep 25 2008 stbinner(a)suse.de - add diffs to plasma-4.1-openSUSE branch for backports and more: * allow to set folder view as desktop activity ++++++ 4_1_BRANCH.diff ++++++ ++++ 2345 lines (skipped) ++++ between KDE/kdebase4-workspace/4_1_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/4_1_BRANCH.diff ++++++ kdebase-workspace-4.1.1.tar.bz2 -> kdebase-workspace-4.1.2.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.1.1.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase-workspace-4.1.2.tar.bz2 differ: byte 11, line 1 ++++++ plasma.diff ++++++ --- /var/tmp/diff_new_pack.M24160/_old 2008-09-29 18:32:23.000000000 +0200 +++ /var/tmp/diff_new_pack.M24160/_new 2008-09-29 18:32:23.000000000 +0200 @@ -11522,7 +11522,7 @@ QList<QString> applications; - applications << "konqbrowser" << "kmail" << "systemsettings" << "dolphin"; + applications << "MozillaFirefox.desktop" << "kde4-Kontact.desktop" -+ << "writer.desktop" << "kde-amarok.desktop" << "kde-digikam.desktop" << "kde4-dolphin.desktop" ++ << "writer.desktop" << "kde4-amarok.desktop" << "kde-digikam.desktop" << "kde4-dolphin.desktop" + << "kde4-systemsettings.desktop" << "kde4-Help.desktop" << "kde4-konsole.desktop"; QList<QString> desktopFiles; @@ -16349,7 +16349,39 @@ //only move when the mouse cursor is out of the controller to avoid an endless reposition cycle if (geometry().contains(event->globalPos())) { return; -@@ -771,7 +922,10 @@ +@@ -740,6 +891,7 @@ + d->startDragPos.x() - d->minimumHeight > + screenGeom.left()) { + move(mapToGlobal(event->pos()).x() - d->startDragPos.x(), pos().y()); ++ d->sizeTool->setText(i18n("Width: %1", screenGeom.left() + (mapToGlobal(event->pos()).x() - d->startDragPos.x()))); + //FIXME: Panel resize deferred, should be here + } + break; +@@ -748,6 +900,7 @@ + d->startDragPos.x() + width() + d->minimumHeight < + screenGeom.right()) { + move(mapToGlobal(event->pos()).x() - d->startDragPos.x(), pos().y()); ++ d->sizeTool->setText(i18n("Width: %1", screenGeom.right() - (mapToGlobal(event->pos()).x() - d->startDragPos.x()) - width() + 1)); + } + break; + case Plasma::TopEdge: +@@ -755,6 +908,7 @@ + d->startDragPos.y() - d->minimumHeight > + screenGeom.top()) { + move(pos().x(), mapToGlobal(event->pos()).y() - d->startDragPos.y()); ++ d->sizeTool->setText(i18n("Height: %1", screenGeom.top() + (mapToGlobal(event->pos()).y() - d->startDragPos.y()))); + } + break; + case Plasma::BottomEdge: +@@ -763,6 +917,7 @@ + d->startDragPos.y() + height() + d->minimumHeight < + screenGeom.bottom()) { + move(pos().x(), mapToGlobal(event->pos()).y() - d->startDragPos.y()); ++ d->sizeTool->setText(i18n("Height: %1", screenGeom.bottom() - (mapToGlobal(event->pos()).y() - d->startDragPos.y()) - height() + 1)); + } + break; + } +@@ -771,7 +926,10 @@ void PanelController::focusOutEvent(QFocusEvent * event) { Q_UNUSED(event) ++++++ plasma-libs.diff ++++++ --- /var/tmp/diff_new_pack.M24160/_old 2008-09-29 18:32:23.000000000 +0200 +++ /var/tmp/diff_new_pack.M24160/_new 2008-09-29 18:32:23.000000000 +0200 @@ -247,7 +247,7 @@ + Q_UNUSED(config); +} + -+void Wallpaper::save(KConfigGroup config) ++void Wallpaper::save(KConfigGroup &config) +{ + Q_UNUSED(config); +} @@ -1844,7 +1844,7 @@ + * This method is called when settings need to be saved. + * @param config Config group to save settings + **/ -+ virtual void save(KConfigGroup config); ++ virtual void save(KConfigGroup &config); + + /** + * Returns widget for configuration dialog. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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