January 2011 - openSUSE Commits - openSUSE Mailing Lists

commit wine for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at Fri Jan 7 13:04:09 CET 2011. -------- --- wine/wine.changes 2010-12-11 12:57:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/wine/wine.changes 2011-01-03 14:32:06.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Jan 3 14:30:52 CET 2011 - meissner(a)suse.de + +- Updated to 1.3.10 development snapshot + - Support for notification balloons in system tray. + - Obsolete AudioIO sound driver removed. + - More work on ActiveX support. + - Various MSI fixes. + - Preloader now used for 64-bit too. + - Translation updates. + - Various bug fixes. + +------------------------------------------------------------------- +Mon Jan 3 13:23:21 UTC 2011 - meissner(a)novell.com + +- little fix for PowerPC build. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- wine-1.3.9.tar.bz2 New: ---- wine-1.3.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.Bi53ul/_old 2011-01-07 13:03:40.000000000 +0100 +++ /var/tmp/diff_new_pack.Bi53ul/_new 2011-01-07 13:03:40.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package wine (Version 1.3.9) +# spec file for package wine (Version 1.3.10) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -30,7 +30,7 @@ License: LGPLv2.1+ Group: System/Emulators/PC AutoReqProv: on -Version: 1.3.9 +Version: 1.3.10 Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com @@ -218,6 +218,10 @@ %endif %ifarch x86_64 /usr/bin/wine64 +/usr/bin/wine64-preloader +%endif +%ifarch ppc +/usr/bin/wine %endif %{_libdir}/lib* %dir %{_libdir}/wine ++++++ wine-1.3.9.tar.bz2 -> wine-1.3.10.tar.bz2 ++++++ wine/wine-1.3.9.tar.bz2 /mounts/work_src_done/STABLE/wine/wine-1.3.10.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-gtk for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package yast2-gtk for openSUSE:Factory checked in at Fri Jan 7 13:03:03 CET 2011. -------- --- yast2-gtk/yast2-gtk.changes 2010-12-23 04:08:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-gtk/yast2-gtk.changes 2011-01-06 00:11:23.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Jan 05 23:00:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.87 +- bug fix: YTree was crashing with new libyui +- YMultiSelectionBox and YTree: show selection count +when main widget +- sw_single: show "re-install" popup menu option +for single package selections. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-gtk-2.21.86.tar.bz2 New: ---- yast2-gtk-2.21.87.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-gtk.spec ++++++ --- /var/tmp/diff_new_pack.AdqUCx/_old 2011-01-07 13:02:34.000000000 +0100 +++ /var/tmp/diff_new_pack.AdqUCx/_new 2011-01-07 13:02:34.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-gtk (Version 2.21.86) +# spec file for package yast2-gtk (Version 2.21.87) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -18,11 +18,11 @@ Name: yast2-gtk -Version: 2.21.86 +Version: 2.21.87 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-gtk-2.21.86.tar.bz2 +Source0: yast2-gtk-2.21.87.tar.bz2 Url: http://en.opensuse.org/YaST2-GTK Summary: YaST2 - GTK+ Graphical User Interface Group: System/YaST ++++++ yast2-gtk-2.21.86.tar.bz2 -> yast2-gtk-2.21.87.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.86/package/yast2-gtk.changes new/yast2-gtk-2.21.87/package/yast2-gtk.changes --- old/yast2-gtk-2.21.86/package/yast2-gtk.changes 2010-12-23 04:07:52.000000000 +0100 +++ new/yast2-gtk-2.21.87/package/yast2-gtk.changes 2011-01-06 00:09:29.000000000 +0100 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Jan 05 23:00:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.87 +- bug fix: YTree was crashing with new libyui +- YMultiSelectionBox and YTree: show selection count +when main widget +- sw_single: show "re-install" popup menu option +for single package selections. + +------------------------------------------------------------------- Tue Dec 23 03:10:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.86 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.86/package/yast2-gtk.spec new/yast2-gtk-2.21.87/package/yast2-gtk.spec --- old/yast2-gtk-2.21.86/package/yast2-gtk.spec 2010-12-23 04:07:52.000000000 +0100 +++ new/yast2-gtk-2.21.87/package/yast2-gtk.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,68 +0,0 @@ -# -# spec file for package yast2-gtk (Version 2.21.85) -# -# norootforbuild;, - - -Name: yast2-gtk -Version: 2.21.85 -Release: 0 - - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-gtk-2.21.85.tar.bz2 -Url: http://en.opensuse.org/YaST2-GTK -Summary: YaST2 - GTK+ Graphical User Interface -Group: System/YaST -License: GPL v2.1 or later -BuildRequires: cmake -BuildRequires: gcc-c++ blocxx-devel libxcrypt-devel -BuildRequires: gtk2-devel -%if 0%{?suse_version} > 1130 -BuildRequires: gdk-pixbuf-devel -%endif -BuildRequires: yast2-devtools >= 2.16.3 -BuildRequires: yast2-libyui-devel >= 2.18.8 -BuildRequires: libzypp-devel >= 6.3.0 -Requires: gtk2 -Requires: yast2-libyui >= 2.18.8 -Requires: yast2_theme >= 2.16.1 -Requires: libzypp >= 6.3.0 -Provides: yast2_ui yast2-ui-gtk -Provides: yast2_ui_pkg -Source1: yast2-gtk-rpmlintrc - -%description -One of several user interfaces available for YaST2, based on GTK and -the X Window System. - -%prep -%setup - -%build -mkdir build -cd build -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$CFLAGS" -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DLIB=%{_lib} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=1 \ - .. -make %{?_smp_mflags} VERBOSE=1 - -%install -cd build -make install DESTDIR=$RPM_BUILD_ROOT -cd .. - -%clean -rm -rf "$RPM_BUILD_ROOT" - -%files -%defattr (-, root, root) -%dir %_libdir/YaST2 -%_libdir/YaST2/plugin/ - -%changelog - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.86/src/pkg/ygtkpkgdetailview.cc new/yast2-gtk-2.21.87/src/pkg/ygtkpkgdetailview.cc --- old/yast2-gtk-2.21.86/src/pkg/ygtkpkgdetailview.cc 2010-12-23 04:07:52.000000000 +0100 +++ new/yast2-gtk-2.21.87/src/pkg/ygtkpkgdetailview.cc 2011-01-06 00:09:29.000000000 +0100 @@ -21,6 +21,8 @@ #include "ygtkpkglistview.h" #include <YStringTree.h> +//#define ATRI_BUTTONS + #define BROWSER_BIN "/usr/bin/firefox" #define GNOME_OPEN_BIN "/usr/bin/gnome-open" @@ -429,23 +431,70 @@ versions.clear(); } +#ifdef ATRI_BUTTONS +static void atri_button_clicked_cb (GtkToggleButton *button, VersionExpander *pThis) +{ + BusyOp op; + Ypp::Selectable sel = pThis->list.get (0); + + if (!gtk_toggle_button_get_active (button)) { /* was active before pressing? */ + sel.undo(); + return; + } + + int nb = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "nb")); + std::list <Ypp::Version>::iterator it = pThis->versions.begin(); + for (int i = 0; i < nb; i++) it++; + + // guard with startTransaction() ... + + if (sel.toModify()) + sel.undo(); + + Ypp::Version &version = *it; + if (version.isInstalled()) + sel.remove(); + else { + sel.setCandidate (version); + sel.install(); + } +} +#endif + GtkWidget *addVersion (Ypp::Selectable &sel, Ypp::Version version, GtkWidget *group) { + GtkWidget *widget; +#ifdef ATRI_BUTTONS + GtkWidget *hbox = gtk_hbox_new (FALSE, 6); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 2); + GtkWidget *button = gtk_toggle_button_new(); + gtk_container_add (GTK_CONTAINER (button), gtk_image_new()); + GtkWidget *label = gtk_label_new (""); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0); + updateRadio (hbox, sel, version); + widget = hbox; + g_object_set_data (G_OBJECT (button), "nb", GINT_TO_POINTER (versions.size())); + g_signal_connect (G_OBJECT (button), "toggled", G_CALLBACK (atri_button_clicked_cb), this); +#else GtkWidget *radio = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (group), ""); updateRadio (radio, sel, version); - gtk_box_pack_start (GTK_BOX (versions_box), radio, FALSE, TRUE, 0); if (version.toModify()) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE); g_signal_connect (G_OBJECT (radio), "toggled", G_CALLBACK (version_toggled_cb), this); - + widget = radio; +#endif if ((versions.size() % 2) == 1) - g_signal_connect (G_OBJECT (radio), "expose-event", + g_signal_connect (G_OBJECT (widget), "expose-event", G_CALLBACK (draw_gray_cb), NULL); versions.push_back (version); - return radio; + gtk_box_pack_start (GTK_BOX (versions_box), widget, FALSE, TRUE, 0); + + return widget; } void updateRadio (GtkWidget *radio, Ypp::Selectable &sel, Ypp::Version &version) @@ -471,9 +520,69 @@ modified ? "" : "", number.c_str(), arch.c_str(), repo.c_str(), modified ? "" : ""); +#ifdef ATRI_BUTTONS + GList *children = gtk_container_get_children (GTK_CONTAINER (radio)); + GtkWidget *_label = (GtkWidget *) children->data; + GtkWidget *_button = (GtkWidget *) children->next->data; + gtk_label_set_markup (GTK_LABEL (_label), label); + if (number.size() > 20) + gtk_widget_set_tooltip_markup (_label, tooltip); + g_list_free (children); + + const gchar *stock, *l; + bool can_never_modify; + if (version.isInstalled()) { + l = _("Remove"); + stock = GTK_STOCK_DELETE; + can_never_modify = !sel.canRemove(); + modified = sel.toRemove(); + } + else { + if (sel.hasInstalledVersion()) { + Ypp::Version installed = sel.installed(); + if (installed < version) { + l = _("Upgrade"); + stock = GTK_STOCK_GO_UP; + } + else if (installed > version) { + l = _("Downgrade"); + stock = GTK_STOCK_GO_DOWN; + } + else { + l = _("Re-install"); + stock = GTK_STOCK_REFRESH; + } + } + else { + l = _("Install"); + stock = GTK_STOCK_SAVE; + } + modified = sel.toInstall(); + } + if (modified) + l = _("Undo"); + bool can_modify = !sel.isLocked(); + modified = modified && version.toModify(); + +g_signal_handlers_block_by_func (_button, (gpointer) atri_button_clicked_cb, this); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_button), modified); +g_signal_handlers_unblock_by_func (_button, (gpointer) atri_button_clicked_cb, this); + gtk_widget_set_sensitive (_button, can_modify); +/* if (can_never_modify) + gtk_widget_hide (_button); + else + gtk_widget_show (_button); +*/ + // stock is never changed -- could be set previously... + gtk_widget_set_tooltip_text (_button, l); + gtk_image_set_from_stock (GTK_IMAGE (GTK_BIN(_button)->child), stock, GTK_ICON_SIZE_BUTTON); + +#else gtk_label_set_markup (GTK_LABEL (GTK_BIN (radio)->child), label); if (number.size() > 20) gtk_widget_set_tooltip_markup (radio, tooltip); +#endif + g_free (tooltip); g_free (label); } @@ -530,6 +639,10 @@ void updateButton() { +#ifdef ATRI_BUTTONS +if (list.size() == 1) { gtk_widget_hide (button); gtk_widget_hide (undo_button); return; } +#endif + const char *label = 0, *stock = 0; bool modified = false, can_modify = true, can_never_modify = false; if (list.size() == 1) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.86/src/pkg/ygtkpkglistview.cc new/yast2-gtk-2.21.87/src/pkg/ygtkpkglistview.cc --- old/yast2-gtk-2.21.86/src/pkg/ygtkpkglistview.cc 2010-12-23 04:07:52.000000000 +0100 +++ new/yast2-gtk-2.21.87/src/pkg/ygtkpkglistview.cc 2011-01-06 00:09:29.000000000 +0100 @@ -417,6 +417,8 @@ } static void install_cb (GtkMenuItem *item, YGtkPkgListView *pThis) { pThis->getSelected().install(); } + static void reinstall_cb (GtkMenuItem *item, YGtkPkgListView *pThis) + { reinstall (pThis->getSelected().get(0)); } static void remove_cb (GtkMenuItem *item, YGtkPkgListView *pThis) { pThis->getSelected().remove(); } static void undo_cb (GtkMenuItem *item, YGtkPkgListView *pThis) @@ -427,11 +429,39 @@ { pThis->getSelected().lock (false); } static void select_all_cb (GtkMenuItem *item, YGtkPkgListView *pThis) { pThis->selectAll(); } + + static bool hasReinstall (Ypp::Selectable sel) + { + if (sel.hasInstalledVersion()) { + Ypp::Version installedVersion = sel.installed(); + for (int i = 0; i < sel.totalVersions(); i++) { + Ypp::Version version = sel.version (i); + if (!version.isInstalled() && version == installedVersion) + return true; + } + } + return false; + } + static void reinstall (Ypp::Selectable sel) + { + Ypp::Version installedVersion = sel.installed(); + for (int i = 0; i < sel.totalVersions(); i++) { + Ypp::Version version = sel.version (i); + if (!version.isInstalled() && version == installedVersion) { + sel.setCandidate (version); + sel.install(); + break; + } + } + } }; GtkWidget *menu = gtk_menu_new(); - bool empty = true; Ypp::List list = pThis->getSelected(); + Ypp::Selectable::Type type = Ypp::Selectable::PACKAGE; + if (list.size() > 0) + type = list.get(0).type(); + if (!outreach) { Ypp::ListProps props (list); @@ -440,35 +470,38 @@ bool locked = !unlocked && canLock; if (props.isNotInstalled() && !modified) inner::appendItem (menu, _("_Install"), 0, GTK_STOCK_SAVE, - !locked, inner::install_cb, pThis), empty = false; + !locked, inner::install_cb, pThis); if (props.hasUpgrade() && !modified) inner::appendItem (menu, _("_Upgrade"), 0, GTK_STOCK_GO_UP, - !locked, inner::install_cb, pThis), empty = false; + !locked, inner::install_cb, pThis); + if (type == Ypp::Selectable::PACKAGE && list.size() == 1 && inner::hasReinstall (list.get(0)) && !modified) + inner::appendItem (menu, _("_Re-install"), 0, GTK_STOCK_REFRESH, + !locked, inner::reinstall_cb, pThis); if (props.isInstalled() && !modified) inner::appendItem (menu, _("_Remove"), 0, GTK_STOCK_DELETE, - !locked && props.canRemove(), inner::remove_cb, pThis), empty = false; + !locked && props.canRemove(), inner::remove_cb, pThis); if (modified) inner::appendItem (menu, _("_Undo"), 0, GTK_STOCK_UNDO, - true, inner::undo_cb, pThis), empty = false; + true, inner::undo_cb, pThis); if (canLock) { static const char *lock_tooltip = "Package lock: prevents the package status from being modified by " "the dependencies resolver."; if (props.isLocked()) inner::appendItem (menu, _("_Unlock"), _(lock_tooltip), - GTK_STOCK_DIALOG_AUTHENTICATION, true, inner::unlock_cb, pThis), empty = false; + GTK_STOCK_DIALOG_AUTHENTICATION, true, inner::unlock_cb, pThis); if (unlocked) inner::appendItem (menu, _("_Lock"), _(lock_tooltip), GTK_STOCK_DIALOG_AUTHENTICATION, !modified, - inner::lock_cb, pThis), empty = false; + inner::lock_cb, pThis); } } - Ypp::Selectable::Type type = Ypp::Selectable::PACKAGE; - if (list.size()) - type = list.get(0).type(); if (type == Ypp::Selectable::PACKAGE || type == Ypp::Selectable::PATCH) { - if (!empty) + GList *items = gtk_container_get_children (GTK_CONTAINER (menu)); + g_list_free (items); + + if (items != NULL) /* add separator if there are other items */ gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new()); inner::appendItem (menu, NULL, NULL, GTK_STOCK_SELECT_ALL, true, inner::select_all_cb, pThis); @@ -990,7 +1023,7 @@ std::string getRepositoryLabel (Ypp::Repository &repo) { std::string name (repo.name()), url, str; - url = repo.isSystem() ? _("System") : repo.url(); + url = repo.isSystem() ? _("Installed packages") : repo.url(); str.reserve (name.size() + url.size() + 64); str = name + "\n"; str += ""; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.86/src/YGDialog.cc new/yast2-gtk-2.21.87/src/YGDialog.cc --- old/yast2-gtk-2.21.86/src/YGDialog.cc 2010-12-23 04:07:52.000000000 +0100 +++ new/yast2-gtk-2.21.87/src/YGDialog.cc 2011-01-06 00:09:29.000000000 +0100 @@ -25,9 +25,9 @@ //#define DEFAULT_WIDTH 750 //#define DEFAULT_HEIGHT 650 -#define DEFAULT_CHAR_WIDTH 62 +#define DEFAULT_CHAR_WIDTH 60 #define DEFAULT_CHAR_HEIGHT 28 -#define DEFAULT_PIXEL_WIDTH 350 +#define DEFAULT_PIXEL_WIDTH 330 #define DEFAULT_PIXEL_HEIGHT 200 class YGWindow; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.86/src/YGTreeView.cc new/yast2-gtk-2.21.87/src/YGTreeView.cc --- old/yast2-gtk-2.21.86/src/YGTreeView.cc 2010-12-23 04:07:52.000000000 +0100 +++ new/yast2-gtk-2.21.87/src/YGTreeView.cc 2011-01-06 00:09:29.000000000 +0100 @@ -14,6 +14,7 @@ #include "YSelectionWidget.h" #include "YGSelectionStore.h" #include "ygtktreeview.h" +#include <YLayoutBox.h> /* A generic widget for table related widgets. */ @@ -21,13 +22,15 @@ { protected: guint m_blockTimeout; + int markColumn; + GtkWidget *m_count; public: YGTreeView (YWidget *ywidget, YWidget *parent, const string &label, bool tree) : YGScrolledWidget (ywidget, parent, label, YD_VERT, YGTK_TYPE_TREE_VIEW, NULL), YGSelectionStore (tree) { - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (getWidget()), FALSE); + gtk_tree_view_set_headers_visible (getView(), FALSE); /* Yast tools expect the user to be unable to un-select the row. They generally don't check to see if the returned value is -1. So, just @@ -39,6 +42,7 @@ connect (getWidget(), "right-click", G_CALLBACK (right_click_cb), this); m_blockTimeout = 0; // GtkTreeSelection idiotically fires when showing widget + markColumn = -1; m_count = NULL; g_signal_connect (getWidget(), "map", G_CALLBACK (block_init_cb), this); } @@ -79,6 +83,8 @@ gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (getView(), column); + if (gtk_tree_view_get_search_column (getView()) == -1) + gtk_tree_view_set_search_column (getView(), text_col); } void addCheckColumn (int check_col) @@ -87,16 +93,70 @@ g_object_set_data (G_OBJECT (renderer), "column", GINT_TO_POINTER (check_col)); GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes ( NULL, renderer, "active", check_col, NULL); + gtk_tree_view_column_set_cell_data_func (column, renderer, inconsistent_mark_cb, this, NULL); g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (toggled_cb), this); gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_append_column (getView(), column); + if (markColumn == -1) + markColumn = check_col; } void readModel() { gtk_tree_view_set_model (getView(), getModel()); } + void addCountWidget (YWidget *yparent) + { + bool mainWidget = true; + for (; yparent; yparent->parent()) { + YLayoutBox *box = dynamic_cast <YLayoutBox *> (yparent); + if (box) { + mainWidget = box->primary() == YD_VERT; + break; + } + } + if (mainWidget) { + m_count = gtk_label_new ("0"); + GtkWidget *hbox = gtk_hbox_new (FALSE, 4); + GtkWidget *label = gtk_label_new (_("Total selected:")); + //gtk_box_pack_start (GTK_BOX (hbox), gtk_event_box_new(), TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), m_count, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (YGWidget::getWidget()), hbox, FALSE, TRUE, 0); + gtk_widget_show_all (hbox); + } + } + + void syncCount() + { + if (!m_count) return; + + struct inner { + static gboolean foreach ( + GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer _pThis) + { + YGTreeView *pThis = (YGTreeView *) _pThis; + gboolean mark; + gtk_tree_model_get (model, iter, pThis->markColumn, &mark, -1); + if (mark) { + int count = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (model), "count")); + g_object_set_data (G_OBJECT (model), "count", GINT_TO_POINTER (count+1)); + } + return FALSE; + } + }; + + GtkTreeModel *model = getModel(); + g_object_set_data (G_OBJECT (model), "count", 0); + gtk_tree_model_foreach (model, inner::foreach, this); + + int count = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (model), "count")); + gchar *str = g_strdup_printf ("%d", count); + gtk_label_set_text (GTK_LABEL (m_count), str); + g_free (str); + } + void focusItem (YItem *item, bool select) { GtkTreeIter iter; @@ -130,7 +190,7 @@ GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer _pThis) { YGTreeView *pThis = (YGTreeView *) _pThis; - pThis->setRowMark (iter, pThis->markColumn(), FALSE); + pThis->setRowMark (iter, pThis->markColumn, FALSE); return FALSE; } }; @@ -141,8 +201,6 @@ virtual bool _immediateMode() { return true; } virtual bool _shrinkable() { return false; } - virtual int markColumn() { return -1; } - void toggleMark (GtkTreePath *path, gint column) { GtkTreeIter iter; @@ -154,6 +212,7 @@ state = !state; setRowMark (&iter, column, state); getYItem (&iter)->setSelected (state); + syncCount(); emitEvent (YEvent::ValueChanged); } @@ -185,6 +244,29 @@ // callbacks + static bool all_marked (GtkTreeModel *model, GtkTreeIter *iter, int mark_col) + { + gboolean marked; + GtkTreeIter child_iter; + if (gtk_tree_model_iter_children (model, &child_iter, iter)) + do { + gtk_tree_model_get (model, &child_iter, mark_col, &marked, -1); + if (!marked) return false; + all_marked (model, &child_iter, mark_col); + } while (gtk_tree_model_iter_next (model, &child_iter)); + return true; + } + + static void inconsistent_mark_cb (GtkTreeViewColumn *column, + GtkCellRenderer *cell, GtkTreeModel *model, GtkTreeIter *iter, gpointer data) + { // used for trees -- show inconsistent if one node is check but another isn't + YGTreeView *pThis = (YGTreeView *) data; + gboolean marked; + gtk_tree_model_get (model, iter, pThis->markColumn, &marked, -1); + gboolean consistent = !marked || all_marked (model, iter, pThis->markColumn); + g_object_set (G_OBJECT (cell), "inconsistent", !consistent, NULL); + } + static void selection_changed_cb (GtkTreeSelection *selection, YGTreeView *pThis) { struct inner { @@ -200,7 +282,7 @@ }; if (pThis->m_blockTimeout) return; - if (pThis->markColumn() < 0) + if (pThis->markColumn == -1) gtk_tree_model_foreach (pThis->getModel(), inner::foreach_sync_select, pThis); if (pThis->_immediateMode()) pThis->emitEvent (YEvent::SelectionChanged, IF_NOT_PENDING_EVENT); @@ -209,8 +291,8 @@ static void activated_cb (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, YGTreeView* pThis) { - if (pThis->markColumn() >= 0) - pThis->toggleMark (path, pThis->markColumn()); + if (pThis->markColumn >= 0) + pThis->toggleMark (path, pThis->markColumn); else { // for tree - expand/collpase double-clicked rows if (gtk_tree_view_row_expanded (tree_view, path)) @@ -229,6 +311,10 @@ gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (renderer), "column")); pThis->toggleMark (path, column); gtk_tree_path_free (path); + + // un/marking a sub-node can cause changes of "inconsistency" + if (gtk_tree_path_get_depth (path) >= 2) + gtk_widget_queue_draw (pThis->getWidget()); } static void right_click_cb (YGtkTreeView *view, gboolean outreach, YGTreeView *pThis) @@ -500,12 +586,12 @@ addTextColumn (1, 2); createStore (3, types); readModel(); + addCountWidget (parent); } // YGTreeView virtual bool _shrinkable() { return shrinkable(); } - virtual int markColumn() { return 0; } // YGSelectionStore @@ -515,6 +601,7 @@ addRow (item, &iter); setRowMark (&iter, 0, item->selected()); setRowText (&iter, 1, item->iconName(), 2, item->label(), this); + syncCount(); } void doSelectItem (YItem *item, bool select) @@ -522,10 +609,11 @@ GtkTreeIter iter; getTreeIter (item, &iter); setRowMark (&iter, 0, select); + syncCount(); } void doDeselectAllItems() - { unmarkAll(); } + { unmarkAll(); syncCount(); } // YMultiSelectionBox @@ -568,15 +656,15 @@ addCheckColumn (2); addTextColumn (0, 1); createStore (3, types); + addCountWidget (parent); } else -#else +#endif { GType types [2] = { GDK_TYPE_PIXBUF, G_TYPE_STRING }; addTextColumn (0, 1); createStore (2, types); } -#endif readModel(); g_signal_connect (getWidget(), "row-collapsed", G_CALLBACK (row_collapsed_cb), this); @@ -647,14 +735,9 @@ }; gtk_tree_model_foreach (getModel(), inner::foreach_sync_open, this); + syncCount(); } - // YGTreeView - -#if YAST2_VERSION >= 2019002 - virtual int markColumn() { return hasMultiSelection() ? 2 : -1; } -#endif - // YGSelectionStore void doAddItem (YItem *item) {} // rebuild will be called anyway @@ -666,6 +749,7 @@ GtkTreeIter iter; getTreeIter (item, &iter); setRowMark (&iter, 2, select); + syncCount(); } else #endif @@ -675,8 +759,10 @@ void doDeselectAllItems() { #if YAST2_VERSION >= 2019002 - if (hasMultiSelection()) + if (hasMultiSelection()) { unmarkAll(); + syncCount(); + } else #endif unfocusAllItems(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.86/VERSION new/yast2-gtk-2.21.87/VERSION --- old/yast2-gtk-2.21.86/VERSION 2010-12-23 04:07:52.000000000 +0100 +++ new/yast2-gtk-2.21.87/VERSION 2011-01-06 00:09:29.000000000 +0100 @@ -1 +1 @@ -2.21.86 +2.21.87 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.86/VERSION.cmake new/yast2-gtk-2.21.87/VERSION.cmake --- old/yast2-gtk-2.21.86/VERSION.cmake 2010-12-23 04:07:52.000000000 +0100 +++ new/yast2-gtk-2.21.87/VERSION.cmake 2011-01-06 00:09:29.000000000 +0100 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "86") +SET(VERSION_PATCH "87") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-wagon for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package yast2-wagon for openSUSE:Factory checked in at Fri Jan 7 13:02:20 CET 2011. -------- --- yast2-wagon/yast2-wagon.changes 2009-09-08 13:59:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-wagon/yast2-wagon.changes 2011-01-05 11:04:29.000000000 +0100 @@ -1,0 +2,108 @@ +Wed Jan 5 10:58:15 CET 2011 - locilka(a)suse.cz + +- Added more explicit RPM requirements (BNC #613820, Comment #22) +- 2.20.2 + +------------------------------------------------------------------- +Mon Jan 3 15:32:13 CET 2011 - locilka(a)suse.cz + +- Do not allow to continue without package lock (BNC #616982) +- 2.20.1 + +------------------------------------------------------------------- +Mon Mar 15 13:28:41 CET 2010 - locilka(a)suse.cz + +- Restarting YaST before calling registration after packages are + upgraded (BNC #587506). + +------------------------------------------------------------------- +Fri Mar 12 17:38:57 CET 2010 - locilka(a)suse.cz + +- Logging all repositories with their products during + wagon_update_proposal run (BNC #585095). + +------------------------------------------------------------------- +Tue Mar 2 19:10:10 CET 2010 - locilka(a)suse.cz + +- Added new possibility to check used repositories (modified by + Customer Center) before migration (BNC #579905). The very same + dialog is also used for manual way of adjusting repositories. +- Fixed 'Migration Type' dialog layout (BNC #582239). + +------------------------------------------------------------------- +Fri Feb 19 15:29:38 CET 2010 - locilka(a)suse.cz + +- Fixed help text (BNC #583177). +- Storing a solver testcase in case of solver issue (as suggested + in BNC #582046). + +------------------------------------------------------------------- +Thu Feb 18 17:18:03 CET 2010 - locilka(a)suse.cz + +- Disabling also repositories that provide installed products (as + packages) but do not describe products in metadata (BNC #579905). +- Cleanup before and after suse_register (BNC #580523). +- Added macro-recording. + +------------------------------------------------------------------- +Fri Feb 5 16:12:02 CET 2010 - locilka(a)suse.cz + +- Adjusting default values for sending optional data during + registration: no data before, all data after the migration + (BNC #576553). + +------------------------------------------------------------------- +Wed Feb 3 09:43:21 CET 2010 - locilka(a)suse.cz + +- Adapted RPM depenencies to prevent from crashes (BNC #551613). +- Checking repositories after registration, offering to rerun + the registration if no changes in the list of registered + repositories were made (BNC #575102). +- Proper (new) congratulations dialog (BNC #576519). + +------------------------------------------------------------------- +Fri Jan 29 16:35:00 CET 2010 - locilka(a)suse.cz + +- Raising a blocker in case of removing any product (except + migration ones) by solver in proposal (BNC #575117). +- Requesting to reboot to the new system as soon as possible at + the end of the migration (BNC #575093). + +------------------------------------------------------------------- +Thu Jan 28 11:45:12 CET 2010 - locilka(a)suse.cz + +- Fixed reset-packager functionality (BNC #573575). + +------------------------------------------------------------------- +Wed Jan 27 11:52:01 CET 2010 - locilka(a)suse.cz + +- Disabling repositories that provide some old version of product + to be upgraded (BNC #573092). +- Fixed RPM dependencies. + +------------------------------------------------------------------- +Tue Jan 26 15:13:12 CET 2010 - locilka(a)suse.cz + +- Added support for migration hook scripts. + +------------------------------------------------------------------- +Mon Jan 25 11:59:30 CET 2010 - locilka(a)suse.cz + +- Upgrading installed products moved after wagon self-update and + restart In some cases the newly added code was not executed + (BNC #573084). + +------------------------------------------------------------------- +Fri Jan 22 11:57:00 CET 2010 - locilka(a)suse.cz + +- Wagon extended to read and use migration products from the + <upgrade> section from product control files (BNC #559554). + +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-wagon-2.18.1.tar.bz2 New: ---- yast2-wagon-2.20.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-wagon.spec ++++++ --- /var/tmp/diff_new_pack.3cHOny/_old 2011-01-07 12:59:31.000000000 +0100 +++ /var/tmp/diff_new_pack.3cHOny/_new 2011-01-07 12:59:31.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-wagon (Version 2.18.1) +# spec file for package yast2-wagon (Version 2.20.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -19,23 +19,47 @@ Name: yast2-wagon -Version: 2.18.1 +Version: 2.20.2 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-wagon-2.18.1.tar.bz2 +Source0: yast2-wagon-2.20.2.tar.bz2 + Prefix: /usr + Group: System/YaST -License: GPL v2 or later +License: GPLv2+ # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 +# BNC #571621, Returns <upgrades> section from product file +Requires: yast2-pkg-bindings >= 2.19.1 + +# Called in proposal and in code +Requires: yast2-packager yast2-add-on + +# Counting packages directly in packages proposal (BNC #573482) +Requires: yast2-update >= 2.18.7 + +# Prevent from crashes (BNC #551613) +Requires: yast2-registration >= 2.18.0 + BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update + # xmllint BuildRequires: libxml2 + # control.rng BuildRequires: yast2-installation >= 2.17.44 + Provides: yast2-online-update-frontend:/usr/share/applications/YaST2/cd_update.desktop + +# See BNC #613820, Comment #22 +Conflicts: yast2-perl-bindings < 2.19.0 +Conflicts: yast2-storage < 2.19.0 + BuildArch: noarch + Summary: YaST2 - Migration Tool for Service Packs %description @@ -44,14 +68,16 @@ through command line tools. %prep -%setup -n yast2-wagon-2.18.1 +%setup -n yast2-wagon-2.20.2 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) ++++++ yast2-wagon-2.18.1.tar.bz2 -> yast2-wagon-2.20.2.tar.bz2 ++++++ ++++ 5819 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 keybinder for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package keybinder for openSUSE:Factory checked in at Fri Jan 7 12:57:00 CET 2011. -------- --- keybinder/keybinder.changes 2010-12-02 16:20:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/keybinder/keybinder.changes 2011-01-03 14:57:29.000000000 +0100 @@ -1,0 +2,22 @@ +Mon Jan 3 13:54:36 UTC 2011 - prusnak(a)opensuse.org + +- split lua files into a separate -lua subpackage + +------------------------------------------------------------------- +Fri Dec 24 10:10:24 UTC 2010 - gber(a)opensuse.org + +- use proper categories + +------------------------------------------------------------------- +Thu Dec 23 17:00:32 UTC 2010 - gber(a)opensuse.org + +- rpmlint cleanup + - make -devel package depend on library + - do not put non-python libraries in Development/Libraries/Python + group + - depend on versioned python-base + - recompressed sources +- enable compiler output +- include code examples + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- keybinder-0.2.2.tar.gz New: ---- keybinder-0.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ keybinder.spec ++++++ --- /var/tmp/diff_new_pack.xrlub1/_old 2011-01-07 12:55:51.000000000 +0100 +++ /var/tmp/diff_new_pack.xrlub1/_new 2011-01-07 12:55:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package keybinder (Version 0.2.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -22,12 +22,12 @@ Name: keybinder Version: 0.2.2 -Release: 1 +Release: 2 License: GPLv2 Summary: A library for registering global keyboard shortcuts Url: http://kaizer.se/wiki/keybinder/ -Group: Development/Languages/Other -Source: http://kaizer.se/publicfiles/keybinder/%{name}-%{version}.tar.gz +Group: Development/Libraries/Other +Source: %{name}-%{version}.tar.bz2 BuildRequires: fdupes BuildRequires: lua-devel BuildRequires: pkgconfig(gtk+-2.0) @@ -49,7 +49,7 @@ %package -n %libname License: GPLv2 Summary: Library package for keybinder -Group: Development/Languages/Python +Group: System/Libraries %description -n %libname Library for registering global keyboard shortcuts. Keybinder @@ -64,17 +64,27 @@ %package devel License: GPLv2 Summary: Development files for keybinder -Group: Development/Libraries/Python +Group: Development/Libraries/Other +Requires: %{libname} = %{version} %description devel This package contains header files needed when building applications based on %{name}. -%package -n python-%{name} +%package lua +License: GPLv2 +Summary: Lua files for keybinder +Group: Development/Libraries/Other +Requires: %{libname} = %{version} + +%description lua +This package contains Lua files for applications based on %{name}. +%package -n python-%{name} Summary: Python bindings for keybinder -Group: Development/Languages/Python +Group: Development/Libraries/Python +Requires: python-base = %{py_ver} Requires: %{libname} = %{version} Requires: python-gobject2 Requires: python-gtk @@ -89,7 +99,7 @@ %{configure}\ --disable-static \ --enable-python -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %make_install @@ -110,11 +120,15 @@ %files devel %defattr(-,root,root) +%doc examples %{_includedir}/keybinder.h -%{_libdir}/lua/*/keybinder.so %{_libdir}/libkeybinder.so %{_libdir}/pkgconfig/keybinder.pc +%files lua +%defattr(-,root,root) +%{_libdir}/lua/*/keybinder.so + %files -n python-%{name} %defattr(-,root,root) %{python_sitearch}/%{name} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kpackagekit for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package kpackagekit for openSUSE:Factory checked in at Fri Jan 7 12:55:33 CET 2011. -------- --- KDE/kpackagekit/kpackagekit.changes 2010-12-08 11:24:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/kpackagekit/kpackagekit.changes 2011-01-06 11:19:21.000000000 +0100 @@ -1,0 +2,32 @@ +Thu Jan 6 10:18:30 UTC 2011 - rwooninck(a)opensuse.org + +- Update to 0.6.3.3 + - Fix some bug that might cause crashes and unsorted lists + +------------------------------------------------------------------- +Wed Dec 29 12:44:49 UTC 2010 - rwooninck(a)opensuse.org + +- Update to 0.6.3.2 + - Fix random startup crash (forgot to cherry-pick) + - Fix version number + - Fix some crashes on categories list + - Add 'repo:' support (browsing by repo) + +------------------------------------------------------------------- +Wed Dec 22 16:37:35 UTC 2010 - rwooninck(a)opensuse.org + +- Update to 0.6.3 + * Fix some double clicks issues + * Fix animations + * Add InstallPrinterDriver (thanks to Tim Waugh) + * Fix crash in KDE 4.6 + * Add hide button so descriptions can be hidden + * Speed Up Delegate + * Improve Gstreamer instalation + * Add architecture column + * Add back icons when there is no AppInstall data available + * Fix number of updates in systray +- Added patch to fix building with PackageKit 0.6.10 + + Upstream patch from Dantti + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kpackagekit-0.6.2.tar.bz2 kpackagekit-po.tar.bz2 New: ---- kpackagekit-0.6.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpackagekit.spec ++++++ --- /var/tmp/diff_new_pack.dIx3f0/_old 2011-01-07 12:55:02.000000000 +0100 +++ /var/tmp/diff_new_pack.dIx3f0/_new 2011-01-07 12:55:02.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kpackagekit (Version 0.6.2) +# spec file for package kpackagekit (Version 0.6.3.3) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -19,15 +19,13 @@ Summary: KDE interface for PackageKit Name: kpackagekit -Version: 0.6.2 -Release: 2 +Version: 0.6.3.3 +Release: 1 License: GPLv3 Group: System/Packages #http://websvn.kde.org/trunk/playground/sysadmin/kpackagekit/ # http://kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}.7z Source0: kpackagekit-%{version}.tar.bz2 -# Original tarball does not contain the entries to compile the translations -Source1: kpackagekit-po.tar.bz2 Url: http://www.kde-apps.org/content/show.php/KPackageKit?content=84745 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libkde4-devel libpackagekit-qt-devel xz @@ -51,12 +49,14 @@ %lang_package %prep -%setup -q -a 1 +%setup -q %patch -p1 +%if 0 # Original tarball does not contain the entries to compile the translations echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt echo "add_subdirectory( po )" >> CMakeLists.txt +%endif %build %cmake_kde4 -d build ++++++ kpackagekit-0.6.2.tar.bz2 -> kpackagekit-0.6.3.3.tar.bz2 ++++++ ++++ 179914 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-mail for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package yast2-mail for openSUSE:Factory checked in at Fri Jan 7 12:53:50 CET 2011. -------- --- yast2-mail/yast2-mail.changes 2010-11-25 12:47:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-mail/yast2-mail.changes 2011-01-04 12:20:18.000000000 +0100 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Tue Jan 4 11:17:20 UTC 2011 - lslezak(a)suse.cz + +- fixed syntax error +- 2.20.0 + calling whatdependson for head-i586 Old: ---- yast2-mail-2.18.6.tar.bz2 New: ---- yast2-mail-2.20.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-mail.spec ++++++ --- /var/tmp/diff_new_pack.1H0whz/_old 2011-01-07 12:53:19.000000000 +0100 +++ /var/tmp/diff_new_pack.1H0whz/_new 2011-01-07 12:53:19.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-mail (Version 2.18.6) +# spec file for package yast2-mail (Version 2.20.0) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -19,11 +19,11 @@ Name: yast2-mail -Version: 2.18.6 +Version: 2.20.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-mail-2.18.6.tar.bz2 +Source0: yast2-mail-2.20.0.tar.bz2 Prefix: /usr @@ -70,7 +70,7 @@ configuration. %prep -%setup -n yast2-mail-2.18.6 +%setup -n yast2-mail-2.20.0 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-mail-2.18.6.tar.bz2 -> yast2-mail-2.20.0.tar.bz2 ++++++ ++++ 4265 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-mail-2.18.6/configure.in new/yast2-mail-2.20.0/configure.in --- old/yast2-mail-2.18.6/configure.in 2010-01-27 16:21:39.000000000 +0100 +++ new/yast2-mail-2.20.0/configure.in 2011-01-04 12:17:59.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-mail, 2.18.3, http://bugs.opensuse.org/, yast2-mail) +AC_INIT(yast2-mail, 2.20.0, http://bugs.opensuse.org/, yast2-mail) 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.18.3" +VERSION="2.20.0" RPMNAME="yast2-mail" MAINTAINER="Peter Varkoly <varkoly(a)novell.com>" 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-mail-2.18.6/src/Mail.ycp new/yast2-mail-2.20.0/src/Mail.ycp --- old/yast2-mail-2.18.6/src/Mail.ycp 2010-11-25 13:33:31.000000000 +0100 +++ new/yast2-mail-2.20.0/src/Mail.ycp 2011-01-04 12:19:50.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: Mail.ycp 62891 2010-11-25 11:33:23Z varkoly $ + * $Id: Mail.ycp 63072 2011-01-04 11:19:49Z lslezak $ * * Representation of the configuration of mail. * Input and output routines. @@ -311,8 +311,8 @@ } if( newcyrus ) { - Service::Enable("cyrus") - Service::Start("cyrus") + Service::Enable("cyrus"); + Service::Start("cyrus"); } return message; } 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-mail-2.18.6/VERSION new/yast2-mail-2.20.0/VERSION --- old/yast2-mail-2.18.6/VERSION 2010-11-25 13:44:22.000000000 +0100 +++ new/yast2-mail-2.20.0/VERSION 2011-01-04 12:16:24.000000000 +0100 @@ -1 +1 @@ -2.18.6 +2.20.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-samba-server for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package yast2-samba-server for openSUSE:Factory checked in at Fri Jan 7 12:53:05 CET 2011. -------- --- yast2-samba-server/yast2-samba-server.changes 2010-02-19 17:26:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-samba-server/yast2-samba-server.changes 2011-01-06 17:07:52.000000000 +0100 @@ -0,0 +1,12 @@ +------------------------------------------------------------------- +Thu Jan 6 17:00:30 CET 2011 - locilka(a)suse.cz + +- Added 'netbios-server' firewall service to list of services + required to be open during firewall configuration (BNC #541958) +- 2.20.1 + +------------------------------------------------------------------- +Tue Jan 4 17:18:23 CET 2011 - locilka(a)suse.cz + +- Also accepting samba-gplv3 packages (BNC #657414) + calling whatdependson for head-i586 Old: ---- yast2-samba-server-2.18.3.tar.bz2 New: ---- yast2-samba-server-2.20.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-server.spec ++++++ --- /var/tmp/diff_new_pack.60Pmjd/_old 2011-01-07 12:51:07.000000000 +0100 +++ /var/tmp/diff_new_pack.60Pmjd/_new 2011-01-07 12:51:07.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-samba-server (Version 2.18.3) +# spec file for package yast2-samba-server (Version 2.20.1) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -19,11 +19,11 @@ Name: yast2-samba-server -Version: 2.18.3 +Version: 2.20.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-samba-server-2.18.3.tar.bz2 +Source0: yast2-samba-server-2.20.1.tar.bz2 Prefix: /usr @@ -53,7 +53,7 @@ configuration. %prep -%setup -n yast2-samba-server-2.18.3 +%setup -n yast2-samba-server-2.20.1 %build %{prefix}/bin/y2tool y2autoconf @@ -90,5 +90,4 @@ %{prefix}/share/applications/YaST2/samba-server.desktop /usr/share/YaST2/schema/autoyast/rnc/samba-server.rnc %doc %{prefix}/share/doc/packages/yast2-samba-server - %changelog ++++++ yast2-samba-server-2.18.3.tar.bz2 -> yast2-samba-server-2.20.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-2.18.3/configure new/yast2-samba-server-2.20.1/configure --- old/yast2-samba-server-2.18.3/configure 2010-02-19 17:25:04.000000000 +0100 +++ new/yast2-samba-server-2.20.1/configure 2011-01-06 17:05:56.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-samba-server 2.18.3. +# Generated by GNU Autoconf 2.63 for yast2-samba-server 2.20.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-samba-server' PACKAGE_TARNAME='yast2-samba-server' -PACKAGE_VERSION='2.18.3' -PACKAGE_STRING='yast2-samba-server 2.18.3' +PACKAGE_VERSION='2.20.1' +PACKAGE_STRING='yast2-samba-server 2.20.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-samba-server 2.18.3 to adapt to many kinds of systems. +\`configure' configures yast2-samba-server 2.20.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1346,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-samba-server 2.18.3:";; + short | recursive ) echo "Configuration of yast2-samba-server 2.20.1:";; esac cat <<\_ACEOF @@ -1426,7 +1426,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-samba-server configure 2.18.3 +yast2-samba-server configure 2.20.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1440,7 +1440,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-samba-server $as_me 2.18.3, which was +It was created by yast2-samba-server $as_me 2.20.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2420,7 +2420,7 @@ # Define the identity of the package. PACKAGE='yast2-samba-server' - VERSION='2.18.3' + VERSION='2.20.1' cat >>confdefs.h <<_ACEOF @@ -2542,7 +2542,7 @@ -VERSION="2.18.3" +VERSION="2.20.1" RPMNAME="yast2-samba-server" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3484,7 +3484,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-samba-server $as_me 2.18.3, which was +This file was extended by yast2-samba-server $as_me 2.20.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3534,7 +3534,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-samba-server config.status 2.18.3 +yast2-samba-server config.status 2.20.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-2.18.3/configure.in new/yast2-samba-server-2.20.1/configure.in --- old/yast2-samba-server-2.18.3/configure.in 2010-02-19 17:25:02.000000000 +0100 +++ new/yast2-samba-server-2.20.1/configure.in 2011-01-06 17:05:53.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-samba-server, 2.18.3, http://bugs.opensuse.org/, yast2-samba-server) +AC_INIT(yast2-samba-server, 2.20.1, http://bugs.opensuse.org/, yast2-samba-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.3" +VERSION="2.20.1" RPMNAME="yast2-samba-server" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-2.18.3/src/dialogs.ycp new/yast2-samba-server-2.20.1/src/dialogs.ycp --- old/yast2-samba-server-2.18.3/src/dialogs.ycp 2010-02-19 17:22:10.000000000 +0100 +++ new/yast2-samba-server-2.20.1/src/dialogs.ycp 2011-01-06 17:03:31.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Stanislav Visnovsky <stanislav.visnovsky(a)suse.cz> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: dialogs.ycp 60883 2010-02-19 16:22:09Z locilka $ + * $Id: dialogs.ycp 63117 2011-01-06 16:03:31Z locilka $ */ { @@ -980,9 +980,9 @@ "get_service_auto_start": SambaService::GetServiceAutoStart, "set_service_auto_start": SambaService::SetServiceAutoStart, ]), - // BNC #247344 + // BNC #247344, BNC #541958 (comment #18) "FIREWALL": CWMFirewallInterfaces::CreateOpenFirewallWidget($[ - "services": [ "service:samba-server" ], + "services": [ "service:samba-server", "service:netbios-server" ], "display_details": true ]), "SHARES": $[ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-2.18.3/src/SambaServer.pm new/yast2-samba-server-2.20.1/src/SambaServer.pm --- old/yast2-samba-server-2.18.3/src/SambaServer.pm 2010-01-25 17:01:54.000000000 +0100 +++ new/yast2-samba-server-2.20.1/src/SambaServer.pm 2011-01-04 17:26:40.000000000 +0100 @@ -5,7 +5,7 @@ # Martin Lazar <mlazar(a)suse.cz> # Lukas Ocilka <locilka(a)suse.cz> # -# $Id: SambaServer.pm 60516 2010-01-25 16:01:54Z locilka $ +# $Id: SambaServer.pm 63077 2011-01-04 16:26:39Z locilka $ # # Representation of the configuration of samba-server. # Input and output routines. @@ -54,6 +54,8 @@ # list of required packages my $RequiredPackages = ["samba", "samba-client"]; +# ... or another packages (BNC #657414) +my $RequiredPackages_gplv3 = ["samba-gplv3", "samba-gplv3-client"]; my $GlobalsConfigured = 0; @@ -77,6 +79,17 @@ || SambaAccounts->GetModified(); }; +# Check that packages are installed or offer their installation +BEGIN{ $TYPEINFO{GetModified} = ["function", "boolean"] } +sub CheckAndInstallPackages { + # installed_required_packages? or installed_packages_gplv3? or install_packages! + PackageSystem->InstalledAll($RequiredPackages) || + PackageSystem->InstalledAll($RequiredPackages_gplv3) || + PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages) || + return 0; + return 1; +} + # Read all samba-server settings # @param force_reread force reread configuration # @param no_progreass_bar disable progress bar @@ -129,7 +142,7 @@ Progress->NextStage(); # check installed packages unless (Mode->test()) { - PackageSystem->CheckAndInstallPackagesInteractive($RequiredPackages) or return 0; + CheckAndInstallPackages() or return 0; } SambaConfig->Read(); Samba->ReadSharesSetting(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-2.18.3/VERSION new/yast2-samba-server-2.20.1/VERSION --- old/yast2-samba-server-2.18.3/VERSION 2010-02-19 17:22:02.000000000 +0100 +++ new/yast2-samba-server-2.20.1/VERSION 2011-01-06 17:02:51.000000000 +0100 @@ -1 +1 @@ -2.18.3 +2.20.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Fri Jan 7 12:50:50 CET 2011. -------- --- aaa_base/aaa_base.changes 2010-12-21 17:28:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2011-01-04 22:22:31.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 4 21:21:09 UTC 2011 - adrian(a)suse.de + +- avoid trailing dot in HOSTNAME when no NIS domain is set + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.fYHgPw/_old 2011-01-07 12:49:35.000000000 +0100 +++ /var/tmp/diff_new_pack.fYHgPw/_new 2011-01-07 12:49:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package aaa_base (Version 11.4) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -20,7 +20,7 @@ Name: aaa_base Version: 11.4 -Release: 16 +Release: 17 License: GPLv2+ Group: System/Fhs Provides: bin bootutls etc skeleng skelger ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/profile new/aaa_base/etc/profile --- old/aaa_base/etc/profile 2010-12-07 17:54:01.000000000 +0100 +++ new/aaa_base/etc/profile 2011-01-04 22:20:56.000000000 +0100 @@ -125,6 +125,7 @@ # its self will provide the NIS/YP domainname, see domainname(8). test -z "$HOSTNAME" && HOSTNAME=${HOST}.`/bin/hostname -d` test "$HOSTNAME" = "${HOSTNAME#*.}" && HOSTNAME=${HOST}.`/bin/hostname -d` + HOSTNAME="${HOSTNAME%\.}" fi test -z "$LOGNAME" && LOGNAME=$USER case "$CPU" in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdepim4-runtime for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at Fri Jan 7 12:49:22 CET 2011. -------- --- KDE/kdepim4-runtime/kdepim4-runtime.changes 2010-12-08 14:24:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdepim4-runtime/kdepim4-runtime.changes 2010-12-23 00:48:47.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Dec 23 00:48:28 CET 2010 - dmueller(a)suse.de + +- update to 4.4.9: + * Compatibility fixes with KDE 4.6 RC1 + +------------------------------------------------------------------- +Thu Dec 16 13:38:17 UTC 2010 - wstephenson(a)novell.com + +- Revert to 4.4.8 for stability + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 4_6_BRANCH.diff akonadi.png kdepim-runtime-4.5.85.tar.bz2 New: ---- 4_4_BRANCH.diff kdepim-runtime-4.4.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.7tOkFD/_old 2011-01-07 12:49:02.000000000 +0100 +++ /var/tmp/diff_new_pack.7tOkFD/_new 2011-01-07 12:49:02.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kdepim4-runtime (Version 4.5.85) +# spec file for package kdepim4-runtime (Version 4.4.9) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -19,9 +19,10 @@ Name: kdepim4-runtime BuildRequires: cyrus-sasl-devel libqca2-devel python-devel -BuildRequires: boost-devel gpgme-devel libkdepimlibs4-devel +BuildRequires: boost-devel gnokii-devel gpgme-devel libkdepimlibs4-devel BuildRequires: libkde4-devel libsoprano-devel soprano-backend-redland BuildRequires: libmysqlclient-devel +BuildRequires: libknotificationitem-devel %define with_kitchensync 0 %define with_kpilot 1 %define with_kmobiletools 0 @@ -30,23 +31,21 @@ %if %with_kitchensync BuildRequires: libopensync-devel %endif -BuildRequires: fdupes libassuan-devel libmal1-devel libpisock-devel libqjson-devel +BuildRequires: fdupes libassuan-devel libmal1-devel libpisock-devel License: LGPLv2.1+ Group: System/GUI/KDE Summary: Base package of kdepim Url: http://www.kde.org -Version: 4.5.85 +Version: 4.4.9 Release: 1 Source0: kdepim-runtime-%version.tar.bz2 -Source1: akonadi.png -Patch: 4_6_BRANCH.diff +Patch: 4_4_BRANCH.diff Patch6: disable-knut.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Suggests: libkdepim4 Provides: kde4-akonadi = 4.2.90 Obsoletes: kde4-akonadi <= 4.2.90 -Obsoletes: kdepim4-runtime-devel < 4.5.80 %description This package contains the Akonadi files of the kdepim module. @@ -74,13 +73,10 @@ %makeinstall cd .. #remove menu entries of development tools - mkdir -p %{buildroot}%{_datadir}/pixmaps - install $RPM_SOURCE_DIR/akonadi.png %{buildroot}%{_datadir}/pixmaps/ - %suse_update_desktop_file -u akonaditray Network Email + rm $RPM_BUILD_ROOT/usr/share/applications/kde4/akonadi*.desktop %kde_post_install %fdupes -s $RPM_BUILD_ROOT %kde_post_install - rm %{buildroot}%_kde4_libdir/*.so %post -p /sbin/ldconfig @@ -90,6 +86,32 @@ rm -rf $RPM_BUILD_ROOT rm -rf filelists +%package devel +License: LGPLv2.1+ +Group: System/GUI/KDE +Summary: KDE Personal Information Management Base Package: Build Environment +Requires: kdepim4-runtime = %version +Provides: kde4-akonadi-devel = 4.2.90 +Obsoletes: kde4-akonadi-devel <= 4.2.90 + +%description devel +This packages contains development files of the kdepim-runtime module. + + + +Authors: +-------- + The KDE Team <kde(a)kde.org> + +%post devel -p /sbin/ldconfig + +%postun devel -p /sbin/ldconfig + +%files devel +%defattr(-,root,root) +%_kde4_libdir/*.so +#/usr/include/kabc + %files %defattr(-,root,root) %_kde4_bindir/* @@ -98,15 +120,10 @@ /usr/share/akonadi /usr/share/dbus-1/interfaces/* %_kde4_appsdir/akonadi -%_kde4_appsdir/akonadi_maildispatcher_agent/ %_kde4_sharedir/services %_kde4_configdir/* %_kde4_iconsdir/hicolor/64x64/apps/kolab.png -/usr/share/mime/packages/*.xml +/usr/share/mime/packages/kdepim-mime.xml /usr/share/autostart/kaddressbookmigrator.desktop -/usr/share/applications/kde4/accountwizard.desktop -/usr/share/pixmaps/akonadi.png -%_kde4_iconsdir/hicolor/*/apps/ox.png -%_kde4_applicationsdir/akonaditray.desktop %changelog ++++++ 4_6_BRANCH.diff -> 4_4_BRANCH.diff ++++++ --- KDE/kdepim4-runtime/4_6_BRANCH.diff 2010-11-23 00:18:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdepim4-runtime/4_4_BRANCH.diff 2010-12-23 09:36:54.000000000 +0100 @@ -1,7 +0,0 @@ -package: kdepim-runtime-4.4.4.tar.bz2 -kdemod: kdepim/runtime ---- BRANCH_STATUS -+++ BRANCH_STATUS -@@ -0,0 +1,2 @@ -+current HEAD: 1139643 -+svn di between //tags/KDE/4.4.4/kdepim/runtime and //branches/KDE/4.4/kdepim/runtime ++++++ disable-knut.diff ++++++ --- /var/tmp/diff_new_pack.7tOkFD/_old 2011-01-07 12:49:02.000000000 +0100 +++ /var/tmp/diff_new_pack.7tOkFD/_new 2011-01-07 12:49:02.000000000 +0100 @@ -1,11 +1,11 @@ ---- resources/CMakeLists.txt.orig 2010-07-17 15:43:52.982914971 +0200 -+++ resources/CMakeLists.txt 2010-07-17 15:43:58.658928661 +0200 -@@ -45,7 +45,7 @@ - endif (KDEPIMLIBS_KRESOURCES_LIBS) - macro_optional_add_subdirectory( kdeaccounts ) - if (NOT WINCE) +--- resources/CMakeLists.txt ++++ resources/CMakeLists.txt +@@ -30,7 +30,7 @@ + add_subdirectory( imap ) + add_subdirectory( kabc ) + add_subdirectory( kcal ) -add_subdirectory( knut ) +#add_subdirectory( knut ) - endif (NOT WINCE) add_subdirectory( kolabproxy ) - macro_optional_add_subdirectory( localbookmarks ) + add_subdirectory( localbookmarks ) + add_subdirectory( maildir ) ++++++ kdepim-runtime-4.5.85.tar.bz2 -> kdepim-runtime-4.4.9.tar.bz2 ++++++ ++++ 121633 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 linphone for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package linphone for openSUSE:Factory checked in at Fri Jan 7 12:48:41 CET 2011. -------- --- linphone/linphone.changes 2010-08-12 02:03:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/linphone/linphone.changes 2010-12-29 16:31:47.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Dec 29 15:25:31 UTC 2010 - aj(a)suse.de + +- Run spec file through spec-cleaner. +- Remove build dependencies on libgnomeprintui-devel and + libwnck-devel, they are not needed. + +------------------------------------------------------------------- +Thu Nov 11 10:43:50 UTC 2010 - coolo(a)novell.com + +- own parent directory for gnome-panel + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linphone.spec ++++++ --- /var/tmp/diff_new_pack.8jQWff/_old 2011-01-07 12:46:49.000000000 +0100 +++ /var/tmp/diff_new_pack.8jQWff/_new 2011-01-07 12:46:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package linphone (Version 3.3.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,20 +15,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: linphone -BuildRequires: gcc-c++ gnome-panel-devel gnutls-devel intltool libeXosip2-devel libglade2-devel libgnomeprintui-devel libosip2-devel libv4l-devel libwnck-devel perl-XML-Parser readline-devel speex-devel update-desktop-files +Version: 3.3.2 +Release: 2 License: GPLv2+ -Group: Productivity/Networking/Other Summary: Web Phone -Version: 3.3.2 -Release: 1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.linphone.org +Group: Productivity/Networking/Other Source0: %{name}-%{version}.tar.bz2 Source1: %{name}-manual.tar.bz2 +BuildRequires: gcc-c++ +BuildRequires: gnome-panel-devel +BuildRequires: gnutls-devel +BuildRequires: intltool +BuildRequires: libeXosip2-devel +BuildRequires: libosip2-devel +BuildRequires: libv4l-devel +BuildRequires: perl-XML-Parser +BuildRequires: pkgconfig(libglade-2.0) +BuildRequires: readline-devel +BuildRequires: speex-devel +BuildRequires: update-desktop-files +BuildRoot: %{_tmppath}/%{name}-%{version}-build #NoSource: 0 %description @@ -39,16 +49,10 @@ SIP-based Web phones. With several codecs available, it can be used with high speed connections as well as 28k modems. - - -Authors: --------- - Simon Morlat <simon.morlat(a)linphone.org> - %package applet License: GPLv2+ -Group: Productivity/Networking/Other Summary: Web Phone +Group: Productivity/Networking/Other Requires: %{name} = %{version} %description applet @@ -59,17 +63,17 @@ SIP-based Web phones. With several codecs available, it can be used with high speed connections as well as 28k modems. - - -Authors: --------- - Simon Morlat <simon.morlat(a)linphone.org> - %package devel License: GPLv2+ -Group: Productivity/Networking/Other Summary: Web Phone -Requires: %{name} = %{version} glib2-devel alsa-devel speex-devel glibc-devel libosip2-devel libeXosip2-devel +Group: Productivity/Networking/Other +Requires: %{name} = %{version} +Requires: alsa-devel +Requires: glibc-devel +Requires: libeXosip2-devel +Requires: libosip2-devel +Requires: pkgconfig(glib-2.0) +Requires: speex-devel %description devel Linphone is a Web phone with a GNOME interface. It lets you make @@ -79,46 +83,40 @@ SIP-based Web phones. With several codecs available, it can be used with high speed connections as well as 28k modems. - - -Authors: --------- - Simon Morlat <simon.morlat(a)linphone.org> - %prep %setup -q find -name "CVS" -type d | xargs rm -rfv %build # needed for linphone-1.3.0: -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing" %configure\ --libexecdir=%{_prefix}/lib/gnome-panel\ --disable-static \ --disable-video -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install +%make_install # install manual -tar xj -C $RPM_BUILD_ROOT%{_datadir}/gnome/help/ -f %{S:1} +tar xj -C %{buildroot}%{_datadir}/gnome/help/ -f %{S:1} #cleanup -rm -fv $RPM_BUILD_ROOT%{_includedir}/speex* -rm -fv $RPM_BUILD_ROOT%{_datadir}/doc/speex-1.1.4/manual.pdf +rm -fv %{buildroot}%{_includedir}/speex* +rm -fv %{buildroot}%{_datadir}/doc/speex-1.1.4/manual.pdf # FIXME: Upstream bug: Use GNOME2-style desktop files instead of GNOME1-style. # install desktop file -%suse_update_desktop_file -D "linphone/index.xml.html" -G "SIP Phone" %name Network Telephony +%suse_update_desktop_file -D "linphone/index.xml.html" -G "SIP Phone" %{name} Network Telephony %find_lang %{name} cat %{name}.lang # delete unused man pages -rm -rf $RPM_BUILD_ROOT%{_datadir}/man/cs/ +rm -rf %{buildroot}%{_mandir}/cs/ # no need to package la files -rm -f $RPM_BUILD_ROOT%{_libdir}/*.*a -ln -sf linphone-3 $RPM_BUILD_ROOT%{_bindir}/linphone -cp -a ./pixmaps/linphone-3.png $RPM_BUILD_ROOT%{_datadir}/linphone/linphone2.png +rm -f %{buildroot}%{_libdir}/*.*a +ln -sf linphone-3 %{buildroot}%{_bindir}/linphone +cp -a ./pixmaps/linphone-3.png %{buildroot}%{_datadir}/linphone/linphone2.png %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -139,7 +137,7 @@ %files applet %defattr(-,root,root) #%{_libdir}/bonobo/servers/*.server -/usr/lib/gnome-panel/* +%{_prefix}/lib/gnome-panel %files devel %defattr(-,root,root) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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