Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,2 +1,3 @@
 xosd-2.2.12.tar.bz2
 xosd_2.2.14.orig.tar.gz
+/xosd-2.2.14.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xosd
-# $Id$
-NAME := xosd
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-4b349fe930e4eee2f504d6c02673e24d  xosd_2.2.14.orig.tar.gz
+SHA512 (xosd-2.2.14.tar.gz) = 3caf6d106d34488f4823e2a58fdff7a69b90f505b8da2443485167ff0362c6f27614c9a5019e738ff1f897d3c2249c934ff60953e3775566d66e8e9b30e4e473

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?= <ppisar@redhat.com>
+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
+

xosd-defaults.patch

@@ -1,28 +0,0 @@
-diff -Naru xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c xosd-2.2.14/src/bmp_plugin/bmp_osd.c
---- xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c	2004-11-17 21:26:56.000000000 +0200
-+++ xosd-2.2.14/src/bmp_plugin/bmp_osd.c	2005-03-17 23:42:25.000000000 +0200
-@@ -177,8 +177,8 @@
-   colour = NULL;
-   font = NULL;
-   timeout = 3;
--  offset = 50;
--  h_offset = 0;
-+  offset = 60;
-+  h_offset = 60;
-   shadow_offset = 1;
-   outline_offset = 0;
-   pos = XOSD_bottom;
-diff -Naru xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c xosd-2.2.14/src/xmms_plugin/xmms_osd.c
---- xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c	2004-11-04 21:47:50.000000000 +0200
-+++ xosd-2.2.14/src/xmms_plugin/xmms_osd.c	2005-03-17 23:42:11.000000000 +0200
-@@ -177,8 +177,8 @@
-   colour = NULL;
-   font = NULL;
-   timeout = 3;
--  offset = 50;
--  h_offset = 0;
-+  offset = 60;
-+  h_offset = 60;
-   shadow_offset = 1;
-   outline_offset = 0;
-   pos = XOSD_bottom;

xosd.rpmlintrc

@@ -0,0 +1,2 @@
+from Config import *
+addFilter("spelling-error .* unmanaged");

xosd.spec

@@ -1,115 +1,244 @@
-%bcond_with static
-
-%define	xmms_plugdir %(xmms-config --general-plugin-dir 2>/dev/null)
-
 Name:           xosd
 Version:        2.2.14
-Release:        12%{?dist}
+Release:        48%{?dist}
 Summary:        On-screen display library for X
-
-Group:          System Environment/Libraries
-License:        GPLv2+
-URL:            http://www.ignavus.net/software.html
-Source:         http://ftp.debian.org/debian/pool/main/x/xosd/%{name}_%{version}.orig.tar.gz
+# COPYING:      GPL-2.0 text
+# man/osd_cat.1:        GPL-1.0-or-later
+# man/xosd-config.1:    MIT-open-group
+# src/libxosd/xosd.c:   GPL-2.0-or-later
+## Disabled at configure time, unused
+# src/bmp_plugin/bmp_osd.c:     GPL-2.0-or-later
+# src/bmp_plugin/dlg_colour.c:  GPL-2.0-or-later
+# src/bmp_plugin/dlg_config.c:  GPL-2.0-or-later
+# src/bmp_plugin/dlg_config_old.c:  GPL-2.0-or-later
+# src/bmp_plugin/dlg_font.c:    GPL-2.0-or-later
+# src/xmms_plugin/dlg_colour.c: GPL-2.0-or-later
+# src/xmms_plugin/dlg_config.c: GPL-2.0-or-later
+# src/xmms_plugin/dlg_config_old.c: GPL-2.0-or-later
+# src/xmms_plugin/dlg_font.c:   GPL-2.0-or-later
+# src/xmms_plugin/xmms_osd.c:   GPL-2.0-or-later
+## Not in any binary package
+# aclocal.m4:   FSFULLR AND GPL-2.0-or-later WITH Autoconf-exception-generic
+#               AND GPL-2.0-or-later
+# config.guess: GPL-2.0-or-later WITH Autoconf-exception-generic
+# config.sub:   GPL-2.0-or-later WITH Autoconf-exception-generic
+# configure:    FSFUL AND GPL-2.0-or-later WITH Autoconf-exception-generic
+# depcomp:      GPL-2.0-or-later WITH Autoconf-exception-generic
+# INSTALL:      FSFUL
+# install-sh:   HPND-sell-variant
+# ltconfig:     GPL-2.0-or-later WITH Autoconf-exception-generic
+# ltmain.sh:    GPL-2.0-or-later WITH Autoconf-exception-generic
+# macros/Makefile.in:   FSFULLR
+# Makefile.in:  FSFULLR
+# man/Makefile.in:      FSFULLR
+# missing:      GPL-2.0-or-later WITH Autoconf-exception-generic
+# pixmaps/Makefile.in:  FSFULLR
+# script/Makefile.in:   FSFULLR
+# src/bmp_plugin/Makefile.in:   FSFULLR
+# src/libxosd/Makefile.in:  FSFULLR
+# src/Makefile.in:          FSFULLR
+# src/xmms_plugin/Makefile.in:  FSFULLR
+License:        GPL-2.0-or-later AND GPL-1.0-or-later
+URL:            https://sourceforge.net/projects/libxosd/
+Source:         https://downloads.sourceforge.net/libxosd/%{name}-%{version}.tar.gz
 Patch0:         %{name}-aclocal18.patch
