1.11-1mdk1.11

3 files changed, 20 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e9584c4..ebe6626 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-01-06 15:55  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* macros.in: Override _query_all_fmt so rpm -qa (without a --qf
+	  format specification) returns the same format as with rpm 4.4.2.
+
+2006-01-06 15:49  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* macros.in: Override _changelog_truncate to "3 years ago" (instead
+	  of the default in rpm 4.4.4 which is only one year ago)
+
+2006-01-05 17:33  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+	* configure.ac, rpm-mandriva-setup.spec: 1.10-1mdk
+
 2006-01-05 17:26  Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
 
 	* macros.in: Add _rpmlock_path to the default macros. That's the
diff --git a/configure.ac b/configure.ac
index 7ea03c6..a2c9565 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # $Id$
 
 AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.10, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.11, 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 15f52f5..fc34218 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -1,5 +1,5 @@
 %define name rpm-mandriva-setup
-%define version 1.10
+%define version 1.11
 %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
+* 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
+
 * Thu Jan 05 2006 Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> 1.10-1mdk
 - Add _rpmlock_path to default macros