aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2006-05-24 18:13:48 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2006-05-24 18:13:48 +0000
commit0d93c5ade339826be99cfc2d0424b43a9449cca1 (patch)
treeeac0cc84845e549b05b4c80216b3af6af72d0a70
parentc7df5b4db82f8e27e807551ab651c64cfc52f4b9 (diff)
- 1.21V1_211.21
-rw-r--r--ChangeLog24
-rw-r--r--configure.ac2
-rw-r--r--rpm-mandriva-setup.spec5
3 files changed, 28 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ce257c..6e887e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,26 @@
-2006-05-10 11:20 Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+2006-05-21 04:34 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * rpmpopt: - impprove --scripts option to list also %posttrans
+ (Luca Berra)
+
+2006-05-20 16:28 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * Makefile.am: wooops, generate ChangeLog
+
+2006-05-20 16:26 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * Makefile.am, configure.ac, macros.in, rpm-mandriva-setup.spec: -
+ 1.20
+
+2006-05-20 14:32 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * macros.in: - remove X11R6/ dir since xorg7 deprecated it
+
+2006-05-10 11:22 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
+
+ * rpm-mandriva-setup.spec: Update .spec file
+
+2006-05-10 11:20 Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com>
* configure.ac: 1.19
diff --git a/configure.ac b/configure.ac
index c3e263c..88b5981 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.20, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.21, nanardon@mandriva.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9)
AC_CONFIG_SRCDIR
diff --git a/rpm-mandriva-setup.spec b/rpm-mandriva-setup.spec
index 3efd1d4..9df14dd 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -1,5 +1,5 @@
%define name rpm-mandriva-setup
-%define version 1.20
+%define version 1.21
%define release %mkrel 1
# This can be useful for backport, as rpm-4.2
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed May 24 2006 Olivier Thauvin <nanardon@mandriva.org> 1.21-1mdk
+- new %%mkrel behavior
+
* Sat May 20 2006 Olivier Thauvin <nanardon@mandriva.org> 1.20-1mdk
- fix X11 location
- latest spec-helper adaptation