aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2006-01-15 19:32:45 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2006-01-15 19:32:45 +0000
commit169570623946c0185fb6a31040ab98a617aa25f7 (patch)
tree8a53491e2882e484c148775b8b2163ec79d9d232
parent94bfcbac0fbcb0fd923a37615b0183ea16c4d906 (diff)
- 1.14V1_141.14
-rw-r--r--ChangeLog14
-rw-r--r--configure.ac2
-rw-r--r--rpm-mandriva-setup.spec6
3 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9978d5f..52d4473 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,16 @@
-2006-01-11 14:47 Michael Scherer <mscherer at mandrake.org>
+2006-01-15 20:27 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * macros.in: - add macros from Giuseppe for gcjdb
+
+2006-01-14 00:02 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * rpmrc.in: - kill /etc/rpm/macros.* in macro search path
+
+2006-01-11 19:17 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * configure.ac, rpm-mandriva-setup.spec: - 1.13
+
+2006-01-11 14:47 Michael Scherer <mscherer@mandrake.org>
* macros.in: - add %py_platlibdir, %py_purelibdir and sister in
order to be able to use a different directory for pure python
diff --git a/configure.ac b/configure.ac
index ad0001f..f271736 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.13, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.14, 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 70c15dd..7b9077f 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -1,5 +1,5 @@
%define name rpm-mandriva-setup
-%define version 1.13
+%define version 1.14
%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
+* Sun Jan 15 2006 Olivier Thauvin <nanardon@mandriva.org> 1.14-1mdk
+- remove /etc/rpm/macros.* from macros search path
+- add macro for gcjdb (Giuseppe)
+
* Wed Jan 11 2006 Olivier Thauvin <nanardon@mandriva.org> 1.13-1mdk
- add %py_platlibdir, %py_purelibdir (misc)