- another typo in build.

[packages/evolution.git] / evolution.spec

diff --git a/evolution.spec b/evolution.spec
index 670fac4c2351b45f56797a4f618aeedfad58ce9f..559878fb5ed00be1ee0095c6c92674adfb24b441 100644 (file)
--- a/evolution.spec
+++ b/evolution.spec
@@ -4,11 +4,12 @@ Summary(pt_BR):       Cliente de email integrado com calend
 Summary(zh_CN):        Evolution - GNOME¸öÈ˺͹¤×÷×éÐÅÏ¢¹ÜÀí¹¤¾ß(°üÀ¨µç×ÓÓʼþ£¬ÈÕÀúºÍµØÖ·±¡)
 Name:          evolution
 Version:       1.0.5
-Release:       2
+Release:       5
 License:       GPL
 Group:         Applications/Mail
 Source0:       ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-nostaticdb3.patch
+Patch1:                %{name}-am.patch
 URL:           http://www.ximian.com/products/ximian_evolution/
 BuildRequires: GConf-devel >= 1.0.7
 BuildRequires: ORBit-devel >= 0.5.8
@@ -122,6 +123,7 @@ aplica
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 sed -e s/AM_GNOME_GETTEXT/AM_GNU_GETTEXT/ configure.in > configure.in.tmp
@@ -131,10 +133,11 @@ xml-i18n-toolize --copy --force
 libtoolize --copy --force
 gettextize --copy --force
 aclocal -I %{_aclocaldir}/gnome
-autoconf
-automake -a -c -f
-cd libical; autoconf; cd ..
-
+%{__autoconf}
+%{__automake}
+cd libical
+%{__autoconf}
+cd ..
 CFLAGS="%{rpmcflags} -I/usr/include/orbit-1.0"
 %configure \
        --disable-gtk-doc \
@@ -158,8 +161,6 @@ rm -rf $RPM_BUILD_ROOT
        desktopdir=%{_applnkdir}/Network/Mail \
        omf_dest_dir=%{_omf_dest_dir}/%{name}
 
-gzip -9nf AUTHORS ChangeLog NEWS
-
 %find_lang %{name} --with-gnome --all-name
 
 %clean
@@ -175,7 +176,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc *.gz
+%doc AUTHORS ChangeLog NEWS
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/evolution/*/*/*.so*
@@ -187,7 +188,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/camel-providers/*/*.urls
 %{_datadir}/evolution
 %{_datadir}/oaf/*.oaf
-%{_datadir}/gnome/ui
+%{_datadir}/gnome/ui/*
 %{_datadir}/gnome/html/*
 %{_datadir}/images
 %{_datadir}/mime-info/*