- merged from DEVEL

Changed files:
    Thunar-desktop.patch -> 1.6
    Thunar.spec -> 1.35

diff --git a/Thunar-desktop.patch b/Thunar-desktop.patch
index 55659fa778482baa3891416fbb76b27ccc7f8a06..d3cec43993a63261b20c2f76de2404357b7e8f8b 100644 (file)
--- a/Thunar-desktop.patch
+++ b/Thunar-desktop.patch
@@ -1,44 +1,46 @@
-diff -urN Thunar-1.0.0/Thunar-bulk-rename.desktop.in.in Thunar-1.0.0.new/Thunar-bulk-rename.desktop.in.in
---- Thunar-1.0.0/Thunar-bulk-rename.desktop.in.in      2008-10-22 08:43:23.000000000 +0200
-+++ Thunar-1.0.0.new/Thunar-bulk-rename.desktop.in.in  2009-02-27 21:39:10.000000000 +0100
-@@ -8,6 +8,7 @@
+diff -urN Thunar-1.2.0/thunar/thunar-settings.desktop.in Thunar-1.2.0.new//thunar/thunar-settings.desktop.in
+--- Thunar-1.2.0/thunar/thunar-settings.desktop.in     2011-01-16 16:02:11.000000000 +0000
++++ Thunar-1.2.0.new//thunar/thunar-settings.desktop.in        2011-01-30 12:56:28.076666636 +0000
+@@ -7,4 +7,5 @@
  Terminal=false
- StartupNotify=true
  Type=Application
--Categories=Application;System;Utility;Core;GTK;Filesystem;
-+Categories=X-XFCE;System;Utility;Core;GTK;Filesystem;
+ Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
 +OnlyShowIn=XFCE;
- 
- # vi:set encoding=UTF-8:
-diff -urN Thunar-1.0.0/Thunar.desktop.in.in Thunar-1.0.0.new/Thunar.desktop.in.in
---- Thunar-1.0.0/Thunar.desktop.in.in  2009-01-12 21:38:49.000000000 +0100
-+++ Thunar-1.0.0.new/Thunar.desktop.in.in      2009-02-27 21:39:21.000000000 +0100
-@@ -8,6 +8,7 @@
+ StartupNotify=true
+diff -urN Thunar-1.2.0/Thunar-bulk-rename.desktop.in.in Thunar-1.2.0.new//Thunar-bulk-rename.desktop.in.in
+--- Thunar-1.2.0/Thunar-bulk-rename.desktop.in.in      2011-01-16 16:02:11.000000000 +0000
++++ Thunar-1.2.0.new//Thunar-bulk-rename.desktop.in.in 2011-01-30 12:53:15.139999548 +0000
+@@ -7,6 +7,7 @@
  Terminal=false
  StartupNotify=true
  Type=Application
--Categories=Application;System;Utility;Core;GTK;FileManager;
-+Categories=X-XFCE;System;Utility;Core;GTK;FileManager;
+-Categories=System;Utility;Core;GTK;Filesystem;
++Categories=X-XFCE;System;Utility;Core;GTK;Filesystem;
 +OnlyShowIn=XFCE;
  
  # vi:set encoding=UTF-8:
---- Thunar-1.0.1/Thunar-folder-handler.desktop.in.in~  2008-10-22 08:43:23.000000000 +0200
-+++ Thunar-1.0.1/Thunar-folder-handler.desktop.in.in   2010-05-11 12:17:08.053352282 +0200
-@@ -10,7 +10,8 @@
+diff -urN Thunar-1.2.0/Thunar.desktop.in.in Thunar-1.2.0.new//Thunar.desktop.in.in
+--- Thunar-1.2.0/Thunar.desktop.in.in  2011-01-16 16:02:11.000000000 +0000
++++ Thunar-1.2.0.new//Thunar.desktop.in.in     2011-01-30 12:55:39.470000167 +0000
+@@ -7,6 +7,6 @@
  Terminal=false
  StartupNotify=true
  Type=Application
--Categories=System;Utility;Core;GTK;FileManager;
-+Categories=X-XFCE;System;Utility;Core;GTK;FileManager;
+-Categories=System;Utility;Core;GTK;FileTools;FileManager;
+-
++Categories=X-XFCE;System;Utility;Core;GTK;FileTools;FileManager;
 +OnlyShowIn=XFCE;
- MimeType=x-directory/gnome-default-handler;x-directory/normal;inode/directory;
- 
  # vi:set encoding=UTF-8:
