SPECS: gnome-vfs2.spec - merged from DEVEL
aflinta
aflinta at pld-linux.org
Tue Sep 6 14:32:24 CEST 2005
Author: aflinta Date: Tue Sep 6 12:32:24 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SPECS:
gnome-vfs2.spec (1.159 -> 1.160)
---- Diffs:
================================================================
Index: SPECS/gnome-vfs2.spec
diff -u SPECS/gnome-vfs2.spec:1.159 SPECS/gnome-vfs2.spec:1.160
--- SPECS/gnome-vfs2.spec:1.159 Sun Sep 4 16:35:15 2005
+++ SPECS/gnome-vfs2.spec Tue Sep 6 14:32:19 2005
@@ -1,29 +1,24 @@
# $Revision$, $Date$
-#
-# Conditional build:
-%bcond_without hal # don't use hal
-#
Summary: GNOME2 - virtual file system
Summary(pl): GNOME2 - wirtualny system plików
Name: gnome-vfs2
-Version: 2.10.1
-Release: 7
+Version: 2.12.0
+Release: 1
License: LGPL v2+
Group: Applications
-Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.10/gnome-vfs-%{version}.tar.bz2
-# Source0-md5: 88b520e5de748a310a2aef62fc095c8b
+Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-vfs/2.12/gnome-vfs-%{version}.tar.bz2
+# Source0-md5: 3323e7472a736716150337d2fc564a43
Source1: %{name}-defaults.list
-Patch0: %{name}-defaults-path.patch
-Patch1: %{name}-no_g_mime.patch
-Patch2: %{name}-hal.patch
+Patch0: %{name}-no_g_mime.patch
+Patch1: %{name}-fstab_edit_crash.patch
+Patch2: %{name}-disable_cdda.patch
URL: http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.10.0
-BuildRequires: ORBit2-devel >= 1:2.12.1
+BuildRequires: GConf2-devel >= 2.12.0
+BuildRequires: ORBit2-devel >= 1:2.12.3
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bzip2-devel
-BuildRequires: cdparanoia-III-devel
-%{?with_hal:BuildRequires: dbus-glib-devel >= 0.33}
+BuildRequires: dbus-glib-devel >= 0.34
BuildRequires: docbook-dtd412-xml >= 1.0-10
BuildRequires: fam-devel
BuildRequires: flex
@@ -31,16 +26,16 @@
BuildRequires: glib2-devel >= 1:2.6.2
BuildRequires: gnome-common >= 2.8.0
BuildRequires: gnome-doc-tools
-BuildRequires: gtk+2-devel >= 2:2.6.2
-BuildRequires: gtk-doc >= 1.1
-%{?with_hal:BuildRequires: hal-devel >= 0.5.2}
+BuildRequires: gtk+2-devel >= 2:2.6.3
+BuildRequires: gtk-doc >= 1.4
+BuildRequires: hal-devel >= 0.5.4
BuildRequires: heimdal-devel >= 0.7
BuildRequires: howl-devel >= 0.9.10
BuildRequires: intltool >= 0.30
-BuildRequires: libbonobo-devel >= 2.8.1
+BuildRequires: libbonobo-devel >= 2.10.1
BuildRequires: libsmbclient-devel >= 3.0
BuildRequires: libtool >= 2:1.5.14
-BuildRequires: libxml2-devel >= 2.6.0
+BuildRequires: libxml2-devel >= 2.6.21
BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: perl-base
BuildRequires: pkgconfig
@@ -50,9 +45,9 @@
BuildRequires: zlib-devel
Requires(post): /sbin/ldconfig
Requires(post,preun): GConf2
-%{?with_hal:Requires: hal-libs >= 0.5.2}
+Requires: hal-libs >= 0.5.4
Requires: howl-libs >= 0.9.10
-Requires: libbonobo >= 2.8.1
+Requires: libbonobo >= 2.10.1
Requires: shared-mime-info >= 0.15
Obsoletes: gnome-vfs-extras
Obsoletes: gnome-vfs2-vfolder-menu
@@ -71,10 +66,10 @@
Summary(pl): gnome-vfs2 - pliki nagłówkowe
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: GConf2-devel >= 2.10.0
+Requires: GConf2-devel >= 2.12.0
Requires: gtk-doc-common
Requires: howl-devel >= 0.9.10
-Requires: libbonobo-devel >= 2.8.1
+Requires: libbonobo-devel >= 2.10.1
Requires: openssl-devel >= 0.9.7d
%description devel
@@ -99,9 +94,11 @@
%setup -q -n gnome-vfs-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p0
+%patch2 -p1
%build
+# force rebuild
+touch libgnomevfs/GNOME_VFS_Daemon.idl
%{__libtoolize}
%{__aclocal}
%{__autoconf}
@@ -110,13 +107,8 @@
--enable-gtk-doc \
--with-html-dir=%{_gtkdocdir} \
--disable-schemas-install \
- --enable-ipv6 \
-%if %{with hal}
- --enable-hal
-%else
- --disable-hal
-%endif
-%{__make} CFLAGS="%{rpmcflags} -DMOUNT_ARGUMENT=\\\"-s\\\""
+ --enable-ipv6
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
@@ -147,6 +139,7 @@
%gconf_schema_install system_dns_sd.schemas
%gconf_schema_install system_http_proxy.schemas
%gconf_schema_install system_smb.schemas
+%gconf_schema_install system_storage.schemas
%preun
%gconf_schema_uninstall desktop_default_applications.schemas
@@ -154,6 +147,7 @@
%gconf_schema_uninstall system_dns_sd.schemas
%gconf_schema_uninstall system_http_proxy.schemas
%gconf_schema_uninstall system_smb.schemas
+%gconf_schema_uninstall system_storage.schemas
%postun -p /sbin/ldconfig
@@ -161,7 +155,12 @@
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
%{_sysconfdir}/gnome-vfs-2.0
-%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/gconf/schemas/desktop_default_applications.schemas
+%{_sysconfdir}/gconf/schemas/desktop_gnome_url_handlers.schemas
+%{_sysconfdir}/gconf/schemas/system_dns_sd.schemas
+%{_sysconfdir}/gconf/schemas/system_http_proxy.schemas
+%{_sysconfdir}/gconf/schemas/system_smb.schemas
+%{_sysconfdir}/gconf/schemas/system_storage.schemas
%attr(755,root,root) %{_bindir}/gnomevfs-*
%attr(755,root,root) %{_libdir}/gnome-vfs-daemon
%attr(755,root,root) %{_libdir}/*.so.*.*
@@ -192,11 +191,55 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.159 2005/09/04 14:35:15 arekm
-- rel 7 for AC; new dbus
+Revision 1.160 2005/09/06 12:32:19 aflinta
+- merged from DEVEL
+
+Revision 1.157.2.15 2005/09/05 13:08:30 freetz
+- 2.12.0, defaults-path patch obsoleted
+
+Revision 1.157.2.14 2005/08/24 15:00:54 paladine
+- removed handle-drives-without-media-detection
+
+Revision 1.157.2.13 2005/08/24 12:56:00 aflinta
+- 2.11.92
+
+Revision 1.157.2.12 2005/08/23 14:51:55 paladine
+- added missing commit log
+
+Revision 1.157.2.11 2005/08/23 14:35:15 paladine
+- itemize schemas
+
+Revision 1.157.2.10 2005/08/14 09:28:25 freetz
+- dropped patches: resolve_fstab_symlinks, user_visible_drives, get_volume_
+ for_path, added: handle-drives-without-media-detection, rel.4
+
+Revision 1.157.2.9 2005/08/07 21:18:48 freetz
+- really cleaned up
+
+Revision 1.157.2.8 2005/08/07 21:03:34 freetz
+- post-experiment cleanup
+
+Revision 1.157.2.7 2005/08/07 20:31:13 freetz
+- cdda method disabled by default (BR: cdparanoia remoed), added bunch of
+ ubuntu/debian patches (small fixes / hal related fixes), cleanup, rel.3
+
+Revision 1.157.2.6 2005/08/07 18:46:17 freetz
+- yes, it works now, rel.2
+
+Revision 1.157.2.5 2005/07/25 22:15:27 freetz
+- 2.11.90
+
+Revision 1.157.2.4 2005/07/13 10:17:05 wiget
+- rebuild GNOME_VFS_Daemon*.[ch]
-Revision 1.158 2005/07/06 19:39:39 arekm
-- br heimdal >= 0.7
+Revision 1.157.2.3 2005/07/13 09:12:50 wiget
+- BR heimdail-devel >= 0.7
+
+Revision 1.157.2.2 2005/07/11 13:45:35 freetz
+- 2.11.4
+
+Revision 1.157.2.1 2005/07/03 15:15:25 freetz
+- 2.11.3, dropped hal bcond (mandatory), dropped obsoleted hal patch
Revision 1.157 2005/05/19 19:34:59 wrobell
- support for hal 0.5.2 added
@@ -272,637 +315,3 @@
Revision 1.137.2.6 2005/03/07 17:48:00 wiget
- updated to 2.10.0
-
-Revision 1.137.2.5 2005/03/03 09:15:28 paladine
-- updated to 2.9.93
-
-Revision 1.137.2.4 2005/03/01 11:50:56 paladine
-- updated to 2.9.92
-- proper license
-
-Revision 1.137.2.3 2005/02/13 18:51:33 grzegol
-- R: gnome-vfs-menu-module isn't needed
-- rel. 1
-
-Revision 1.137.2.2 2005/02/10 18:36:05 grzegol
-- updated to 2.9.91
-
-Revision 1.137.2.1 2005/02/06 22:16:35 grzegol
-- updated to 2.9.90
-- removed outdated applnk, application, onlyshowin, capplets-dir, gnome2-dir,
- categories and hal patches
-- removed vfolder menu subpackage (from now separate package gnome-menus is
- responsible for menus)
-- rel. 0.1
-
-Revision 1.137 2004/12/10 16:25:41 krzak
-- rel 3
-- -DMOUNT_ARGUMENT=\\\"-s\\\""
-
-Revision 1.136 2004/12/08 14:44:44 krzak
-- rel. 2
-- Source: defaults.list
-- Patch: defaults-path.patch
-- %dir %{_datadir}/gnome/applications
-- now GNOME apps look into defaults.list file located in
- %{_datadir}/gnome/applications to get default GNOME applications
- for mime types
-
-Revision 1.135 2004/11/18 20:04:16 havner
-- rel 1
-
-Revision 1.134 2004/11/03 18:53:27 aflinta
-- removed nonexisten patches, well, finally it seems to be working great with my USB pen drive
-
-Revision 1.133 2004/11/03 18:18:54 freetz
-- rock'n'roll - uncommented hal patch, PLD GNOME squad is about to test it!
- (if you own pendrive or external storage gadgets feel free to test it)
-
-Revision 1.132 2004/10/28 17:21:25 freetz
-- 2.8.3, need more testing, feodra patches already included, rel. 0.1, NFY
-
-Revision 1.131 2004/10/18 18:49:16 freetz
-- updated incidentally omitted commitlog entry (sorry about that)
-
-Revision 1.130 2004/10/18 17:25:18 freetz
-- commented out fedora hal patch - it breaks pendrive support (reported by
- Artur Flinta, thx)
-- added two more fixes from fedora (bufer-fix and mtab-mtime-check)
-
-Revision 1.129 2004/10/17 00:14:42 freetz
-- updated hal BRs/Rs
-
-Revision 1.128 2004/10/17 00:11:31 freetz
-- hal fixes from fedora (patch) - ejecting is working at least
-- rel.3
-
-Revision 1.127 2004/10/14 08:41:42 aflinta
-- added categories patch, release 2
-
-Revision 1.126 2004/10/11 15:37:46 freetz
-- 2.8.2
-
-Revision 1.125 2004/09/28 11:18:10 grzegol
-- dbus-glib-devel should be BRed only if built with hal support (fixes
- http://bugs.pld-linux.org/?bug=957)
-
-Revision 1.124 2004/09/27 21:06:57 aflinta
-- force latest hal, release 4
-
-Revision 1.123 2004/09/27 19:53:41 aflinta
-- R: hal-libs instead of hal, release 3
-
-Revision 1.122 2004/09/22 20:32:17 aflinta
-- use hal by default, release 2
-
-Revision 1.121 2004/09/21 17:49:31 freetz
-- 2.8.1, STBR
-
-Revision 1.120 2004/09/17 05:19:33 ankry
-- added conflicts, rel. 5
-
-Revision 1.119 2004/09/16 18:47:50 qboosh
-- release 4
-
-Revision 1.118 2004/09/16 17:26:21 grzegol
-- s/howl-libs-devel/howl-devel/
-
-Revision 1.117 2004/09/16 12:01:11 qboosh
-- libgnomevfs-2 links with libhowl, so -devel R: howl-devel
-
-Revision 1.116 2004/09/16 11:48:13 aflinta
-- howl i back on alpha, thx qboosh :), release 3
-
-Revision 1.115 2004/09/16 10:29:05 aflinta
-- release 2
-
-Revision 1.114 2004/09/16 09:55:26 aflinta
-- release 1.1 for testing
-
-Revision 1.113 2004/09/16 09:41:39 aflinta
-- Can we piss off howl on alpha?
-
-Revision 1.112 2004/09/15 18:24:37 grzegol
-- in gnome-common-2.8.0 all macros are in %%{_aclocaldir}, not in
- %%{_aclocaldir}/gnome2-macros, so remove -I %%{_aclocal}/gnome2-macros from
- %%{__aclocal} args and BR: gnome-common >= 2.8.0
-
-Revision 1.111 2004/09/13 13:23:21 grzegol
-- merged from DEVEL and updated to 2.8.0
-- removed locale-names patch
-- remove no locale in %%install
-
-Revision 1.110 2004/09/07 20:30:27 wiget
-- %%files fixed
-
-Revision 1.109 2004/09/07 19:25:41 wiget
-- split default-modules.conf (menu releated entries moved to menu.conf)
-- vfolder-menu package P: gnome-vfs-menu-module = 1.0-1
-- release 2
-
-Revision 1.108 2004/08/13 06:48:33 aflinta
-- up to version 2.6.2
-
-Revision 1.107 2004/08/11 21:47:55 qboosh
-- cosmetics
-
-Revision 1.106 2004/08/09 18:10:57 krzak
-- package vfolder-menu (Provides: gnome-vfs-menu-module)
-- source1 with modules configuration file
-- rel 5
-
-Revision 1.105 2004/07/26 16:14:00 havner
-- rel 4
-
-Revision 1.104 2004/07/21 18:41:58 grzegol
-- added modules_conf patch (connect applications: URI to libmenu.so)
-- rel. 3.1
-
-Revision 1.103 2004/06/12 20:19:23 aflinta
-- require fixed shared-mime-info, release 3
-
-Revision 1.102.2.19 2004/09/07 20:24:31 grzegol
-- fixed %%files:
- * don't include menu.conf in main package
- * removed duplicated entry for default-modules.conf
-
-Revision 1.102.2.18 2004/09/07 19:11:47 wiget
-- split default-modules.conf (menu releated entries moved to menu.conf)
-- vfolder-menu package P: gnome-vfs-menu-module = 1.0-1
-- release 2
-
-Revision 1.102.2.17 2004/08/30 14:28:59 grzegol
-- updated to 2.7.92
-
-Revision 1.102.2.16 2004/08/22 11:57:12 grzegol
-- BR: howl-devel >= 0.9.6
-- removed outdated enum patch
-
-Revision 1.102.2.15 2004/08/16 20:51:42 aflinta
-- up to version 2.7.91
-
-Revision 1.102.2.14 2004/08/11 23:15:41 grzegol
-- merged cosmetics from HEAD
-
-Revision 1.102.2.13 2004/08/10 22:31:14 grzegol
-- added R: desktop-file-utils >= 0.7 (for update-desktop-database)
-
-Revision 1.102.2.12 2004/08/09 22:41:19 grzegol
-- merged from HEAD:
- * removed modules_conf patch
- * added R: gnome-vfs-menu-module
- * added vfolder-menu subpackage
-- rel. 3
-
-Revision 1.102.2.11 2004/08/08 20:02:48 grzegol
-- added enum patch (remove a trailing comma from enum)
-- rel. 2
-
-Revision 1.102.2.10 2004/07/31 22:17:13 grzegol
-- updated to 2.7.90
-- set _with_hal bcond default to off as it's in configure
-
-Revision 1.102.2.9 2004/07/27 18:09:29 grzegol
-- updated to 2.7.5
-- removed outdated hal patch
-
-Revision 1.102.2.8 2004/07/27 12:49:30 grzegol
-- added without_hal bcond
-
-Revision 1.102.2.7 2004/07/22 19:42:58 grzegol
-- R: hal
-
-Revision 1.102.2.6 2004/07/22 19:35:02 grzegol
-- updated to 2.7.4
-- removed mime patch (mime subsystem in gnome-vfs has been rewrited)
-- added hal support and hal patch which fixes compilation
-- added BR: heimdal-devel
-
-Revision 1.102.2.5 2004/07/21 18:38:37 grzegol
-- added modules_conf (connect applications: URI to libmenu.so)
-- rel. 1.1
-
-Revision 1.102.2.4 2004/07/05 10:49:32 grzegol
-- updated to 2.7.3
-
-Revision 1.102.2.3 2004/07/04 16:05:15 grzegol
-- rel. 2 to rebuild with howl support
-
-Revision 1.102.2.2 2004/06/18 14:51:56 freetz
-- 2.7.2
-
-Revision 1.102.2.1 2004/06/05 14:54:19 freetz
-- 2.7.1 - gnome 2.8 developement series
-
-Revision 1.102 2004/05/07 19:23:21 qboosh
-- Obsoletes: gnome-vfs-extras; release 2
-
-Revision 1.101 2004/04/20 10:20:21 aflinta
-- up to version 2.6.1.1
-
-Revision 1.100 2004/04/19 11:23:52 grzegol
-- updated to 2.6.1
-
-Revision 1.99 2004/04/18 11:26:54 krzak
-- gnome2-dir.patch (fix for ~/.gnome2 dir creation)
-- updated mime.patch
-- rel 5
-
-Revision 1.98 2004/04/17 18:36:42 krzak
-- mime.patch that fix mime data reading
-- rel 4
-
-Revision 1.97 2004/04/14 08:55:47 krzak
-- Patch3: onlyshowin.patch (back)
-- Patch4: capplets-dir.patch (back)
-- rel 3
-
-Revision 1.96 2004/03/26 14:21:48 aflinta
-- require latest shared-mime-info - fixes MS Office recognition bug
-
-Revision 1.95 2004/03/22 16:59:19 aflinta
-- merged from DEVEL, up to version 2.6.0
-
-Revision 1.94 2004/03/19 23:46:26 ankry
-- massive change: BR openssl-devel >= 0.9.7d
-
-Revision 1.93 2004/02/25 14:16:43 qboosh
-- -devel R: libbonobo-devel; strict internal deps
-
-Revision 1.92 2004/01/27 10:38:05 freetz
-- 2.4.2 STBR Ac
-
-Revision 1.91 2003/12/27 17:02:22 qboosh
-- removed unused *.la for bonobo and gnome-vfs modules; release 4
-
-Revision 1.90 2003/12/14 20:20:28 krzak
-- onlyshowin.patch OnlyShowIn tag support
-- resticted query for System Tools submenu without KDE useless/duplicated in GNOME tools
-- rel 3
-
-Revision 1.89 2003/11/09 01:51:35 krzak
-- capplets-dir.patch
- set default directory for capplets to {_datadir}/gnome/capplets
-- rel 2
-
-Revision 1.88.2.18 2004/03/15 17:26:00 grzegol
-- updated to 2.5.91
-
-Revision 1.88.2.17 2004/03/08 13:03:44 grzegol
-- updated to 2.5.90
-- removed outdated inc_fixes and gtk patches
-- removed gtk bcond (gtk module is now in libgnomeui)
-
-Revision 1.88.2.16 2004/03/06 15:22:34 grzegol
-- added inc_fixes patch (fixes some bugs in header files)
-- added gtk patch (update to the new gtk API)
-- rel. 3
-
-Revision 1.88.2.15 2004/02/24 13:42:08 grzegol
-- added %%bcond_without gtk (it might be usefull to build GNOME from scratch
- ade it kills build dependency loop)
-
-Revision 1.88.2.14 2004/02/23 20:29:48 grzegol
-- added locale-names patch (changes locale no -> nb)
-- added BRs: libgnomeui-devel, libsmbclient-devel, perl-base
-- strict internal Requires
-- added --enable-ipv6 to configure
-- disabled schemas instalation during build
-- removed %%{_libdir}/gtk-2.0/*/filesystems/*.{la,a}
-- added %%{_libdir}/gtk-2.0/2.2.0/filesystems dir
-- rel. 2
-
-Revision 1.88.2.13 2004/02/23 14:34:52 aflinta
-- up to version 2.5.8
-
-Revision 1.88.2.12 2004/02/11 16:05:55 grzegol
-- updated to 2.5.7
-- removed outdated DESTDIR patch
-
-Revision 1.88.2.11 2004/01/31 01:32:05 grzegol
-- added R: shared-mime-info >= 0.13
-
-Revision 1.88.2.10 2004/01/30 22:46:32 grzegol
-- updated to 2.5.6
-- added DESTDIR patch
-
-Revision 1.88.2.9 2004/01/12 17:23:39 grzegol
-- updated to 2.5.5
-
-Revision 1.88.2.8 2003/12/28 14:45:51 grzegol
-- updated to 2.5.4.1
-- regenerate gtkdoc
-
-Revision 1.88.2.7 2003/12/09 12:47:26 wiget
-- file conflict with old libgnome
-
-Revision 1.88.2.6 2003/12/09 12:43:48 wiget
-- 2.5.3
-
-Revision 1.88.2.5 2003/11/25 13:10:12 wiget
-- 2.5.2
-
-Revision 1.88.2.4 2003/11/14 15:30:58 wiget
-- added epoch to ORBit req
-
-Revision 1.88.2.3 2003/11/14 15:12:47 wiget
-- release 1
-
-Revision 1.88.2.2 2003/11/13 00:45:02 wiget
-- 2.5.1
-
-Revision 1.88.2.1 2003/10/28 13:10:32 wiget
-- 2.5.0.1
-
-Revision 1.88 2003/10/13 14:38:12 freetz
-- up to 2.4.1
-
-Revision 1.87 2003/09/30 20:18:23 eothane
-- ahh, what the hell: openssl 0.9.7c
-
-Revision 1.86 2003/09/22 18:36:21 havner
-- more BR
-
-Revision 1.85 2003/09/19 23:10:31 krzak
-- rel. 3
-- application.patch : according to Desktop Menu Specification
- from http://freedesktop.org, there is no such category like "Application"
- for *.desktop files.
-
-Revision 1.84 2003/09/19 06:52:13 qrczak
-- Revert last change, gnome-common was required.
-
-Revision 1.83 2003/09/18 17:49:26 qrczak
-- There is no gnome-common in gnome-2.4.
-- Release 2.
-
-Revision 1.82 2003/09/08 19:10:07 grzegol
-- updated to 2.4.0
-
-Revision 1.81 2003/09/02 13:54:25 grzegol
-- updated to 2.3.90
-
-Revision 1.80 2003/08/25 23:10:25 grzegol
-- updated to 2.3.8
-
-Revision 1.79 2003/08/18 08:08:09 gotar
-- mass commit: cosmetics (removed trailing white spaces)
-
-Revision 1.78 2003/08/11 22:46:30 ankry
-- cosmetics
-
-Revision 1.77 2003/08/11 15:52:45 aflinta
-- version 2.3.7
-
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gnome-vfs2.spec?r1=1.159&r2=1.160&f=u
More information about the pld-cvs-commit
mailing list