aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-01-05 16:33:06 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-01-05 16:33:06 +0000
commitb34d94865bb64671fb1e8cedba1cab1b6812cace (patch)
tree961bec014b47777b83a5eb41f0323ca9073d8da8
parent919f268cdbdae729683f374e2f092670fd01b4a6 (diff)
1.10-1mdk1.10
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
-rw-r--r--rpm-mandriva-setup.spec5
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bb57f72..e9584c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-05 17:26 Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+
+ * macros.in: Add _rpmlock_path to the default macros. That's the
+ path used for the transaction fcntl lock. It comes from the rpm
+ 4.4.2 default macros.
+
2006-01-04 15:18 Gwenole Beauchesne <gbeauchesne at mandriva.com>
* configure.ac, rpm-mandriva-setup.spec: 1.9-1mdk
diff --git a/configure.ac b/configure.ac
index d71e30d..7ea03c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.9, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.10, 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 a94ebd2..15f52f5 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -1,5 +1,5 @@
%define name rpm-mandriva-setup
-%define version 1.9
+%define version 1.10
%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
+* Thu Jan 05 2006 Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> 1.10-1mdk
+- Add _rpmlock_path to default macros
+
* Wed Jan 4 2006 Gwenole Beauchesne <gbeauchesne@mandriva.com> 1.9-1mdk
- find-debuginfo.sh: preserve setuid/setgid permissions when stripping
files for -debug package