rpms/bzr-gtk/F-11 bzr-gtk-handle-patch.patch, NONE, 1.1 bzr-gtk.spec, 1.41, 1.42

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19091/F-11

Modified Files:
	bzr-gtk.spec 
Added Files:
	bzr-gtk-handle-patch.patch 
Log Message:

* Fri Nov 12 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.97.0-2
- Disable nautilus plugin on F13+ as nautilus-python is orphaned, broken, and
  not active upstream.
- Add a patch to fix error handling in bzr-patch-handler


bzr-gtk-handle-patch.patch:
 bzr-handle-patch |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bzr-gtk-handle-patch.patch ---
=== modified file 'bzr-handle-patch'
--- bzr-handle-patch	2008-06-27 16:53:56 +0000
+++ bzr-handle-patch	2009-11-13 19:07:28 +0000
@@ -33,7 +33,7 @@
 	gtk = open_display()
 	window.connect("destroy", gtk.main_quit)
 except Exception, e:
-	from dialog import error_dialog
+	from bzrlib.plugins.gtk.dialog import error_dialog
 	error_dialog('Error', str(e))
 	raise
 gtk.main()



Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-11/bzr-gtk.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- bzr-gtk.spec	25 Aug 2009 20:28:19 -0000	1.41
+++ bzr-gtk.spec	14 Nov 2009 00:05:46 -0000	1.42
@@ -8,7 +8,7 @@
 
 Name:           bzr-gtk
 Version:        0.97.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
@@ -21,7 +21,9 @@ Patch0:         bzr-gtk-disable-nautilus
 # Change the version in the desktop file -- it's for the dektop spec version,
 # not the application version
 Patch1: bzr-gtk-desktop-version.patch
-%if 0%{?fedora} <= 7 || 0%{?rhel} <= 5
+# Submitted upstream
+Patch2: bzr-gtk-handle-patch.patch
+%if 0%{?rhel} && 0%{?rhel} <= 5
 # In EL-5 and Fedora < 7 Encoding was a mandatory field.  Now it's deprecated.
 Patch100:       bzr-gtk-el5-encoding.patch
 %endif
@@ -31,8 +33,9 @@ BuildRequires:  python-devel
 BuildRequires:  bzr
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-%if 0%{?fedora}
+%if 0%{?fedora} && 0%{?fedora} <= 12
 # nautilus-python is not present in EPEL at this time.
+# It's also orphaned in Fedora as of Fedora 12
 BuildRequires:  nautilus-python-devel
 %endif
 Requires:       bzr >= 1.6
@@ -48,17 +51,14 @@ Provides:       olive = %{version}-%{rel
 bzr-gtk is a plugin for Bazaar that aims to provide GTK+ interfaces to most
 Bazaar operations.
 
-%if 0%{?fedora}
+%if 0%{?fedora} && 0%{?fedora} <= 12
 # nautilus-python is not present in EPEL at this time.
+# It's also orphaned in Fedora as of Fedora 12
 %package -n nautilus-bzr
 Summary: Nautilus plugin for the bazaar revision control system
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
-%if 0%{?fedora} >= 9
 Requires:       nautilus-python >= 0.5.0
-%else
-Requires:       nautilus-python >= 0.4.3-4
-%endif
 
 %description -n nautilus-bzr
 nautilus-bzr is an extension for Nautilus, the GNOME file manager.  It
@@ -70,9 +70,10 @@ from within Nautilus.
 %setup -q
 %patch0 -p1 -b .nautilusdisable
 %patch1 -p1 -b .dver
+%patch2 -p0 -b .bhp
 
-%if 0%{?fedora} <= 7 || 0%{?rhel} > 5
-# EPEL 5 and Fedora <= 7
+%if 0%{?rhel} && 0%{?rhel} <= 5
+# EPEL 5 only
 %patch100 -p1 -b .encoding
 %endif
 
@@ -114,13 +115,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/*.png
 %{_datadir}/icons/hicolor/scalable/emblems/
 %{python_sitearch}/bzrlib/plugins/gtk/
-%if 0%{?fedora} > 8
+%if 0%{?fedora} || 0%{?rhel} > 5
 %{python_sitearch}/*.egg-info
 %endif
 
-%if 0%{?fedora}
-# If building for fedora, create the nautilus-bzr subpackage.  If building for
-# RHEL, exclude the files.
+%if 0%{?fedora} && 0%{?fedora} <= 12
+# nautilus-python is not present in RHEL
+# nautilus-python is orphaned as of F-12
 %files -n nautilus-bzr
 %defattr(-,root,root,-)
 %if 0%{?fedora} >= 9
@@ -131,6 +132,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Nov 12 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.97.0-2
+- Disable nautilus plugin on F13+ as nautilus-python is orphaned, broken, and
+  not active upstream.
+- Add a patch to fix error handling in bzr-patch-handler
+
 * Tue Aug 25 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.97.0-1
 - Update to latest bugfix release.
 
@@ -237,20 +243,3 @@ rm -rf $RPM_BUILD_ROOT
 - Don't own the bzrlib or plugins directory as bzr already owns them.
 - Notes on splitting the nautilus functionality out.  This isn't done yet as
   we need to add python-nautilus into Fedora.
-
-* Wed Dec 06 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 0.13.0-1
-- Update to 0.13.0
-- Desktop file patch merged upstream.
-
-* Wed Dec 06 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 0.12.0-1
-- Update to 0.12.0
-- Add a subpackage for the olive code
-
-* Sun Sep 17 2006 Warren Togami <wtogami at redhat.com> 0.10.0-2
-- Fix review issues #206877
-
-* Sun Sep 17 2006 Warren Togami <wtogami at redhat.com> 0.10.0-1
-- 0.10.0
-
-* Sat Sep 16 2006 Warren Togami <wtogami at redhat.com> 0.9.0-1
-- initial Fedora