- ac_fix patch added - builds now

Changed files:
    xfdesktop-ac_fix.patch -> 1.1
    xfdesktop.spec -> 1.76

diff --git a/xfdesktop-ac_fix.patch b/xfdesktop-ac_fix.patch
new file mode 100644 (file)
index 0000000..50ea52e
--- /dev/null
+++ b/xfdesktop-ac_fix.patch
@@ -0,0 +1,14 @@
+--- ./configure.ac.org 2008-10-28 12:47:03.594776250 +0100
++++ ./configure.ac     2008-10-28 12:56:50.551242090 +0100
+@@ -13,11 +13,9 @@ m4_define([exo_minimum_version], [0.3.2]
+ m4_define([thunar_minimum_version], [0.8.0])
+ m4_define([dbus_minimum_version], [0.34])
+ m4_define([intltool_minimum_version], [0.31])
+-m4_define([autoconf_minimum_version], [2.50])
+ 
+ dnl init autoconf
+ AC_INIT([xfdesktop], [xfdesktop_version], [http://bugzilla.xfce.org/])
+-AC_PREREQ([autoconf_minimum_version])
+ 
+ dnl init automake
+ XFDESKTOP_VERSION=xfdesktop_version

diff --git a/xfdesktop.spec b/xfdesktop.spec
index 2a1367c1fbf219b8ff6361719a49c9d022ca4c32..c499ebd694c69c80b0b7ae80afb99810f5041c62 100644 (file)
--- a/xfdesktop.spec
+++ b/xfdesktop.spec
@@ -9,6 +9,7 @@ Source0:        http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.
 # Source0-md5: 3c1ea8d2ccb3cfbbbbba834214ad5d2e
 Patch0:                %{name}-locale-names.patch
 Patch1:                %{name}-desktop.patch
+Patch2:                %{name}-ac_fix.patch
 URL:           http://www.xfce.org/
 BuildRequires: Thunar-devel >= 0.9.3
 BuildRequires: autoconf >= 2.50
@@ -41,18 +42,18 @@ xfdesktop zawiera zarządcę pulpitu dla środowiska Xfce.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 mv -f po/{pt_PT,pt}.po
 mv -f po/{nb_NO,nb}.po
 
 %build
 %{__glib_gettextize}
-%{__intltoolize}
-%{__libtoolize}
 %{__aclocal}
+%{__intltoolize}
 %{__autoheader}
 %{__automake}
-%{__autoconf}
+%{__aclocal}
 %configure \
        --enable-desktop-icons \
        --enable-desktop-menu \