- unified bcond header

[packages/XaoS.git] / XaoS.spec

diff --git a/XaoS.spec b/XaoS.spec
index d4e74b15fdee4bab8258a3a75c57f3b23b1e093b..e3a2f828829fe2bf54302fc5636b30a673329054 100644 (file)
--- a/XaoS.spec
+++ b/XaoS.spec
@@ -1,20 +1,16 @@
 #
 # Conditional build:
+%bcond_without aalib   # without aalib output support
+%bcond_without ggi     # without ggi output support
+%bcond_without ncurses # without ncurses output support
+%bcond_without svga    # without svga output support
 #
-# _without_aalib       - without aalib output support
-# _without_ggi         - without ggi output support
-# _without_ncurses     - without ncurses output support
-# _without_svga        - without svga output support
-#
-%ifnarch %{ix86} alpha
-%define _without_svga 1
-%endif
 Summary:       A fast, portable real-time interactive fractal zoomer
-Summary(pl):   Szybki, przeno¶ny i interaktywny explorator fraktali
+Summary(pl):   Szybki, przeno¶ny i interaktywny eksplorator fraktali
 Name:          XaoS
 Version:       3.1
 %define        pre     pre5
-Release:       0.%{pre}.1
+Release:       0.%{pre}.3
 License:       GPL
 Group:         X11/Applications
 Source0:       http://dl.sourceforge.net/xaos/%{name}-%{version}%{pre}.tar.gz
@@ -28,15 +24,16 @@ Patch3:             %{name}-svga-fix.patch
 Patch4:                %{name}-info.patch
 URL:           http://xaos.theory.org/
 BuildRequires: XFree86-devel
-%{!?_without_aalib:BuildRequires:              aalib-devel}
+%{?with_aalib:BuildRequires:           aalib-devel}
 BuildRequires: autoconf
 BuildRequires: automake
-%{!?_without_ggi:BuildRequires:                libggi-devel}
+BuildRequires: gettext-devel
+%{?with_ggi:BuildRequires:             libggi-devel}
 BuildRequires: libpng-devel
-%{!?_without_ncurses:BuildRequires:    ncurses-devel}
-%{!?_without_svga:BuildRequires:       svgalib-devel}
+%{?with_ncurses:BuildRequires: ncurses-devel}
+%{?with_svga:BuildRequires:    svgalib-devel}
 BuildRequires: texinfo
-Buildroot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 XaoS is a fast portable real-time interactive fractal zoomer. It
@@ -51,7 +48,7 @@ were later made including autopilot (for those of you without drivers
 licenses), palette changing, PNG saving, and fractal inversion.
 
 %description -l pl
-XaoS jest szybkim, przeno¶nym i interaktywnym exploratorem fraktali.
+XaoS jest szybkim, przeno¶nym i interaktywnym eksploratorem fraktali.
 Efekty jego dzia³ania mo¿na ogl±daæ z u¿yciem drajwerów X11, aalib,
 ncurses oraz SVGAlib. XaoS wy¶wietla zbiór Mandelbrota (i nie tylko) i
 pozwala na p³ynne powiêkszanie/pomniejszanie widocznego zakresu.
@@ -74,13 +71,14 @@ palety, zapisywanie PNG i inwersja fraktali.
 %build
 cp -f /usr/share/automake/config.* .
 %{__autoconf}
+LDFLAGS="%{rpmldflags} -L/usr/X11R6/%{_lib}"
 %configure \
        --with-x \
        --with-x11-driver=yes \
-       %{?_without_aalib:      --with-aa-driver=no} \
-       %{?_without_ggi:        --with-ggi-driver=no} \
-       %{?_without_ncurses:    --with-curses-driver=no} \
-       %{?_without_svga:       --with-svga-driver=no}
+       %{?with_aalib:  --with-aa-driver=no} \
+       %{?with_ggi:    --with-ggi-driver=no} \
+       %{?with_ncurses:--with-curses-driver=no} \
+       %{?with_svga:   --with-svga-driver=no}
 
 %{__make}
 
@@ -90,7 +88,7 @@ makeinfo --no-split xaosdev.texinfo
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_infodir},%{_applnkdir},%{_pixmapsdir}} \
+install -d $RPM_BUILD_ROOT{%{_infodir},%{_desktopdir},%{_pixmapsdir}} \
        $RPM_BUILD_ROOT%{_datadir}/locale/{hu,es,fr,cs,de}/LC_MESSAGES
 
 %{__make} install \
@@ -100,7 +98,7 @@ install -d $RPM_BUILD_ROOT{%{_infodir},%{_applnkdir},%{_pixmapsdir}} \
        infodir=$RPM_BUILD_ROOT%{_infodir} \
        LOCALEDIR=$RPM_BUILD_ROOT%{_datadir}/locale
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %find_lang xaos
@@ -132,4 +130,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man6/*
 %{_infodir}/*.info*
 %{_pixmapsdir}/XaoS.png
-%{_applnkdir}/XaoS.desktop
+%{_desktopdir}/XaoS.desktop