From 9463371be36f28ab5a62b4e48521743f68fc3d0e35a6ed8b21add17688fdc783 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 10 Jan 2007 16:39:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany?expand=0&rev=2 --- epiphany.changes | 20 +++++++ epiphany.spec | 134 ++++++++++++++++++++++------------------------- 2 files changed, 84 insertions(+), 70 deletions(-) diff --git a/epiphany.changes b/epiphany.changes index d7d34f4..17928c8 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Jan 10 16:10:11 CET 2007 - sbrabec@suse.cz + +- Enabled NetworkManager support. + +------------------------------------------------------------------- +Wed Jan 3 14:53:07 CET 2007 - sbrabec@suse.cz + +- Spec file cleanup. + +------------------------------------------------------------------- +Fri Dec 29 11:45:58 GMT 2006 - james@usr-local-bin.org + +- Fix %post. + +------------------------------------------------------------------- +Fri Dec 29 11:45:11 CST 2006 - maw@suse.de + +- Move to /usr. + ------------------------------------------------------------------- Thu Dec 28 23:12:30 CET 2006 - jhargadon@suse.de diff --git a/epiphany.spec b/epiphany.spec index 513ee70..ca6db89 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -1,7 +1,7 @@ # # spec file for package epiphany (Version 2.16.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,9 +12,7 @@ Name: epiphany %define xulrunner_version 181 -BuildRequires: gcc-c++ gnome-common gnome-desktop-devel gnome-doc-utils-devel gnutls-devel iso-codes-devel kdelibs3-devel-doc libglade2-devel libgnomeprintui-devel libwnck-devel libxslt-devel mDNSResponder-devel perl-XML-Parser python-devel python-gnome-devel python-gtk-devel update-desktop-files -%define prefix /opt/gnome -%define sysconfdir /etc%{prefix} +BuildRequires: NetworkManager-devel docbook_4 enchant-devel gcc-c++ gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-icon-theme gnutls-devel iso-codes-devel kdelibs3-devel-doc libglade2-devel libgnomeprintui-devel libwnck-devel libxslt-devel mDNSResponder-devel perl-XML-Parser python-devel python-gnome-devel python-gtk-devel update-desktop-files %if %suse_version > 1010 || 0%{?opensuse_bs} BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel %define mozilla_ver %(rpm -q --qf '%%{version}' mozilla-xulrunner%{xulrunner_version}) @@ -32,24 +30,25 @@ Requires: mozilla = %{mozilla_ver} %endif License: GNU General Public License (GPL) Group: Productivity/Networking/Web/Browsers -Autoreqprov: on Version: 2.16.1 -Release: 36 +Release: 40 %define interface_version 2.16 Summary: GNOME Web Browser Based on the Mozilla Rendering Engine Source: %{name}-%{version}.tar.bz2 Patch1: %{name}-schema.dif Patch4: 59950.diff Patch5: 59949.diff -Patch9: %name-desktop.patch +Patch9: %{name}-desktop.patch Patch11: epiphany-no-root.patch Patch12: epiphany-flash-crash.patch Patch13: epiphany-browser-plugins.patch Patch14: epiphany-dbus-connection-close-fix-thoenig-01.patch URL: http://www.gnome.org/projects/epiphany/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: python-gtk python-gnome iso-codes -PreReq: filesystem gconf2 +Requires: python-gtk python-gnome iso-codes gnome-icon-theme +Autoreqprov: on + +%gconf_schemas_prereq %description Epiphany is a Web browser for the GNOME Desktop. Its principles are @@ -122,89 +121,84 @@ cat %{P:13} | sed s/@LIB@/%{_lib}/g | patch -p0 %build #cp -i data/default-prefs-gecko-1-8.js data/default-prefs-xulrunner.js -libtoolize --force -aclocal -I m4 -automake --add-missing -autoconf -CFLAGS="$RPM_OPT_FLAGS" \ -CXXFLAGS="$RPM_OPT_FLAGS" \ -./configure \ - --prefix=%prefix \ - --libdir=%prefix/%_lib \ - --sysconfdir=%sysconfdir \ - --datadir=%prefix/share \ - --mandir=%prefix/share/man \ - --localstatedir=/var/lib \ +ACLOCAL="aclocal -I m4" autoreconf -f -i +# needed for epiphany-2.16.1: +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +# FIXME: es/epiphany.xml:*: parser error : Entity 'hellip' not defined +%configure\ + --disable-scrollkeeper\ %if %suse_version > 1000 - --with-mozilla=xulrunner \ + --with-mozilla=xulrunner\ %endif - --enable-dbus \ - --enable-zeroconf -make + --enable-dbus\ + --enable-zeroconf\ + --enable-certificate-manager\ + --enable-network-manager +# FIXME: Compile xulrunner with spellchecker extension. +# --enable-spell-checker +make %{?jobs:-j%jobs} %install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL +mkdir $RPM_BUILD_ROOT%{_datadir}/pixmaps +ln -s ../icons/gnome/scalable/apps/web-browser.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/ %suse_update_desktop_file -N "Epiphany" %name Network WebBrowser %suse_update_desktop_file bme System Network -mkdir -p $RPM_BUILD_ROOT%{prefix}/%_lib/epiphany/%{interface_version}/extensions -rm -f %{prefix}/share/applications/epiphany.desktop -rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper -mkdir -p $RPM_BUILD_ROOT/usr/share -mv $RPM_BUILD_ROOT%{prefix}/share/pygtk $RPM_BUILD_ROOT/usr/share -mv $RPM_BUILD_ROOT%{prefix}/share/dbus-1 $RPM_BUILD_ROOT/usr/share -rm $RPM_BUILD_ROOT%{prefix}/lib/epiphany/2.16/plugins/libdesktopfileplugin.la - -%post -%run_ldconfig -export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/epiphany.schemas >/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/epiphany-lockdown.schemas >/dev/null - -%postun -%run_ldconfig +mkdir $RPM_BUILD_ROOT%{_libdir}/epiphany/%{interface_version}/extensions +%find_lang %{name} +%find_gconf_schemas +cat %{name}.lang %{name}.schemas_list >%{name}.lst +rm $RPM_BUILD_ROOT%{_libdir}/*/*/*/*.*a %clean rm -rf $RPM_BUILD_ROOT -%files +%pre -f %{name}.schemas_pre + +%post +%run_ldconfig + +%posttrans -f %{name}.schemas_posttrans + +%preun -f %{name}.schemas_preun + +%postun +%run_ldconfig + +%files -f %{name}.lst %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO -%{prefix}/bin/* -#%{prefix}/%_lib/bonobo/servers/*.server -#%{prefix}/share/application-registry/epiphany.applications -%{prefix}/share/applications/*.desktop -%{prefix}/share/epiphany -%{prefix}/share/aclocal/epiphany.m4 +%{_bindir}/* +%{_datadir}/applications/*.desktop %{_datadir}/dbus-1/services/org.gnome.Epiphany.service -%{prefix}/share/icons/hicolor/48x48/apps/epiphany-bookmarks.png -/etc/opt/gnome/gconf/schemas/epiphany.schemas -/etc/opt/gnome/gconf/schemas/epiphany-lockdown.schemas -/etc/opt/gnome/gconf/schemas/epiphany-fonts.schemas -/etc/opt/gnome/gconf/schemas/epiphany-pango.schemas -%{prefix}/share/gnome/help/epiphany -%{prefix}/share/man/man1/epiphany.1.gz -%{prefix}/share/omf/epiphany -#%{prefix}/share/pixmaps/*.png -/usr/share/pygtk/2.0/defs/epiphany.defs -%{prefix}/share/locale/*/LC_MESSAGES/epiphany* -%dir %{prefix}/%_lib/epiphany -%dir %{prefix}/%_lib/epiphany/%{interface_version} -%dir %{prefix}/%_lib/epiphany/%{interface_version}/plugins -%dir %{prefix}/%_lib/epiphany/%{interface_version}/extensions -%{prefix}/%_lib/epiphany/%{interface_version}/plugins/* +%{_datadir}/epiphany +%{_datadir}/icons/hicolor/48x48/apps/epiphany-bookmarks.png +%{_datadir}/pixmaps/*.svg +%{_datadir}/pygtk/2.0/defs/epiphany.defs +%{_datadir}/omf/epiphany +%{_libdir}/epiphany +%doc %{_mandir}/man1/epiphany.1.gz %files devel %defattr(-,root,root) -%{prefix}/include/epiphany* -%{prefix}/%_lib/pkgconfig/epiphany*.pc +%{_datadir}/aclocal/*.m4 +%{_includedir}/epiphany* +%{_libdir}/pkgconfig/*.pc %files doc %defattr(-,root,root) -%{prefix}/share/gtk-doc/html/epiphany +%{_datadir}/gtk-doc/html/epiphany %changelog -n epiphany +* Wed Jan 10 2007 - sbrabec@suse.cz +- Enabled NetworkManager support. +* Wed Jan 03 2007 - sbrabec@suse.cz +- Spec file cleanup. +* Fri Dec 29 2006 - james@usr-local-bin.org +- Fix %%post. +* Fri Dec 29 2006 - maw@suse.de +- Move to /usr. * Thu Dec 28 2006 - jhargadon@suse.de - removed unneeded libtool file (#223685) * Thu Nov 30 2006 - sbrabec@suse.cz