From 02e51e4158eb32f48b6d963603b4f4017e185a64 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 21 Oct 2007 01:50:39 +0000 Subject: [PATCH 01/55] Initialize branch F-8 for xosd --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 3de29b4a7973947e2d1a3d041c0d3eab70c8c3c6 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 10 Feb 2008 18:56:44 +0000 Subject: [PATCH 02/55] Rebuild for gcc43 --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 62fcd8e..0facb5e 100644 --- a/xosd.spec +++ b/xosd.spec @@ -4,7 +4,7 @@ Name: xosd Version: 2.2.14 -Release: 10%{?dist} +Release: 11%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{xmms_plugdir}/libxmms_osd.so %changelog +* Sun Feb 10 2008 Kevin Fenzi - 2.2.14-11 +- Rebuild for gcc43 + * Sun Aug 26 2007 Kevin Fenzi - 2.2.14-10 - Update License tag From a9e25e38f204cfc9f58c0f8acdb493736dba2aaa Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 11:45:24 +0000 Subject: [PATCH 03/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 0facb5e..18e7e1e 100644 --- a/xosd.spec +++ b/xosd.spec @@ -4,7 +4,7 @@ Name: xosd Version: 2.2.14 -Release: 11%{?dist} +Release: 12%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{xmms_plugdir}/libxmms_osd.so %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 2.2.14-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Feb 10 2008 Kevin Fenzi - 2.2.14-11 - Rebuild for gcc43 From b72b23e62ea2d8e4f0cc00a288957a318e92ba16 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:40:26 +0000 Subject: [PATCH 04/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 18e7e1e..8a4871d 100644 --- a/xosd.spec +++ b/xosd.spec @@ -4,7 +4,7 @@ Name: xosd Version: 2.2.14 -Release: 12%{?dist} +Release: 13%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{xmms_plugdir}/libxmms_osd.so %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 2.2.14-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 2.2.14-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 0c1205534477bbb5f88968dd86bb7d76e14348f6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:41:05 +0000 Subject: [PATCH 05/55] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c5cea9f..0b12109 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From fe766cccc249dc3e8266f6c1d135443215921b16 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:38:27 +0000 Subject: [PATCH 06/55] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c5cea9f..0b12109 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 09b2ac82ff017bbe7f9f0e47b2059c9e207bc9dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:08:57 +0000 Subject: [PATCH 07/55] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0b12109..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8 From 5e55ca2a8241916985a420cb3b74b2e16e21eb69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:09:06 +0000 Subject: [PATCH 08/55] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0b12109..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) From d4043b6e17fe7b581b57781300722477d06f3322 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 00:44:26 -0600 Subject: [PATCH 09/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 8a4871d..cac18a9 100644 --- a/xosd.spec +++ b/xosd.spec @@ -4,7 +4,7 @@ Name: xosd Version: 2.2.14 -Release: 13%{?dist} +Release: 14%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{xmms_plugdir}/libxmms_osd.so %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 2.2.14-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jul 27 2009 Fedora Release Engineering - 2.2.14-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 822ae3db064ce131197a1a51f8b81b03f7920ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 24 Nov 2011 14:23:00 +0100 Subject: [PATCH 10/55] Remove XMMS support --- xosd.spec | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/xosd.spec b/xosd.spec index cac18a9..a1b37b5 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,10 +1,8 @@ %bcond_with static -%define xmms_plugdir %(xmms-config --general-plugin-dir 2>/dev/null) - Name: xosd Version: 2.2.14 -Release: 14%{?dist} +Release: 15%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries @@ -21,12 +19,14 @@ BuildRequires: libXinerama-devel # 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. +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 @@ -41,20 +41,6 @@ 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. - %prep %setup -q %patch0 -p0 @@ -65,7 +51,10 @@ done %build -%configure --disable-dependency-tracking %{!?with_static:--disable-static} +%configure --disable-dependency-tracking %{!?with_static:--disable-static} \ + --disable-gtktest --disable-gdk_pixbuftest \ + --disable-new-plugin --disable-old-plugin \ + --disable-beep_media_player_plugin make %{?_smp_mflags} %{__perl} -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config @@ -105,11 +94,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/xosd-config.1* %{_mandir}/man3/xosd*.3* -%files -n xmms-%{name} -%defattr(-,root,root,-) -%{xmms_plugdir}/libxmms_osd.so - %changelog +* Thu Nov 24 2011 Petr Pisar - 2.2.14-15 +- Disable XMMS plug-in because gdk-pixpuf-0 has been removed + * Tue Feb 08 2011 Fedora Release Engineering - 2.2.14-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From f33f1f78bffeb6ff0aace395f113e0483856fe22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 24 Nov 2011 14:26:02 +0100 Subject: [PATCH 11/55] Remove build-optional static library --- xosd.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/xosd.spec b/xosd.spec index a1b37b5..46b93d4 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,5 +1,3 @@ -%bcond_with static - Name: xosd Version: 2.2.14 Release: 15%{?dist} @@ -37,9 +35,8 @@ 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. +Header files and documentation for developing applications that use the XOSD +on-screen display. %prep %setup -q @@ -51,7 +48,7 @@ done %build -%configure --disable-dependency-tracking %{!?with_static:--disable-static} \ +%configure --disable-dependency-tracking --disable-static \ --disable-gtktest --disable-gdk_pixbuftest \ --disable-new-plugin --disable-old-plugin \ --disable-beep_media_player_plugin @@ -87,9 +84,6 @@ rm -rf $RPM_BUILD_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* @@ -97,6 +91,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Nov 24 2011 Petr Pisar - 2.2.14-15 - Disable XMMS plug-in because gdk-pixpuf-0 has been removed +- Remove build-optional static library * Tue Feb 08 2011 Fedora Release Engineering - 2.2.14-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From e8f773db8018f497d1595ef25744132d35c60090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 24 Nov 2011 14:55:12 +0100 Subject: [PATCH 12/55] Clean up spec file --- xosd.spec | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/xosd.spec b/xosd.spec index 46b93d4..83e434e 100644 --- a/xosd.spec +++ b/xosd.spec @@ -2,21 +2,17 @@ Name: xosd Version: 2.2.14 Release: 15%{?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 Patch0: %{name}-aclocal18.patch Patch1: %{name}-defaults.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXinerama-devel # 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. Obsoletes: xmms-%{name} < 2.2.14-15 Obsoletes: %{name}-xmms <= 2.2.12 @@ -43,7 +39,9 @@ on-screen display. %patch0 -p0 %patch1 -p1 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 @@ -51,28 +49,23 @@ done %configure --disable-dependency-tracking --disable-static \ --disable-gtktest --disable-gdk_pixbuftest \ --disable-new-plugin --disable-old-plugin \ - --disable-beep_media_player_plugin + --disable-beep_media_player_plugin\ + --enable-xinerama make %{?_smp_mflags} %{__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 rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir}}/*.la -%clean -rm -rf $RPM_BUILD_ROOT - - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{_bindir}/osd_cat %{_libdir}/libxosd.so.* @@ -80,7 +73,6 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/osd_cat.1* %files devel -%defattr(-,root,root,-) %{_bindir}/xosd-config %{_includedir}/xosd.h %{_libdir}/libxosd.so @@ -92,6 +84,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Nov 24 2011 Petr Pisar - 2.2.14-15 - Disable XMMS plug-in because gdk-pixpuf-0 has been removed - Remove build-optional static library +- Clean spec file up * Tue Feb 08 2011 Fedora Release Engineering - 2.2.14-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 1df4e4bdaee1765396e74623416c88dca3994300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 24 Nov 2011 15:15:56 +0100 Subject: [PATCH 13/55] Do not package XMMS plug-in pixmaps --- xosd.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 83e434e..e213881 100644 --- a/xosd.spec +++ b/xosd.spec @@ -58,6 +58,8 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir}}/*.la +# Pixmaps are needed only by unsupported XMMS plug-in. +rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %post -p /sbin/ldconfig @@ -69,7 +71,6 @@ rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir}}/*.la %doc AUTHORS ChangeLog COPYING README TODO %{_bindir}/osd_cat %{_libdir}/libxosd.so.* -%{_datadir}/xosd/ %{_mandir}/man1/osd_cat.1* %files devel @@ -85,6 +86,7 @@ rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir}}/*.la - 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 * Tue Feb 08 2011 Fedora Release Engineering - 2.2.14-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 2977fd3a7229334a5e6f12f82931562300be1de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 13 Jan 2012 11:04:38 +0100 Subject: [PATCH 14/55] Remove patch changing default offset --- xosd-defaults.patch | 28 ---------------------------- xosd.spec | 5 ++--- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 xosd-defaults.patch diff --git a/xosd-defaults.patch b/xosd-defaults.patch deleted file mode 100644 index 914bd77..0000000 --- a/xosd-defaults.patch +++ /dev/null @@ -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; diff --git a/xosd.spec b/xosd.spec index e213881..c03966b 100644 --- a/xosd.spec +++ b/xosd.spec @@ -7,7 +7,6 @@ License: GPLv2+ URL: http://www.ignavus.net/software.html Source: http://ftp.debian.org/debian/pool/main/x/xosd/%{name}_%{version}.orig.tar.gz Patch0: %{name}-aclocal18.patch -Patch1: %{name}-defaults.patch BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXinerama-devel @@ -37,7 +36,6 @@ on-screen display. %prep %setup -q %patch0 -p0 -%patch1 -p1 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" @@ -82,11 +80,12 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog -* Thu Nov 24 2011 Petr Pisar - 2.2.14-15 +* Fri Jan 13 2012 Petr Pisar - 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 * Tue Feb 08 2011 Fedora Release Engineering - 2.2.14-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From e37a035b43e3a5f56c8f6bd31989d29a710c2110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 13 Jan 2012 11:10:33 +0100 Subject: [PATCH 15/55] Make devel sub-package requiring architecture --- xosd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index c03966b..e66d9ba 100644 --- a/xosd.spec +++ b/xosd.spec @@ -24,7 +24,7 @@ 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} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libX11-devel Requires: libXext-devel Requires: libXinerama-devel From 73d0c1090700145ee5e794c93ddd45261fce6196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 13 Jan 2012 11:19:24 +0100 Subject: [PATCH 16/55] Update upstream URLs --- .gitignore | 1 + sources | 2 +- xosd.spec | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 60e62bc..de8bf77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xosd-2.2.12.tar.bz2 xosd_2.2.14.orig.tar.gz +/xosd-2.2.14.tar.gz diff --git a/sources b/sources index c0f472e..97a1f93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b349fe930e4eee2f504d6c02673e24d xosd_2.2.14.orig.tar.gz +4b349fe930e4eee2f504d6c02673e24d xosd-2.2.14.tar.gz diff --git a/xosd.spec b/xosd.spec index e66d9ba..7d44c13 100644 --- a/xosd.spec +++ b/xosd.spec @@ -4,8 +4,8 @@ Release: 15%{?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 +URL: http://sourceforge.net/projects/libxosd/ +Source: http://downloads.sourceforge.net/libxosd/%{name}-%{version}.tar.gz Patch0: %{name}-aclocal18.patch BuildRequires: libX11-devel BuildRequires: libXext-devel @@ -86,6 +86,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} - 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 - 2.2.14-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From a9db4d83e3c70563c7a5fc3e738c8fb86a3c52aa Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 02:03:36 -0500 Subject: [PATCH 17/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 7d44c13..c414f82 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 15%{?dist} +Release: 16%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries License: GPLv2+ @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 2.2.14-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Petr Pisar - 2.2.14-15 - Disable XMMS plug-in because gdk-pixpuf-0 has been removed - Remove build-optional static library From 472d5bf0c61949b46147d5af1548cd2e38f9c9a2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 22:01:38 -0600 Subject: [PATCH 18/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index c414f82..c353b3c 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 16%{?dist} +Release: 17%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries License: GPLv2+ @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 2.2.14-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 2.2.14-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 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 19/55] 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 From 4a7c64efc6ae245fccfb01388bc4e784dc01a4a1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:07:10 -0500 Subject: [PATCH 20/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index bfba0fc..3ca2d87 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 18%{?dist} +Release: 19%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries License: GPLv2+ @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 2.2.14-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Mar 27 2013 Petr Pisar - 2.2.14-18 - Update config.sub to support aarch64 (bug #926836) From 6399a1f8b45760ddce803d773955951f34f33f70 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:43:13 -0500 Subject: [PATCH 21/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 3ca2d87..b39bb7c 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 19%{?dist} +Release: 20%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries License: GPLv2+ @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 2.2.14-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 2.2.14-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 83305f5d5e7716abf1725c9d1de3c313b4d6c357 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 10:49:07 +0000 Subject: [PATCH 22/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index b39bb7c..7799e45 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 20%{?dist} +Release: 21%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries License: GPLv2+ @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 2.2.14-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 2.2.14-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From a509a646d828bc7490ec36dc78bdcb6365fd1ea9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:23:23 +0000 Subject: [PATCH 23/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 7799e45..15a2ba0 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 21%{?dist} +Release: 22%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries License: GPLv2+ @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 2.2.14-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 2.2.14-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From f49473a103bf3dcc2ef10f1a8a189524e5a8db23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:47:07 +0000 Subject: [PATCH 24/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 15a2ba0..89bc70c 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 22%{?dist} +Release: 23%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries License: GPLv2+ @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 2.2.14-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 2.2.14-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From bb35d81fa0577b5a5668bac876e303d73c80c10a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:07:11 +0000 Subject: [PATCH 25/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 89bc70c..590b7c3 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 23%{?dist} +Release: 24%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries License: GPLv2+ @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.2.14-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 2.2.14-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 94fbfb5915bd9c839201553f85483fc909e86278 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:24:09 +0000 Subject: [PATCH 26/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 590b7c3..1bb017f 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 24%{?dist} +Release: 25%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries License: GPLv2+ @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.2.14-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 2.2.14-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From eafc50a2a3e4b902a0723ed5dead578d23efaa33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:56:17 +0000 Subject: [PATCH 27/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 1bb017f..229759f 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 25%{?dist} +Release: 26%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries License: GPLv2+ @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.2.14-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 2.2.14-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From f589b3667e77905801714aa1272df43192949a47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:01:49 +0000 Subject: [PATCH 28/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 229759f..1766432 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 26%{?dist} +Release: 27%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries License: GPLv2+ @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.2.14-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 2.2.14-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From b80722975dd8f84363aecf60551e2ca10f77bfd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 23 Mar 2018 13:46:36 +0100 Subject: [PATCH 29/55] Modernize a spec file --- .rpmlint | 2 ++ xosd.spec | 33 ++++++++++++++++++--------------- 2 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 .rpmlint diff --git a/.rpmlint b/.rpmlint new file mode 100644 index 0000000..3c53ef9 --- /dev/null +++ b/.rpmlint @@ -0,0 +1,2 @@ +from Config import * +addFilter("spelling-error .* unmanaged"); diff --git a/xosd.spec b/xosd.spec index 1766432..477f23f 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,18 +1,23 @@ Name: xosd Version: 2.2.14 -Release: 27%{?dist} +Release: 28%{?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: autoconf +BuildRequires: automake +BuildRequires: coreutils +# glibc-common for iconv +BuildRequires: glibc-common +BuildRequires: libtool BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXinerama-devel -# Update config.sub to support aarch64, bug #926836 -BuildRequires: autoconf automake libtool +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 # XMMS is dead, gdk-pixbuf-0 is dead. Dropping xmms plug-in. @@ -26,7 +31,6 @@ 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}%{?_isa} = %{version}-%{release} Requires: libX11-devel Requires: libXext-devel @@ -40,9 +44,10 @@ on-screen display. %setup -q %patch0 -p0 %patch1 -p1 -# Update config.sub to support aarch64, bug #926836 +# 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" @@ -50,7 +55,6 @@ for f in ChangeLog man/xosd_{create,destroy,display,is_onscreen,set_bar_length}. mv "${f}.utf8" "$f" done - %build %configure --disable-dependency-tracking --disable-static \ --disable-gtktest --disable-gdk_pixbuftest \ @@ -58,8 +62,7 @@ done --disable-beep_media_player_plugin\ --enable-xinerama make %{?_smp_mflags} -%{__perl} -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config - +perl -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config %install make install DESTDIR=$RPM_BUILD_ROOT @@ -67,14 +70,11 @@ rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir}}/*.la # Pixmaps are needed only by unsupported XMMS plug-in. rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - +%ldconfig_scriptlets %files -%doc AUTHORS ChangeLog COPYING README TODO +%license COPYING +%doc AUTHORS ChangeLog README TODO %{_bindir}/osd_cat %{_libdir}/libxosd.so.* %{_mandir}/man1/osd_cat.1* @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Fri Mar 23 2018 Petr Pisar - 2.2.14-28 +- Modernize a spec file + * Fri Feb 09 2018 Fedora Release Engineering - 2.2.14-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 033a91197e655fdf3c7abf7d1e693b9f805e9b51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:32:32 +0000 Subject: [PATCH 30/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 477f23f..92a3bcd 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 28%{?dist} +Release: 29%{?dist} Summary: On-screen display library for X License: GPLv2+ URL: http://sourceforge.net/projects/libxosd/ @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.2.14-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Mar 23 2018 Petr Pisar - 2.2.14-28 - Modernize a spec file From e7651fa8df1078dbafb41597005cfba1a122d170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 19 Jul 2018 08:02:39 +0200 Subject: [PATCH 31/55] Rename rpmlint configuration file --- .rpmlint => xosd.rpmlintrc | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .rpmlint => xosd.rpmlintrc (100%) diff --git a/.rpmlint b/xosd.rpmlintrc similarity index 100% rename from .rpmlint rename to xosd.rpmlintrc From eb6e5103a4ceaca50570261d7dbec9a8840a79c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:46:01 +0000 Subject: [PATCH 32/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 92a3bcd..e1f33e6 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 29%{?dist} +Release: 30%{?dist} Summary: On-screen display library for X License: GPLv2+ URL: http://sourceforge.net/projects/libxosd/ @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2.2.14-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2.2.14-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From fb4ce60857373ec48094ada877a244b3aa37da87 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:34:56 +0000 Subject: [PATCH 33/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index e1f33e6..fc1c125 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 30%{?dist} +Release: 31%{?dist} Summary: On-screen display library for X License: GPLv2+ URL: http://sourceforge.net/projects/libxosd/ @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.2.14-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 2.2.14-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 048311e833dd6b1ee99ed93b4438f6d26251492b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:50:34 +0000 Subject: [PATCH 34/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index fc1c125..e1f07c1 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 31%{?dist} +Release: 32%{?dist} Summary: On-screen display library for X License: GPLv2+ URL: http://sourceforge.net/projects/libxosd/ @@ -88,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2.2.14-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 2.2.14-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f1a59bedcfbdd4fb1464eadfd8e65059821978af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 9 Mar 2020 14:35:52 +0100 Subject: [PATCH 35/55] Modernize a spec file --- xosd.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/xosd.spec b/xosd.spec index e1f07c1..774d87a 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,15 +1,16 @@ Name: xosd Version: 2.2.14 -Release: 32%{?dist} +Release: 33%{?dist} Summary: On-screen display library for X License: GPLv2+ -URL: http://sourceforge.net/projects/libxosd/ -Source: http://downloads.sourceforge.net/libxosd/%{name}-%{version}.tar.gz +URL: https://sourceforge.net/projects/libxosd/ +Source: https://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: autoconf BuildRequires: automake BuildRequires: coreutils +BuildRequires: gcc # glibc-common for iconv BuildRequires: glibc-common BuildRequires: libtool @@ -61,17 +62,15 @@ done --disable-new-plugin --disable-old-plugin \ --disable-beep_media_player_plugin\ --enable-xinerama -make %{?_smp_mflags} +%{make_build} perl -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config %install -make install DESTDIR=$RPM_BUILD_ROOT +%{make_install} rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir}}/*.la # Pixmaps are needed only by unsupported XMMS plug-in. rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} -%ldconfig_scriptlets - %files %license COPYING %doc AUTHORS ChangeLog README TODO @@ -88,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Mon Mar 09 2020 Petr Pisar - 2.2.14-33 +- Modernize a spec file + * Fri Jan 31 2020 Fedora Release Engineering - 2.2.14-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From db4aa8eb4817e4f3d7a6930c5283c8df6fa06bb9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:01:32 +0000 Subject: [PATCH 36/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 774d87a..e1a2a16 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 33%{?dist} +Release: 34%{?dist} Summary: On-screen display library for X License: GPLv2+ URL: https://sourceforge.net/projects/libxosd/ @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.2.14-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Mar 09 2020 Petr Pisar - 2.2.14-33 - Modernize a spec file From 8ddb00bbbe1bd372a5455a60aaf7aa312ec7e9ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:20:16 +0000 Subject: [PATCH 37/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index e1a2a16..5f6c339 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 34%{?dist} +Release: 35%{?dist} Summary: On-screen display library for X License: GPLv2+ URL: https://sourceforge.net/projects/libxosd/ @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 2.2.14-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2.2.14-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e8ca5fbe43ace4c0982af1328782bbf92c56bcc6 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 2 Mar 2021 08:30:45 +1000 Subject: [PATCH 38/55] Require xorg-x11-fonts-misc instead of -base. -base hasn't existed for over a decade. --- xosd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xosd.spec b/xosd.spec index 5f6c339..baa9b34 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 35%{?dist} +Release: 36%{?dist} Summary: On-screen display library for X License: GPLv2+ URL: https://sourceforge.net/projects/libxosd/ @@ -20,7 +20,7 @@ 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 @@ -87,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Tue Mar 02 2021 Peter Hutterer 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 - 2.2.14-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From c7a7226cb8fea13aa5a939cda6125b094ac73641 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:53:16 +0000 Subject: [PATCH 39/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index baa9b34..c070126 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 36%{?dist} +Release: 37%{?dist} Summary: On-screen display library for X License: GPLv2+ URL: https://sourceforge.net/projects/libxosd/ @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.2.14-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Peter Hutterer 2.2.14-36 - Require xorg-x11-fonts-misc instead of -base. -base hasn't existed for over a decade. From ca0d4d1017a4d1b00887ce769d9081fe0f3372ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:26:28 +0000 Subject: [PATCH 40/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index c070126..7d0e6ec 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 37%{?dist} +Release: 38%{?dist} Summary: On-screen display library for X License: GPLv2+ URL: https://sourceforge.net/projects/libxosd/ @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.2.14-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 2.2.14-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 751e82d0a35ff53831762d20f0d8925168145d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 4 Jul 2022 20:16:27 +0200 Subject: [PATCH 41/55] Reupload sources with SHA-512 --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 97a1f93..87e6034 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b349fe930e4eee2f504d6c02673e24d xosd-2.2.14.tar.gz +SHA512 (xosd-2.2.14.tar.gz) = 3caf6d106d34488f4823e2a58fdff7a69b90f505b8da2443485167ff0362c6f27614c9a5019e738ff1f897d3c2249c934ff60953e3775566d66e8e9b30e4e473 From fddb68e72862d8e30ef3bdd9e674f8373ba269da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:27:31 +0000 Subject: [PATCH 42/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 7d0e6ec..751b61a 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 38%{?dist} +Release: 39%{?dist} Summary: On-screen display library for X License: GPLv2+ URL: https://sourceforge.net/projects/libxosd/ @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.2.14-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 2.2.14-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From e83289112b2fb9ae32bb9b502704899a65532eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 8 Sep 2022 15:32:04 +0200 Subject: [PATCH 43/55] License corrected to "GPL-2.0-or-later AND GPL-1.0-or-later AND MIT-open-group --- xosd.spec | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/xosd.spec b/xosd.spec index 751b61a..dc5413c 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,8 +1,53 @@ Name: xosd Version: 2.2.14 -Release: 39%{?dist} +Release: 40%{?dist} Summary: On-screen display library for X -License: GPLv2+ +# 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 an exception +# () +# AND GPL-2.0-or-later +# config.guess: GPL-2.0-or-later WITH an exception (under review +# ) +# config.sub: GPL-2.0-or-later WITH an exception +# () +# configure: FSFUL AND GPL-2.0-or-later WITH an exception +# () +# depcomp: GPL-2.0-or-laterWITH an exception +# () +# INSTALL: FSFUL +# install-sh: HPND-sell-variant-like (waiting on an identifier +# ) +# ltconfig: GPL-2.0-or-later WITH an exception +# () +# ltmain.sh: GPL-2.0-or-later WITH an exception +# () +# macros/Makefile.in: FSFULLR +# Makefile.in: FSFULLR +# man/Makefile.in: FSFULLR +# missing: GPL-2.0-or-later WITH an exception +# () +# 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 @@ -32,6 +77,7 @@ the effect of an On Screen Display, like your TV/VCR etc. %package devel Summary: Development files for the XOSD on-screen display library +License: GPL-2.0-or-later AND MIT-open-group Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libX11-devel Requires: libXext-devel @@ -87,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Thu Sep 08 2022 Petr Pisar - 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 - 2.2.14-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From c59a490507f292b523899473020203989d219fc8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:47:40 +0000 Subject: [PATCH 44/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index dc5413c..bf44657 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 40%{?dist} +Release: 41%{?dist} Summary: On-screen display library for X # COPYING: GPL-2.0 text # man/osd_cat.1: GPL-1.0-or-later @@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.2.14-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Sep 08 2022 Petr Pisar - 2.2.14-40 - License corrected to "GPL-2.0-or-later AND GPL-1.0-or-later AND MIT-open-group From 13d60f9b08d657fed88ac110cd26031a34b36e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 16 Feb 2023 10:39:35 +0100 Subject: [PATCH 45/55] New license identifiers accepted by SPDX Links will be removed once they are recognized by Fedora. --- xosd.spec | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/xosd.spec b/xosd.spec index bf44657..fdd59dc 100644 --- a/xosd.spec +++ b/xosd.spec @@ -18,28 +18,27 @@ Summary: On-screen display library for X # 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 an exception +# 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 an exception (under review +# config.guess: GPL-2.0-or-later WITH Autoconf-exception-generic (under review # ) -# config.sub: GPL-2.0-or-later WITH an exception +# config.sub: GPL-2.0-or-later WITH Autoconf-exception-generic # () -# configure: FSFUL AND GPL-2.0-or-later WITH an exception +# configure: FSFUL AND GPL-2.0-or-later WITH Autoconf-exception-generic # () -# depcomp: GPL-2.0-or-laterWITH an exception +# depcomp: GPL-2.0-or-later WITH Autoconf-exception-generic # () # INSTALL: FSFUL -# install-sh: HPND-sell-variant-like (waiting on an identifier -# ) -# ltconfig: GPL-2.0-or-later WITH an exception +# install-sh: HPND-sell-variant +# ltconfig: GPL-2.0-or-later WITH Autoconf-exception-generic # () -# ltmain.sh: GPL-2.0-or-later WITH an exception +# 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 an exception +# missing: GPL-2.0-or-later WITH Autoconf-exception-generic # () # pixmaps/Makefile.in: FSFULLR # script/Makefile.in: FSFULLR From 30e4238df7279a0cd4d1f1f2519190a6182aba60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 21 Feb 2023 16:18:25 +0100 Subject: [PATCH 46/55] Autoconf-exception-generic recognized by Fedora --- xosd.spec | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/xosd.spec b/xosd.spec index fdd59dc..4651efe 100644 --- a/xosd.spec +++ b/xosd.spec @@ -19,27 +19,19 @@ Summary: On-screen display library for X # 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 (under review -# ) +# 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 From c2c6165dc6265353a9376e3d8a180ceb49770aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 21 Feb 2023 16:20:50 +0100 Subject: [PATCH 47/55] Package sonames explicitly --- xosd.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 4651efe..de7321a 100644 --- a/xosd.spec +++ b/xosd.spec @@ -112,7 +112,8 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %license COPYING %doc AUTHORS ChangeLog README TODO %{_bindir}/osd_cat -%{_libdir}/libxosd.so.* +%{_libdir}/libxosd.so.2 +%{_libdir}/libxosd.so.2.* %{_mandir}/man1/osd_cat.1* %files devel From 6fdd882784871df3f6139f8d04358e4854395f82 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:13:16 +0000 Subject: [PATCH 48/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index de7321a..80dc762 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 41%{?dist} +Release: 42%{?dist} Summary: On-screen display library for X # COPYING: GPL-2.0 text # man/osd_cat.1: GPL-1.0-or-later @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.2.14-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 2.2.14-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 207ff537696f1fae65a567b4e7742b3471c37109 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:03:05 +0000 Subject: [PATCH 49/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 80dc762..efc646b 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 42%{?dist} +Release: 43%{?dist} Summary: On-screen display library for X # COPYING: GPL-2.0 text # man/osd_cat.1: GPL-1.0-or-later @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.2.14-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.2.14-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 0565fa4d911709e4e6123c18b6f5ccc6c6a7364f Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:50 +0200 Subject: [PATCH 50/55] Eliminate use of obsolete %patchN syntax (#2283636) --- xosd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xosd.spec b/xosd.spec index efc646b..4191802 100644 --- a/xosd.spec +++ b/xosd.spec @@ -80,8 +80,8 @@ 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 From da57fcf3a0b31b16eb5f2c373c617800590a0c18 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:23:31 +0000 Subject: [PATCH 51/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 4191802..be96181 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 43%{?dist} +Release: 44%{?dist} Summary: On-screen display library for X # COPYING: GPL-2.0 text # man/osd_cat.1: GPL-1.0-or-later @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.2.14-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.2.14-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9a5ed4ce07ac0771be395c353818b09f8c464802 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:12:39 +0000 Subject: [PATCH 52/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index be96181..749b423 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 44%{?dist} +Release: 45%{?dist} Summary: On-screen display library for X # COPYING: GPL-2.0 text # man/osd_cat.1: GPL-1.0-or-later @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.2.14-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 2.2.14-44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d7855a28abf10d0829d74b8295c9041f6c4d9f3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:01:54 +0000 Subject: [PATCH 53/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 749b423..dccca10 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 45%{?dist} +Release: 46%{?dist} Summary: On-screen display library for X # COPYING: GPL-2.0 text # man/osd_cat.1: GPL-1.0-or-later @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.2.14-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 2.2.14-45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7479be08995d44ccf492c8687cde711e8cb223f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 20 Jan 2026 03:31:47 +0000 Subject: [PATCH 54/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index dccca10..dacfdb8 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 46%{?dist} +Release: 47%{?dist} Summary: On-screen display library for X # COPYING: GPL-2.0 text # man/osd_cat.1: GPL-1.0-or-later @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Tue Jan 20 2026 Fedora Release Engineering - 2.2.14-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 2.2.14-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 06dd59ccfc9e721ed0746392db488e04df6627c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:23:55 +0000 Subject: [PATCH 55/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index dacfdb8..3fe714a 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,6 +1,6 @@ Name: xosd Version: 2.2.14 -Release: 47%{?dist} +Release: 48%{?dist} Summary: On-screen display library for X # COPYING: GPL-2.0 text # man/osd_cat.1: GPL-1.0-or-later @@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name} %{_mandir}/man3/xosd*.3* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.2.14-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Tue Jan 20 2026 Fedora Release Engineering - 2.2.14-47 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild