diff --git a/sources b/sources index 87e6034..97a1f93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xosd-2.2.14.tar.gz) = 3caf6d106d34488f4823e2a58fdff7a69b90f505b8da2443485167ff0362c6f27614c9a5019e738ff1f897d3c2249c934ff60953e3775566d66e8e9b30e4e473 +4b349fe930e4eee2f504d6c02673e24d xosd-2.2.14.tar.gz diff --git a/xosd.spec b/xosd.spec index 3fe714a..92a3bcd 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,52 +1,15 @@ Name: xosd Version: 2.2.14 -Release: 48%{?dist} +Release: 29%{?dist} Summary: On-screen display library for X -# 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 +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 -BuildRequires: gcc # glibc-common for iconv BuildRequires: glibc-common BuildRequires: libtool @@ -56,7 +19,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-misc +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 @@ -68,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 -License: GPL-2.0-or-later AND MIT-open-group Requires: %{name}%{?_isa} = %{version}-%{release} Requires: libX11-devel Requires: libXext-devel @@ -80,8 +42,8 @@ on-screen display. %prep %setup -q -%patch -P0 -p0 -%patch -P1 -p1 +%patch0 -p0 +%patch1 -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 @@ -99,21 +61,22 @@ done --disable-new-plugin --disable-old-plugin \ --disable-beep_media_player_plugin\ --enable-xinerama -%{make_build} +make %{?_smp_mflags} perl -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config %install -%{make_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} +%ldconfig_scriptlets + %files %license COPYING %doc AUTHORS ChangeLog README TODO %{_bindir}/osd_cat -%{_libdir}/libxosd.so.2 -%{_libdir}/libxosd.so.2.* +%{_libdir}/libxosd.so.* %{_mandir}/man1/osd_cat.1* %files devel @@ -125,64 +88,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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