From 1a485aac4c38525c9ae845bad0d34c848e171af1 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 22 Feb 2011 18:31:13 +0100 Subject: [PATCH 1/4] Split nautilus extension into a separate package --- gnome-disk-utility.spec | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnome-disk-utility.spec b/gnome-disk-utility.spec index 5cccadf..148da0d 100644 --- a/gnome-disk-utility.spec +++ b/gnome-disk-utility.spec @@ -13,7 +13,7 @@ Summary: Disk management application Name: gnome-disk-utility Version: 2.91.6 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://git.gnome.org/cgit/gnome-disk-utility @@ -91,6 +91,15 @@ Requires: %{name}-devel = %{version}-%{release} This package contains header files and libraries needed to develop applications with gnome-disk-utility-ui-libs. +%package nautilus +Summary: Nautilus extension +Group: Applications/File +Requires: %{name} = %{version}-%{release} + +%description nautilus +This package contains a Nautilus extension providing formatting +functionality. + %prep %setup -q %patch0 -p1 -b .nautilus @@ -151,7 +160,6 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : %{_libexecdir}/gdu-notification-daemon %{_sysconfdir}/xdg/autostart/gdu-notification-daemon.desktop -%{_libdir}/nautilus/extensions-3.0/*.so %{_libexecdir}/gdu-format-tool %{_bindir}/palimpsest @@ -199,7 +207,15 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : %dir %{_includedir}/gnome-disk-utility/gdu-gtk %{_includedir}/gnome-disk-utility/gdu-gtk/* +%files nautilus +%defattr(-,root,root,-) + +%{_libdir}/nautilus/extensions-3.0/*.so + %changelog +* Tue Feb 22 2011 Tomas Bzatek - 2.91.6-4 +- Split nautilus extension into a separate package + * Fri Feb 11 2011 Matthias Clasen - 2.91.6-3 - Rebuild against newer gtk From aca272f3433092a57ccd1fb19306aaab7a212db5 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Mon, 14 Mar 2011 14:10:00 +0100 Subject: [PATCH 2/4] Fix gnome-disk-utility-nautilus upgrade path --- gnome-disk-utility.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnome-disk-utility.spec b/gnome-disk-utility.spec index 148da0d..0128c11 100644 --- a/gnome-disk-utility.spec +++ b/gnome-disk-utility.spec @@ -13,7 +13,7 @@ Summary: Disk management application Name: gnome-disk-utility Version: 2.91.6 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://git.gnome.org/cgit/gnome-disk-utility @@ -94,6 +94,7 @@ develop applications with gnome-disk-utility-ui-libs. %package nautilus Summary: Nautilus extension Group: Applications/File +Obsoletes: %{name} < 2.91.6-5 Requires: %{name} = %{version}-%{release} %description nautilus @@ -213,6 +214,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : %{_libdir}/nautilus/extensions-3.0/*.so %changelog +* Mon Mar 14 2011 Tomas Bzatek - 2.91.6-5 +- Fix gnome-disk-utility-nautilus upgrade path + * Tue Feb 22 2011 Tomas Bzatek - 2.91.6-4 - Split nautilus extension into a separate package From 767afc59837c4d827a7faab97f29d0ebea132af5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 21 Mar 2011 19:09:36 -0400 Subject: [PATCH 3/4] 2.91.7 --- .gitignore | 1 + gnome-disk-utility.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5f3e839..b128724 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ gnome-disk-utility-2.30.1.tar.bz2 /gnome-disk-utility-2.32.0.tar.bz2 /gnome-disk-utility-2.32.1.tar.bz2 /gnome-disk-utility-2.91.6.tar.bz2 +/gnome-disk-utility-2.91.7.tar.bz2 diff --git a/gnome-disk-utility.spec b/gnome-disk-utility.spec index 0128c11..78b3278 100644 --- a/gnome-disk-utility.spec +++ b/gnome-disk-utility.spec @@ -12,8 +12,8 @@ Summary: Disk management application Name: gnome-disk-utility -Version: 2.91.6 -Release: 5%{?dist} +Version: 2.91.7 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://git.gnome.org/cgit/gnome-disk-utility @@ -214,6 +214,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : %{_libdir}/nautilus/extensions-3.0/*.so %changelog +* Mon Mar 21 2011 Matthias Clasen - 2.91.7-1 +- Update to 2.91.7 + * Mon Mar 14 2011 Tomas Bzatek - 2.91.6-5 - Fix gnome-disk-utility-nautilus upgrade path diff --git a/sources b/sources index 355bdbb..aa6610a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d902c78f5f8a245dc97029d53fa12a4 gnome-disk-utility-2.91.6.tar.bz2 +b711e76e023537944a7a4efcb24e9826 gnome-disk-utility-2.91.7.tar.bz2 From c47bea1fdf0cfcf1aeb066872f99e8547f4910ca Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 4 Apr 2011 13:22:06 -0400 Subject: [PATCH 4/4] 3.0.0 --- .gitignore | 1 + gnome-disk-utility.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b128724..61797a5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ gnome-disk-utility-2.30.1.tar.bz2 /gnome-disk-utility-2.32.1.tar.bz2 /gnome-disk-utility-2.91.6.tar.bz2 /gnome-disk-utility-2.91.7.tar.bz2 +/gnome-disk-utility-3.0.0.tar.bz2 diff --git a/gnome-disk-utility.spec b/gnome-disk-utility.spec index 78b3278..1c40298 100644 --- a/gnome-disk-utility.spec +++ b/gnome-disk-utility.spec @@ -12,13 +12,12 @@ Summary: Disk management application Name: gnome-disk-utility -Version: 2.91.7 +Version: 3.0.0 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://git.gnome.org/cgit/gnome-disk-utility -Source0: http://download.gnome.org/sources/gnome-disk-utility/2.91/%{name}-%{version}.tar.bz2 -Patch0: gdu-nautilus.patch +Source0: http://download.gnome.org/sources/gnome-disk-utility/3.0/%{name}-%{version}.tar.bz2 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -103,7 +102,6 @@ functionality. %prep %setup -q -%patch0 -p1 -b .nautilus aclocal automake @@ -214,6 +212,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : %{_libdir}/nautilus/extensions-3.0/*.so %changelog +* Mon Apr 4 2011 Matthias Clasen - 3.0.0-1 +- Update to 3.0.0 + * Mon Mar 21 2011 Matthias Clasen - 2.91.7-1 - Update to 2.91.7 diff --git a/sources b/sources index aa6610a..7258ae6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b711e76e023537944a7a4efcb24e9826 gnome-disk-utility-2.91.7.tar.bz2 +567a57df8555f5bbee3b664f40684518 gnome-disk-utility-3.0.0.tar.bz2