SPECS (AC-branch): epiphany.spec - merged from HEAD

baggins baggins at pld-linux.org
Mon May 15 18:04:36 CEST 2006 

Author: baggins                      Date: Mon May 15 16:04:36 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   epiphany.spec (1.107 -> 1.107.2.1) 

---- Diffs:

================================================================
Index: SPECS/epiphany.spec
diff -u SPECS/epiphany.spec:1.107 SPECS/epiphany.spec:1.107.2.1
--- SPECS/epiphany.spec:1.107	Wed Feb  8 17:32:20 2006
+++ SPECS/epiphany.spec	Mon May 15 18:04:31 2006
@@ -1,39 +1,40 @@
 # $Revision$, $Date$
 # Conditinal build:
-%bcond_with	mozilla_firefox	# build with mozilla-firefox-devel
+%bcond_without	mozilla_firefox	# build without mozilla-firefox-devel
 #
+%define		basever	2.14
 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.8.4.1
-Release:	1
+Version:	2.14.1
+Release:	3
 License:	GPL v2
 Group:		X11/Applications/Networking
-Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany/1.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	e34870feff1db2c529568a75be7546b0
+Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany/%{basever}/%{name}-%{version}.tar.bz2
+# Source0-md5:	69f9760646b736d953f24442e0e38f7b
 Patch0:		%{name}-first-tab.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-mozilla_includes.patch
-Patch3:		%{name}-mozilla.patch
-Patch4:		%{name}-pld-homepage.patch
+Patch3:		%{name}-pld-homepage.patch
+Patch4:		%{name}-configure.patch
 URL:		http://www.gnome.org/projects/epiphany/
-BuildRequires:	GConf2-devel >= 2.10.0
-BuildRequires:	ORBit2-devel >= 1:2.12.1
+BuildRequires:	GConf2-devel >= 2.14.0
+BuildRequires:	ORBit2-devel >= 1:2.14.0
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1.8
-BuildRequires:	dbus-glib-devel >= 0.34
+BuildRequires:	dbus-glib-devel >= 0.60
 BuildRequires:	gnome-common >= 2.8.0
-BuildRequires:	gnome-desktop-devel >= 2.10.0-2
+BuildRequires:	gnome-desktop-devel >= 2.14.0
 BuildRequires:	gnome-doc-utils >= 0.3.2-1
-BuildRequires:	gnome-vfs2-devel >= 2.10.0-2
+BuildRequires:	gnome-vfs2-devel >= 2.14.0
 BuildRequires:	gtk+2-devel >= 2:2.8.3
 BuildRequires:	gtk-doc >= 1.3
 BuildRequires:	intltool >= 0.33
 BuildRequires:	iso-codes >= 0.35
 BuildRequires:	libglade2-devel >= 1:2.5.1
-BuildRequires:	libgnomeprintui-devel >= 2.11.0-3
-BuildRequires:	libgnomeui-devel >= 2.10.0-2
+BuildRequires:	libgnomeprintui-devel >= 2.12.0
+BuildRequires:	libgnomeui-devel >= 2.14.0
 BuildRequires:	startup-notification-devel >= 0.5
 BuildRequires:	libtool
 BuildRequires:	libxslt-devel >= 1.1.15
@@ -43,7 +44,6 @@
 BuildRequires:	mozilla-devel >= 5:1.7.9
 %endif
 BuildRequires:	pkgconfig
-# Requries but python package not present?
 BuildRequires:	python-gnome-devel >= 2.6.0
 BuildRequires:	python-pygtk-devel >= 2.6.0
 BuildRequires:	rpmbuild(macros) >= 1.197
@@ -51,7 +51,8 @@
 Requires(post,preun):	GConf2
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	scrollkeeper
-Requires:	gnome-icon-theme >= 2.10.0
+Requires:	dbus >= 0.60
+Requires:	gnome-icon-theme >= 2.14.0
 Requires:	gtk+2 >= 2:2.8.3
 %if %{with mozilla_firefox}
 %requires_eq	mozilla-firefox
@@ -123,14 +124,14 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/1.8/extensions
+install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/%{basever}/extensions
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	HTML_DIR=%{_gtkdocdir}
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-rm -r $RPM_BUILD_ROOT%{_datadir}/application-registry/*
+rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/%{basever}/plugins/*.la
 
 # epiphany-2.0.mo, but gnome/help/epiphany
 %find_lang %{name}-2.0 --with-gnome --all-name
@@ -139,13 +140,17 @@
 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
 
 %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
@@ -156,20 +161,25 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
-%{_libdir}/bonobo/servers/*
+%{_datadir}/dbus-1/services/*.service
 %{_datadir}/%{name}
 %{_desktopdir}/*
 %{_pixmapsdir}/*
+%{_sysconfdir}/gconf/schemas/epiphany-fonts.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas
+%{_sysconfdir}/gconf/schemas/epiphany-pango.schemas
 %{_sysconfdir}/gconf/schemas/epiphany.schemas
 %{_omf_dest_dir}/*
 %dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/1.8
-%dir %{_libdir}/%{name}/1.8/extensions
+%dir %{_libdir}/%{name}/%{basever}
+%dir %{_libdir}/%{name}/%{basever}/extensions
+%dir %{_libdir}/%{name}/%{basever}/plugins
+%attr(755,root,root) %{_libdir}/epiphany/%{basever}/plugins/*.so*
 %{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
+%{_aclocaldir}/*
 %{_includedir}/epiphany
 %{_pkgconfigdir}/*.pc
 %{_datadir}/pygtk/*/defs/epiphany.defs
@@ -181,6 +191,46 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.107.2.1  2006/05/15 16:04:31  baggins
+- merged from HEAD
+
+Revision 1.112  2006/05/05 14:54:43  wrobell
+- rel. 3 to rebuild with mozilla firefox 1.5.0.3
+
+Revision 1.111  2006/04/17 16:07:48  wrobell
+- build with firefox by default
+- rel. 2
+
+Revision 1.110  2006/04/10 21:30:14  freetz
+- 2.14.1
+
+Revision 1.109  2006/04/02 14:45:40  freetz
+- merged from DEVEL
+
+Revision 1.105.2.7  2006/03/12 20:59:03  freetz
+- 2.14.0, define and use basever
+
+Revision 1.105.2.6  2006/03/06 22:16:12  freetz
+- 1.9.99
+
+Revision 1.105.2.5  2006/02/28 14:58:17  freetz
+- 1.9.8
+
+Revision 1.105.2.4  2006/02/14 08:48:48  freetz
+- 1.9.7, removed obsoleted m4 patch
+
+Revision 1.105.2.3  2006/02/01 18:01:18  freetz
+- m4 fix added
+
+Revision 1.105.2.2  2006/02/01 17:28:29  freetz
+- 1.9.6, configure patch (aginst mozilla madness), files list update
+
+Revision 1.105.2.1  2005/10/25 19:17:46  paladine
+- updated to 1.9.1
+
+Revision 1.108  2006/02/15 07:22:07  freetz
+- 1.8.5 (important bugfix release)
+
 Revision 1.107  2006/02/08 16:32:20  freetz
 - 1.8.4.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/epiphany.spec?r1=1.107&r2=1.107.2.1&f=u

More information about the pld-cvs-commit mailing list