Author: paladine                     Date: Thu Mar 10 11:03:24 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL and updated to 3.6.0

---- Files affected:
SPECS:
   gtkhtml.spec (1.124 -> 1.125) 

---- Diffs:

================================================================
Index: SPECS/gtkhtml.spec
diff -u SPECS/gtkhtml.spec:1.124 SPECS/gtkhtml.spec:1.125
--- SPECS/gtkhtml.spec:1.124    Tue Mar  1 12:08:16 2005
+++ SPECS/gtkhtml.spec  Thu Mar 10 12:03:19 2005
@@ -6,30 +6,34 @@
 Summary(uk):   GtkHTML - ĂĹ ÂŚÂĚŚĎÔĹËÁ ŇĹÎÄĹŇÉÎÇŐ/ŇĹÄÁÇŐ×ÁÎÎŃ HTML
 Summary(zh_CN):        gtkhtml żâ
 Name:          gtkhtml
-Version:       3.2.5
+Version:       3.6.0
 Release:       1
 License:       LGPL
 Group:         X11/Libraries
-Source0:       
http://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.2/%{name}-%{version}.tar.bz2
-# Source0-md5: 86e1ce32fed536bce5b2d6e8d41b0c65
+Source0:       
http://ftp.gnome.org/pub/gnome/sources/gtkhtml/3.6/%{name}-%{version}.tar.bz2
+# Source0-md5: a53378f57544ef2e2e7b40616dc237a1
 Patch0:                %{name}-pixmap.patch
 Patch1:                %{name}-gtkhtml-stream.h.patch
 Patch2:                %{name}-link.patch
-BuildRequires: ORBit2-devel >= 1:2.10.3
+Patch3:                %{name}-crash.patch
+BuildRequires: ORBit2-devel >= 1:2.12.1
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gail-devel >= 1.6.6
-BuildRequires: gal-devel >= 1:2.2.5
+BuildRequires: gail-devel >= 1.8.0
+BuildRequires: gal-devel >= 1:2.4.0
 BuildRequires: gnome-common >= 2.8.0
-BuildRequires: intltool >= 0.31.3
-BuildRequires: libbonoboui-devel >= 2.6.1
-BuildRequires: libglade2-devel >= 1:2.4.0
-BuildRequires: libgnomeprintui-devel >= 2.6.1
-BuildRequires: libgnomeui-devel >= 2.6.1
-BuildRequires: libsoup-devel >= 2.2.0
+BuildRequires: gnome-icon-theme >= 2.10.0
+BuildRequires: gtk+2-devel >= 2:2.6.2
+BuildRequires: intltool >= 0.30
+BuildRequires: libglade2-devel >= 1:2.5.0
+BuildRequires: libgnomeprintui-devel >= 2.10.0
+BuildRequires: libgnomeui-devel >= 2.10.0
+BuildRequires: libsoup-devel >= 2.2.2
 BuildRequires: libtool
 BuildRequires: pkgconfig
-Requires:      gal >= 1:2.2.5
+Requires:      gal >= 1:2.3.5
+Requires:      gnome-icon-theme >= 2.10.0
+Requires:      gtk+2 >= 2:2.6.2
 Obsoletes:     libgtkhtml20
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,11 +71,10 @@
 Summary(zh_CN):        gtkhtmlżŞˇ˘żâ
 Group:         X11/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      gail-devel >= 1.6.6
-Requires:      gal-devel >= 1:2.2.5
-Requires:      libbonobo-devel >= 2.6.0
-Requires:      libgnomeprintui-devel >= 2.6.1
-Requires:      libgnomeui-devel >= 2.6.1
+Requires:      gail-devel >= 1.8.0
+Requires:      gal-devel >= 1:2.4.0
+Requires:      libgnomeprintui-devel >= 2.10.0
+Requires:      libgnomeui-devel >= 2.10.0
 Obsoletes:     libgtkhtml20-devel
 
 %description devel
@@ -122,6 +125,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 glib-gettextize --copy --force
@@ -134,7 +138,6 @@
 %configure \
        --with-bonobo \
        --with-gconf
-
 %{__make} \
        idldir=%{_datadir}/idl \
        pkgconfigdir=%{_pkgconfigdir}
@@ -167,8 +170,7 @@
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/*.so
 %{_libdir}/bonobo/servers/*
-
-%{_datadir}/%{name}-*
+%{_datadir}/%{name}-3.6
 %{_pixmapsdir}/*
 
 %files devel
@@ -189,6 +191,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.125  2005/03/10 11:03:19  paladine
+- merged from DEVEL and updated to 3.6.0
+
 Revision 1.124  2005/03/01 11:08:16  paladine
 - gtkhtml 3.5.x is for GNOME 2.9.x
 
@@ -226,6 +231,33 @@
 
 Revision 1.114  2004/08/15 10:25:42  aflinta
 - up to version 3.1.20
+
+Revision 1.113.2.7  2005/03/01 11:37:54  paladine
+- updated to 3.5.7
+- missing BR: pkgconfig
+
+Revision 1.113.2.6  2005/02/07 21:06:19  grzegol
+- updated to 3.5.6
+
+Revision 1.113.2.5  2004/09/17 13:31:06  grzegol
+- updated to 3.3.2
+
+Revision 1.113.2.4  2004/09/15 18:24:37  grzegol
+- in gnome-common-2.8.0 all macros are in %%{_aclocaldir}, not in
+  %%{_aclocaldir}/gnome2-macros, so remove -I %%{_aclocal}/gnome2-macros from
+  %%{__aclocal} args and BR: gnome-common >= 2.8.0
+
+Revision 1.113.2.3  2004/09/06 22:48:24  grzegol
+- added crash patch (fix possible crash)
+- rel. 2
+
+Revision 1.113.2.2  2004/09/02 20:50:33  grzegol
+- updated to 3.3.1
+- removed outdated locale-names patch
+- remove no locale in %%install
+
+Revision 1.113.2.1  2004/08/04 17:33:51  grzegol
+- updated to 3.3.0
 
 Revision 1.113  2004/08/03 12:44:43  grzegol
 - updated to 3.1.19
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gtkhtml.spec?r1=1.124&r2=1.125&f=u


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

Reply via email to