rpms/epiphany/devel .cvsignore, 1.42, 1.43 epiphany.spec, 1.109, 1.110 sources, 1.43, 1.44

[fedora-cvs-commits redhat com]

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv913

Modified Files:
	.cvsignore epiphany.spec sources 
Log Message:
2.15.4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	18 Jul 2006 16:29:15 -0000	1.42
+++ .cvsignore	29 Jul 2006 04:02:46 -0000	1.43
@@ -1 +1 @@
-epiphany-2.15.1.tar.bz2
+epiphany-2.15.4.tar.bz2


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- epiphany.spec	19 Jul 2006 20:00:12 -0000	1.109
+++ epiphany.spec	29 Jul 2006 04:02:46 -0000	1.110
@@ -1,6 +1,5 @@
-%define mozver 37:1.7.13
+%define firefox_ver 1.5.0.5
 %define desktop_file_utils_version 0.9
-%define mozilla_devel_ver 1.7
 %define glib2_devel_ver 2.10.1
 %define gtk2_devel_ver 2.9.0
 %define libbonoboui_devel_ver 2.1.1
@@ -9,13 +8,12 @@
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 2.15.1
-Release: 2
+Version: 2.15.4
+Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
 Source0: %{name}-%{version}.tar.bz2
-Source1: po.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires(post): scrollkeeper
@@ -24,13 +22,12 @@
 Requires(preun): GConf2
 Requires(postun): scrollkeeper
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
-Requires: mozilla = %mozver
+Requires: firefox = %{firefox_ver}
 Requires: gnome-icon-theme >= 1.0.6-1
 Requires: iso-codes >= 0.45
 BuildRequires: glib2-devel >= %{glib2_devel_ver}
 BuildRequires: gtk2-devel >= %{gtk2_devel_ver}
-BuildRequires: mozilla-devel >= %{mozilla_devel_ver}
-BuildRequires: mozilla
+BuildRequires: firefox-devel >= %{firefox_ver} 
 BuildRequires: scrollkeeper >= %{scrollkeeper_ver}
 BuildRequires: libxml2-devel, libxslt-devel
 BuildRequires: libgnomeui-devel, libglade2-devel
@@ -81,8 +78,6 @@
 
 %patch0 -p1 -b .homepage
 
-tar xzf %{SOURCE1}
-
 %build
 %ifnarch s390 s390x
 %define enable_nm --enable-network-manager
@@ -164,6 +159,10 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Sat Jul 29 2006 Matthias Clasen <mclasen redhat com> - 2.15.4-1
+- Update to 2.15.4
+- Rebuild against firefox-devel
+
 * Tue Jul 18 2006 Matthias Clasen <mclasen redhat com> - 2.15.1-2
 - Go back to 2.15.1, since gecko 1.8 is still missing
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources	18 Jul 2006 17:53:18 -0000	1.43
+++ sources	29 Jul 2006 04:02:46 -0000	1.44
@@ -1,2 +1 @@
-1bc4bb644617ebf1aee3cd3e1604a54d  epiphany-2.15.1.tar.bz2
-1244f76760f1f6a5bc56ee1c39b5c91d  po.tar.gz
+1c0afcfed0340158b65ad720cc2b65e4  epiphany-2.15.4.tar.bz2