-Patch1:         %{name}-defaults.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Patch1:         %{name}-2.2.14-Do-not-install-some-manual-pages-twice.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  coreutils
+BuildRequires:  gcc
+# glibc-common for iconv
+BuildRequires:  glibc-common
+BuildRequires:  libtool
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libXinerama-devel
+BuildRequires:  make
+BuildRequires:  perl-interpreter
 # As of 2.2.14, the default font *must* be found, even if not used (#183971)
-Requires:       xorg-x11-fonts-base
+Requires:       xorg-x11-fonts-misc
+# XMMS is dead, gdk-pixbuf-0 is dead. Dropping xmms plug-in.
+Obsoletes:      xmms-%{name} < 2.2.14-15
+Obsoletes:      %{name}-xmms <= 2.2.12
 
 %description
 XOSD displays text on your screen, sounds simple right? The difference
 is it is unmanaged and shaped, so it appears transparent. This gives
-the effect of an On Screen Display, like your TV/VCR etc.. The package
-also includes an xmms plugin, which automatically displays various
-interesting things as they change (song name, volume etc...)
+the effect of an On Screen Display, like your TV/VCR etc.
 
 %package        devel
 Summary:        Development files for the XOSD on-screen display library
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+License:        GPL-2.0-or-later AND MIT-open-group
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       libX11-devel
 Requires:       libXext-devel
 Requires:       libXinerama-devel
 
 %description    devel
-The xosd-devel package contains static libraries, header files and
-documentation for developing applications that use the XOSD on-screen
-display.
-
-%package     -n xmms-%{name}
-Summary:        XMMS plugin for on-screen display using the XOSD library
-Group:          Applications/Multimedia
-BuildRequires:  gtk+-devel >= 1:1.2.2
-BuildRequires:  gdk-pixbuf-devel >= 1:0.22.0
-BuildRequires:  xmms-devel
-Requires:       %{name} = %{version}-%{release}
-Requires:       xmms
-Obsoletes:      %{name}-xmms <= 2.2.12
-
-%description -n xmms-%{name}
-X MultiMedia System plugin to display information on-screen through
-the XOSD library, similarly to TV OSD.
+Header files and documentation for developing applications that use the XOSD
+on-screen display.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
+%patch -P0 -p0
+%patch -P1 -p1
+# XMMS is dead, gdk-pixbuf-0 is dead. Dropping xmms plug-in.
+sed -i -e '/AM_PATH_GTK/,+1 d' -e '/AM_PATH_XMMS/,+1 d' \
+    -e '/AM_PATH_GDK_PIXBUF/,+1 d' configure.ac
+# Update config.sub to support aarch64, bug #926836
+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 ; mv $f.utf8 $f
+    iconv -f iso-8859-1 -t utf-8 "$f" > "${f}.utf8"
+    touch -r "$f" "${f}.utf8"
+    mv "${f}.utf8" "$f"
 done
 
-
 %build
-%configure --disable-dependency-tracking %{!?with_static:--disable-static}
-make %{?_smp_mflags}
-%{__perl} -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config
-
+%configure --disable-dependency-tracking --disable-static \
+    --disable-gtktest --disable-gdk_pixbuftest \
+    --disable-new-plugin --disable-old-plugin \
+    --disable-beep_media_player_plugin\
+    --enable-xinerama
+%{make_build}
+perl -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%{make_install}
 rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir}}/*.la
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
+# Pixmaps are needed only by unsupported XMMS plug-in.
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%license COPYING
+%doc AUTHORS ChangeLog README TODO
 %{_bindir}/osd_cat
-%{_libdir}/libxosd.so.*
-%{_datadir}/xosd/
+%{_libdir}/libxosd.so.2
+%{_libdir}/libxosd.so.2.*
 %{_mandir}/man1/osd_cat.1*
 
 %files devel
-%defattr(-,root,root,-)
 %{_bindir}/xosd-config
 %{_includedir}/xosd.h
 %{_libdir}/libxosd.so
-%if %{with static}
-%{_libdir}/libxosd.a
-%endif
 %{_datadir}/aclocal/libxosd.m4
 %{_mandir}/man1/xosd-config.1*
 %{_mandir}/man3/xosd*.3*
 
-%files -n xmms-%{name}
-%defattr(-,root,root,-)
-%{xmms_plugdir}/libxmms_osd.so
-
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-48
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Tue Jan 20 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-47
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-46
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-45
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-44
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-43
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-41
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Sep 08 2022 Petr Pisar <ppisar@redhat.com> - 2.2.14-40
+- License corrected to "GPL-2.0-or-later AND GPL-1.0-or-later AND MIT-open-group
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-39
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-38
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-37
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Mar 02 2021 Peter Hutterer <peter.hutterer@redhat.com> 2.2.14-36
+- Require xorg-x11-fonts-misc instead of -base. -base hasn't existed for
+  over a decade.
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Mar 09 2020 Petr Pisar <ppisar@redhat.com> - 2.2.14-33
+- Modernize a spec file
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-32
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Mar 23 2018 Petr Pisar <ppisar@redhat.com> - 2.2.14-28
+- Modernize a spec file
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.14-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.14-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.14-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.14-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Mar 27 2013 Petr Pisar <ppisar@redhat.com> - 2.2.14-18
+- Update config.sub to support aarch64 (bug #926836)
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.14-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.14-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Petr Pisar <ppisar@redhat.com> - 2.2.14-15
+- Disable XMMS plug-in because gdk-pixpuf-0 has been removed
+- Remove build-optional static library
+- Clean spec file up 
+- Do not package XMMS plug-in pixmaps
+- Remove patch changing default offset to keep closer with upstream
+- Update upstream URLs
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.14-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.14-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.14-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild