rpms/exo/EL-5 exo-0.3.105-mount-utf8.patch, NONE, 1.1 exo.spec, 1.23, 1.24 sources, 1.6, 1.7 .cvsignore, 1.6, 1.7

[Kevin Fenzi]

Author: kevin

Update of /cvs/pkgs/rpms/exo/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24537

Modified Files:
	exo.spec sources .cvsignore 
Added Files:
	exo-0.3.105-mount-utf8.patch 
Log Message:
initial version for epel5


exo-0.3.105-mount-utf8.patch:
 mount.rc |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE exo-0.3.105-mount-utf8.patch ---
--- exo-0.3.105/exo-mount/mount.rc.orig	2009-10-18 17:53:04.000000000 +0200
+++ exo-0.3.105/exo-mount/mount.rc	2009-10-19 02:27:01.000000000 +0200
@@ -34,12 +34,14 @@
 
 [vfat]
 uid=<auto>
+utf8=true
 shortname=winnt
 # FreeBSD specific option
 longnames=true
 
 [iso9660]
 uid=<auto>
+utf8=true
 
 [udf]
 uid=<auto>
@@ -47,6 +49,7 @@
 
 [ntfs]
 uid=<auto>
+utf8=true
 
 [ntfs-3g]
 uid=<auto>


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/EL-5/exo.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- exo.spec	27 Aug 2007 19:29:54 -0000	1.23
+++ exo.spec	26 Jul 2010 00:13:15 -0000	1.24
@@ -2,28 +2,31 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.2
-Release: 3%{?dist}
+Version: 0.3.107
+Release: 2%{?dist}
 # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
 # everything else is LGPLv2+
 License: LGPLv2+ and GPLv2+
 URL: http://xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.0/src/exo-0.3.2.tar.bz2
+Source0: http://archive.xfce.org/src/xfce/exo/0.3/exo-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
-Group: Development/Libraries
+# to not bring https://bugzilla.redhat.com/show_bug.cgi?id=508823 back
+Patch2: exo-0.3.105-mount-utf8.patch
+Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus-glib >= 0.22
+Requires: xfce4-doc
 BuildRequires: dbus-devel >= 0.22
 BuildRequires: gtk-doc
 BuildRequires: pygtk2-devel
 BuildRequires: gettext
 BuildRequires: python-devel
-BuildRequires: imake
-BuildRequires: libXt-devel
 BuildRequires: perl-URI
-BuildRequires: xfce-mcs-manager-devel
 BuildRequires: libxfce4util-devel
 BuildRequires: hal-devel libnotify-devel
+BuildRequires: intltool >= 0.31
+BuildRequires: chrpath
+BuildRequires: desktop-file-utils
 
 %description
 Extension library for Xfce, targeted at application development.
@@ -33,9 +36,12 @@ Summary: Development tools for exo libra
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libxfce4util-devel
+Requires: hal-devel
+Requires: pkgconfig
+Requires: gtk-doc
 
 %description devel
-Static libraries and header files for the exo library.
+Development tools and static libraries and header files for the exo library.
 
 %package -n python-exo
 Summary: Python tools for exo library
@@ -48,49 +54,60 @@ Python libraries and header files for th
 %prep
 %setup -q
 
-%patch0 -p1 -b x86_64-build
+%patch0 -p1 -b .x86_64-build
+%patch2 -p1 -b .utf8
 
 %build
-%configure --enable-gtk-doc
-make %{?_smp_mflags}
+%configure --enable-gtk-doc --disable-static
+
+# using %{?_smp_mflags} causes a multilib conflict, disable it for now
+make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
-rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.la
-rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*.a
-rm -f $RPM_BUILD_ROOT/%{python_sitearch}/*/*.a
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-mount
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-desktop-item-edit
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-open
+chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/exo-helper-0.3
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-0.3/_exo.so
 
 %find_lang libexo-0.3
 
+desktop-file-install                                       \
+  --delete-original                                        \
+  --vendor=""                                              \
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications          \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/exo-preferred-applications.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_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
 /sbin/ldconfig
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f libexo-0.3.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog HACKING NEWS README THANKS TODO COPYING
+%doc AUTHORS ChangeLog NEWS README THANKS TODO COPYING
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/mount.rc
 %{_libdir}/lib*.so.*
 %{_datadir}/xfce4/helpers
-%{_datadir}/xfce4/doc/C
-%{_datadir}/xfce4/doc/ja
-%{_datadir}/xfce4/doc/fr
-%{_mandir}/man1/exo-csource.1.gz
-%{_mandir}/man1/exo-open.1.gz
-%{_bindir}/exo-csource
+%doc %{_datadir}/xfce4/doc/*/images/*
+%doc %{_datadir}/xfce4/doc/*/*.html
+%{_mandir}/man1/exo-open.1.*
 %{_bindir}/exo-desktop-item-edit
 %{_bindir}/exo-open
 %{_bindir}/exo-preferred-applications
