[devel] Patch: libglade2 (was Re: Зависимости на скриптовые языки в мини-системе)

Вт Мар 11 03:20:15 MSK 2003

Hello devel,

On Tue, Mar 11, 2003 at 01:51:53AM +0300, Mikhail Zabaluev wrote:
>
> Hello rider,
> 
> On Mon, Mar 10, 2003 at 06:59:40PM +0300, rider на altlinux.com wrote:
> >
> > Также не удалось уйти от зависимости на python, который вытаскивается
> > kudzu напрямую и sinaptic'ом через libglade.
> 
> Я не вижу, где пакету libglade2 может понадобиться python
> -- там одна библиотека, которая никак не связывается с python.
> По моим ощущениям, xml-utils там тоже не нужны: наличие
> файла с DTD вовсе не означает, что библиотека им пользуется.
> Лучше вынести её в libglade2-dtd.

Разобрался, разнёс сторонние для библиотеки зависимости
по пакетам libglade2-{convert,dtd}

Патч spec'а прилагается.

-- 
Stay tuned,
  MhZ                                     JID: mhz на altlinux.org
___________
Be valiant, but not too venturous.
Let thy attire be comely, but not costly.
		-- John Lyly
----------- следующая часть -----------

--- 2.0.1-alt2/libglade.spec	2002-10-06 17:20:48 +0400
+++ libglade2.spec	2003-03-11 03:18:07 +0300
@@ -1,15 +1,13 @@
-%define _name libglade
-
 Name: libglade2
 Version: 2.0.1
-Release: alt2
+Release: alt2.1mhz1
 
-Summary: libglade library
+Summary: The libglade library for loading user interfaces
 License: LGPL
 Group: System/Libraries
-Url: http://www.gnome.org
+URL: http://www.daa.com.au/~james/software/libglade/
 
-Source: %_name-%version.tar.bz2
+Source: libglade-%version.tar.bz2
 
 %define gtk2_ver 2.1.0
 %define pango_ver 1.1.1
@@ -18,21 +16,17 @@
 %define pkgconfig_ver 0.8
 %define python_ver 2.0
 
-PreReq: xml-utils
-
 Requires: libgtk+2 >= %gtk2_ver
-Requires: python >= %python_ver
 Requires: libxml2 >= %libxml2_ver
 Requires: libatk >= %atk_ver
 
 BuildPreReq: libgtk+2-devel >= %gtk2_ver
-BuildPreReq: python >= 2.0
 BuildPreReq: libxml2-devel >= %libxml2_ver
 BuildPreReq: libpango-devel >= %pango_ver
 BuildPreReq: pkgconfig >= %pkgconfig_ver
 
-# Automatically added by buildreq on Sun Oct 06 2002
-BuildRequires: PyXML XFree86-libs Xft-devel docbook-dtds docbook-style-dsssl fontconfig freetype2-devel glib2-devel glibc-devel-static gtk-doc libatk-devel libexpat libgtk+2-devel libpango-devel libxml2-devel openjade pkgconfig python sgml-common tkinter zlib-devel
+# Automatically added by buildreq on Tue Mar 11 2003
+BuildRequires: PyXML XFree86-libs docbook-dtds docbook-style-dsssl fontconfig freetype2 glib2-devel gtk-doc libXft libatk-devel libexpat libgtk+2-devel libpango-devel libxml2-devel openjade pkgconfig python sgml-common zlib-devel
 
 %description
 This library allows you to load user interfaces in your program, which are
@@ -42,30 +36,50 @@
 The interfaces can also be edited with GLADE.
 
 %package devel
-Summary: Libraries, includes, etc to develop libglade applications
+Summary: Libraries, includes, etc to develop applications using libglade.
 Group: Development/GNOME and GTK+
 Requires: %name = %version-%release 
-Requires: libgtk+2-devel >= %gtk2_ver libatk-devel >= %atk_ver
-Requires: libxml2-devel >= %libxml2_ver libpango-devel >= %pango_ver
-Requires: pkgconfig >= %pkgconfig_ver
 
 %description devel
-Libraries, include files, etc you can use to develop libglade applications.
+Libraries, include files, etc you can use
+to build applications using libglade, a library
+for loading user interfaces at runtime.
 
 %package devel-static
