rpms/bzr-gtk/F-10 bzr-gtk-desktop-version.patch, NONE, 1.1 bzr-gtk-el5-encoding.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 bzr-gtk.spec, 1.37, 1.38 sources, 1.14, 1.15

Fri Jul 10 23:41:47 UTC 2009

Author: toshio

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

Modified Files:
	.cvsignore bzr-gtk.spec sources 
Added Files:
	bzr-gtk-desktop-version.patch bzr-gtk-el5-encoding.patch 
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-desktop-version.patch:

--- NEW FILE bzr-gtk-desktop-version.patch ---
diff -up bzr-gtk/bzr-notify.desktop.ver bzr-gtk/bzr-notify.desktop
--- bzr-gtk/bzr-notify.desktop.ver	2009-06-17 13:03:53.254184564 -0700
+++ bzr-gtk/bzr-notify.desktop	2009-06-17 13:04:03.260934759 -0700
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Version=0.1
+Version=1.0
 Name=Bazaar Notification
 GenericName=
 Comment=Notification Area Icon for Bazaar

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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	4 Sep 2008 03:52:03 -0000	1.14
+++ .cvsignore	10 Jul 2009 23:41:45 -0000	1.15
@@ -1 +1 @@
-bzr-gtk-0.95.0.tar.gz
+bzr-gtk-0.96.2.tar.gz


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-10/bzr-gtk.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- bzr-gtk.spec	25 Sep 2008 23:32:48 -0000	1.37
+++ bzr-gtk.spec	10 Jul 2009 23:41:45 -0000	1.38
@@ -7,18 +7,21 @@
 %define debug_package %{nil}
 
 Name:           bzr-gtk
-Version:        0.95.0
-Release:        2%{?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
-%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
@@ -66,8 +69,9 @@ from within Nautilus.
 %prep
 %setup -q
 %patch0 -p1 -b .nautilusdisable
+%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
@@ -82,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}
@@ -125,6 +131,19 @@ 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
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.95.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.95.0-3
+- Rebuild for Python 2.6
+
 * Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.95.0-2
 - Update for fixed nautilus-python package.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	4 Sep 2008 03:52:03 -0000	1.14
+++ sources	10 Jul 2009 23:41:46 -0000	1.15
@@ -1 +1 @@
-00aedce625672abca13d2d962b047ac0  bzr-gtk-0.95.0.tar.gz
+3873dc9efcbc7a655f1c890be406a867  bzr-gtk-0.96.2.tar.gz