@@ -102,20 +119,18 @@ touch --no-create %{_datadir}/icons/hico
 %{_libexecdir}/exo-mount-notify-0.3
 %{_libexecdir}/exo-compose-mail-0.3
 %{_datadir}/applications/exo-preferred-applications.desktop
-%{_libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so
-%{_datadir}/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
-%{_datadir}/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
-%{_datadir}/icons/hicolor/48x48/apps/applications-internet.png
-%{_datadir}/icons/hicolor/48x48/apps/applications-other.png
-%{_datadir}/pixmaps/exo-0.3/exo-thumbnail-frame.png
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/pixmaps/exo-0.3/
 
 %files devel
 %defattr(-, root, root,-)
-%doc %{_datadir}/gtk-doc/html/exo/
+%doc %{_datadir}/gtk-doc/html/exo-0.3/
+%{_bindir}/exo-csource
 %{_includedir}/exo*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/pygtk/*/defs/exo-*/
+%{_mandir}/man1/exo-csource.1.*
 
 %files -n python-exo
 %defattr(-, root, root,-)
@@ -123,6 +138,93 @@ touch --no-create %{_datadir}/icons/hico
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Mon Jun 07 2010 Kevin Fenzi <kevin at tummy.com> - 0.3.107-2
+- Drop patch1 as it doublefixed bug 6230
+
+* Fri May 21 2010 Kevin Fenzi <kevin at tummy.com> - 0.3.107-1
+- Update to 0.3.107
+
+* Sat Apr 24 2010 Kevin Fenzi <kevin at tummy.com> - 0.3.106-3
+- Add patch for xfce bug 6230
+
+* Thu Dec 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.106-2
+- Remove libtool archive from python-exo package
+
+* Thu Dec 17 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.106-1
+- Update to 0.3.106
+- Remove upstreamed sync patch
+
+* Mon Oct 19 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.105-1
+- Update to 0.3.105
+- Tweak mount.rc to use UTF-8 (to not bring back #508823 again)
+
+* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.104-1
+- Update to 0.3.104
+
+* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-2
+- Disable parallel make due to multilib conflicts.
+
+* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-1
+- Update to 0.3.103
+- Drop patches for URL quoting and default mount options (fixed upstream)
+- Revert useless touch -r trick
+
+* Wed Sep 30 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.101-5
+- Use touch -r trick to fix multilib issue
+
+* Thu Sep 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.101-4
+- Mount vfat and ntfs volumes with UTF-8 (#508823)
+- Mount ntfs with ntfs-3g
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.101-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 17 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.101-2
+- Add patch to fix url quoting (bug #509730)
+
+* Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.101-1
+- Update to 0.3.101
+
+* Mon Mar 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.100-2
+- Fix directory ownership problems
+- Move exo-csource into devel package
+- Make devel package require pkgconfig and gtk-doc
+- Mark gtk-doc files as %%doc
+
+* Thu Feb 26 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.100-1
+- Update to 0.3.100
+- Remove some unneeded BuildRequires
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.99.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.99.1-1
+- Update to 0.3.99.1
+
+* Tue Jan 13 2009 Kevin Fenzi <kevin at tummy.com> 0.3.93-1
+- Update to 0.3.93
+
+* Tue Dec 23 2008 Kevin Fenzi <kevin at tummy.com> 0.3.92-1
+- Update to 0.3.92
+
+* Tue Dec 16 2008 Kevin Fenzi <kevin at tummy.com> 0.3.4-5
+- Add hal-devel Requires to devel package. 
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.3.4-4
+- Rebuild for Python 2.6
+
+* Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.4-3
+- Add two Debian patches to fix broken regex and gcc_hardening
+- Fix rpm group
+- Update gtk-update-icon-cache scriptlets
+- Configure with --disable-static
+
+* Sun Feb 10 2008 Kevin Fenzi <kevin at tummy.com> - 0.3.4-2
+- Rebuild for gcc43
+
+* Sun Dec  2 2007 Kevin Fenzi <kevin at tummy.com> - 0.3.4-1
+- Update to 0.3.4
+
 * Tue Aug 21 2007 Kevin Fenzi <kevin at tummy.com> - 0.3-2-3
 - Update license tag. 
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exo/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 Jan 2007 20:53:12 -0000	1.6
+++ sources	26 Jul 2010 00:13:15 -0000	1.7
@@ -1 +1 @@
-8b73acc98d0938d1193b31316823b6db  exo-0.3.2.tar.bz2
+3a92cca0c99ee940db4410891c9e8498  exo-0.3.107.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exo/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	27 Jan 2007 20:53:12 -0000	1.6
+++ .cvsignore	26 Jul 2010 00:13:15 -0000	1.7
@@ -1 +1 @@
-exo-0.3.2.tar.bz2
+exo-0.3.107.tar.bz2