[packages/xdg-user-dirs] - added am patch (fixes build with automake 1.13)

qboosh qboosh at pld-linux.org
Sun Jan 27 10:45:49 CET 2013


commit 864b8213cb2e68e3111373b930a0ff07114c68c5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 27 10:46:36 2013 +0100

    - added am patch (fixes build with automake 1.13)

 xdg-user-dirs-am.patch | 11 +++++++++++
 xdg-user-dirs.spec     |  8 +++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec
index b3dedb4..982394d 100644
--- a/xdg-user-dirs.spec
+++ b/xdg-user-dirs.spec
@@ -8,8 +8,9 @@ Group:		Libraries
 Source0:	http://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz
 # Source0-md5:	dc496ecde0e6a1e959bd8a38643f28fd
 Source1:	%{name}.sh
+Patch0:		%{name}-am.patch
 URL:		http://www.freedesktop.org/wiki/Software/xdg-user-dirs
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	gettext-devel
 # sr at Latn vs. sr at latin
@@ -28,11 +29,13 @@ Obsługuje także lokalizację (tzn. tłumaczenia) nazw plików.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__gettextize}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure
 %{__make}
@@ -46,8 +49,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/%{name}.sh
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
-        mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 
 %find_lang %{name}
 
diff --git a/xdg-user-dirs-am.patch b/xdg-user-dirs-am.patch
new file mode 100644
index 0000000..ddbec54
--- /dev/null
+++ b/xdg-user-dirs-am.patch
@@ -0,0 +1,11 @@
+--- xdg-user-dirs-0.14/configure.ac.orig	2011-05-03 10:32:05.000000000 +0200
++++ xdg-user-dirs-0.14/configure.ac	2013-01-27 10:39:54.250461746 +0100
+@@ -1,7 +1,7 @@
+ AC_INIT(xdg-user-dirs-update.c)
+ 
+ AM_INIT_AUTOMAKE(xdg-user-dirs, 0.14)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 	
+ AM_SANITY_CHECK
+ AM_MAINTAINER_MODE
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xdg-user-dirs.git/commitdiff/864b8213cb2e68e3111373b930a0ff07114c68c5



More information about the pld-cvs-commit mailing list