---- Thunar-1.0.1/thunar/thunar-settings.desktop.in~    2008-11-03 08:56:05.000000000 +0100
-+++ Thunar-1.0.1/thunar/thunar-settings.desktop.in     2010-05-11 13:07:59.430823311 +0200
-@@ -7,4 +7,5 @@
+diff -urN Thunar-1.2.0/Thunar-folder-handler.desktop.in.in Thunar-1.2.0.new//Thunar-folder-handler.desktop.in.in
+--- Thunar-1.2.0/Thunar-folder-handler.desktop.in.in   2011-01-16 16:02:11.000000000 +0000
++++ Thunar-1.2.0.new//Thunar-folder-handler.desktop.in.in      2011-01-30 12:55:05.763333870 +0000
+@@ -9,7 +9,7 @@
  Terminal=false
+ StartupNotify=true
  Type=Application
- Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
+-Categories=System;Utility;Core;GTK;FileTools;FileManager;
++Categories=X-XFCE;System;Utility;Core;GTK;FileTools;FileManager;
+ MimeType=inode/directory;
+-
 +OnlyShowIn=XFCE;
- StartupNotify=true
+ # vi:set encoding=UTF-8:

diff --git a/Thunar.spec b/Thunar.spec
index 322d228dad83fbe9e3f38b858cf498cd91d1fd80..834da982f9bfbf2f4d5e9c999ff7c4e14d6e8b9e 100644 (file)
--- a/Thunar.spec
+++ b/Thunar.spec
@@ -2,52 +2,48 @@
 # Conditional build:
 %bcond_without static_libs     # don't build static library
 #
-%define                xfce_version    4.6.2
+%define                xfce_version    4.8.0
 Summary:       Xfce file manager
 Summary(pl.UTF-8):     Zarządca plików Xfce
 Name:          Thunar
-Version:       1.0.2
-Release:       2
+Version:       1.2.1
+Release:       1
 License:       GPL v2 / LGPL v2
 Group:         X11/Applications
-Source0:       http://www.xfce.org/archive/xfce-%{xfce_version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: c91073202d373a1f9951a1240083c36d
+Source0:       http://archive.xfce.org/src/xfce/thunar/1.2/%{name}-%{version}.tar.bz2
+# Source0-md5: d8dce796890619d67aed0cd7ef84c7b1
 Patch0:                %{name}-desktop.patch
 URL:           http://thunar.xfce.org/
-BuildRequires: GConf2-devel >= 2.16.0
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.8
 BuildRequires: dbus-glib-devel >= 0.62
 BuildRequires: docbook-dtd412-xml
-BuildRequires: exo-devel >= 0.3.100
-BuildRequires: gamin-devel >= 0.1.0
+BuildRequires: exo-devel >= 0.6.0
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.12.4
-BuildRequires: gtk+2-devel >= 2:2.10.6
+BuildRequires: glib2-devel >= 1:2.18.0
+BuildRequires: gtk+2-devel >= 2:2.14.0
 BuildRequires: gtk-doc >= 1.7
-BuildRequires: hal-devel >= 0.5.7
 BuildRequires: intltool
-BuildRequires: libexif-devel >= 0.6.13
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel >= 1.2.12
+BuildRequires: libexif-devel >= 0.6.0
+BuildRequires: libnotify-devel >= 0.4.0
 BuildRequires: libtool
+BuildRequires: libxfce4ui-devel >= %{xfce_version}
 BuildRequires: libxfce4util-devel >= %{xfce_version}
-BuildRequires: libxfcegui4-devel >= %{xfce_version}
 BuildRequires: pcre-devel >= 6.0
 BuildRequires: perl-base
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: rpmbuild(macros) >= 1.601
 BuildRequires: startup-notification-devel >= 0.8
-BuildRequires: xfce4-dev-tools
+BuildRequires: udev-glib-devel >= 145
+BuildRequires: xfce4-dev-tools >= %{xfce_version}
 BuildRequires: xfce4-panel-devel >= %{xfce_version}
-BuildRequires: xfconf-devel >= %{xfce_version}
 Requires(post,postun): desktop-file-utils
-Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): hicolor-icon-theme
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      exo >= 0.3.100
-Requires:      hal >= 0.5.7
+Requires:      exo >= 0.6.0
+Requires:      gtk-update-icon-cache
+Requires:      hicolor-icon-theme
 Requires:      shared-mime-info >= 0.15
