[packages/libbonoboui] - dependencies cleanup, moved browser specific ui file to browser package

[qboosh]

commit 4e01b0798026aa3854026457ed65e7f92b9b1131
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jan 11 22:04:56 2014 +0100

    - dependencies cleanup, moved browser specific ui file to browser package

 libbonoboui.spec | 63 +++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 37 insertions(+), 26 deletions(-)
---
diff --git a/libbonoboui.spec b/libbonoboui.spec
index 1b3e951..792a75a 100644
--- a/libbonoboui.spec
+++ b/libbonoboui.spec
@@ -17,6 +17,7 @@ BuildRequires:	autoconf
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.6.0
 BuildRequires:	gnome-common >= 2.20.0
 BuildRequires:	gtk+2-devel >= 2:2.12.8
 BuildRequires:	gtk-doc >= 1.8
@@ -27,12 +28,18 @@ BuildRequires:	libgnomecanvas-devel >= 2.20.0
 BuildRequires:	libgnome-devel >= 2.24.0
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 1:2.6.31
+BuildRequires:	pango-devel
+BuildRequires:	pangox-compat-devel
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 BuildRequires:	rpmbuild(macros) >= 1.197
-Requires:	GConf2 >= 2.24.0
-Requires:	libbonobo >= 2.24.0
-Requires:	libgnome >= 2.24.0
+BuildRequires:	xorg-lib-libX11-devel
+BuildConflicts:	gdk-pixbuf-devel < 0.12
+Requires:	GConf2-libs >= 2.24.0
+Requires:	glib2 >= 1:2.6.0
+Requires:	gtk+2 >= 2:2.12.8
+Requires:	libbonobo-libs >= 2.24.0
+Requires:	libgnome-libs >= 2.24.0
 Requires:	libgnomecanvas >= 2.20.0
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
@@ -54,6 +61,8 @@ Summary(pl.UTF-8):	Pliki nagłówkowe libbonoboui
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	GConf2-devel >= 2.24.0
+Requires:	glib2-devel >= 1:2.6.0
+Requires:	gtk+2-devel >= 2:2.12.8
 Requires:	libbonobo-devel >= 2.24.0
 Requires:	libglade2-devel >= 1:2.6.2
 Requires:	libgnome-devel >= 2.24.0
@@ -61,9 +70,6 @@ Requires:	libgnomecanvas-devel >= 2.20.0
 Requires:	libxml2-devel >= 1:2.6.31
 
 %description devel
-Bonobo is a component system based on CORBA, used by the GNOME
-desktop. libbonoboui contains GUI components that come with Bonobo.
-
 This package contains header files used to compile programs that use
 libbonoboui.
 
@@ -71,18 +77,6 @@ libbonoboui.
 Ten pakiet zawiera pliki nagłówkowe potrzebne do kompilacji programów
 używających libbonoboui.
 
-%package -n gnome-bonobo-browser
-Summary:	Bonobo component viewer
-Summary(pl.UTF-8):	Przeglądarka komponentów bonobo
-Group:		Applications/System
-Requires:	%{name} = %{version}-%{release}
-
-%description -n gnome-bonobo-browser
-Shows available Bonobo components.
-
-%description -n gnome-bonobo-browser -l pl.UTF-8
-Wyświetla dostępne komponenty bonobo.
-
 %package static
 Summary:	Static libbonoboui library
 Summary(pl.UTF-8):	Statyczna biblioteka libbonoboui
@@ -119,6 +113,18 @@ libbonoboui - example programs.
 %description examples -l pl.UTF-8
 libbonoboui - przykładowe programy.
 
+%package -n gnome-bonobo-browser
+Summary:	Bonobo component viewer
+Summary(pl.UTF-8):	Przeglądarka komponentów bonobo
+Group:		Applications/System
+Requires:	%{name} = %{version}-%{release}
+
+%description -n gnome-bonobo-browser
+Shows available Bonobo components.
+
+%description -n gnome-bonobo-browser -l pl.UTF-8
+Wyświetla dostępne komponenty bonobo.
+
 %prep
 %setup -q
 
@@ -132,6 +138,7 @@ libbonoboui - przykładowe programy.
 %{__autoheader}
 %{__automake}
 %configure \
+	PATH_TO_XRDB=/usr/bin/xrdb \
 	--enable-gtk-doc \
 	--with-html-dir=%{_gtkdocdir} \
 	%{!?with_static_libs:--disable-static}
@@ -159,7 +166,7 @@ cp -r samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/{sr at ije,sr at ijekavian}
 
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name}-2.0
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -167,7 +174,7 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%files -f %{name}.lang
+%files -f %{name}-2.0.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS README
 %attr(755,root,root) %{_bindir}/test-moniker
@@ -177,7 +184,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/bonobo/servers/Bonobo_Sample_Controls.server
 %{_libdir}/bonobo/servers/CanvDemo.server
 %attr(755,root,root) %{_libdir}/bonobo-2.0/samples/bonobo-sample-controls-2
-%{_datadir}/gnome-2.0
+%dir %{_datadir}/gnome-2.0
+%dir %{_datadir}/gnome-2.0/ui
+%{_datadir}/gnome-2.0/ui/Bonobo_Sample_Container-ui.xml
+%{_datadir}/gnome-2.0/ui/Bonobo_Sample_Hello.xml
 
 %files devel
 %defattr(644,root,root,755)
@@ -192,11 +202,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libbonoboui-2.a
 %endif
 
-%files -n gnome-bonobo-browser
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/bonobo-browser
-%{_desktopdir}/bonobo-browser.desktop
-
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/%{name}
@@ -204,3 +209,9 @@ rm -rf $RPM_BUILD_ROOT
 %files examples
 %defattr(644,root,root,755)
 %{_examplesdir}/%{name}-%{version}
+
+%files -n gnome-bonobo-browser
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/bonobo-browser
+%{_datadir}/gnome-2.0/ui/bonobo-browser.xml
+%{_desktopdir}/bonobo-browser.desktop
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libbonoboui.git/commitdiff/4e01b0798026aa3854026457ed65e7f92b9b1131