- merged from HEAD

Changed files:
    libbonoboui-desktop.patch -> 1.1.4.1
    libbonoboui.spec -> 1.80.4.1

diff --git a/libbonoboui-desktop.patch b/libbonoboui-desktop.patch
index ddd841cea37bad519be91b69915fae33396f61cb..7154646558cf066bb844d72ee8b0b207e5eb69a1 100644 (file)
--- a/libbonoboui-desktop.patch
+++ b/libbonoboui-desktop.patch
@@ -1,15 +1,12 @@
-diff -urN aa/libbonoboui-2.8.1/tools/browser/bonobo-browser.desktop.in libbonoboui-2.8.1/tools/browser/bonobo-browser.desktop.in
---- aa/libbonoboui-2.8.1/tools/browser/bonobo-browser.desktop.in       2004-09-24 01:21:46.000000000 +0200
-+++ libbonoboui-2.8.1/tools/browser/bonobo-browser.desktop.in  2005-02-05 17:24:46.820752208 +0100
-@@ -1,8 +1,9 @@
- [Desktop Entry]
-+Encoding=UTF-8
- _Name=Bonobo Component Browser
- _Comment=Shows available Bonobo components
+diff -aurN libbonoboui-2.14.0.orig/tools/browser/bonobo-browser.desktop.in libbonoboui-2.14.0/tools/browser/bonobo-browser.desktop.in
+--- libbonoboui-2.14.0.orig/tools/browser/bonobo-browser.desktop.in    2006-02-24 14:40:48.000000000 +0100
++++ libbonoboui-2.14.0/tools/browser/bonobo-browser.desktop.in 2006-03-14 23:12:40.403699536 +0100
+@@ -5,7 +5,7 @@
  Exec=bonobo-browser
--Terminal=0
-+Terminal=false
+ Terminal=false
  Type=Application
- Icon=
--Categories=Application;System;
-+Categories=System;
+-Categories=GNOME;GTK;Application;System;
++Categories=GNOME;GTK;System;
+ NoDisplay=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=bonobo

diff --git a/libbonoboui.spec b/libbonoboui.spec
index e6fd07d25c394f5e6bc474b86c6c1761ae31e7e2..e04878af7334645a2f0f1d23f469a6009ad47ed3 100644 (file)
--- a/libbonoboui.spec
+++ b/libbonoboui.spec
@@ -1,38 +1,34 @@
 #
 # Conditional build:
-%bcond_with    xlibs   # with xlibs
 %bcond_without static_libs     # don't build static library
 #
 Summary:       Bonobo user interface components
 Summary(pl):   Komponenty interfejsu u¿ytkownika do Bonobo
 Name:          libbonoboui
-Version:       2.10.1
+Version:       2.14.0
 Release:       1
 License:       LGPL
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
-# Source0-md5: 74c4b633ae33524e2f6d3e6573b75f3c
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: dc26dc17cddc625cac37ecfab263a51a
 Patch0:                %{name}-desktop.patch
 URL:           http://www.gnome.org/
-%{?with_xlibs:BuildRequires:   libX11-devel}
 BuildRequires: GConf2-devel >= 2.8.0.1
 BuildRequires: ORBit2-devel >= 2.12.0
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: howl-devel >= 0.9.10
 BuildRequires: gnome-common >= 2.8.0
-BuildRequires: gtk+2-devel >= 2:2.4.1
+BuildRequires: gtk+2-devel >= 2:2.6.0
 BuildRequires: gtk-doc >= 1.0
 BuildRequires: intltool >= 0.29
-BuildRequires: libbonobo-devel >= 2.10.1
+BuildRequires: libbonobo-devel >= 2.13.0
 BuildRequires: libglade2-devel >= 1:2.4.0
-BuildRequires: libgnome-devel >= 2.8.0
-BuildRequires: libgnomecanvas-devel >= 2.8.0
+BuildRequires: libgnome-devel >= 2.13.7
+BuildRequires: libgnomecanvas-devel >= 2.13.0
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.6.13
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.197
-%{?with_xlibs:BuildRequires:   sed >= 4.0}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -96,12 +92,6 @@ Ten pakiet zawiera statyczn
 %setup -q
 %patch0 -p1
 
-%if %{with xlibs}
-sed -ie \
-       's/AC_PATH_XTRA/PKG_CHECK_MODULES(X, [x11], [$x_no = no])/' \
-       configure.in
-%endif
-
 %build
 %{__libtoolize}
 %{__aclocal}