rpms/bzr-gtk/F-9 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)
fedora-extras-commits at redhat.com
Wed May 7 13:23:57 UTC 2008
- Previous message (by thread): 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
- Next message (by thread): rpms/bzr-gtk/EL-5 bzr-gtk-nautilus-setup.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 bzr-gtk.spec, 1.12, 1.13 sources, 1.9, 1.10 bzr-gtk-nautilus-protocol.patch, 1.1, NONE bzr-gtk-nautilus.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: toshio
Update of /cvs/pkgs/rpms/bzr-gtk/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8702/F-9
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-9/.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 7 May 2008 13:23:17 -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-9/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 7 May 2008 13:23:17 -0000 1.17
@@ -7,46 +7,43 @@
%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)
BuildRequires: python-devel
BuildRequires: bzr
BuildRequires: gettext
+BuildRequires: desktop-file-utils
+BuildRequires: nautilus-python-devel
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.
-
+%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
@@ -57,13 +54,13 @@
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
%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 +68,17 @@
%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,31 +87,43 @@
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
-
+%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
+- 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
+* 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-9/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 7 May 2008 13:23:17 -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 ---
- Previous message (by thread): 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
- Next message (by thread): rpms/bzr-gtk/EL-5 bzr-gtk-nautilus-setup.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 bzr-gtk.spec, 1.12, 1.13 sources, 1.9, 1.10 bzr-gtk-nautilus-protocol.patch, 1.1, NONE bzr-gtk-nautilus.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list