SPECS: evolution.spec - added pilot-link-0.12 for fix build with n...

[megabajt]

Author: megabajt                     Date: Mon Feb  5 10:22:45 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added pilot-link-0.12 for fix build with new pilot-link
- cosmetics

---- Files affected:
SPECS:
   evolution.spec (1.208 -> 1.209) 

---- Diffs:

================================================================
Index: SPECS/evolution.spec
diff -u SPECS/evolution.spec:1.208 SPECS/evolution.spec:1.209
--- SPECS/evolution.spec:1.208	Fri Feb  2 00:08:31 2007
+++ SPECS/evolution.spec	Mon Feb  5 11:22:40 2007
@@ -27,6 +27,7 @@
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-gnome-icon-theme.patch
 Patch2:		%{name}-as_needed-fix.patch
+Patch3:		%{name}-pilot-link-0.12.patch
 URL:		http://www.gnome.org/projects/evolution/
 BuildRequires:	GConf2-devel >= 2.16.0
 BuildRequires:	ORBit2-devel >= 1:2.14.4
@@ -62,9 +63,9 @@
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper >= 0.1.4
 BuildRequires:	which
-Requires(post,preun):	GConf2 >= 2.16.0
 Requires(post,postun):	gtk+2 >= 2:2.10.6
 Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2 >= 2.16.0
 Requires:	%{name}-component = %{version}-%{release}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	GConf2 >= 2.16.0
@@ -160,8 +161,8 @@
 Summary(pl):	Moduł pocztowy Evolution
 Group:		X11/Applications
 # mail composer requires addressbook component
-Requires:	%{name}-addressbook = %{version}-%{release}
 Requires(post,preun):	GConf2
+Requires:	%{name}-addressbook = %{version}-%{release}
 Provides:	%{name}-component = %{version}-%{release}
 
 %description mail
@@ -174,8 +175,8 @@
 Summary:	Evolution addressbook component
 Summary(pl):	Moduł książki adresowej Evolution
 Group:		X11/Applications
-Requires:	%{name} = %{version}-%{release}
 Requires(post,preun):	GConf2
+Requires:	%{name} = %{version}-%{release}
 Provides:	%{name}-component = %{version}-%{release}
 
 %description addressbook
@@ -188,8 +189,8 @@
 Summary:	Evolution calendar and todo component
 Summary(pl):	Moduł kalendarza i listy zadań Evolution
 Group:		X11/Applications
-Requires:	%{name} = %{version}-%{release}
 Requires(post,preun):	GConf2
+Requires:	%{name} = %{version}-%{release}
 Provides:	%{name}-component = %{version}-%{release}
 
 %description calendar
@@ -219,6 +220,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0
 
 %build
 %{__glib_gettextize}
@@ -279,6 +281,7 @@
 # remove useless files
 rm -f $RPM_BUILD_ROOT%{_libdir}/evolution/*/*/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-pilot/*/*.{a,la}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
 rm -r $RPM_BUILD_ROOT%{_desktopdir}/evolution.desktop
 
 ln -sf evolution-%{basever} $RPM_BUILD_ROOT%{_bindir}/evolution
@@ -505,6 +508,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.209  2007/02/05 10:22:40  megabajt
+- added pilot-link-0.12 for fix build with new pilot-link
+- cosmetics
+
 Revision 1.208  2007/02/01 23:08:31  qrczak
 - 2.8.3
 - Fixed URL
================================================================

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