Author: megabajt Date: Tue Apr 5 22:26:03 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 3.0.0; merged from DEVEL
---- Files affected: packages/epiphany: epiphany.spec (1.223 -> 1.224) , epiphany-pld-homepage.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/epiphany/epiphany.spec diff -u packages/epiphany/epiphany.spec:1.223 packages/epiphany/epiphany.spec:1.224 --- packages/epiphany/epiphany.spec:1.223 Sat Mar 26 14:27:20 2011 +++ packages/epiphany/epiphany.spec Wed Apr 6 00:25:57 2011 @@ -1,38 +1,37 @@ # $Revision$, $Date$ -%define basever 2.29 +%define basever 3.0 Summary: Epiphany - WebKit-based GNOME web browser Summary(es.UTF-8): Epiphany - navigador Web de GNOME basado en WebKit Summary(pl.UTF-8): Epiphany - przeglądarka WWW dla GNOME Name: epiphany -Version: 2.30.2 -Release: 5 +Version: 3.0.0 +Release: 1 License: GPL v2 Group: X11/Applications/Networking -Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.30/%{name}-%{version}.tar.bz2 -# Source0-md5: 29b084acfa016540d91d3601ec3dff5c +Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany/3.0/%{name}-%{version}.tar.bz2 +# Source0-md5: b3ab9c49867de2e4c2458a4c9fada4cd Patch0: %{name}-pld-homepage.patch URL: http://www.gnome.org/projects/epiphany/ -BuildRequires: GConf2-devel >= 2.28.0 BuildRequires: NetworkManager-devel BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.9 +BuildRequires: avahi-devel >= 0.6.22 BuildRequires: avahi-gobject-devel >= 0.6.22 BuildRequires: dbus-glib-devel >= 0.73 BuildRequires: docbook-dtd412-xml BuildRequires: gettext-devel -BuildRequires: gir-repository-devel +BuildRequires: glib2-devel >= 1:2.28.0 BuildRequires: gnome-common >= 2.20.0 BuildRequires: gnome-doc-utils >= 0.12.0 -BuildRequires: gobject-introspection-devel >= 0.6.7 -BuildRequires: gtk+2-devel >= 2:2.20.0 +BuildRequires: gobject-introspection-devel >= 0.10.0 +BuildRequires: gsettings-desktop-schemas-devel +BuildRequires: gtk+3-devel >= 3.0.2 BuildRequires: gtk-doc >= 1.8 -BuildRequires: gtk-webkit-devel >= 1.1.22 +BuildRequires: gtk-webkit3-devel >= 1.3.11 BuildRequires: intltool >= 0.40.0 BuildRequires: iso-codes >= 0.53 BuildRequires: libgnome-keyring-devel >= 2.28.0 -BuildRequires: libicu-devel -BuildRequires: libnotify-devel >= 0.4 -BuildRequires: libsoup-gnome-devel >= 2.30.0 +BuildRequires: libsoup-gnome-devel >= 2.34.0 BuildRequires: libtool >= 2:2.2 BuildRequires: libxml2-devel >= 1:2.6.28 BuildRequires: libxslt-devel >= 1.1.20 @@ -40,18 +39,22 @@ BuildRequires: pkgconfig BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(find_lang) >= 1.23 -BuildRequires: rpmbuild(macros) >= 1.364 -BuildRequires: scrollkeeper +BuildRequires: rpmbuild(macros) >= 1.601 +BuildRequires: sed >= 4.0 +BuildRequires: seed-devel >= 2.28.0 BuildRequires: startup-notification-devel >= 0.8 +BuildRequires: xorg-lib-libICE-devel BuildRequires: xorg-lib-libSM-devel +BuildRequires: xorg-lib-libX11-devel Requires(post,postun): desktop-file-utils +Requires(post,postun): glib2 >= 1:2.26.0 Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): hicolor-icon-theme Requires(post,postun): scrollkeeper -Requires(post,preun): GConf2 Requires: ca-certificates Requires: dbus >= 1.0.2 Requires: gnome-icon-theme >= 2.26.0 +Requires: gsettings-desktop-schemas +Requires: hicolor-icon-theme Provides: wwwbrowser # sr@Latn vs. sr@latin Conflicts: glibc-misc < 6:2.7 @@ -72,8 +75,8 @@ Summary(pl.UTF-8): Pliki nagłówkowe Epiphany Group: X11/Applications/Networking # doesn't require base -Requires: gtk+2-devel >= 2:2.20.0 -Requires: gtk-webkit-devel >= 1.1.22 +Requires: gtk+3-devel >= 3.0.2 +Requires: gtk-webkit3-devel >= 1.3.11 Requires: libxml2-devel >= 1:2.6.28 %description devel @@ -113,12 +116,12 @@ %{__autoconf} %configure \ --disable-silent-rules \ + --disable-schemas-compile \ --with-distributor-name="PLD Linux" \ --with-ca-file=/etc/certs/ca-certificates.crt \ --enable-network-manager \ --enable-gtk-doc \ - --with-html-dir=%{_gtkdocdir} \ - --disable-schemas-install + --with-html-dir=%{_gtkdocdir} %{__make} %install @@ -128,45 +131,41 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%{__rm} -r $RPM_BUILD_ROOT%{_iconsdir}/LowContrastLargePrint - %find_lang %{name} --with-gnome --with-omf %clean rm -rf $RPM_BUILD_ROOT %post -%gconf_schema_install epiphany-lockdown.schemas -%gconf_schema_install epiphany.schemas %scrollkeeper_update_post %update_desktop_database_post %update_icon_cache hicolor - -%preun -%gconf_schema_uninstall epiphany-lockdown.schemas -%gconf_schema_uninstall epiphany.schemas +%glib_compile_schemas %postun %scrollkeeper_update_postun %update_desktop_database_postun %update_icon_cache hicolor +%glib_compile_schemas %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README - %attr(755,root,root) %{_bindir}/epiphany +%attr(755,root,root) %{_bindir}/ephy-profile-migrator %{_datadir}/dbus-1/services/org.gnome.Epiphany.service %{_datadir}/%{name} +%{_datadir}/GConf/gsettings/epiphany.convert +%{_datadir}/glib-2.0/schemas/org.gnome.Epiphany.enums.xml +%{_datadir}/glib-2.0/schemas/org.gnome.epiphany.gschema.xml %{_desktopdir}/bme.desktop %{_desktopdir}/epiphany.desktop %{_iconsdir}/*/*/apps/*.* -%{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas -%{_sysconfdir}/gconf/schemas/epiphany.schemas %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/%{basever} %dir %{_libdir}/%{name}/%{basever}/extensions %{_libdir}/girepository-1.0/Epiphany-*.typelib +%{_libdir}/girepository-1.0/EphyEgg-*.typelib %{_mandir}/man1/epiphany.1* %files devel @@ -175,6 +174,7 @@ %{_includedir}/epiphany %{_pkgconfigdir}/epiphany-*.pc %{_datadir}/gir-1.0/Epiphany-*.gir +%{_datadir}/gir-1.0/EphyEgg-*.gir %files apidocs %defattr(644,root,root,755) @@ -186,9 +186,22 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.224 2011/04/05 22:25:57 megabajt +- updated to 3.0.0; merged from DEVEL + +Revision 1.222.2.3 2011/03/31 12:02:46 megabajt +- updated to 2.91.92 + Revision 1.223 2011/03/26 13:27:20 qboosh - en@shaw locale is now supported (via LANGUAGE) - use __rm macro + +Revision 1.222.2.2 2011/03/12 22:56:04 megabajt +- updated to 2.91.91.1 + +Revision 1.222.2.1 2011/03/09 13:48:38 wiget +- up to 2.91.91 +- patch need update Revision 1.222 2011/02/04 18:23:43 wiget - Requires(post,postun): gtk-update-icon-cache ================================================================ Index: packages/epiphany/epiphany-pld-homepage.patch diff -u packages/epiphany/epiphany-pld-homepage.patch:1.1 packages/epiphany/epiphany-pld-homepage.patch:1.2 --- packages/epiphany/epiphany-pld-homepage.patch:1.1 Mon Aug 8 17:47:59 2005 +++ packages/epiphany/epiphany-pld-homepage.patch Wed Apr 6 00:25:57 2011 @@ -1,12 +1,12 @@ -diff -urN epiphany-1.7.3.orig/data/epiphany.schemas.in epiphany-1.7.3/data/epiphany.schemas.in ---- epiphany-1.7.3.orig/data/epiphany.schemas.in 2005-08-08 17:11:42.962212856 +0200 -+++ epiphany-1.7.3/data/epiphany.schemas.in 2005-08-08 17:12:15.789222392 +0200 -@@ -5,7 +5,7 @@ - <applyto>/apps/epiphany/general/homepage</applyto> - <owner>epiphany</owner> - <type>string</type> -- <default>http://www.google.com</default> -+ <default>http://www.pld-linux.org</default> - <locale name="C"> - <short>Home page</short> - <long>Address of the user's home page.</long> +diff -urN epiphany-2.91.91.1/data/org.gnome.epiphany.gschema.xml.in epiphany-2.91.91.1.new//data/org.gnome.epiphany.gschema.xml.in +--- epiphany-2.91.91.1/data/org.gnome.epiphany.gschema.xml.in 2011-03-09 20:31:34.000000000 +0000 ++++ epiphany-2.91.91.1.new//data/org.gnome.epiphany.gschema.xml.in 2011-03-12 22:28:47.150000020 +0000 +@@ -10,7 +10,7 @@ + <summary>Browse with caret</summary> + </key> + <key type="s" name="homepage-url"> +- <default>'http://www.google.com'</default> ++ <default>'http://www.pld-linux.org'</default> + <summary>Home page</summary> + <description>Address of the user's home page.</description> + </key> ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/epiphany/epiphany.spec?r1=1.223&r2=1.224&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/epiphany/epiphany-pld-homepage.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
