SPECS: evolution.spec - 2.7.90, use rpm macros, disable --as-neede...

[freetz]

Author: freetz                       Date: Wed Jul 26 20:18:34 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.7.90, use rpm macros, disable --as-needed build

---- Files affected:
SPECS:
   evolution.spec (1.195 -> 1.196) 

---- Diffs:

================================================================
Index: SPECS/evolution.spec
diff -u SPECS/evolution.spec:1.195 SPECS/evolution.spec:1.196
--- SPECS/evolution.spec:1.195	Fri Jul 14 19:22:13 2006
+++ SPECS/evolution.spec	Wed Jul 26 22:18:29 2006
@@ -12,12 +12,12 @@
 Summary(pt_BR):	Cliente de email integrado com calendário e catálogo de endereços
 Summary(zh_CN):	Evolution - GNOME¸öČ˺͚¤×÷×éĐĹϢšÜŔ횤žß(°üŔ¨ľç×ÓÓĘźţŁŹČŐŔúşÍľŘÖˇąĄ)
 Name:		evolution
-Version:	2.7.4
+Version:	2.7.90
 Release:	1
 License:	GPL v2
 Group:		Applications/Mail
 Source0:	http://ftp.gnome.org/pub/gnome/sources/evolution/2.7/%{name}-%{version}.tar.bz2
-# Source0-md5:	5d9770b3d86953e8edcd36ec9f9b8852
+# Source0-md5:	aae1aac8c521aef1aa9dbb1aed9a9f6e
 Source1:	%{name}-gg16.png
 Source2:	%{name}-gg48.png
 Source3:	%{name}-addressbook.desktop
@@ -26,7 +26,6 @@
 Source6:	%{name}-tasks.desktop
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-gnome-icon-theme.patch
-Patch2:		%{name}-GG-IM.patch
 URL:		http://www.ximian.com/products/ximian_evolution/
 BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	ORBit2-devel >= 1:2.14.0
@@ -34,21 +33,21 @@
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	dbus-glib-devel >= 0.62
-BuildRequires:	evolution-data-server-devel >= 1.7.4
+BuildRequires:	evolution-data-server-devel >= 1.7.90.1
 BuildRequires:	flex
 BuildRequires:	freetype-devel >= 2.0.5
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-common >= 2.12.0
 %{?with_pilot:BuildRequires:	gnome-pilot-devel >= 2.0.13}
-BuildRequires:	gnome-vfs2-devel >= 2.15.3
+BuildRequires:	gnome-vfs2-devel >= 2.15.90
 BuildRequires:	gtk-doc >= 1.6
-BuildRequires:	gtkhtml-devel >= 3.11.4
+BuildRequires:	gtkhtml-devel >= 3.11.90.1
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	intltool >= 0.35
 BuildRequires:	libglade2-devel >= 1:2.6.0
 BuildRequires:	libgnomeprintui-devel >= 2.12.1
-BuildRequires:	libgnomeui-devel >= 2.15.2
-BuildRequires:	libsoup-devel >= 2.2.95.1
+BuildRequires:	libgnomeui-devel >= 2.15.90
+BuildRequires:	libsoup-devel >= 2.2.96
 BuildRequires:	libtool
 BuildRequires:	libxml2 >= 1:2.6.26
 BuildRequires:	nspr-devel
@@ -58,18 +57,18 @@
 BuildRequires:	pkgconfig
 BuildRequires:	psmisc
 BuildRequires:	python
-BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper >= 0.1.4
 BuildRequires:	which
 Requires(post,preun):	GConf2 >= 2.14.0
-Requires(post,postun):	gtk+2 >= 2:2.10.0
+Requires(post,postun):	gtk+2 >= 2:2.10.1
 Requires(post,postun):	scrollkeeper
 Requires:	%{name}-component = %{version}-%{release}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	GConf2 >= 2.14.0
 Requires:	bonobo-activation
-Requires:	evolution-data-server >= 1.7.4
-Requires:	gtkhtml >= 3.11.4
+Requires:	evolution-data-server >= 1.7.90.1
+Requires:	gtkhtml >= 3.11.90.1
 Requires:	hicolor-icon-theme
 Requires:	libglade2 >= 1:2.6.0
 Requires:	psmisc
@@ -78,6 +77,8 @@
 Obsoletes:	gnome-pim
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		no_build_with_as_needed	1
+
 %description
 Evolution is the GNOME mailer, calendar, contact manager and
 communications tool. The tools which make up Evolution will be tightly
@@ -111,14 +112,14 @@
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	cyrus-sasl-devel
-Requires:	evolution-data-server-devel >= 1.7.4
+Requires:	evolution-data-server-devel >= 1.7.90.1
 Requires:	freetype-devel
-Requires:	gnome-vfs2-devel >= 2.15.3
-Requires:	gtkhtml-devel >= 3.11.4
+Requires:	gnome-vfs2-devel >= 2.15.90
+Requires:	gtkhtml-devel >= 3.11.90.1
 Requires:	libglade2-devel >= 1:2.6.0
 Requires:	libgnomeprintui-devel >= 2.12.1
-Requires:	libgnomeui-devel >= 2.15.2
-Requires:	libsoup-devel >= 2.2.95.1
+Requires:	libgnomeui-devel >= 2.15.90
+Requires:	libsoup-devel >= 2.2.96
 Requires:	nspr-devel
 Requires:	nss-devel
 %{?with_ldap:Requires:	openldap-devel >= 2.3.0}
@@ -217,7 +218,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__glib_gettextize}
@@ -291,14 +291,14 @@
 %post
 %gconf_schema_install apps_evolution_shell-%{basever}.schemas
 %scrollkeeper_update_post
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+%update_icon_cache hicolor
 
 %preun
 %gconf_schema_uninstall apps_evolution_shell-%{basever}.schemas
 
 %postun
 %scrollkeeper_update_postun
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+%update_icon_cache hicolor
 
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
@@ -505,6 +505,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.196  2006/07/26 20:18:29  freetz
+- 2.7.90, use rpm macros, disable --as-needed build
+
 Revision 1.195  2006/07/14 17:22:13  freetz
 - 2.7.4, updated deps
   no support for --as-needed support
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/evolution.spec?r1=1.195&r2=1.196&f=u