- updated to 1.3.3

- added gnome_prefix.patch (use pkg-config not gnome-config to determine GNOME prefix)

Changed files:
    evolution.spec -> 1.79

diff --git a/evolution.spec b/evolution.spec
index 315dd0916212644b0eeff85ae1c6023e52857fe8..e6304e8c4fe84c33ff3111a74699359ba68bdd4f 100644 (file)
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,6 +1,5 @@
 %define                mver            1.3
-%define                subver  2.99
-%define                _snap           20030425
+%define                subver  3
 %define                _db3ver 3.1.17
 %define                _dbdir  $RPM_BUILD_DIR/%{name}-%{version}/db3-headers-%{_db3ver}
 
@@ -10,16 +9,16 @@ Summary(pt_BR):      Cliente de email integrado com calend
 Summary(zh_CN):        Evolution - GNOME2¸öÈ˺͹¤×÷×éÐÅÏ¢¹ÜÀí¹¤¾ß(°üÀ¨µç×ÓÓʼþ£¬ÈÕÀúºÍµØÖ·±¡)
 Name:          evolution
 Version:       %{mver}.%{subver}
-Release:       0.%{_snap}.1
+Release:       0.1
 License:       GPL
 Group:         Applications/Mail
-#Source0:      ftp://ftp.gnome.org/mirror/gnome.org/sources/evolution/%{mver}/%{name}-%{version}.tar.bz2
-Source0:       %{name}-%{version}-%{_snap}.tar.bz2
+Source0:       ftp://ftp.gnome.org/mirror/gnome.org/sources/evolution/%{mver}/%{name}-%{version}.tar.bz2
 Source1:       %{name}-db3-headers-%{_db3ver}.tar.bz2
 Patch0:                %{name}-nostaticdb3.patch
 Patch1:                %{name}-am.patch
 Patch2:                %{name}-configure_in.patch
 Patch3:                %{name}-desktop.patch
+Patch4:                %{name}-gnome_prefix.patch
 URL:           http://www.ximian.com/products/ximian_evolution/
 BuildRequires: GConf2-devel
 BuildRequires: ORBit2-devel >= 2.3.0
@@ -56,7 +55,7 @@ BuildRequires:        python
 BuildRequires: scrollkeeper >= 0.1.4
 Requires(post,postun): /sbin/ldconfig
 Requires(post,postun): /usr/bin/scrollkeeper-update
-Requires(post):                                        GConf2
+Requires(post):                GConf2
 Requires:      GConf2
 Requires:      bonobo-activation
 Requires:      db3 = %{_db3ver}
@@ -155,14 +154,14 @@ Palmem.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 rm -f missing
 glib-gettextize --copy --force
 intltoolize --copy --force
-xml-i18n-toolize --copy --force
 %{__libtoolize}
-%{__aclocal} -I macros
+%{__aclocal} -I %{_aclocaldir}/gnome2-macros
 %{__autoheader}
 %{__autoconf}
 %{__automake}
@@ -227,7 +226,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS* README RELEASE-NOTES
+%doc AUTHORS ChangeLog NEWS* README 
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/evolution/*/*/*.so*
 %attr(755,root,root) %{_libdir}/evolution/%{mver}/*.so.*.*.*