From 4e60bb39a99453ec82179a49c7e11ebeb3097a8d Mon Sep 17 00:00:00 2001 From: Marcin Banasiak Date: Tue, 5 Apr 2011 18:56:21 +0000 Subject: [PATCH] - updated to 3.0.0; merged from DEVEL Changed files: gnome-disk-utility.spec -> 1.15 --- gnome-disk-utility.spec | 45 +++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/gnome-disk-utility.spec b/gnome-disk-utility.spec index ac0aec9..48388f7 100644 --- a/gnome-disk-utility.spec +++ b/gnome-disk-utility.spec @@ -5,47 +5,44 @@ Summary: Disk management application Summary(pl.UTF-8): Aplikacja do zarządzania dyskami Name: gnome-disk-utility -Version: 2.32.0 -Release: 2 +Version: 3.0.0 +Release: 1 License: LGPL v2+ Group: X11/Applications -#Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-disk-utility/2.30/%{name}-%{version}.tar.bz2 -Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2 -# Source0-md5: f0366c8baebca0404d190b2d78f3582d +Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-disk-utility/3.0/%{name}-%{version}.tar.bz2 +# Source0-md5: 567a57df8555f5bbee3b664f40684518 +Patch0: %{name}-link.patch BuildRequires: autoconf BuildRequires: automake >= 1:1.9 -BuildRequires: avahi-ui-devel >= 0.6.25 +BuildRequires: avahi-ui-gtk3-devel >= 0.6.25 BuildRequires: dbus-glib-devel >= 0.74 BuildRequires: docbook-dtd412-xml BuildRequires: gettext-devel -BuildRequires: glib2-devel >= 1:2.22.0 +BuildRequires: glib2-devel >= 1:2.28.0 BuildRequires: gnome-common BuildRequires: gnome-doc-utils -BuildRequires: gtk+2-devel >= 2:2.20.0 +BuildRequires: gtk+3-devel >= 3.0.0 %{?with_apidocs:BuildRequires: gtk-doc >= 1.3} BuildRequires: intltool >= 0.35.0 BuildRequires: libatasmart-devel >= 0.14 BuildRequires: libgnome-keyring-devel >= 2.22.0 -BuildRequires: libnotify-devel >= 0.3.0 +BuildRequires: libnotify-devel >= 0.6.1 BuildRequires: libtool -BuildRequires: libunique-devel >= 1.0.0 -BuildRequires: nautilus-devel >= 2.24.0 +BuildRequires: libunique3-devel >= 3.0.0 +BuildRequires: nautilus-devel >= 3.0.0 BuildRequires: pkgconfig BuildRequires: rpmbuild(find_lang) >= 1.23 -BuildRequires: rpmbuild(macros) >= 1.311 +BuildRequires: rpmbuild(macros) >= 1.601 BuildRequires: scrollkeeper -BuildRequires: udev-devel BuildRequires: udisks-devel >= 1.0.0 Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): hicolor-icon-theme Requires: %{name}-libs = %{version}-%{release} -Requires: nautilus >= 2.24.0 +Requires: hicolor-icon-theme +Requires: nautilus >= 3.0.0 Requires: udisks >= 1.0.0 Suggests: openssh-gnome-askpass BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define skip_post_check_so libgdu-gtk.so.0.0.0 - %description This package contains the Palimpsest disk management application. Palimpsest supports partitioning, file system creation, encryption, @@ -72,8 +69,8 @@ Summary: Header files for gnome-disk-utility libraries Summary(pl.UTF-8): Pliki nagłówkowe bibliotek gnome-disk-utility Group: X11/Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: glib2-devel >= 1:2.22.0 -Requires: gtk+2-devel >= 2:2.20.0 +Requires: glib2-devel >= 1:2.28.0 +Requires: gtk+3-devel >= 3.0.0 %description devel Header files for gnome-disk-utility libraries. @@ -107,6 +104,7 @@ Dokumentacja API bibliotek gnome-disk-utility. %prep %setup -q +%patch0 -p1 %build %{__gtkdocize} @@ -118,7 +116,7 @@ Dokumentacja API bibliotek gnome-disk-utility. %{__automake} %configure \ --disable-silent-rules \ - --%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \ + %{__enable_disable apidocs gtk-doc} \ --with-html-dir=%{_gtkdocdir} %{__make} @@ -129,7 +127,8 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/libnautilus-gdu.{a,la} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/libnautilus-gdu.{a,la} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la %find_lang gnome-disk-utility %find_lang palimpsest --with-gnome --with-omf @@ -152,7 +151,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/palimpsest %attr(755,root,root) %{_libdir}/gdu-format-tool %attr(755,root,root) %{_libdir}/gdu-notification-daemon -%attr(755,root,root) %{_libdir}/nautilus/extensions-2.0/libnautilus-gdu.so +%attr(755,root,root) %{_libdir}/nautilus/extensions-3.0/libnautilus-gdu.so %{_sysconfdir}/xdg/autostart/gdu-notification-daemon.desktop %{_desktopdir}/palimpsest.desktop %{_iconsdir}/hicolor/*/*/*.png @@ -169,8 +168,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libgdu-gtk.so %attr(755,root,root) %{_libdir}/libgdu.so -%{_libdir}/libgdu-gtk.la -%{_libdir}/libgdu.la %{_includedir}/gnome-disk-utility %{_pkgconfigdir}/gdu-gtk.pc %{_pkgconfigdir}/gdu.pc -- 2.44.0