rpms/bzr-gtk/devel bzr-gtk.spec,1.25,1.26
Toshio くらとみ (toshio)
fedora-extras-commits at redhat.com
Wed May 7 20:01:29 UTC 2008
- Previous message (by thread): rpms/bzr-gtk/F-7 bzr-gtk-el5-encoding.patch, NONE, 1.1 bzr-gtk.spec, 1.12, 1.13
- Next message (by thread): rpms/kde-l10n/F-9 .cvsignore, 1.6, 1.7 kde-l10n.spec, 1.23, 1.24 sources, 1.6, 1.7 subdirs-kde-l10n, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: toshio
Update of /cvs/pkgs/rpms/bzr-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2390/devel
Modified Files:
bzr-gtk.spec
Log Message:
* Wed May 7 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94-1.1
- Add Encoding metadata for EL-5/F-7 desktop-file-validate.
Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- bzr-gtk.spec 7 May 2008 07:16:46 -0000 1.25
+++ bzr-gtk.spec 7 May 2008 20:00:51 -0000 1.26
@@ -8,7 +8,7 @@
Name: bzr-gtk
Version: 0.94.0
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: Bazaar plugin for GTK+ interfaces to most Bazaar operations
Group: Development/Tools
@@ -21,14 +21,20 @@
# for now.
Patch1: bzr-gtk-disable-nautilus-pull.patch
Patch2: bzr-gtk-nautilus-setup.patch
-
+%if 0%{?fedora} <= 7
+# In EL-5 and Fedora < 7 Encoding was a mandatory field. Now it's deprecated.
+Patch100: bzr-gtk-el5-encoding.patch
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
BuildRequires: bzr
BuildRequires: gettext
BuildRequires: desktop-file-utils
+%if 0%{?fedora}
+# nautilus-python is not present in EPEL at this time.
BuildRequires: nautilus-python-devel
+%endif
Requires: bzr >= 1.0
Requires: pygtk2
# This enables the commit-notify functionality but it's not packaged for
@@ -61,6 +67,10 @@
%patch0 -p1 -b .disable
%patch1 -p1 -b .nautilusdisable
%patch2 -p1 -b .nautilusinstall
+%if 0%{?fedora} <= 7
+# EPEL and Fedora < 7
+%patch100 -p1 -b .encoding
+%endif
%build
%{__python} setup.py build
@@ -112,6 +122,9 @@
%endif
%changelog
+* Wed May 7 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94-1.1
+- Add Encoding metadata for EL-5/F-7 desktop-file-validate.
+
* 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.
- Previous message (by thread): rpms/bzr-gtk/F-7 bzr-gtk-el5-encoding.patch, NONE, 1.1 bzr-gtk.spec, 1.12, 1.13
- Next message (by thread): rpms/kde-l10n/F-9 .cvsignore, 1.6, 1.7 kde-l10n.spec, 1.23, 1.24 sources, 1.6, 1.7 subdirs-kde-l10n, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list