commit b4edd671cc0e247adc26a5675df02aa46e0aeec7 Author: Xavier Bachelot <xavier(a)bachelot.org&gt; Date: Tue May 14 23:10:59 2019 +0200 Add patch to revert gettext version bump on EL6 xine-lib-1.2.9-revert_update_gettext.patch | 179 +++++++++++++++++++++++++++++ xine-lib.spec | 6 + 2 files changed, 185 insertions(+) --- diff --git a/xine-lib-1.2.9-revert_update_gettext.patch b/xine-lib-1.2.9-revert_update_gettext.patch new file mode 100644 index 0000000..2a5b424 --- /dev/null +++ b/xine-lib-1.2.9-revert_update_gettext.patch @@ -0,0 +1,179 @@ +diff -Naur xine-lib-1.2.9-20190516hg14396.orig/configure.ac xine-lib-1.2.9-20190516hg14396/configure.ac +--- xine-lib-1.2.9-20190516hg14396.orig/configure.ac 2019-05-17 10:17:43.000000000 +0200 ++++ xine-lib-1.2.9-20190516hg14396/configure.ac 2019-05-20 10:42:47.903178522 +0200 +@@ -224,7 +224,7 @@ + fi + + AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION([0.18.3]) ++AM_GNU_GETTEXT_VERSION([0.17]) + AC_PROG_GMSGFMT_PLURAL + + AC_CHECK_LIB([c], [dlopen], [DYNAMIC_LD_LIBS=""], +diff -Naur xine-lib-1.2.9-20190516hg14396.orig/po/Makefile.in.in xine-lib-1.2.9-20190516hg14396/po/Makefile.in.in +--- xine-lib-1.2.9-20190516hg14396.orig/po/Makefile.in.in 2019-05-17 10:17:43.000000000 +0200 ++++ xine-lib-1.2.9-20190516hg14396/po/Makefile.in.in 2019-05-20 10:42:47.917178609 +0200 +@@ -1,5 +1,5 @@ + # Makefile for PO directory in any package using GNU gettext. +-# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper(a)gnu.ai.mit.edu&gt; ++# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper(a)gnu.ai.mit.edu&gt; + # + # This file can be copied and used freely without restrictions. It can + # be used in projects which are not available under the GNU General Public +@@ -8,14 +8,13 @@ + # Please note that the actual code of GNU gettext is covered by the GNU + # General Public License and is *not* in the public domain. + # +-# Origin: gettext-0.18.3 +-GETTEXT_MACRO_VERSION = 0.18 ++# Origin: gettext-0.17 ++GETTEXT_MACRO_VERSION = 0.17 + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + +-SED = @SED@ + SHELL = /bin/sh + @SET_MAKE@ + +@@ -89,22 +88,22 @@ + .po.gmo: + @lang=`echo $* | sed -e 's,.*/,,'`; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ +- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ +- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo ++ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ ++ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + + .sin.sed: + sed -e '/^#/d' $< > t-$@ + mv t-$@ $@ + + +-all: all-@USE_NLS@ ++all: check-macro-version all-@USE_NLS@ + + all-yes: stamp-po + all-no: + + # Ensure that the gettext macros and this Makefile.in.in are in sync. +-CHECK_MACRO_VERSION = \ +- test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ ++check-macro-version: ++ @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ + || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ + exit 1; \ + } +@@ -124,7 +123,6 @@ + # $(POFILES) has been designed to not touch files that don't need to be + # changed. + stamp-po: $(srcdir)/$(DOMAIN).pot +- @$(CHECK_MACRO_VERSION) + test ! -f $(srcdir)/$(DOMAIN).pot || \ + test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) + @test ! -f $(srcdir)/$(DOMAIN).pot || { \ +@@ -139,16 +137,8 @@ + + # This target rebuilds $(DOMAIN).pot; it is an expensive operation. + # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +-# The determination of whether the package xyz is a GNU one is based on the +-# heuristic whether some file in the top level directory mentions "GNU xyz". +-# If GNU 'find' is available, we avoid grepping through monster files. + $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed +- if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ +- LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \ +- else \ +- LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ +- fi; \ +- } | grep -v 'libtool:' >/dev/null; then \ ++ if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ + package_gnu='GNU '; \ + else \ + package_gnu=''; \ +@@ -203,15 +193,8 @@ + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ + if test -f "$(srcdir)/$${lang}.po"; then \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ +- echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ +- cd $(srcdir) \ +- && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ +- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ +- $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ +- *) \ +- $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ +- esac; \ +- }; \ ++ echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ ++ cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + else \ + $(MAKE) $${lang}.po-create; \ + fi +@@ -234,6 +217,7 @@ + fi + install-data-no: all + install-data-yes: all ++ $(mkdir_p) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +@@ -285,6 +269,7 @@ + fi + installdirs-data-no: + installdirs-data-yes: ++ $(mkdir_p) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +@@ -410,15 +395,9 @@ + tmpdir=`pwd`; \ + echo "$$lang:"; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ +- echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ ++ echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + cd $(srcdir); \ +- if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ +- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ +- $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ +- *) \ +- $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ +- esac; \ +- }; then \ ++ if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ + else \ +@@ -439,13 +418,9 @@ + update-gmo: Makefile $(GMOFILES) + @: + +-# Recreate Makefile by invoking config.status. Explicitly invoke the shell, +-# because execution permission bits may not work on the current file system. +-# Use @SHELL@, which is the shell determined by autoconf for the use by its +-# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. + Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ + cd $(top_builddir) \ +- && @SHELL@ ./config.status $(subdir)/$@.in po-directories ++ && $(SHELL) ./config.status $(subdir)/$@.in po-directories + + force: + +diff -Naur xine-lib-1.2.9-20190516hg14396.orig/po/Rules-quot xine-lib-1.2.9-20190516hg14396/po/Rules-quot +--- xine-lib-1.2.9-20190516hg14396.orig/po/Rules-quot 2019-05-17 10:17:43.000000000 +0200 ++++ xine-lib-1.2.9-20190516hg14396/po/Rules-quot 2019-05-20 10:42:47.918178615 +0200 +@@ -14,13 +14,13 @@ + + .insert-header.po-update-en: + @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ +- if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ ++ if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ + tmpdir=`pwd`; \ + echo "$$lang:"; \ + ll=`echo $$lang | sed -e 's/@.*//'`; \ + LC_ALL=C; export LC_ALL; \ + cd $(srcdir); \ +- if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) $(SED) -f `echo $$lang | sed -e &#39;s/.*(a)//&#39;`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ ++ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e &#39;s/.*(a)//&#39;`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ + else \ diff --git a/xine-lib.spec b/xine-lib.spec index 4bc9404..8ad7361 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -27,6 +27,10 @@ Source0: xine-lib-%{version}-%{date}hg%{revision}.tar.xz # Script to make a snapshot Source1: make_xinelib_snapshot.sh +# Based on: +# https://sourceforge.net/p/xine/xine-lib-1.2/ci/ba01d04fe4d50a67302ed3cdbf... +Patch1: xine-lib-1.2.9-revert_update_gettext.patch + Provides: xine-lib(plugin-abi) = %{plugin_abi} %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} @@ -121,6 +125,7 @@ This package contains extra plugins for %{name}: %else %setup -q -n %{name}-%{version}-%{date}hg%{revision} %endif +%{?el6:%patch1 -p1} autoreconf -ivf @@ -328,6 +333,7 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir} - Clean up and sort BuildRequires. - Enable fontconfig support. - No NFS support on EL6. +- Add patch to revert gettext version bump on EL6. * Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1.2.9-13.20181129hg14263 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild