rpms/bzr-gtk/F-8 bzr-gtk-nautilus-setup.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 bzr-gtk.spec, 1.15, 1.16 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/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8702/F-8

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/F-8/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Dec 2007 06:20:58 -0000	1.12
+++ .cvsignore	7 May 2008 13:23:05 -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/F-8/bzr-gtk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- bzr-gtk.spec	7 May 2008 04:14:26 -0000	1.15
+++ bzr-gtk.spec	7 May 2008 13:23:06 -0000	1.16
@@ -42,6 +42,8 @@
 bzr-gtk is a plugin for Bazaar that aims to provide GTK+ interfaces to most
 Bazaar operations.
 
+%if 0%{?fedora}
+# nautilus-python is not present in EPEL at this time.
 %package -n nautilus-bzr
 Summary: Nautilus plugin for the bazaar revision control system
 Group: User Interface/Desktops
@@ -52,6 +54,7 @@
 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.
+%endif
 
 %prep
 %setup -q
@@ -73,11 +76,8 @@
 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}/
-    find $RPM_BUILD_ROOT -print
-    #mv $RPM_BUILD_ROOT%{_usr}/lib/nautilus/ $RPM_BUILD_ROOT%{_libdir}
 fi
 
-# No translations yet
 %find_lang olive-gtk
 
 # This won't do anything until after we add bzr-dbus.
@@ -102,8 +102,14 @@
 %{python_sitearch}/*.egg-info
 %endif
 
+%if 0%{?fedora}
+# If building for fedora, create the nautilus-bzr subpackage.  If building for
+# RHEL, exclude the files.
 %files -n nautilus-bzr
 %{_libdir}/nautilus/extensions-1.0/python/*
+%else
+%exclude %{_libdir}/nautilus/extensions-1.0/python/*
+%endif
 
 %changelog
 * Mon May 5 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94-1
@@ -114,6 +120,10 @@
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.93.0-3
 - Autorebuild for GCC 4.3
 
+* Thu Jan 17 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.93.0-3
+- Exclude nautilus-bzr when building for RHEL as nautilus-python is not
+  available there.
+
 * Tue Dec 11 2007 Toshio Kuratomi <a.badger at gmail.com> 0.93-2
 - Move the egg-info into sitearch along with the module.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Dec 2007 06:20:59 -0000	1.12
+++ sources	7 May 2008 13:23:06 -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 ---