From 0c5663a1e79688f8cd674b863c4e855fca6e4d0e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Feb 2011 17:47:51 -0500 Subject: [PATCH] Fix build --- .gitignore | 1 + gdu-nautilus.patch | 12 +++++++++++ gnome-disk-utility.spec | 47 +++++++++++++++++++++++------------------ sources | 2 +- 4 files changed, 40 insertions(+), 22 deletions(-) create mode 100644 gdu-nautilus.patch diff --git a/.gitignore b/.gitignore index cbb85cf..5f3e839 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,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 diff --git a/gdu-nautilus.patch b/gdu-nautilus.patch new file mode 100644 index 0000000..fe0e33e --- /dev/null +++ b/gdu-nautilus.patch @@ -0,0 +1,12 @@ +diff -up gnome-disk-utility-2.91.6/src/nautilus-extension/Makefile.am.nautilus gnome-disk-utility-2.91.6/src/nautilus-extension/Makefile.am +--- gnome-disk-utility-2.91.6/src/nautilus-extension/Makefile.am.nautilus 2011-02-02 17:43:10.408424958 -0500 ++++ gnome-disk-utility-2.91.6/src/nautilus-extension/Makefile.am 2011-02-02 17:43:22.123278502 -0500 +@@ -34,7 +34,7 @@ CORE_LIBADD = \ + $(NULL) + + +-nautilus_extensiondir = $(libdir)/nautilus/extensions-2.0 ++nautilus_extensiondir = $(libdir)/nautilus/extensions-3.0 + nautilus_extension_LTLIBRARIES = libnautilus-gdu.la + + libnautilus_gdu_la_SOURCES = \ diff --git a/gnome-disk-utility.spec b/gnome-disk-utility.spec index 99b9cab..d73452c 100644 --- a/gnome-disk-utility.spec +++ b/gnome-disk-utility.spec @@ -1,7 +1,7 @@ %define dbus_version 1.2 %define dbus_glib_version 0.76 %define glib2_version 2.16 -%define gtk2_version 2.17.2 +%define gtk3_version 2.99 %define gnome_doc_utils_version 0.3.2 %define gnome_keyring_version 2.22 %define udisks_version 1.0.0-0.git20100215 @@ -12,29 +12,33 @@ Summary: Disk management application Name: gnome-disk-utility -Version: 2.32.1 -Release: 4%{?dist} +Version: 2.91.6 +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.32/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/gnome-disk-utility/2.91/%{name}-%{version}.tar.bz2 +Patch0: gdu-nautilus.patch + BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: dbus-glib >= %{dbus_glib_version} BuildRequires: glib2-devel >= %{glib2_version} -BuildRequires: gtk2-devel >= %{gtk2_version} +BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: gnome-keyring-devel >= %{gnome_keyring_version} BuildRequires: udisks-devel >= %{udisks_version} -BuildRequires: unique-devel >= %{unique_version} +BuildRequires: unique3-devel >= %{unique_version} BuildRequires: libnotify-devel >= %{libnotify_version} BuildRequires: nautilus-devel >= %{nautilus_version} BuildRequires: libatasmart-devel >= %{libatasmart_version} BuildRequires: avahi-ui-devel BuildRequires: intltool BuildRequires: rarian-compat +BuildRequires: automake autoconf libtool + Requires: %{name}-libs = %{version}-%{release} Obsoletes: gnome-disk-utility-format Obsoletes: nautilus-gdu @@ -72,8 +76,6 @@ disk-related widgets for use in GTK+ applications. Summary: Development files for gnome-disk-utility-libs Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: glib2-devel >= %{glib2_version} -Requires: pkgconfig %description devel This package contains header files and libraries needed to @@ -84,8 +86,6 @@ Summary: Development files for gnome-disk-utility-ui-libs Group: Development/Libraries Requires: %{name}-ui-libs = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} -Requires: gtk2-devel >= %{gtk2_version} -Requires: pkgconfig %description ui-devel This package contains header files and libraries needed to @@ -93,6 +93,10 @@ develop applications with gnome-disk-utility-ui-libs. %prep %setup -q +%patch0 -p1 -b .nautilus + +aclocal +automake %build %configure @@ -114,8 +118,8 @@ desktop-file-install --delete-original \ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.a %find_lang %{name} @@ -127,19 +131,17 @@ update-desktop-database %{_datadir}/applications &> /dev/null update-desktop-database %{_datadir}/applications &> /dev/null %post libs -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi +touch --no-create %{_datadir}/icons/hicolor || : /sbin/ldconfig %postun libs -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : /sbin/ldconfig +%posttrans libs +gtk-update-icon-cache -q %{_datadir}/icons/hicolor || : + %post ui-libs -p /sbin/ldconfig %postun ui-libs -p /sbin/ldconfig @@ -149,7 +151,7 @@ fi %{_libexecdir}/gdu-notification-daemon %{_sysconfdir}/xdg/autostart/gdu-notification-daemon.desktop -%{_libdir}/nautilus/extensions-2.0/*.so +%{_libdir}/nautilus/extensions-3.0/*.so %{_libexecdir}/gdu-format-tool %{_bindir}/palimpsest @@ -198,6 +200,9 @@ fi %{_includedir}/gnome-disk-utility/gdu-gtk/* %changelog +* Wed Feb 2 2011 Matthias Clasen - 2.91.6-1%{?dist} +- Update to 2.91.6 + * Wed Feb 2 2011 Matthias Clasen - 2.32.1-4%{?dist} - Rebuild against newer gtk diff --git a/sources b/sources index c6c1018..355bdbb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb04b69ded14c1db82133979d8240ea6 gnome-disk-utility-2.32.1.tar.bz2 +8d902c78f5f8a245dc97029d53fa12a4 gnome-disk-utility-2.91.6.tar.bz2