rpms/beagle/devel .cvsignore, 1.26, 1.27 beagle.spec, 1.128, 1.129 sources, 1.29, 1.30

[David Nielsen (dnielsen)]

Author: dnielsen

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv979/devel

Modified Files:
	.cvsignore beagle.spec sources 
Log Message:
bump to 3.4-pre1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	10 Feb 2008 16:10:41 -0000	1.26
+++ .cvsignore	19 Mar 2008 15:44:29 -0000	1.27
@@ -1 +1 @@
-beagle-0.3.3.tar.bz2
+beagle-0.3.3.90.tar.gz


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- beagle.spec	5 Mar 2008 11:45:48 -0000	1.128
+++ beagle.spec	19 Mar 2008 15:44:29 -0000	1.129
@@ -7,18 +7,15 @@
 	%define epiphany_version 2.22
 %endif
 
-# firefox app if for beagle firefox extension
-%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
-
 Name:           beagle
-Version:        0.3.3
-Release:        10%{?dist}
+Version:        0.3.3.90
+Release:        1%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
 # see COPYING for details
 License:        ASL 2.0 and MIT and BSD and CC-BY and LGPLv2+ and (AFL or LGPLv2+)
 URL:            http://beagle-project.org/
-Source0:        http://download.gnome.org/sources/beagle/0.3/%{name}-%{version}.tar.bz2
+Source0:        http://download.gnome.org/sources/beagle/0.3/%{name}-%{version}.tar.gz
 
 # Working Epiphany Backend 
 # http://browser-extension-for-beagle.googlecode.com/svn/trunk/py-epiphany-extension/
@@ -56,12 +53,9 @@
 Requires: mono-core >= 1.1.13.5
 Requires: zip unzip sed grep poppler-utils
 Requires: libbeagle
-
-# deep hack, banshee autoprovides ndesk-dbus(-glib)
-# this will go away but for now
-# suck in these to avoid installing banshee
-Requires:	ndesk-dbus
-Requires:	ndesk-dbus-glib
+# This should be picked up automatically by dep, but there is
+# a problem with it. See bug #230212
+Requires: gsf-sharp
 
 # 4.0.17-5 fixes bug #201991
 Requires(pre):  shadow-utils >= 4.0.17-5
@@ -73,8 +67,8 @@
 Patch6: beagle-monodoc.patch
 Patch7: beagle-0.3.3-buildfix.patch
 
-# JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
+# Mono is not available on these arches 
+ExcludeArch: s390 s390x sparc64 ppc64
 
 # Fedora 9 and above ships xulrunner
 %if "%{fedora}" > "8"
@@ -83,6 +77,9 @@
 BuildRequires:	firefox-devel
 %endif
 
+# firefox app if for beagle firefox extension
+%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
+
 %description
 A general infrastructure for making your data easy to find. 
 
@@ -151,19 +148,17 @@
 
 %prep
 %setup -q
-%patch2 -p1 -b .crawl
+#%patch2 -p1 -b .crawl
 %patch3 -p1 -b .spew
 %patch4 -p1 -b .runuser
 %patch5 -p1 -b .libdir
 %patch6 -p1 -b .monodoc
-%patch7 -p1 -b .buildfix
+#%patch7 -p1 -b .buildfix
 
 %build
 autoconf
 export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-%configure --enable-wv1 
-
-
+%configure --enable-wv1
 make %{?_smp_mflags}
 
 %install
@@ -177,16 +172,10 @@
 # don't autostart the search gui
 rm -f $RPM_BUILD_ROOT/etc/xdg/autostart/beagle-search-autostart.desktop
 
-# Fedora 9 and above ships xulrunner
-%if "%{fedora}" > "8"
-# No support for 3.0 api yet - this is ugly I know
-rm -rf firefox-extension/beagle.xpi
-%else
 # TODO: Isn't there a better place to install this?
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}
 install -m 644 firefox-extension/beagle.xpi \
 $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}
