diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 5f56685..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -xine-plugin-1.0.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b0f7955 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +xine-plugin-1.0.1.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 23c548d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xine-plugin -# $Id$ -NAME := xine-plugin -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) diff --git a/sources b/sources index a811738..204d43b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05498789ac11990d5ddd05269671ad0d xine-plugin-1.0.tar.bz2 +56f826f5ca85543df114d25591147970 xine-plugin-1.0.1.tar.bz2 diff --git a/xine-plugin.spec b/xine-plugin.spec index 74cbade..01cbca7 100644 --- a/xine-plugin.spec +++ b/xine-plugin.spec @@ -1,19 +1,31 @@ +%if 0%{?fedora} > 8 + %define use_xulrunner 1 +%else + %define use_xulrunner 0 +%endif + Name: xine-plugin -Version: 1.0 -Release: 3%{?dist} +Version: 1.0.1 +Release: 2%{?dist} Summary: Media plugin for mozilla compatible browsers using libxine backend Group: Applications/Multimedia -License: GPL +License: GPLv2+ URL: http://xinehq.de/ -Source0: http://prdownloads.sourceforge.net/xine/xine-plugin-1.0.tar.bz2 +Source0: http://prdownloads.sourceforge.net/xine/xine-plugin-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xine-lib-devel BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel -Requires: %{_libdir}/mozilla/plugins + +%if 0%{?use_xulrunner} +Requires: xulrunner +%else +Requires: %{_libdir}/mozilla/plugins +%endif + %description This is a very simple netscape/mozilla browser plugin using the xine @@ -35,7 +47,6 @@ Features: %prep %setup -q - %build %configure --with-plugindir=%{_libdir}/mozilla/plugins make %{?_smp_mflags} @@ -58,6 +69,23 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 23 2008 Martin Sourada - 1.0.1-2 +- remove the dropped patch from spec file completely + +* Tue Apr 22 2008 Martin Sourada - 1.0.1-1 +- new upstream release +- drop the xine-lib version patch - fixed in upstream + +* Sat Feb 09 2008 Martin Sourada - 1.0-6 +- rebuild for gcc 4.3 +- add patch for x.y.z.w format xine-lib version string + +* Tue Aug 21 2007 Martin Sourada - 1.0-5 +- rebuild + +* Thu Aug 09 2007 Martin Sourada - 1.0-4 +- update License: field to GPLv2+ + * Wed Mar 14 2007 Martin Sourada - 1.0-3 - fix rpmlint warning