- up to 1.6.0

diff --git a/xfce4-places-plugin-position.patch b/xfce4-places-plugin-position.patch
deleted file mode 100644 (file)
index 48eb2e1..0000000
--- a/xfce4-places-plugin-position.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -ur xfce4-places-plugin-1.2.0/panel-plugin/view.c xfce4-places-plugin-1.2.0-position/panel-plugin/view.c
---- xfce4-places-plugin-1.2.0/panel-plugin/view.c      2011-03-03 13:43:31.938573607 +0100
-+++ xfce4-places-plugin-1.2.0-position/panel-plugin/view.c     2011-03-03 13:42:28.099573608 +0100
-@@ -734,6 +734,55 @@
- }
- 
- static void
-+pview_position_menu (GtkMenu *menu,
-+                     gint *x,
-+                     gint *y,
-+                     gboolean *push_in,
-+                     PlacesView *view)
-+{
-+  GtkWidget *button;
-+  GtkRequisition requisition;
-+  GtkOrientation orientation;
-+
-+  button = view->button;
-+  orientation = xfce_panel_plugin_get_orientation (view->plugin);
-+  gtk_widget_size_request (GTK_WIDGET (menu), &requisition);
-+  gdk_window_get_origin (GTK_WIDGET (view->plugin)->window, x, y);
-+
-+  switch (orientation)
-+    {
-+    case GTK_ORIENTATION_HORIZONTAL:
-+      if (*y + button->allocation.height + requisition.height > gdk_screen_height ())
-+        /* Show menu above */
-+        *y -= requisition.height;
-+      else
-+        /* Show menu below */
-+        *y += button->allocation.height;
-+
-+      if (*x + requisition.width > gdk_screen_width ())
-+        /* Adjust horizontal position */
-+        *x = gdk_screen_width () - requisition.width;
-+      break;
-+
-+    case GTK_ORIENTATION_VERTICAL:
-+      if (*x + button->allocation.width + requisition.width > gdk_screen_width ())
-+        /* Show menu on the right */
-+        *x -= requisition.width;
-+      else
-+        /* Show menu on the left */
-+        *x += button->allocation.width;
-+
-+      if (*y + requisition.height > gdk_screen_height ())
-+        /* Adjust vertical position */
-+        *y = gdk_screen_height () - requisition.height;
-+      break;
-+
-+    default:
-+      break;
-+    }
-+}
-+
-+static void
- pview_open_menu(PlacesView *pd)
- {
-     /* check if menu is needed, or it needs an update */
-@@ -745,8 +794,7 @@
- 
-     /* popup menu */
-     gtk_menu_popup (GTK_MENU (pd->menu), NULL, NULL,
--                    xfce_panel_plugin_position_menu,
--                    pd->plugin, 0,
-+                    (GtkMenuPositionFunc)pview_position_menu, pd, 0,
-                     gtk_get_current_event_time ());
-     
-     /* menu timeout to poll for model changes */

diff --git a/xfce4-places-plugin.spec b/xfce4-places-plugin.spec
index 729b35c27dd6c5ae87f7345add1bf64fa3b7d31c..2e7f5c90c9846606469202cc97c0163ea9606f68 100644 (file)
--- a/xfce4-places-plugin.spec
+++ b/xfce4-places-plugin.spec
@@ -1,13 +1,12 @@
 Summary:       A places plugin for the Xfce panel
 Summary(pl.UTF-8):     Wtyczka places dla panelu Xfce
 Name:          xfce4-places-plugin
-Version:       1.3.0
+Version:       1.6.0
 Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.3/%{name}-%{version}.tar.bz2
-# Source0-md5: d075fffccf44bcf09a1bfcd4e0cd38a2
-Patch0:                %{name}-position.patch
+Source0:       http://archive.xfce.org/src/panel-plugins/xfce4-places-plugin/1.6/%{name}-%{version}.tar.bz2
+# Source0-md5: 8f3ec883efb0775052eeea816bbd8a23
 URL:           http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin
 BuildRequires: Thunar-devel >= 1.2.0
 BuildRequires: autoconf
@@ -51,8 +50,6 @@ Nautilusem, panelem GNOME itp.
 
 %prep
 %setup -q
-# verify if still needed
-#%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -70,7 +67,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/libplaces.la
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
 
 %find_lang %{name}
 
@@ -81,5 +79,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/xfce4-popup-places
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-places-plugin
-%{_datadir}/xfce4/panel-plugins/places.desktop
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libplaces.so
+%{_datadir}/xfce4/panel/plugins/places.desktop