SPECS (AC-branch): gnome-volume-manager.spec - merged from HEAD

[baggins]

Author: baggins                      Date: Mon May 15 17:08:02 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   gnome-volume-manager.spec (1.37 -> 1.37.2.1) 

---- Diffs:

================================================================
Index: SPECS/gnome-volume-manager.spec
diff -u SPECS/gnome-volume-manager.spec:1.37 SPECS/gnome-volume-manager.spec:1.37.2.1
--- SPECS/gnome-volume-manager.spec:1.37	Thu Oct 27 22:20:14 2005
+++ SPECS/gnome-volume-manager.spec	Mon May 15 19:07:57 2006
@@ -2,16 +2,13 @@
 Summary:	The GNOME Volume Manager
 Summary(pl):	Zarządca woluminów dla GNOME
 Name:		gnome-volume-manager
-Version:	1.5.4
+Version:	1.5.15
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-volume-manager/1.5/%{name}-%{version}.tar.gz
-# Source0-md5:	43897852ab33e48a3ac1a8d36a0435f1
+# Source0-md5:	dd17711c55ec63af04cfe306926cfcd5
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-less_verbose.patch
-Patch2:		%{name}-reconnect_on_dbus_exit.patch
-Patch3:		%{name}-eject_path.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel
 BuildRequires:	autoconf >= 2.52
@@ -20,14 +17,15 @@
 BuildRequires:	hal-devel >= 0.5.0
 BuildRequires:	intltool >= 0.33
 BuildRequires:	libglade2-devel >= 1:2.5.1
-BuildRequires:	libgnomeui-devel >= 2.12.0
+BuildRequires:	libgnomeui-devel >= 2.14.0
+BuildRequires:	libnotify-devel >= 0.3.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
 Requires(post,preun):	GConf2
 Requires:	dbus >= 0.36
-Requires:	eject
 Requires:	hal >= 0.5.4
+Requires:	notification-daemon >= 0.3.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,9 +47,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__glib_gettextize}
@@ -62,7 +57,8 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--disable-schemas-install
+	--disable-schemas-install \
+	--with-console-auth-dir=%{_localstatedir}/lock/console/
 %{__make}
 
 %install
@@ -70,7 +66,8 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
+	autostartdir=%{_datadir}/gnome/autostart
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
@@ -89,6 +86,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/*
+%{_datadir}/gnome/autostart/*.desktop
 %{_datadir}/%{name}
 %{_desktopdir}/*.desktop
 %{_sysconfdir}/gconf/schemas/gnome-volume-manager.schemas
@@ -99,6 +97,46 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37.2.1  2006/05/15 17:07:57  baggins
+- merged from HEAD
+
+Revision 1.49  2006/03/10 19:28:33  freetz
+- 1.5.15, bug332762.patch already in sources
+
+Revision 1.48  2006/03/01 21:54:45  freetz
+- fixed http://bugzilla.gnome.org/show_bug.cgi?id=332762, rel.3
+
+Revision 1.47  2006/02/28 15:44:28  freetz
+- fixed one more time autostart dir location, rel.2
+
+Revision 1.46  2006/02/27 17:45:06  freetz
+- 1.5.14, dropped user_at_console patch
+
+Revision 1.45  2006/02/19 18:21:20  freetz
+- disable user_at_console for now (it's enabled in dbus now)
+
+Revision 1.44  2006/02/16 08:29:15  freetz
+- fix autostart dir, rel.3
+
+Revision 1.43  2006/02/11 11:00:17  freetz
+- say no to pam_console checks (patch added), enabled eye candy, rel.2
+
+Revision 1.42  2006/02/10 22:39:59  freetz
+- 1.5.13
+
+Revision 1.41  2006/02/02 17:05:00  freetz
+- 1.5.12
+
+Revision 1.40  2006/01/31 18:22:52  patrys
+- up to 1.5.11
+
+Revision 1.39  2006/01/22 19:16:43  dzeus
+- up to 1.5.10, removed less_verbose.patch (obsolete)
+
+Revision 1.38  2005/12/19 22:45:11  freetz
+- 1.5.7, removed obsolete eject_path patch, dropped reconnect_on_dbus_exit
+  patch (hal must be reworked first to make any use of this feature)
+
 Revision 1.37  2005/10/27 20:20:14  freetz
 - 1.5.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-volume-manager.spec?r1=1.37&r2=1.37.2.1&f=u