aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2006-01-10 19:36:27 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2006-01-10 19:36:27 +0000
commit2efbb8c2aa2a24a477ec3d493817e5d516f0e674 (patch)
tree76b3429caecf29c64ba0f8167ff96a82fda9f9ae
parentabf20ac8d0c1283760ccb6d7162255f6937b0913 (diff)
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac2
-rw-r--r--rpm-mandriva-setup.spec5
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ebe6626..1267094 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-10 20:32 Olivier Thauvin <thauvin at aerov.jussieu.fr>
+
+ * macros.in: - fix typo in RequireS
+
+2006-01-06 15:58 Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+ * configure.ac, rpm-mandriva-setup.spec: 1.11-1mdk
+
2006-01-06 15:55 Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
* macros.in: Override _query_all_fmt so rpm -qa (without a --qf
diff --git a/configure.ac b/configure.ac
index a2c9565..9c24fb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.11, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.12, 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 fc34218..5223605 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -1,5 +1,5 @@
%define name rpm-mandriva-setup
-%define version 1.11
+%define version 1.12
%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
+* Tue Jan 10 2006 Olivier Thauvin <nanardon@mandriva.org> 1.12-1mdk
+- fix typo in RequireS (#20574)
+
* Fri Jan 06 2006 Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> 1.11-1mdk
- Set _changelog_truncate to "3 years ago"
- Restore _query_all_fmt to its default 4.4.2 value