'make install' fails when run in parallel mode

[packages/AfterStep.git] / AfterStep.spec

diff --git a/AfterStep.spec b/AfterStep.spec
index 206b6afb796662cd403295e7391034bb629050aa..77577d6bfeb7e8a665f6d77fcd544c7470334f01 100644 (file)
--- a/AfterStep.spec
+++ b/AfterStep.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
-%bcond_with    mmx     # use MMX
+%bcond_with    mmx             # use MMX
+%bcond_with    gnome2          # build with support for GNOME2 wm-properties
 #
 %ifarch pentium3 pentium4 athlon %{x8664}
 %define                with_mmx        1
@@ -13,7 +14,7 @@ Summary(ja.UTF-8):    AfterStep ウィンドウマネージャ (NeXT風)
 Summary(pl.UTF-8):     AfterStep - zarządca okien
 Name:          AfterStep
 Version:       2.2.11
-Release:       0.3
+Release:       0.4
 License:       GPL v2+
 Group:         X11/Window Managers
 Source0:       ftp://ftp.afterstep.org/stable/%{name}-%{version}.tar.bz2
@@ -24,16 +25,23 @@ Patch0:             %{name}-no_bash_fix.patch
 Patch1:                %{name}-ldconfig.patch
 Patch2:                %{name}-opt.patch
 Patch3:                %{name}-link.patch
+Patch4:                %{name}-libpng-1.5.patch
+Patch5:                %{name}-inline.patch
 URL:           http://www.afterstep.org/
 BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake
+BuildRequires: dbus-devel
 BuildRequires: fltk-devel
+BuildRequires: freetype-devel >= 2.0
+BuildRequires: gdk-pixbuf2-devel >= 2.0
 BuildRequires: giflib-devel
 BuildRequires: gtk+2-devel >= 1:2.0.0
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
+BuildRequires: librsvg-devel
 BuildRequires: libtiff-devel
 BuildRequires: pkgconfig
+BuildRequires: readline-devel
 BuildRequires: sgml-tools
 BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXinerama-devel
@@ -141,6 +149,7 @@ Summary(pl.UTF-8):  Pliki nagłówkowe biblioteki AfterBase
 Version:       %{afterbase_ver}
 Group:         Development/Libraries
 Requires:      libAfterBase = %{afterbase_ver}-%{release}
+Requires:      xorg-lib-libX11-devel
 
 %description -n libAfterBase-devel
 Header files for AfterBase library.
@@ -181,6 +190,14 @@ Version:   %{afterimage_ver}
 Group:         Development/Libraries
 Requires:      libAfterBase-devel = %{afterbase_ver}-%{release}
 Requires:      libAfterImage = %{afterimage_ver}-%{release}
+Requires:      freetype-devel >= 2.0
+Requires:      gdk-pixbuf2-devel >= 2.0
+Requires:      giflib-devel
+Requires:      libjpeg-devel
+Requires:      libpng-devel
+Requires:      librsvg-devel
+Requires:      libtiff-devel
+Requires:      xorg-lib-libXext-devel
 
 %description -n libAfterImage-devel
 Header files for AfterImage library.
@@ -207,6 +224,8 @@ Statyczna biblioteka AfterImage.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 cp -f autoconf/configure*.in .
 
@@ -238,10 +257,10 @@ sgml2html doc/afterstep.sgml
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_wmpropsdir},%{_datadir}/xsessions,/etc/sysconfig/wmstyle}
 
-%{__make} install \
+%{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install AfterStep.desktop $RPM_BUILD_ROOT%{_wmpropsdir}
+%{?with_gnome2:install AfterStep.desktop $RPM_BUILD_ROOT%{_wmpropsdir}}
 
 #install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/afterstep.sh
 install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/xsessions/AfterStep.desktop
@@ -289,7 +308,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/makeastheme.pl
 %attr(755,root,root) %{_bindir}/postcard.sh
 %attr(755,root,root) %{_libdir}/libAfter*.so.*.*
-%{_wmpropsdir}/AfterStep.desktop
+%{?with_gnome2:%{_wmpropsdir}/AfterStep.desktop}
 #%attr(755,root,root) /etc/sysconfig/wmstyle/*.sh
 %{_datadir}/afterstep
 %{_datadir}/xsessions/AfterStep.desktop