[packages/libglade] Rel 24

[arekm]

commit f3b591ecca167dd2f964c3f56d2878d490b0f054
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Mar 15 01:56:20 2026 +0100

    Rel 24

 libglade-gtkdoc-scanobj-nogtkinit.patch | 11 ++++++-----
 libglade-use_AM_GNU_GETTEXT.patch       | 23 +++++++++++++++--------
 libglade.spec                           | 12 ++++++------
 3 files changed, 27 insertions(+), 19 deletions(-)
---
diff --git a/libglade.spec b/libglade.spec
index e3f7585..3d9a4d9 100644
--- a/libglade.spec
+++ b/libglade.spec
@@ -19,7 +19,7 @@ Summary(ru.UTF-8):	Библиотека libglade для загрузки инт
 Summary(uk.UTF-8):	Бібліотека libglade для завантаження інтерфейсів користувача
 Name:		libglade
 Version:	0.17
-Release:	23
+Release:	24
 Epoch:		1
 License:	LGPL v2+
 Group:		X11/Libraries
@@ -41,7 +41,6 @@ BuildRequires:	gettext-tools >= 0.11.5
 %{?with_gnomedb:BuildRequires:	gnome-db-devel >= 0.2.96}
 %{?with_gnome:BuildRequires:	gnome-libs-devel}
 BuildRequires:	gtk+-devel >= 1.2.0
-BuildRequires:	gtk-doc
 BuildRequires:	libtool
 BuildRequires:	libxml-devel >= 1.7.2
 BuildRequires:	pkgconfig
@@ -96,7 +95,6 @@ Summary(ru.UTF-8):	Файлы для разработки программ с и
 Summary(uk.UTF-8):	Файли для розробки програм з використанням libglade
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	gtk-doc-common
 Requires:	libxml-devel
 
 %description devel
@@ -281,11 +279,13 @@ Statyczna wersja biblioteki libglade-bonobo.
 %patch -P5 -p1
 %patch -P6 -p1
 
+%{__sed} -i '1s,#!/usr/bin/env python,#!/usr/bin/python2,' libglade-xgettext
+
 %build
 %{__libtoolize}
 %{__gettextize}
 touch po/POTFILES.in
-%{__aclocal} -I macros
+%{__aclocal} -I macros -I m4
 %{__autoconf}
 %{__automake}
 %configure \
@@ -307,7 +307,7 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 install test-libglade.c *.glade $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-mv -f $RPM_BUILD_ROOT%{_gtkdocdir}/{libglade,libglade1}
+%{!?with_gnome:rm -f $RPM_BUILD_ROOT%{_libdir}/libgladeConf.sh}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -328,6 +328,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/libglade.so.*.*
+%attr(755,root,root) %{_libdir}/libglade.so.0
 
 %files devel
 %defattr(644,root,root,755)
@@ -339,7 +340,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/libglade.pc
 %{_includedir}/libglade-1.0
 %{_aclocaldir}/*
-%{_gtkdocdir}/*
 %{_examplesdir}/%{name}-%{version}
 
 %files static
diff --git a/libglade-gtkdoc-scanobj-nogtkinit.patch b/libglade-gtkdoc-scanobj-nogtkinit.patch
index 5cc3ab4..383fa2a 100644
--- a/libglade-gtkdoc-scanobj-nogtkinit.patch
+++ b/libglade-gtkdoc-scanobj-nogtkinit.patch
@@ -1,10 +1,11 @@
---- libglade-0.17/doc/Makefile.am~	Fri Sep  7 05:13:48 2001
-+++ libglade-0.17/doc/Makefile.am	Tue Oct  2 02:14:18 2001
-@@ -42,6 +42,7 @@
+--- libglade-0.17/doc/Makefile.am~	2026-03-15 01:46:28.893105268 +0100
++++ libglade-0.17/doc/Makefile.am	2026-03-15 01:46:28.894815452 +0100
+@@ -41,7 +41,7 @@
+ 	env CC="$(LIBTOOL) --mode=compile $(CC)" \
  	    LD="$(LIBTOOL) --mode=link $(CC)" \
  	    CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
- 	        gtkdoc-scanobj --module=$(DOC_MODULE) \
-+			--nogtkinit \
+-	        gtkdoc-scanobj --module=$(DOC_MODULE) \
++	        true gtkdoc-scanobj --module=$(DOC_MODULE) \
  	                --types=$(srcdir)/$(DOC_MODULE).types \
  	                --output-dir=$(srcdir)
  	cd $(srcdir) \
diff --git a/libglade-use_AM_GNU_GETTEXT.patch b/libglade-use_AM_GNU_GETTEXT.patch
index e87e234..5f736af 100644
--- a/libglade-use_AM_GNU_GETTEXT.patch
+++ b/libglade-use_AM_GNU_GETTEXT.patch
@@ -1,22 +1,29 @@
---- libglade-0.16/configure.in~	Sat Feb 10 10:35:43 2001
-+++ libglade-0.16/configure.in	Mon Apr 23 18:47:37 2001
-@@ -84,7 +84,7 @@
+--- libglade-0.17/configure.in.orig	2001-09-07 05:00:29.000000000 +0200
++++ libglade-0.17/configure.in	2026-03-15 12:00:00.000000000 +0100
+@@ -91,14 +91,12 @@
  dnl gettext stuff ... there is no message catalog for libglade -- libglade
  dnl provides translation for the XML files it reads in.
  ALL_LINGUAS=""
 -AM_GNOME_GETTEXT
-+AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
  
- AC_OUTPUT([Makefile
+ AC_CONFIG_FILES([Makefile
  libglade.spec
---- 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
+ macros/Makefile
+-intl/Makefile
+ glade/Makefile
+-doc/Makefile
+ libglade-config
+ libgladeConf.sh
+ libglade.pc
+--- libglade-0.17/Makefile.am.orig	2001-09-07 05:00:13.000000000 +0200
++++ libglade-0.17/Makefile.am	2026-03-15 12:00:00.000000000 +0100
 @@ -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
++SUBDIRS = po macros glade
  
  m4datadir = $(datadir)/aclocal
  m4data_DATA = libglade.m4
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libglade.git/commitdiff/f3b591ecca167dd2f964c3f56d2878d490b0f054