commit fc0a36e3949153cfadf516813a40ee595a707c49
Author: Christoph Wickert <cwickert(a)fedoraproject.org>
Date: Fri Aug 31 23:44:28 2012 +0200
Update to 1.4.0 (fixes #757180)
- Bring back the icon naming patch
- No longer require Thunar (not using thunar-vfs any more)
.gitignore | 1 +
sources | 2 +-
xfce4-places-plugin-1.2.0-dsofix.patch | 23 -
xfce4-places-plugin-1.2.0-exo1.patch | 44 -
xfce4-places-plugin-1.2.0-gio.patch | 1634 ---------------------------
xfce4-places-plugin-1.2.0-icon-naming.patch | 23 -
xfce4-places-plugin-1.2.0-libxfce4ui.patch | 247 ----
xfce4-places-plugin-1.4.0-icon-naming.patch | 23 +
xfce4-places-plugin-port-to-exo-1.patch | 44 -
xfce4-places-plugin.spec | 75 +-
10 files changed, 75 insertions(+), 2041 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b076604..b5e8afb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
xfce4-places-plugin-1.2.0.tar.bz2
/xfce4-places-plugin-1.3.0.tar.bz2
+/xfce4-places-plugin-1.4.0.tar.bz2
diff --git a/sources b/sources
index eb085c8..e3567de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d075fffccf44bcf09a1bfcd4e0cd38a2 xfce4-places-plugin-1.3.0.tar.bz2
+cdb5c966c7a93ca29f2ce50223782133 xfce4-places-plugin-1.4.0.tar.bz2
diff --git a/xfce4-places-plugin-1.4.0-icon-naming.patch
b/xfce4-places-plugin-1.4.0-icon-naming.patch
new file mode 100644
index 0000000..7971e8a
--- /dev/null
+++ b/xfce4-places-plugin-1.4.0-icon-naming.patch
@@ -0,0 +1,23 @@
+diff -dur xfce4-places-plugin-1.4.0.orig/panel-plugin/model_system.c
xfce4-places-plugin-1.4.0/panel-plugin/model_system.c
+--- xfce4-places-plugin-1.4.0.orig/panel-plugin/model_system.c 2012-05-07
18:20:45.000000000 +0200
++++ xfce4-places-plugin-1.4.0/panel-plugin/model_system.c 2012-08-31 22:22:10.495975480
+0200
+@@ -204,7 +204,7 @@
+ /* File System (/) */
+ bookmark = places_bookmark_create(_("File System"));
+ bookmark->uri = "/";
+- bookmark->icon = g_themed_icon_new("gtk-harddisk");
++ bookmark->icon = g_themed_icon_new("drive-harddisk");
+
+ terminal = places_create_open_terminal_action(bookmark);
+ bookmark->actions = g_list_prepend(bookmark->actions, terminal);
+diff -dur xfce4-places-plugin-1.4.0.orig/panel-plugin/places.desktop.in
xfce4-places-plugin-1.4.0/panel-plugin/places.desktop.in
+--- xfce4-places-plugin-1.4.0.orig/panel-plugin/places.desktop.in 2012-05-07
15:42:29.000000000 +0200
++++ xfce4-places-plugin-1.4.0/panel-plugin/places.desktop.in 2012-08-31
22:21:02.407515385 +0200
+@@ -2,6 +2,6 @@
+ Type=X-XFCE-PanelPlugin
+ _Name=Places
+ _Comment=Access folders, documents, and removable media
+-Icon=file-manager
++Icon=system-file-manager
+ X-XFCE-Module=places
+ X-XFCE-Unique=FALSE
diff --git a/xfce4-places-plugin.spec b/xfce4-places-plugin.spec
index a11b402..42f38c3 100644
--- a/xfce4-places-plugin.spec
+++ b/xfce4-places-plugin.spec
@@ -1,22 +1,34 @@
-Name: xfce4-places-plugin
-Version: 1.3.0
-Release: 2%{?dist}
-Summary: Places menu for the Xfce panel
-
-Group: User Interface/Desktops
-License: GPLv2+
-URL:
http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:
http://archive.xfce.org/src/panel-plugins/%{name}/1.3/%{name}-%{version}....
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: xfce4-panel-devel >= 4.8.0
+# Review:
https://bugzilla.redhat.com/show_bug.cgi?id=173105
+
+%global minorversion 1.4
+
+%if 0%{?fedora} >= 18
+ %global xfceversion 4.10
+%else
+ %global xfceversion 4.8
+%endif
+
+Name: xfce4-places-plugin
+Version: 1.4.0
+Release: 1%{?dist}
+Summary: Places menu for the Xfce panel
+
+Group: User Interface/Desktops
+License: GPLv2+
+URL:
http://goodies.xfce.org/projects/panel-plugins/%{name}
+#VCS:
git:git://git.xfce.org/panel-plugins/xfce4-places-plugin
+Source0:
http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}...
+# Submitted upstream through
https://bugzilla.xfce.org/show_bug.cgi?id=9253
+Patch0: xfce4-places-plugin-1.4.0-icon-naming.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: libxfce4ui-devel >= 4.8.0
+BuildRequires: xfce4-panel-devel >= 4.8.0
BuildRequires: exo-devel >= 0.5.0
-BuildRequires: libxfce4ui-devel >= 0.8.0
-BuildRequires: libxfce4util-devel >= 0.8.0
-BuildRequires: libxml2-devel, gettext, intltool
-BuildRequires: autoconf libtool libnotify-devel xfce4-dev-tools
-Requires: xfce4-panel >= 4.8.0, Thunar >= 0.9.0
+BuildRequires: libnotify-devel >= 0.4.0
+BuildRequires: gettext
+BuildRequires: intltool
+Requires: xfce4-panel >= %{xfceversion}
%description
A menu with quick access to folders, documents, and removable media. The
@@ -24,38 +36,51 @@ Places plugin brings much of the functionality of GNOME’s Places menu
to
Xfce. It puts a simple button on the panel. Clicking on this button opens up
a menu with 4 sections:
1) System-defined directories (home folder, trash, desktop, file system)
-2) Removable media (using thunar-vfs)
+2) Removable media
3) User-defined bookmarks (reads ~/.gtk-bookmarks)
4) Recent documents submenu (requires GTK v2.10 or greater)
+
%prep
%setup -q
+%patch0 -p1 -b .icon-naming
+
%build
-xdt-autogen
-%configure --disable-static
-make %{?_smp_mflags}
+%configure
+make %{?_smp_mflags} V=1
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# remove la file
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
+# make sure debuginfo is generated properly
+chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so
+
%find_lang %{name}
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_bindir}/xfce4-popup-places
-%{_libexecdir}/xfce4/panel-plugins/%{name}
-%{_datadir}/xfce4/panel-plugins/*.desktop
-
+%{_libdir}/xfce4/panel/plugins/*.so
+%{_datadir}/xfce4/panel/plugins/*.desktop
%changelog
+* Fri Aug 31 2012 Christoph Wickert <cwickert(a)fedoraproject.org> - 1.4.0-1
+- Update to 1.4.0 (fixes #757180)
+- Bring back the icon naming patch
+- No longer require Thunar (not using thunar-vfs any more)
+
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.3.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild