From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 11 Mar 2003 03:20:15 +0300 From: Mikhail Zabaluev To: devel@altlinux.ru, aris@altlinux.ru Message-ID: <20030311002015.GB2107@mhz.mikhail.zabaluev.name> Mail-Followup-To: Mikhail Zabaluev , devel@altlinux.ru, aris@altlinux.ru References: <20030310155940.GK26812@master.altlinux.ru> <20030310225153.GA2107@mhz.mikhail.zabaluev.name> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="bAmEntskrkuBymla" Content-Disposition: inline In-Reply-To: <20030310225153.GA2107@mhz.mikhail.zabaluev.name> User-Agent: Mutt/1.4i Subject: [devel] Patch: libglade2 (was Re: =?koi8-r?B?+sHX?= =?koi8-r?B?ydPJzc/T1MkgzsEg08vSydDUz9fZxSDR2tnLySDXIM3Jzskt08nT1MXNxSk=?= Sender: devel-admin@altlinux.ru Errors-To: devel-admin@altlinux.ru X-BeenThere: devel@altlinux.ru X-Mailman-Version: 2.0.9 Precedence: bulk Reply-To: devel@altlinux.ru List-Unsubscribe: , List-Id: List-Post: List-Help: List-Subscribe: , List-Archive: Archived-At: List-Archive: List-Post: --bAmEntskrkuBymla Content-Type: multipart/mixed; boundary="jho1yZJdad60DJr+" Content-Disposition: inline Content-Transfer-Encoding: 8bit --jho1yZJdad60DJr+ Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: 8bit 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 --jho1yZJdad60DJr+ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="libglade2.spec.patch" --- 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 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 2.0.1-alt2 - rebuild with new pango, gtk+ - post/postun scripts fixed. --jho1yZJdad60DJr+-- --bAmEntskrkuBymla Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQE+bSu/TKqCuNPJlLgRAvCCAJ9QAYB7OhXgqgAU9EueLS1GMXV2+wCfWtdE wIwzlYlvsWYBFgEaK6FB1Zw= =stf4 -----END PGP SIGNATURE----- --bAmEntskrkuBymla--