SPECS: beagle.spec - glue libraries are dlopened by mono; no point...

qboosh qboosh at pld-linux.org
Sat Feb 9 00:11:00 CET 2008


Author: qboosh                       Date: Fri Feb  8 23:11:00 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- glue libraries are dlopened by mono; no point in -libs and -static
- general cleanup, moved man pages to proper packages
- Obsoletes for old python- package

---- Files affected:
SPECS:
   beagle.spec (1.116 -> 1.117) 

---- Diffs:

================================================================
Index: SPECS/beagle.spec
diff -u SPECS/beagle.spec:1.116 SPECS/beagle.spec:1.117
--- SPECS/beagle.spec:1.116	Sun Feb  3 18:16:47 2008
+++ SPECS/beagle.spec	Sat Feb  9 00:10:54 2008
@@ -74,6 +74,9 @@
 Requires:	dotnet-gmime-sharp >= 2.2.3
 Requires:	dotnet-gsf-sharp
 Requires:	sqlite3
+Obsoletes:	beagle-libs
+Obsoletes:	beagle-static
+Obsoletes:	python-beagle
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 ExclusiveArch:	%{ix86} %{x8664} arm hppa ia64 ppc s390 s390x sparc sparcv9 sparc64
@@ -88,17 +91,6 @@
 Beagle jest podsystemem indeksującym i wyszukującym zbudowanym na
 bazie Lucene.Net.
 
-%package libs
-Summary:	Beagle libraries
-Summary(pl.UTF-8):	Bibiloteki Beagle
-Group:		Libraries
-
-%description libs
-Beagle libraries.
-
-%description libs -l pl.UTF-8
-Bibiloteki Beagle.
-
 %package debug
 Summary:	Debug files for the Mono part of Beagle
 Summary(pl.UTF-8):	Pliki debugujące dla części Mono Beagle'a
@@ -123,18 +115,6 @@
 %description devel -l pl.UTF-8
 Pliki programistyczne Beagle.
 
-%package static
-Summary:	Beagle static libraries
-Summary(pl.UTF-8):	Statyczne biblioteki Beagle
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Beagle static libraries.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki Beagle.
-
 %package apidocs
 Summary:	libbeagle API documentation
 Summary(pl.UTF-8):	Dokumentacja API libbeagle
@@ -161,6 +141,46 @@
 %description crawl-system -l pl.UTF-8
 System przeszukujący beagle-crawl.
 
+%package search-gui
+Summary:	GNOME based Beagle GUI
+Summary(pl.UTF-8):	Oparty na GNOME graficzny interfejs dla Beagle
+Group:		Libraries/Python
+Requires:	%{name} = %{version}-%{release}
+Requires:	gtk+2 >= 2:2.10.10
+
+%description search-gui
+GNOME based Beagle GUI.
+
+%description search-gui -l pl.UTF-8
+Oparty na GNOME graficzny interfejs dla Beagle.
+
+%package startup
+Summary:	Automatic startup integration for Beagle
+Summary(pl.UTF-8):	Integracja funkcji automatycznego startu Beagle
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	beagle-gnome
+
+%description startup
+Automatic session startup integration for Beagle.
+
+%description startup -l pl.UTF-8
+Integracja funkcji automatycznego startu Beagle.
+
+%package webinterface
+Summary:	A web interface for Beagle
+Summary(pl.UTF-8):	Interfejs sieciowy dla Beagle
+Group:		Applications
+Requires:	%{name} = %{version}-%{release}
+
+%description webinterface
+An AJAX interface that allows users to search for data through their
+web browser.
+
+%description webinterface -l pl.UTF-8
+AJAX-owy interfejs pozwalający użytkownikom wyszukiwać dane za pomocą
+przeglądarki internetowej.
+
 %package evolution
 Summary:	Beagle Evolution backend
 Summary(pl.UTF-8):	Backend Beagle dla Evolution
