From 05b96ae9fb47a7ab3b774f1ce6b34e4900d1a89d Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Nov 26 2008 00:08:22 +0000 Subject: - Update to 0.5.2 --- diff --git a/.cvsignore b/.cvsignore index a097e03..e405378 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xarchiver-20070103svn.tar.bz2 +xarchiver-0.5.2.tar.bz2 diff --git a/sources b/sources index 3a54300..8fb34f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43c93a6e41eabfbac3d556b086870406 xarchiver-20070103svn.tar.bz2 +2bc7f06403cc6582dd4a8029ec9d038d xarchiver-0.5.2.tar.bz2 diff --git a/xarchiver-0.4.9-xdg-open.patch b/xarchiver-0.4.9-xdg-open.patch deleted file mode 100644 index 30cf02c..0000000 --- a/xarchiver-0.4.9-xdg-open.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: src/callbacks.c -=================================================================== ---- src/callbacks.c (revision 24249) -+++ src/callbacks.c (working copy) -@@ -2163,7 +2163,10 @@ - gchar *browser_path; - - //TODO: retrieve the user set browser from prefs and use it -- browser_path = g_find_program_in_path ("exo-open"); -+ browser_path = g_find_program_in_path ("xdg-open"); -+ if ( browser_path == NULL) -+ browser_path = g_find_program_in_path ("exo-open"); -+ - if ( browser_path == NULL) - browser_path = g_find_program_in_path ("htmlview"); - diff --git a/xarchiver.spec b/xarchiver.spec index d7a7988..b0e0236 100644 --- a/xarchiver.spec +++ b/xarchiver.spec @@ -1,17 +1,12 @@ Name: xarchiver -Version: 0.4.9 -Release: 0.6.20070103svn24249%{?dist} +Version: 0.5.2 +Release: 1%{?dist} Summary: Archive manager for Xfce Group: Applications/Archiving License: GPLv2+ URL: http://xarchiver.xfce.org/ -# Source0 was generated with the following commands: -# svn co -r24249 http://svn.xfce.org/svn/xfce/xarchiver/trunk xarchiver -# tar -cjf xarchiver-`date +%G%m%d`svn.tar.bz2 xarchiver -Source0: xarchiver-20070103svn.tar.bz2 -#Source0: http://dl.sf.net/sourceforge/xarchiver/xarchiver-%{version}.tar.bz2 -Patch0: %{name}-0.4.9-xdg-open.patch +Source0: http://downloads.sourceforge.net/xarchiver/xarchiver-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libxml2-devel, gettext, desktop-file-utils @@ -26,9 +21,9 @@ archives in the arj, 7z, rar, and zip formats are supported. %prep -%setup -qn xarchiver -%patch0 -p0 -./autogen.sh +%setup -q +# fix spurious executable permissions of some debug files +chmod -x src/mime.* %build @@ -49,20 +44,28 @@ install -p -m 755 xarchiver.tap \ %find_lang %{name} desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category="Compression" \ --delete-original \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop +# remove duplicate docs +rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} + %post -update-desktop-database &> /dev/null ||: -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi +update-desktop-database &> /dev/null || : %postun -update-desktop-database &> /dev/null ||: -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi +update-desktop-database &> /dev/null || : %clean @@ -72,81 +75,88 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README TODO -%lang(it) %doc LEGGIMI %{_bindir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %dir %{_datadir}/pixmaps/%{name}/ -#%{_datadir}/pixmaps/%{name}/%{name}*.png -#%{_datadir}/pixmaps/%{name}/%{name}*.svg -%{_datadir}/pixmaps/%{name}/*.png +%{_datadir}/pixmaps/%{name}/%{name}*.png %dir %{_libexecdir}/thunar-archive-plugin/ %{_libexecdir}/thunar-archive-plugin/fedora-xarchiver.tap -%{_docdir}/%{name}/ -# exculde duplicate docs -%exclude %{_docdir}/%{name}/AUTHORS -%exclude %{_docdir}/%{name}/COPYING -%exclude %{_docdir}/%{name}/ChangeLog -%exclude %{_docdir}/%{name}/NEWS -%exclude %{_docdir}/%{name}/README -%exclude %{_docdir}/%{name}/TODO %changelog -* Sat Apr 19 2008 Christoph Wickert - 0.4.9-0.6.20070103svn24249 +* Tue Nov 25 2008 Christoph Wickert - 0.5.2-1 +- Update to 0.5.2 + +* Sun Nov 09 2008 Christoph Wickert - 0.5.1-1 +- Update to 0.5.1 stable release + +* Sun Oct 26 2008 Christoph Wickert - 0.5.0-0.1.rc1 +- Update to 0.5.0rc1 +- Fix crash when opening zipped PDF files (#467619) +- Update gtk-icon-cache scriptlets + +* Sat Oct 11 2008 Christoph Wickert - 0.5.0-0.1.beta2 +- Update to 0.5.0beta2 + +* Sun Aug 31 2008 Christoph Wickert - 0.5.0-0.1.beta1 +- Update to 0.5.0beta1 +- Remove xdg-open.patch as xarchiver now uses xdg-open by default + +* Sat Apr 19 2008 Christoph Wickert - 0.4.9-0.6.20070103svn24249 - Remove additional mime-types from desktop-file-install to make sure we don't break livecds -* Fri Mar 14 2008 Christoph Wickert - 0.4.9-0.5.20070103svn24249 +* Fri Mar 14 2008 Christoph Wickert - 0.4.9-0.5.20070103svn24249 - Use xdg-open instead of htmlview (#437554) * Mon Feb 18 2008 Fedora Release Engineering - 0.4.9-0.4.20070103svn24249 - Autorebuild for GCC 4.3 -* Tue Aug 28 2007 Christoph Wickert - 0.4.9-0.3.20070103svn24249 +* Tue Aug 28 2007 Christoph Wickert - 0.4.9-0.3.20070103svn24249 - Rebuild for BuildID feature - Update license tag -* Fri Mar 02 2007 Christoph Wickert - 0.4.9-0.2.20070103svn24249 +* Fri Mar 02 2007 Christoph Wickert - 0.4.9-0.2.20070103svn24249 - Downgrade to SVN release 24249 in order to fix #230154 temporarily. -* Sun Jan 28 2007 Christoph Wickert - 0.4.9-0.1.20070128svn24772 +* Sun Jan 28 2007 Christoph Wickert - 0.4.9-0.1.20070128svn24772 - Update to SVN release 24772 of January 28th 2007. -* Wed Jan 03 2007 Christoph Wickert - 0.4.9-0.1.20070103svn +* Wed Jan 03 2007 Christoph Wickert - 0.4.9-0.1.20070103svn - Update to SVN r24249 of January 3rd 2007. - Add mimetype application/x-deb again since opening of debs now is secure. -* Wed Dec 13 2006 Christoph Wickert - 0.4.9-0.1.20061213svn +* Wed Dec 13 2006 Christoph Wickert - 0.4.9-0.1.20061213svn - Update to SVN r24096 of December 13th 2006. -* Wed Dec 06 2006 Christoph Wickert - 0.4.6-3 +* Wed Dec 06 2006 Christoph Wickert - 0.4.6-3 - Add deb.patch to prevent opening of .a files as debs. - Don't add mimetype for x-ar (archiver can't handle ar archive). -* Wed Nov 29 2006 Christoph Wickert - 0.4.6-2 +* Wed Nov 29 2006 Christoph Wickert - 0.4.6-2 - Add htmlview.patch. -* Tue Nov 28 2006 Christoph Wickert - 0.4.6-1 +* Tue Nov 28 2006 Christoph Wickert - 0.4.6-1 - Update to 0.4.6. - Update %%description. - Require binutils, cpio and htmlview. - Add mimetypes application/x-ar, application/x-cd-image and application/x-deb. -* Tue Nov 27 2006 Christoph Wickert - 0.4.4-1 +* Tue Nov 27 2006 Christoph Wickert - 0.4.4-1 - Update to 0.4.4. -* Sat Nov 25 2006 Christoph Wickert - 0.4.2-0.3.rc2 +* Sat Nov 25 2006 Christoph Wickert - 0.4.2-0.3.rc2 - Install xarchiver.png also in %%{_datadir}/icons/hicolor/48x48/apps/. -* Sat Nov 25 2006 Christoph Wickert - 0.4.2-0.2.rc2 +* Sat Nov 25 2006 Christoph Wickert - 0.4.2-0.2.rc2 - Drop subpackage and own %%{_libexecdir}/thunar-archive-plugin/ (#198098). -* Sun Nov 12 2006 Christoph Wickert - 0.4.2-0.1.rc2 +* Sun Nov 12 2006 Christoph Wickert - 0.4.2-0.1.rc2 - Update to 0.4.2.RC2. -* Wed Sep 13 2006 Christoph Wickert - 0.4.0-1 +* Wed Sep 13 2006 Christoph Wickert - 0.4.0-1 - Update to 0.4.0. -* Tue Sep 05 2006 Christoph Wickert - 0.3.9.2-0.beta2 +* Tue Sep 05 2006 Christoph Wickert - 0.3.9.2-0.beta2 - Initial package.