From a733c8fa21e553bd465852e0d00bf4204d5d4526 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 11:27:02 +0000 Subject: [PATCH 1/6] Initialize branch F-7 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..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From b9bef354a947df22d815b086bd00a4c12ae2ebf7 Mon Sep 17 00:00:00 2001 From: Martin Sourada Date: Tue, 22 Apr 2008 21:35:10 +0000 Subject: [PATCH 2/6] Update to new version. --- .cvsignore | 2 +- sources | 2 +- xine-plugin.spec | 38 +++++++++++++++++++++++++++++++++----- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5f56685..b0f7955 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xine-plugin-1.0.tar.bz2 +xine-plugin-1.0.1.tar.bz2 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..d4b7a05 100644 --- a/xine-plugin.spec +++ b/xine-plugin.spec @@ -1,19 +1,32 @@ +%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: 1%{?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 +Patch0: xine-plugin-1.0-xine-version-check.patch 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 @@ -34,6 +47,7 @@ Features: %prep %setup -q +#%patch0 -p1 -b .xine-version-check %build @@ -58,6 +72,20 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From bb1c072725b6898c3fe6e376d2352bdde8d926f9 Mon Sep 17 00:00:00 2001 From: Martin Sourada Date: Tue, 22 Apr 2008 22:30:02 +0000 Subject: [PATCH 3/6] Fix build issue (remove unused patch from specfile). --- xine-plugin.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xine-plugin.spec b/xine-plugin.spec index d4b7a05..7297ef0 100644 --- a/xine-plugin.spec +++ b/xine-plugin.spec @@ -13,7 +13,6 @@ Group: Applications/Multimedia License: GPLv2+ URL: http://xinehq.de/ Source0: http://prdownloads.sourceforge.net/xine/xine-plugin-%{version}.tar.bz2 -Patch0: xine-plugin-1.0-xine-version-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xine-lib-devel @@ -47,8 +46,6 @@ Features: %prep %setup -q -#%patch0 -p1 -b .xine-version-check - %build %configure --with-plugindir=%{_libdir}/mozilla/plugins @@ -72,6 +69,9 @@ 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 From cc0e76f2fa8934ebb363d44d742a2a58781d7cae Mon Sep 17 00:00:00 2001 From: Martin Sourada Date: Tue, 22 Apr 2008 22:32:59 +0000 Subject: [PATCH 4/6] And bump the release... --- xine-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xine-plugin.spec b/xine-plugin.spec index 7297ef0..01cbca7 100644 --- a/xine-plugin.spec +++ b/xine-plugin.spec @@ -6,7 +6,7 @@ Name: xine-plugin Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Media plugin for mozilla compatible browsers using libxine backend Group: Applications/Multimedia From 85751d81fad0ea3224da47de6016a0eee03fc61d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:35 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 23c548d..05e2881 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 82fe6e1c6369cbc6ba77415fc367105115cf1846 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:53:08 +0000 Subject: [PATCH 6/6] 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 05e2881..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 $$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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7