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

rpms/beagle/devel beagle-0.2.7-beagle-index-username.patch, NONE, 1.1 beagle-0.2.7-crawl.patch, NONE, 1.1 beagle-0.2.7-nodebug.patch, NONE, 1.1 beagle-0.2.7-runuser.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 beagle-0.2.1-spew.patch, 1.4, 1.5 beagle.spec, 1.56, 1.57 sources, 1.13, 1.14 beagle-0.2.5-crawl.patch, 1.1, NONE



Author: alexl

Update of /cvs/dist/rpms/beagle/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1569

Modified Files:
	.cvsignore beagle-0.2.1-spew.patch beagle.spec sources 
Added Files:
	beagle-0.2.7-beagle-index-username.patch 
	beagle-0.2.7-crawl.patch beagle-0.2.7-nodebug.patch 
	beagle-0.2.7-runuser.patch 
Removed Files:
	beagle-0.2.5-crawl.patch 
Log Message:
* Wed Jun 21 2006 Alexander Larsson <alexl redhat com> - 0.2.7-1
- update to 0.2.7
- Use runuser, not su in index cronjob (#195809)
- Rename beagleindex to beaglidx (#184157)
- Remove --debug from all wrappers



beagle-0.2.7-beagle-index-username.patch:
 beagle-crawl-system.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE beagle-0.2.7-beagle-index-username.patch ---
--- beagle-0.2.7/tools/beagle-crawl-system.in.beagleindex	2006-06-21 12:56:03.000000000 +0200
+++ beagle-0.2.7/tools/beagle-crawl-system.in	2006-06-21 12:56:19.000000000 +0200
@@ -28,7 +28,7 @@
 
 umask 022
 
-CRAWL_USER=beagleindex
+CRAWL_USER=beaglidx
 
 export TMPDIR=/tmp
 

beagle-0.2.7-crawl.patch:
 Makefile.am                     |    1 -
 Makefile.in                     |    1 -
 crawl-rules/crawl-applications  |    2 +-
 crawl-rules/crawl-documentation |    2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE beagle-0.2.7-crawl.patch ---
--- beagle-0.2.5/tools/crawl-rules/crawl-applications.crawl	2006-03-22 16:09:41.000000000 +0100
+++ beagle-0.2.5/tools/crawl-rules/crawl-applications	2006-04-21 09:23:26.000000000 +0200
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="applications"
 
-CRAWL_PATHS="/usr/share/applications /usr/local/share/applications /opt/gnome/share/applications /opt/kde3/share/applications"
+CRAWL_PATHS="/usr/share/applications /usr/local/share/applications" 
 
 CRAWL_RECURSIVE="yes"
 
--- beagle-0.2.5/tools/crawl-rules/crawl-documentation.crawl	2006-04-12 21:41:03.000000000 +0200
+++ beagle-0.2.5/tools/crawl-rules/crawl-documentation	2006-04-21 09:27:23.000000000 +0200
@@ -2,7 +2,7 @@
 
 CRAWL_INDEX_NAME="documentation"
 
-CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /opt/kde3/share/doc /opt/gnome/share/gnome/help /usr/share/gnome/help /opt/gnome/share/gtk-doc/html /usr/share/gtk-doc/html /usr/share/gnome/html"
+CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /usr/share/gnome/help /usr/share/gtk-doc/html /usr/share/gnome/html"
 
 CRAWL_ALLOW_PATTERNS="*.xml,*.html,*.docbook"
 
--- beagle-0.2.5/tools/Makefile.am.crawl	2006-04-19 02:30:36.000000000 +0200
+++ beagle-0.2.5/tools/Makefile.am	2006-04-21 09:23:26.000000000 +0200
@@ -35,7 +35,6 @@
 	chmod +x $(CRAWL_WRAPPER)
 
 CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-windows		\
 	$(srcdir)/crawl-rules/crawl-applications	\
 	$(srcdir)/crawl-rules/crawl-documentation
 
--- beagle-0.2.5/tools/Makefile.in.crawl	2006-04-20 17:57:24.000000000 +0200
+++ beagle-0.2.5/tools/Makefile.in	2006-04-21 09:23:26.000000000 +0200
@@ -366,7 +366,6 @@
 CRAWL_WRAPPER = beagle-crawl-system
 CRAWL_WRAPPER_IN = $(CRAWL_WRAPPER).in
 CRAWL_RULES = \
-	$(srcdir)/crawl-rules/crawl-windows		\
 	$(srcdir)/crawl-rules/crawl-applications	\
 	$(srcdir)/crawl-rules/crawl-documentation
 

beagle-0.2.7-nodebug.patch:
 ImLogViewer/beagle-imlogviewer.in |    2 +-
 beagled/beagled-index-helper.in   |    2 +-
 beagled/beagled.in                |    2 +-
 beagled/wrapper.in                |    2 +-
 bludgeon/bludgeon.in              |    2 +-
 search/beagle-search.in           |    2 +-
 tools/wrapper.in                  |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE beagle-0.2.7-nodebug.patch ---
--- beagle-0.2.7/beagled/beagled-index-helper.in.debug	2006-06-21 11:27:29.000000000 +0200
+++ beagle-0.2.7/beagled/beagled-index-helper.in	2006-06-21 11:28:00.000000000 +0200
@@ -31,7 +31,7 @@
 export MONO_GAC_PREFIX="@gacprefix ${MONO_GAC_PREFIX+:$MONO_GAC_PREFIX}"
 export MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}"
 
-CMDLINE="mono --debug $MONO_EXTRA_ARGS $THIS_EXE $@"
+CMDLINE="mono $MONO_EXTRA_ARGS $THIS_EXE $@"
 
 PROCESS_NAME="beagled-helper"
 exec -a $PROCESS_NAME $CMDLINE
--- beagle-0.2.7/beagled/beagled.in.debug	2006-06-21 11:28:15.000000000 +0200
+++ beagle-0.2.7/beagled/beagled.in	2006-06-21 11:28:35.000000000 +0200
@@ -99,7 +99,7 @@
     export GC_DONT_GC=1
     CMDLINE="monogrind $TARGET_EXE $MONO_EXTRA_ARGS $BEAGLED_ARGS $FGBG_ARG"
 else
-    CMDLINE="$BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $TARGET_EXE $BEAGLED_ARGS $FGBG_ARG"
+    CMDLINE="$BEAGLE_MONO_RUNTIME $MONO_EXTRA_ARGS $TARGET_EXE $BEAGLED_ARGS $FGBG_ARG"
 fi
 
 PROCESS_NAME="beagled"
--- beagle-0.2.7/beagled/wrapper.in.debug	2006-06-21 11:26:25.000000000 +0200
+++ beagle-0.2.7/beagled/wrapper.in	2006-06-21 11:27:02.000000000 +0200
@@ -19,5 +19,5 @@
     export LD_LIBRARY_PATH="@pkglibdir ${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
 fi
 
-MONO_GAC_PREFIX="@gacprefix ${MONO_GAC_PREFIX+:$MONO_GAC_PREFIX}" MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a @wrapper@ mono --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
+MONO_GAC_PREFIX="@gacprefix ${MONO_GAC_PREFIX+:$MONO_GAC_PREFIX}" MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a @wrapper@ mono $MONO_EXTRA_ARGS $THIS_EXE "$@"
 
--- beagle-0.2.7/ImLogViewer/beagle-imlogviewer.in.debug	2006-06-21 11:28:59.000000000 +0200
+++ beagle-0.2.7/ImLogViewer/beagle-imlogviewer.in	2006-06-21 11:29:15.000000000 +0200
@@ -14,5 +14,5 @@
     export LD_LIBRARY_PATH="@pkglibdir ${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
 fi
 
-MONO_GAC_PREFIX="@gacprefix ${MONO_GAC_PREFIX+:$MONO_GAC_PREFIX}" MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a beagle-imlogviewer mono $MONO_EXTRA_ARGS --debug $THIS_EXE "$@"
+MONO_GAC_PREFIX="@gacprefix ${MONO_GAC_PREFIX+:$MONO_GAC_PREFIX}" MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a beagle-imlogviewer mono $MONO_EXTRA_ARGS $THIS_EXE "$@"
 
--- beagle-0.2.7/tools/wrapper.in.debug	2006-06-21 11:29:30.000000000 +0200
+++ beagle-0.2.7/tools/wrapper.in	2006-06-21 11:29:40.000000000 +0200
@@ -20,5 +20,5 @@
    echo "*** Using mono runtime at $BEAGLE_MONO_RUNTIME ***"
 fi
 
-MONO_GAC_PREFIX="@gacprefix ${MONO_GAC_PREFIX+:$MONO_GAC_PREFIX}" MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" BEAGLE_FILTER_PATH="$BEAGLE_FILTER_PATH${THIS_FILTERS+:$THIS_FILTERS}" BEAGLE_BACKEND_PATH="$BEAGLE_BACKEND_PATH${THIS_BACKENDS+:$THIS_BACKENDS}" exec $BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
+MONO_GAC_PREFIX="@gacprefix ${MONO_GAC_PREFIX+:$MONO_GAC_PREFIX}" MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" BEAGLE_FILTER_PATH="$BEAGLE_FILTER_PATH${THIS_FILTERS+:$THIS_FILTERS}" BEAGLE_BACKEND_PATH="$BEAGLE_BACKEND_PATH${THIS_BACKENDS+:$THIS_BACKENDS}" exec $BEAGLE_MONO_RUNTIME $MONO_EXTRA_ARGS $THIS_EXE "$@"
 
--- beagle-0.2.7/bludgeon/bludgeon.in.debug	2006-06-21 11:29:51.000000000 +0200
+++ beagle-0.2.7/bludgeon/bludgeon.in	2006-06-21 11:29:58.000000000 +0200
@@ -28,5 +28,5 @@
    echo "*** Using mono runtime at $BEAGLE_MONO_RUNTIME ***"
 fi
 
-MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" MONO_PATH="$THIS_PATH:$MONO_PATH" exec $BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
+MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" MONO_PATH="$THIS_PATH:$MONO_PATH" exec $BEAGLE_MONO_RUNTIME $MONO_EXTRA_ARGS $THIS_EXE "$@"
 
--- beagle-0.2.7/search/beagle-search.in.debug	2006-06-21 11:30:18.000000000 +0200
+++ beagle-0.2.7/search/beagle-search.in	2006-06-21 11:30:29.000000000 +0200
@@ -21,4 +21,4 @@
    echo "*** Using mono runtime at $BEAGLE_MONO_RUNTIME ***"
 fi
 
-exec -a beagle-search $BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
\ No newline at end of file
+exec -a beagle-search $BEAGLE_MONO_RUNTIME $MONO_EXTRA_ARGS $THIS_EXE "$@"

beagle-0.2.7-runuser.patch:
 beagle-crawl-system.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE beagle-0.2.7-runuser.patch ---
--- beagle-0.2.7/tools/beagle-crawl-system.in.runuser	2006-06-21 13:07:54.000000000 +0200
+++ beagle-0.2.7/tools/beagle-crawl-system.in	2006-06-21 13:09:37.000000000 +0200
@@ -64,7 +64,7 @@
                 IONICE="$IONICE -c 3"
             fi
 
-	    eval nice -n 19 $IONICE su -s /bin/bash $CRAWL_USER -c \"MONO_SHARED_DIR=$MONO_SHARED_DIR @sbindir@/beagle-build-index --target @localstatedir@/cache/beagle/indexes/$CRAWL_INDEX_NAME $OPTIONS $CRAWL_PATHS\" > /dev/null 2>&1
+	    eval nice -n 19 $IONICE  /sbin/runuser -s /bin/bash $CRAWL_USER -c \"MONO_SHARED_DIR=$MONO_SHARED_DIR @sbindir@/beagle-build-index --target @localstatedir@/cache/beagle/indexes/$CRAWL_INDEX_NAME $OPTIONS $CRAWL_PATHS\" > /dev/null 2>&1
 	fi
     fi
 done


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	2 May 2006 09:09:53 -0000	1.11
+++ .cvsignore	21 Jun 2006 12:07:00 -0000	1.12
@@ -1,2 +1,3 @@
 beagle-0.2.6.tar.bz2
 beagle-0.2.4.tar.bz2
+beagle-0.2.7.tar.bz2

beagle-0.2.1-spew.patch:
 BeagleDaemon.cs            |    2 +-
 IndexHelper/IndexHelper.cs |    7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

Index: beagle-0.2.1-spew.patch
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle-0.2.1-spew.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- beagle-0.2.1-spew.patch	15 Jun 2006 22:26:14 -0000	1.4
+++ beagle-0.2.1-spew.patch	21 Jun 2006 12:07:00 -0000	1.5
@@ -26,7 +26,7 @@
  					// debugging this code, after all...
  					//arg_debug ? LogLevel.Debug : LogLevel.Warn,
 -					LogLevel.Debug,
-+					arg_debug ? LogLevel.Debug : LogLevel.Error
++					arg_debug ? LogLevel.Debug : LogLevel.Error,
  					arg_fg);
  
  			Logger.Log.Info ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);


