From baf3766f24d15f274f4d4ddded137019b686b2b9 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 07:13:30 +0000 Subject: [PATCH 1/5] Initialize branch F-11 for webkit-sharp --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 41b626882518c6046711ed70d3412a29df5d9f92 Mon Sep 17 00:00:00 2001 From: Xavier LAMIEN Date: Mon, 25 May 2009 21:32:50 +0000 Subject: [PATCH 2/5] build arch ppc64 --- webkit-sharp.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webkit-sharp.spec b/webkit-sharp.spec index 465fa12..2f0e946 100644 --- a/webkit-sharp.spec +++ b/webkit-sharp.spec @@ -2,7 +2,7 @@ Name: webkit-sharp Version: 0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: .NET bindings for WebKit Group: Development/Languages License: MIT @@ -17,7 +17,7 @@ BuildRequires: gtk-sharp2-gapi BuildRequires: monodoc-devel # Bug 241850 - no Mono on pp64 -ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha ppc +#ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha %description WebKit-sharp is .NET bindings for the WebKit rendering engine. @@ -60,5 +60,8 @@ make DESTDIR=%{buildroot} install %{_libdir}/monodoc/sources/webkit-sharp* %changelog +* Mon May 25 2009 Xavier Lamien - 0.2-2 +- Build arch ppc64. + * Sat Feb 21 2009 David Nielsen - 0.2-1 - Initial package From 6755b780869ddce2d8f6551d9585319406f8b00c Mon Sep 17 00:00:00 2001 From: palango Date: Mon, 15 Jun 2009 05:17:30 +0000 Subject: [PATCH 3/5] Fix bug #500654 --- webkit-dllmap-fix.patch | 10 ++++++++++ webkit-sharp.spec | 14 +++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 webkit-dllmap-fix.patch diff --git a/webkit-dllmap-fix.patch b/webkit-dllmap-fix.patch new file mode 100644 index 0000000..2503625 --- /dev/null +++ b/webkit-dllmap-fix.patch @@ -0,0 +1,10 @@ +# https://bugzilla.redhat.com/show_bug.cgi?id=500654 +diff -uraN webkit-sharp-0.2/sources/webkit-sharp.dll.config.in webkit-sharp-0.2.orig/sources/webkit-sharp.dll.config.in +--- webkit-sharp-0.2/sources/webkit-sharp.dll.config.in 2008-06-12 02:28:06.000000000 +0200 ++++ webkit-sharp-0.2.orig/sources/webkit-sharp.dll.config.in 2009-05-16 23:42:36.847810576 +0200 +@@ -1,3 +1,3 @@ + +- ++ + + diff --git a/webkit-sharp.spec b/webkit-sharp.spec index 2f0e946..ad9baa7 100644 --- a/webkit-sharp.spec +++ b/webkit-sharp.spec @@ -2,23 +2,22 @@ Name: webkit-sharp Version: 0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: .NET bindings for WebKit Group: Development/Languages License: MIT URL: http://ftp.novell.com/pub/mono/sources/webkit-sharp/ Source0: http://ftp.novell.com/pub/mono/sources/webkit-sharp/%{name}-%{version}.tar.bz2 Patch0: webkit-sharp-libdir.patch +Patch1: webkit-dllmap-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: WebKit-gtk-devel +Requires: webkitgtk +BuildRequires: webkitgtk-devel BuildRequires: mono-devel BuildRequires: gtk-sharp2-devel BuildRequires: gtk-sharp2-gapi BuildRequires: monodoc-devel -# Bug 241850 - no Mono on pp64 -#ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 armv4l sparc alpha - %description WebKit-sharp is .NET bindings for the WebKit rendering engine. @@ -36,6 +35,8 @@ Development files for WebKit-sharp # patch for libdir madness %patch0 -p1 -b webkit-sharp-libdir.patch +#patch for updated webkit version +%patch1 -p1 -b webkit-dllmap-fix.patch %build %configure @@ -60,6 +61,9 @@ make DESTDIR=%{buildroot} install %{_libdir}/monodoc/sources/webkit-sharp* %changelog +* Sun Jun 14 2009 Paul Lange - 0.2-3 +- Fix wrong webkitgtk link and missing dependency (#500654) + * Mon May 25 2009 Xavier Lamien - 0.2-2 - Build arch ppc64. From ccf4d78b15a82da17c1cd6745fdf8e0909965a77 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:15:58 +0000 Subject: [PATCH 4/5] 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 8c911e6..5d02245 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := webkit-sharp 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 76c7a80af2840af0ef638eade7b19e6ec81f14dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:14:29 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 5d02245..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: webkit-sharp -# $Id$ -NAME := webkit-sharp -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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/import.log b/import.log deleted file mode 100644 index b506702..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -webkit-sharp-0_2-1_fc11:HEAD:webkit-sharp-0.2-1.fc11.src.rpm:1235695367