rpms/Thunar/F-12 Thunar-1.0.2-dsofix.patch, NONE, 1.1 Thunar.spec, 1.28, 1.29 sources, 1.11, 1.12 .cvsignore, 1.11, 1.12 Thunar-1.0.1-dsofix.patch, 1.1, NONE Thunar-1.0.1-umask-dir.patch, 1.1, NONE

Kevin Fenzi kevin at fedoraproject.org
Thu Jun 10 04:34:41 UTC 2010 

Author: kevin

Update of /cvs/pkgs/rpms/Thunar/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16385

Modified Files:
	Thunar.spec sources .cvsignore 
Added Files:
	Thunar-1.0.2-dsofix.patch 
Removed Files:
	Thunar-1.0.1-dsofix.patch Thunar-1.0.1-umask-dir.patch 
Log Message:
Update to 1.0.2


Thunar-1.0.2-dsofix.patch:
 thunar-vfs/Makefile.in |    2 +-
 thunar/Makefile.in     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE Thunar-1.0.2-dsofix.patch ---
diff -Nur Thunar-1.0.2.orig/thunar/Makefile.in Thunar-1.0.2/thunar/Makefile.in
--- Thunar-1.0.2.orig/thunar/Makefile.in	2010-05-21 11:11:02.000000000 -0600
+++ Thunar-1.0.2/thunar/Makefile.in	2010-05-22 00:03:05.000000000 -0600
@@ -371,7 +371,7 @@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lX11
 LIBFAM_CFLAGS = @LIBFAM_CFLAGS@
 LIBFAM_LIBS = @LIBFAM_LIBS@
 LIBFAM_REQUIRED_VERSION = @LIBFAM_REQUIRED_VERSION@
diff -Nur Thunar-1.0.2.orig/thunar-vfs/Makefile.in Thunar-1.0.2/thunar-vfs/Makefile.in
--- Thunar-1.0.2.orig/thunar-vfs/Makefile.in	2010-05-21 11:11:02.000000000 -0600
+++ Thunar-1.0.2/thunar-vfs/Makefile.in	2010-05-22 00:03:46.000000000 -0600
@@ -218,7 +218,7 @@
 thunar_vfs_font_thumbnailer_1_LINK = $(LIBTOOL) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(thunar_vfs_font_thumbnailer_1_CFLAGS) $(CFLAGS) \
-	$(thunar_vfs_font_thumbnailer_1_LDFLAGS) $(LDFLAGS) -o $@
+	$(thunar_vfs_font_thumbnailer_1_LDFLAGS) $(LDFLAGS) -lm -o $@
 am_thunar_vfs_mime_cleaner_1_OBJECTS =  \
 	thunar_vfs_mime_cleaner_1-thunar-vfs-mime-cleaner.$(OBJEXT)
 thunar_vfs_mime_cleaner_1_OBJECTS =  \


Index: Thunar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Thunar/F-12/Thunar.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- Thunar.spec	15 Apr 2010 20:39:13 -0000	1.28
+++ Thunar.spec	10 Jun 2010 04:34:40 -0000	1.29
@@ -2,17 +2,15 @@
 
 Summary: Thunar File Manager
 Name: Thunar
-Version: 1.0.1
-Release: 6%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://thunar.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.6.1/src/Thunar-%{version}.tar.bz2
+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.1-dsofix.patch
-# Upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=3532
-Patch1: Thunar-1.0.1-umask-dir.patch
+Patch0: Thunar-1.0.2-dsofix.patch
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fam-devel
@@ -35,6 +33,10 @@ 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
 
 # obsolete xffm to allow for smooth upgrades
 Provides: xffm = 4.2.4
@@ -63,8 +65,7 @@ libraries and header files for the Thuna
 %prep
 %setup -q
 
-%patch0 -p1 
-%patch1 -p1 
+%patch0 -p1
 
 # fix icon in thunar-sendto-email.desktop
 sed -i 's!internet-mail!mail-message-new!' \
@@ -101,25 +102,23 @@ chrpath --delete $RPM_BUILD_ROOT/%{_libe
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/thunar-settings.desktop
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         thunar/thunar-settings.desktop
 
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar-bulk-rename.desktop
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         Thunar-bulk-rename.desktop
 
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar-folder-handler.desktop
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
+        --remove-mime-type x-directory/gnome-default-handler    \
+        --remove-mime-type x-directory/normal                   \
         Thunar-folder-handler.desktop
 
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/Thunar.desktop
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         Thunar.desktop
 
 # install additional sendto helpers
@@ -137,19 +136,21 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
 /sbin/ldconfig
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    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
@@ -208,6 +209,17 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri May 21 2010 Kevin Fenzi <kevin at tummy.com> - 1.0.2-1
+- Update to 1.0.2
+
+* Fri Apr 30 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.1-7
+- Require hal-storage-addon
+- Remove obsolete mime types (#587256)
+- Update icon-cache scriptlets
+
+* Thu Apr 15 2010 Kevin Fenzi <kevin at tummy.com> - 1.0.1-6
+- Bump release
+
 * Thu Apr 15 2010 Kevin Fenzi <kevin at tummy.com> - 1.0.1-5
 - Add patch to fix directory umask issue. Fixes bug #579087
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Thunar/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	20 Apr 2009 02:17:36 -0000	1.11
+++ sources	10 Jun 2010 04:34:40 -0000	1.12
@@ -1 +1 @@
-218373aa45d74b6ba8c69c4d5af3bb19  Thunar-1.0.1.tar.bz2
+c91073202d373a1f9951a1240083c36d  Thunar-1.0.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Thunar/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	20 Apr 2009 02:17:36 -0000	1.11
+++ .cvsignore	10 Jun 2010 04:34:40 -0000	1.12
@@ -1 +1 @@
-Thunar-1.0.1.tar.bz2
+Thunar-1.0.2.tar.bz2


--- Thunar-1.0.1-dsofix.patch DELETED ---


--- Thunar-1.0.1-umask-dir.patch DELETED ---

More information about the scm-commits mailing list