Index: beagle.spec
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- beagle.spec	15 Jun 2006 22:26:14 -0000	1.56
+++ beagle.spec	21 Jun 2006 12:07:00 -0000	1.57
@@ -1,6 +1,6 @@
 Name:           beagle
-Version:        0.2.6
-Release:        6
+Version:        0.2.7
+Release:        1
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 License:        LGPL
@@ -28,8 +28,11 @@
 Requires: sqlite >= 3.3.1
 Requires: mono-core >= 1.1.13.5
 Requires: zip unzip sed grep poppler-utils
-Patch2: beagle-0.2.5-crawl.patch
+Patch1: beagle-0.2.7-nodebug.patch
+Patch2: beagle-0.2.7-crawl.patch
 Patch3: beagle-0.2.1-spew.patch
+Patch4: beagle-0.2.7-beagle-index-username.patch
+Patch5: beagle-0.2.7-runuser.patch
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc
@@ -64,8 +67,11 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .nodebug
 %patch2 -p1 -b .crawl
 %patch3 -p1 -b .spew
+%patch4 -p1 -b .beagleidx
+%patch5 -p1 -b .runuser
 
 %build
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -130,9 +136,11 @@
 
 %pre
 %define beagle_user_uid 58
-
-/usr/sbin/groupadd -g %{beagle_user_uid} -r beagleindex 2> /dev/null || :
-/usr/sbin/useradd -r -u %{beagle_user_uid} -s /sbin/nologin -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || :
+# Remove old username, we switched to an 8 char one
+/usr/sbin/userdel beagleindex
+/usr/sbin/groupdel beagleindex
+/usr/sbin/groupadd -g %{beagle_user_uid} -r beaglidx 2> /dev/null || :
+/usr/sbin/useradd -r -u %{beagle_user_uid} -s /sbin/nologin -c "User for Beagle indexing" -d /var/cache/beagle -g beaglidx beaglidx 2> /dev/null || :
 
 %post 
 if rpm -q firefox > /dev/null; then
