Hello community, here is the log from the commit of package gtkhtml for openSUSE:Factory checked in at Fri Oct 7 10:30:33 CEST 2011.
-------- --- openSUSE:Factory/gtkhtml/gtkhtml.changes 2011-10-02 10:11:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/gtkhtml/gtkhtml.changes 2011-10-06 17:43:56.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Oct 6 15:43:28 UTC 2011 - [email protected] + +- Add iso-codes Recommends to libgtkhtml-editor-4_0-0 since the + iso-codes data is used at runtime (but gtkhtml can survive + without it). + +------------------------------------------------------------------- +Wed Oct 5 12:49:20 UTC 2011 - [email protected] + +- Build and package the glade catalog (bnc#689575): + + Manually ship gtkhtml-editor.xml as a source, since it's + missing from the tarball. + + Add pkgconfig(gladeui-2.0) BuildRequires. + + Pass --with-glade-catalog to configure. + + Create glade-catalog-gtkhtml subpackage. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gtkhtml-editor.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkhtml.spec ++++++ --- /var/tmp/diff_new_pack.iShhDX/_old 2011-10-07 10:30:30.000000000 +0200 +++ /var/tmp/diff_new_pack.iShhDX/_new 2011-10-07 10:30:30.000000000 +0200 @@ -31,6 +31,8 @@ Url: http://www.gnome.org Group: System/Libraries Source: http://download.gnome.org/sources/gtkhtml/4.2/%{name}-%{version}.tar.bz2 +# File is missing from tarballs, see bgo#660983 +Source1: gtkhtml-editor.xml BuildRequires: enchant-devel BuildRequires: fdupes BuildRequires: glib2-devel @@ -39,6 +41,7 @@ BuildRequires: intltool BuildRequires: iso-codes-devel BuildRequires: libsoup-devel +BuildRequires: pkgconfig(gladeui-2.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) Requires: gsettings-desktop-schemas BuildRequires: translation-update-upstream @@ -50,7 +53,6 @@ being developed independently. %package -n libgtkhtml-%{_gtkhtml_api}-%{_gtkhtml_major} - License: GPLv2+ ; LGPLv2.1+ Summary: Lightweight HTML rendering/printing/editing engine Group: System/Libraries @@ -68,16 +70,32 @@ being developed independently. %package -n libgtkhtml-editor-%{_gtkhtml_editor_api}-%{_gtkhtml_editor_major} - License: GPLv2+ ; LGPLv2.1+ Summary: Lightweight HTML rendering/printing/editing engine Group: System/Libraries +Recommends: iso-codes %description -n libgtkhtml-editor-%{_gtkhtml_editor_api}-%{_gtkhtml_editor_major} GtkHTML is a lightweight HTML rendering/printing/editing engine. It was originally based on KHTMLW, part of the KDE project, but is now being developed independently. +%package -n glade-catalog-gtkhtml +License: GPLv2+ ; LGPLv2.1+ +Summary: Lightweight HTML rendering/printing/editing engine -- Catalog for Glade +Group: Development/Tools/GUI Builders +Requires: libgtkhtml-editor-%{_gtkhtml_editor_api}-%{_gtkhtml_editor_major} = %{version} +Requires: glade +Supplements: packageand(glade:%{name}-devel) + +%description -n glade-catalog-gtkhtml +GtkHTML is a lightweight HTML rendering/printing/editing engine. It +was originally based on KHTMLW, part of the KDE project, but is now +being developed independently. + +This package provides a catalog for Glade, to allow the use of GtkHTML +widgets in Glade. + %package devel License: GPLv2+ ; LGPLv2.1+ Summary: Lightweight HTML rendering/printing/editing engine -- Development Files @@ -99,10 +117,14 @@ %prep %setup -q translation-update-upstream +# File is missing from tarballs, see bgo#660983 +test ! -f components/editor/gtkhtml-editor.xml +cp %{SOURCE1} components/editor/gtkhtml-editor.xml %build %{configure} \ --disable-static \ + --with-glade-catalog \ --disable-deprecated-warning-flags %{__make} %{?jobs:-j%jobs} @@ -111,8 +133,7 @@ %if 0%{suse_version} <= 1120 %{__rm} -rf %{buildroot}%{_datadir}/locale/en@shaw %endif -# Remove the libtool archive files -%{__rm} %{buildroot}%{_libdir}/*.la +find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %find_lang %{name}-%{_gtkhtml_version} %fdupes %{buildroot} @@ -139,6 +160,11 @@ %files -n %{name}-%{_gtkhtml_api}-lang -f %{name}-%{_gtkhtml_version}.lang +%files -n glade-catalog-gtkhtml +%defattr(-,root,root) +%{_libdir}/glade/modules/libglade-gtkhtml-editor.so +%{_datadir}/glade/catalogs/gtkhtml-editor.xml + %files devel %defattr(-, root, root) %{_bindir}/gtkhtml-editor-test ++++++ gtkhtml-editor.xml ++++++ <glade-catalog name="gtkhtml-editor" library="glade-gtkhtml-editor" depends="gtk+"> <glade-widget-classes> <glade-widget-class name="GtkhtmlColorCombo" generic-name="color-combo" title="Color Combo Box"> <properties> <property id="color"/> <property id="popup-shown"/> </properties> </glade-widget-class> <glade-widget-class name="GtkhtmlColorSwatch" generic-name="color-swatch" title="Color Swatch"> <properties> <property id="color"/> </properties> </glade-widget-class> <glade-widget-class name="GtkhtmlComboBox" generic-name="combo-box" title="Radio Action Combo Box"> <properties> <property id="action"/> </properties> </glade-widget-class> </glade-widget-classes> <glade-widget-group name="widgets" title="GtkHTML Editor"> <glade-widget-class-ref name="GtkhtmlColorCombo"/> <glade-widget-class-ref name="GtkhtmlColorSwatch"/> <glade-widget-class-ref name="GtkhtmlComboBox"/> </glade-widget-group> </glade-catalog> continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
