[Thunar] - Update to 1.1.6
Christoph Wickert
cwickert at fedoraproject.org
Sat Jan 8 21:57:16 UTC 2011
commit c14195f3356457378fd53a792ff60b2f864d4b5f
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Sat Jan 8 22:57:04 2011 +0100
- Update to 1.1.6
.gitignore | 1 +
Thunar-1.0.2-drag-n-drop.patch | 13 ---
Thunar-1.0.2-dsofix.patch | 24 -----
Thunar-1.0.2-trash-icon-fix.patch | 70 -------------
Thunar.spec | 201 +++++++++++++++++--------------------
sources | 2 +-
6 files changed, 94 insertions(+), 217 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d47c74..ee27dfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
Thunar-1.0.2.tar.bz2
+/Thunar-1.1.6.tar.bz2
diff --git a/Thunar.spec b/Thunar.spec
index ca42a81..de8c70b 100644
--- a/Thunar.spec
+++ b/Thunar.spec
@@ -1,65 +1,54 @@
-%global exo_version 0.3.100
-
-Summary: Thunar File Manager
-Name: Thunar
-Version: 1.0.2
-Release: 4%{?dist}
-License: GPLv2+
-URL: http://thunar.xfce.org/
-Source0: http://archive.xfce.org/src/xfce/thunar/1.0/Thunar-%{version}.tar.bz2
-Source1: thunar-sendto-bluetooth.desktop
-Source2: thunar-sendto-audacious-playlist.desktop
-# Upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=6232
-Patch0: Thunar-1.0.2-dsofix.patch
-Patch1: Thunar-1.0.2-drag-n-drop.patch
-Patch2: Thunar-1.0.2-trash-icon-fix.patch
-Group: User Interface/Desktops
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: fam-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libexif-devel
-BuildRequires: libpng-devel >= 2:1.2.2-16
-BuildRequires: desktop-file-utils >= 0.7
-BuildRequires: exo-devel >= %{exo_version}
-BuildRequires: startup-notification-devel >= 0.4
-BuildRequires: intltool gettext
-BuildRequires: dbus-glib-devel
-BuildRequires: hal-devel
-BuildRequires: pcre-devel
-BuildRequires: xfce4-panel-devel
-BuildRequires: freetype-devel
-BuildRequires: pkgconfig
-BuildRequires: libxslt
-BuildRequires: GConf2-devel
-BuildRequires: gtk-doc
-BuildRequires: chrpath
-Requires: shared-mime-info
-Requires: dbus-x11
-# Requires for mounting removable media
-%if 0%{?fedora} >= 13
-Requires: hal-storage-addon
-%endif
+%global minorversion 1.1
+
+Name: Thunar
+Version: 1.1.6
+Release: 1%{?dist}
+Summary: Thunar File Manager
+
+Group: User Interface/Desktops
+License: GPLv2+
+URL: http://thunar.xfce.org/
+Source0: http://archive.xfce.org/src/xfce/thunar/%{minorversion}/%{name}-%{version}.tar.bz2
+Source1: thunar-sendto-bluetooth.desktop
+Source2: thunar-sendto-audacious-playlist.desktop
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: exo-devel >= 0.5.1
+BuildRequires: libxfce4ui-devel >= 4.7.1
+BuildRequires: xfce4-panel-devel >= 4.7.0
+BuildRequires: libpng-devel >= 2:1.2.2-16
+BuildRequires: libexif-devel
+BuildRequires: pcre-devel
+BuildRequires: startup-notification-devel >= 0.4
+BuildRequires: dbus-glib-devel
+BuildRequires: libgudev1-devel
+BuildRequires: freetype-devel
+BuildRequires: pkgconfig
+BuildRequires: intltool gettext
+BuildRequires: desktop-file-utils >= 0.7
+BuildRequires: gtk-doc
+Requires: shared-mime-info
+Requires: dbus-x11
# obsolete xffm to allow for smooth upgrades
-Provides: xffm = 4.2.4
-Obsoletes: xffm <= 4.2.3-5.fc6
+Provides: xffm = 4.2.4
+Obsoletes: xffm <= 4.2.3-5.fc6
# Provide lowercase name to help people find the package.
-Provides: thunar = %{version}-%{release}
+Provides: thunar = %{version}-%{release}
%description
-Thunar is a new modern file manager for the Xfce Desktop Environment.
-It has been designed from the ground up to be fast and easy-to-use.
-Its user interface is clean and intuitive, and does not include any
-confusing or useless options. Thunar is fast and responsive with a
-good start up time and directory load time.
+Thunar is a new modern file manager for the Xfce Desktop Environment. It has
+been designed from the ground up to be fast and easy-to-use. Its user interface
+is clean and intuitive, and does not include any confusing or useless options.
+Thunar is fast and responsive with a good start up time and directory load time.
%package devel
Summary: Development tools for Thunar file manager
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
-Requires: exo-devel >= %{exo_version}
+Requires: exo-devel >= %{exoversion}
%description devel
libraries and header files for the Thunar file manager.
@@ -67,23 +56,24 @@ libraries and header files for the Thunar file manager.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
# fix icon in thunar-sendto-email.desktop
sed -i 's!internet-mail!mail-message-new!' \
plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in
-# second part of the xdg-userdir fixes
-pushd thunar
-exo-csource --name=thunar_window_ui thunar-window-ui.xml > thunar-window-ui.h
-popd
%build
-%configure --enable-dbus --enable-final --enable-xsltproc --enable-gtk-doc
+%configure --enable-dbus --enable-gtk-doc
+# Remove rpaths
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+# The LD_LIBRARY_PATH hack is needed for --enable-gtk-doc
+# because lt-thunarx-scan is linked against libthunarx
+export LD_LIBRARY_PATH=$( pwd )/thunarx/.libs
+
make %{?_smp_mflags}
+
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
@@ -95,35 +85,28 @@ make -C examples distclean
chmod 644 examples/thunar-file-manager.py
chmod 644 examples/xfce-file-manager.py
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/thunarx-1/*.la
-
-chrpath --delete $RPM_BUILD_ROOT/%{_bindir}/Thunar
-chrpath --delete $RPM_BUILD_ROOT/%{_libexecdir}/thunar-sendto-email
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%find_lang Thunar
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/thunar-settings.desktop
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor fedora --delete-original \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- thunar/thunar-settings.desktop
+ ${RPM_BUILD_ROOT}%{_datadir}/applications/thunar-settings.desktop
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar-bulk-rename.desktop
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor fedora --delete-original \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- Thunar-bulk-rename.desktop
+ --delete-original \
+ ${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar-bulk-rename.desktop
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar-folder-handler.desktop
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor fedora --delete-original \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--remove-mime-type x-directory/gnome-default-handler \
--remove-mime-type x-directory/normal \
- Thunar-folder-handler.desktop
+ ${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar-folder-handler.desktop
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar.desktop
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor fedora --delete-original \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- Thunar.desktop
+ ${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar.desktop
# install additional sendto helpers
desktop-file-install --vendor "" \
@@ -134,14 +117,17 @@ desktop-file-install --vendor "" \
--dir ${RPM_BUILD_ROOT}%{_datadir}/Thunar/sendto \
%{SOURCE2}
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%post
/sbin/ldconfig
update-desktop-database &> /dev/null ||:
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
%postun
/sbin/ldconfig
update-desktop-database &> /dev/null ||:
@@ -150,69 +136,66 @@ if [ $1 -eq 0 ] ; then
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
%files -f Thunar.lang
%defattr(-,root,root,-)
%doc README TODO ChangeLog NEWS INSTALL COPYING AUTHORS HACKING THANKS
-%doc docs/README.gtkrc
-%doc docs/README.thunarrc
-%doc docs/README.volumes
-%doc docs/ThumbnailersCacheFormat.txt
+%doc docs/README.gtkrc
+%doc docs/README.thunarrc
# exclude docs that we have moved to the above
%exclude %{_datadir}/doc/Thunar/README.gtkrc
%exclude %{_datadir}/doc/Thunar/README.thunarrc
-%exclude %{_datadir}/doc/Thunar/README.volumes
-%exclude %{_datadir}/doc/Thunar/ThumbnailersCacheFormat.txt
%{_bindir}/Thunar
%{_bindir}/thunar
%{_bindir}/thunar-settings
%{_libdir}/libthunar*.so.*
-%dir %{_libdir}/thunarx-1/
-%{_libdir}/thunarx-1/thunar*.so
-%{_libexecdir}/ThunarBulkRename
-%{_libexecdir}/ThunarHelp
-%{_libexecdir}/thunar-sendto-email
-%{_libexecdir}/thunar-vfs-font-thumbnailer-1
-%{_libexecdir}/thunar-vfs-mime-cleaner-1
-%{_libexecdir}/thunar-vfs-pixbuf-thumbnailer-1
-%{_libexecdir}/thunar-vfs-update-thumbnailers-cache-1
+%dir %{_libdir}/thunarx-*/
+%{_libdir}/thunarx-*/thunar*.so
+%{_libdir}/Thunar/ThunarBulkRename
+%{_libdir}/Thunar/ThunarHelp
+%{_libdir}/Thunar/thunar-sendto-email
%dir %{_datadir}/Thunar/
%dir %{_datadir}/Thunar/sendto/
%{_datadir}/Thunar/sendto/*.desktop
-%dir %{_datadir}/thumbnailers
-%{_datadir}/thumbnailers/thunar-vfs-font-thumbnailer-1.desktop
-%{_datadir}/applications/fedora-thunar-settings.desktop
-%{_datadir}/applications/fedora-Thunar-bulk-rename.desktop
-%{_datadir}/applications/fedora-Thunar-folder-handler.desktop
-%{_datadir}/applications/fedora-Thunar.desktop
+%{_datadir}/applications/*.desktop
%{_datadir}/dbus-1/services/org.xfce.FileManager.service
%{_datadir}/dbus-1/services/org.xfce.Thunar.service
-%{_datadir}/doc/Thunar/
-%{_datadir}/icons/hicolor/*/apps/Thunar.png
-%{_datadir}/icons/hicolor/16x16/stock/navigation/stock_thunar-*.png
-%{_datadir}/icons/hicolor/scalable/apps/Thunar.svg
-%{_datadir}/pixmaps/Thunar
+%{_datadir}/doc/%{name}/
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/pixmaps/Thunar/
%{_datadir}/xfce4/panel-plugins/thunar-tpa.desktop
-%{_libexecdir}/xfce4/panel-plugins/thunar-tpa
+%{_libdir}/xfce4/panel/plugins/libthunar-tpa.so
%{_mandir}/man1/Thunar.1*
%dir %{_sysconfdir}/xdg/Thunar
%config(noreplace) %{_sysconfdir}/xdg/Thunar/uca.xml
+
%files devel
%defattr(-,root,root,-)
%doc examples
-%{_includedir}/thunar-vfs-1
-%{_includedir}/thunarx-1
+%{_includedir}/thunarx-*/
%{_libdir}/libthunar*.so
-%{_libdir}/pkgconfig/thunar-vfs-1.pc
-%{_libdir}/pkgconfig/thunarx-1.pc
-%{_datadir}/gtk-doc/html/*
+%{_libdir}/pkgconfig/thunarx-*.pc
+%doc %{_datadir}/gtk-doc/html/*
+
%changelog
+* Sun Jan 02 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.6-1
+- Update to 1.1.6
+
+* Sun Dec 05 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.5-1
+- Update to 1.1.5
+
+* Mon Nov 08 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.1.4-1
+- Update to 1.1.4
+- Drop obsolete build requirements: GConf2-devel, fam-devel, hal-devel,
+ libjpeg-devel, libxslt-devel.
+- Remove old patches
+
* Mon Nov 01 2010 Kevin Fenzi <kevin at tummy.com> - 1.0.2-4
- Add patch for trash icon. (#647734)
diff --git a/sources b/sources
index 0e80b79..ee38a8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c91073202d373a1f9951a1240083c36d Thunar-1.0.2.tar.bz2
+a96fdbc0b3d422f864d50374b5d6be41 Thunar-1.1.6.tar.bz2
More information about the scm-commits
mailing list