+Requires:      xfconf >= %{xfce_version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -85,8 +81,8 @@ Summary:      Header files for Thunar libraries
 Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek Thunar
 Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      exo-devel >= 0.3.100
-Requires:      gtk+2-devel >= 2:2.10.6
+Requires:      exo-devel >= 0.6.0
+Requires:      gtk+2-devel >= 2:2.14.0
 
 %description devel
 This is the package containing the header files for Thunar libraries.
@@ -121,12 +117,12 @@ Statyczne biblioteki Thunar.
 %configure \
        --enable-dbus \
        --enable-exif \
-       --enable-gnome-thumbnailers \
        --enable-gtk-doc \
        --enable-pcre \
        --enable-startup-notification \
        --with-html-dir=%{_gtkdocdir} \
-       %{?with_static_libs:--enable-static}
+       %{?with_static_libs:--enable-static} \
+       --disable-silent-rules
 
 %{__make}
 
@@ -136,9 +132,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/thunarx-1/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/thunarx-2/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK
 
 %find_lang %{name} --all-name
 
@@ -162,13 +160,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %dir %{_sysconfdir}/xdg/Thunar
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/Thunar/*.xml
-%attr(755,root,root) %{_libdir}/ThunarBulkRename
-%attr(755,root,root) %{_libdir}/ThunarHelp
-%attr(755,root,root) %{_libdir}/thunar-vfs-*
-%attr(755,root,root) %{_libdir}/thunar-sendto-email
-%dir %{_libdir}/thunarx-1
-%attr(755,root,root) %{_libdir}/thunarx-1/*.so
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/thunar-tpa
+%dir %{_libdir}/Thunar
+%attr(755,root,root) %{_libdir}/Thunar/ThunarBulkRename
+%attr(755,root,root) %{_libdir}/Thunar/ThunarHelp
+%attr(755,root,root) %{_libdir}/Thunar/thunar-sendto-email
+%dir %{_libdir}/thunarx-2
+%attr(755,root,root) %{_libdir}/thunarx-2/*.so
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libthunar-tpa.so
 
 %{_datadir}/Thunar
 %{_datadir}/xfce4/panel-plugins/*.desktop
@@ -178,57 +176,50 @@ rm -rf $RPM_BUILD_ROOT
 %{_pixmapsdir}/Thunar
 %{_mandir}/man1/Thunar*
 
-# FIXME: maybe it's common dir?
-%dir %{_datadir}/thumbnailers
-%{_datadir}/thumbnailers/*.desktop
-
 %dir %{_docdir}/Thunar
 # move it to proper place
 %{_docdir}/Thunar/README*
 
 %dir %{_docdir}/Thunar/html
-%{_docdir}/Thunar/*.txt
 %{_docdir}/Thunar/html/C
 %{_docdir}/Thunar/html/*.css
+%lang(bn) %{_docdir}/Thunar/html/bn
+%lang(ca) %{_docdir}/Thunar/html/ca
 %lang(da) %{_docdir}/Thunar/html/da
+%lang(el) %{_docdir}/Thunar/html/el
 %lang(es) %{_docdir}/Thunar/html/es
 %lang(eu) %{_docdir}/Thunar/html/eu
 %lang(fr) %{_docdir}/Thunar/html/fr
 %lang(gl) %{_docdir}/Thunar/html/gl
+%lang(id) %{_docdir}/Thunar/html/id
 %lang(it) %{_docdir}/Thunar/html/it
 %lang(ja) %{_docdir}/Thunar/html/ja
 %lang(nl) %{_docdir}/Thunar/html/nl
 %lang(pl) %{_docdir}/Thunar/html/pl
 %lang(ru) %{_docdir}/Thunar/html/ru
+%lang(sv) %{_docdir}/Thunar/html/sv
 %lang(tr) %{_docdir}/Thunar/html/tr
+%lang(ug) %{_docdir}/Thunar/html/ug
+%lang(zh_CN) %{_docdir}/Thunar/html/zh_CN
 %lang(zh_TW) %{_docdir}/Thunar/html/zh_TW
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/thunar-vfs
 %{_gtkdocdir}/thunarx
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libthunar-vfs-1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libthunar-vfs-1.so.2
-%attr(755,root,root) %{_libdir}/libthunarx-1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libthunarx-1.so.2
+%attr(755,root,root) %{_libdir}/libthunarx-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libthunarx-2.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libthunar-vfs-1.so
-%attr(755,root,root) %{_libdir}/libthunarx-1.so
-%{_libdir}/libthunar-vfs-1.la
-%{_libdir}/libthunarx-1.la
-%{_includedir}/thunar-vfs-1
-%{_includedir}/thunarx-1
-%{_pkgconfigdir}/thunar-vfs-1.pc
-%{_pkgconfigdir}/thunarx-1.pc
+%attr(755,root,root) %{_libdir}/libthunarx-2.so
+%{_includedir}/thunarx-2
+%{_pkgconfigdir}/thunarx-2.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libthunar-vfs-1.a
-%{_libdir}/libthunarx-1.a
+%{_libdir}/libthunarx-2.a
 %endif