packages: gnome-disk-utility/gnome-disk-utility.spec - updated to 3.0.0; me...

megabajt megabajt at pld-linux.org
Tue Apr 5 20:56:26 CEST 2011 

Author: megabajt                     Date: Tue Apr  5 18:56:26 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.0.0; merged from DEVEL

---- Files affected:
packages/gnome-disk-utility:
   gnome-disk-utility.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/gnome-disk-utility/gnome-disk-utility.spec
diff -u packages/gnome-disk-utility/gnome-disk-utility.spec:1.14 packages/gnome-disk-utility/gnome-disk-utility.spec:1.15
--- packages/gnome-disk-utility/gnome-disk-utility.spec:1.14	Sun Mar 27 14:59:56 2011
+++ packages/gnome-disk-utility/gnome-disk-utility.spec	Tue Apr  5 20:56:21 2011
@@ -6,47 +6,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,
@@ -73,8 +70,8 @@
 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.
@@ -108,6 +105,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__gtkdocize}
@@ -119,7 +117,7 @@
 %{__automake}
 %configure \
 	--disable-silent-rules \
-	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
+	%{__enable_disable apidocs gtk-doc} \
 	--with-html-dir=%{_gtkdocdir}
 
 %{__make}
@@ -130,7 +128,8 @@
 %{__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
@@ -153,7 +152,7 @@
 %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
@@ -170,8 +169,6 @@
 %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
@@ -193,9 +190,33 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2011/04/05 18:56:21  megabajt
+- updated to 3.0.0; merged from DEVEL
+
 Revision 1.14  2011/03/27 12:59:56  qboosh
 - en at shaw locale is now supported (via LANGUAGE)
 - pl for base
+
+Revision 1.12.2.6  2011/03/24 10:06:14  wiget
+- BR: libunique3-devel
+
+Revision 1.12.2.5  2011/03/23 10:04:04  wiget
+- up to 2.91.7
+
+Revision 1.12.2.4  2011/02/27 12:04:50  megabajt
+- added nautilus-extension-dir.patch
+
+Revision 1.12.2.3  2011/02/12 22:32:08  wiget
+- BR stable gtk+
+- use %{__enable_disable} macro
+- kill libtool files
+
+Revision 1.12.2.2  2011/02/05 18:14:34  wiget
+- fix avahi BR
+
+Revision 1.12.2.1  2011/02/04 20:03:36  megabajt
+- updated to 2.91.6
+- added -link.patch
 
 Revision 1.13  2011/02/04 18:23:48  wiget
 - Requires(post,postun): gtk-update-icon-cache
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-disk-utility/gnome-disk-utility.spec?r1=1.14&r2=1.15&f=u

More information about the pld-cvs-commit mailing list