- Add BR for libpst-devel and libytnef-devel (RH bug #493049).

- Add patch to build pst-import plugin against current libpst.
- libpst's API broke again so disable the BR's for now.
- Specify the gettext package when calling intltool-update.
This commit is contained in:
Matthew Barnes 2009-07-02 21:22:17 +00:00
parent f75cfb4934
commit ba26f4fa5f

View File

@ -112,11 +112,11 @@ BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libgnomecanvas-devel >= 2.0
BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0
BuildRequires: libgweather-devel >= %{libgweather_version} BuildRequires: libgweather-devel >= %{libgweather_version}
BuildRequires: libpst-devel #BuildRequires: libpst-devel
BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libsoup-devel >= %{soup_version}
BuildRequires: libtool >= 1.5 BuildRequires: libtool >= 1.5
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: libytnef-devel #BuildRequires: libytnef-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
%if %{use_mozilla_nss} %if %{use_mozilla_nss}
@ -313,9 +313,9 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DE
cd po cd po
grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
mv POTFILES.keep POTFILES.in mv POTFILES.keep POTFILES.in
intltool-update --pot intltool-update --gettext-package=%{name}-%{evo-major} --pot
for p in *.po; do for p in *.po; do
msgmerge $p evolution-%{evo_major}.pot > $p.out msgmerge $p %{name}-%{evo_major}.pot > $p.out
msgfmt -o `basename $p .po`.gmo $p.out msgfmt -o `basename $p .po`.gmo $p.out
done done
cd - cd -
@ -680,6 +680,8 @@ rm -rf $RPM_BUILD_ROOT
* Thu Jul 02 2009 Matthew Barnes <mbarnes@redhat.com> - 2.27.3-4.fc12 * Thu Jul 02 2009 Matthew Barnes <mbarnes@redhat.com> - 2.27.3-4.fc12
- Add BR for libpst-devel and libytnef-devel (RH bug #493049). - Add BR for libpst-devel and libytnef-devel (RH bug #493049).
- Add patch to build pst-import plugin against current libpst. - Add patch to build pst-import plugin against current libpst.
- libpst's API broke again so disable the BR's for now.
- Specify the gettext package when calling intltool-update.
* Wed Jul 01 2009 Milan Crha <mcrha@redhat.com> - 2.27.3-3.fc12 * Wed Jul 01 2009 Milan Crha <mcrha@redhat.com> - 2.27.3-3.fc12
- Rebuild against newer gcc - Rebuild against newer gcc