rpms/bzr-gtk/EL-5 .cvsignore, 1.8, 1.9 bzr-gtk.spec, 1.10, 1.11 sources, 1.8, 1.9
Toshio くらとみ (toshio)
fedora-extras-commits at redhat.com
Fri Dec 14 06:21:18 UTC 2007
- Previous message (by thread): rpms/bzrtools/F-8 .cvsignore, 1.14, 1.15 bzrtools.spec, 1.22, 1.23 sources, 1.14, 1.15
- Next message (by thread): rpms/bzr-gtk/F-7 .cvsignore, 1.9, 1.10 bzr-gtk.spec, 1.10, 1.11 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: toshio
Update of /cvs/pkgs/rpms/bzr-gtk/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27836/EL-5
Modified Files:
.cvsignore bzr-gtk.spec sources
Log Message:
* Tue Dec 11 2007 Toshio Kuratomi <a.badger at gmail.com> 0.93-2
- Move the egg-info into sitearch along with the module.
* Tue Dec 11 2007 Toshio Kuratomi <a.badger at gmail.com> 0.93-1
- Update to bzr-1.0 compatible package.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 25 Jul 2007 22:59:49 -0000 1.8
+++ .cvsignore 14 Dec 2007 06:20:43 -0000 1.9
@@ -1 +1 @@
-bzr-gtk-0.18.0.tar.gz
+bzr-gtk-0.93.0.tar.gz
Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/EL-5/bzr-gtk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bzr-gtk.spec 25 Jul 2007 22:59:49 -0000 1.10
+++ bzr-gtk.spec 14 Dec 2007 06:20:43 -0000 1.11
@@ -1,30 +1,35 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+
+# Oh the horrors of arch dependent noarch packages!
+# (bzrlib is arch dependent. Thus bzrlib plugins are also arch dependent.)
+%define debug_package %{nil}
Name: bzr-gtk
-Version: 0.18.0
-Release: 1%{?dist}
+Version: 0.93.0
+Release: 2%{?dist}
Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations
Group: Development/Tools
-License: GPL
+License: GPLv2+
URL: http://bazaar-vcs.org/bzr-gtk
-Source0: http://samba.org/~jelmer/bzr/bzr-gtk-%{version}.tar.gz
+Source0: https://launchpad.net/bzr-gtk/0.93/%{version}/+download/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
+Patch2: bzr-gtk-nautilus-protocol.patch
# This requires some nonexistent functionality. Bug filed upstream. Disabled
# for now.
Patch3: bzr-gtk-disable-nautilus-pull.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
BuildRequires: python-devel
BuildRequires: bzr
BuildRequires: gettext
-Requires: bzr >= 0.18
+Requires: bzr >= 1.0
# This enables the commit-notify functionality but it's not packaged for
# Fedora yet.
#Requires: bzr-dbus
@@ -66,9 +71,20 @@
%install
rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__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_sitelib}/bzrlib/plugins/gtk/nautilus* $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
+
+# This won't do anything until after we add bzr-dbus.
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bzr-notify.desktop
%clean
rm -rf $RPM_BUILD_ROOT
@@ -77,20 +93,48 @@
%files
%defattr(-,root,root,-)
%doc COPYING README
-%{python_sitelib}/bzrlib/plugins/gtk/
+%{_datadir}/applications/bazaar-properties.desktop
+%{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_sitelib}/olive
+%{python_sitearch}/olive/
%{_datadir}/olive/
%{_datadir}/pixmaps/olive-gtk.png
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/olive-gtk.desktop
%files -n nautilus-bzr
%{_libdir}/nautilus/extensions-1.0/python/*
%changelog
+* Tue Dec 11 2007 Toshio Kuratomi <a.badger at gmail.com> 0.93-2
+- Move the egg-info into sitearch along with the module.
+
+* Tue Dec 11 2007 Toshio Kuratomi <a.badger at gmail.com> 0.93-1
+- Update to bzr-1.0 compatible package.
+
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-2
+- Olive must be moved to an arch specific directory as well for now.
+ If rpm could have noarch subpackages, this would be fine to leave in
+ python_sitelib.
+
+* Wed Sep 26 2007 Toshio Kuratomi <a.badger at gmail.com> 0.91.0-1
+- Update to 0.91.0.
+
+* Thu Aug 30 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-2
+- Move the plugins manually as distutils doesn't know that bzr is arch
+ specific.
+
+* Tue Aug 28 2007 Toshio Kuratomi <a.badger at gmail.com> 0.90.0-1
+- Update to 0.90.0.
+- Update license tag to the new Licensing Guidelines.
+- Bzr is now arch specific so all its plugins have to be as well.
+
* Wed Jul 25 2007 Warren Togami <wtogami at redhat.com> 0.18.0-1
- Update to 0.18.0.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 25 Jul 2007 22:59:49 -0000 1.8
+++ sources 14 Dec 2007 06:20:43 -0000 1.9
@@ -1 +1 @@
-4be297c58fc6aeb79e660d77770f24fd bzr-gtk-0.18.0.tar.gz
+de4951911d7e39d88916d276177476f3 bzr-gtk-0.93.0.tar.gz
- Previous message (by thread): rpms/bzrtools/F-8 .cvsignore, 1.14, 1.15 bzrtools.spec, 1.22, 1.23 sources, 1.14, 1.15
- Next message (by thread): rpms/bzr-gtk/F-7 .cvsignore, 1.9, 1.10 bzr-gtk.spec, 1.10, 1.11 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list