From 390f8c7e468df8b5dbd7c2d2e3c05d6d2e9ebcc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 27 Mar 2013 17:30:02 +0100 Subject: [PATCH] Update config.sub to support aarch64 --- ...-not-install-some-manual-pages-twice.patch | 26 +++++++++++++++++++ xosd.spec | 13 +++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 xosd-2.2.14-Do-not-install-some-manual-pages-twice.patch diff --git a/xosd-2.2.14-Do-not-install-some-manual-pages-twice.patch b/xosd-2.2.14-Do-not-install-some-manual-pages-twice.patch new file mode 100644 index 0000000..916b0e3 --- /dev/null +++ b/xosd-2.2.14-Do-not-install-some-manual-pages-twice.patch @@ -0,0 +1,26 @@ +From c84bc1e170e6337c3bfc7069524433d307000a43 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Wed, 27 Mar 2013 17:26:22 +0100 +Subject: [PATCH] Do not install some manual pages twice + +This is fatal for modern Automake/install. +--- + man/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/Makefile.am b/man/Makefile.am +index 4f6622c..8e927ad 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -3,7 +3,7 @@ man_MANS = osd_cat.1 xosd-config.1 \ + xosd_display.3 xosd_hide.3 xosd_is_onscreen.3 xosd_set_vertical_offset.3 \ + xosd_set_pos.3 xosd_set_shadow_offset.3 xosd_show.3 xosd_uninit.3 xosd.3 \ + xosd_get_number_lines.3 xosd_set_align.3 xosd_create.3 \ +- xosd_set_horizontal_offset.3 xosd_destroy.3 xosd_create.3 xosd_is_onscreen.3 \ ++ xosd_set_horizontal_offset.3 xosd_destroy.3 \ + xosd_set_bar_length.3 + + EXTRA_DIST = ${man_MANS} +-- +1.8.1.4 + diff --git a/xosd.spec b/xosd.spec index c353b3c..bfba0fc 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,15 +1,18 @@ Name: xosd Version: 2.2.14 -Release: 17%{?dist} +Release: 18%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries License: GPLv2+ URL: http://sourceforge.net/projects/libxosd/ Source: http://downloads.sourceforge.net/libxosd/%{name}-%{version}.tar.gz Patch0: %{name}-aclocal18.patch +Patch1: %{name}-2.2.14-Do-not-install-some-manual-pages-twice.patch BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXinerama-devel +# Update config.sub to support aarch64, bug #926836 +BuildRequires: autoconf automake libtool # As of 2.2.14, the default font *must* be found, even if not used (#183971) Requires: xorg-x11-fonts-base # XMMS is dead, gdk-pixbuf-0 is dead. Dropping xmms plug-in. @@ -36,6 +39,11 @@ on-screen display. %prep %setup -q %patch0 -p0 +%patch1 -p1 +# Update config.sub to support aarch64, bug #926836 +sed -i -e '/AM_PATH_GTK/,+1 d' -e '/AM_PATH_XMMS/,+1 d' \ + -e '/AM_PATH_GDK_PIXBUF/,+1 d' configure.ac +autoreconf -i -f for f in ChangeLog man/xosd_{create,destroy,display,is_onscreen,set_bar_length}.3 ; do iconv -f iso-8859-1 -t utf-8 "$f" > "${f}.utf8" touch -r "$f" "${f}.utf8" @@ -80,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Wed Mar 27 2013 Petr Pisar - 2.2.14-18 +- Update config.sub to support aarch64 (bug #926836) + * Fri Feb 15 2013 Fedora Release Engineering - 2.2.14-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild