rpms/bzr-gtk/F-8 bzr-gtk.spec,1.14,1.15

[Toshio くらとみ (toshio)]

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26303

Modified Files:
	bzr-gtk.spec 
Log Message:
Find out where this directory is going in the x86_64 builds.



Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-8/bzr-gtk.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bzr-gtk.spec	14 Dec 2007 06:20:59 -0000	1.14
+++ bzr-gtk.spec	7 May 2008 04:14:26 -0000	1.15
@@ -7,46 +7,41 @@
 %define debug_package %{nil}
 
 Name:           bzr-gtk
-Version:        0.93.0
-Release:        2%{?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.
-
 %package -n nautilus-bzr
 Summary: Nautilus plugin for the bazaar revision control system
 Group: User Interface/Desktops
@@ -61,9 +56,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 +65,20 @@
 
 %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}/
+    find $RPM_BUILD_ROOT -print
+    #mv $RPM_BUILD_ROOT%{_usr}/lib/nautilus/ $RPM_BUILD_ROOT%{_libdir}
 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 +87,33 @@
 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
+
 * Tue Dec 11 2007 Toshio Kuratomi <a.badger at gmail.com> 0.93-2
 - Move the egg-info into sitearch along with the module.