@@ -187,21 +207,6 @@
 %description thunderbird -l pl.UTF-8
 Backend Beagle dla Mozilli Thunderbird.
 
-%package -n mozilla-firefox-extension-beagle
-Summary:	Mozilla Firefox extension - beagle
-Summary(pl.UTF-8):	Rozszerzenie dla Mozilla Firefox - beagle
-Group:		X11/Applications/Networking
-Requires:	%{name} = %{version}-%{release}
-Requires:	mozilla-firefox >= 2.0.0.1-2
-
-%description -n mozilla-firefox-extension-beagle
-Mozilla Firefox extension that allows Beagle to index every page the
-user views.
-
-%description -n mozilla-firefox-extension-beagle -l pl.UTF-8
-Rozszerzenie dla Mozilla Firefox sprawiające, że Beagle indeksuje
-każdą odwiedzaną stronę.
-
 %package -n epiphany-extension-beagle
 Summary:	Epiphany extension - beagle
 Summary(pl.UTF-8):	Rozszerzenie dla Epiphany - beagle
@@ -217,58 +222,20 @@
 Rozszerzenie dla Epiphany sprawiające, że Beagle indeksuje każdą
 odwiedzaną stronę.
 
-%package -n python-%{name}
-Summary:	Beagle Python bindings
-Summary(pl.UTF-8):	Wiązania języka Python dla Beagle
-Group:		Libraries/Python
-Requires:	%{name} = %{version}-%{release}
-%pyrequires_eq  python-libs
-
-%description -n python-%{name}
-Beagle Python bindings.
-
-%description -n python-%{name} -l pl.UTF-8
-Wiązania języka Python dla Beagle.
-
-%package search-gui
-Summary:	GNOME based Beagle GUI
-Summary(pl.UTF-8):	Oparty na GNOME graficzny interfejs dla Beagle
-Group:		Libraries/Python
-Requires:	%{name} = %{version}-%{release}
-Requires:	gtk+2 >= 2:2.10.10
-
-%description search-gui
-GNOME based Beagle GUI.
-
-%description search-gui -l pl.UTF-8
-Oparty na GNOME graficzny interfejs dla Beagle.
-
-%package startup
-Summary:	Automatic startup integration for Beagle
-Summary(pl.UTF-8):	Integracja funkcji automatycznego startu Beagle
-Group:		X11/Applications
-Requires:	%{name} = %{version}-%{release}
-Obsoletes:	beagle-gnome
-
-%description startup
-Automatic session startup integration for Beagle.
-
-%description startup -l pl.UTF-8
-Integracja funkcji automatycznego startu Beagle.
-
-%package webinterface
-Summary:	A web interface for Beagle
-Summary(pl.UTF-8):	Interfejs sieciowy dla Beagle
-Group:		Applications
+%package -n mozilla-firefox-extension-beagle
+Summary:	Mozilla Firefox extension - beagle
+Summary(pl.UTF-8):	Rozszerzenie dla przeglądarki Mozilla Firefox - beagle
+Group:		X11/Applications/Networking
 Requires:	%{name} = %{version}-%{release}
+Requires:	mozilla-firefox >= 2.0.0.1-2
 
-%description webinterface
-An AJAX interface that allows users to search for data through their
-web browser.
+%description -n mozilla-firefox-extension-beagle
+Mozilla Firefox extension that allows Beagle to index every page the
+user views.
 
-%description webinterface -l pl.UTF-8
-AJAX-owy interfejs pozwalający użytkownikom wyszukiwać dane za pomocą
-przeglądarki internetowej.
+%description -n mozilla-firefox-extension-beagle -l pl.UTF-8
+Rozszerzenie dla przeglądarki Mozilla Firefox sprawiające, że Beagle
+indeksuje każdą odwiedzaną stronę.
 
 %prep
 %setup -q
