rpms/xosd/devel xosd-defaults.patch,1.1,1.2 xosd.spec,1.11,1.12
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Wed Apr 12 19:26:48 UTC 2006
Author: scop
Update of /cvs/extras/rpms/xosd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24976/devel
Modified Files:
xosd-defaults.patch xosd.spec
Log Message:
* Wed Apr 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.2.14-6
- Revert to upstream default font, require xorg-x11-fonts-base (#183971).
xosd-defaults.patch:
Index: xosd-defaults.patch
===================================================================
RCS file: /cvs/extras/rpms/xosd/devel/xosd-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xosd-defaults.patch 17 Mar 2005 21:57:09 -0000 1.1
+++ xosd-defaults.patch 12 Apr 2006 19:26:48 -0000 1.2
@@ -12,18 +12,6 @@
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
Index: xosd.spec
===================================================================
RCS file: /cvs/extras/rpms/xosd/devel/xosd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xosd.spec 12 Mar 2006 11:46:18 -0000 1.11
+++ xosd.spec 12 Apr 2006 19:26:48 -0000 1.12
@@ -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 @@
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 @@
%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 @@
%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 @@
%changelog
+* Wed Apr 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.2.14-6
+- Revert to upstream default font, require xorg-x11-fonts-base (#183971).
+
* Sun Mar 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.2.14-5
- Convert docs to UTF-8.
More information about the scm-commits
mailing list