- 1.20V1_201.20

4 files changed, 9 insertions, 5 deletions

diff --git a/Makefile.am b/Makefile.am
index 99e50f7..1e223fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,7 +83,7 @@ rpm: dist dist-bzip2
 
 .PHONY: ChangeLog
 ChangeLog:
-	cvs2cl -W 400 -I ChangeLog --accum -U ../common/username
+	echo cvs2cl -W 400 -I ChangeLog --accum -U ../common/username
 	rm -f *.bak
 
 cvstag:
diff --git a/configure.ac b/configure.ac
index 6da8fd6..c3e263c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # $Id$
 
 AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.19, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.20, nanardon@mandriva.org)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.9)
 AC_CONFIG_SRCDIR
diff --git a/macros.in b/macros.in
index f2b1844..8b80932 100644
--- a/macros.in
+++ b/macros.in
@@ -240,8 +240,8 @@
     @RPMVENDORDIR@/brp-strip-comment-note \
 %{nil}
 
-%__os_install_post \
-    /usr/share/spec-helper/spec-helper \
+%__os_install_post    \
+    %{?__spec_helper_post}%{?!__spec_helper_post:/usr/share/spec-helper/spec-helper} \
 %{nil}
 
 %__debug_install_post   \
diff --git a/rpm-mandriva-setup.spec b/rpm-mandriva-setup.spec
index 4266c8a..3efd1d4 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -1,5 +1,5 @@
 %define name rpm-mandriva-setup
-%define version 1.19
+%define version 1.20
 %define release %mkrel 1
 
 # This can be useful for backport, as rpm-4.2
@@ -91,6 +91,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat May 20 2006 Olivier Thauvin <nanardon@mandriva.org> 1.20-1mdk
+- fix X11 location
+- latest spec-helper adaptation
+
 * Wed May 10 2006 Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> 1.19-1mdk
 - Revert changes made in 1.18