@@ -283,7 +250,7 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--enable-static \
+	--disable-static \
 	%{?with_apidocs:--enable-gtk-doc} \
 	--with-html-dir=%{_gtkdocdir} \
 	--%{!?with_epiphany:dis}%{?with_epiphany:en}able-epiphany-extension \
@@ -292,9 +259,7 @@
 	--%{!?with_thunderbird:dis}%{?with_thunderbird:en}able-thunderbird \
 	--%{!?with_avahi:dis}%{?with_avahi:en}able-avahi
 
-%{__make} \
-	MOZILLA_HOME=%{_libdir}/mozilla \
-	pythondir=%{py_sitedir}
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -305,6 +270,8 @@
 	pythondir=%{py_sitedir} \
 	monodocdir=%{_libdir}/monodoc/sources
 
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*glue.la
+
 dest=$RPM_BUILD_ROOT%{_datadir}/mozilla-firefox/extensions/\{fda00e13-8c62-4f63-9d19-d168115b11ca\}
 install -d $dest $dest/chrome
 install firefox-extension/{chrome.manifest,install.rdf} $dest
@@ -342,14 +309,10 @@
         %groupremove beagleindex
 fi
 
-%post	libs -p /sbin/ldconfig
-%postun	libs -p /sbin/ldconfig
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/beagle-config
-%attr(755,root,root) %{_bindir}/beagled
 %attr(755,root,root) %{_bindir}/beagle-doc-extractor
 %attr(755,root,root) %{_bindir}/beagle-extract-content
 %attr(755,root,root) %{_bindir}/beagle-index-info
@@ -358,7 +321,9 @@
 %attr(755,root,root) %{_bindir}/beagle-query
 %attr(755,root,root) %{_bindir}/beagle-shutdown
 %attr(755,root,root) %{_bindir}/beagle-status
+%attr(755,root,root) %{_bindir}/beagled
 %attr(755,root,root) %{_libdir}/%{name}/*.exe
+%attr(755,root,root) %{_libdir}/%{name}/libbeagleglue.so*
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/Backends
 %dir %{_libdir}/%{name}/Filters
@@ -366,11 +331,12 @@
 %{_libdir}/%{name}/*.dll.config
 %{_libdir}/%{name}/Filters/*.dll
 %attr(755,root,root) %{_libdir}/%{name}/beagled-index-helper
-%{_mandir}/man*/*
-
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/lib*.so.*.*.*
+%{_mandir}/man1/beagle-config.1*
+%{_mandir}/man1/beagle-query.1*
+%{_mandir}/man1/beagle-search.1*
+%{_mandir}/man1/beagle-shutdown.1*
+%{_mandir}/man1/beagle-status.1*
+%{_mandir}/man1/beagled.1*
 
 %files debug
 %defattr(644,root,root,755)
