[balsa/gtk3] Minor build regressions fixed.

[Pawel Salek <pawels src gnome org>]

commit dffbfdb40e3f8b024bdd2b7c5084a38e8731b9b4
Author: Pawel Salek <pawsa0 gmail com>
Date:   Sat May 30 23:29:10 2015 +0200

    Minor build regressions fixed.

 Makefile.am     |   10 +++++-----
 balsa.spec.in   |   47 ++++++++++++++++++++++++-----------------------
 doc/Makefile.am |    8 +++++---
 3 files changed, 34 insertions(+), 31 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e24502c..b11ec1e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,16 +52,16 @@ dist-hook: balsa.spec
 
 @MAINT RPM: balsa.spec
 @MAINT@        rm -f *.rpm
- MAINT@        $(MAKE) distdir="$(PACKAGE)- BALSA_VERSION@" dist
+ MAINT@        $(MAKE) distdir="$(PACKAGE)-$(PACKAGE_VERSION)" dist
 @MAINT@        cp $(top_srcdir)/rpm-po.patch $(top_builddir)/rpm-po.patch
- MAINT@        rpm -ta "./$(PACKAGE)- BALSA_VERSION@.tar.gz"
+ MAINT@        rpm -ta "./$(PACKAGE)-$(PACKAGE_VERSION).tar.gz"
 @MAINT@        rm $(top_builddir)/rpm-po.patch
- MAINT@        -test -f "/usr/src/redhat/SRPMS/$(PACKAGE)- VERSION@- BALSA_RELEASE@.src.rpm" \
- MAINT@                && cp -f "/usr/src/redhat/SRPMS/$(PACKAGE)- VERSION@- BALSA_RELEASE@.src.rpm" .
+ MAINT@        -test -f "/usr/src/redhat/SRPMS/$(PACKAGE)-$(PACKAGE_VERSION)- BALSA_RELEASE@.src.rpm" \
+ MAINT@                && cp -f "/usr/src/redhat/SRPMS/$(PACKAGE)-$(PACKAGE_VERSION)- 
BALSA_RELEASE@.src.rpm" .
 @MAINT@        -for ping in /usr/src/redhat/RPMS/* ; do \
 @MAINT@                if test -d $$ping ; then \
 @MAINT@                        arch=`echo $$ping |sed -e 's,/.*/\([^/][^/]*\),\1,'` ; \
- MAINT@                        f="$$ping/$(PACKAGE)- VERSION@- BALSA_RELEASE@.$$arch.rpm" ; \
+ MAINT@                        f="$$ping/$(PACKAGE)-$(PACKAGE_VERSION)- BALSA_RELEASE@.$$arch.rpm" ; \
 @MAINT@                        test -f $$f && cp -f $$f . ; \
 @MAINT@                fi ; \
 @MAINT@        done
diff --git a/balsa.spec.in b/balsa.spec.in
index 370d8df..4c93f4f 100644
--- a/balsa.spec.in
+++ b/balsa.spec.in
@@ -10,7 +10,7 @@
 %endif
 
 Name:           balsa
-Version:        @BALSA_VERSION@
+Version:        @PACKAGE_VERSION@
 Release:        1
 Summary:        Mail Client
 
@@ -25,26 +25,26 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %if %fedora
-Requires: libesmtp >= 1.0.4
-Requires: scrollkeeper
-BuildRequires: automake
+Requires: libesmtp >= 1.0.6
+#BuildRequires: gnome-vfs2-devel
+BuildRequires: NetworkManager-glib-devel
 BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: gmime-devel
-BuildRequires: gnome-vfs2-devel
-BuildRequires: gtk2-devel
-BuildRequires: gtkhtml2-devel
-BuildRequires: gtkspell-devel
 BuildRequires: enchant-devel
+BuildRequires: gettext
+BuildRequires: gmime-devel >= 2.5.1
+BuildRequires: gnome-doc-utils
+BuildRequires: gpgme-devel
+BuildRequires: gtkspell3-devel
 BuildRequires: intltool
-BuildRequires: libesmtp-devel >= 1.0.4
-BuildRequires: libgnome-devel
-BuildRequires: libgnomeui-devel
+BuildRequires: libesmtp-devel >= 1.0.6
 BuildRequires: libnotify-devel
+BuildRequires: libsecret-devel
+BuildRequires: libtool
 BuildRequires: openssl-devel
-BuildRequires: NetworkManager-glib-devel
-BuildRequires: scrollkeeper
-BuildRequires: gnome-doc-utils
+BuildRequires: rarian-compat
+BuildRequires: unique-devel
+BuildRequires: webkitgtk3-devel
+BuildRequires: yelp-tools
 %endif
 %if %mdk
 BuildRequires:  libgnome-vfs2_0-devel
@@ -129,15 +129,16 @@ fi
 %doc docs/vconvert.awk docs/pine2vcard
 %{_bindir}/balsa
 %{_bindir}/balsa-ab
-%{_libdir}/bonobo/servers/GNOME_Balsa.server
 %{_datadir}/applications/*.desktop
-%{_datadir}/balsa
-%{_datadir}/gnome/help/balsa/
-/usr/share/icons/hicolor/*
-%{_datadir}/idl/Balsa.idl
-%{_datadir}/omf/balsa/
+%{_datadir}/balsa/
+%{_datadir}/help/C/balsa/
+%{_datadir}/help/de/balsa/
+%{_datadir}/help/es/balsa/
+%{_datadir}/help/fr/balsa/
+%{_datadir}/help/sl/balsa/
+%{_datadir}/icons/hicolor/*
 %{_datadir}/pixmaps/gnome-balsa2.png
-%{_datadir}/sounds/balsa/*
+%{_datadir}/sounds/balsa/
 %{_mandir}/man1/balsa.1*
 %config(noreplace) %{_sysconfdir}/sound/events/balsa.soundlist
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e4925f3..8d86977 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -30,16 +30,19 @@ balsa_help_files =                                          \
                win-run-filters.page                            \
                win-search.page
 
+HELP_LINGUAS = de es fr sl
+
 if BUILD_WITH_GTKSPELL
 balsa_gtkspell_extra =
-balsa_gtkspell_extra_dist = preferences-spelling.page
+helpdirs = C $(HELP_LINGUAS)
+balsa_gtkspell_extra_dist = $(foreach lc,$(helpdirs),$(lc)/preferences-spelling.page) #
 else
 balsa_gtkspell_extra_dist =
 balsa_gtkspell_extra = preferences-spelling.page
 endif
 
 HELP_FILES   = $(balsa_help_files) $(balsa_gtkspell_extra)
-EXTRA_DIST   = balsa.xml $(balsa_gtkspell_extra_dist)
+EXTRA_DIST   = $(balsa_gtkspell_extra_dist)
 
 HELP_EXTRA   = balsa.entities
 
@@ -62,7 +65,6 @@ HELP_MEDIA   =                                                        \
              figures/preferences-window.png                    \
              figures/spell-check.png
 
-HELP_LINGUAS = de es fr sl
 
 doc-dist-hook: