- Strip unneeded translations from .mo files (RH bug #463887).

- Split Perl-based utilities into a "perl" subpackage (RH bug #462345).

evolution.spec

@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -216,6 +216,14 @@ Requires: spamassassin
 %description spamassassin
 This package contains the plugin to filter junk mail using SpamAssassin.
 
+%package perl
+Group: Applications/Productivity
+Summary: Supplemental utilities that require Perl
+Requires: %{name} = %{version}-%{release}
+
+%description perl
+This package contains supplemental utilities for %{name} that require Perl.
+
 %prep
 %setup -q -n evolution-%{version}
 %patch10 -p1 -b .ldaphack
@@ -308,15 +316,28 @@ CFLAGS="$CFLAGS \
 %endif
 
 %configure \
-  --enable-gtk-doc \
+	--enable-gtk-doc \
-  --enable-ipv6 \
+	--enable-ipv6 \
-  --with-sub-version=" (%{version}-%{release})" \
+	--with-sub-version=" (%{version}-%{release})" \
-  --with-kde-applnk-path=no \
+	--with-kde-applnk-path=no \
-  %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \
+	%ldap_flags %pilot_flags %krb5_flags \
-  --enable-plugins=all
+	%nntp_flags %ssl_flags %exchange_flags \
+	--enable-plugins=all
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED -fno-strict-aliasing"
 
+# Strip unneeded translations from .mo files.
+# This reduces the RPM size by several megabytes.
+cd po
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+	msgmerge $p evolution-%{evo_major}.pot > $p.out
+	msgfmt -o `basename $p .po`.gmo $p.out
+done
+cd -
+
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -458,8 +479,6 @@ rm -rf $RPM_BUILD_ROOT
 # Various libexec programs:
 %dir %{_libexecdir}/evolution
 %dir %{_libexecdir}/evolution/%{evo_major}
-%{_libexecdir}/evolution/%{evo_major}/csv2vcard
-%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export
 %{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
 %{_libexecdir}/evolution/%{evo_major}/evolution-backup
@@ -651,7 +670,18 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
+%files perl
+%defattr(-, root, root)
+%dir %{_libexecdir}/evolution
+%dir %{_libexecdir}/evolution/%{evo_major}
+%{_libexecdir}/evolution/%{evo_major}/csv2vcard
+%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
+
 %changelog
+* Thu Sep 25 2008 Matthew Barnes <mbarnes@redhat.com> - 2.24.0-2.fc10
+- Strip unneeded translations from .mo files (RH bug #463887).
+- Split Perl-based utilities into a "perl" subpackage (RH bug #462345).
+
 * Mon Sep 22 2008 Matthew Barnes <mbarnes@redhat.com> - 2.24.0-1.fc10
 - Update to 2.24.0