diff --git a/.cvsignore b/.cvsignore index ee94226..54687a7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -9,3 +9,4 @@ gnome-disk-utility-0.5.tar.bz2 gnome-disk-utility-2.28.0.tar.bz2 gnome-disk-utility-2.29.0.git20091202.tar.bz2 gnome-disk-utility-2.29.0.git20100115.tar.bz2 +gnome-disk-utility-2.29.0.git20100215.tar.bz2 diff --git a/gnome-disk-utility.spec b/gnome-disk-utility.spec index 4e68f75..ded1a66 100644 --- a/gnome-disk-utility.spec +++ b/gnome-disk-utility.spec @@ -4,7 +4,7 @@ %define gtk2_version 2.17.2 %define gnome_doc_utils_version 0.3.2 %define gnome_keyring_version 2.22 -%define udisks_version 1.0.0 +%define udisks_version 1.0.0-0.git20100215 %define unique_version 1.0.4 %define libnotify_version 0.4.5 %define nautilus_version 2.26 @@ -13,11 +13,11 @@ Summary: Disk management application Name: gnome-disk-utility Version: 2.29.0 -Release: 0.git20100115.2%{?dist} +Release: 0.git20100215.2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://git.gnome.org/cgit/gnome-disk-utility -Source0: %{name}-%{version}.git20100115.tar.bz2 +Source0: %{name}-%{version}.git20100215.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -41,16 +41,6 @@ Requires: %{name}-libs = %{version}-%{release} Obsoletes: gnome-disk-utility-format Obsoletes: nautilus-gdu -# Patch0 touches Makefile.am files: -BuildRequires: automake autoconf -BuildRequires: libtool -BuildRequires: gnome-common scrollkeeper - -# from upstream -Patch0: gnome-disk-utility-2.29.1-missing-include.patch - - - %description This package contains the Palimpsest disk management application. Palimpsest supports partitioning, file system creation, encryption, @@ -105,16 +95,8 @@ develop applications with gnome-disk-utility-ui-libs. %prep %setup -q -%patch0 -p1 -b .missing-include %build -# needed for Patch0 -libtoolize --force || : -aclocal || : -autoheader || : -automake || : -autoconf || : - %configure make %{?_smp_mflags} @@ -229,6 +211,10 @@ fi %{_includedir}/gnome-disk-utility/gdu-gtk/* %changelog +* Mon Feb 15 2010 David Zeuthen - 2.29.0-0.git20100215.1%{?dist} +- Update to git snapshot +- Drop upstreamed patches + * Mon Jan 18 2010 Tomas Bzatek - 2.29.0-0.git20100115.2%{?dist} - Install missing include diff --git a/sources b/sources index f03b2b9..0bff8c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2143a0a208cb48e1ad197c0b1ab6b1d1 gnome-disk-utility-2.29.0.git20100115.tar.bz2 +c4ac0a79a356a404f0e1fc11a8342b03 gnome-disk-utility-2.29.0.git20100215.tar.bz2