SPECS: epiphany.spec - 2.15.2, mozilla 1.7 support dropped upstrea...

freetz freetz at pld-linux.org
Sat Jun 10 23:13:27 CEST 2006 

Author: freetz                       Date: Sat Jun 10 21:13:27 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.15.2, mozilla 1.7 support dropped upstream (removed bcond),
  GNOME 2.15.x deps

---- Files affected:
SPECS:
   epiphany.spec (1.114 -> 1.115) 

---- Diffs:

================================================================
Index: SPECS/epiphany.spec
diff -u SPECS/epiphany.spec:1.114 SPECS/epiphany.spec:1.115
--- SPECS/epiphany.spec:1.114	Tue Jun  6 15:00:02 2006
+++ SPECS/epiphany.spec	Sat Jun 10 23:13:22 2006
@@ -1,66 +1,53 @@
 # $Revision$, $Date$
-#
-# Conditinal build:
-%bcond_without	mozilla_firefox	# build with mozilla instead of mozilla-firefox
-#
-%define		basever	2.14
+%define		basever	2.15
 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:	2.14.2.1
+Version:	2.15.2
 Release:	1
 License:	GPL v2
 Group:		X11/Applications/Networking
 Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany/%{basever}/%{name}-%{version}.tar.bz2
-# Source0-md5:	872ef8d5e95cdc359f93b5ded501d98d
+# Source0-md5:	eb9826f106b29168a8154dbf4aaaf718
 Patch0:		%{name}-first-tab.patch
 Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-mozilla_includes.patch
-Patch3:		%{name}-pld-homepage.patch
-Patch4:		%{name}-configure.patch
+Patch2:		%{name}-pld-homepage.patch
+Patch3:		%{name}-configure.patch
 URL:		http://www.gnome.org/projects/epiphany/
 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.60
-BuildRequires:	gnome-common >= 2.8.0
-BuildRequires:	gnome-desktop-devel >= 2.14.2
-BuildRequires:	gnome-doc-utils >= 0.3.2-1
-BuildRequires:	gnome-vfs2-devel >= 2.14.2
-BuildRequires:	gtk+2-devel >= 2:2.8.18
+BuildRequires:	gnome-common >= 2.12.0
+BuildRequires:	gnome-desktop-devel >= 2.15.2
+BuildRequires:	gnome-doc-utils >= 0.6.0
+BuildRequires:	gnome-vfs2-devel >= 2.15.1
+BuildRequires:	gtk+2-devel >= 2:2.9.2
 BuildRequires:	gtk-doc >= 1.3
-BuildRequires:	intltool >= 0.33
+BuildRequires:	intltool >= 0.35
 BuildRequires:	iso-codes >= 0.35
 BuildRequires:	libglade2-devel >= 1:2.5.1
 BuildRequires:	libgnomeprintui-devel >= 2.12.0
-BuildRequires:	libgnomeui-devel >= 2.14.1
+BuildRequires:	libgnomeui-devel >= 2.15.1
 BuildRequires:	startup-notification-devel >= 0.5
 BuildRequires:	libtool
-BuildRequires:	libxslt-devel >= 1.1.15
-%if %{with mozilla_firefox}
+BuildRequires:	libxslt-devel >= 1.1.17
 BuildRequires:	mozilla-firefox-devel >= 1.0.5
-%else
-BuildRequires:	mozilla-devel >= 5:1.7.9
-%endif
 BuildRequires:	pkgconfig
-BuildRequires:	python-gnome-devel >= 2.6.0
-BuildRequires:	python-pygtk-devel >= 2.6.0
+BuildRequires:	python-gnome-devel >= 2.15.1
+BuildRequires:	python-pygtk-devel >= 2.9.0
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
-Requires(post,preun):	GConf2
+Requires(post,preun):	GConf2 >= 2.14.0
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	scrollkeeper
 Requires:	dbus >= 0.60
-Requires:	gnome-icon-theme >= 2.14.0
-Requires:	gtk+2 >= 2:2.8.18
-Requires:	libgnomeui >= 2.14.1
-%if %{with mozilla_firefox}
+Requires:	gnome-icon-theme >= 2.15.2
+Requires:	gtk+2 >= 2:2.9.2
+Requires:	libgnomeui >= 2.15.1
 %requires_eq	mozilla-firefox
-%else
-Requires:	mozilla-embedded = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla-embedded)
-%endif
 Obsoletes:	python-epiphany
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -83,8 +70,8 @@
 Summary(pl):	Pliki nagłówkowe Epiphany
 Group:		X11/Applications/Networking
 # doesn't require base
-Requires:	gtk+2-devel >= 2:2.8.18
-Requires:	libxslt-devel >= 1.1.15
+Requires:	gtk+2-devel >= 2:2.9.2
+Requires:	libxslt-devel >= 1.1.17
 
 %description devel
 Epiphany header files for plugin development.
@@ -101,7 +88,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 gnome-doc-prepare --copy --force
@@ -120,9 +106,7 @@
 	--enable-gtk-doc \
 	--enable-python \
 	--with-html-dir=%{_gtkdocdir}
-# CFLAGS is a hack for gcc 3.3
-%{__make} \
-	CFLAGS="%{rpmcflags} -fno-strict-aliasing"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -132,7 +116,7 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	HTML_DIR=%{_gtkdocdir}
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/tk
 rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/%{basever}/plugins/*.la
 
 # epiphany-2.0.mo, but gnome/help/epiphany
@@ -148,6 +132,7 @@
 %gconf_schema_install epiphany.schemas
 %scrollkeeper_update_post
 %update_desktop_database_post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 
 %preun
 %gconf_schema_uninstall epiphany-fonts.schemas
@@ -158,6 +143,7 @@
 %postun
 %scrollkeeper_update_postun
 %update_desktop_database_postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 
 %files -f %{name}-2.0.lang
 %defattr(644,root,root,755)
@@ -166,7 +152,7 @@
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/%{name}
 %{_desktopdir}/*
-%{_pixmapsdir}/*
+%{_iconsdir}/hicolor/*/*/*.png
 %{_sysconfdir}/gconf/schemas/epiphany-fonts.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-pango.schemas
@@ -193,6 +179,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.115  2006/06/10 21:13:22  freetz
+- 2.15.2, mozilla 1.7 support dropped upstream (removed bcond),
+  GNOME 2.15.x deps
+
 Revision 1.114  2006/06/06 13:00:02  qboosh
 - merged update to 2.14.2.1 from AC-branch
 
================================================================

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

More information about the pld-cvs-commit mailing list