- merged from DEVEL

Changed files:
    epiphany-extensions-mozilla_includes.patch -> 1.4
    epiphany-extensions.spec -> 1.40

diff --git a/epiphany-extensions-mozilla_includes.patch b/epiphany-extensions-mozilla_includes.patch
index 59badeccb128b2fee881142c4cc63cbaec440f49..233ecc5618e9449f233d8f5443992a4a706d88c8 100644 (file)
--- a/epiphany-extensions-mozilla_includes.patch
+++ b/epiphany-extensions-mozilla_includes.patch
@@ -1,20 +1,43 @@
-diff -urN aa/epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am
---- aa/epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am   2004-12-08 16:33:52.000000000 +0100
-+++ epiphany-extensions-1.5.7/extensions/error-viewer/mozilla/Makefile.am      2005-02-08 17:20:49.260647760 +0100
+diff -urN epiphany-extensions-1.7.5.orig/extensions/adblock/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/adblock/mozilla/Makefile.am
+--- epiphany-extensions-1.7.5.orig/extensions/adblock/mozilla/Makefile.am      2005-08-28 20:49:56.203735032 +0200
++++ epiphany-extensions-1.7.5/extensions/adblock/mozilla/Makefile.am   2005-08-28 22:02:24.092755432 +0200
+@@ -11,6 +11,8 @@
+       content         \
+       docshell        \
+       dom             \
++      necko           \
++      webbrwsr        \
+       xpcom
+ 
+ libadblockmozilla_la_CPPFLAGS = \
+diff -urN epiphany-extensions-1.7.5.orig/extensions/auto-scroller/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/auto-scroller/mozilla/Makefile.am
+--- epiphany-extensions-1.7.5.orig/extensions/auto-scroller/mozilla/Makefile.am        2005-08-28 20:49:56.494690800 +0200
++++ epiphany-extensions-1.7.5/extensions/auto-scroller/mozilla/Makefile.am     2005-08-28 20:56:30.391809336 +0200
+@@ -9,6 +9,7 @@
+       content         \
+       docshell        \
+       dom             \
++      webbrwsr        \
+       xpcom
+ 
+ libautoscrollermozilla_la_CPPFLAGS = \
+diff -urN epiphany-extensions-1.7.5.orig/extensions/error-viewer/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/error-viewer/mozilla/Makefile.am
+--- epiphany-extensions-1.7.5.orig/extensions/error-viewer/mozilla/Makefile.am 2005-08-28 20:49:53.852092536 +0200
++++ epiphany-extensions-1.7.5/extensions/error-viewer/mozilla/Makefile.am      2005-08-28 20:54:26.401658704 +0200
 @@ -16,7 +16,8 @@
        .               \
        dom             \
        jsconsole       \
 -      necko
-+      necko \
++      necko           \
 +      webbrwsr
  
  liberrorviewermozilla_la_CPPFLAGS = \
        -I..                                            \
-diff -urN aa/epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am
---- aa/epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am      2004-12-08 16:33:52.000000000 +0100
-+++ epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am 2005-02-08 17:25:38.975604392 +0100
-@@ -12,6 +12,7 @@
+diff -urN epiphany-extensions-1.7.5.orig/extensions/page-info/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/page-info/mozilla/Makefile.am
+--- epiphany-extensions-1.7.5.orig/extensions/page-info/mozilla/Makefile.am    2005-08-28 20:49:53.625127040 +0200
++++ epiphany-extensions-1.7.5/extensions/page-info/mozilla/Makefile.am 2005-08-28 22:14:59.178964880 +0200
+@@ -14,6 +14,7 @@
        layout          \
        nkcache         \
        necko           \
@@ -22,14 +45,14 @@ diff -urN aa/epiphany-extensions-1.5.7/extensions/page-info/mozilla/Makefile.am
        uconv           \
        webbrwsr
  
-diff -urN aa/epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am
---- aa/epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am      2004-12-08 16:33:53.000000000 +0100
-+++ epiphany-extensions-1.5.7/extensions/select-stylesheet/mozilla/Makefile.am 2005-02-08 17:28:31.583364024 +0100
+diff -urN epiphany-extensions-1.7.5.orig/extensions/select-stylesheet/mozilla/Makefile.am epiphany-extensions-1.7.5/extensions/select-stylesheet/mozilla/Makefile.am
+--- epiphany-extensions-1.7.5.orig/extensions/select-stylesheet/mozilla/Makefile.am    2005-08-28 20:49:55.301872136 +0200
++++ epiphany-extensions-1.7.5/extensions/select-stylesheet/mozilla/Makefile.am 2005-08-28 20:55:09.807060080 +0200
 @@ -6,6 +6,7 @@
  
  mozilla_include_subdirs = \
        .               \
-+      dom                     \
++      dom             \
        necko           \
        nkcache         \
        webbrwsr

diff --git a/epiphany-extensions.spec b/epiphany-extensions.spec
index cef04edc9d8cb0001851f917c0f1eb36132e8860..3c46856478a90770330af1a8b8013ec7cb9b487c 100644 (file)
--- a/epiphany-extensions.spec
+++ b/epiphany-extensions.spec
@@ -4,20 +4,20 @@
 Summary:       Collection of extensions for Epiphany
 Summary(pl):   Zbiór rozszerzeñ dla Epiphany
 Name:          epiphany-extensions
-Version:       1.6.4
-Release:       4
+Version:       1.8.0
+Release:       1
 License:       GPL v2
 Group:         X11/Applications/Networking
-Source0:       http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 0bc858d08d3f3a4609367505011787d9
+Source0:       http://ftp.gnome.org/pub/gnome/sources/epiphany-extensions/1.8/%{name}-%{version}.tar.bz2
+# Source0-md5: 312335e8f755995dc486d496f497175e
 Patch0:                %{name}-locale-names.patch
 Patch1:                %{name}-mozilla_includes.patch
 URL:           http://www.gnome.org/projects/epiphany/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
-BuildRequires: epiphany-devel >= 1.6.2
+BuildRequires: epiphany-devel >= 1.8.0
 BuildRequires: gnome-common >= 2.8.0
-BuildRequires: gtk+2-devel >= 2:2.6.4
+BuildRequires: gtk+2-devel >= 2:2.8.3
 BuildRequires: intltool >= 0.33
 BuildRequires: libglade2-devel >= 1:2.5.1
 BuildRequires: libgnomeui-devel >= 2.10.0-2
@@ -30,6 +30,7 @@ BuildRequires:        mozilla-devel >= 5:1.7
 %endif
 BuildRequires: opensp-devel
 BuildRequires: pkgconfig
+BuildRequires: python-gnome-devel >= 2.11.3
 Requires:      epiphany = %(rpm -q --qf '%{EPOCH}:%{VERSION}' epiphany-devel)
 %if %{with mozilla_firefox}
 %requires_eq   mozilla-firefox
@@ -71,16 +72,17 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany-*/extensions/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/1.8/extensions/*.{la,py}
 
-%find_lang %{name}-1.6
+%find_lang %{name}-1.8
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}-1.6.lang
+%files -f %{name}-1.8.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/epiphany-*/extensions/*.so*
-%{_libdir}/epiphany-*/extensions/*.xml
+%attr(755,root,root) %{_libdir}/epiphany/1.8/extensions/*.so*
+%{_libdir}/epiphany/1.8/extensions/*.py[co]
+%{_libdir}/epiphany/1.8/extensions/*.xml
 %{_datadir}/%{name}