- merged from DEVEL and updated to 1.4.0

Changed files:
    epiphany-extensions.spec -> 1.12

diff --git a/epiphany-extensions.spec b/epiphany-extensions.spec
index 4cd5b1ef1c82b3c6b5229dca5eb8545f54df39c0..a3e12604a44301eaa0ae9d0ada892eb3a21a0aba 100644 (file)
--- a/epiphany-extensions.spec
+++ b/epiphany-extensions.spec
@@ -1,30 +1,36 @@
+%define                minmozver       5:1.7
 Summary:       Collection of extensions for Epiphany
 Summary(pl):   Zbiór rozszerzeñ dla Epiphany
 Name:          epiphany-extensions
-Version:       1.0
+Version:       1.4.0
 Release:       1
 License:       GPL
 Group:         X11/Applications/Networking
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}.tar.bz2
-# Source0-md5: 8be057ef7a37b10bdd3a3cc1df818f3a
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.4/%{name}-%{version}.tar.bz2
+# Source0-md5: 28cdf5e3f846aab82f1acc7b5a323144
 Patch0:                %{name}-locale-names.patch
-Patch1:                %{name}-mozilla-version.patch
+Patch1:                %{name}-mozilla_includes.patch
 URL:           http://www.gnome.org/projects/epiphany/
 BuildRequires: autoconf >= 2.57
 Buildrequires: automake
-BuildRequires: epiphany-devel >= 1.2.6
+BuildRequires: epiphany-devel >= 1.4.0
 BuildRequires: gnome-common
-BuildRequires: gtk+2-devel >= 2:2.4.0
+BuildRequires: gtk+2-devel >= 2:2.4.4
 BuildRequires: intltool >= 0.29
-BuildRequires: libglade2-devel >= 1:2.3.6
+BuildRequires: libglade2-devel >= 1:2.4.0
 BuildRequires: libtool
-BuildRequires: libxml2-devel >= 2.6.0
+BuildRequires: libxml2-devel >= 2.6.11
+BuildRequires: mozilla-devel >= %{minmozver}
 BuildRequires: opensp-devel
-Requires:      epiphany >= 1.2.6
+Requires:      epiphany = %(rpm -q --qf '%{EPOCH}:%{VERSION}' epiphany)
+Requires:      mozilla-embedded = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla-embedded)
 Obsoletes:     epiphany-plugins <= 0.1.2
 Provides:      epiphany-plugins
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# can be provided by mozilla or mozilla-embedded
+%define                _noautoreqdep   libgtkembedmoz.so libgtksuperwin.so libxpcom.so
+
 %description
 Epiphany Extensions is a collection of extensions for Epiphany.
 
@@ -34,7 +40,7 @@ Epiphany Extensions jest zbiorem rozszerze
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 
 mv po/{no,nb}.po
 
@@ -54,15 +60,15 @@ 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-*/extensions/*.la
 
-%find_lang %{name}-1.0
+%find_lang %{name}-1.2
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}-1.0.lang
+%files -f %{name}-1.2.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/epiphany/extensions/*.so*
+%attr(755,root,root) %{_libdir}/epiphany-*/extensions/*.so*
 %{_datadir}/%{name}