November 2008 - openSUSE Commits - openSUSE Mailing Lists

commit f-spot
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package f-spot checked in at Fri Nov 28 16:35:46 CET 2008. -------- --- GNOME/f-spot/f-spot.changes 2008-11-06 12:26:45.000000000 +0100 +++ f-spot/f-spot.changes 2008-11-28 16:34:57.322816000 +0100 @@ -0,0 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 24 14:20:56 CET 2008 - sdelcroix(a)novell.com + +- Backporting bugfixes from trunk + + prefidialog.patch, fix a crasher (bgo#560265) + + ellipsize.patch, no longer ellipsize the menu entries + + hashjob.patch: provide feedback on the hashjob dialog (bgo#558671), + hash new versions on SaveVersion (). + calling whatdependson for head-i586 New: ---- ellipsize.patch hashjob.patch prefdialog.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ f-spot.spec ++++++ --- /var/tmp/diff_new_pack.V10776/_old 2008-11-28 16:35:13.000000000 +0100 +++ /var/tmp/diff_new_pack.V10776/_new 2008-11-28 16:35:13.000000000 +0100 @@ -30,7 +30,7 @@ AutoReqProv: on Requires: dcraw Version: 0.5.0.3 -Release: 4 +Release: 5 Summary: GNOME Photo Management Application Url: http://www.gnome.org/projects/f-spot/ Source: %{name}-%{version}.tar.bz2 @@ -40,6 +40,9 @@ Patch3: file_import.patch Patch4: bgo557793.patch Patch5: theme.patch +Patch6: prefdialog.patch +Patch7: ellipsize.patch +Patch8: hashjob.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mono-core nautilus-cd-burner dbus-1-x11 libgphoto2 sqlite2 Provides: %{name}-devel = %{version}-%{release} @@ -76,6 +79,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build autoreconf -f -i @@ -123,6 +129,12 @@ %define __find_provides env sh -c 'filelist=($(grep -v -E "%{_libdir}/%{name}/extensions|Mono.Addins")) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' %changelog +* Mon Nov 24 2008 sdelcroix(a)novell.com +- Backporting bugfixes from trunk + + prefidialog.patch, fix a crasher (bgo#560265) + + ellipsize.patch, no longer ellipsize the menu entries + + hashjob.patch: provide feedback on the hashjob dialog (bgo#558671), + hash new versions on SaveVersion (). * Thu Nov 06 2008 sdelcroix(a)novell.com - Backporting bugfixes from trunk + file_import.patch, load images from the right mass-storage camera if ++++++ ellipsize.patch ++++++ >From bfc9c8925a7d34560e1669040dbf5e15076bb6fc Mon Sep 17 00:00:00 2001 From: sdelcroix <sdelcroix@772769d8-d925-0410-89eb-a6ffa0d40526> Date: Sun, 23 Nov 2008 12:20:34 +0000 Subject: [PATCH] 2008-09-25 Stephane Delcroix <sdelcroix(a)novell.com> * src/PhotoVersionMenu.cs: no longer Ellipsize items * src/InfoBox.cs: replace the OptionMenu by a ComboBox, Ellipsize the text. git-svn-id: svn+ssh://svn.gnome.org/svn/f-spot/branches/FSPOT_0_5_0_STABLE@4611 772769d8-d925-0410-89eb-a6ffa0d40526 --- ChangeLog | 5 +++ src/PhotoVersionMenu.cs | 2 - src/Widgets/InfoBox.cs | 64 ++++++++++++++++++++++++++++++----------------- 3 files changed, 46 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e62445..6bb4c95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-09-25 Stephane Delcroix <sdelcroix(a)novell.com> + + * src/PhotoVersionMenu.cs: no longer Ellipsize items + * src/InfoBox.cs: replace the OptionMenu by a ComboBox, Ellipsize the text. + 2008-11-18 Stephane Delcroix <sdelcroix(a)novell.com> * src/UI.Dialog/PreferenceDialog.cs: handle the case where the diff --git a/src/PhotoVersionMenu.cs b/src/PhotoVersionMenu.cs index 5930125..7c7d734 100644 --- a/src/PhotoVersionMenu.cs +++ b/src/PhotoVersionMenu.cs @@ -56,7 +56,6 @@ public class PhotoVersionMenu : Menu { menu_item.Show (); menu_item.Sensitive = true; ((Gtk.Label)menu_item.Child).UseUnderline = false; - ((Gtk.Label)menu_item.Child).Ellipsize = Pango.EllipsizeMode.End; menu_item.Activated += new EventHandler (HandleMenuItemActivated); item_infos [i ++] = new MenuItemInfo (menu_item, id); @@ -68,7 +67,6 @@ public class PhotoVersionMenu : Menu { MenuItem no_edits_menu_item = new MenuItem (Mono.Unix.Catalog.GetString ("(No Edits)")); no_edits_menu_item.Show (); no_edits_menu_item.Sensitive = false; - ((Gtk.Label)no_edits_menu_item.Child).Ellipsize = Pango.EllipsizeMode.End; Append (no_edits_menu_item); } } diff --git a/src/Widgets/InfoBox.cs b/src/Widgets/InfoBox.cs index 5c61322..767185a 100644 --- a/src/Widgets/InfoBox.cs +++ b/src/Widgets/InfoBox.cs @@ -103,7 +103,8 @@ namespace FSpot.Widgets private Label name_value_label; private Label version_label; - private OptionMenu version_option_menu; + private ListStore version_list; + private ComboBox version_combo; private Label date_label; private Label date_value_label; @@ -120,12 +121,6 @@ namespace FSpot.Widgets private TagView tag_view; private string default_exposure_string; - private void HandleVersionIdChanged (PhotoVersionMenu menu) - { - if (VersionIdChanged != null) - VersionIdChanged (this, menu.VersionId); - } - private void HandleRatingChanged (object o, EventArgs e) { MainWindow.Toplevel.HandleRatingMenuSelected ((o as Widgets.Rating).Value); @@ -220,9 +215,16 @@ namespace FSpot.Widgets date_value_label = AttachLabel (info_table, 2, name_value_label); size_value_label = AttachLabel (info_table, 3, name_value_label); exposure_value_label = AttachLabel (info_table, 4, name_value_label); - - version_option_menu = new OptionMenu (); - info_table.Attach (version_option_menu, 1, 2, 1, 2, AttachOptions.Fill, AttachOptions.Fill, TABLE_XPADDING, TABLE_YPADDING); + + version_list = new ListStore (typeof (uint), typeof (string)); + version_combo = new ComboBox (); + CellRendererText version_name_cell = new CellRendererText (); + version_name_cell.Ellipsize = Pango.EllipsizeMode.End; + version_combo.PackStart (version_name_cell, true); + version_combo.SetCellDataFunc (version_name_cell, new CellLayoutDataFunc (VersionNameCellFunc)); + version_combo.Model = version_list; + version_combo.Changed += OnVersionComboChanged; + info_table.Attach (version_combo, 1, 2, 1, 2, AttachOptions.Fill, AttachOptions.Fill, TABLE_XPADDING, TABLE_YPADDING); date_value_label.Text = Environment.NewLine; exposure_value_label.Text = Environment.NewLine; @@ -435,21 +437,18 @@ namespace FSpot.Widgets version_label.Visible = true; - version_option_menu.Visible = true; - PhotoVersionMenu menu = new PhotoVersionMenu (photo); - menu.VersionIdChanged += new PhotoVersionMenu.VersionIdChangedHandler (HandleVersionIdChanged); - menu.WidthRequest = version_option_menu.Allocation.Width; - version_option_menu.Menu = menu; - - uint i = 0; + version_combo.Visible = true; + version_list.Clear (); + version_combo.Changed -= OnVersionComboChanged; + int i = 0; foreach (uint version_id in photo.VersionIds) { - if (version_id == photo.DefaultVersionId) { - // FIXME GTK# why not just .History = i ? - version_option_menu.SetHistory (i); - break; - } + version_list.AppendValues (version_id, (photo.GetVersion (version_id) as PhotoVersion).Name); + if (version_id == photo.DefaultVersionId) + version_combo.Active = i; i++; } + version_combo.Changed += OnVersionComboChanged; + if (show_tags) tag_view.Current = photo; rating_label.Visible = show_rating; @@ -461,6 +460,25 @@ namespace FSpot.Widgets Show (); } + void VersionNameCellFunc (CellLayout cell_layout, CellRenderer cell, TreeModel tree_model, TreeIter iter) + { + string name = (string)tree_model.GetValue (iter, 1); + (cell as CellRendererText).Text = name; + } + + + void OnVersionComboChanged (object o, EventArgs e) + { + ComboBox combo = o as ComboBox; + if (combo == null) + return; + + TreeIter iter; + + if (combo.GetActiveIter (out iter)) + VersionIdChanged (this, (uint)version_list.GetValue (iter, 0)); + } + private void UpdateMultiple () { histogram_expander.Visible = false; @@ -469,7 +487,7 @@ namespace FSpot.Widgets name_value_label.Text = String.Format(Catalog.GetString("{0} Photos"), Photos.Length); version_label.Visible = false; - version_option_menu.Visible = false; + version_combo.Visible = false; exposure_label.Visible = false; exposure_value_label.Visible = false; -- 1.6.0.2 ++++++ hashjob.patch ++++++ >From 51a917d7bbba286547ac5be7e54d7d2d4fa55414 Mon Sep 17 00:00:00 2001 From: sdelcroix <sdelcroix@772769d8-d925-0410-89eb-a6ffa0d40526> Date: Mon, 24 Nov 2008 13:10:54 +0000 Subject: [PATCH] yet another round of fixes for md5 2008-11-24 Lorenzo Milesi <maxxer(a)yetopen.it> * src/Core/Photo.cs: ensure md5 is hashed when creating new version with SaveVersion. 2008-11-24 Lorenzo Milesi <maxxer(a)yetopen.it> * HashJob/HashJob.cs: check for missing hashes in photo versions, and check for empty strings also, not only for null (to work on db 16.3). display some feedback when pressing buttons. * HashJob/HashJob.addin.xml: bump ver. fix bgo#558671. git-svn-id: svn+ssh://svn.gnome.org/svn/f-spot/branches/FSPOT_0_5_0_STABLE@4616 772769d8-d925-0410-89eb-a6ffa0d40526 --- ChangeLog | 5 +++ extensions/Tools/ChangeLog | 7 +++++ extensions/Tools/HashJob/HashJob.addin.xml | 2 +- extensions/Tools/HashJob/HashJob.cs | 38 +++++++++++++++++++++++++--- src/Core/Photo.cs | 12 +-------- 5 files changed, 48 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6bb4c95..545004f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-11-24 Lorenzo Milesi <maxxer(a)yetopen.it> + + * src/Core/Photo.cs: ensure md5 is hashed when creating new version + with SaveVersion. + 2008-09-25 Stephane Delcroix <sdelcroix(a)novell.com> * src/PhotoVersionMenu.cs: no longer Ellipsize items diff --git a/extensions/Tools/ChangeLog b/extensions/Tools/ChangeLog index 7c92594..a573ef4 100644 --- a/extensions/Tools/ChangeLog +++ b/extensions/Tools/ChangeLog @@ -1,3 +1,10 @@ +2008-11-24 Lorenzo Milesi <maxxer(a)yetopen.it> + + * HashJob/HashJob.cs: check for missing hashes in photo versions, and + check for empty strings also, not only for null (to work on db 16.3). + display some feedback when pressing buttons. + * HashJob/HashJob.addin.xml: bump ver. fix bgo#558671. + 2008-10-17 Stephane Delcroix <sdelcroix(a)novell.com> * HashJob/: new HashJob extension diff --git a/extensions/Tools/HashJob/HashJob.addin.xml b/extensions/Tools/HashJob/HashJob.addin.xml index f70af7a..fa3d865 100644 --- a/extensions/Tools/HashJob/HashJob.addin.xml +++ b/extensions/Tools/HashJob/HashJob.addin.xml @@ -1,6 +1,6 @@ <Addin namespace="FSpot" id="HashJob" - version="0.5.0.0" + version="0.5.0.1" description="Process your photo collection for duplicate detection" author="Stephane Delcroix" url="http://f-spot.org/Extensions" diff --git a/extensions/Tools/HashJob/HashJob.cs b/extensions/Tools/HashJob/HashJob.cs index 7aecd53..696bcb4 100644 --- a/extensions/Tools/HashJob/HashJob.cs +++ b/extensions/Tools/HashJob/HashJob.cs @@ -15,7 +15,6 @@ using Mono.Data.SqliteClient; using Gtk; using FSpot; -using FSpot.UI.Dialog; using FSpot.Extensions; using FSpot.Jobs; @@ -31,14 +30,37 @@ namespace HashJobExtension { public class HashJobDialog : Dialog { + private Gtk.Label status_label; public void ShowDialog () { + // This query is not very fast, but it's a 'one-time' so don't care much... + SqliteDataReader reader = FSpot.Core.Database.Database.Query ( + "SELECT COUNT(*) FROM photos p WHERE md5_sum IS NULL OR md5_sum = '' OR EXISTS " + + "(SELECT * FROM photo_versions pv WHERE p.id=pv.photo_id AND version_id <> '1' AND " + + "(pv.md5_sum IS NULL OR pv.md5_sum = ''))"); + reader.Read (); + uint missing_md5 = Convert.ToUInt32 (reader[0]); + reader.Close (); + + reader = FSpot.Core.Database.Database.Query (String.Format ( + "SELECT COUNT(*) FROM jobs WHERE job_type = '{0}' ", typeof(FSpot.Jobs.CalculateHashJob).ToString ())); + reader.Read (); + uint active_jobs = Convert.ToUInt32 (reader[0]); + reader.Close (); + VBox.Spacing = 6; - Label l = new Label ("In order to detect duplicates on pictures you imported before f-spot 0.5.0, f-spot need to analyze your image collection. This is is not done by default as it's time consuming. You can Start or Pause this update process using this dialog."); + Label l = new Label (Catalog.GetString ("In order to detect duplicates on pictures you imported before 0.5.0, " + + "F-Spot needs to analyze your image collection. This is is not done by default as it's time consuming. " + + "You can Start or Pause this update process using this dialog.")); l.LineWrap = true; VBox.PackStart (l); + Label l2 = new Label (Catalog.GetString (String.Format ("You currently have {0} photos needing md5 calculation, and {1} pending jobs", + missing_md5, active_jobs))); + l2.LineWrap = true; + VBox.PackStart (l2); + Button execute = new Button (Stock.Execute); execute.Clicked += HandleExecuteClicked; VBox.PackStart (execute); @@ -47,11 +69,13 @@ namespace HashJobExtension { stop.Clicked += HandleStopClicked; VBox.PackStart (stop); + status_label = new Label (); + VBox.PackStart (status_label); + this.AddButton ("_Close", ResponseType.Close); this.Response += HandleResponse; ShowAll (); - } void HandleResponse (object obj, ResponseArgs args) @@ -66,18 +90,24 @@ namespace HashJobExtension { void HandleExecuteClicked (object o, EventArgs e) { - SqliteDataReader reader = FSpot.Core.Database.Database.Query ("SELECT id from photos WHERE md5_sum IS NULL"); + SqliteDataReader reader = FSpot.Core.Database.Database.Query ( + "SELECT id FROM photos p WHERE md5_sum IS NULL OR md5_sum = '' OR EXISTS " + + "(SELECT * FROM photo_versions pv WHERE p.id=pv.photo_id AND version_id <> '1' AND " + + "(pv.md5_sum IS NULL OR pv.md5_sum = '') )"); FSpot.Core.Database.Database.BeginTransaction (); while (reader.Read ()) FSpot.Jobs.CalculateHashJob.Create (FSpot.Core.Database.Jobs, Convert.ToUInt32 (reader[0])); reader.Close (); FSpot.Core.Database.Database.CommitTransaction (); + status_label.Text = Catalog.GetString ("Processing images..."); } void HandleStopClicked (object o, EventArgs e) { FSpot.Core.Database.Database.ExecuteNonQuery (String.Format ("DELETE FROM jobs WHERE job_type = '{0}'", typeof(FSpot.Jobs.CalculateHashJob).ToString ())); + status_label.Text = Catalog.GetString ("Stopped"); } + } } diff --git a/src/Core/Photo.cs b/src/Core/Photo.cs index 0fdfd6b..9493bb5 100644 --- a/src/Core/Photo.cs +++ b/src/Core/Photo.cs @@ -359,6 +359,7 @@ namespace FSpot using (Stream stream = System.IO.File.OpenWrite (version_path)) { img.Save (buffer, stream); } + (GetVersion (version) as PhotoVersion).MD5Sum = GenerateMD5 (VersionUri (version)); FSpot.ThumbnailGenerator.Create (version_path).Dispose (); DefaultVersionId = version; } catch (System.Exception e) { @@ -446,18 +447,7 @@ namespace FSpot XferOverwriteMode.Abort, delegate (Gnome.Vfs.XferProgressInfo info) {return 1;}); - // Mono.Unix.Native.Stat stat; - // int stat_err = Mono.Unix.Native.Syscall.stat (original_path, out stat); - // File.Copy (original_path, new_path); FSpot.ThumbnailGenerator.Create (new_uri).Dispose (); - // - // if (stat_err == 0) - // try { - // Mono.Unix.Native.Syscall.chown(new_path, Mono.Unix.Native.Syscall.getuid (), stat.st_gid); - // } catch (Exception) {} - // - } else { - md5_sum = Photo.GenerateMD5 (new_uri); } highest_version_id ++; -- 1.6.0.2 ++++++ prefdialog.patch ++++++ >From c8915bc9b92aa56a71117fe9fe41421c546865b3 Mon Sep 17 00:00:00 2001 From: sdelcroix <sdelcroix@772769d8-d925-0410-89eb-a6ffa0d40526> Date: Tue, 18 Nov 2008 20:14:14 +0000 Subject: [PATCH] 2008-11-18 Stephane Delcroix <sdelcroix(a)novell.com> * src/UI.Dialog/PreferenceDialog.cs: handle the case where the screensaver_tag from gconf no longer exists. Fix bgo #560265. git-svn-id: svn+ssh://svn.gnome.org/svn/f-spot/branches/FSPOT_0_5_0_STABLE@4599 772769d8-d925-0410-89eb-a6ffa0d40526 --- ChangeLog | 5 +++++ src/TagStore.cs | 1 - src/UI.Dialog/PreferenceDialog.cs | 11 +++-------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 951e9aa..1e62445 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-11-18 Stephane Delcroix <sdelcroix(a)novell.com> + + * src/UI.Dialog/PreferenceDialog.cs: handle the case where the + screensaver_tag from gconf no longer exists. Fix bgo #560265. + 2008-11-06 Stephane Delcroix <sdelcroix(a)novell.com> * src/main.cs: diff --git a/src/TagStore.cs b/src/TagStore.cs index 8d570a5..b4e0e74 100644 --- a/src/TagStore.cs +++ b/src/TagStore.cs @@ -129,7 +129,6 @@ public class TagStore : DbStore { foreach (Tag t in this.item_cache.Values) if (t.Id == id) return t; - return null; } diff --git a/src/UI.Dialog/PreferenceDialog.cs b/src/UI.Dialog/PreferenceDialog.cs index a83056f..c1857b8 100644 --- a/src/UI.Dialog/PreferenceDialog.cs +++ b/src/UI.Dialog/PreferenceDialog.cs @@ -327,18 +327,13 @@ case Preferences.COLOR_MANAGEMENT_ENABLED: use_x_profile_check.Active = active; break; case Preferences.SCREENSAVER_TAG: - try { - screensaver_tag = Preferences.Get<int> (key); - } catch (System.Exception e) { - Console.WriteLine (e); - screensaver_tag = 0; - } - if (screensaver_tag == 0) { + screensaver_tag = Preferences.Get<int> (key); + Tag t = MainWindow.Toplevel.Database.Tags.GetTagById (screensaver_tag); + if (screensaver_tag == 0 || t == null) { screensaverall_radio.Active = true; tag_button.Sensitive = false; } else { screensavertagged_radio.Active = true; - Tag t = MainWindow.Toplevel.Database.Tags.GetTagById (screensaver_tag); tag_button.Label = t.Name; } break; -- 1.6.0.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 at-spi
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package at-spi checked in at Fri Nov 28 16:34:31 CET 2008. -------- --- GNOME/at-spi/at-spi.changes 2008-10-13 14:59:03.000000000 +0200 +++ at-spi/at-spi.changes 2008-11-25 17:54:43.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 25 17:22:26 CET 2008 - sbrabec(a)suse.cz + +- Supplement gtk2-32bit/gtk2-64bit in baselibs.conf (bnc#354164). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at-spi.spec ++++++ --- /var/tmp/diff_new_pack.DI8997/_old 2008-11-28 16:34:18.000000000 +0100 +++ /var/tmp/diff_new_pack.DI8997/_new 2008-11-28 16:34:18.000000000 +0100 @@ -35,7 +35,7 @@ Group: Development/Libraries/GNOME AutoReqProv: on Version: 1.24.0 -Release: 1 +Release: 2 Requires: %{name}-lang = %{version} Summary: Assistive Technology Service Provider Interface Source: %{name}-%{version}.tar.bz2 @@ -151,6 +151,8 @@ %doc %{_docdir}/%{name}/reference %changelog +* Tue Nov 25 2008 sbrabec(a)suse.cz +- Supplement gtk2-32bit/gtk2-64bit in baselibs.conf (bnc#354164). * Thu Oct 09 2008 sbrabec(a)suse.cz - Signed-off. * Wed Oct 01 2008 sshaw(a)decriptor.com @@ -176,7 +178,7 @@ - Update to version 1.23.3: + Bugs fixed: bgo#532887, bgo#498668, bgo#431053, bgo#451553, bgo#520490, bgo#521667, and bgo#522356. -* Thu Apr 10 2008 maw(a)suse.de +* Wed Apr 09 2008 maw(a)suse.de - Update to version 1.22.1: + Bug fixed: bgo#520490 + Updated translations. @@ -190,11 +192,11 @@ * Wed Jan 23 2008 maw(a)suse.de - Update to version 1.21.5: + Bugs (bugzilla.gnome.org) fixed: #474480 and #503091. -* Tue Dec 18 2007 maw(a)suse.de +* Mon Dec 17 2007 maw(a)suse.de - Update to version 1.21.3: + Bugs (bugzilla.gnome.org) fixed: #446277, #493547, #326516, [#491805], #492469, and #490202. -* Sat Nov 24 2007 maw(a)suse.de +* Fri Nov 23 2007 maw(a)suse.de - Update to version 1.21.1: + Bugs (bugzilla.gnome.org) fixed: #490205, #490202, and #489273. * Mon Sep 17 2007 sbrabec(a)suse.cz @@ -241,7 +243,7 @@ - Fixed getAttributes APIs - Export Hyperlink interface for AtkHyperlinkImpl peers - Aggregate Document interface -* Tue Aug 01 2006 gekker(a)suse.de +* Mon Jul 31 2006 gekker(a)suse.de - Update to version 1.7.10 * New method Selection::deselectChild. RFE #326535. * Fri Jul 21 2006 gekker(a)suse.de @@ -309,7 +311,7 @@ - fix a threading deadlock in event emission (#157561) * Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Tue Sep 06 2005 gekker(a)suse.de +* Mon Sep 05 2005 gekker(a)suse.de - Update to version 1.6.6 * Mon Sep 05 2005 gekker(a)suse.de - Update to version 1.6.5 (GNOME 2.12) @@ -350,21 +352,21 @@ - Prefix really changed to /opt/gnome. * Tue Jul 15 2003 sbrabec(a)suse.cz - GNOME prefix change to /opt/gnome. -* Mon Jul 14 2003 hhetter(a)suse.de +* Sun Jul 13 2003 hhetter(a)suse.de - %%_lib fixes * Tue Jun 24 2003 sbrabec(a)suse.cz - Fixed neededforbuild. - Branched at-spi-devel and at-spi-doc. - Prefix clash fixes - gtk-doc, orbit2 modules and gtk modules. - Standard docs moved from yelp directory. -* Tue May 27 2003 ro(a)suse.de +* Mon May 26 2003 ro(a)suse.de - add bonobo-server to filelist - remove unpackaged/moved files from buildroot * Wed Feb 26 2003 sbrabec(a)suse.cz - FHS fix. * Fri Feb 07 2003 hhetter(a)suse.de - updated to version 1.1.8 [GNOME 2.2.0] -* Tue Nov 12 2002 ro(a)suse.de +* Mon Nov 11 2002 ro(a)suse.de - changed neededforbuild <xf86 xdevel> to <x-devel-packages> * Fri Sep 27 2002 ro(a)suse.de - Added alsa alsa-devel to neededforbuild (esound) ++++++ baselibs.conf ++++++ at-spi supplements "packageand(at-spi:gtk2-<targettype>)" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-storage
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package yast2-storage checked in at Fri Nov 28 16:33:49 CET 2008. -------- --- yast2-storage/yast2-storage.changes 2008-11-28 12:15:35.000000000 +0100 +++ yast2-storage/yast2-storage.changes 2008-11-28 15:21:05.213977000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 28 14:59:36 CET 2008 - aschnell(a)suse.de + +- ignore volume label for hfs since there is no tool to set it + (bnc #447782) +- 2.17.58 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-storage-2.17.57.tar.bz2 New: ---- yast2-storage-2.17.58.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.JM5712/_old 2008-11-28 16:33:09.000000000 +0100 +++ /var/tmp/diff_new_pack.JM5712/_new 2008-11-28 16:33:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.17.57) +# spec file for package yast2-storage (Version 2.17.58) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-storage -Version: 2.17.57 +Version: 2.17.58 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.17.57.tar.bz2 +Source0: yast2-storage-2.17.58.tar.bz2 Prefix: /usr BuildRequires: blocxx-devel boost-devel docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-perl-bindings yast2-testsuite Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid multipath-tools kpartx cryptsetup @@ -57,7 +57,7 @@ Arvin Schnell <aschnell(a)suse.de> %prep -%setup -n yast2-storage-2.17.57 +%setup -n yast2-storage-2.17.58 %build %{prefix}/bin/y2tool y2autoconf @@ -183,6 +183,10 @@ %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description %changelog * Fri Nov 28 2008 aschnell(a)suse.de +- ignore volume label for hfs since there is no tool to set it + (bnc #447782) +- 2.17.58 +* Fri Nov 28 2008 aschnell(a)suse.de - fixed comparisons of libstorage backup states (bnc #438076) - 2.17.57 * Thu Nov 27 2008 locilka(a)suse.cz ++++++ yast2-storage-2.17.57.tar.bz2 -> yast2-storage-2.17.58.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.57/configure new/yast2-storage-2.17.58/configure --- old/yast2-storage-2.17.57/configure 2008-11-28 12:12:12.000000000 +0100 +++ new/yast2-storage-2.17.58/configure 2008-11-28 15:03:31.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-storage 2.17.57. +# Generated by GNU Autoconf 2.61 for yast2-storage 2.17.58. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='yast2-storage' PACKAGE_TARNAME='yast2-storage' -PACKAGE_VERSION='2.17.57' -PACKAGE_STRING='yast2-storage 2.17.57' +PACKAGE_VERSION='2.17.58' +PACKAGE_STRING='yast2-storage 2.17.58' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1449,7 +1449,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-storage 2.17.57 to adapt to many kinds of systems. +\`configure' configures yast2-storage 2.17.58 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1520,7 +1520,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-storage 2.17.57:";; + short | recursive ) echo "Configuration of yast2-storage 2.17.58:";; esac cat <<\_ACEOF @@ -1630,7 +1630,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-storage configure 2.17.57 +yast2-storage configure 2.17.58 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1644,7 +1644,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-storage $as_me 2.17.57, which was +It was created by yast2-storage $as_me 2.17.58, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2465,7 +2465,7 @@ # Define the identity of the package. PACKAGE='yast2-storage' - VERSION='2.17.57' + VERSION='2.17.58' cat >>confdefs.h <<_ACEOF @@ -2693,7 +2693,7 @@ -VERSION="2.17.57" +VERSION="2.17.58" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschnell(a)suse.de>" @@ -21746,7 +21746,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-storage $as_me 2.17.57, which was +This file was extended by yast2-storage $as_me 2.17.58, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21799,7 +21799,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-storage config.status 2.17.57 +yast2-storage config.status 2.17.58 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.57/configure.in new/yast2-storage-2.17.58/configure.in --- old/yast2-storage-2.17.57/configure.in 2008-11-28 12:11:57.000000000 +0100 +++ new/yast2-storage-2.17.58/configure.in 2008-11-28 15:03:16.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-storage, 2.17.57, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 2.17.58, http://bugs.opensuse.org/, yast2-storage) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.57" +VERSION="2.17.58" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschnell(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.57/libstorage/src/Volume.cc new/yast2-storage-2.17.58/libstorage/src/Volume.cc --- old/yast2-storage-2.17.57/libstorage/src/Volume.cc 2008-11-25 11:02:15.000000000 +0100 +++ new/yast2-storage-2.17.58/libstorage/src/Volume.cc 2008-11-28 15:01:29.000000000 +0100 @@ -472,7 +472,9 @@ i = m.find( "LABEL" ); if( i != m.end() ) { - label = orig_label = i->second; + // ignore label for hfs since we cannot set it (bnc #447782) + if (fs != HFS) + label = orig_label = i->second; b << " label:\"" << label << "\""; list<string>::iterator i = find_if( alt_names.begin(), alt_names.end(), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.57/VERSION new/yast2-storage-2.17.58/VERSION --- old/yast2-storage-2.17.57/VERSION 2008-11-28 12:05:42.000000000 +0100 +++ new/yast2-storage-2.17.58/VERSION 2008-11-28 14:59:29.000000000 +0100 @@ -1 +1 @@ -2.17.57 +2.17.58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package yast2-network checked in at Fri Nov 28 16:33:46 CET 2008. -------- --- yast2-network/yast2-network.changes 2008-11-28 12:09:51.000000000 +0100 +++ yast2-network/yast2-network.changes 2008-11-28 15:05:51.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Nov 28 14:58:43 CET 2008 - mzugec(a)suse.cz + +- support for portnumber option (fate#304080) +- 2.17.59 + +------------------------------------------------------------------- +Thu Nov 27 11:21:48 CET 2008 - kmachalkova(a)suse.cz + +- Removed source of UI syntax error in ISDN - invalid widget ID + (bnc#446346) +- Make IP/Netmask/Hostname widgets h-stretched (bnc#447897) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-network-2.17.58.tar.bz2 New: ---- yast2-network-2.17.59.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.UK5604/_old 2008-11-28 16:33:08.000000000 +0100 +++ /var/tmp/diff_new_pack.UK5604/_new 2008-11-28 16:33:08.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.17.58) +# spec file for package yast2-network (Version 2.17.59) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-network -Version: 2.17.58 +Version: 2.17.59 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.17.58.tar.bz2 +Source0: yast2-network-2.17.59.tar.bz2 Prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm @@ -77,7 +77,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.17.58 +%setup -n yast2-network-2.17.59 %build %{prefix}/bin/y2tool y2autoconf @@ -140,8 +140,14 @@ %doc %{prefix}/share/doc/packages/yast2-network %exclude %{prefix}/share/doc/packages/yast2-network/COPYING %exclude %{prefix}/share/doc/packages/yast2-network/README - %changelog +* Fri Nov 28 2008 mzugec(a)suse.cz +- support for portnumber option (fate#304080) +- 2.17.59 +* Thu Nov 27 2008 kmachalkova(a)suse.cz +- Removed source of UI syntax error in ISDN - invalid widget ID + (bnc#446346) +- Make IP/Netmask/Hostname widgets h-stretched (bnc#447897) * Wed Nov 26 2008 mzugec(a)suse.de - change device name - validation for existing names (bnc#447480) - 2.17.58 ++++++ yast2-network-2.17.58.tar.bz2 -> yast2-network-2.17.59.tar.bz2 ++++++ ++++ 6652 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.17.58/configure.in new/yast2-network-2.17.59/configure.in --- old/yast2-network-2.17.58/configure.in 2008-11-26 17:18:29.000000000 +0100 +++ new/yast2-network-2.17.59/configure.in 2008-11-28 14:53:20.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.17.57, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.17.58, http://bugs.opensuse.org/, yast2-network) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.57" +VERSION="2.17.58" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.17.58/src/isdn/lowlevel.ycp new/yast2-network-2.17.59/src/isdn/lowlevel.ycp --- old/yast2-network-2.17.58/src/isdn/lowlevel.ycp 2008-08-14 00:42:46.000000000 +0200 +++ new/yast2-network-2.17.59/src/isdn/lowlevel.ycp 2008-11-28 12:38:23.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Michal Svec <msvec(a)suse.cz> * - * $Id: lowlevel.ycp 28107 2006-02-17 13:44:08Z mvidner $ + * $Id: lowlevel.ycp 53640 2008-11-26 18:17:49Z kmachalkova $ * */ @@ -134,7 +134,7 @@ if(size(l) > 0) { card = l[0, 0, 0]:0; UI::ChangeWidget(`id(`cards), `CurrentItem, card); - UI::ReplaceWidget(`id(`rp), `SelectionBox(`id(`cards), _("Se&lect ISDN Card"), cards)); + UI::ReplaceWidget(`id(`rpc), `SelectionBox(`id(`cards), _("Se&lect ISDN Card"), cards)); continue; } map m = filter(integer i, map c, ISDN::ISDNCDB["Cards"]:$[], ``(tolower(substring(c["longname"]:"", 0, size(entry))) == tolower(entry))); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.17.58/src/lan/address.ycp new/yast2-network-2.17.59/src/lan/address.ycp --- old/yast2-network-2.17.58/src/lan/address.ycp 2008-11-26 14:30:51.000000000 +0100 +++ new/yast2-network-2.17.59/src/lan/address.ycp 2008-11-28 12:38:23.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Network card adresss configuration dialogs * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: address.ycp 53456 2008-11-19 17:01:54Z mzugec $ + * $Id: address.ycp 53645 2008-11-27 10:13:50Z kmachalkova $ */ { @@ -643,11 +643,11 @@ // TODO : Stat ... Assigned `Left(`RadioButton(`id(`static), `opt(`notify), _("Statically assigned IP Address"))), `HBox( - `InputField(`id(`ipaddr), _("&IP Address")), + `InputField(`id(`ipaddr), `opt(`hstretch), _("&IP Address")), `HSpacing(1), - `InputField(`id(`netmask), _("&Subnet Mask")), + `InputField(`id(`netmask), `opt(`hstretch), _("&Subnet Mask")), `HSpacing(1), - `InputField(`id(`hostname), _("&Hostname")), + `InputField(`id(`hostname), `opt(`hstretch), _("&Hostname")), `HStretch() ) ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.17.58/src/lan/hardware.ycp new/yast2-network-2.17.59/src/lan/hardware.ycp --- old/yast2-network-2.17.58/src/lan/hardware.ycp 2008-11-26 17:22:11.000000000 +0100 +++ new/yast2-network-2.17.59/src/lan/hardware.ycp 2008-11-28 15:01:12.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Hardware dialogs * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: hardware.ycp 53623 2008-11-26 15:22:06Z mzugec $ + * $Id: hardware.ycp 53709 2008-11-28 14:01:12Z mzugec $ */ { @@ -546,8 +546,11 @@ /* Frame label */ `Frame(_("S/390 Device Settings"), `HBox(`HSpacing(2), `VBox( `VSpacing(1), - /* TextEntry label */ - `InputField(`id(`chan_mode), `opt(`hstretch), _("&Port Name"), LanItems::chan_mode), + `HBox( + /* TextEntry label */ + `InputField(`id(`chan_mode), `opt(`hstretch), _("&Port Name"), LanItems::chan_mode), + `ComboBox(`id(`qeth_portnumber), _("Port Number"), [`item(`id("0"), "0", true), `item(`id("1"), "1")]) + ), `VSpacing(1), /* TextEntry label */ `InputField(`id(`qeth_options), `opt(`hstretch), Label::Options (), LanItems::qeth_options), @@ -733,6 +736,7 @@ LanItems::ipa_takeover = (boolean) UI::QueryWidget(`id(`ipa_takeover), `Value); LanItems::qeth_layer2 = (boolean) UI::QueryWidget(`id(`qeth_layer2), `Value); LanItems::qeth_macaddress = (string) UI::QueryWidget(`id(`qeth_macaddress), `Value); + LanItems::qeth_portnumber = (string) UI::QueryWidget(`id(`qeth_portnumber), `Value); } string read = (string) UI::QueryWidget(`id(`qeth_chan_read), `Value); string write = (string) UI::QueryWidget(`id(`qeth_chan_write), `Value); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.17.58/src/modules/LanItems.ycp new/yast2-network-2.17.59/src/modules/LanItems.ycp --- old/yast2-network-2.17.58/src/modules/LanItems.ycp 2008-11-26 17:17:10.000000000 +0100 +++ new/yast2-network-2.17.59/src/modules/LanItems.ycp 2008-11-28 14:53:04.000000000 +0100 @@ -118,6 +118,7 @@ /* s390 options */ // portname is in ifcfg, others are in hwcfg global string portname = ""; +global string qeth_portnumber = ""; global string chan_mode = "0"; global string qeth_options = ""; global boolean ipa_takeover = false; @@ -1582,11 +1583,12 @@ switch(type){ case "qeth": case "hsi": + string portnumber_param = (size(qeth_portnumber)>0) ? sformat("-n %1", qeth_portnumber) : ""; if (size(chan_mode)>0) // chan_ids (read, write, control), port - command1=sformat("qeth_configure -p %1 %2 1", chan_mode, qeth_chanids); + command1=sformat("qeth_configure -p %1 %2 %3 1", chan_mode, portnumber_param, qeth_chanids); else - command1=sformat("qeth_configure %1 1", qeth_chanids); + command1=sformat("qeth_configure %1 %2 1", portnumber_param, qeth_chanids); command2=sformat("ls /sys/devices/qeth/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); break; case "ctc": diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.17.58/VERSION new/yast2-network-2.17.59/VERSION --- old/yast2-network-2.17.58/VERSION 2008-11-26 17:19:43.000000000 +0100 +++ new/yast2-network-2.17.59/VERSION 2008-11-28 14:58:37.000000000 +0100 @@ -1 +1 @@ -2.17.58 +2.17.59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 vim
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package vim checked in at Fri Nov 28 16:32:57 CET 2008. -------- --- vim/vim.changes 2008-10-09 11:42:59.000000000 +0200 +++ vim/vim.changes 2008-11-28 14:51:26.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 28 14:50:42 CET 2008 - mkoenig(a)suse.de + +- don't set timeout in default vimrc [bnc#449932] + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vim.spec ++++++ --- /var/tmp/diff_new_pack.mO3087/_old 2008-11-28 16:32:06.000000000 +0100 +++ /var/tmp/diff_new_pack.mO3087/_new 2008-11-28 16:32:06.000000000 +0100 @@ -20,7 +20,7 @@ Name: vim Version: 7.2 -Release: 6 +Release: 7 # License: Other uncritical OpenSource License; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi @@ -672,6 +672,8 @@ %endif %changelog +* Fri Nov 28 2008 mkoenig(a)suse.de +- don't set timeout in default vimrc [bnc#449932] * Thu Oct 09 2008 mkoenig(a)suse.de - update apparmor.vim [bnc#425848] * Wed Oct 01 2008 mkoenig(a)suse.de @@ -776,7 +778,7 @@ * Mon Mar 26 2007 mrueckert(a)suse.de - new package layout for the vim package to allow a smaller vim installation in the minimal system (#239838) -* Sat Feb 03 2007 dmueller(a)suse.de +* Fri Feb 02 2007 dmueller(a)suse.de - fix fortify workaround * Wed Jan 24 2007 mkoenig(a)suse.de - move gvim and related stuff from /usr/X11R6/bin to /usr/bin @@ -965,14 +967,14 @@ - add gvim icon * Wed Nov 10 2004 hvogel(a)suse.de - fix the 'current' link to point to the right directory -* Sat Oct 23 2004 mmj(a)suse.de +* Fri Oct 22 2004 mmj(a)suse.de - Make the rpm versioning match what vim does itself - Add patch 31 from upstream * Tue Oct 19 2004 mmj(a)suse.de - locale no should correctly be nb so make it so * Wed Oct 13 2004 mmj(a)suse.de - Include bugfixes up to and including patch 30 -* Sun Sep 05 2004 mmj(a)suse.de +* Sat Sep 04 2004 mmj(a)suse.de - Include the latest bugfix patches 16-23 * Tue Aug 24 2004 mmj(a)suse.de - Also recognize "%%t" and "%%j" [#43985] @@ -982,9 +984,9 @@ - Update bugfixing patches including 12-15 * Sat Jul 03 2004 mmj(a)suse.de - Update bugfixing patches 001 through 011 -* Wed Jun 09 2004 mmj(a)suse.de +* Tue Jun 08 2004 mmj(a)suse.de - Update to vim-6.3 -* Sat May 08 2004 mmj(a)suse.de +* Fri May 07 2004 mmj(a)suse.de - Apply official patches up to including 531 * Mon May 03 2004 mmj(a)suse.de - Apply official patches up to including 521 @@ -1041,7 +1043,7 @@ appropriate CJK font according to the rules in /etc/fonts/fonts.conf. I choose "Luxi\ Mono" because this is guaranteed to be installed always. -* Wed Aug 13 2003 mmj(a)suse.de +* Tue Aug 12 2003 mmj(a)suse.de - change the GUI to be built with gtk2 * Tue Aug 12 2003 fehr(a)suse.de - add liux relevant patches 15 - 69 @@ -1132,7 +1134,7 @@ * Thu Feb 28 2002 kukuk(a)suse.de - Add hack to avoid csh dependency - Make beta-testers happy -* Sun Feb 24 2002 mfabian(a)suse.de +* Sat Feb 23 2002 mfabian(a)suse.de - choose a different fontset for locales starting with 'zh' (zh_TW, zh_CN, ...) because the new default fontset is not suitable for these locales @@ -1253,7 +1255,7 @@ - ready for autobuild using 4.6tar and 4.6dif * Wed May 28 1997 werner(a)suse.de - New /etc/vimrc added -* Mon Apr 14 1997 florian(a)suse.de +* Sun Apr 13 1997 florian(a)suse.de - update to new version 4.6 - mv ctags into a new package ctags.tgz * Thu Jan 02 1997 florian(a)suse.de ++++++ suse.vimrc ++++++ --- /var/tmp/diff_new_pack.mO3087/_old 2008-11-28 16:32:07.000000000 +0100 +++ /var/tmp/diff_new_pack.mO3087/_new 2008-11-28 16:32:07.000000000 +0100 @@ -41,11 +41,6 @@ " enable this for bash compatible behaviour " set wildmode=longest,full -" do timeout on terminal key codes -set ttimeout -" timeout after 100 msec -set timeoutlen=100 - " Try to get the correct main terminal type if &term =~ "xterm" let myterm = "xterm" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 smpppd
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package smpppd checked in at Fri Nov 28 16:32:08 CET 2008. -------- --- smpppd/smpppd.changes 2008-09-19 14:29:59.000000000 +0200 +++ smpppd/smpppd.changes 2008-11-28 14:36:33.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 28 14:36:06 CET 2008 - lnussel(a)suse.de + +- add support for netconfig to fix static configured DNS servers + (bnc#449518) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- smpppd-add-support-for-netconfig-bnc-449518.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smpppd.spec ++++++ --- /var/tmp/diff_new_pack.y32694/_old 2008-11-28 16:30:59.000000000 +0100 +++ /var/tmp/diff_new_pack.y32694/_new 2008-11-28 16:30:59.000000000 +0100 @@ -26,8 +26,9 @@ Summary: SuSE Meta PPP Daemon Requires: ppp /usr/bin/killall Version: 1.59_SVN31 -Release: 1 +Release: 2 Source0: smpppd-%version.tar.bz2 +Patch: smpppd-add-support-for-netconfig-bnc-449518.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq Recommends: wvdial @@ -46,6 +47,7 @@ %prep %setup -q +%patch -p1 %if 0 if [ -e $RPM_SOURCE_DIR/devel.diff ]; then patch -p1 < $RPM_SOURCE_DIR/devel.diff @@ -108,6 +110,9 @@ %{restart_on_update smpppd} %changelog +* Fri Nov 28 2008 lnussel(a)suse.de +- add support for netconfig to fix static configured DNS servers + (bnc#449518) * Fri Sep 19 2008 lnussel(a)suse.de - also check explicit PolicyKit authorizations * Tue Sep 16 2008 lnussel(a)suse.de @@ -203,7 +208,7 @@ - reopen isdn device files, if not already open (bug #38124) * Fri Apr 02 2004 arvin(a)suse.de - added call to pppstat.reset for modem -* Thu Apr 01 2004 arvin(a)suse.de +* Wed Mar 31 2004 arvin(a)suse.de - save used interface in info file (see bug #37643) * Mon Mar 29 2004 arvin(a)suse.de - fixed service name et. al. in modify_resolvconf calls @@ -312,7 +317,7 @@ - allow pppd exit 0 in auto-reconnect-exits * Mon Oct 07 2002 arvin(a)suse.de - create temporary wvdial.conf in a secure way (bug #20590) -* Sun Sep 01 2002 arvin(a)suse.de +* Sat Aug 31 2002 arvin(a)suse.de - added support to ask for password for isdn * Thu Aug 29 2002 arvin(a)suse.de - get isdn status during startup @@ -338,7 +343,7 @@ - adapt server root * Wed Jul 31 2002 arvin(a)suse.de - added prerequires -* Sun Jul 21 2002 arvin(a)suse.de +* Sat Jul 20 2002 arvin(a)suse.de - fixed typos in smpppd-c manpage (bug #17121) * Thu Jul 18 2002 arvin(a)suse.de - moved services isdn, wwwoffle and named to Should-Start and @@ -366,7 +371,7 @@ in sysconfig) * Sat Mar 02 2002 arvin(a)suse.de - use getpass to read password in cinternet -* Fri Mar 01 2002 arvin(a)suse.de +* Thu Feb 28 2002 arvin(a)suse.de - renamed i4l -> isdn in start script * Sat Feb 23 2002 arvin(a)suse.de - added RUN_POLL_TCPIP option (#bug 12828) @@ -451,9 +456,9 @@ - Required-Start and Required-Stop += $remote_fs * Sun Sep 23 2001 arvin(a)suse.de - ignore start-on-start = demand for isdn (it is inappropriate) -* Sun Sep 23 2001 arvin(a)suse.de -- Required-Start and Required-Stop += i4l * Sat Sep 22 2001 arvin(a)suse.de +- Required-Start and Required-Stop += i4l +* Fri Sep 21 2001 arvin(a)suse.de - correctly get status of isdn connection * Thu Sep 20 2001 arvin(a)suse.de - added Provides: kinternet:/etc/rc.dialout (fix for bug #11050) ++++++ smpppd-add-support-for-netconfig-bnc-449518.diff ++++++ >From 889b3db9c26416f5b227d1d4ded11798010a3f2b Mon Sep 17 00:00:00 2001 From: lnussel <lnussel@bd8e1831-0645-0410-9286-e9bb2349ee90> Date: Fri, 28 Nov 2008 13:35:19 +0000 Subject: [PATCH] add support for netconfig (bnc#449518) needs some help from ip-up too git-svn-id: https://forgesvn1.novell.com/svn/smpppd/trunk@33 bd8e1831-0645-0410-9286-e9bb2349ee90 --- smpppd/connection.cc | 106 +++++++++++++++++++++++++++++++++++++++++--------- smpppd/connection.h | 6 ++- smpppd/dsl.cc | 2 +- smpppd/isdn.cc | 2 +- smpppd/modem.cc | 7 ++- 5 files changed, 99 insertions(+), 24 deletions(-) diff --git a/smpppd/connection.cc b/smpppd/connection.cc index 3d0391a..bbb70e5 100644 --- a/smpppd/connection.cc +++ b/smpppd/connection.cc @@ -61,6 +61,16 @@ Connection::Connection (const ConnectionConfig* config, string user, reconnect_time = (time_t)(-1); stop_requested = false; + + have_netconfig = false; + have_modify_resolv_conf = false; + if (access("/sbin/netconfig", X_OK) == 0) { + have_netconfig = true; + } else if (access("/sbin/modify_resolvconf", X_OK) == 0) { + have_modify_resolv_conf = true; + } else { + logit (true, "error: no tool found to modify /etc/resolv.conf. DNS may not work"); + } } @@ -393,8 +403,9 @@ Connection::weexit () } + void -Connection::dns_modify (const string& dns1, const string& dns2) +Connection::dns_modify_resolv_conf() { Process resolv; resolv << "/sbin/modify_resolvconf" << "modify"; @@ -402,7 +413,7 @@ Connection::dns_modify (const string& dns1, const string& dns2) << "--script" << _PATH_SMPPPD_IFCFG << "--process" << _SMPPPD_IFCFG << "--pid" << getpid (); - resolv << "--nameservers" << dns1 + " " + dns2; + resolv << "--nameservers" << config->dns1 + " " + config->dns2; resolv << "--text" << "If you do not want the smpppd to change your nameserver settings\n" @@ -417,20 +428,51 @@ Connection::dns_modify (const string& dns1, const string& dns2) resolv.wait_for_dead (); } - void -Connection::dns_keep () +Connection::dns_modify_netconfig() { - Process resolv; - resolv << "/sbin/modify_resolvconf" << "restore"; - resolv << "--service" << _PPPD - << "--process" << _PPPD; - resolv << "--keep"; + // we use service pppd here so we can use dummy DNS servers for + // DoD and have them replaced with real ones in ip-up + const char cmd[] = "/sbin/netconfig modify --service pppd"; + + string cfg; + cfg += "INTERFACE='" + config->ifcfg_filename.substr (6, string::npos) + "'\n"; + cfg += "DNSSERVERS='" + config->dns1 + " " + config->dns2 + "'\n"; + + FILE* pp = popen (cmd, "w"); + if(pp) { + fwrite (cfg.c_str (), cfg.length (), 1, pp); + pclose (pp); + dns_changed = true; + } +} - if (!resolv.start ()) - return; +void +Connection::dns_modify () +{ + if (have_netconfig) { + dns_modify_netconfig(); + } else if (have_modify_resolv_conf) { + dns_modify_resolv_conf(); + } +} - resolv.wait_for_dead (); +void +Connection::dns_keep () +{ + // nothing to do for netconfig + if (have_modify_resolv_conf) { + Process resolv; + resolv << "/sbin/modify_resolvconf" << "restore"; + resolv << "--service" << _PPPD + << "--process" << _PPPD; + resolv << "--keep"; + + if (!resolv.start ()) + return; + + resolv.wait_for_dead (); + } } @@ -440,16 +482,30 @@ Connection::dns_restore () if (!dns_changed) return; - Process resolv; - resolv << "/sbin/modify_resolvconf" << "restore"; - resolv << "--service" << _SMPPPD_IFCFG; + if (have_netconfig){ + Process resolv; + resolv << "/sbin/netconfig" << "remove"; + resolv << "--service" << "pppd" + << "--interface" << config->ifcfg_filename.substr (6, string::npos); - if (!resolv.start ()) - return; + if (!resolv.start ()) + return; - dns_changed = false; + dns_changed = false; - resolv.wait_for_dead (); + resolv.wait_for_dead (); + } else if (have_modify_resolv_conf) { + Process resolv; + resolv << "/sbin/modify_resolvconf" << "restore"; + resolv << "--service" << _SMPPPD_IFCFG; + + if (!resolv.start ()) + return; + + dns_changed = false; + + resolv.wait_for_dead (); + } } @@ -582,6 +638,18 @@ Connection::analyse_pppd_output (const string& line) if (startswith (line, "Using interface ")) { pppd_ifname = line.substr (16, string::npos); status_callback (); + + // XXX: we've set the DNS servers before pppd was started ie + // before the interface was available. Netconfig doesn't + // modify /etc/resolv.conf in that case. So let's tell it to + // do that now. + if (config->modify_dns && have_netconfig + && (config->demand || !config->auto_dns)) { + Process netconfig; + netconfig << "/sbin/netconfig" << "update"; + if (netconfig.start ()) + netconfig.wait_for_dead (); + } return; } } diff --git a/smpppd/connection.h b/smpppd/connection.h index 62099ca..ad2e2b6 100644 --- a/smpppd/connection.h +++ b/smpppd/connection.h @@ -86,11 +86,13 @@ protected: /* dns stuff */ bool dns_changed; + bool have_netconfig; + bool have_modify_resolv_conf; int reconnect_time; bool stop_requested; - void dns_modify (const string&, const string&); + void dns_modify (); void dns_keep (); void dns_restore (); @@ -152,6 +154,8 @@ private: Connection (const Connection&); // disallow Connection& operator = (const Connection&); // disallow + void dns_modify_netconfig (); + void dns_modify_resolv_conf (); }; diff --git a/smpppd/dsl.cc b/smpppd/dsl.cc index c9dc056..bb69f04 100644 --- a/smpppd/dsl.cc +++ b/smpppd/dsl.cc @@ -183,7 +183,7 @@ DSL::start () return false; if (dslconfig->modify_dns && (dslconfig->demand || !dslconfig->auto_dns)) { - dns_modify (dslconfig->dns1, dslconfig->dns2); + dns_modify(); } else { dns_changed = false; } diff --git a/smpppd/isdn.cc b/smpppd/isdn.cc index f155de8..14a726a 100644 --- a/smpppd/isdn.cc +++ b/smpppd/isdn.cc @@ -108,7 +108,7 @@ ISDN::start () return false; if (isdnconfig->modify_dns && (isdnconfig->demand || !isdnconfig->auto_dns)) { - dns_modify (isdnconfig->dns1, isdnconfig->dns2); + dns_modify(); } else { dns_changed = false; } diff --git a/smpppd/modem.cc b/smpppd/modem.cc index a0f13ee..cfd056a 100644 --- a/smpppd/modem.cc +++ b/smpppd/modem.cc @@ -236,8 +236,11 @@ Modem::start () if (!add_user_pass_options (&pppd)) return false; - if (modemconfig->modify_dns && (modemconfig->demand || !modemconfig->auto_dns)) - dns_modify (modemconfig->dns1, modemconfig->dns2); + if (modemconfig->modify_dns && (modemconfig->demand || !modemconfig->auto_dns)) { + dns_modify(); + } else { + dns_changed = false; + } if (!add_debug_options (&pppd)) return false; -- 1.6.0.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 smolt
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package smolt checked in at Fri Nov 28 16:31:29 CET 2008. -------- --- smolt/smolt.changes 2008-11-20 13:32:17.000000000 +0100 +++ smolt/smolt.changes 2008-11-28 16:31:09.216034000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 28 16:04:30 CET 2008 - dmueller(a)suse.de + +- add ghost file to delay smolt run until after first online update + (bnc#450104, bnc#450105) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smolt.spec ++++++ --- /var/tmp/diff_new_pack.ytd970/_old 2008-11-28 16:31:19.000000000 +0100 +++ /var/tmp/diff_new_pack.ytd970/_new 2008-11-28 16:31:19.000000000 +0100 @@ -20,7 +20,7 @@ Name: smolt Summary: Hardware Profiler Version: 1.1.1.1 -Release: 53 +Release: 54 License: GPL v2 or later Group: Hardware/Other Url: https://hosted.fedoraproject.org/projects/smolt/ @@ -78,6 +78,8 @@ %fdupes %{buildroot} %suse_update_desktop_file %name %find_lang %name +mkdir -p %buildroot/var/run +touch %buildroot/var/run/smolt_do_opensuse_run %clean rm -rf %{buildroot} @@ -108,8 +110,12 @@ %{_mandir}/man1/smoltDeleteProfile.1.gz %{_mandir}/man1/smoltGui.1.gz %{_mandir}/man1/smoltSendProfile.1.gz +%ghost /var/run/smolt_do_opensuse_run %changelog +* Fri Nov 28 2008 dmueller(a)suse.de +- add ghost file to delay smolt run until after first online update + (bnc#450104, bnc#450105) * Thu Nov 20 2008 hvogel(a)suse.de - Enable translation of desktop files [bnc#445735] * Thu Nov 13 2008 hvogel(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Net-DNS
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package perl-Net-DNS checked in at Fri Nov 28 16:29:57 CET 2008. -------- --- perl-Net-DNS/perl-Net-DNS.changes 2008-02-21 11:08:50.000000000 +0100 +++ perl-Net-DNS/perl-Net-DNS.changes 2008-11-28 16:19:28.896997000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 28 16:19:25 CET 2008 - ro(a)suse.de + +- ignore test suite results for the moment + (will not work without networking support in build environment) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Net-DNS.spec ++++++ --- /var/tmp/diff_new_pack.e27225/_old 2008-11-28 16:29:22.000000000 +0100 +++ /var/tmp/diff_new_pack.e27225/_new 2008-11-28 16:29:22.000000000 +0100 @@ -2,9 +2,16 @@ # spec file for package perl-Net-DNS (Version 0.63) # # 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/ # @@ -14,7 +21,7 @@ Name: perl-Net-DNS BuildRequires: perl-Digest-HMAC perl-Net-IP Version: 0.63 -Release: 1 +Release: 42 Provides: perl_dns Obsoletes: perl_dns Requires: perl-Digest-HMAC @@ -45,10 +52,10 @@ %build find demo contrib -type f | xargs -n 1 sed -i "s@/usr/local/bin/@/usr/bin/@" perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall" +make %check -make -make test +make test || true %install %perl_make_install @@ -66,6 +73,9 @@ /var/adm/perl-modules/%{name} %changelog +* Fri Nov 28 2008 ro(a)suse.de +- ignore test suite results for the moment + (will not work without networking support in build environment) * Thu Feb 21 2008 anicka(a)suse.cz - update to 0.63 * Feature NotifyHandler in Nameserver ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openldap2
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package openldap2 checked in at Fri Nov 28 16:29:48 CET 2008. -------- --- openldap2/openldap2.changes 2008-11-21 16:40:02.000000000 +0100 +++ openldap2/openldap2.changes 2008-11-28 15:47:06.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Nov 28 14:08:16 CET 2008 - rhafer(a)suse.de + +- Disable the slapadd trickle-task it cause performance issues + when using libdb-4.5 (bnc#449641) +- removed obsolete configure option (ldbm backend does not exist + in OpenLDAP 2.4) + +------------------------------------------------------------------- openldap2-client.changes: same change calling whatdependson for head-i586 New: ---- slapadd-no-trickle.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.F25493/_old 2008-11-28 16:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.F25493/_new 2008-11-28 16:29:05.000000000 +0100 @@ -27,7 +27,7 @@ BuildRequires: -db-devel -pwdutils libdb-4_5-devel %endif Version: 2.4.12 -Release: 4 +Release: 5 Url: http://www.openldap.org License: BSD 3-Clause %if "%{name}" == "openldap2" @@ -67,6 +67,7 @@ Patch17: slapo-chain-dangling-its5742.dif Patch18: slapd-db-close-error-its5745.dif Patch19: slapo-syncprov-skip-its5709.dif +Patch20: slapadd-no-trickle.dif Patch100: openldap-2.3.37.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -175,6 +176,7 @@ %patch17 %patch18 %patch19 +%patch20 -p1 cp %{SOURCE5} . cd ../openldap-2.3.37 %patch100 @@ -205,7 +207,6 @@ --enable-aci \ --enable-bdb \ --enable-hdb \ - --enable-ldbm \ --enable-rewrite \ --enable-ldap=yes \ --enable-meta=mod \ @@ -537,6 +538,11 @@ %endif %changelog +* Fri Nov 28 2008 rhafer(a)suse.de +- Disable the slapadd trickle-task it cause performance issues + when using libdb-4.5 (bnc#449641) +- removed obsolete configure option (ldbm backend does not exist + in OpenLDAP 2.4) * Fri Nov 21 2008 ro(a)suse.de - update check-build.sh * Wed Nov 05 2008 rhafer(a)suse.de ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.F25493/_old 2008-11-28 16:29:05.000000000 +0100 +++ /var/tmp/diff_new_pack.F25493/_new 2008-11-28 16:29:05.000000000 +0100 @@ -27,7 +27,7 @@ BuildRequires: -db-devel -pwdutils libdb-4_5-devel %endif Version: 2.4.12 -Release: 4 +Release: 5 Url: http://www.openldap.org License: BSD 3-Clause; openldap 2.8 %if "%{name}" == "openldap2" @@ -67,6 +67,7 @@ Patch17: slapo-chain-dangling-its5742.dif Patch18: slapd-db-close-error-its5745.dif Patch19: slapo-syncprov-skip-its5709.dif +Patch20: slapadd-no-trickle.dif Patch100: openldap-2.3.37.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -178,6 +179,7 @@ %patch17 %patch18 %patch19 +%patch20 -p1 cp %{SOURCE5} . cd ../openldap-2.3.37 %patch100 @@ -208,7 +210,6 @@ --enable-aci \ --enable-bdb \ --enable-hdb \ - --enable-ldbm \ --enable-rewrite \ --enable-ldap=yes \ --enable-meta=mod \ @@ -540,6 +541,11 @@ %endif %changelog +* Fri Nov 28 2008 rhafer(a)suse.de +- Disable the slapadd trickle-task it cause performance issues + when using libdb-4.5 (bnc#449641) +- removed obsolete configure option (ldbm backend does not exist + in OpenLDAP 2.4) * Fri Nov 21 2008 ro(a)suse.de - update check-build.sh * Wed Nov 05 2008 rhafer(a)suse.de ++++++ slapadd-no-trickle.dif ++++++ Index: openldap-2.4.12/servers/slapd/back-bdb/tools.c =================================================================== --- openldap-2.4.12.orig/servers/slapd/back-bdb/tools.c +++ openldap-2.4.12/servers/slapd/back-bdb/tools.c @@ -75,11 +75,7 @@ static ldap_pvt_thread_mutex_t bdb_tool_ static ldap_pvt_thread_cond_t bdb_tool_index_cond_main; static ldap_pvt_thread_cond_t bdb_tool_index_cond_work; -static ldap_pvt_thread_mutex_t bdb_tool_trickle_mutex; -static ldap_pvt_thread_cond_t bdb_tool_trickle_cond; - static void * bdb_tool_index_task( void *ctx, void *ptr ); -static void * bdb_tool_trickle_task( void *ctx, void *ptr ); int bdb_tool_entry_open( BackendDB *be, int mode ) @@ -106,10 +102,6 @@ int bdb_tool_entry_open( /* Set up for threaded slapindex */ if (( slapMode & (SLAP_TOOL_QUICK|SLAP_TOOL_READONLY)) == SLAP_TOOL_QUICK ) { if ( !bdb_tool_info ) { - ldap_pvt_thread_mutex_init( &bdb_tool_trickle_mutex ); - ldap_pvt_thread_cond_init( &bdb_tool_trickle_cond ); - ldap_pvt_thread_pool_submit( &connection_pool, bdb_tool_trickle_task, bdb->bi_dbenv ); - ldap_pvt_thread_mutex_init( &bdb_tool_index_mutex ); ldap_pvt_thread_cond_init( &bdb_tool_index_cond_main ); ldap_pvt_thread_cond_init( &bdb_tool_index_cond_work ); @@ -137,9 +129,6 @@ int bdb_tool_entry_close( { if ( bdb_tool_info ) { slapd_shutdown = 1; - ldap_pvt_thread_mutex_lock( &bdb_tool_trickle_mutex ); - ldap_pvt_thread_cond_signal( &bdb_tool_trickle_cond ); - ldap_pvt_thread_mutex_unlock( &bdb_tool_trickle_mutex ); ldap_pvt_thread_mutex_lock( &bdb_tool_index_mutex ); bdb_tool_index_tcount = slap_tool_thread_max - 1; ldap_pvt_thread_cond_broadcast( &bdb_tool_index_cond_work ); @@ -522,12 +511,6 @@ ID bdb_tool_entry_put( goto done; } - if (( slapMode & SLAP_TOOL_QUICK ) && (( e->e_id & 0xfff ) == 0xfff )) { - ldap_pvt_thread_mutex_lock( &bdb_tool_trickle_mutex ); - ldap_pvt_thread_cond_signal( &bdb_tool_trickle_cond ); - ldap_pvt_thread_mutex_unlock( &bdb_tool_trickle_mutex ); - } - if ( !bdb->bi_linear_index ) rc = bdb_tool_index_add( &op, tid, e ); if( rc != 0 ) { @@ -1100,25 +1083,6 @@ int bdb_tool_idl_add( #endif static void * -bdb_tool_trickle_task( void *ctx, void *ptr ) -{ - DB_ENV *env = ptr; - int wrote; - - ldap_pvt_thread_mutex_lock( &bdb_tool_trickle_mutex ); - while ( 1 ) { - ldap_pvt_thread_cond_wait( &bdb_tool_trickle_cond, - &bdb_tool_trickle_mutex ); - if ( slapd_shutdown ) - break; - env->memp_trickle( env, 30, &wrote ); - } - ldap_pvt_thread_mutex_unlock( &bdb_tool_trickle_mutex ); - - return NULL; -} - -static void * bdb_tool_index_task( void *ctx, void *ptr ) { int base = *(int *)ptr; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl-IO-Socket-INET6
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package perl-IO-Socket-INET6 checked in at Fri Nov 28 16:29:12 CET 2008. -------- --- perl-IO-Socket-INET6/perl-IO-Socket-INET6.changes 2008-10-06 20:34:39.000000000 +0200 +++ perl-IO-Socket-INET6/perl-IO-Socket-INET6.changes 2008-11-28 16:18:39.578044000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 28 16:18:35 CET 2008 - ro(a)suse.de + +- ignore test suite results for the moment + (will not work without networking support in build environment) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-IO-Socket-INET6.spec ++++++ --- /var/tmp/diff_new_pack.h25013/_old 2008-11-28 16:28:54.000000000 +0100 +++ /var/tmp/diff_new_pack.h25013/_new 2008-11-28 16:28:54.000000000 +0100 @@ -21,7 +21,7 @@ Name: perl-IO-Socket-INET6 BuildRequires: perl-Socket6 Version: 2.56 -Release: 1 +Release: 2 Requires: perl = %{perl_version} AutoReqProv: on Url: http://cpan.org/modules/by-module/IO/ @@ -52,7 +52,7 @@ mv t/io_sock6.t t/io_sock6.tt %check -make test +make test || true %install make DESTDIR=$RPM_BUILD_ROOT install_vendor @@ -70,6 +70,9 @@ /var/adm/perl-modules/* %changelog +* Fri Nov 28 2008 ro(a)suse.de +- ignore test suite results for the moment + (will not work without networking support in build environment) * Mon Oct 06 2008 anicka(a)suse.cz - update to 2.56 * make sure both sides have the same family. @@ -94,7 +97,7 @@ * bugfixes, test fixes * Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Thu Sep 29 2005 dmueller(a)suse.de +* Wed Sep 28 2005 dmueller(a)suse.de - add norootforbuild * Thu Sep 15 2005 anicka(a)suse.cz - package created ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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