Merge branch 'f15'

Conflicts:
	.gitignore
	gnome-bluetooth.spec
	sources
This commit is contained in:
Tomas Bzatek 2011-04-21 16:22:39 +02:00
commit 8532512b73
3 changed files with 16 additions and 6 deletions

6
.gitignore vendored
View File

@ -1,4 +1,2 @@
gnome-bluetooth-2.90.0.tar.bz2
/gnome-bluetooth-2.91.2.tar.bz2
/gnome-bluetooth-2.91.5.tar.bz2
/gnome-bluetooth-2.91.91.tar.bz2
/gnome-bluetooth-2.91.92.tar.bz2
/gnome-bluetooth-3.0.0.tar.bz2

View File

@ -1,6 +1,6 @@
Name: gnome-bluetooth
Epoch: 1
Version: 2.91.91
Version: 3.0.0
Release: 1%{?dist}
Summary: Bluetooth graphical utilities
@ -15,8 +15,11 @@ BuildRequires: GConf2-devel
BuildRequires: control-center-devel
BuildRequires: dbus-glib-devel
BuildRequires: libnotify-devel
%if 0
# not needed with the moblin subpackage disabled
BuildRequires: mutter-meego-devel
BuildRequires: libmx-devel
%endif
BuildRequires: gnome-doc-utils rarian-compat
BuildRequires: nautilus-sendto-devel >= 2.90.0
@ -202,6 +205,15 @@ fi
%endif
%changelog
* Mon Apr 04 2011 Bastien Nocera <bnocera@redhat.com> 3.0.0-1
- Update to 3.0.0
* Sat Mar 26 2011 Dan Horák <dan[at]danny.cz> 2.91.92-2
- update BRs when the moblin subpackage is disabled
* Mon Mar 21 2011 Bastien Nocera <bnocera@redhat.com> 2.91.92-1
- Update to 2.91.92
* Tue Mar 08 2011 Bastien Nocera <bnocera@redhat.com> 2.91.91-1
- Update to 2.91.91

View File

@ -1 +1 @@
43b00d0ad7136641779d9e9a201340d6 gnome-bluetooth-2.91.91.tar.bz2
390f878091a0f21cf2578f3cbc36dbff gnome-bluetooth-3.0.0.tar.bz2