packages: epiphany/epiphany.spec - updated to 2.28.0; merged from DEVEL

megabajt megabajt at pld-linux.org
Mon Sep 28 20:53:53 CEST 2009 

Author: megabajt                     Date: Mon Sep 28 18:53:53 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.28.0; merged from DEVEL

---- Files affected:
packages/epiphany:
   epiphany.spec (1.211 -> 1.212) 

---- Diffs:

================================================================
Index: packages/epiphany/epiphany.spec
diff -u packages/epiphany/epiphany.spec:1.211 packages/epiphany/epiphany.spec:1.212
--- packages/epiphany/epiphany.spec:1.211	Thu Sep 10 14:18:41 2009
+++ packages/epiphany/epiphany.spec	Mon Sep 28 20:53:47 2009
@@ -1,66 +1,43 @@
 # $Revision$, $Date$
-#
-#Conditional build:
-%bcond_with	webkit		# Build with experimental webkit support instead of xulrunner
-#
-%define		basever		2.26
-Summary:	Epiphany - gecko-based GNOME web browser
-Summary(es.UTF-8):	Epiphany - navigador Web de GNOME basado en gecko
+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.26.3
-Release:	4
+Version:	2.28.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications/Networking
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.26/%{name}-%{version}.tar.bz2
-# Source0-md5:	16f44012bc376077e1443e049d725847
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.28/%{name}-%{version}.tar.bz2
+# Source0-md5:	b88ac1168fc271892cabf73b749cac16
 Patch0:		%{name}-pld-homepage.patch
-Patch1:		%{name}-configure.patch
-Patch2:		%{name}-ti-agent.patch
-Patch3:		%{name}-agent.patch
-Patch4:		%{name}-lt.patch
-Patch5:		%{name}-libxul.patch
-Patch7:		%{name}-build_date.patch
-Patch8:		%{name}-xulrunner-plugins-dir.patch
 URL:		http://www.gnome.org/projects/epiphany/
-BuildRequires:	GConf2-devel >= 2.26.0
+BuildRequires:	GConf2-devel >= 2.28.0
 BuildRequires:	NetworkManager-devel
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
-BuildRequires:	avahi-gobject-devel >= 0.6
+BuildRequires:	avahi-gobject-devel >= 0.6.22
 BuildRequires:	dbus-glib-devel >= 0.73
-BuildRequires:	enchant-devel >= 1.0
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gnome-desktop-devel >= 2.26.0
+BuildRequires:	gnome-keyring-devel >= 2.28.0
 BuildRequires:	gnome-doc-utils >= 0.12.0
 BuildRequires:	gtk+2-devel >= 2:2.16.0
 BuildRequires:	gtk-doc >= 1.8
-%if %{with webkit}
-BuildRequires:	gtk-webkit-devel
-BuildRequires:	libssh2-devel
-%endif
+BuildRequires:	gtk-webkit-devel >= 1.1.15
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	iso-codes >= 0.53
-BuildRequires:	libcanberra-gtk-devel >= 0.3
-BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.24.0
 BuildRequires:	libnotify-devel >= 0.4
+BuildRequires:	libsoup-gnome-devel >= 2.28.0
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 1:2.6.28
 BuildRequires:	libxslt-devel >= 1.1.20
+BuildRequires:	nss-devel
 BuildRequires:	pkgconfig
-BuildRequires:	python-gnome-devel >= 2.20.0
-BuildRequires:	python-pygtk-devel >= 2:2.12.0
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.364
 BuildRequires:	scrollkeeper
 BuildRequires:	startup-notification-devel >= 0.8
-%if %{without webkit}
-BuildRequires:	xulrunner
-BuildRequires:	xulrunner-devel >= 1.9.0.1-1
-%endif
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
@@ -68,35 +45,19 @@
 Requires(post,preun):	GConf2
 Requires:	dbus >= 1.0.2
 Requires:	gnome-icon-theme >= 2.26.0
-Requires:	libgnomeui >= 2.24.0
 Provides:	wwwbrowser
-%if %{without webkit}
-Requires:	browser-plugins >= 2.0
-Requires:	browser-plugins(%{_target_base_arch})
-%requires_eq	xulrunner
-%endif
-Obsoletes:	python-epiphany
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%if %{without webkit}
-# can be provided by mozilla or mozilla-embedded
-%define		_noautoreqdep	libgtkembedmoz.so libgtksuperwin.so libxpcom.so
-# we have strict deps for it
-%define		_noautoreq	libxpcom.so
-%endif
-
 %description
-GNOME browser based on Gecko (Mozilla rendering engine).
+GNOME browser based on WebKit.
 
 %description -l es.UTF-8
-Navigador Web de GNOME basado en Gecko (el engine plasmante de
-Mozilla).
+Navigador Web de GNOME basado en WebKit.
 
 %description -l pl.UTF-8
-Epiphany jest przeglądarką WWW bazującą na Gecko (mechanizmie
-interpretacji stron Mozilli).
+Epiphany jest przeglądarką WWW bazującą na WebKit.
 
 %package devel
 Summary:	Epiphany header files
