diff --git a/.cvsignore b/.cvsignore index 2b2556e..5b7ad12 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libglade-1.99.5.90.tar.gz +libglade-1.99.9.tar.gz diff --git a/libglade2.spec b/libglade2.spec index 59159c7..b1df7f8 100644 --- a/libglade2.spec +++ b/libglade2.spec @@ -1,11 +1,11 @@ %define __libtoolize : %define libxml2_version 2.4.12-0.7 -%define gtk2_version 1.3.12.90 +%define gtk2_version 2.0 Summary: The libglade library for loading user interfaces. Name: libglade2 -Version: 1.99.5.90 +Version: 1.99.9 Release: 1 Copyright: LGPL Group: System Environment/Libraries @@ -14,11 +14,13 @@ Source2: fixed-ltmain.sh URL: http://www.gnome.org BuildRoot: /var/tmp/%{name}-%{version}-root -## Patch: libglade-1.99.2.90-nogtkdoc.patch +Patch: libglade-1.99.2.90-nogtkdoc.patch Requires: libxml2 >= %{libxml2_version} BuildRequires: libxml2-devel >= %{libxml2_version} BuildRequires: gtk2-devel >= %{gtk2_version} +BuildRequires: automake +BuildRequires: autoconf252 %description Libglade is a small library that allows a program to load its user @@ -46,15 +48,24 @@ that you can use to develop libglade applications. %prep %setup -q -n libglade-%{version} -## %patch -p1 -b .nogtkdoc -## autoconf +%patch -p1 -b .nogtkdoc + +## if we add a --disable-gtk-doc upstream or fix the need-an-x-display problem +## we can get rid of this. remove automake build requires too +libtoolize --copy --force +autoheader-2.52 +aclocal +automake +autoconf-2.52 %build + rm ltmain.sh && cp %{SOURCE2} ltmain.sh -%configure +%configure --disable-gtk-doc make %{?_smp_mflags} %install + rm -rf $RPM_BUILD_ROOT %makeinstall @@ -63,7 +74,6 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README COPYING @@ -80,6 +90,28 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Mon Mar 11 2002 Alex Larsson +- Update to 1.99.9 + +* Mon Feb 25 2002 Alex Larsson +- Bump for rebuild + +* Thu Feb 21 2002 Alex Larsson +- Bump for rebuild + +* Tue Feb 19 2002 Alex Larsson +- Add horrible buildroot check hacks. Require new Gtk+. + +* Thu Feb 14 2002 Havoc Pennington +- rebuild for new gtk + +* Wed Jan 30 2002 Owen Taylor +- Rebuild against new GTK+ + +* Tue Jan 22 2002 Havoc Pennington +- put "nogtkdoc" patch back, it avoids X display requirement +- automake14 + * Wed Jan 2 2002 Havoc Pennington - 1.99.5.90 snap - comment out "nogtkdoc" patch, don't run autoconf diff --git a/sources b/sources index 9985411..8efa905 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df2d5da439861ad4273958b09eb7a4ec libglade-1.99.5.90.tar.gz +d07c8a66ef971d0753b4670676e1e7ab libglade-1.99.9.tar.gz