[packages/xosd] - rel 5, fix building without xmms

baggins baggins at pld-linux.org
Sun May 31 23:30:04 CEST 2026


commit 84f4cb2ec6f3dfa4c3d93678e4ad6e1dcf2b1442
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun May 31 23:29:50 2026 +0200

    - rel 5, fix building without xmms

 xosd.spec | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/xosd.spec b/xosd.spec
index f601025..bc16914 100644
--- a/xosd.spec
+++ b/xosd.spec
@@ -9,7 +9,7 @@ Summary(es.UTF-8):	Subtítulos (como en la tele) para X11
 Summary(pl.UTF-8):	Wyświetlanie napisów na ekranie podobnie jak w telewizorach (OSD)
 Name:		xosd
 Version:	2.2.14
-Release:	4
+Release:	5
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/libxosd/%{name}-%{version}.tar.gz
@@ -21,8 +21,8 @@ URL:		http://sourceforge.net/projects/libxosd/
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	libtool
-%if %{with xmms}
 BuildRequires:	gdk-pixbuf-devel >= 0.22.0
+%if %{with xmms}
 BuildRequires:	gtk+-devel >= 1.2.2
 BuildRequires:	rpmbuild(macros) >= 1.125
 BuildRequires:	xmms-devel >= 1.2.7
@@ -135,7 +135,9 @@ install -d $RPM_BUILD_ROOT{%{xmms_general_plugindir},%{_includedir}} \
 	DESTDIR=$RPM_BUILD_ROOT \
 	m4datadir=%{_aclocaldir}
 
+%if %{with xmms}
 %{__rm} $RPM_BUILD_ROOT%{xmms_general_plugindir}/*.la
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -149,6 +151,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/osd_cat
 %{_libdir}/libxosd.so.*.*.*
 %ghost %{_libdir}/libxosd.so.2
+%dir %{_datadir}/xosd
+%{_datadir}/xosd/*.png
 %{_mandir}/man1/osd_cat.1*
 
 %files devel
@@ -171,6 +175,4 @@ rm -rf $RPM_BUILD_ROOT
 %files -n xmms-general-xosd
 %defattr(644,root,root,755)
 %{xmms_general_plugindir}/libxmms_osd.so
-%dir %{_datadir}/xosd
-%{_datadir}/xosd/*.png
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xosd.git/commitdiff/84f4cb2ec6f3dfa4c3d93678e4ad6e1dcf2b1442



More information about the pld-cvs-commit mailing list