- added gettext patch, fixed build with recent gettext and gtk-doc

- updated URLs

diff --git a/libgalago-gettext.patch b/libgalago-gettext.patch
new file mode 100644 (file)
index 0000000..3e4f537
--- /dev/null
+++ b/libgalago-gettext.patch
@@ -0,0 +1,19 @@
+--- libgalago-0.5.2/configure.ac.orig  2021-03-01 19:20:24.689458844 +0100
++++ libgalago-0.5.2/configure.ac       2021-03-01 19:20:27.482777044 +0100
+@@ -92,7 +92,7 @@
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
+ 
+ AM_GNU_GETTEXT_VERSION(0.10.40)
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([external])
+ 
+ pkg_modules="glib-2.0 >= 2.8.0, dbus-1 >= 0.36, dbus-glib-1 >= 0.36"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+@@ -168,7 +168,6 @@
+ autopackage/default.apspec
+ docs/Makefile
+ docs/reference/Makefile
+-intl/Makefile
+ libgalago/Makefile
+ m4/Makefile
+ po/Makefile.in

diff --git a/libgalago.spec b/libgalago.spec
index 6520598c3706bef7305a5418446e288fb4746e1f..d1742b75bca198e7af9f87a8e7c5d3e754794a30 100644 (file)
--- a/libgalago.spec
+++ b/libgalago.spec
@@ -5,10 +5,11 @@ Version:      0.5.2
 Release:       4
 License:       LGPL v2.1+
 Group:         Applications/System
-Source0:       http://www.galago-project.org/files/releases/source/libgalago/%{name}-%{version}.tar.bz2
+Source0:       https://galago-project.org/files/releases/source/libgalago/%{name}-%{version}.tar.bz2
 # Source0-md5: 47f27f58dd8b0e46d9d2e037c51063ed
 Patch0:                pkgconfig.patch
-URL:           http://www.galago-project.org/
+Patch1:                %{name}-gettext.patch
+URL:           https://www.galago-project.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: dbus-devel >= 0.71
@@ -19,6 +20,7 @@ BuildRequires:        glib2-devel >= 1:2.12.1
 BuildRequires: gtk-doc >= 1.7
 BuildRequires: libtool
 BuildRequires: pkgconfig
+BuildRequires: rpm-build >= 4.6
 Requires:      dbus-glib >= 0.71
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -73,15 +75,19 @@ Dokumentacja API libgalago.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
+# use newer system macro
+%{__sed} -i -e '/^AC_DEFUN(\[GTK_DOC_CHECK\]/,/^\])/ d' acinclude.m4
 
 %build
+%{__gtkdocize}
 %{__gettextize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-
 %configure \
        --enable-gtk-doc \
        --with-html-dir=%{_gtkdocdir}