@@ -380,26 +346,62 @@
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/*.so
-%attr(755,root,root) %ghost %{_libdir}/%{name}/*.so.0
-%{_libdir}/%{name}/*.la
-%{_pkgconfigdir}/*
+%{_pkgconfigdir}/beagle-0.0.pc
+%{_pkgconfigdir}/beagle-ui-0.0.pc
+%{_pkgconfigdir}/beagle-daemon.pc
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_libdir}/monodoc/sources/*
+%endif
 
 %files crawl-system
 %defattr(644,root,root,755)
-%attr(750,root,crontab) %config(noreplace) %verify(not md5 mtime size) /etc/cron.daily/*
 %dir %{_sysconfdir}/beagle
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/beagle/*
+%dir %{_sysconfdir}/beagle/config-files
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/beagle/config-files/BeagleSearch.xml
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/beagle/config-files/Daemon.xml
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/beagle/config-files/FilesQueryable.xml
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/beagle/config-files/Networking.xml
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/beagle/crawl-applications
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/beagle/crawl-documentation
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/beagle/crawl-manpages
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/beagle/crawl-monodoc
+# XXX: samples not here
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/beagle/external-filters.xml.sample
+%attr(750,root,crontab) %config(noreplace) %verify(not md5 mtime size) /etc/cron.daily/beagle-crawl-system
 %dir %attr(755,beagleindex,beagleindex) %{_var}/cache/beagle
 %dir %attr(755,beagleindex,beagleindex) %{_var}/cache/beagle/indexes
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/beagle-build-index
+%attr(755,root,root) %{_sbindir}/beagle-dump-index
+%attr(755,root,root) %{_sbindir}/beagle-manage-index
+%attr(755,root,root) %{_sbindir}/beagle-master-delete-button
+%{_mandir}/man1/beagle-dump-index.1*
+%{_mandir}/man8/beagle-build-index.8*
+%{_mandir}/man8/beagle-extract-content.8*
+%{_mandir}/man8/beagle-manage-index.8*
 
-%if %{with apidocs}
-%files apidocs
+%if %{with gui}
+%files search-gui
 %defattr(644,root,root,755)
-%{_libdir}/monodoc/sources/*
+%attr(755,root,root) %{_bindir}/beagle-imlogviewer
+%attr(755,root,root) %{_bindir}/beagle-search
+%attr(755,root,root) %{_bindir}/beagle-settings
+%attr(755,root,root) %{_libdir}/%{name}/libbeagleuiglue.so*
+%{_mandir}/man8/beagle-imlogviewer.8*
+%{_desktopdir}/*.desktop
 %endif
 
+%files startup
+%defattr(644,root,root,755)
+%{_sysconfdir}/xdg/autostart/beagled-autostart.desktop
+%{_sysconfdir}/xdg/autostart/beagle-search-autostart.desktop
+
+%files webinterface
+%defattr(644,root,root,755)
+%{_datadir}/%{name}
+
 %if %{with evolution}
 %files evolution
 %defattr(644,root,root,755)
@@ -413,10 +415,6 @@
 %{_libdir}/mozilla-thunderbird/extensions/{b656ef18-fd76-45e6-95cc-8043f26361e7}
 %endif
 
-%files -n mozilla-firefox-extension-beagle
-%defattr(644,root,root,755)
-%{_datadir}/mozilla-firefox/extensions/{fda00e13-8c62-4f63-9d19-d168115b11ca}
-
 %if %{with epiphany}
 %files -n epiphany-extension-beagle
 %defattr(644,root,root,755)
@@ -424,28 +422,9 @@
 %{_libdir}/epiphany/2.20/extensions/*.ephy-extension
 %endif
 
-%if %{with gui}
-%files search-gui
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/beagle-imlogviewer
-%attr(755,root,root) %{_bindir}/beagle-search
-%attr(755,root,root) %{_bindir}/beagle-settings
-%attr(755,root,root) %{_libdir}/%{name}/libbeagleuiglue.so*
-%{_desktopdir}/*.desktop
-%endif
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/%{name}/*.a
-
-%files startup
-%defattr(644,root,root,755)
-%{_sysconfdir}/xdg/autostart/beagled-autostart.desktop
-%{_sysconfdir}/xdg/autostart/beagle-search-autostart.desktop
-
-%files webinterface
+%files -n mozilla-firefox-extension-beagle
 %defattr(644,root,root,755)
-%{_datadir}/%{name}
+%{_datadir}/mozilla-firefox/extensions/{fda00e13-8c62-4f63-9d19-d168115b11ca}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -453,6 +432,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.117  2008-02-08 23:10:54  qboosh
+- glue libraries are dlopened by mono; no point in -libs and -static
+- general cleanup, moved man pages to proper packages
+- Obsoletes for old python- package
+
 Revision 1.116  2008-02-03 17:16:47  deejay1
 - version 0.3.3 merged from DEVEL
 - release 1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/beagle.spec?r1=1.116&r2=1.117&f=u



More information about the pld-cvs-commit mailing list