rpms/bzr-gtk/devel bzr-gtk-nautilus-setup.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 bzr-gtk.spec, 1.16, 1.17 sources, 1.12, 1.13 bzr-gtk-nautilus-protocol.patch, 1.1, NONE bzr-gtk-nautilus.patch, 1.1, NONE

[Toshio くらとみ (toshio)]

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8521

Modified Files:
	.cvsignore bzr-gtk.spec sources 
Added Files:
	bzr-gtk-nautilus-setup.patch 
Removed Files:
	bzr-gtk-nautilus-protocol.patch bzr-gtk-nautilus.patch 
Log Message:

* 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.
- Remove patches that were merged into 0.94.


bzr-gtk-nautilus-setup.patch:

--- NEW FILE bzr-gtk-nautilus-setup.patch ---
diff -up bzr-gtk-0.94.0/setup.py.bak bzr-gtk-0.94.0/setup.py
--- bzr-gtk-0.94.0/setup.py.bak	2008-05-05 16:13:21.000000000 -0700
+++ bzr-gtk-0.94.0/setup.py	2008-05-05 16:14:17.000000000 -0700
@@ -83,7 +83,7 @@ class InstallData(install_data):
             ret = cmd.close()
             
             if ret is None:
-                dest = res[5:]
+                dest = res[5:].rstrip()
                 files.append((dest, ['nautilus-bzr.py']))
         
         return files


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	11 Dec 2007 21:32:55 -0000	1.12
+++ .cvsignore	5 May 2008 23:25:32 -0000	1.13
@@ -1 +1 @@
-bzr-gtk-0.93.0.tar.gz
+bzr-gtk-0.94.0.tar.gz


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bzr-gtk.spec	20 Feb 2008 05:41:46 -0000	1.16
+++ bzr-gtk.spec	5 May 2008 23:25:32 -0000	1.17
@@ -7,22 +7,20 @@
 %define debug_package %{nil}
 
 Name:           bzr-gtk
-Version:        0.93.0
-Release:        3%{?dist}
+Version:        0.94.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:        https://launchpad.net/bzr-gtk/0.93/%{version}/+download/bzr-gtk-%{version}.tar.gz
+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
+Patch1:         bzr-gtk-disable-nautilus-pull.patch
+Patch2:         bzr-gtk-nautilus-setup.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,23 +28,18 @@
 BuildRequires:  bzr
 BuildRequires:  gettext
 Requires:       bzr >= 1.0
+Requires:       pygtk2
 # This enables the commit-notify functionality but it's not packaged for
 # Fedora yet.
 #Requires:       bzr-dbus
+Obsoletes:      olive < %{version}-%{release}
+Provides:       olive = %{version}-%{release}
+
 
 %description
 bzr-gtk is a plugin for Bazaar that aims to provide GTK+ interfaces to most
 Bazaar operations.
 
-%package -n olive
-Summary: Graphical frontend to the bazaar revision control system
-Group: Development/Tools
-Requires: %{name} = %{version}-%{release}
-
-%description -n olive
-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
@@ -61,9 +54,8 @@
 %prep
 %setup -q
 %patch0 -p1 -b .disable
-%patch1 -p1 -b .nautilusfixes
-%patch2 -p1 -b .nautilusprotocol
-%patch3 -p1 -b .nautilusdisable
+%patch1 -p1 -b .nautilusdisable
+%patch2 -p1 -b .nautilusinstall
 
 %build
 %{__python} setup.py build
@@ -71,17 +63,18 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
+desktop-file-validate bazaar-properties.desktop
+desktop-file-validate bzr-handle-patch.desktop
+desktop-file-validate olive-gtk.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}
     mv $RPM_BUILD_ROOT%{python_sitelib}/* $RPM_BUILD_ROOT%{python_sitearch}/
 fi
 
-install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
-mv $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/plugins/gtk/nautilus* $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/python/
-
 # No translations yet
-#%find_lang olive
+%find_lang olive-gtk
 
 # This won't do anything until after we add bzr-dbus.
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bzr-notify.desktop
@@ -90,28 +83,30 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f olive-gtk.lang
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_datadir}/applications/bazaar-properties.desktop
+%{_bindir}/*
+%{_datadir}/applications/*
+%{_datadir}/application-registry/bzr-gtk.applications
+%{_datadir}/olive/
+%{_datadir}/bzr-gtk/
+%{_datadir}/pixmaps/*.png
+%{_datadir}/icons/hicolor/scalable/emblems/
 %{python_sitearch}/bzrlib/plugins/gtk/
 %if 0%{?fedora} > 8
 %{python_sitearch}/*.egg-info
 %endif
 
-#%files -n olive -f olive.lang
-%files -n olive
-%defattr(-,root,root,-)
-%{_bindir}/*
-%{python_sitearch}/olive/
-%{_datadir}/olive/
-%{_datadir}/pixmaps/olive-gtk.png
-%{_datadir}/applications/olive-gtk.desktop
-
 %files -n nautilus-bzr
 %{_libdir}/nautilus/extensions-1.0/python/*
 
 %changelog
+* 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.
+- Remove patches that were merged into 0.94.
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.93.0-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	11 Dec 2007 21:32:55 -0000	1.12
+++ sources	5 May 2008 23:25:32 -0000	1.13
@@ -1 +1 @@
-de4951911d7e39d88916d276177476f3  bzr-gtk-0.93.0.tar.gz
+623715992ca761e7e6470134bf07f27f  bzr-gtk-0.94.0.tar.gz


--- bzr-gtk-nautilus-protocol.patch DELETED ---


--- bzr-gtk-nautilus.patch DELETED ---