[Nautilus-list] Re: Patch : Mandrake customization in Nautilus



Hi Frederic,

Thanks for pointing out this problem.

Another fix is:

1) Make sure you are using ScrollKeeper >= 0.2 which fixed a
bug where if a database did not exist in the specified path it was not
created.

2) Pass scrollkeeper-update the database path so that when users are
trying to build an RPM, a new (test) database is built under the
RPMBUILDROOT.  (patch below)

Note that the reason we build the test database under the build root is
as a sanity check.  If the docs or metadata are broken in some way, the
packager will see the warnings or errors during the RPM build.  Otherwise
problems could slip through and wouldn't be found until install time.  It
also makes it easy to debug any problems by inspecting or using the test
database without modifying the real system database or having root access.

Dan

=====================================================================
--- Makefile.am.orig	Fri Apr 20 15:32:44 2001
+++ Makefile.am	Fri Apr 20 15:33:13 2001
@@ -1,15 +1,16 @@
 omf_dest_dir=$(datadir)/omf/nautilus
+scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
 	-for file in $(srcdir)/*.omf; do 			\
 		$(INSTALL_DATA) $(srcdir)/$$file
$(DESTDIR)$(omf_dest_dir); \
 	done
-	-scrollkeeper-update
+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
 
 uninstall-local:
 	-for file in $(srcdir)/*.omf; do 			\
 		basefile=`basename $$file`; 			\
 		rm -f $(omf_dest_dir)/$$basefile; 		\
         done
-	-scrollkeeper-update
+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
=====================================================================

On 20 Apr 2001, Frederic Crozat wrote:

> Hi,
> 
> here are current modifications we've made to Nautilus in order to get it
> work better 
> with Mandrake 8.0 (which has been released yesterday). They are against
> 1.0.1.1
> and apply also against 1.0.2. Some have already been merged by Nautilus
> hackers, therefore I don't add them in this mail :)
> 
> I think some (or maybe all) could be merged in Nautilus main tree.. :

[SNIP]

> This patch disable scrollkeeper-update call when installing Nautilus,
> since we are generating
> rpms as simple user and scrollkeeper-update try too hard to update its
> database, even if it can't
> write on it :((
> --- nautilus-1.0.1.1/omf-install/Makefile.am.orig	Sat Feb 17 09:39:38
> 2001
> +++ nautilus-1.0.1.1/omf-install/Makefile.am	Mon Apr  9 15:57:24 2001
> @@ -5,7 +5,6 @@
>  	-for file in $(srcdir)/*.omf; do 			\
>  		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
>  	done
> -	-scrollkeeper-update
>  
>  uninstall-local:
>  	-for file in $(srcdir)/*.omf; do 			\
> 
> 
> That's all for now..









[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]