SPECS: epiphany.spec - merged from DEVEL

freetz freetz at pld-linux.org
Tue Sep 6 20:14:32 CEST 2005 

Author: freetz                       Date: Tue Sep  6 18:14:32 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   epiphany.spec (1.101 -> 1.102) 

---- Diffs:

================================================================
Index: SPECS/epiphany.spec
diff -u SPECS/epiphany.spec:1.101 SPECS/epiphany.spec:1.102
--- SPECS/epiphany.spec:1.101	Wed Aug 10 09:07:42 2005
+++ SPECS/epiphany.spec	Tue Sep  6 20:14:27 2005
@@ -6,45 +6,53 @@
 Summary(es):	Epiphany - navigador Web de GNOME basado en gecko
 Summary(pl):	Epiphany - przeglądarka WWW dla GNOME
 Name:		epiphany
-Version:	1.6.4
-Release:	5
+Version:	1.8.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications/Networking
-Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany/1.6/%{name}-%{version}.tar.bz2
-# Source0-md5:	fbe9925593968c2f78abfa1e3a08e6d4
+Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany/1.8/%{name}-%{version}.tar.bz2
+# Source0-md5:	297ca64ce700e90db596a50d58b68a80
 Patch0:		%{name}-first-tab.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-mozilla_includes.patch
 Patch3:		%{name}-mozilla.patch
+Patch4:		%{name}-pld-homepage.patch
 URL:		http://www.gnome.org/projects/epiphany/
 BuildRequires:	GConf2-devel >= 2.10.0
 BuildRequires:	ORBit2-devel >= 1:2.12.1
 BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake
+BuildRequires:	automake >= 1.8
+BuildRequires:	dbus-glib-devel >= 0.34
 BuildRequires:	gnome-common >= 2.8.0
 BuildRequires:	gnome-desktop-devel >= 2.10.0-2
+BuildRequires:	gnome-doc-utils >= 0.3.2-1
 BuildRequires:	gnome-vfs2-devel >= 2.10.0-2
-BuildRequires:	gtk+2-devel >= 2:2.6.4
+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:	startup-notification-devel >= 0.5
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.6.19
+BuildRequires:	libxslt-devel >= 1.1.15
 %if %{with mozilla_firefox}
 BuildRequires:	mozilla-firefox-devel
 %else
 BuildRequires:	mozilla-devel >= 5:1.7
 %endif
-BuildRequires:	pango-devel >= 1:1.8.1
 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
 BuildRequires:	scrollkeeper
 Requires(post,preun):	GConf2
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	scrollkeeper
 Requires:	gnome-icon-theme >= 2.10.0
-Requires:	gtk+2 >= 2:2.6.4
+Requires:	gtk+2 >= 2:2.8.3
 %if %{with mozilla_firefox}
 %requires_eq	mozilla-firefox
 %else
@@ -71,8 +79,8 @@
 Summary(pl):	Pliki nagłówkowe Epiphany
 Group:		X11/Applications/Networking
 # doesn't require base
-Requires:	gtk+2-devel >= 2:2.6.4
-Requires:	libxml2-devel >= 1:2.6.19
+Requires:	gtk+2-devel >= 2:2.8.3
+Requires:	libxslt-devel >= 1.1.15
 
 %description devel
 Epiphany header files for plugin development.
@@ -89,22 +97,24 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
-rm -f acconfig.h
+gnome-doc-prepare --copy --force
+%{__gnome_doc_common}
 %{__glib_gettextize}
 %{__intltoolize}
-%{__gnome_doc_common}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoheader}
 %{__automake}
 %{__autoconf}
 
 %configure \
 	--disable-schemas-install \
-	--enable-nautilus-view=yes \
+	--enable-dbus \
 	--enable-gtk-doc \
+	--enable-python \
 	--with-html-dir=%{_gtkdocdir}
 # CFLAGS is a hack for gcc 3.3
 %{__make} \
