From 7c105d5980100b93bd817a33b47613f7962e6825 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:31:34 +0000 Subject: [PATCH 1/4] Initialize branch F-10 for xine-plugin --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From dfd087025b3002fa4161645534ee9cc7966829ab Mon Sep 17 00:00:00 2001 From: Martin Sourada Date: Thu, 11 Dec 2008 00:06:17 +0000 Subject: [PATCH 2/4] Update to 1.0.2. --- .cvsignore | 2 +- sources | 2 +- xine-plugin.spec | 21 +++++++-------------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.cvsignore b/.cvsignore index b0f7955..3dd8b0a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xine-plugin-1.0.1.tar.bz2 +xine-plugin-1.0.2.tar.bz2 diff --git a/sources b/sources index 204d43b..db93bea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -56f826f5ca85543df114d25591147970 xine-plugin-1.0.1.tar.bz2 +dde79a4d12270cbe0c71a0c1afa41111 xine-plugin-1.0.2.tar.bz2 diff --git a/xine-plugin.spec b/xine-plugin.spec index 1d8bfb4..9fd4ff8 100644 --- a/xine-plugin.spec +++ b/xine-plugin.spec @@ -1,13 +1,7 @@ -%if 0%{?fedora} > 8 - %define use_xulrunner 1 -%else - %define use_xulrunner 0 -%endif - Name: xine-plugin -Version: 1.0.1 -Release: 4%{?dist} -Summary: Media plugin for mozilla compatible browsers using libxine backend +Version: 1.0.2 +Release: 1%{?dist} +Summary: Mozilla/Netscape compatible media plugin Group: Applications/Multimedia License: GPLv2+ @@ -20,12 +14,7 @@ BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel -%if 0%{?use_xulrunner} Requires: mozilla-filesystem -%else -Requires: %{_libdir}/mozilla/plugins -%endif - %description This is a very simple netscape/mozilla browser plugin using the xine @@ -69,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 11 2008 Martin Sourada - 1.0.2-1 +- new upstreame release +- should fix rhbz #473830 + * Sun Jun 22 2008 Martin Stransky - 1.0.1-4 - rebuild against new xulrunner From 916290f0961c20a73bceb77427e93c5ed471cc5f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:34 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 23c548d..e90bd0a 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xine-plugin -# $Id$ +# $Id: Makefile,v 1.1 2007/03/15 06:16:14 petersen Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 0bd4bb053645aaabbf38e3af55569d4c72a60f56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:53:10 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index e90bd0a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xine-plugin -# $Id: Makefile,v 1.1 2007/03/15 06:16:14 petersen Exp $ -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 $$d/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/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10