dist-git conversion

#2781)

Makefile

@@ -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 $$/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)

xosd.spec

@@ -1,15 +1,14 @@
 %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:        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
@@ -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,13 @@ 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
+* Sun Aug 26 2007 Kevin Fenzi <kevin@tummy.com> - 2.2.14-10
+- Update License tag
+
+* Tue Feb 27 2007 Kevin Fenzi <kevin@tummy.com> - 2.2.14-9
+- Remove bmp subpackage, as bmp is no longer shipped. 
+
 * Sun Aug 27 2006 Kevin Fenzi <kevin@tummy.com> - 2.2.14-8
 - Rebuild for fc6