- bcond: faces

- typos - where is iconset?

Changed files:
    claws-mail.spec -> 1.54

diff --git a/claws-mail.spec b/claws-mail.spec
index c7f1981389cfa34f955531350f7472583d408ed6..6643c8eddf7a23d4c2f9690a9aa0d06fbcd61650 100644 (file)
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -5,6 +5,7 @@
 # _without_ssl          - without ssl support
 # _without_ipv6         - without ipv6 support
 # _without_ldap         - without ldap support
+# _without_faces        - without compfaces support
 #
 Summary:       A bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast e-mail client
 Summary(pl):   Rozwojowa wersja Sylpheed z du¿± ilo¶ci± zmian oraz ulepszeñ
@@ -16,10 +17,10 @@ Group:              X11/Applications/Networking
 Source0:       http://dl.sourceforge.net/sylpheed-claws/sylpheed-%{version}claws.tar.bz2
 # Source0-md5:  e547783629300e5a1a06fb5f20b9f7fd
 Source1:       %{name}.desktop
-Patch0:                %{name}-po.patch
+#Patch0:               %{name}-po.patch
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: faces-devel
+%{!?_without_faces:BuildRequires:      faces-devel}
 BuildRequires: gdk-pixbuf-devel >= 0.8
 BuildRequires: gettext-devel
 %{!?_without_gpg:BuildRequires: gpgme-devel < 0.4}
@@ -31,7 +32,7 @@ BuildRequires:        libtool
 %{!?_without_ssl:BuildRequires:        openssl-devel >= 0.9.7}
 BuildRequires: aspell-devel >= 0.50
 %{!?_without_jconv:BuildRequires:   libjconv-devel}
-Requires:      faces
+%{!?_without_faces:Requires:   faces}
 Obsoletes:     sylpheed
 URL:           http://sylpheed-claws.sourceforge.net/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,8 +50,8 @@ ale z nowymi/poprawionymi funkcjami. Niekt
 %prep
 %setup -q -n sylpheed-%{version}claws -a1
 #%patch0 -p1
-mv sylpheed*claws-iconset themes
-mv -f themes/README README.themes
+#mv sylpheed*claws-iconset themes
+#mv -f themes/README README.themes
 
 %build
 rm -f missing
@@ -66,6 +67,7 @@ rm -f missing
        %{!?_without_ldap: --enable-ldap} \
        %{!?_without_ssl: --enable-openssl} \
        %{!?_without_ipv6: --enable-ipv6 } \
+       %{?_without_faces: --disable-compfaces } \
        --enable-aspell \
        --enable-gdk-pixbuf \
        --enable-threads
@@ -79,8 +81,8 @@ install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/Mail,%{_pixmapsdir}}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
-cp -a themes $RPM_BUILD_ROOT%{_datadir}/sylpheed
+install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
+#cp -a themes $RPM_BUILD_ROOT%{_datadir}/sylpheed
 
 install sylpheed.png $RPM_BUILD_ROOT%{_pixmapsdir}
 
@@ -107,6 +109,6 @@ rm -rf $RPM_BUILD_ROOT
 %lang(es) %{_datadir}/sylpheed/faq/es
 %lang(fr) %{_datadir}/sylpheed/faq/fr
 %lang(it) %{_datadir}/sylpheed/faq/it
-%{_datadir}/sylpheed/themes
+#%{_datadir}/sylpheed/themes
 %{_applnkdir}/Network/Mail/%{name}.desktop
 %{_pixmapsdir}/sylpheed.png