aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2005-05-25 12:02:11 (GMT)
committerOlivier Thauvin <nanardon@mandriva.org>2005-05-25 12:02:11 (GMT)
commitf7ee1539e4d3a4151b6b3f7b3a3ff774a0c142c8 (patch)
treeee1ec4a7cda63d9c9f6824a3752e920a80c57e9a
parent18d665c6386ecb4787405cdf4e7bb9c63769f244 (diff)
- 1.0v1_01.0
-rw-r--r--ChangeLog64
-rw-r--r--configure.ac2
-rw-r--r--rpm-mandriva-setup.spec7
3 files changed, 71 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cce7f48..ff0ef21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,66 @@
+2005-05-25 13:29 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * macros.in: - disable automatic gpg key query on server
+
+2005-05-13 11:23 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * find-requires.in: - add experimantal ocaml requires
+
+2005-05-13 10:21 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * macros.in, rpmrc.in: - do not reload rpm configuration as it
+ pollute macros parsing - +k6 on ix86
+
+2005-05-13 06:02 Pixel <pixel@mandrakesoft.com>
+
+ * rpm-spec-mode.el: fix rpm-increase-release-with-macros when mkrel
+ is used
+
+2005-05-12 09:29 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * rpm-mandriva-setup.spec: - add changelog
+
+2005-05-12 09:15 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * configure.ac, macros.in, rpm-mandriva-setup.spec: - 0.8 (fix
+ %_localstatedir)
+
+2005-05-12 08:36 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * configure.ac, rpm-mandriva-setup.spec: - 0.7 (provide emacs spec
+ mode)
+
+2005-05-10 12:06 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * configure.ac, rpm-mandriva-setup.spec: - 0.6
+
+2005-05-10 06:03 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * macros.in: - %_libexecdir == %_libdir
+
+2005-05-09 12:26 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * Makefile.am: - fix make rpm
+
+2005-05-09 12:25 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * rpm-mandriva-setup.spec: - add changelog
+
+2005-05-09 12:16 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * configure.ac, make_macrosfiles.sh.in, rpm-mandriva-setup.spec,
+ rpmrc.in: - handle pentium computer
+
+2005-05-08 17:57 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * Makefile.am, rpm-mandriva-setup.spec, rpmrc.in: - add make
+ ChangeLog - 0.4 final
+
+2005-05-08 17:06 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * README: - add README
+
+=======
2005-05-12 08:36 Olivier Thauvin <thauvin@aerov.jussieu.fr>
* configure.ac, rpm-mandriva-setup.spec: - 0.7 (provide emacs spec
@@ -33,6 +96,7 @@
* README: - add README
+>>>>>>> 1.6
2005-05-06 10:11 Olivier Thauvin <thauvin@aerov.jussieu.fr>
* configure.ac, rpm-mandriva-setup.spec: - 0.4
diff --git a/configure.ac b/configure.ac
index e745793..856f2fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 0.8, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.0, 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 5ffcd28..09e1f21 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -1,5 +1,5 @@
%define name rpm-mandriva-setup
-%define version 0.8
+%define version 1.0
%define release %mkrel 1
# This can be usefull for backport as rpm-4.2
@@ -70,6 +70,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Wed May 25 2005 Olivier Thauvin <nanardon@zarb.org> 1.0-1mdk
+- 1.0:
+ - disable automatic gpg key query on server
+ - add automatic require for ocaml (G. Rousse)
+
* Thu May 12 2005 Olivier Thauvin <nanardon@mandriva.org> 0.8-1mdk
- 0.8: fix %%_localstatedir