rpms/bzr-gtk/F-7 bzr-gtk-el5-encoding.patch, NONE, 1.1 bzr-gtk.spec, 1.12, 1.13

[Toshio くらとみ (toshio)]

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2390/F-7

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

* Wed May 7 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94-1.1
- Add Encoding metadata for EL-5/F-7 desktop-file-validate.


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/F-7/bzr-gtk.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bzr-gtk.spec	7 May 2008 13:22:58 -0000	1.12
+++ bzr-gtk.spec	7 May 2008 20:00:39 -0000	1.13
@@ -8,7 +8,7 @@
 
 Name:           bzr-gtk
 Version:        0.94.0
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
@@ -21,14 +21,20 @@
 # for now.
 Patch1:         bzr-gtk-disable-nautilus-pull.patch
 Patch2:         bzr-gtk-nautilus-setup.patch
-
+%if 0%{?fedora} <= 7
+# In EL-5 and Fedora < 7 Encoding was a mandatory field.  Now it's deprecated.
+Patch100:	bzr-gtk-el5-encoding.patch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
 BuildRequires:  bzr
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
+%if 0%{?fedora}
+# nautilus-python is not present in EPEL at this time.
 BuildRequires:  nautilus-python-devel
+%endif
 Requires:       bzr >= 1.0
 Requires:       pygtk2
 # This enables the commit-notify functionality but it's not packaged for
@@ -61,6 +67,10 @@
 %patch0 -p1 -b .disable
 %patch1 -p1 -b .nautilusdisable
 %patch2 -p1 -b .nautilusinstall
+%if 0%{?fedora} <= 7
+# EPEL and Fedora < 7
+%patch100 -p1 -b .encoding
+%endif
 
 %build
 %{__python} setup.py build
@@ -112,6 +122,9 @@
 %endif
 
 %changelog
+* Wed May 7 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94-1.1
+- Add Encoding metadata for EL-5/F-7 desktop-file-validate.
+
 * Mon May 5 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94-1
 - Update to 0.94.
 - Merge olive package into bzr-gtk to fix BZ#441139.