From ffb2d3c0831d0cc9b40c1cf0751fa2d30b29b12d Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 05:35:37 +0000 Subject: [PATCH 01/60] Setup of module xosd --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..09cdbc4 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# 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/Rootx && { 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/sources b/sources new file mode 100644 index 0000000..e69de29 From 94b42ac4c011240ff2542e9693e32adae37a5f59 Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 05:35:39 +0000 Subject: [PATCH 02/60] =?UTF-8?q?auto-import=20changelog=20data=20from=20x?= =?UTF-8?q?osd-2.2.5-0.fdr.1.rh80.src.rpm=202.2.5-0.fdr.1=20-=20Update=20t?= =?UTF-8?q?o=202.2.5.=202.2.2-0.fdr.1=20-=20Update=20to=202.2.2.=202.2.1-0?= =?UTF-8?q?.fdr.1=20-=20Update=20to=202.2.1.=20-=20Disable=20gdk-pixbuf=20?= =?UTF-8?q?test,=20XOSD=20says=20it=20requires=20>=3D=200.22.0,=20but=200.?= =?UTF-8?q?18.0=20=20=20=20=20seems=20to=20work=20just=20fine.=202.2.0-0.f?= =?UTF-8?q?dr.1=20-=20Update=20to=202.2.0.=20-=20Rename=20XMMS=20plugin=20?= =?UTF-8?q?package=20to=20xmms-xosd,=20and=20obsolete=20xosd-xmms.=202.1.3?= =?UTF-8?q?-0.fdr.3=20-=20Require=20XFree86-devel=20in=20-devel=20(xosd-co?= =?UTF-8?q?nfig=20--libs).=202.1.3-0.fdr.2=20-=20Add=20epoch=20to=20devel?= =?UTF-8?q?=20and=20xmms=20Requires=20(#30=20comment=204).=20-=20Don't=20i?= =?UTF-8?q?nclude=20*.la=20in=20xmms=20package.=20-=20Save=20.spec=20in=20?= =?UTF-8?q?UTF-8.=202.1.3-0.fdr.1=20-=20Update=20to=202.1.3=20and=20curren?= =?UTF-8?q?t=20Fedora=20guidelines.=20-=20Don't=20include=20%{=5Flibdir}/*?= =?UTF-8?q?.la.=20Wed=20Feb=2026=202003=20Ville=20Skytt=C3=A4=20=20-=202.1.2-1.fedora.1=20-=20Update=20to=202?= =?UTF-8?q?.1.2.=20-=20Use=20%post(un)=20-p=20/sbin/ldconfig.=20Sat=20Feb?= =?UTF-8?q?=2008=202003=20Ville=20Skytt=C3=A4=20=20-=202.1.0-1.fedora.1=20-=20First=20Fedora=20release,=20bas?= =?UTF-8?q?ed=20on=20Matthias=20Saou's=20work.=20Wed=20Feb=2005=202003=20M?= =?UTF-8?q?atthias=20Saou=20=20-=20Upd?= =?UTF-8?q?ate=20to=202.1.0.=20-=20Spec=20file=20updates=20to=20reflect=20?= =?UTF-8?q?upstream=20changes.=20Wed=20Jan=2008=202003=20Matthias=20Saou?= =?UTF-8?q?=20=20-=20Update=20to=202.0?= =?UTF-8?q?.1.=20Mon=20Oct=2021=202002=20Matthias=20Saou=20=20-=20Update=20to=201.1.1.=20Sun=20Sep=20?= =?UTF-8?q?29=202002=20Matthias=20Saou=20=20-=20Update=20to=201.0.4.=20-=20Rebuilt=20for=20Red=20Hat?= =?UTF-8?q?=20Linux=208.0.=20Fri=20Aug=2030=202002=20Matthias=20Saou=20=20-=20Update=20to=201.0.3.=20?= =?UTF-8?q?Wed=20Aug=2028=202002=20Matthias=20Saou=20=20-=20Update=20to=201.0.2.=20-=20Fixed=20%defat?= =?UTF-8?q?tr=20for=20xmms=20plugin=20sub-package.=20Mon=20Jul=2022=202002?= =?UTF-8?q?=20Matthias=20Saou=20=20-?= =?UTF-8?q?=20Update=20to=201.0.0.=20-=20Spec=20file=20cleanup=20(near=20r?= =?UTF-8?q?ewrite),=20added=20devel=20and=20xmms=20sub-packages.=20Wed=20A?= =?UTF-8?q?ug=2001=202001=20Matthias=20Saou=20=20-=20Update=20to=200.7.0=20and=20spec=20file=20cleanu?= =?UTF-8?q?p.=20-=20Changed=20the=20plugin=20path.=20-=20Added=20ldconfig?= =?UTF-8?q?=20execution=20since=20I=20also=20changed=20the=20lib=20filenam?= =?UTF-8?q?e.=20Sat=20Feb=2003=202001=20Matthias=20Saou=20=20-=20Initial=20RPM=20release.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 1 + sources | 1 + xosd.spec | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+) create mode 100644 xosd.spec diff --git a/.cvsignore b/.cvsignore index e69de29..2d364e4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xosd-2.2.5.tar.gz diff --git a/sources b/sources index e69de29..f720513 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +96bae6f0800c1710d7d4edb3b37b01e5 xosd-2.2.5.tar.gz diff --git a/xosd.spec b/xosd.spec new file mode 100644 index 0000000..137e446 --- /dev/null +++ b/xosd.spec @@ -0,0 +1,160 @@ +%define plugdir %(xmms-config --general-plugin-dir) + +Name: xosd +Version: 2.2.5 +Release: 0.fdr.1.rh80 +Epoch: 0 +Summary: On-screen display library for X + +Group: System Environment/Libraries +License: GPL +URL: http://www.ignavus.net/software.html +Source: http://www.ignavus.net/xosd-2.2.5.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel, xmms-devel + +%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...) + +%package devel +Summary: Development files for the XOSD on-screen display library +Group: Development/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release}, XFree86-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: An XMMS plugin for on-screen display using the XOSD library +Group: Applications/Multimedia +Requires: %{name} = %{epoch}:%{version}-%{release}, xmms +Obsoletes: %{name}-xmms + +%description -n xmms-%{name} +An X MultiMedia System plugin to display information on-screen through +the XOSD library, similarly to TV OSD. + + +%prep +%setup -q + + +%build +# XOSD 2.2.1+ says it requires gdk-pixbuf >= 0.22.0, but it seems to work +# fine with older (0.18.0) versions. This is needed for the XMMS plugin. +%configure --disable-gdk_pixbuftest +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT{%{_libdir},%{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 +%{_bindir}/osd_cat +%{_libdir}/*.so.* +%{_datadir}/xosd +%{_mandir}/man1/osd_cat* + +%files devel +%defattr(-,root,root,-) +%{_bindir}/xosd-config +%{_includedir}/* +%{_libdir}/*.a +%{_libdir}/*.so +%{_datadir}/aclocal/* +%{_mandir}/man1/xosd-config* +%{_mandir}/man3/* + +%files -n xmms-%{name} +%defattr(-,root,root,-) +%{plugdir}/*.so + + +%changelog +* Sat Sep 27 2003 Ville Skyttä - 0:2.2.5-0.fdr.1 +- Update to 2.2.5. + +* Mon Jun 30 2003 Ville Skyttä - 0:2.2.2-0.fdr.1 +- Update to 2.2.2. + +* Sat Apr 19 2003 Ville Skyttä - 0:2.2.1-0.fdr.1 +- Update to 2.2.1. +- Disable gdk-pixbuf test, XOSD says it requires >= 0.22.0, but 0.18.0 + seems to work just fine. + +* Sun Apr 13 2003 Ville Skyttä - 0:2.2.0-0.fdr.1 +- Update to 2.2.0. +- Rename XMMS plugin package to xmms-xosd, and obsolete xosd-xmms. + +* Mon Apr 7 2003 Ville Skyttä - 0:2.1.3-0.fdr.3 +- Require XFree86-devel in -devel (xosd-config --libs). + +* Sat Apr 5 2003 Ville Skyttä - 0:2.1.3-0.fdr.2 +- Add epoch to devel and xmms Requires (#30 comment 4). +- Don't include *.la in xmms package. +- Save .spec in UTF-8. + +* Sat Mar 22 2003 Ville Skyttä - 0:2.1.3-0.fdr.1 +- Update to 2.1.3 and current Fedora guidelines. +- Don't include %%{_libdir}/*.la. + +* Wed Feb 26 2003 Ville Skyttä - 2.1.2-1.fedora.1 +- Update to 2.1.2. +- Use %%post(un) -p /sbin/ldconfig. + +* Sat Feb 8 2003 Ville Skyttä - 2.1.0-1.fedora.1 +- First Fedora release, based on Matthias Saou's work. + +* Wed Feb 5 2003 Matthias Saou +- Update to 2.1.0. +- Spec file updates to reflect upstream changes. + +* Wed Jan 8 2003 Matthias Saou +- Update to 2.0.1. + +* Mon Oct 21 2002 Matthias Saou +- Update to 1.1.1. + +* Sun Sep 29 2002 Matthias Saou +- Update to 1.0.4. +- Rebuilt for Red Hat Linux 8.0. + +* Fri Aug 30 2002 Matthias Saou +- Update to 1.0.3. + +* Wed Aug 28 2002 Matthias Saou +- Update to 1.0.2. +- Fixed %%defattr for xmms plugin sub-package. + +* Mon Jul 22 2002 Matthias Saou +- Update to 1.0.0. +- Spec file cleanup (near rewrite), added devel and xmms sub-packages. + +* Wed Aug 1 2001 Matthias Saou +- Update to 0.7.0 and spec file cleanup. +- Changed the plugin path. +- Added ldconfig execution since I also changed the lib filename. + +* Sat Feb 3 2001 Matthias Saou +- Initial RPM release. + From 909b7892362a8aa866e4e0d59f4cf944d4e7222a Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 05:35:45 +0000 Subject: [PATCH 03/60] auto-import changelog data from xosd-2.2.8-0.fdr.1.rh90.src.rpm 2.2.8-0.fdr.1 - Update to 2.2.8. 2.2.7-0.fdr.1 - Update to 2.2.7. 2.2.5-0.fdr.2 - Clean up "xosd-config --cflags". --- .cvsignore | 2 +- sources | 2 +- xosd.spec | 18 ++++++++++++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2d364e4..21fdc6d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xosd-2.2.5.tar.gz +xosd-2.2.8.tar.bz2 diff --git a/sources b/sources index f720513..bd63723 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -96bae6f0800c1710d7d4edb3b37b01e5 xosd-2.2.5.tar.gz +85b00f6609603139855775d6213980cb xosd-2.2.8.tar.bz2 diff --git a/xosd.spec b/xosd.spec index 137e446..17e367f 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,15 +1,15 @@ -%define plugdir %(xmms-config --general-plugin-dir) +%define plugdir %(xmms-config --general-plugin-dir 2>/dev/null) Name: xosd -Version: 2.2.5 -Release: 0.fdr.1.rh80 +Version: 2.2.8 +Release: 0.fdr.1.rh90 Epoch: 0 Summary: On-screen display library for X Group: System Environment/Libraries License: GPL URL: http://www.ignavus.net/software.html -Source: http://www.ignavus.net/xosd-2.2.5.tar.gz +Source: http://www.ignavus.net/xosd-2.2.8.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel, xmms-devel @@ -51,6 +51,7 @@ the XOSD library, similarly to TV OSD. # fine with older (0.18.0) versions. This is needed for the XMMS plugin. %configure --disable-gdk_pixbuftest make %{?_smp_mflags} +%{__perl} -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config %install @@ -91,6 +92,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 5 2004 Ville Skyttä - 0:2.2.8-0.fdr.1 +- Update to 2.2.8. + +* Tue May 25 2004 Ville Skyttä - 0:2.2.7-0.fdr.1 +- Update to 2.2.7. + +* Wed May 19 2004 Ville Skyttä - 0:2.2.5-0.fdr.2 +- Clean up "xosd-config --cflags". + * Sat Sep 27 2003 Ville Skyttä - 0:2.2.5-0.fdr.1 - Update to 2.2.5. From 43a2af21de2569a8d53e6c393c2eec098c4baed5 Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 05:35:51 +0000 Subject: [PATCH 04/60] auto-import changelog data from xosd-2.2.10-0.fdr.1.1.src.rpm 2.2.10-0.fdr.1 - Update to 2.2.10. - Patch to eliminate aclocal >= 1.8 warnings from libxosd.m4. --- .cvsignore | 2 +- sources | 2 +- xosd-aclocal18.patch | 11 +++++++++++ xosd.spec | 15 +++++++++++---- 4 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 xosd-aclocal18.patch diff --git a/.cvsignore b/.cvsignore index 21fdc6d..daf8127 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xosd-2.2.8.tar.bz2 +xosd-2.2.10.tar.bz2 diff --git a/sources b/sources index bd63723..aee95d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85b00f6609603139855775d6213980cb xosd-2.2.8.tar.bz2 +2a598c1e9f940830d04167c48845758c xosd-2.2.10.tar.bz2 diff --git a/xosd-aclocal18.patch b/xosd-aclocal18.patch new file mode 100644 index 0000000..921d922 --- /dev/null +++ b/xosd-aclocal18.patch @@ -0,0 +1,11 @@ +--- libxosd.m4~ 2004-08-20 01:39:40.000000000 +0300 ++++ libxosd.m4 2004-08-28 16:37:57.343670228 +0300 +@@ -6,7 +6,7 @@ + dnl AM_PATH_LIBXOSD([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) + dnl Test to see if libxosd is installed, and define LIBXOSD_CFLAGS, LIBXOSDLIBS + dnl +-AC_DEFUN(AM_PATH_LIBXOSD, ++AC_DEFUN([AM_PATH_LIBXOSD], + [dnl + dnl Get the cflags and libraries from the xosd-config script + dnl diff --git a/xosd.spec b/xosd.spec index 17e367f..83d05f4 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,15 +1,16 @@ %define plugdir %(xmms-config --general-plugin-dir 2>/dev/null) Name: xosd -Version: 2.2.8 -Release: 0.fdr.1.rh90 +Version: 2.2.10 +Release: 0.fdr.1.1 Epoch: 0 Summary: On-screen display library for X Group: System Environment/Libraries License: GPL URL: http://www.ignavus.net/software.html -Source: http://www.ignavus.net/xosd-2.2.8.tar.bz2 +Source: http://www.ignavus.net/xosd-2.2.10.tar.bz2 +Patch: %{name}-aclocal18.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel, xmms-devel @@ -44,6 +45,8 @@ the XOSD library, similarly to TV OSD. %prep %setup -q +%patch -p0 +chmod -x AUTHORS ChangeLog COPYING README `find src -type f` %build @@ -82,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/* %{_libdir}/*.a %{_libdir}/*.so -%{_datadir}/aclocal/* +%{_datadir}/aclocal/libxosd.m4 %{_mandir}/man1/xosd-config* %{_mandir}/man3/* @@ -92,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 28 2004 Ville Skyttä - 0:2.2.10-0.fdr.1 +- Update to 2.2.10. +- Patch to eliminate aclocal >= 1.8 warnings from libxosd.m4. + * Mon Jul 5 2004 Ville Skyttä - 0:2.2.8-0.fdr.1 - Update to 2.2.8. From 837b917d7449df940a89c9d3f03663aeb94f8137 Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 05:35:57 +0000 Subject: [PATCH 05/60] auto-import xosd-2.2.10-0.fdr.1.2 from xosd-2.2.10-0.fdr.1.2.src.rpm --- xosd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 83d05f4..1be55b3 100644 --- a/xosd.spec +++ b/xosd.spec @@ -2,7 +2,7 @@ Name: xosd Version: 2.2.10 -Release: 0.fdr.1.1 +Release: 0.fdr.1.2 Epoch: 0 Summary: On-screen display library for X From 1b3b2b6901d230627b9d6a9dea85f882f8d05ba4 Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 05:36:03 +0000 Subject: [PATCH 06/60] auto-import changelog data from xosd-2.2.12-0.fdr.1.2.src.rpm 2.2.12-0.fdr.1 - Update to 2.2.12. - Disable dependency tracking to speed up the build. - Include TODO in docs. 2.2.11-0.fdr.1 - Update to 2.2.11 (from Debian). - While at it, borrow patches from Debian's 2.2.11-2. --- .cvsignore | 2 +- sources | 2 +- xosd.spec | 23 ++++++++++++++++------- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index daf8127..c7f1ce3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xosd-2.2.10.tar.bz2 +xosd-2.2.12.tar.bz2 diff --git a/sources b/sources index aee95d5..7d6315c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a598c1e9f940830d04167c48845758c xosd-2.2.10.tar.bz2 +756d714cec908e4d4c956ff0e7dcd4c4 xosd-2.2.12.tar.bz2 diff --git a/xosd.spec b/xosd.spec index 1be55b3..06285ce 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,7 +1,7 @@ %define plugdir %(xmms-config --general-plugin-dir 2>/dev/null) Name: xosd -Version: 2.2.10 +Version: 2.2.12 Release: 0.fdr.1.2 Epoch: 0 Summary: On-screen display library for X @@ -9,8 +9,8 @@ Summary: On-screen display library for X Group: System Environment/Libraries License: GPL URL: http://www.ignavus.net/software.html -Source: http://www.ignavus.net/xosd-2.2.10.tar.bz2 -Patch: %{name}-aclocal18.patch +Source: http://www.ignavus.net/xosd-2.2.12.tar.bz2 +Patch0: %{name}-aclocal18.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel, xmms-devel @@ -45,14 +45,14 @@ the XOSD library, similarly to TV OSD. %prep %setup -q -%patch -p0 -chmod -x AUTHORS ChangeLog COPYING README `find src -type f` +%patch0 -p0 +chmod -x AUTHORS ChangeLog COPYING README TODO `find src -type f` %build # XOSD 2.2.1+ says it requires gdk-pixbuf >= 0.22.0, but it seems to work # fine with older (0.18.0) versions. This is needed for the XMMS plugin. -%configure --disable-gdk_pixbuftest +%configure --disable-gdk_pixbuftest --disable-dependency-tracking make %{?_smp_mflags} %{__perl} -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config @@ -73,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README +%doc AUTHORS ChangeLog COPYING README TODO %{_bindir}/osd_cat %{_libdir}/*.so.* %{_datadir}/xosd @@ -95,6 +95,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Sep 14 2004 Ville Skyttä - 0:2.2.12-0.fdr.1 +- Update to 2.2.12. +- Disable dependency tracking to speed up the build. +- Include TODO in docs. + +* Sun Sep 12 2004 Ville Skyttä - 0:2.2.11-0.fdr.1 +- Update to 2.2.11 (from Debian). +- While at it, borrow patches from Debian's 2.2.11-2. + * Sat Aug 28 2004 Ville Skyttä - 0:2.2.10-0.fdr.1 - Update to 2.2.10. - Patch to eliminate aclocal >= 1.8 warnings from libxosd.m4. From 294b513da8f5ae82683449525dfe5759e24af57a Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 11 Nov 2004 19:21:37 +0000 Subject: [PATCH 07/60] Release bumping to provide upgrade path from non-fedora.us packages. A few minor tweaks here and there. --- xosd.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/xosd.spec b/xosd.spec index 06285ce..d88f927 100644 --- a/xosd.spec +++ b/xosd.spec @@ -2,14 +2,13 @@ Name: xosd Version: 2.2.12 -Release: 0.fdr.1.2 -Epoch: 0 +Release: 2 Summary: On-screen display library for X Group: System Environment/Libraries License: GPL URL: http://www.ignavus.net/software.html -Source: http://www.ignavus.net/xosd-2.2.12.tar.bz2 +Source: http://www.ignavus.net/xosd-%{version}.tar.bz2 Patch0: %{name}-aclocal18.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,7 +24,7 @@ interesting things as they change (song name, volume etc...) %package devel Summary: Development files for the XOSD on-screen display library Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release}, XFree86-devel +Requires: %{name} = %{version}-%{release}, XFree86-devel %description devel The xosd-devel package contains static libraries, header files and @@ -35,8 +34,8 @@ display. %package -n xmms-%{name} Summary: An XMMS plugin for on-screen display using the XOSD library Group: Applications/Multimedia -Requires: %{name} = %{epoch}:%{version}-%{release}, xmms -Obsoletes: %{name}-xmms +Requires: %{name} = %{version}-%{release}, xmms +Obsoletes: %{name}-xmms <= 2.2.12 %description -n xmms-%{name} An X MultiMedia System plugin to display information on-screen through @@ -95,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 10 2004 Matthias Saou 2.2.12-2 +- Bump release to provide Extras upgrade path. +- Remove zero epochs. + * Tue Sep 14 2004 Ville Skyttä - 0:2.2.12-0.fdr.1 - Update to 2.2.12. - Disable dependency tracking to speed up the build. From 735a7c77e164b9f007c08acdafd5163df1482c0e Mon Sep 17 00:00:00 2001 From: gafton Date: Wed, 24 Nov 2004 05:10:29 +0000 Subject: [PATCH 08/60] Fix braindead typo from the original import --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 09cdbc4..c5cea9f 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f CVS/Rootx && { 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 +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)) From 0db2a2833a46a08b2677cae96ee44aa4919afbe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 29 Nov 2004 18:40:26 +0000 Subject: [PATCH 09/60] Update to 2.2.14. --- .cvsignore | 1 + sources | 2 +- xosd.spec | 17 +++++++++-------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index c7f1ce3..60e62bc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ xosd-2.2.12.tar.bz2 +xosd_2.2.14.orig.tar.gz diff --git a/sources b/sources index 7d6315c..c0f472e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -756d714cec908e4d4c956ff0e7dcd4c4 xosd-2.2.12.tar.bz2 +4b349fe930e4eee2f504d6c02673e24d xosd_2.2.14.orig.tar.gz diff --git a/xosd.spec b/xosd.spec index d88f927..020619a 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,18 +1,18 @@ %define plugdir %(xmms-config --general-plugin-dir 2>/dev/null) Name: xosd -Version: 2.2.12 -Release: 2 +Version: 2.2.14 +Release: 1 Summary: On-screen display library for X Group: System Environment/Libraries License: GPL URL: http://www.ignavus.net/software.html -Source: http://www.ignavus.net/xosd-%{version}.tar.bz2 +Source: http://ftp.debian.org/debian/pool/main/x/xosd/xosd_2.2.14.orig.tar.gz Patch0: %{name}-aclocal18.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel, xmms-devel +BuildRequires: gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel >= 1:0.22.0, xmms-devel %description XOSD displays text on your screen, sounds simple right? The difference @@ -45,13 +45,10 @@ the XOSD library, similarly to TV OSD. %prep %setup -q %patch0 -p0 -chmod -x AUTHORS ChangeLog COPYING README TODO `find src -type f` %build -# XOSD 2.2.1+ says it requires gdk-pixbuf >= 0.22.0, but it seems to work -# fine with older (0.18.0) versions. This is needed for the XMMS plugin. -%configure --disable-gdk_pixbuftest --disable-dependency-tracking +%configure --disable-dependency-tracking make %{?_smp_mflags} %{__perl} -pi -e "s|$RPM_OPT_FLAGS\\s*|| ; s|\\s*-Wall||" script/xosd-config @@ -94,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 29 2004 Ville Skyttä - 2.2.14-1 +- Update to 2.2.14 (from Debian). +- Drop pre-FC1 gdk-pixbuf compatibility kludges. + * Wed Nov 10 2004 Matthias Saou 2.2.12-2 - Bump release to provide Extras upgrade path. - Remove zero epochs. From 6dcf0ed6476c176fd1e203a07cba7e6a2680e880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 17 Mar 2005 21:57:09 +0000 Subject: [PATCH 10/60] Add BMP plugin subpackage, improve default config. --- xosd-defaults.patch | 40 ++++++++++++++++++++++++++++++++++++++++ xosd.spec | 33 +++++++++++++++++++++++++++------ 2 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 xosd-defaults.patch diff --git a/xosd-defaults.patch b/xosd-defaults.patch new file mode 100644 index 0000000..43ff81e --- /dev/null +++ b/xosd-defaults.patch @@ -0,0 +1,40 @@ +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/libxosd/xosd.c xosd-2.2.14/src/libxosd/xosd.c +--- xosd-2.2.14.orig/src/libxosd/xosd.c 2004-11-17 21:27:11.000000000 +0200 ++++ xosd-2.2.14/src/libxosd/xosd.c 2005-03-17 23:43:48.000000000 +0200 +@@ -24,7 +24,7 @@ + #define XOFFSET 10 + + const char *osd_default_font = +- "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*"; ++ "-*-luxi sans-*-r-*-*-17-*-*-*-*-*-*-*"; + #if 0 + "-adobe-helvetica-bold-r-*-*-10-*"; + #endif +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 020619a..40c9ecd 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,8 +1,9 @@ -%define plugdir %(xmms-config --general-plugin-dir 2>/dev/null) +%define xmms_plugdir %(xmms-config --general-plugin-dir 2>/dev/null) +%define bmp_plugdir %(pkg-config bmp --variable=general_plugin_dir 2>/dev/null) Name: xosd Version: 2.2.14 -Release: 1 +Release: 2 Summary: On-screen display library for X Group: System Environment/Libraries @@ -10,9 +11,11 @@ License: GPL URL: http://www.ignavus.net/software.html Source: http://ftp.debian.org/debian/pool/main/x/xosd/xosd_2.2.14.orig.tar.gz Patch0: %{name}-aclocal18.patch +Patch1: %{name}-defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel >= 1:0.22.0, xmms-devel +BuildRequires: bmp-devel %description XOSD displays text on your screen, sounds simple right? The difference @@ -32,19 +35,29 @@ documentation for developing applications that use the XOSD on-screen display. %package -n xmms-%{name} -Summary: An XMMS plugin for on-screen display using the XOSD library +Summary: XMMS plugin for on-screen display using the XOSD library Group: Applications/Multimedia Requires: %{name} = %{version}-%{release}, xmms Obsoletes: %{name}-xmms <= 2.2.12 %description -n xmms-%{name} -An X MultiMedia System plugin to display information on-screen through +X MultiMedia System plugin to display information on-screen through +the XOSD library, similarly to TV OSD. + +%package -n bmp-%{name} +Summary: BMP plugin for on-screen display using the XOSD library +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release}, bmp + +%description -n bmp-%{name} +Beep Media Player plugin to display information on-screen through the XOSD library, similarly to TV OSD. %prep %setup -q %patch0 -p0 +%patch1 -p1 %build @@ -56,7 +69,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT{%{_libdir},%{plugdir}}/*.la +rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir},%{bmp_plugdir}}/*.la %clean @@ -87,10 +100,18 @@ rm -rf $RPM_BUILD_ROOT %files -n xmms-%{name} %defattr(-,root,root,-) -%{plugdir}/*.so +%{xmms_plugdir}/*.so + +%files -n bmp-%{name} +%defattr(-,root,root,-) +%{bmp_plugdir}/*.so %changelog +* Thu Mar 17 2005 Ville Skyttä - 2.2.14-2 +- Add Beep Media Player plugin subpackage. +- Improve default font and plugin OSD placement. + * Mon Nov 29 2004 Ville Skyttä - 2.2.14-1 - Update to 2.2.14 (from Debian). - Drop pre-FC1 gdk-pixbuf compatibility kludges. From 2704bf676be50385fc440a959cfb2d37d323f437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 20 May 2005 18:34:30 +0000 Subject: [PATCH 11/60] Arch sync rebuild. --- xosd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xosd.spec b/xosd.spec index 40c9ecd..416c809 100644 --- a/xosd.spec +++ b/xosd.spec @@ -3,13 +3,13 @@ Name: xosd Version: 2.2.14 -Release: 2 +Release: 3 Summary: On-screen display library for X Group: System Environment/Libraries License: GPL URL: http://www.ignavus.net/software.html -Source: http://ftp.debian.org/debian/pool/main/x/xosd/xosd_2.2.14.orig.tar.gz +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) @@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 19 2005 Ville Skyttä - 2.2.14-3 +- Rebuild. + * Thu Mar 17 2005 Ville Skyttä - 2.2.14-2 - Add Beep Media Player plugin subpackage. - Improve default font and plugin OSD placement. From 921efb05b44c2371e5cdd4f113055a7e644e43c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 17 Nov 2005 16:54:03 +0000 Subject: [PATCH 12/60] - Adapt to modular X packaging. - Don't ship static libraries by default. - Specfile cleanups. --- xosd.spec | 54 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/xosd.spec b/xosd.spec index 416c809..084cee2 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,9 +1,11 @@ +%bcond_with static + %define xmms_plugdir %(xmms-config --general-plugin-dir 2>/dev/null) %define bmp_plugdir %(pkg-config bmp --variable=general_plugin_dir 2>/dev/null) Name: xosd Version: 2.2.14 -Release: 3 +Release: 4%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries @@ -14,7 +16,14 @@ Patch0: %{name}-aclocal18.patch Patch1: %{name}-defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk+-devel >= 1:1.2.2, gdk-pixbuf-devel >= 1:0.22.0, xmms-devel +# Needed for main xosd: +BuildRequires: libX11-devel +BuildRequires: libXext-devel +BuildRequires: libXinerama-devel +# ...and for the bmp and xmms plugins: +BuildRequires: gtk+-devel >= 1:1.2.2 +BuildRequires: gdk-pixbuf-devel >= 1:0.22.0 +BuildRequires: xmms-devel BuildRequires: bmp-devel %description @@ -27,7 +36,10 @@ interesting things as they change (song name, volume etc...) %package devel Summary: Development files for the XOSD on-screen display library Group: Development/Libraries -Requires: %{name} = %{version}-%{release}, XFree86-devel +Requires: %{name} = %{version}-%{release} +Requires: libX11-devel +Requires: libXext-devel +Requires: libXinerama-devel %description devel The xosd-devel package contains static libraries, header files and @@ -37,7 +49,8 @@ display. %package -n xmms-%{name} Summary: XMMS plugin for on-screen display using the XOSD library Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release}, xmms +Requires: %{name} = %{version}-%{release} +Requires: xmms Obsoletes: %{name}-xmms <= 2.2.12 %description -n xmms-%{name} @@ -47,7 +60,8 @@ the XOSD library, similarly to TV OSD. %package -n bmp-%{name} Summary: BMP plugin for on-screen display using the XOSD library Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release}, bmp +Requires: %{name} = %{version}-%{release} +Requires: bmp %description -n bmp-%{name} Beep Media Player plugin to display information on-screen through @@ -61,7 +75,7 @@ the XOSD library, similarly to TV OSD. %build -%configure --disable-dependency-tracking +%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 @@ -77,6 +91,7 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig @@ -84,30 +99,37 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{_bindir}/osd_cat -%{_libdir}/*.so.* -%{_datadir}/xosd -%{_mandir}/man1/osd_cat* +%{_libdir}/libxosd.so.* +%{_datadir}/xosd/ +%{_mandir}/man1/osd_cat.1* %files devel %defattr(-,root,root,-) %{_bindir}/xosd-config -%{_includedir}/* -%{_libdir}/*.a -%{_libdir}/*.so +%{_includedir}/xosd.h +%{_libdir}/libxosd.so +%if %{with static} +%{_libdir}/libxosd.a +%endif %{_datadir}/aclocal/libxosd.m4 -%{_mandir}/man1/xosd-config* -%{_mandir}/man3/* +%{_mandir}/man1/xosd-config.1* +%{_mandir}/man3/xosd*.3* %files -n xmms-%{name} %defattr(-,root,root,-) -%{xmms_plugdir}/*.so +%{xmms_plugdir}/libxmms_osd.so %files -n bmp-%{name} %defattr(-,root,root,-) -%{bmp_plugdir}/*.so +%{bmp_plugdir}/libbmp_osd.so %changelog +* Thu Nov 17 2005 Ville Skyttä - 2.2.14-4 +- Adapt to modular X packaging. +- Don't ship static libraries by default. +- Specfile cleanups. + * Thu May 19 2005 Ville Skyttä - 2.2.14-3 - Rebuild. From 87c044fd23b05659762852fddf3ab14e47d52323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 12 Mar 2006 11:46:18 +0000 Subject: [PATCH 13/60] - Convert docs to UTF-8. --- xosd.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index 084cee2..15f0250 100644 --- a/xosd.spec +++ b/xosd.spec @@ -5,7 +5,7 @@ Name: xosd Version: 2.2.14 -Release: 4%{?dist} +Release: 5%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries @@ -72,6 +72,9 @@ the XOSD library, similarly to TV OSD. %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 ; mv $f.utf8 $f +done %build @@ -125,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Mar 12 2006 Ville Skyttä - 2.2.14-5 +- Convert docs to UTF-8. + * Thu Nov 17 2005 Ville Skyttä - 2.2.14-4 - Adapt to modular X packaging. - Don't ship static libraries by default. From ff3bea153004ae2c359d03962601d5a097585956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 12 Apr 2006 19:26:48 +0000 Subject: [PATCH 14/60] - Revert to upstream default font, require xorg-x11-fonts-base (#183971). --- xosd-defaults.patch | 12 ------------ xosd.spec | 17 ++++++++++------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/xosd-defaults.patch b/xosd-defaults.patch index 43ff81e..914bd77 100644 --- a/xosd-defaults.patch +++ b/xosd-defaults.patch @@ -12,18 +12,6 @@ diff -Naru xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c xosd-2.2.14/src/bmp_plugin/ shadow_offset = 1; outline_offset = 0; pos = XOSD_bottom; -diff -Naru xosd-2.2.14.orig/src/libxosd/xosd.c xosd-2.2.14/src/libxosd/xosd.c ---- xosd-2.2.14.orig/src/libxosd/xosd.c 2004-11-17 21:27:11.000000000 +0200 -+++ xosd-2.2.14/src/libxosd/xosd.c 2005-03-17 23:43:48.000000000 +0200 -@@ -24,7 +24,7 @@ - #define XOFFSET 10 - - const char *osd_default_font = -- "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*"; -+ "-*-luxi sans-*-r-*-*-17-*-*-*-*-*-*-*"; - #if 0 - "-adobe-helvetica-bold-r-*-*-10-*"; - #endif 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 diff --git a/xosd.spec b/xosd.spec index 15f0250..e7ccbe7 100644 --- a/xosd.spec +++ b/xosd.spec @@ -5,7 +5,7 @@ Name: xosd Version: 2.2.14 -Release: 5%{?dist} +Release: 6%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries @@ -16,15 +16,11 @@ Patch0: %{name}-aclocal18.patch Patch1: %{name}-defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Needed for main xosd: BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXinerama-devel -# ...and for the bmp and xmms plugins: -BuildRequires: gtk+-devel >= 1:1.2.2 -BuildRequires: gdk-pixbuf-devel >= 1:0.22.0 -BuildRequires: xmms-devel -BuildRequires: bmp-devel +# As of 2.2.14, the default font *must* be found, even if not used (#183971) +Requires: xorg-x11-fonts-base %description XOSD displays text on your screen, sounds simple right? The difference @@ -49,6 +45,9 @@ 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 @@ -60,6 +59,7 @@ the XOSD library, similarly to TV OSD. %package -n bmp-%{name} Summary: BMP plugin for on-screen display using the XOSD library Group: Applications/Multimedia +BuildRequires: bmp-devel Requires: %{name} = %{version}-%{release} Requires: bmp @@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 12 2006 Ville Skyttä - 2.2.14-6 +- Revert to upstream default font, require xorg-x11-fonts-base (#183971). + * Sun Mar 12 2006 Ville Skyttä - 2.2.14-5 - Convert docs to UTF-8. From 6cd370ac503d92a5bec083d81503e53474f53ef5 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 16 Jun 2006 19:02:47 +0000 Subject: [PATCH 15/60] Rebuild against new libgdk_pixbuf --- xosd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xosd.spec b/xosd.spec index e7ccbe7..e50bbe1 100644 --- a/xosd.spec +++ b/xosd.spec @@ -5,7 +5,7 @@ Name: xosd Version: 2.2.14 -Release: 6%{?dist} +Release: 7%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries @@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 16 2006 Kevin Fenzi - 2.2.14-7 +- Rebuild against new libgdk_pixbuf + * Wed Apr 12 2006 Ville Skyttä - 2.2.14-6 - Revert to upstream default font, require xorg-x11-fonts-base (#183971). From 192c4c2f63d82d554ccc2a9d50eac89a5fd6f3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 21:18:19 +0000 Subject: [PATCH 16/60] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 31046071afcbe4a7d9d1e8c7204cb0497f02dc59 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 28 Aug 2006 04:34:50 +0000 Subject: [PATCH 17/60] Rebuild for fc6 --- needs.rebuild | 1 - xosd.spec | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild diff --git a/xosd.spec b/xosd.spec index e50bbe1..4a2fdbb 100644 --- a/xosd.spec +++ b/xosd.spec @@ -5,7 +5,7 @@ Name: xosd Version: 2.2.14 -Release: 7%{?dist} +Release: 8%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries @@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 27 2006 Kevin Fenzi - 2.2.14-8 +- Rebuild for fc6 + * Fri Jun 16 2006 Kevin Fenzi - 2.2.14-7 - Rebuild against new libgdk_pixbuf From b28fecc5d1df6dac2781dd5d75563b460243b1aa Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 27 Feb 2007 17:14:23 +0000 Subject: [PATCH 18/60] Remove bmp subpackage, as bmp is no longer shipped. --- xosd.spec | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/xosd.spec b/xosd.spec index 4a2fdbb..037c4d5 100644 --- a/xosd.spec +++ b/xosd.spec @@ -1,11 +1,10 @@ %bcond_with static %define xmms_plugdir %(xmms-config --general-plugin-dir 2>/dev/null) -%define bmp_plugdir %(pkg-config bmp --variable=general_plugin_dir 2>/dev/null) Name: xosd Version: 2.2.14 -Release: 8%{?dist} +Release: 9%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries @@ -56,18 +55,6 @@ Obsoletes: %{name}-xmms <= 2.2.12 X MultiMedia System plugin to display information on-screen through the XOSD library, similarly to TV OSD. -%package -n bmp-%{name} -Summary: BMP plugin for on-screen display using the XOSD library -Group: Applications/Multimedia -BuildRequires: bmp-devel -Requires: %{name} = %{version}-%{release} -Requires: bmp - -%description -n bmp-%{name} -Beep Media Player plugin to display information on-screen through -the XOSD library, similarly to TV OSD. - - %prep %setup -q %patch0 -p0 @@ -86,7 +73,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir},%{bmp_plugdir}}/*.la +rm -f $RPM_BUILD_ROOT{%{_libdir},%{xmms_plugdir}}/*.la %clean @@ -122,12 +109,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{xmms_plugdir}/libxmms_osd.so -%files -n bmp-%{name} -%defattr(-,root,root,-) -%{bmp_plugdir}/libbmp_osd.so - - %changelog +* Tue Feb 27 2007 Kevin Fenzi - 2.2.14-9 +- Remove bmp subpackage, as bmp is no longer shipped. + * Sun Aug 27 2006 Kevin Fenzi - 2.2.14-8 - Rebuild for fc6 From 7c18550db3ace3b4cae0e5d457455846c982d1e1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 27 Aug 2007 04:18:40 +0000 Subject: [PATCH 19/60] Update License tag --- xosd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xosd.spec b/xosd.spec index 037c4d5..62fcd8e 100644 --- a/xosd.spec +++ b/xosd.spec @@ -4,11 +4,11 @@ Name: xosd Version: 2.2.14 -Release: 9%{?dist} +Release: 10%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries -License: GPL +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 @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{xmms_plugdir}/libxmms_osd.so %changelog +* Sun Aug 26 2007 Kevin Fenzi - 2.2.14-10 +- Update License tag + * Tue Feb 27 2007 Kevin Fenzi - 2.2.14-9 - Remove bmp subpackage, as bmp is no longer shipped. From 3de29b4a7973947e2d1a3d041c0d3eab70c8c3c6 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 10 Feb 2008 18:56:44 +0000 Subject: [PATCH 20/60] 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 21/60] - 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 22/60] - 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 23/60] 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 5e55ca2a8241916985a420cb3b74b2e16e21eb69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:09:06 +0000 Subject: [PATCH 24/60] 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 25/60] - 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 26/60] 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 27/60] 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 28/60] 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 29/60] 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 30/60] 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 31/60] 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 32/60] 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 33/60] - 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 34/60] - 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 35/60] 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 36/60] - 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 37/60] - 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 38/60] - 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 39/60] - 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 40/60] - 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 41/60] - 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 42/60] - 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 43/60] - 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 44/60] - 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 45/60] 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 46/60] - 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 47/60] 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 48/60] - 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 49/60] - 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 50/60] - 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 51/60] 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 52/60] - 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 53/60] - 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 54/60] 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 55/60] - 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 56/60] - 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 57/60] 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 58/60] 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 59/60] 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 7859998519b3d94c33e2c4332eca7db41f8b0164 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Tue, 31 Oct 2023 00:34:55 +0300 Subject: [PATCH 60/60] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 87e6034..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (xosd-2.2.14.tar.gz) = 3caf6d106d34488f4823e2a58fdff7a69b90f505b8da2443485167ff0362c6f27614c9a5019e738ff1f897d3c2249c934ff60953e3775566d66e8e9b30e4e473