rpms/beagle/F-10 beagle-0.3.9-libgnome-desktop-soname.patch, NONE, 1.1 beagle-0.2.15.1-libdir.patch, 1.1, 1.2 beagle-0.3.8-epiphany.patch, 1.2, 1.3 beagle.spec, 1.155, 1.156 beagle-0.3.8-category-crash.patch, 1.2, NONE beagle-0.3.8-desktop-parser.patch, 1.1, NONE beagle-0.3.8-libgnome-desktop-soname.patch, 1.1, NONE beagle-0.3.8-tmp-permissions.patch, 1.2, NONE beagle-0.3.8-typo-fix.patch, 1.1, NONE

[Adel Gadllah]

Author: drago01

Update of /cvs/pkgs/rpms/beagle/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9211

Modified Files:
	beagle-0.2.15.1-libdir.patch beagle-0.3.8-epiphany.patch 
	beagle.spec 
Added Files:
	beagle-0.3.9-libgnome-desktop-soname.patch 
Removed Files:
	beagle-0.3.8-category-crash.patch 
	beagle-0.3.8-desktop-parser.patch 
	beagle-0.3.8-libgnome-desktop-soname.patch 
	beagle-0.3.8-tmp-permissions.patch beagle-0.3.8-typo-fix.patch 
Log Message:
Update to 0.3.9

beagle-0.3.9-libgnome-desktop-soname.patch:

--- NEW FILE beagle-0.3.9-libgnome-desktop-soname.patch ---
diff -upNr beagle-0.3.9.orign/search/Beagle.Search.exe.config beagle-0.3.9/search/Beagle.Search.exe.config
--- beagle-0.3.9.orign/search/Beagle.Search.exe.config	2008-07-17 10:59:14.000000000 +0200
+++ beagle-0.3.9/search/Beagle.Search.exe.config	2009-01-28 12:51:07.000000000 +0100
@@ -1,4 +1,4 @@
 <configuration>
-	<dllmap dll="libgnome-desktop-2" target="libgnome-desktop-2.so.2" />
+	<dllmap dll="libgnome-desktop-2" target="libgnome-desktop-2.so.7" />
 </configuration>
 

beagle-0.2.15.1-libdir.patch:

Index: beagle-0.2.15.1-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-10/beagle-0.2.15.1-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beagle-0.2.15.1-libdir.patch	5 Feb 2007 14:42:26 -0000	1.1
+++ beagle-0.2.15.1-libdir.patch	31 Jan 2009 11:24:31 -0000	1.2
@@ -1,11 +1,30 @@
---- beagle-0.2.15.1/configure.in.libdir	2007-02-05 13:35:26.000000000 +0100
-+++ beagle-0.2.15.1/configure.in	2007-02-05 13:37:10.000000000 +0100
-@@ -77,7 +77,7 @@
- needed_dlls="Mono.Data.SqliteClient Mono.Posix System.Runtime.Remoting System.Web System.Web.Services ICSharpCode.SharpZipLib"
+diff -upNr beagle-0.3.9.orign/configure beagle-0.3.9/configure
+--- beagle-0.3.9.orign/configure	2008-07-19 13:20:36.000000000 +0200
++++ beagle-0.3.9/configure	2009-01-28 13:16:04.000000000 +0100
+@@ -21191,7 +21191,7 @@ needed_dlls="Mono.Data.Sqlite Mono.Posix
  for i in $needed_dlls; do
-   AC_MSG_CHECKING([for $i.dll])
+   { echo "$as_me:$LINENO: checking for $i.dll" >&5
+ echo $ECHO_N "checking for $i.dll... $ECHO_C" >&6; }
 -  if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
 +  if test ! -e `monodir`/2.0/$i.dll; then
