rpms/bzr-gtk/devel .cvsignore, 1.13, 1.14 bzr-gtk-disable-nautilus-pull.patch, 1.2, 1.3 bzr-gtk.spec, 1.35, 1.36 sources, 1.13, 1.14 bzr-gtk-disable-notifier.patch, 1.2, NONE bzr-gtk-ghost-keyerror.patch, 1.3, NONE bzr-gtk-more-better-seahorse-dbus-check.patch, 1.2, NONE bzr-gtk-nautilus-setup.patch, 1.1, NONE
Toshio くらとみ
toshio at fedoraproject.org
Thu Sep 4 03:52:34 UTC 2008
- Previous message (by thread): rpms/flam3/F-8 .cvsignore, 1.8, 1.9 flam3.spec, 1.8, 1.9 import.log, 1.1, 1.2 sources, 1.8, 1.9
- Next message (by thread): rpms/flam3/F-9 .cvsignore, 1.8, 1.9 flam3.spec, 1.8, 1.9 import.log, 1.1, 1.2 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: toshio
Update of /cvs/pkgs/rpms/bzr-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11685
Modified Files:
.cvsignore bzr-gtk-disable-nautilus-pull.patch bzr-gtk.spec
sources
Removed Files:
bzr-gtk-disable-notifier.patch bzr-gtk-ghost-keyerror.patch
bzr-gtk-more-better-seahorse-dbus-check.patch
bzr-gtk-nautilus-setup.patch
Log Message:
* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.95.0-1
- New Upstream release for use with bzr >= 1.6.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 5 May 2008 23:25:32 -0000 1.13
+++ .cvsignore 4 Sep 2008 03:52:03 -0000 1.14
@@ -1 +1 @@
-bzr-gtk-0.94.0.tar.gz
+bzr-gtk-0.95.0.tar.gz
bzr-gtk-disable-nautilus-pull.patch:
Index: bzr-gtk-disable-nautilus-pull.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk-disable-nautilus-pull.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bzr-gtk-disable-nautilus-pull.patch 15 Jul 2008 09:09:06 -0000 1.2
+++ bzr-gtk-disable-nautilus-pull.patch 4 Sep 2008 03:52:03 -0000 1.3
@@ -1,10 +1,10 @@
-Index: bzr-gtk-0.94.0/nautilus-bzr.py
+Index: bzr-gtk-0.95.0/nautilus-bzr.py
===================================================================
---- bzr-gtk-0.94.0.orig/nautilus-bzr.py
-+++ bzr-gtk-0.94.0/nautilus-bzr.py
-@@ -183,24 +183,6 @@ class BzrExtension(nautilus.MenuProvider
-
- return
+--- bzr-gtk-0.95.0.orig/nautilus-bzr.py
++++ bzr-gtk-0.95.0/nautilus-bzr.py
+@@ -185,24 +185,6 @@ class BzrExtension(nautilus.MenuProvider
+ pp.show()
+ gtk.main()
- def pull_cb(self, menu, vfs_file):
- # We can only cope with local files
@@ -27,16 +27,16 @@
def merge_cb(self, menu, vfs_file):
# We can only cope with local files
if vfs_file.get_uri_scheme() != 'file':
-@@ -265,12 +247,6 @@ class BzrExtension(nautilus.MenuProvider
+@@ -267,12 +249,6 @@ class BzrExtension(nautilus.MenuProvider
item.connect('activate', self.log_cb, vfs_file)
items.append(item)
- item = nautilus.MenuItem('BzrNautilus::pull',
-- 'Pull',
+- 'Pull ...',
- 'Pull from another branch')
- item.connect('activate', self.pull_cb, vfs_file)
- items.append(item)
-
item = nautilus.MenuItem('BzrNautilus::merge',
- 'Merge',
+ 'Merge ...',
'Merge from another branch')
Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- bzr-gtk.spec 24 Jul 2008 18:26:52 -0000 1.35
+++ bzr-gtk.spec 4 Sep 2008 03:52:03 -0000 1.36
@@ -7,27 +7,20 @@
%define debug_package %{nil}
Name: bzr-gtk
-Version: 0.94.0
-Release: 5%{?dist}
+Version: 0.95.0
+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
-# We can't use the notifier functionality without a bzr-dbus-package.
-Patch0: bzr-gtk-disable-notifier.patch
# This requires some nonexistent functionality. Bug filed upstream. Disabled
# for now.
-Patch1: bzr-gtk-disable-nautilus-pull.patch
-Patch2: bzr-gtk-nautilus-setup.patch
-# https://bugs.launchpad.net/bzr-gtk/+bug/228922
-Patch3: bzr-gtk-more-better-seahorse-dbus-check.patch
-# From upstream
-Patch4: bzr-gtk-ghost-keyerror.patch
+Patch0: bzr-gtk-disable-nautilus-pull.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
+Patch100: bzr-gtk-el5-encoding.patch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,9 +32,9 @@
# nautilus-python is not present in EPEL at this time.
BuildRequires: nautilus-python-devel
%endif
-Requires: bzr >= 1.0
+Requires: bzr >= 1.6
Requires: pygtk2
-# This enables the commit-notify functionality but it's not packaged for
+# This enables the bzr-notify functionality but it's not packaged for
# Fedora yet.
#Requires: bzr-dbus
Obsoletes: olive < %{version}-%{release}
@@ -68,11 +61,7 @@
%prep
%setup -q
-%patch0 -p1 -b .disable
-%patch1 -p1 -b .nautilusdisable
-%patch2 -p1 -b .nautilusinstall
-%patch3 -p0 -b .seahorse-fix
-%patch4 -p1 -b .ghost
+%patch0 -p1 -b .nautilusdisable
%if 0%{?fedora} <= 7
# EPEL 5 and Fedora <= 7
@@ -123,10 +112,14 @@
# If building for fedora, create the nautilus-bzr subpackage. If building for
# RHEL, exclude the files.
%files -n nautilus-bzr
+%defattr(-,root,root,-)
%{_libdir}/nautilus/extensions-1.0/python/*
%endif
%changelog
+* Wed Sep 3 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.95.0-1
+- New Upstream release for use with bzr >= 1.6.
+
* Thu Jul 24 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94.0-5
- Upstream has a new patch for bz#455284.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 5 May 2008 23:25:32 -0000 1.13
+++ sources 4 Sep 2008 03:52:03 -0000 1.14
@@ -1 +1 @@
-623715992ca761e7e6470134bf07f27f bzr-gtk-0.94.0.tar.gz
+00aedce625672abca13d2d962b047ac0 bzr-gtk-0.95.0.tar.gz
--- bzr-gtk-disable-notifier.patch DELETED ---
--- bzr-gtk-ghost-keyerror.patch DELETED ---
--- bzr-gtk-more-better-seahorse-dbus-check.patch DELETED ---
--- bzr-gtk-nautilus-setup.patch DELETED ---
- Previous message (by thread): rpms/flam3/F-8 .cvsignore, 1.8, 1.9 flam3.spec, 1.8, 1.9 import.log, 1.1, 1.2 sources, 1.8, 1.9
- Next message (by thread): rpms/flam3/F-9 .cvsignore, 1.8, 1.9 flam3.spec, 1.8, 1.9 import.log, 1.1, 1.2 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list