From 47350aedc4464d4141474f7975756fff78bd3401 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 02:46:58 +0000 Subject: [PATCH 1/9] Initialize branch F-9 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..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From f4b6ba920a8379c696f7b2a9e6edd229622b1c66 Mon Sep 17 00:00:00 2001 From: Martin Sourada Date: Tue, 22 Apr 2008 21:35:28 +0000 Subject: [PATCH 2/9] Update to new version. --- .cvsignore | 2 +- sources | 2 +- xine-plugin.spec | 26 +++++++++++++++++++++----- 3 files changed, 23 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 41d3de7..d4b7a05 100644 --- a/xine-plugin.spec +++ b/xine-plugin.spec @@ -1,12 +1,18 @@ +%if 0%{?fedora} > 8 + %define use_xulrunner 1 +%else + %define use_xulrunner 0 +%endif + Name: xine-plugin -Version: 1.0 -Release: 6%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: Media plugin for mozilla compatible browsers using libxine backend Group: Applications/Multimedia 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) @@ -14,7 +20,13 @@ BuildRequires: xine-lib-devel BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel -Requires: xulrunner + +%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,7 @@ Features: %prep %setup -q -%patch0 -p1 -b .xine-version-check +#%patch0 -p1 -b .xine-version-check %build @@ -60,6 +72,10 @@ 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 From 2aee396f7cac30b8db3da5112ec707835ba20164 Mon Sep 17 00:00:00 2001 From: Martin Sourada Date: Tue, 22 Apr 2008 22:30:17 +0000 Subject: [PATCH 3/9] 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 ef90322a5f78fa29ac8f6ca4330e60faee074c3c Mon Sep 17 00:00:00 2001 From: Martin Sourada Date: Tue, 22 Apr 2008 22:33:45 +0000 Subject: [PATCH 4/9] 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 c75d0013adcd206a2f883ab7a78c0625369a1467 Mon Sep 17 00:00:00 2001 From: Martin Sourada Date: Sun, 1 Jun 2008 12:21:54 +0000 Subject: [PATCH 5/9] Require mozilla-filesystem instead of xulrunner on >= F9 --- xine-plugin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xine-plugin.spec b/xine-plugin.spec index 01cbca7..c77119d 100644 --- a/xine-plugin.spec +++ b/xine-plugin.spec @@ -6,7 +6,7 @@ Name: xine-plugin Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Media plugin for mozilla compatible browsers using libxine backend Group: Applications/Multimedia @@ -21,7 +21,7 @@ BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel %if 0%{?use_xulrunner} -Requires: xulrunner +Requires: mozilla-filesystem %else Requires: %{_libdir}/mozilla/plugins %endif @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jun 01 2008 Martin Sourada - 1.0.1-3 +- require mozilla-filesystem instead of xulrunner on >= F9 + * Wed Apr 23 2008 Martin Sourada - 1.0.1-2 - remove the dropped patch from spec file completely From 74b0201bba17fe16d6752f59e35bfeea6fda6619 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Sun, 22 Jun 2008 19:17:52 +0000 Subject: [PATCH 6/9] Rebuild against new xulrunner --- xine-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-plugin.spec b/xine-plugin.spec index c77119d..1d8bfb4 100644 --- a/xine-plugin.spec +++ b/xine-plugin.spec @@ -6,7 +6,7 @@ Name: xine-plugin Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Media plugin for mozilla compatible browsers using libxine backend Group: Applications/Multimedia @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jun 22 2008 Martin Stransky - 1.0.1-4 +- rebuild against new xulrunner + * Sun Jun 01 2008 Martin Sourada - 1.0.1-3 - require mozilla-filesystem instead of xulrunner on >= F9 From b047a3f93d27430b0f6aa0476af9712c7af1ecaf Mon Sep 17 00:00:00 2001 From: Martin Sourada Date: Thu, 11 Dec 2008 00:06:18 +0000 Subject: [PATCH 7/9] 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 1ca22ae691145e1444412e2d16c2278c874b2fcf Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:35 +0000 Subject: [PATCH 8/9] 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 f4808883538ef5f39faf3db284675ac5807cf4c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:53:11 +0000 Subject: [PATCH 9/9] 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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9