- merged from DEVEL

- proper license
- proper extensions dir

Changed files:
    epiphany.spec -> 1.81

diff --git a/epiphany.spec b/epiphany.spec
index 8f19b02f016679f96fabd63e0d0458b936eb12e9..9510198291002b6ae0c9921fd5abc45df473b9ef 100644 (file)
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -3,41 +3,41 @@ Summary:      Epiphany - gecko-based GNOME web browser
 Summary(es):   Epiphany - navigador Web de GNOME basado en gecko
 Summary(pl):   Epiphany - przegl±darka WWW dla GNOME
 Name:          epiphany
-Version:       1.4.8
+Version:       1.6.0
 Release:       1
 License:       GPL v2
 Group:         X11/Applications/Networking
-Source0:       http://ftp.gnome.org/pub/gnome/sources/epiphany/1.4/%{name}-%{version}.tar.bz2
-# Source0-md5: bb9bdb92c5b4a7a97029e942304a9373
+Source0:       http://ftp.gnome.org/pub/gnome/sources/epiphany/1.6/%{name}-%{version}.tar.bz2
+# Source0-md5: 53eda1c713aec26a51fb806210c8afa7
 Patch0:                %{name}-first-tab.patch
 Patch1:                %{name}-desktop.patch
 Patch2:                %{name}-mozilla_includes.patch
 Patch3:                %{name}-mozilla.patch
 URL:           http://www.gnome.org/projects/epiphany/
-BuildRequires: GConf2-devel >= 2.8.0.1
-BuildRequires: ORBit2-devel >= 1:2.12.0
-BuildRequires: autoconf
+BuildRequires: GConf2-devel >= 2.10.0
+BuildRequires: ORBit2-devel >= 1:2.12.1
+BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: gnome-common >= 2.8.0
-BuildRequires: gnome-vfs2-devel >= 2.8.1
-BuildRequires: gtk+2-devel >= 2:2.4.4
-BuildRequires: gtk-doc
-BuildRequires: intltool >= 0.31
-BuildRequires: libbonoboui-devel >= 2.8.0
-BuildRequires: libglade2-devel >= 1:2.4.0
-BuildRequires: libgnomeui-devel >= 2.8.0
+BuildRequires: gnome-desktop >= 2.10.0
+BuildRequires: gnome-vfs2-devel >= 2.10.0
+BuildRequires: gtk+2-devel >= 2:2.6.4
+BuildRequires: gtk-doc >= 1.3
+BuildRequires: intltool >= 0.33
+BuildRequires: libglade2-devel >= 1:2.5.1
+BuildRequires: libgnomeui-devel >= 2.10.0
 BuildRequires: libtool
-BuildRequires: libxml2-devel >= 2.6.11
+BuildRequires: libxml2-devel >= 2.6.17
 BuildRequires: mozilla-devel >= %{minmozver}
-BuildRequires: nautilus-devel >= 2.8.0
-BuildRequires: pango-devel >= 1:1.5.2
+BuildRequires: nautilus-devel >= 2.10.0
+BuildRequires: pango-devel >= 1:1.8.1
 BuildRequires: pkgconfig
 BuildRequires: rpm-build >= 4.1-10
 BuildRequires: scrollkeeper
 Requires(post):        GConf2
 Requires(post,postun): scrollkeeper
-Requires:      gnome-icon-theme >= 2.8.0
-Requires:      gtk+2 >= 2:2.4.4
+Requires:      gnome-icon-theme >= 2.10.0
+Requires:      gtk+2 >= 2:2.6.4
 Requires:      mozilla-embedded = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla-embedded)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,8 +60,8 @@ Summary(es):  Ficheros de cabecera de Epiphany
 Summary(pl):   Pliki nag³ówkowe Epiphany
 Group:         X11/Applications/Networking
 # doesn't require base
-Requires:      gtk+2-devel >= 2:2.4.4
-Requires:      libxml2-devel >= 2.6.11
+Requires:      gtk+2-devel >= 2:2.6.4
+Requires:      libxml2-devel >= 2.6.17
 
 %description devel
 Epiphany header files for plugin development.
@@ -96,14 +96,13 @@ gnome-doc-common --copy
        --enable-nautilus-view=yes \
        --enable-gtk-doc \
        --with-html-dir=%{_gtkdocdir}
-
 # CFLAGS is a hack for gcc 3.3
 %{__make} \
        CFLAGS="%{rpmcflags} -fno-strict-aliasing"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}-1.4/extensions
+install -d $RPM_BUILD_ROOT%{_libdir}/%{name}-1.6/extensions
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -139,12 +138,12 @@ umask 022
 %{_pixmapsdir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_omf_dest_dir}/*
-%dir %{_libdir}/%{name}-1.4
-%dir %{_libdir}/%{name}-1.4/extensions
+%dir %{_libdir}/%{name}-1.6
+%dir %{_libdir}/%{name}-1.6/extensions
 %{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/epiphany-1.4
+%{_includedir}/epiphany-1.6
 %{_pkgconfigdir}/*.pc
 %{_gtkdocdir}/*