- allow building without GNOME (added nognome patch with autoconf fixes)

- gettext-related fixes for automake 1.6.x (no po directory in sources)
- moved gtkdoc files to standard location
- release 9

Changed files:
    libglade-nognome.patch -> 1.1
    libglade-use_AM_GNU_GETTEXT.patch -> 1.2
    libglade.spec -> 1.55

diff --git a/libglade-nognome.patch b/libglade-nognome.patch
new file mode 100644 (file)
index 0000000..87ee09c
--- /dev/null
+++ b/libglade-nognome.patch
@@ -0,0 +1,12 @@
+--- libglade-0.17/macros/gnome.m4.orig Thu Aug  3 00:26:45 2000
++++ libglade-0.17/macros/gnome.m4      Sat Aug  3 18:53:56 2002
+@@ -93,6 +93,9 @@
+               fi
+             fi
+             fi
++      else
++              AM_CONDITIONAL(HAVE_ORBIT, false)
++              AM_CONDITIONAL(HAVE_GNORBA, false)
+       fi
+ 
+       if test -n "$3"; then

diff --git a/libglade-use_AM_GNU_GETTEXT.patch b/libglade-use_AM_GNU_GETTEXT.patch
index d0dfc57c0bb80a699ea82bdcd23f5f50a65386a1..97c67233f01e04b8240b42e3f442826f057f5275 100644 (file)
--- a/libglade-use_AM_GNU_GETTEXT.patch
+++ b/libglade-use_AM_GNU_GETTEXT.patch
@@ -9,3 +9,22 @@
  
  AC_OUTPUT([Makefile
  libglade.spec
+@@ -97,6 +97,7 @@
+ libglade.spec
+ macros/Makefile
+ intl/Makefile
++po/Makefile.in
+ glade/Makefile
+ doc/Makefile
+ libglade-config
+--- libglade-0.17/Makefile.am.orig     Fri Sep  7 05:00:13 2001
++++ libglade-0.17/Makefile.am  Sat Aug  3 18:32:35 2002
+@@ -43,7 +43,7 @@
+ bin_SCRIPTS = libglade-config libglade-xgettext
+ noinst_PROGRAMS = test-libglade
+ test_libglade_LDADD = $(THE_LIBS) $(XML_LIBS)
+-SUBDIRS = intl macros glade doc
++SUBDIRS = intl po macros glade doc
+ 
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = libglade.m4

diff --git a/libglade.spec b/libglade.spec
index 1ff2f138a56ca0a44812753aec33d06a7d9fb652..1b74d9df0072fb72bd4ed272f9ea9baf379c7e35 100644 (file)
--- a/libglade.spec
+++ b/libglade.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+# _without_gnome       - without gnome/gnomedb/bonobo support
+#
 Summary:       libglade library
 Summary(es):   El libglade permite que usted cargue archivos del interfaz del glade
 Summary(pl):   Biblioteka do ³adowania definicji interfejsu generowanego programem glade
@@ -6,7 +10,7 @@ Summary(ru):   
 Summary(uk):   â¦Â̦ÏÔÅËÁ libglade ÄÌÑ ÚÁ×ÁÎÔÁÖÅÎÎÑ ¦ÎÔÅÒÆÅÊÓ¦× ËÏÒÉÓÔÕ×ÁÞÁ
 Name:          libglade
 Version:       0.17
-Release:       8
+Release:       9
 Epoch:         1
 License:       LGPL
 Group:         X11/Libraries
@@ -16,20 +20,23 @@ Patch1:             %{name}-gtkdoc-scanobj-nogtkinit.patch
 Patch2:                %{name}-clist-gettext.patch
 Patch3:                %{name}-fixquote.patch
 Patch4:                %{name}-gnomedb.patch
+Patch5:                %{name}-nognome.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
-BuildRequires: bonobo-devel >= 0.28
+%{!?_without_gnome:BuildRequires:      bonobo-devel >= 0.28}
 BuildRequires: gettext-devel
-BuildRequires: gnome-db-devel >= 0.2.96
-BuildRequires: gnome-libs-devel
+%{!?_without_gnome:BuildRequires:      gnome-db-devel >= 0.2.96}
+%{!?_without_gnome:BuildRequires:      gnome-libs-devel}
 BuildRequires: gtk+-devel >= 1.2.0
+BuildRequires: gtk-doc
 BuildRequires: libtool
 BuildRequires: libxml-devel >= 1.7.2
 URL:           http://www.gnome.org/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
+%define                _gtkdocdir      %{_defaultdocdir}/gtk-doc/html
 
 %description
 The libglade library allows you to load user interfaces which are
@@ -78,9 +85,10 @@ Summary(ru): 
 Summary(uk):   æÁÊÌÉ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ libglade
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}
-Requires:      bonobo-devel
-Requires:      gnome-db-devel
-Requires:      gnome-libs-devel
+%{!?_without_gnome:Requires:   bonobo-devel}
+%{!?_without_gnome:Requires:   gnome-db-devel}
+%{!?_without_gnome:Requires:   gnome-libs-devel}
+Requires:      gtk-doc-common
 Requires:      libxml-devel
 
 %description devel
@@ -145,17 +153,19 @@ interface glade.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 rm -f missing
 %{__libtoolize}
 %{__gettextize}
+touch po/POTFILES.in
 aclocal -I macros
 %{__autoconf}
 %{__automake}
 %configure \
-       --enable-bonobo \
-       --enable-gnomedb
+       %{!?_without_gnome:--enable-bonobo --enable-gnomedb} \
+       %{?_without_gnome:--without-gnome}
 %{__make}
 
 %install
@@ -165,7 +175,8 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        m4datadir=%{_aclocaldir} \
-       pkgconfigdir=%{_pkgconfigdir}
+       pkgconfigdir=%{_pkgconfigdir} \
+       HTML_DIR=%{_gtkdocdir}
 
 install test-libglade.c *.glade $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -182,9 +193,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%docdir %{_datadir}/gnome/html/libglade
-%doc %{_datadir}/gnome/html/libglade/*
-%doc %{_examplesdir}/%{name}-%{version}
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/libgladeConf.sh
 %attr(755,root,root) %{_libdir}/lib*.so
@@ -192,6 +200,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/*
 %{_includedir}/libglade-1.0
 %{_aclocaldir}/*
+%{_gtkdocdir}/*
+%{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)