- updated to 1.113.0

Changed files:
    libbonoboui.spec -> 1.6

diff --git a/libbonoboui.spec b/libbonoboui.spec
index 7db83c2ce5d7534f2b1dd214e7c98763f19fbf9f..ffd1fec75e5bbedc417ec2cad27b95bfca7d465b 100644 (file)
--- a/libbonoboui.spec
+++ b/libbonoboui.spec
@@ -1,41 +1,24 @@
-%define libxml2_version 2.4.12
-%define orbit2_version 2.3.103
-%define bonobo_activation_version 0.9.3.91
-%define libbonobo_version 1.110.0
-%define libgnomecanvas_version 1.110.0
-%define libgnome_version 1.110.0
-%define libart_lgpl_version 2.3.8
-%define gtk2_version 1.3.13
-%define libglade2_version 1.99.5.90
-
 Summary:       Bonobo user interface components
 Summary(pl):   Komponenty interfejsu u¿ytkownika do Bonobo
 Name:          libbonoboui
-Version:       1.110.0
-Release:       4
+Version:       1.113.0
+Release:       1
 License:       LGPL
 Group:         X11/Libraries
 Source0:       ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/libbonoboui/%{name}-%{version}.tar.bz2
+Patch0:                %{name}-gconf2.patch
 URL:           http://www.gnome.org/
-Requires:      libxml2 >= %{libxml2_version}
-Requires:      ORBit2 >= %{orbit2_version}
-Requires:      bonobo-activation >= %{bonobo_activation_version}
-Requires:      libbonobo >= %{libbonobo_version}
-Requires:      libgnomecanvas >= %{libgnomecanvas_version}
-Requires:      libgnome >= %{libgnome_version}
-Requires:      libart_lgpl >= %{libart_lgpl_version}
-Requires:      gtk2 >= %{gtk2_version}
-Requires:      libglade2 >= %{libglade2_version}
-BuildRequires: libxml2-devel >= %{libxml2_version}
-BuildRequires: ORBit2-devel >= %{orbit2_version}
-BuildRequires: bonobo-activation-devel >= %{bonobo_activation_version}
-BuildRequires: libbonobo-devel >= %{libbonobo_version}
-BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version}
-BuildRequires: libgnome-devel >= %{libgnome_version}
-BuildRequires: libart_lgpl-devel >= %{libart_lgpl_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: libglade2-devel >= %{libglade2_version}
-BuildRequires: intltool >= 0.14-1
+BuildRequires: GConf2-devel >= 1.1.8
+BuildRequires: ORBit2-devel
+BuildRequires: bonobo-activation-devel >= 0.9.5
+BuildRequires: gtk+2-devel
+BuildRequires: intltool
+BuildRequires: libart_lgpl-devel
+BuildRequires: libbonobo-devel >= 1.113
+BuildRequires: libglade2-devel
+BuildRequires: libgnome-devel >= 1.113.0
+BuildRequires: libgnomecanvas-devel >= 1.113.0
+BuildRequires: libxml2-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
@@ -56,16 +39,6 @@ Summary:     Headers for libbonoboui
 Summary(pl):   Pliki nag³ówkowe libbonoboui
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}
-Requires:      libxml2-devel >= %{libxml2_version}
-Requires:      ORBit2-devel >= %{orbit2_version}
-Requires:      bonobo-activation-devel >= %{bonobo_activation_version}
-Requires:      libbonobo-devel >= %{libbonobo_version}
-Requires:      libgnomecanvas-devel >= %{libgnomecanvas_version}
-Requires:      libgnome-devel >= %{libgnome_version}
-Requires:      libart_lgpl-devel >= %{libart_lgpl_version}
-Requires:      gtk2-devel >= %{gtk2_version}
-Requires:      libglade2-devel >= %{libglade2_version}
-Conflicts:     bonobo-devel < 1.0.8
 
 %description devel
 Bonobo is a component system based on CORBA, used by the GNOME
@@ -83,7 +56,6 @@ Summary:      Static libbonoboui library
 Summary(pl):   Statyczna biblioteka libbonoboui
 Group:         X11/Development/Libraries
 Requires:      %{name}-devel = %{version}
-Conflicts:     bonobo-static < 1.0.8
 
 %description static
 This package contains static version of libbonoboui.
@@ -93,11 +65,13 @@ Ten pakiet zawiera statyczn
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # intltool 0.13 wants NDBM_File, which we don't include
-intltoolize --force --copy
-%configure
+#ntltoolize --force --copy
+%configure \
+       --enable-gtk-doc=no
 
 %{__make}
 
@@ -105,11 +79,12 @@ intltoolize --force --copy
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       pkgconfigdir=%{_pkgconfigdir}
 
 gzip -9nf AUTHORS ChangeLog NEWS README
 
-%find_lang %{name}
+%find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -121,17 +96,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc {AUTHORS,ChangeLog,NEWS,README}.gz
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%{_libdir}/libglade/2.0/*
-%{_libdir}/bonobo
-%{_datadir}/gnome-2.0
+%attr(755,root,root) %{_libdir}/libglade/2.0/*.??
+%{_libdir}/bonobo/servers/*
+#%{_datadir}/gnome-2.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/lib*.la
-%{_libdir}/pkgconfig/*
-%{_includedir}/*
+%{_pkgconfigdir}/*.pc
+%{_includedir}/libbonoboui-2.0
 
 %files static
 %defattr(644,root,root,755)