rpms/epiphany/FC-2 epiphany-1.4.4-download.patch, NONE, 1.1 epiphany.spec, 1.10, 1.11 sources, 1.7, 1.8 epiphany-1.1.7-rpath.patch, 1.1, NONE epiphany-1.2.7-fc2-glib-2.4.0.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Mar 23 19:56:48 UTC 2005 

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

Modified Files:
	epiphany.spec sources 
Added Files:
	epiphany-1.4.4-download.patch 
Removed Files:
	epiphany-1.1.7-rpath.patch epiphany-1.2.7-fc2-glib-2.4.0.patch 
Log Message:
* Wed Mar 23 2005 Christopher Aillon <caillon at redhat.com> 1.4.4-4.2.1
- Build against 1.7.6


epiphany-1.4.4-download.patch:
 ContentHandler.cpp |   10 ----------
 1 files changed, 10 deletions(-)

--- NEW FILE epiphany-1.4.4-download.patch ---
Index: embed/mozilla/ContentHandler.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/ContentHandler.cpp,v
retrieving revision 1.60.4.2
diff -u -r1.60.4.2 ContentHandler.cpp
--- embed/mozilla/ContentHandler.cpp	10 Oct 2004 16:18:26 -0000	1.60.4.2
+++ embed/mozilla/ContentHandler.cpp	12 Oct 2004 14:48:41 -0000
@@ -419,22 +419,12 @@
 
 	if (mAction == CONTENT_ACTION_OPEN)
 	{
-		if (mAppSupportScheme)
-		{
-			LaunchHelperApp ();
-		}
-		else
 		{
 			mLauncher->SaveToDisk (nsnull, PR_FALSE);
 		}
 	}
 	else if (mAction == CONTENT_ACTION_OPEN_TMP)
 	{
-		if (mAppSupportScheme)
-		{
-			LaunchHelperApp ();
-		}
-		else
 		{
 			mLauncher->LaunchWithApplication (nsnull, PR_FALSE);
 		}


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/FC-2/epiphany.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- epiphany.spec	23 Mar 2005 19:39:25 -0000	1.10
+++ epiphany.spec	23 Mar 2005 19:56:42 -0000	1.11
@@ -1,20 +1,19 @@
 %define mozver 37:1.7.6
-ExclusiveArch: i386 x86_64
+ExclusiveArch: i386 x86_64 ppc
 
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
-Version: 1.2.7
-Release: 0.2.3
+Version: 1.4.4
+Release: 4.2.1
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
-Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany/1.2/%{name}-%{version}.tar.gz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany/1.3/%{name}-%{version}.tar.bz2
 Patch0: epiphany-1.0.1-home-page.patch
-Patch1: epiphany-1.1.7-rpath.patch
-Patch2: epiphany-1.2.7-fc2-glib-2.4.0.patch
+Patch1: epiphany-1.4.4-download.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Prereq: scrollkeeper, GConf2
-Requires: %mozver
+Requires: mozilla = %mozver
 # 1.0.5 for gnome-spinner, 1.0.6 for web-browser
 Requires: gnome-icon-theme >= 1.0.6-1
 BuildRequires: mozilla-devel >= 1.7
@@ -30,16 +29,24 @@
 epiphany is a simple GNOME web browser based on the Mozilla rendering
 engine
 
+%package devel
+Summary: The files needed for developing extensions for the epiphany web browser.
+Group: Development/Libraries
+
+%description devel
+epiphany is a web browser based on the Mozilla rendering engine.
+This package allows you to develop extensions that work within epiphany.
+
+Install epiphany-devel if you want to write extensions for epiphany.
+
 %prep
 %setup -q
 
 %patch0 -p1 -b .homepage
-%patch1 -p1 -b .rpath
-%patch2 -p1 -b .fc2
+%patch1 -p0 -b .download
 
 %build
-autoconf
-%configure --enable-nautilus-view=no
+%configure
 make
 
 %install
@@ -51,11 +58,9 @@
 %find_lang %{name}
 
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-rm -rf $RPM_BUILD_ROOT/usr/include
 
-# FC2 temporary hack: Use translations from redhat-menus
-ln -sf ../desktop-menu-patches/epiphany.desktop \
-  $RPM_BUILD_ROOT/%{_datadir}/applications/epiphany.desktop
+# Remove the bookmarks editor menu item
+rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/bme.desktop
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -76,7 +81,6 @@
 %doc
 %{_sysconfdir}/gconf/schemas/*
 %{_bindir}/epiphany
-%{_bindir}/epiphany-bin
 %{_libdir}/bonobo/servers/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/epiphany
@@ -84,20 +88,77 @@
 %{_datadir}/omf/epiphany
 %{_datadir}/pixmaps/*png
 %{_datadir}/application-registry/epiphany.applications
+
+%files devel
+%defattr(-, root, root)
+%{_includedir}/epiphany-1.4
+%{_libdir}/pkgconfig/epiphany-1.4.pc
 %{_datadir}/gtk-doc/html/epiphany
-%{_libdir}/pkgconfig/*.pc
 
+%changelog
+* Wed Mar 23 2005 Christopher Aillon <caillon at redhat.com> 1.4.4-4.2.1
+- Build against 1.7.6
 
+* Mon Oct 18 2004 Christopher Aillon <caillon at redhat.com> 1.4.4-4
+- Put back ppc
 
-%changelog
-* Wed Mar 23 2005 Christopher Aillon <caillon at redhat.com> 1.2.7-0.2.3
-- Rebuild against mozilla 1.7.6
+* Tue Oct 12 2004 Marco Pesenti Gritti <mpg at redhat.com> - 1.4.4-3
+- Remove generic name patch, epiphany is no more default
+
+* Tue Oct 12 2004 Marco Pesenti Gritti <mpg at redhat.com> - 1.4.4-2
+- Disable direct handling of downloads by external applications
+
+* Mon Oct 11 2004 Marco Pesenti Gritti <mpg at redhat.com> - 1.4.4-1
+- Add a devel package for extensions development
+
+* Mon Oct 11 2004 Marco Pesenti Gritti <mpg at redhat.com> - 1.4.4-0
+- Update to 1.4.4
+
+* Sun Oct 07 2004 Marco Pesenti Gritti <mpg at redhat.com> - 1.4.3-0
+- Remove mozilla 1.7.3 compatibility patch
+- Do not disable the nautilus view, it has been removed upstream
+ 
+* Sun Sep 26 2004 Christopher Blizzard <blizzard at redhat.com> - 1.4.0-0.3.6
+- Don't require a specific mozilla rpm release, only the version
+
+* Fri Sep 24 2004 Christopher Blizzard <blizzard at redhat.com> - 1.4.0-0.3.5
+- Change .desktop file name to "Web Browser" instead of "Epiphany..."
+
+* Fri Sep 24 2004 Christopher Blizzard <blizzard at redhat.com> - 1.4.0-0.3.4
+- Include epiphany's default .desktop file - don't remove it.
+
+* Fri Sep 24 2004 Christopher Blizzard <blizzard at redhat.com> - 1.4.0-0.3.3
+- Make sure to include the epoch for the mozilla version.
+
+* Fri Sep 24 2004 Christopher Blizzard <blizzard at redhat.com> - 1.4.0-0.3.2
+- Add patch to get this epiphany building with moz 1.7.3.
+
+* Fri Sep 24 2004 Christopher Blizzard <blizzard at redhat.com> - 1.4.0-0.3.1
+- Don't query for the mozilla version, use an explicit version number
+
+* Fri Sep 24 2004 Christopher Blizzard <blizzard at redhat.com> - 1.4.0-0.3.0
+- Update to 1.4.0
+
+* Fri Sep 24 2004 Mark McLoughlin <markmc at redhat.com> - 1.3.8-0.3.3
+- Remove the bookmarks editor from the menu (bug #132549)
+
+* Wed Sep 22 2004 Christopher Aillon <caillon at redhat.com> 1.3.8-0.3.2
+- Rebuilt to pick up new mozilla changes
+- Drop ppc from the build since mozilla doesn't build there anymore.
+
+* Fri Sep 03 2004 Christopher Blizzard <blizzard at redhat.com>
+- Bump release and rebuild.
+
+* Wed Sep 01 2004 Christopher Blizzard <blizzard at redht.com>
+- Update to 1.3.8
 
-* Thu Sep 23 2004 Christopher Aillon <caillon at redhat.com>
-- Rebuilt
+* Tue Aug 17 2004 Christopher Blizzard <blizzard at redhat.com>
+- Update to 1.3.5.
+- Remove epiphany-bin - it's not there anymore.
+- Change to .bz2 source tarball.
 
-* Wed Sep 22 2004 Christopher Aillon <caillon at redhat.com>
-- Rebuilt
+* Mon Aug 09 2004 Christopher Aillon <caillon at redhat.com>
+- Rebuild
 
 * Tue Aug 03 2004 Christopher Blizzard <blizzard at redhat.com>
 - Update to 1.2.7


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/epiphany/FC-2/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Sep 2004 04:35:06 -0000	1.7
+++ sources	23 Mar 2005 19:56:42 -0000	1.8
@@ -1 +1 @@
-d1e35adbb1b5f6f0ff5ed1e8885503fb  epiphany-1.2.7.tar.gz
+2d29074c577dd42706c923df21a9a5bf  epiphany-1.4.4.tar.bz2


--- epiphany-1.1.7-rpath.patch DELETED ---


--- epiphany-1.2.7-fc2-glib-2.4.0.patch DELETED ---

More information about the fedora-cvs-commits mailing list