rpms/bzr-gtk/devel bzr-gtk-olive-desktop.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 bzr-gtk.spec, 1.1, 1.2 sources, 1.2, 1.3

[Toshio Ernie Kuratomi (toshio)]

Author: toshio

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

Modified Files:
	.cvsignore bzr-gtk.spec sources 
Added Files:
	bzr-gtk-olive-desktop.patch 
Log Message:
- Update to 0.12.0
- Add a subpackage for the olive code


bzr-gtk-olive-desktop.patch:

--- NEW FILE bzr-gtk-olive-desktop.patch ---
=== modified file 'olive-gtk.desktop'
--- olive-gtk.desktop	2006-08-15 17:37:54 +0000
+++ olive-gtk.desktop	2006-12-10 19:33:37 +0000
@@ -1,4 +1,5 @@
 [Desktop Entry]
+Encoding=UTF-8
 Type=Application
 Version=1.0
 Name=Olive
@@ -6,4 +7,4 @@
 Comment=Graphical User Interface for the Bazaar Version Control System
 Icon=olive-gtk.png
 Exec=/usr/bin/olive-gtk
-Categories=Application;Development
+Categories=Application;Development;



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzr-gtk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Sep 2006 21:18:19 -0000	1.2
+++ .cvsignore	11 Dec 2006 00:40:40 -0000	1.3
@@ -1 +1 @@
-bzr-gtk-0.10.0.tar.gz
+bzr-gtk-0.12.0.tar.gz


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/extras/rpms/bzr-gtk/devel/bzr-gtk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzr-gtk.spec	19 Sep 2006 21:18:19 -0000	1.1
+++ bzr-gtk.spec	11 Dec 2006 00:40:40 -0000	1.2
@@ -1,27 +1,40 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bzr-gtk
-Version:        0.10.0
-Release:        2%{?dist}
+Version:        0.12.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?action=show&redirect=BzrGtk
+URL:            http://bazaar-vcs.org/bzr-gtk
 Source0:        http://samba.org/~jelmer/bzr/bzr-gtk-%{version}.tar.gz
+Patch0:         bzr-gtk-olive-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel bzr
-Requires:       bzr >= 0.10
+BuildRequires:  gettext
+Requires:       bzr >= 0.12
 
 %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.
+
+Olive is part of the bzr-gtk package.
+
 %prep
 %setup -q
-
+%patch0 -p0 -b .olive
 
 %build
 %{__python} setup.py build
@@ -31,7 +44,8 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
- 
+%find_lang olive-gtk
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -42,7 +56,18 @@
 # For noarch packages: sitelib
 %{python_sitelib}/*
 
+%files -n olive -f olive-gtk.lang
+%defattr(-,root,root,-)
+%{_bindir}/*
+%{_datadir}/olive/
+%{_datadir}/pixmaps/olive-gtk.png
+%{_datadir}/applications/olive-gtk.desktop
+
 %changelog
+* Wed Dec 06 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 0.12.0-1
+- Update to 0.12.0
+- Add a subpackage for the olive code
+
 * Sun Sep 17 2006 Warren Togami <wtogami at redhat.com> 0.10.0-2
 - Fix review issues #206877
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzr-gtk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Sep 2006 21:18:19 -0000	1.2
+++ sources	11 Dec 2006 00:40:40 -0000	1.3
@@ -1 +1 @@
-80b558931493f0c111f0741ae7ad3314  bzr-gtk-0.10.0.tar.gz
+7e037cec4de1608bf96b6caee62ac6c8  bzr-gtk-0.12.0.tar.gz