[file-roller/f18] revert accidental merge to wrong branch

Rahul Sundaram sundaram at fedoraproject.org
Wed Apr 24 22:13:44 UTC 2013 

commit 7cd29a499ab5bb0c24c83c31e1684489140071b0
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Wed Apr 24 18:12:35 2013 -0400

    revert accidental merge to wrong branch

 file-roller.spec |   54 +++++++++++++++++-------------------------------------
 sources          |    2 +-
 2 files changed, 18 insertions(+), 38 deletions(-)
---
diff --git a/file-roller.spec b/file-roller.spec
index 2b7dd35..5f52947 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -1,12 +1,12 @@
 Summary:        Tool for viewing and creating archives
 Name:           file-roller
-Version:        3.8.1
+Version:        3.6.3
 Release:        2%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
 URL:            http://download.gnome.org/sources/file-roller/
 #VCS: git:git://git.gnome.org/file-roller
-Source:         http://download.gnome.org/sources/file-roller/3.8/file-roller-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/file-roller/3.6/file-roller-%{version}.tar.xz
 
 BuildRequires: glib2-devel
 BuildRequires: pango-devel
@@ -21,10 +21,11 @@ BuildRequires: itstool
 BuildRequires: GConf2-devel
 BuildRequires: file-devel
 BuildRequires: libarchive-devel
-BuildRequires: json-glib-devel
 
 Requires(pre): GConf2
-Requires:      unar
+
+# Because we prefix the .desktop filename
+Patch0: 0001-Change-desktop-filename-to-Fedora-s-name.patch
 
 %description
 File Roller is an application for creating and viewing archives files,
@@ -43,6 +44,7 @@ or directories.
 
 %prep
 %setup -q
+%patch0 -p1 -b .desktop
 
 %build
 %configure                                      \
@@ -57,14 +59,17 @@ make LIBTOOL=/usr/bin/libtool
 export tagname=CC
 make install DESTDIR=$RPM_BUILD_ROOT
 
+desktop-file-install --vendor gnome --delete-original       \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
+  --remove-only-show-in=GNOME                               \
+  $RPM_BUILD_ROOT%{_datadir}/applications/*
+
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
 %find_lang %{name} --with-gnome
 
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/file-roller.desktop
-
 %post
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
@@ -88,7 +93,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %doc README COPYING NEWS AUTHORS
 %{_bindir}/file-roller
 %{_datadir}/file-roller
-%{_datadir}/applications/file-roller.desktop
+%{_datadir}/applications/gnome-file-roller.desktop
 %{_libexecdir}/file-roller
 %{_datadir}/dbus-1/services/org.gnome.FileRoller.service
 %{_datadir}/icons/hicolor/*/apps/file-roller.png
@@ -100,31 +105,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
-* Sun Apr 21 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 3.8.1-2
-- Add BR on json-glib-devel and requires on unrar for RAR support
-
-* Mon Apr 15 2013 Kalev Lember <kalevlember at gmail.com> - 3.8.1-1
-- Update to 3.8.1
-
-* Tue Mar 26 2013 Kalev Lember <kalevlember at gmail.com> - 3.8.0-1
-- Update to 3.8.0
-
-* Wed Mar 20 2013 Richard Hughes <rhughes at redhat.com> - 3.7.92-1
-- Update to 3.7.92
-
-* Thu Mar  7 2013 Matthias Clasen <mclasen at redhat.com> - 3.7.91-1
-- Update to 3.7.91
-
-* Tue Feb 19 2013 Richard Hughes <rhughes at redhat.com> - 3.7.90-1
-- Update to 3.7.90
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Feb 06 2013 Kalev Lember <kalevlember at gmail.com> - 3.7.3-1
-- Update to 3.7.3
-- Remove the vendor prefix from the desktop file
-
 * Thu Jan 17 2013 Tomas Bzatek <tbzatek at redhat.com> - 3.6.3-2
 - Rebuilt for new libarchive
 
@@ -418,7 +398,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 - Clean up BRs
 
 * Sun Nov 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-2
-- Shorten summary
+- Shorten summary 
 
 * Mon Oct 20 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.1-1
 - Update to 2.24.1
@@ -449,7 +429,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 - Update to 2.23.4
 
 * Fri Jul 11 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.3-2
-- Fix icon lookup
+- Fix icon lookup 
 
 * Wed Jun 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.3-1
 - Update to 2.23.3
@@ -595,7 +575,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.14.3-4.1
 - rebuild
 
-* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-4
+* Thu Jun  8 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-4 
 - Add more BuildRequires
 
 * Mon Jun  5 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.3-3
@@ -660,10 +640,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 * Wed Sep  7 2005 Matthias Clasen <mclasen at redhat.com> 2.12.0-1
 - Update to 2.12.0
 
-* Wed Aug 17 2005 David Zeuthen <davidz at redhat.com>
+* Wed Aug 17 2005 David Zeuthen <davidz at redhat.com> 
 - Disable scrollkeeper until gnome-doc changes are sorted out
 
-* Tue Aug 16 2005 Matthias Clasen <mclasen at redhat.com>
+* Tue Aug 16 2005 Matthias Clasen <mclasen at redhat.com> 
 - New upstream version
 
 * Thu Aug  4 2005 Matthias Clasen <mclasen at redhat.com> 2.11.90-1
diff --git a/sources b/sources
index a2ed8a8..c0380f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e28ef39cd5ae7461bd9ac181ab81283f  file-roller-3.8.1.tar.xz
+6fdc21dfe47847125191a8ad8633871e  file-roller-3.6.3.tar.xz

More information about the scm-commits mailing list