-     AC_MSG_ERROR([missing required mono DLL: $i.dll])
-   else
-     AC_MSG_RESULT([found])
+     { { echo "$as_me:$LINENO: error: missing required mono DLL: $i.dll" >&5
+ echo "$as_me: error: missing required mono DLL: $i.dll" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -25613,7 +25613,7 @@ if test "x$enable_google" = "xyes"; then
+   i="System.Security"
+   { echo "$as_me:$LINENO: checking for $i.dll (needed by Google backends)" >&5
+ echo $ECHO_N "checking for $i.dll (needed by Google backends)... $ECHO_C" >&6; }
+-  if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
++  if test ! -e `monodir`/2.0/$i.dll; then
+     { { echo "$as_me:$LINENO: error: missing required mono DLL: $i.dll" >&5
+ echo "$as_me: error: missing required mono DLL: $i.dll" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -27512,7 +27512,7 @@ if test "x$enable_qt" != "xno" -a "x$has
+ 	i="qt-dotnet"
+ 	{ echo "$as_me:$LINENO: checking for $i.dll" >&5
+ echo $ECHO_N "checking for $i.dll... $ECHO_C" >&6; }
+-	if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then
++	if test ! -e `monodir`/2.0/$i.dll; then
+ 		{ { echo "$as_me:$LINENO: error: missing required mono DLL: $i.dll" >&5
+ echo "$as_me: error: missing required mono DLL: $i.dll" >&2;}
+    { (exit 1); exit 1; }; }

beagle-0.3.8-epiphany.patch:

Index: beagle-0.3.8-epiphany.patch
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-10/beagle-0.3.8-epiphany.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- beagle-0.3.8-epiphany.patch	4 Oct 2008 12:44:40 -0000	1.2
+++ beagle-0.3.8-epiphany.patch	31 Jan 2009 11:24:31 -0000	1.3
@@ -1,12 +1,12 @@
-diff -upNr beagle-0.3.8.orign/configure.in beagle-0.3.8/configure.in
---- beagle-0.3.8.orign/configure.in	2008-06-12 18:06:25.000000000 +0200
-+++ beagle-0.3.8/configure.in	2008-07-24 14:17:24.000000000 +0200
-@@ -402,7 +402,7 @@ if test "x$enable_epiphany_extension" !=
- 	dnl If you want to add anything but a <major>.<minor> version here, you
- 	dnl need to see the handling of the epiphany_version variable in the
- 	dnl epiphany extension code
--	VALID_EPIPHANY_VERSIONS="2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
-+	VALID_EPIPHANY_VERSIONS="2.24 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
+diff -upNr beagle-0.3.9.orign/configure beagle-0.3.9/configure
+--- beagle-0.3.9.orign/configure	2008-07-19 13:20:36.000000000 +0200
++++ beagle-0.3.9/configure	2009-01-28 12:54:38.000000000 +0100
+@@ -26942,7 +26942,7 @@ echo $ECHO_N "checking for Epiphany... $
+ 	{ echo "$as_me:$LINENO: result: " >&5
+ echo "${ECHO_T}" >&6; }
+ 
+-				VALID_EPIPHANY_VERSIONS="2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
++				VALID_EPIPHANY_VERSIONS="2.26 2.25 2.24 2.22 2.20 2.19 2.18 2.17 2.16 2.15 2.14 1.8 1.6"
  	for v in $VALID_EPIPHANY_VERSIONS; do
- 	
- 		AC_MSG_CHECKING([for Epiphany $v])
+ 
+ 		{ echo "$as_me:$LINENO: checking for Epiphany $v" >&5


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-10/beagle.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- beagle.spec	28 Dec 2008 14:30:23 -0000	1.155
+++ beagle.spec	31 Jan 2009 11:24:31 -0000	1.156
@@ -1,6 +1,6 @@
 Name:		beagle
-Version:	0.3.8
-Release:	14%{?dist}
+Version:	0.3.9
+Release:	1%{?dist}
 Summary:	The Beagle Search Infrastructure
 Group:		User Interface/Desktops
 # see COPYING for details
@@ -55,31 +55,18 @@
 Patch4: beagle-0.3.0-runuser.patch
 Patch5: beagle-0.2.15.1-libdir.patch
 Patch6: beagle-monodoc.patch
-Patch7: beagle-0.3.8-typo-fix.patch
-Patch8: beagle-0.3.8-epiphany.patch
-Patch9: beagle-0.3.8-desktop-parser.patch
-Patch10: beagle-0.3.8-libgnome-desktop-soname.patch
-#svn commit r4855
-Patch11: beagle-0.3.8-category-crash.patch
-#svn commit 4899, fixes RH #465358
-Patch12: beagle-0.3.8-tmp-permissions.patch
+Patch7: beagle-0.3.8-epiphany.patch
+Patch8: beagle-0.3.9-libgnome-desktop-soname.patch
+
 # Mono is not available on these arches 
 ExcludeArch: s390 s390x sparc64 ppc64
 
-# Fedora 9 and above ships xulrunner
-%if 0%{?fedora} > 8
 BuildRequires:	xulrunner-devel
-%else
-BuildRequires:	firefox-devel
-%endif
 
 # firefox app id for beagle firefox extension
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define firefox_ext_id \{fda00e13-8c62-4f63-9d19-d168115b11ca\}
 
-# thunderbird version and ext id for beagle extension
-%define tb_ext_id \{b656ef18-fd76-45e6-95cc-8043f26361e7\}
-
 %description
 A general infrastructure for making your data easy to find. 
 
@@ -150,15 +137,10 @@
 %patch4 -p1 -b .runuser
 %patch5 -p1 -b .libdir
 %patch6 -p1 -b .monodoc
-%patch7 -p1 -b .typo
-%patch8 -p1 -b .epiphany
-%patch9 -p1 -b .desktop-parser
-%patch10 -p1 -b .gnome-desktop
-%patch11 -p1 -b .category-crash
-%patch12 -p1 -b .tmp-leak
+%patch7 -p1 -b .epiphany
+%patch8 -p1 -b .gnome-desktop
 
 %build
-autoconf
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure --enable-wv1 --disable-googlebackends
 make %{?_smp_mflags}
@@ -347,6 +329,10 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Sat Jan 31 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.9-1
+- Update to 0.3.9
+- Drop obsolete patches
+
 * Sun Dec 28 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-14
 - Fix tmp file leak, RH #465358
 


--- beagle-0.3.8-category-crash.patch DELETED ---


--- beagle-0.3.8-desktop-parser.patch DELETED ---


--- beagle-0.3.8-libgnome-desktop-soname.patch DELETED ---


--- beagle-0.3.8-tmp-permissions.patch DELETED ---


--- beagle-0.3.8-typo-fix.patch DELETED ---