@@ -187,8 +195,8 @@
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_mandir}/*/*
-%dir %attr(-,beagleindex,beagleindex) /var/cache/beagle
-%dir %attr(-,beagleindex,beagleindex) /var/cache/beagle/indexes
+%dir %attr(-,beaglidx,beaglidx) /var/cache/beagle
+%dir %attr(-,beaglidx,beaglidx) /var/cache/beagle/indexes
 #%{_sysconfdir}/xdg/autostart/beagle.desktop
 
 %files -n libbeagle
@@ -205,6 +213,12 @@
 %{_libdir}/python*/site-packages/beagle.so
 
 %changelog
+* Wed Jun 21 2006 Alexander Larsson <alexl redhat com> - 0.2.7-1
+- update to 0.2.7
+- Use runuser, not su in index cronjob (#195809)
+- Rename beagleindex to beaglidx (#184157)
+- Remove --debug from all wrappers
+
 * Thu Jun 16 2006 Ray Strode <rstrode redhat com> - 0.2.6-6
 - add bug spew when debugging is enabled (bug 195621)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/beagle/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	2 May 2006 09:09:53 -0000	1.13
+++ sources	21 Jun 2006 12:07:00 -0000	1.14
@@ -1,2 +1,2 @@
 6f0f121a9269662071eb5c260b54f86f  beagle.desktop
-56437aed8e5ac14a1b679755784e1a12  beagle-0.2.6.tar.bz2
+d4c8e93db23c9b7d06104ce97a182502  beagle-0.2.7.tar.bz2


--- beagle-0.2.5-crawl.patch DELETED ---


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