rpms/bzr-gtk/devel bzr-gtk-el5-encoding.patch, NONE, 1.1 bzr-gtk.spec, 1.40, 1.41 bug377476.diff, 1.1, NONE

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12931

Modified Files:
	bzr-gtk.spec 
Added Files:
	bzr-gtk-el5-encoding.patch 
Removed Files:
	bug377476.diff 
Log Message:

* Fri Jul 10 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.96.2-1
- Update to work with bzr-1.16
- Update rhel version reqs


bzr-gtk-el5-encoding.patch:

--- NEW FILE bzr-gtk-el5-encoding.patch ---
diff -up bzr-gtk-0.94.0/bzr-handle-patch.desktop.el5-enc bzr-gtk-0.94.0/bzr-handle-patch.desktop
--- bzr-gtk-0.94.0/bzr-handle-patch.desktop.el5-enc	2008-05-07 12:51:09.000000000 -0700
+++ bzr-gtk-0.94.0/bzr-handle-patch.desktop	2008-05-07 12:51:19.000000000 -0700
@@ -1,4 +1,5 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=Bazaar
 Comment=Apply Bazaar Bundle
 Icon=bazaar


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- bzr-gtk.spec	27 May 2009 17:45:31 -0000	1.40
+++ bzr-gtk.spec	10 Jul 2009 21:16:42 -0000	1.41
@@ -7,20 +7,21 @@
 %define debug_package %{nil}
 
 Name:           bzr-gtk
-Version:        0.95.0
-Release:        5%{?dist}
+Version:        0.96.2
+Release:        1%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://bazaar-vcs.org/bzr-gtk
-Source0:        http://samba.org/~jelmer/bzr/bzr-gtk-%{version}.tar.gz
+Source0: http://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
 # This requires some nonexistent functionality.  Bug filed upstream.  Disabled
 # for now.
 Patch0:         bzr-gtk-disable-nautilus-pull.patch
-# Fix for seahorse traceback from upstream
-Patch1: bug377476.diff
-%if 0%{?fedora} <= 7
+# 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
 # In EL-5 and Fedora < 7 Encoding was a mandatory field.  Now it's deprecated.
 Patch100:       bzr-gtk-el5-encoding.patch
 %endif
@@ -68,9 +69,9 @@ from within Nautilus.
 %prep
 %setup -q
 %patch0 -p1 -b .nautilusdisable
-%patch1 -p0 -b .seahorse
+%patch1 -p1 -b .dver
 
-%if 0%{?fedora} <= 7
+%if 0%{?fedora} <= 7 || 0%{?rhel} > 5
 # EPEL 5 and Fedora <= 7
 %patch100 -p1 -b .encoding
 %endif
@@ -85,6 +86,8 @@ rm -rf $RPM_BUILD_ROOT
 desktop-file-validate bazaar-properties.desktop
 desktop-file-validate bzr-handle-patch.desktop
 desktop-file-validate olive-gtk.desktop
+desktop-file-validate bzr-notify.desktop
+
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 if test "%{python_sitelib}" != "%{python_sitearch}" ; then
     install -d -m 0755 $RPM_BUILD_ROOT%{python_sitearch}
@@ -128,6 +131,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Jul 10 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.96.2-1
+- Update to work with bzr-1.16
+- Update rhel version reqs
+
 * Wed May 27 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.95.0-5
 - Upstream patch to work around: bz#498138
 


--- bug377476.diff DELETED ---