@@ -112,7 +122,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}-1.6/extensions
+install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/1.8/extensions
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -149,16 +159,19 @@
 %{_datadir}/%{name}
 %{_desktopdir}/*
 %{_pixmapsdir}/*
-%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas
+%{_sysconfdir}/gconf/schemas/epiphany.schemas
 %{_omf_dest_dir}/*
-%dir %{_libdir}/%{name}-1.6
-%dir %{_libdir}/%{name}-1.6/extensions
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/1.8
+%dir %{_libdir}/%{name}/1.8/extensions
 %{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/epiphany-1.6
+%{_includedir}/epiphany
 %{_pkgconfigdir}/*.pc
+%{_datadir}/pygtk/*/defs/epiphany.defs
 %{_gtkdocdir}/*
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -167,496 +180,48 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.101  2005/08/10 07:07:42  hawk
-- release 5 to rebuild with mozilla 1.7.11
-
-Revision 1.100  2005/07/27 20:29:03  freetz
-- rel.4 for rebuild with mozilla 1.7.10
-
-Revision 1.99  2005/07/12 06:15:26  freetz
-- rel.3
-
-Revision 1.98  2005/07/12 06:13:05  freetz
-- fixed gnome-desktop-devel BR
-
-Revision 1.97  2005/07/12 06:02:30  freetz
-- rel.2 for rebuild (gnutls 1.2.x)
-
-Revision 1.96  2005/07/07 11:57:53  freetz
-- 1.6.4
-
-Revision 1.95  2005/05/19 10:57:23  paladine
-- simpler mozilla-firefox requiers
-
-Revision 1.94  2005/05/18 18:52:03  freetz
-- require build time firefox version
-
-Revision 1.93  2005/05/18 18:28:09  freetz
-- added mozilla firefox bcond
-
-Revision 1.92  2005/05/14 08:14:31  freetz
-- release 2 for rebuild with mozilla 1.7.8
-
-Revision 1.91  2005/04/23 12:30:19  freetz
-- 1.6.3
-
-Revision 1.90  2005/04/12 09:08:14  paladine
-- updated to 1.6.2
-- no minmozver macro
-
-Revision 1.89  2005/04/10 19:45:21  freetz
-- removed redundant BRs (nautilus isn't required at all), fixed typo, rel.2
-
-Revision 1.88  2005/04/08 11:43:15  paladine
-- new style macros
-- STBR
-
-Revision 1.87  2005/04/06 11:18:31  paladine
-- missing umask 022
-
-Revision 1.86  2005/04/05 15:19:46  paladine
-- cosmetics
-
-Revision 1.85  2005/04/04 14:43:59  paladine
-- updated to 1.6.1
-- use new faster rpm's GConf automation
-- run scrollkeeper-update in quiet mode
-- don't package deprecated gnome-mime-data stuff
-
-Revision 1.84  2005/03/27 13:26:11  havner
-- reverted, wasn't sent with this rel
-
-Revision 1.83  2005/03/27 13:25:08  havner
-- rel 3 for rebuild
-
-Revision 1.82  2005/03/20 18:12:53  aflinta
-- rebuild with howl 0.9.10, release 2
-
-Revision 1.81  2005/03/14 10:18:42  paladine
+Revision 1.102  2005/09/06 18:14:27  freetz
 - merged from DEVEL
-- proper license
-- proper extensions dir
-
-Revision 1.80  2005/02/14 08:38:54  paladine
-- updated to 1.4.8
-- removed obsolete mozilla_175_fix patch
-- BR: pkgconfig
-- proper license
-
-Revision 1.79.2.4  2005/03/11 15:09:52  aflinta
-- up to version 1.6.0
-
-Revision 1.79.2.3  2005/02/28 23:29:02  paladine
-- updated to 1.5.8
-
-Revision 1.79.2.2  2005/02/28 01:33:43  paladine
-- updated to 1.5.7
-
-Revision 1.79.2.1  2005/02/08 15:12:04  grzegol
-- updated to 1.5.6
-- removed outdated mozilla_175_fix patch
-
-Revision 1.79  2005/01/17 23:19:18  paladine
-- removed Source0-size
-- removed dup from files
-- missing/proper epiphany extensions dir
-
-Revision 1.78  2005/01/13 21:19:29  hawk
-- fixed build against mozilla 1.7.5
-
-Revision 1.77  2005/01/13 14:37:57  hawk
-- release++ to rebuild with new mozilla
-
-Revision 1.76  2004/12/25 17:55:31  qboosh
-- cleanups
-
-Revision 1.75  2004/12/21 08:40:44  paladine
-- updated to 1.4.7 STBR
-
-Revision 1.74  2004/11/29 16:12:20  freetz
-- 1.4.6, STBR
-
-Revision 1.73  2004/11/15 11:52:40  aflinta
-- version 1.4.5
-
-Revision 1.72  2004/10/11 13:46:38  paladine
-- updated to 1.4.4
-
-Revision 1.71  2004/10/10 18:53:15  paladine
-- added missing BR: libtool
-
-Revision 1.70  2004/10/07 16:20:47  grzegol
-- updated to 1.4.3
-
-Revision 1.69  2004/09/28 22:08:40  paladine
-- updated to 1.4.1
-
-Revision 1.68  2004/09/16 19:27:21  grzegol
-- added mozilla173 patch (fix building with mozilla-1.7.3)
-
-Revision 1.67  2004/09/15 18:24:37  grzegol
-- in gnome-common-2.8.0 all macros are in %%{_aclocaldir}, not in
-  %%{_aclocaldir}/gnome2-macros, so remove -I %%{_aclocal}/gnome2-macros from
-  %%{__aclocal} args and BR: gnome-common >= 2.8.0
-
-Revision 1.66  2004/09/13 14:25:29  grzegol
-- merged from DEVEL and updated to 1.4.0
-- removed locale-names patch
-- remove no locale in %%install
-- run /usr/bin/update-desktop-database in %%post and %%postun
-
-Revision 1.65  2004/08/17 06:53:21  aflinta
-- up to version 1.2.8
-
-Revision 1.64  2004/08/01 17:29:06  freetz
-- 1.2.7, nautilus_view_patch added, do not send it to builders, bugfix rel.
-  expected shortly (with fixes against mozilla API breakage)
-
-Revision 1.63  2004/07/20 10:20:07  ankry
-- force build with mozilla 1.7.1
-
-Revision 1.62  2004/07/20 05:11:50  ankry
-- rel. 3
-
-Revision 1.61  2004/06/18 09:37:50  aflinta
-- added BR: gtk-doc
-
-Revision 1.60  2004/06/18 07:48:00  aflinta
-- rebuild with mozilla 1.7
-
-Revision 1.59  2004/06/14 11:38:26  aflinta
-- up to version 1.2.6
-
-Revision 1.58.2.14  2004/08/30 16:52:06  grzegol
-- updated to 1.3.8
-
-Revision 1.58.2.13  2004/08/24 23:35:08  grzegol
-- updated to 1.3.7
-
-Revision 1.58.2.12  2004/08/24 22:04:20  grzegol
-- added mozilla patch (detect mozilla home properly)
-
-Revision 1.58.2.11  2004/08/24 21:26:24  aflinta
-- up to version 1.3.6
-
-Revision 1.58.2.10  2004/08/22 21:27:51  aflinta
-- rebuild with howl, release 2
-
-Revision 1.58.2.9  2004/08/22 21:14:38  grzegol
-- added BR: pango-devel >= 1:1.5.2
-
-Revision 1.58.2.8  2004/08/16 19:03:30  aflinta
-- up to version 1.3.5
-
-Revision 1.58.2.7  2004/08/12 19:29:55  aflinta
-- rebuild with new mozilla, release 2
-
-Revision 1.58.2.6  2004/08/01 14:38:21  grzegol
-- updated to 1.3.4
-
-Revision 1.58.2.5  2004/07/20 11:07:33  grzegol
-- updated to 1.3.3
-
-Revision 1.58.2.4  2004/07/07 19:12:21  grzegol
-- updated to 1.3.2
-
-Revision 1.58.2.3  2004/07/05 23:21:08  grzegol
-- updated to 1.3.0.90-20040706 snap (it works with mozilla-1.7)
-- added mozilla_includes patch (add more mozilla include dirs)
-
-Revision 1.58.2.2  2004/06/12 10:21:28  freetz
-- added desktop patch (merged changes from desktop name patch, added X-WWW;
-  to Categories, killed Application;
-
-Revision 1.58.2.1  2004/06/05 18:03:38  freetz
-- 1.3.0 - gnome 2.8 developement series
-
-Revision 1.58  2004/05/03 23:07:55  grzegol
-- updated to 1.2.5
-
-Revision 1.57  2004/04/27 12:23:35  aflinta
-- up to version 1.2.4
-
-Revision 1.56  2004/04/18 22:38:13  aflinta
-- up to version 1.2.3
-
-Revision 1.55  2004/04/18 12:57:16  krzak
-- desktop-name-entry.patch
-- rel 2
-
-Revision 1.54  2004/04/01 14:02:10  qboosh
-- -devel doesn't require base
-
-Revision 1.53  2004/03/31 13:40:00  grzegol
-- updated to 1.2.2
-
-Revision 1.52  2004/03/22 01:04:35  grzegol
-- merged from DEVEL and updated to 1.2.1
-
-Revision 1.51  2004/02/08 19:23:36  krzak
-- BR: mozilla-devel instead mozilla-embedded-devel
-
-Revision 1.50  2004/02/08 19:12:04  krzak
-- minmozver = 5:1.6
-- rel 2
-
-Revision 1.49  2004/01/17 14:38:26  freetz
-- typo
-
-Revision 1.48  2004/01/17 14:33:25  freetz
-- 1.0.7, STBR for Ac
-
-Revision 1.47  2003/12/14 16:34:45  erjot
-- Req icons
-
-Revision 1.46  2003/11/20 21:57:30  saq
-- es translations
-- new URL
-
-Revision 1.45  2003/11/10 23:01:49  qboosh
-- BR: libtool
-
-Revision 1.44  2003/11/10 15:13:25  grzegol
-- updated to 1.0.6
-- -devel R:gtk+2-devel >= 2.2.0, libxml2-devel >= 2.5.9
-
-Revision 1.43  2003/11/05 17:27:16  grzegol
-- updated to 1.0.5
-
-Revision 1.42.2.31  2004/03/15 18:44:33  grzegol
-- updated to 1.2.0
-
-Revision 1.42.2.30  2004/03/09 11:14:21  grzegol
-- let ./configure guess mozilla version (don't pass --with-mozilla-snapshot=
-  option)
-
-Revision 1.42.2.29  2004/03/09 10:46:46  aflinta
-- small cleanup
-
-Revision 1.42.2.28  2004/03/09 10:45:56  aflinta
-- up to version 1.1.12
-
-Revision 1.42.2.27  2004/03/07 19:47:53  grzegol
-- updated to 1.1.11
-
-Revision 1.42.2.26  2004/03/05 16:22:28  grzegol
-- updated to 1.1.10-20040305 snap for mozilla-1.7a and gtk+2-2.3.5
-
-Revision 1.42.2.25  2004/02/22 16:34:38  grzegol
-- updated to 1.1.10
-- removed outdated schemas patch
-
-Revision 1.42.2.24  2004/02/16 23:52:18  grzegol
-- updated to 1.1.9
-
-Revision 1.42.2.23  2004/02/16 09:33:15  aflinta
-- fixed version issue in devel subpackage
-
-Revision 1.42.2.22  2004/02/15 13:34:27  grzegol
-- updated to 1.1.8
-- added locale-names patch (changes locale no -> nb)
-- added Requires to -devel
-
-Revision 1.42.2.21  2004/02/06 03:11:25  wiget
-- R fixed gnome-icon-theme (now all icons visible)
-- release 2
-
-Revision 1.42.2.20  2004/02/02 18:08:58  grzegol
-- updated to 1.1.7
-
-Revision 1.42.2.19  2004/02/01 12:41:03  grzegol
-- updated to 1.1.6
-
-Revision 1.42.2.18  2004/01/31 13:02:09  grzegol
-- added schemas patch
-- rel. 2
-
-Revision 1.42.2.17  2004/01/28 13:13:40  wiget
-- BR gtk+2-devel 2.3.2
-
-Revision 1.42.2.16  2004/01/24 20:46:14  grzegol
-- updated to 1.1.5
-
-Revision 1.42.2.15  2004/01/24 14:08:36  grzegol
-- updated to 1.1.4
-
-Revision 1.42.2.14  2004/01/20 16:34:44  grzegol
-- rel. 2 to rebuild with mozilla-1.6
-
-Revision 1.42.2.13  2004/01/14 10:41:02  trojan
-- updated to 1.1.3
-
-Revision 1.42.2.12  2004/01/01 22:10:48  grzegol
-- changed plugins directory into %%{_libdir}/%%{name}/extensions
-- rel. 2
-
-Revision 1.42.2.11  2003/12/28 20:44:08  grzegol
-- updated to 1.1.2
-
-Revision 1.42.2.10  2003/12/12 14:47:48  wiget
-- libglade2 BR fixed
-
-Revision 1.42.2.9  2003/12/11 12:16:27  wiget
-- up to 1.1.1
-
-Revision 1.42.2.8  2003/12/03 11:50:39  wiget
-- updated to 1.1.0 snap 20031203
-- enabled gtk-doc
-
-Revision 1.42.2.7  2003/11/14 15:15:49  wiget
-- added epoch to ORBit req
-
-Revision 1.42.2.6  2003/11/14 15:15:10  wiget
-- added epoch to gtk+ req
-
-Revision 1.42.2.5  2003/11/14 13:29:56  wiget
-- md5sum fix
-
-Revision 1.42.2.4  2003/11/14 13:27:06  wiget
-- updated to 20031114 snap
-
-Revision 1.42.2.3  2003/11/13 12:43:28  wiget
-- start updating to 20031113 snap
-
-Revision 1.42.2.2  2003/11/12 14:20:22  areq
-- rebuild
-
-Revision 1.42.2.1  2003/10/28 13:19:55  wiget
-- 1.1.0
-
-Revision 1.42  2003/10/25 11:24:29  grzegol
-- rel. 2 to rebuild with mozilla-1.5
-
-Revision 1.41  2003/10/22 15:09:37  freetz
-- 1.0.4
-
-Revision 1.40  2003/10/16 20:05:16  freetz
-- 1.0.3
-
-Revision 1.39  2003/10/13 14:39:51  freetz
-- up to 1.0.2
-
-Revision 1.38  2003/10/04 12:54:45  grzegol
-- updated to 1.0.1
-- removed open-save-dialog patch (already in sources)
-
-Revision 1.37  2003/09/20 12:11:37  krzak
-- open-save-dialog.patch (http://bugzilla.gnome.org/show_bug.cgi?id=122780)
-- rel. 4
-
-Revision 1.36  2003/09/16 15:22:15  krzak
-- first-tab.patch, do not show tab title if there is only on tab
-- rel. 3
-
-Revision 1.35  2003/09/16 12:14:55  krzak
-- tabsmenu.patch to work with epiphany-extension
-- rel 2
-
-Revision 1.34  2003/09/09 11:44:11  ankry
-- sorted (Build)Requires
-
-Revision 1.33  2003/09/09 05:48:03  aflinta
-- version 1.0
-
-Revision 1.32  2003/09/03 03:59:37  grzegol
-- rel. 2 to rebuild with mozilla-1.5b
-
-Revision 1.31  2003/09/01 21:21:14  aflinta
-- version 0.9.3
-
-Revision 1.30  2003/09/01 14:05:49  ankry
-- cosmetics: working commented out URL
-
-Revision 1.29  2003/08/26 20:31:19  ankry
-- s/[Gg]nome/GNOME/
-
-Revision 1.28  2003/08/26 04:51:20  aflinta
-- fetch proper source
-
-Revision 1.27  2003/08/24 21:04:22  grzegol
-- updated to 0.9.2
-
-Revision 1.26  2003/08/23 14:19:37  grzegol
-- updated to 0.9.1
-
-Revision 1.25  2003/08/11 22:16:58  grzegol
-- updated to 0.8.4
-
-Revision 1.24  2003/08/10 17:29:00  grzegol
-- updated to 0.8.3
-
-Revision 1.23  2003/08/04 11:59:33  grzegol
-- added plugins dir
-- rel. 2
-
-Revision 1.22  2003/08/03 13:40:24  grzegol
-- updated to 0.8.2
-- changed source to official one (there is no epiphany-0.8.2 on gnome ftp yet)
-
-Revision 1.21  2003/08/01 11:58:49  grzegol
-- rel++ to rebuild without linc
-- sorting/cosmetics
-
-Revision 1.20  2003/07/28 13:56:31  grzegol
-- rel. 2 to rebuild with mozilla 1.5a
-- added scrollkeeper-update in %%postun
-
-Revision 1.19  2003/07/15 20:06:44  aflinta
-- require new gnome-common instead of ac-patch
-
-Revision 1.18  2003/07/15 19:56:38  grzegol
-- readded ac patch
-
-Revision 1.17  2003/07/15 19:42:15  aflinta
-- version 0.8.0
-
-Revision 1.16  2003/07/10 10:05:53  qboosh
-- get epoch from mozilla
-
-Revision 1.15  2003/07/10 10:00:41  aflinta
-- cosmetics, rebuild with new mozilla, release 2
-
-Revision 1.14  2003/06/29 19:49:49  grzegol
-- updated to 0.7.3
<<Diff was trimmed, longer than 597 lines>>

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

More information about the pld-cvs-commit mailing list