rpms/xosd/FC-1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xosd.spec, 1.4, 1.5
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Mon Nov 29 18:23:21 UTC 2004
- Previous message: rpms/xosd/FC-2 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xosd.spec, 1.5, 1.6
- Next message: rpms/xosd/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xosd.spec, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Changeset from: scop
Update of /cvs/extras/rpms/xosd/FC-1
In directory cvs.fedora.redhat.com:/tmp/cvs-serv29908/FC-1
Modified Files:
.cvsignore sources xosd.spec
Log Message:
Sync with fedora.us 2.2.12-0.fdr.2.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xosd/FC-1/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 8 Nov 2004 05:36:00 -0000 1.5
+++ .cvsignore 29 Nov 2004 18:23:19 -0000 1.6
@@ -1 +1,2 @@
xosd-2.2.12.tar.bz2
+xosd_2.2.12-2.diff.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xosd/FC-1/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 8 Nov 2004 05:36:00 -0000 1.5
+++ sources 29 Nov 2004 18:23:19 -0000 1.6
@@ -1 +1,2 @@
756d714cec908e4d4c956ff0e7dcd4c4 xosd-2.2.12.tar.bz2
+8a1dc565650c83bfd3191a3c75e2c695 xosd_2.2.12-2.diff.gz
Index: xosd.spec
===================================================================
RCS file: /cvs/extras/rpms/xosd/FC-1/xosd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xosd.spec 8 Nov 2004 05:36:00 -0000 1.4
+++ xosd.spec 29 Nov 2004 18:23:19 -0000 1.5
@@ -2,7 +2,7 @@
Name: xosd
Version: 2.2.12
-Release: 0.fdr.1.1
+Release: 0.fdr.2.1
Epoch: 0
Summary: On-screen display library for X
@@ -11,9 +11,10 @@
URL: http://www.ignavus.net/software.html
Source: http://www.ignavus.net/xosd-2.2.12.tar.bz2
Patch0: %{name}-aclocal18.patch
+Patch1: http://pint.pmhahn.de/pmhahn/debian/sid/x/xosd/xosd_2.2.12-2.diff.gz
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 xmms-devel
%description
XOSD displays text on your screen, sounds simple right? The difference
@@ -46,6 +47,10 @@
%prep
%setup -q
%patch0 -p0
+%patch1 -p1
+for file in debian/patches/*.diff ; do
+ %{__patch} -p0 < $file
+done
chmod -x AUTHORS ChangeLog COPYING README TODO `find src -type f`
@@ -95,6 +100,10 @@
%changelog
+* Wed Nov 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.12-0.fdr.2
+- Apply patches from Philip Hahn (Debian XOSD maintainer, 2.2.12-2) to fix
+ tpb xinit in Gnome and a few other problems.
+
* Tue Sep 14 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2.12-0.fdr.1
- Update to 2.2.12.
- Disable dependency tracking to speed up the build.
- Previous message: rpms/xosd/FC-2 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xosd.spec, 1.5, 1.6
- Next message: rpms/xosd/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xosd.spec, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list