-%endif
 
 desktop-file-install --vendor gnome --delete-original		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
@@ -256,38 +245,9 @@
 %doc COPYING README
 %{_sysconfdir}/cron.daily/*
 %{_sysconfdir}/beagle
-%{_bindir}/beagle-config
-%{_bindir}/beagled
-%{_bindir}/beagle-extract-content
-%{_bindir}/beagle-index-info
-%{_bindir}/beagle-info
-%{_bindir}/beagle-ping
-%{_bindir}/beagle-query
-%{_bindir}/beagle-shutdown
-%{_bindir}/beagle-status
-%{_bindir}/beagle-doc-extractor
+%{_bindir}/
 %{_sbindir}/*
-%dir %{_libdir}/beagle
-%dir %{_libdir}/beagle/Filters
-%dir %{_libdir}/beagle/Backends
-%{_libdir}/beagle/BeagleDaemonLib.dll*
-%{_libdir}/beagle/BeagleDaemonPlugins.dll*
-%{_libdir}/beagle/Beagle.dll*
-%{_libdir}/beagle/Util.dll*
-%{_libdir}/beagle/BeagleDaemon.exe*
-%{_libdir}/beagle/BuildIndex.exe*
-%{_libdir}/beagle/DumpIndex.exe*
-%{_libdir}/beagle/Config.exe*
-%{_libdir}/beagle/ExtractContent.exe*
-%{_libdir}/beagle/IndexHelper.exe*
-%{_libdir}/beagle/Info.exe*
-%{_libdir}/beagle/ManageIndex.exe*
-%{_libdir}/beagle/Query.exe*
-%{_libdir}/beagle/Shutdown.exe*
-%{_libdir}/beagle/beagled-index-helper
-%{_libdir}/beagle/libbeagleglue*
-%{_libdir}/beagle/Filters/*
-%{_libdir}/beagle/DocExtractor.exe*
+%{_libdir}/beagle/
 %{_datadir}/beagle
 %{_mandir}/*/*
 %dir %attr(-,beaglidx,beaglidx) /var/cache/beagle
@@ -296,10 +256,7 @@
 
 %files firefox
 %defattr(-, root, root,-)
-# Fedora 9 and above ships xulrunner, ugly hack since we don't support API 3.0
-%if "%{fedora}" <= "8"
 %{_libdir}/mozilla/extensions/%{firefox_app_id}/
-%endif
 
 %files thunderbird
 %defattr(-, root, root,-)
@@ -316,7 +273,6 @@
 %{_bindir}/beagle-settings
 %{_libdir}/beagle/UiUtil.dll*
 %{_libdir}/beagle/ImLogViewer.exe*
-%{_libdir}/beagle/Search.exe*
 %{_libdir}/beagle/Settings.exe*
 %{_libdir}/beagle/libbeagleuiglue*
 %{_datadir}/applications/*
@@ -333,10 +289,12 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Fri Mar 14 2008 David Nielsen <gnomeuser at gmail.com> - 0.3.3.90-1
+- bump to 3.3.90 (3.4-pre1)
+
 * Tue Feb 26 2008 David Nielsen <gnomeuser at gmail.com> - 0.3.3-10
 - Add Epiphany plugin
 - replace beagle-gui with beagle-gnome
-- no firefox plugin on devel only supports < 2.0
 
 * Tue Feb 26 2008 David Nielsen <gnomeuser at gmail.com> - 0.3.3-9
 - Build Thunderbird plugin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	10 Feb 2008 16:10:41 -0000	1.29
+++ sources	19 Mar 2008 15:44:29 -0000	1.30
@@ -1 +1 @@
-c1b6c340c72a70e33212c85513bc23f2  beagle-0.3.3.tar.bz2
+1d65acfd47ed20ead3fbd079e2db60a9  beagle-0.3.3.90.tar.gz