Author: freetz                       Date: Sat Apr  1 20:54:46 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   libbonoboui.spec (1.80 -> 1.81) , libgnomecanvas.spec (1.69 -> 1.70) , 
libgnomeui.spec (1.82 -> 1.83) 

---- Diffs:

================================================================
Index: SPECS/libbonoboui.spec
diff -u SPECS/libbonoboui.spec:1.80 SPECS/libbonoboui.spec:1.81
--- SPECS/libbonoboui.spec:1.80 Sun Aug 21 13:14:16 2005
+++ SPECS/libbonoboui.spec      Sat Apr  1 22:54:40 2006
@@ -1,39 +1,35 @@
 # $Revision$, $Date$
 #
 # 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
@@ -97,12 +93,6 @@
 %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}
@@ -170,6 +160,21 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2006/04/01 20:54:40  freetz
+- merged from DEVEL
+
+Revision 1.80.2.4  2006/03/14 22:21:08  freetz
+- 2.14.0
+
+Revision 1.80.2.3  2006/02/21 12:04:18  wiget
+- force newer libgnomecanvas (2.13.0)
+
+Revision 1.80.2.2  2006/02/19 20:25:31  freetz
+- updated BR, dropped xlibs support
+
+Revision 1.80.2.1  2006/01/18 22:50:52  freetz
+- 2.13.1, disable howl for now
+
 Revision 1.80  2005/08/21 11:14:16  aflinta
 - version 2.10.1
 

================================================================
Index: SPECS/libgnomecanvas.spec
diff -u SPECS/libgnomecanvas.spec:1.69 SPECS/libgnomecanvas.spec:1.70
--- SPECS/libgnomecanvas.spec:1.69      Sat Feb 25 18:16:45 2006
+++ SPECS/libgnomecanvas.spec   Sat Apr  1 22:54:40 2006
@@ -1,17 +1,18 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without apidocs # disable gtk-doc
+%bcond_without apidocs         # disable gtk-doc
 #
+# $Revision$, $Date$
 Summary:       GnomeCanvas widget
 Summary(pl):   Widget GnomeCanvas
 Name:          libgnomecanvas
-Version:       2.12.0
+Version:       2.14.0
 Release:       1
 License:       LGPL
 Group:         X11/Libraries
-Source0:       
http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: 62c0edd3d27803d341662fd9088b2d9b
+Source0:       
http://ftp.gnome.org/pub/gnome/sources/libgnomecanvas/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 516c46fb4a1401b05cfef58c350fbd3d
 URL:           http://www.gnome.org/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake
@@ -122,6 +123,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.70  2006/04/01 20:54:40  freetz
+- merged from DEVEL
+
+Revision 1.67.2.2  2006/03/13 13:51:15  freetz
+- 2.14.0
+
+Revision 1.67.2.1  2006/01/18 22:42:19  freetz
+- 2.13.0
+
 Revision 1.69  2006/02/25 17:16:45  qboosh
 - unified
 

================================================================
Index: SPECS/libgnomeui.spec
diff -u SPECS/libgnomeui.spec:1.82 SPECS/libgnomeui.spec:1.83
--- SPECS/libgnomeui.spec:1.82  Wed Feb  8 16:20:37 2006
+++ SPECS/libgnomeui.spec       Sat Apr  1 22:54:40 2006
@@ -2,13 +2,12 @@
 Summary:       GNOME base GUI library
 Summary(pl):   Podstawowa biblioteka GUI GNOME
 Name:          libgnomeui
-Version:       2.12.1
-Release:       1
+Version:       2.14.0
+Release:       2
 License:       LGPL
 Group:         Libraries
-Source0:       
http://ftp.gnome.org/pub/gnome/sources/libgnomeui/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: 97ee22e36d6fb8c4a57796da4110145e
-Patch0:                %{name}-threads.patch
+Source0:       
http://ftp.gnome.org/pub/gnome/sources/libgnomeui/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 9bf9a8696c3eba9477eeeed29297e801
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.12.0
 BuildRequires: audiofile-devel >= 1:0.2.3
@@ -20,9 +19,9 @@
 BuildRequires: gnome-vfs2-devel >= 2.12.0
 BuildRequires: gtk-doc >= 1.3
 BuildRequires: gtk+2-devel >= 2:2.8.3
-BuildRequires: libbonoboui-devel >= 2.10.1
+BuildRequires: libbonoboui-devel >= 2.13.1
 BuildRequires: libglade2-devel >= 1:2.5.0
-BuildRequires: libgnome-devel >= 2.12.0
+BuildRequires: libgnome-devel >= 2.14.0
 BuildRequires: libgnomecanvas-devel >= 2.12.0
 BuildRequires: libjpeg-devel
 BuildRequires: libtool
@@ -92,7 +91,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %{__libtoolize}
@@ -157,6 +155,26 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2006/04/01 20:54:40  freetz
+- merged from DEVEL
+
+Revision 1.81.2.6  2006/03/20 19:30:11  freetz
+- rel.2
+
+Revision 1.81.2.5  2006/03/13 13:59:43  freetz
+- 2.14.0, depend on libgnome 2.14.0
+
+Revision 1.81.2.4  2006/02/28 08:41:19  freetz
+- 2.13.90
+
+Revision 1.81.2.3  2006/01/31 00:24:31  patrys
+- proper R: on libbonoboui
+
+Revision 1.81.2.2  2006/01/26 15:55:12  freetz
+- 2.13.3
+
+Revision 1.81.2.1  2006/01/18 22:59:37  freetz
+- 2.13.2, they included threads patch after 2 years! ;-)
 Revision 1.82  2006/02/08 15:20:37  freetz
 - 2.12.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libbonoboui.spec?r1=1.80&r2=1.81&f=u
    http://cvs.pld-linux.org/SPECS/libgnomecanvas.spec?r1=1.69&r2=1.70&f=u
    http://cvs.pld-linux.org/SPECS/libgnomeui.spec?r1=1.82&r2=1.83&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to