rpms/beagle/devel beagle.spec,1.150,1.151

Adel Gadllah drago01 at fedoraproject.org
Sun Nov 2 13:19:32 UTC 2008 

Author: drago01

Update of /cvs/pkgs/rpms/beagle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17840

Modified Files:
	beagle.spec 
Log Message:
Require gnome-desktop in -gnome


Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/devel/beagle.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- beagle.spec	27 Oct 2008 17:30:55 -0000	1.150
+++ beagle.spec	2 Nov 2008 13:19:02 -0000	1.151
@@ -1,49 +1,56 @@
-Name:           beagle
-Version:        0.3.8
-Release:        9%{?dist}
-Summary:        The Beagle Search Infrastructure
-Group:          User Interface/Desktops
+Name:		beagle
+Version:	0.3.8
+Release:	10%{?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
+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
 Source1:	beagle-thunderbird-update.sh
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  mono-devel
-BuildRequires:  mono-data mono-data-sqlite
-BuildRequires:  monodoc-devel
-BuildRequires:  gtk-sharp2-gapi gtk-sharp2-devel gnome-sharp-devel mono-web zip libexif-devel
-BuildRequires:  gsf-sharp-devel >= 0.6
-BuildRequires:  gmime-sharp >= 2.1.19
-BuildRequires:  evolution-sharp-devel >= 0.10.2-3
-BuildRequires:  libXScrnSaver-devel
-BuildRequires:  gtk2-devel >= 2.6.0
-BuildRequires:  librsvg2-devel >= 2.0
-BuildRequires:  libXt-devel
-BuildRequires:  wv-devel
+BuildRequires:	mono-devel
+BuildRequires:	mono-data
+BuildRequires:	mono-data-sqlite
+BuildRequires:	monodoc-devel
+BuildRequires:	gtk-sharp2-gapi 
+BuildRequires:	gtk-sharp2-devel
+BuildRequires:	gnome-sharp-devel
+BuildRequires:	mono-web
+BuildRequires:	zip
+BuildRequires:	libexif-devel
+BuildRequires:	gsf-sharp-devel >= 0.6
+BuildRequires:	gmime-sharp >= 2.1.19
+BuildRequires:	gnome-sharp-devel
+BuildRequires:	evolution-sharp-devel >= 0.10.2-3
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	gtk2-devel >= 2.6.0
+BuildRequires:	librsvg2-devel >= 2.0
+BuildRequires:	libXt-devel
+BuildRequires:	wv-devel
 BuildRequires:	gettext
 BuildRequires:	autoconf
 BuildRequires:	perl(XML::Parser)
-BuildRequires:  desktop-file-utils
+BuildRequires:	desktop-file-utils
 BuildRequires:	libbeagle-devel >= 0.3.4
-BuildRequires:  ndesk-dbus-glib-devel
+BuildRequires:	ndesk-dbus-glib-devel
 BuildRequires:	epiphany-devel
-BuildRequires:  taglib-sharp-devel
-BuildRequires:  unzip
-BuildRequires: chmlib-devel
+BuildRequires:	taglib-sharp-devel
+BuildRequires:	unzip
+BuildRequires:	chmlib-devel
 
 %ifarch ia64
-BuildRequires:  libunwind-devel
+BuildRequires:	libunwind-devel
 %endif
-Requires: sqlite >= 3.3.1
-Requires: zip unzip sed grep poppler-utils
-Requires: libbeagle
+Requires:	sqlite >= 3.3.1
+Requires:	zip unzip sed grep poppler-utils
+Requires:	libbeagle
 
 # 4.0.17-5 fixes bug #201991
-Requires(pre):  shadow-utils >= 4.0.17-5
+Requires(pre):	shadow-utils >= 4.0.17-5
 
-Patch2: beagle-0.2.7-crawl.patch
+#Patch2: beagle-0.2.7-crawl.patch
 Patch3: beagle-0.3.2-spew.patch
 Patch4: beagle-0.3.0-runuser.patch
 Patch5: beagle-0.2.15.1-libdir.patch
@@ -73,58 +80,59 @@
 A general infrastructure for making your data easy to find. 
 
 %package gnome
-Summary:      Beagle search system user interface for GNOME
-Group:        User Interface/Desktops
-Requires:     beagle = %{version}-%{release}
-Obsoletes:    beagle-gui < 0.3.3-9
-Provides:     beagle-gui = 0.3.3-9
+Summary:	Beagle search system user interface for GNOME
+Group:		User Interface/Desktops
+Requires:	beagle = %{version}-%{release}
+Requires:	gnome-desktop
+Obsoletes:	beagle-gui < 0.3.3-9
+Provides:	beagle-gui = 0.3.3-9
 
 %description gnome
 User interface for doing beagle searches
 
 %package evolution
-Summary:      Beagle backend for evolution
-Group:        User Interface/Desktops
-Requires:     beagle = %{version}-%{release}
+Summary:	Beagle backend for evolution
+Group:		User Interface/Desktops
+Requires:	beagle = %{version}-%{release}
 
 %description evolution
 Beagle indexing backend for evolution
 
 %package thunderbird
-Summary:      Beagle backend for Thunderbird
-Group:        User Interface/Desktops
-Requires:     beagle = %{version}-%{release}
-Requires: thunderbird
+Summary:	Beagle backend for Thunderbird
+Group:		User Interface/Desktops
+Requires:	beagle = %{version}-%{release}
+Requires:	thunderbird
 
 %description thunderbird
 Beagle backend for Thunderbird
 
 %package firefox
-Summary:      Beagle Indexer Extension for Firefox
-Group:        User Interface/Desktops
-Requires:     beagle = %{version}-%{release}
+Summary:	Beagle Indexer Extension for Firefox
+Group:		User Interface/Desktops
+Requires:	beagle = %{version}-%{release}
 
 %description firefox
 Beagle Indexer Extension for Firefox
 
 %package epiphany
-Summary:      Beagle backend for Epiphany
-Group:        User Interface/Desktops
-Requires:     beagle = %{version}-%{release}
+Summary:	Beagle backend for Epiphany
+Group:		User Interface/Desktops
+Requires:	beagle = %{version}-%{release}
 Requires:	epiphany-extensions
 
 %description epiphany
 Beagle backend for Epiphany
 
 %package devel
-Summary:    Development files for the Beagle search infrastructure
-Group:      Development/Libraries
+Summary:	Development files for the Beagle search infrastructure
+Group:		Development/Libraries
 # for /usr/lib/pkgconfig
-Requires:   pkgconfig
+Requires:	pkgconfig
 # for /usr/lib/monodoc/
-Requires:         monodoc
-Requires(post):   monodoc
-Requires(postun): monodoc
+Requires:		monodoc
+Requires(post):	monodoc
+Requires(postun): 	monodoc
 
 %description devel
 The beagle-devel package contains documentation and other materials
@@ -169,14 +177,14 @@
 unzip thunderbird-extension/beagle.xpi  -d $RPM_BUILD_ROOT%{_libdir}/beagle/thunderbird
 install -D -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/beagle/beagle-thunderbird-update.sh
 
-desktop-file-install --vendor gnome --delete-original		\
+desktop-file-install --vendor gnome --delete-original	\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
   $RPM_BUILD_ROOT%{_datadir}/applications/beagle-search.desktop
 
-desktop-file-install --vendor gnome --delete-original		\
+desktop-file-install --vendor gnome --delete-original	\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
-  --add-category X-GNOME-SystemSettings				\
-  --remove-category Utility                                     \
+  --add-category X-GNOME-SystemSettings			\
+  --remove-category Utility					\
   $RPM_BUILD_ROOT%{_datadir}/applications/beagle-settings.desktop
 
 echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-beagle-search.desktop
@@ -332,6 +340,9 @@
 %{_libdir}/pkgconfig/beagle*.pc
 
 %changelog
+* Sun Nov 02 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.8-10
+- Require gnome-deskop in the gnome package (RH #556243)
+
 * Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.8-9
 - rebuild against new gnome-sharp

More information about the scm-commits mailing list