-Summary: Libraries, includes, etc to develop libglade applications
+Summary: Static libraries of libglade
 Group: Development/GNOME and GTK+
-Requires: libgtk+2-devel libxml2-devel %name-devel = %version-%release
+Requires: %name-devel = %version-%release
 
 %description devel-static
-Libraries, include files, etc you can use to develop libglade applications.
+Static libraries you can use to build applications using libglade.
+
+%package convert
+Summary: Convertor for libglade file formats
+Group: Development/GNOME and GTK+
+Requires: python >= %python_ver
+Requires: PyXML
+
+%description convert
+This package contains libglade-convert, a Python script to convert
+legacy libglade description files to version 2.0 of the file format.
+
+%package dtd
+Summary: DTD for libglade file format version 2.0
+Group: Development/GNOME and GTK+
+Requires: xml-common
+Requires(post): xml-utils
+Requires(postun): xml-utils
+
+%description dtd
+The XML DTD for libglade description file format,
+accepted by version 2.0 and later of the libglade library.
 
 %define xmlbase %_datadir/xml
 %define xmlconfdir %_sysconfdir/xml
 %define xmlcatalog %xmlconfdir/catalog
 
 %prep
-%setup -n %_name-%version
+%setup -q -n libglade-%version
 
 %build
 %configure --enable-gtk-doc
@@ -76,29 +90,31 @@
 
 %post
 %post_ldconfig
-%_bindir/xmlcatalog --noout --add "system" \
-    "http://glade.gnome.org/glade-2.0.dtd" \
-    %_datadir/xml/%_name/glade-2.0.dtd %xmlcatalog ||:
 
 %postun
 %postun_ldconfig
-%_bindir/xmlcatalog --noout --del \
-    "%_datadir/xml/%_name/glade-2.0.dtd" %xmlcatalog ||:
+
+%post dtd
+%_bindir/xmlcatalog --noout --add "system" \
+    "http://glade.gnome.org/glade-2.0.dtd" \
+    %_datadir/xml/libglade/glade-2.0.dtd %xmlcatalog ||:
+
+%postun dtd
+if [ $1 = 0 ]; then
+    %_bindir/xmlcatalog --noout --del \
+	"%_datadir/xml/libglade/glade-2.0.dtd" %xmlcatalog ||:
+fi
 
 %files
 %doc AUTHORS ChangeLog NEWS README
 %_libdir/lib*.so.*
-#%_libdir/%_name/2.0/*
-%dir %_datadir/xml/%_name
-%_datadir/xml/%_name/glade-2.0.dtd
+#%_libdir/libglade/2.0/*
 
 %files devel
-%_bindir/*
 %_libdir/lib*.so
 %_libdir/lib*.la
 %_includedir/*
 %_libdir/pkgconfig/*
-
 %doc test-libglade.c
 %doc examples/*.glade
 %doc %_datadir/gtk-doc/html/*
@@ -106,7 +122,19 @@
 %files devel-static
 %_libdir/*.a
 
+%files convert
+%_bindir/libglade-convert
+
+%files dtd
+%_datadir/xml/libglade
+
 %changelog
+* Tue Mar 11 2003 Mikhail Zabaluev <mhz на altlinux.ru> 2.0.1-alt2.1mhz1
+- removed overly rigid dependencies
+- convert and dtd subpackages
+- enhanced summaries and dependencies
+- corrected URL
+
 * Sun Oct 06 2002 Yuri N. Sedunov <aris на altlinux.ru> 2.0.1-alt2
 - rebuild with new pango, gtk+
 - post/postun scripts fixed.
----------- следующая часть -----------
Было удалено вложение не в текстовом формате...
Имя     : =?iso-8859-1?q?=CF=D4=D3=D5=D4=D3=D4=D7=D5=C5=D4?=
Тип     : application/pgp-signature
Размер  : 189 байтов
Описание: =?iso-8859-1?q?=CF=D4=D3=D5=D4=D3=D4=D7=D5=C5=D4?=
Url     : <http://lists.altlinux.org/pipermail/devel/attachments/20030311/053aa7cb/attachment-0001.bin>