@@ -105,6 +66,7 @@
 Group:		X11/Applications/Networking
 # doesn't require base
 Requires:	gtk+2-devel >= 2:2.16.0
+Requires:	gtk-webkit-devel >= 1.1.15
 Requires:	libxml2-devel >= 1:2.6.28
 
 %description devel
@@ -131,16 +93,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%if "%{pld_release}" == "ti"
-%patch2 -p1
-%else
-%patch3 -p1
-%endif
-%patch4 -p1
-%patch5 -p1
-%patch7 -p1
-%patch8 -p1
 
 %build
 %{__gnome_doc_prepare}
@@ -153,30 +105,19 @@
 %{__automake}
 %{__autoconf}
 %configure \
-	--disable-schemas-install \
-	--enable-dbus \
-	%{!?with_webkit:--enable-gtk-doc} \
+	--with-distributor-name="PLD Linux" \
 	--enable-network-manager \
-	--enable-python \
-%if %{with webkit}
-	--with-engine=webkit \
-%else
-	--with-gecko=libxul-embedding \
-%endif
-	--with-html-dir=%{_gtkdocdir}
+	--enable-gtk-doc \
+	--with-html-dir=%{_gtkdocdir} \
+	--disable-schemas-install
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/%{basever}/extensions
-
-%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/%{basever}/plugins
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	HTML_DIR=%{_gtkdocdir}
+	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/%{basever}/plugins/*.la
 rm -rf $RPM_BUILD_ROOT%{_iconsdir}/LowContrastLargePrint
 
 %find_lang %{name} --with-gnome --with-omf
@@ -185,59 +126,32 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install epiphany-fonts.schemas
 %gconf_schema_install epiphany-lockdown.schemas
-%gconf_schema_install epiphany-pango.schemas
 %gconf_schema_install epiphany.schemas
 %scrollkeeper_update_post
 %update_desktop_database_post
 %update_icon_cache hicolor
-%if %{without webkit}
-%update_browser_plugins
-%endif
 
 %preun
-%gconf_schema_uninstall epiphany-fonts.schemas
 %gconf_schema_uninstall epiphany-lockdown.schemas
-%gconf_schema_uninstall epiphany-pango.schemas
 %gconf_schema_uninstall epiphany.schemas
 
 %postun
 %scrollkeeper_update_postun
 %update_desktop_database_postun
 %update_icon_cache hicolor
-%if %{without webkit}
-if [ "$1" = 0 ]; then
-	%update_browser_plugins
-fi
-%endif
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 
-%if %{without webkit}
-# browser plugins v2
-%{_browserpluginsconfdir}/browsers.d/%{name}.*
-%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
-%endif
-
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/%{name}
 %{_desktopdir}/*.desktop
 %{_iconsdir}/*/*/apps/*.*
-%{_sysconfdir}/gconf/schemas/epiphany-fonts.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas
-%{_sysconfdir}/gconf/schemas/epiphany-pango.schemas
 %{_sysconfdir}/gconf/schemas/epiphany.schemas
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/%{basever}
-%dir %{_libdir}/%{name}/%{basever}/extensions
-%if %{without webkit}
-%dir %{_libdir}/%{name}/%{basever}/plugins
-%attr(755,root,root) %{_libdir}/epiphany/%{basever}/plugins/*.so*
-%endif
 %{_mandir}/man1/*
 
 %files devel
@@ -245,7 +159,6 @@
 %{_aclocaldir}/*
 %{_includedir}/epiphany
 %{_pkgconfigdir}/*.pc
-%{_datadir}/pygtk/*/defs/epiphany.defs
 
 %files apidocs
 %defattr(644,root,root,755)
@@ -257,20 +170,45 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212  2009/09/28 18:53:47  megabajt
+- updated to 2.28.0; merged from DEVEL
+
 Revision 1.211  2009/09/10 12:18:41  baggins
 - rel 4
 
+Revision 1.206.2.7  2009/08/26 08:43:31  patrys
+- 2.27.91
+
+Revision 1.206.2.6  2009/08/11 09:00:09  patrys
+- remove ca at valencia
+
+Revision 1.206.2.5  2009/08/11 08:48:08  patrys
+- 2.27.90
+
+Revision 1.206.2.4  2009/08/08 15:28:05  patrys
+- 2.27.5
+
 Revision 1.210  2009/08/05 16:09:23  arekm
 - release 3
 
 Revision 1.209  2009/07/19 15:05:25  arekm
 - release 2
 
+Revision 1.206.2.3  2009/07/16 08:34:08  patrys
+- 2.27.4
+- python is no longer used
+
 Revision 1.208  2009/07/04 09:24:58  megabajt
 - updated to 2.26.3
 
+Revision 1.206.2.2  2009/05/28 08:39:38  patrys
+- 2.27.2
+
 Revision 1.207  2009/05/06 20:29:33  megabajt
 - release 3
+
+Revision 1.206.2.1  2009/05/03 16:38:28  patrys
+- 2.27.1
 
 Revision 1.206  2009/04/24 11:34:56  megabajt
 - release 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/epiphany/epiphany.spec?r1=1.211&r2=1.212&f=u

More information about the pld-cvs-commit mailing list