rpms/bzr-gtk/EL-5 .cvsignore, 1.7, 1.8 bzr-gtk.spec, 1.9, 1.10 sources, 1.7, 1.8

[Warren Togami (wtogami)]

Author: wtogami

Update of /cvs/pkgs/rpms/bzr-gtk/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10379

Modified Files:
	.cvsignore bzr-gtk.spec sources 
Log Message:
- Update to 0.18.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Apr 2007 20:44:58 -0000	1.7
+++ .cvsignore	25 Jul 2007 22:59:49 -0000	1.8
@@ -1 +1 @@
-bzr-gtk-0.15.2.tar.gz
+bzr-gtk-0.18.0.tar.gz


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/EL-5/bzr-gtk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bzr-gtk.spec	18 Apr 2007 23:08:14 -0000	1.9
+++ bzr-gtk.spec	25 Jul 2007 22:59:49 -0000	1.10
@@ -1,25 +1,33 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bzr-gtk
-Version:        0.15.2
-Release:        2%{?dist}
+Version:        0.18.0
+Release:        1%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
 License:        GPL
 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
+# Fix some bugs in the nautilus integration.  Submitted upstream
+Patch1:         bzr-gtk-nautilus.patch
+Patch2:		bzr-gtk-nautilus-protocol.patch
+# This requires some nonexistent functionality.  Bug filed upstream.  Disabled
+# for now.
+Patch3:         bzr-gtk-disable-nautilus-pull.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel bzr
+BuildRequires:  python-devel
+BuildRequires:  bzr
 BuildRequires:  gettext
-Requires:       bzr >= 0.15
-# These enable the commit-notify and nautilus browse functionality resp.  But
-# neither are packaged for Fedora yet.
+Requires:       bzr >= 0.18
+# This enables the commit-notify functionality but it's not packaged for
+# Fedora yet.
 #Requires:       bzr-dbus
-#Requires:       python-nautilus
 
 %description
 bzr-gtk is a plugin for Bazaar that aims to provide GTK+ interfaces to most
@@ -34,9 +42,23 @@
 Olive aims to be a full-featured graphical frontend for Bazaar.  It will
 expose all core functionality of Bazaar in a user-friendly GUI.
 
+%package -n nautilus-bzr
+Summary: Nautilus plugin for the bazaar revision control system
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires:       nautilus-python >= 0.4.3-4
+
+%description -n nautilus-bzr
+nautilus-bzr is an extension for Nautilus, the GNOME file manager.  It
+allows you to perform some revision control commands on Bazaar Working Trees
+from within Nautilus.
+
 %prep
 %setup -q
-%patch -p1 -b .disable
+%patch0 -p1 -b .disable
+%patch1 -p1 -b .nautilusfixes
+%patch2 -p1 -b .nautilusprotocol
+%patch3 -p1 -b .nautilusdisable
 
 %build
 %{__python} setup.py build
@@ -45,7 +67,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-# mv $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/gtk/nautilus* $RPM_BUILD_ROOT%{_prefix}/lib/nautilus/extensions-1.0/python/
+install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
+mv $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/gtk/nautilus* $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -62,12 +85,25 @@
 %{python_sitelib}/olive
 %{_datadir}/olive/
 %{_datadir}/pixmaps/olive-gtk.png
-%{_datadir}/applications/olive-gtk.desktop
+%{_datadir}/applications/*.desktop
 
-#%files nautilus
-#%{_prefix}/lib/nautilus/extensions-1.0/python/*
+%files -n nautilus-bzr
+%{_libdir}/nautilus/extensions-1.0/python/*
 
 %changelog
+* Wed Jul 25 2007 Warren Togami <wtogami at redhat.com> 0.18.0-1
+- Update to 0.18.0.
+
+* Thu Jun 28 2007 Warren Togami <wtogami at redhat.com> 0.17.0-1
+- Update to 0.17.0.
+
+* Fri May 11 2007 Toshio Kuratomi <toshio at tiki-lounge.com> 0.16.0-1
+- Update to 0.16.0.
+- Apply patch to fix traceback in nautilus module.
+
+* Mon Apr 30 2007 Toshio Kuratomi <toshio at tiki-lounge.com> 0.15.2-3
+- Add a nautilus subpackage as there's now a nautilus-python package in Fedora.
+
 * Wed Apr 18 2007 Toshio Kuratomi <toshio at tiki-lounge.com> 0.15.2-2
 - Fix olive description.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Apr 2007 20:44:58 -0000	1.7
+++ sources	25 Jul 2007 22:59:49 -0000	1.8
@@ -1 +1 @@
-33e79c61d8f367e126a7a4f5d7092038  bzr-gtk-0.15.2.tar.gz
+4be297c58fc6aeb79e660d77770f24fd  bzr-gtk-0.18.0.tar.gz