rpms/beagle/devel .cvsignore, 1.28, 1.29 beagle.spec, 1.131, 1.132 sources, 1.31, 1.32 beagleIndexer.conf.sample, 1.1, NONE beagleIndexer.ephy-extension, 1.1, NONE beagleIndexer.py, 1.1, NONE

[David Nielsen (dnielsen)]

Author: dnielsen

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

Modified Files:
	.cvsignore beagle.spec sources 
Removed Files:
	beagleIndexer.conf.sample beagleIndexer.ephy-extension 
	beagleIndexer.py 
Log Message:
Bump to 0.3.5 and move to use included epiphany backend



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	26 Mar 2008 12:31:39 -0000	1.28
+++ .cvsignore	3 Apr 2008 18:29:49 -0000	1.29
@@ -1 +1 @@
-beagle-0.3.4.tar.bz2
+beagle-0.3.5.tar.bz2


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- beagle.spec	26 Mar 2008 12:31:39 -0000	1.131
+++ beagle.spec	3 Apr 2008 18:29:49 -0000	1.132
@@ -1,14 +1,5 @@
-# Set the epiphany plugin version according to shipped version
-%if "%{fedora}" == "7"
-	%define epiphany_version 2.18
-%elseif "%{fedora} == "8"
-	%define epiphany_version 2.20
-%else
-	%define epiphany_version 2.22
-%endif
-
 Name:           beagle
-Version:        0.3.4
+Version:        0.3.5
 Release:        1%{?dist}
 Summary:        The Beagle Search Infrastructure
 Group:          User Interface/Desktops
@@ -17,12 +8,6 @@
 URL:            http://beagle-project.org/
 Source0:        http://download.gnome.org/sources/beagle/0.3/%{name}-%{version}.tar.bz2
 
-# Working Epiphany Backend 
-# http://browser-extension-for-beagle.googlecode.com/svn/trunk/py-epiphany-extension/
-Source1:	beagleIndexer.conf.sample
-Source2:	beagleIndexer.ephy-extension
-Source3:	beagleIndexer.py
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel
@@ -46,6 +31,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:	libbeagle-devel >= 0.3.4
 BuildRequires:  ndesk-dbus-glib-devel
+BuildRequires:	epiphany-devel
 %ifarch ia64
 BuildRequires:  libunwind-devel
 %endif
@@ -127,7 +113,7 @@
 Summary:      Beagle backend for Epiphany
 Group:        User Interface/Desktops
 Requires:     beagle = %{version}-%{release}
-Requires:     epiphany-extensions
+Requires:	epiphany-extensions
 
 %description epiphany
 Beagle backend for Epiphany
@@ -200,11 +186,6 @@
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/beagle/*.dll
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/beagle/*.exe
 
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/epiphany/%{epiphany_version}/extensions/
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/epiphany/%{epiphany_version}/extensions/
-cp %{SOURCE2} $RPM_BUILD_ROOT%{_libdir}/epiphany/%{epiphany_version}/extensions/
-cp %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/epiphany/%{epiphany_version}/extensions/
-
 %pre
 %define beagle_user_uid 58
 # Remove old username, we switched to an 8 char one
@@ -264,7 +245,7 @@
 
 %files epiphany
 %defattr(-, root, root,-)
-%{_libdir}/epiphany/%{epiphany_version}/extensions/
+%{_libdir}/epiphany/
 
 %files gnome
 %defattr(-, root, root,-)
@@ -289,6 +270,10 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Thu Apr 03 2008 David Nielsen <gnomeuser at gmail.com> - 0.3.5-1
+- Bump to 0.3.5
+- Replace epiphany extension with the bundled version as it now works
+
 * Wed Mar 26 2008 David Nielsen <gnomeuser at gmail.com> - 0.3.4-1
 - Bump to 0.3.4 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	26 Mar 2008 12:31:39 -0000	1.31
+++ sources	3 Apr 2008 18:29:49 -0000	1.32
@@ -1 +1 @@
-1be3e5c64fba09b526d9f18b1070f2ec  beagle-0.3.4.tar.bz2
+4d89f4fea81c870e6bdaa9fb2bd33f4a  beagle-0.3.5.tar.bz2


--- beagleIndexer.conf.sample DELETED ---


--- beagleIndexer.ephy-extension DELETED ---


--- beagleIndexer.py DELETED ---