[perl-Gtk2-MozEmbed] Rebuild against newer gecko (1.9.3.0)
Remi Collet
remi at fedoraproject.org
Sat Sep 4 15:06:18 UTC 2010
commit 48493aad8f0d22c2765c98ce9d3fef5e08145c9f
Author: remi <fedora at famillecollet.com>
Date: Sat Sep 4 17:06:16 2010 +0200
Rebuild against newer gecko (1.9.3.0)
missing-pixbuf.patch | 23 +++++++++++++++++++++++
perl-Gtk2-MozEmbed.spec | 27 +++++++++++++--------------
2 files changed, 36 insertions(+), 14 deletions(-)
---
diff --git a/missing-pixbuf.patch b/missing-pixbuf.patch
new file mode 100644
index 0000000..f78a683
--- /dev/null
+++ b/missing-pixbuf.patch
@@ -0,0 +1,23 @@
+diff -up Gtk2-MozEmbed-0.08/Makefile.PL.pixbuf Gtk2-MozEmbed-0.08/Makefile.PL
+--- Gtk2-MozEmbed-0.08/Makefile.PL.pixbuf 2010-08-11 13:34:16.000000000 +0200
++++ Gtk2-MozEmbed-0.08/Makefile.PL 2010-08-11 13:35:36.000000000 +0200
+@@ -54,6 +54,8 @@ my %pkgcfg = ExtUtils::PkgConfig->find(
+ "firefox-gtkmozembed >= $build_reqs{'Firefox'}",
+ "mozilla-firefox-gtkmozembed >= $build_reqs{'Firefox'}");
+
++my %pkgcfg_pixbuf = ExtUtils::PkgConfig->find("gdk-pixbuf-2.0");
++
+ mkdir 'build', 0777;
+
+ our @xs_files = <xs/*.xs>;
+@@ -73,8 +75,8 @@ ExtUtils::PkgConfig->write_version_macro
+ $pkg => "GTK_MOZ_EMBED",
+ );
+
+-my $inc = $pkgcfg{cflags};
+-my $libs = $pkgcfg{libs};
++my $inc = $pkgcfg{cflags} ." ". $pkgcfg_pixbuf{cflags};
++my $libs = $pkgcfg{libs} . " ". $pkgcfg_pixbuf{libs};
+
+ if ($libs =~ m#(lib|lib64)/xulrunner-(devel|sdk)-([^/]+)#) {
+ $inc .= qq( -DGTK_MOZ_EMBED_PERL_XULRUNNER_PATH=)
diff --git a/perl-Gtk2-MozEmbed.spec b/perl-Gtk2-MozEmbed.spec
index e17f7bf..67a08bc 100644
--- a/perl-Gtk2-MozEmbed.spec
+++ b/perl-Gtk2-MozEmbed.spec
@@ -1,22 +1,17 @@
%define perlname Gtk2-MozEmbed
-%define gecko_version 1.9.0.6
-%if 0%{?fedora} >= 11
-%define gecko_version 1.9.2.4
-%endif
-%if 0%{?fedora} >= 13
-%define gecko_version 1.9.2.4
-%else
-%endif
+# fedora >= 15
+%define gecko_version 1.9.3.0
+
# Using specfilever cause dumpspec to only increase
# right part of release (post dist tag)
-%global specfilever 6
+%global specfilever 7
Summary: Interface to the Mozilla embedding widget
Name: perl-Gtk2-MozEmbed
Version: 0.08
-Release: %{specfilever}%{?dist}.15
+Release: %{specfilever}%{?dist}
Group: Development/Libraries
License: LGPLv2+
@@ -25,6 +20,8 @@ Source0: http://www.cpan.org/authors/id/T/TS/TSCH/%{perlname}-%{version}.t
# See https://rt.cpan.org/Ticket/Display.html?id=43306
Patch0: %{name}-make.patch
+# See https://rt.cpan.org/Ticket/Display.html?id=61063
+Patch1: missing-pixbuf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,11 +31,7 @@ BuildRequires: perl(ExtUtils::PkgConfig) >= 1.03
BuildRequires: perl(Glib::MakeHelper)
BuildRequires: perl(Gtk2) >= 1.081
BuildRequires: gtk2-devel
-%if 0%{?fedora} >= 13
BuildRequires: xulrunner-devel = %{gecko_version}
-%else
-BuildRequires: xulrunner-devel-unstable = %{gecko_version}
-%endif
Requires: perl(Glib) >= 1.180
Requires: perl(Gtk2) >= 1.081
@@ -54,6 +47,7 @@ This module allows you to use the Mozilla embedding widget from Perl.
%setup -q -n %{perlname}-%{version}
%patch0 -p0
+%patch1 -p1
iconv -f ISO-8859-15 -t UTF-8 NEWS >NEWS.utf8
touch -r NEWS NEWS.utf8
@@ -96,6 +90,11 @@ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
%changelog
+* Sat Sep 04 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.08-7
+- Rebuild against newer gecko (1.9.3.0)
+- Added missing-pixbuf.patch to solve missing gdk-pixbuf.h
+- add link to upstream bug and clean macros
+
* Wed Jun 23 2010 Jan Horak <jhorak at redhat.com> - 0.08-6.15
- Rebuild against newer gecko
More information about the scm-commits
mailing list