aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog59
-rw-r--r--configure.ac2
-rw-r--r--rpm-mandriva-setup.spec7
3 files changed, 28 insertions, 40 deletions
diff --git a/ChangeLog b/ChangeLog
index ff0ef21..b736637 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2005-06-13 15:44 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * macros.in: - provide %_package_i18n (testing) - %with %without =>
+ %_with %_without to not conflict with current rpm macro
+
+2005-06-08 05:14 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * macros.in: - rpmbuild --without section - fix %with() %without()
+
+2005-06-06 04:23 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+
+ * find-requires.in, rpm-mandriva-setup.spec: - merge from old ppc64
+ branch: * find-requires: handle ppc64 loaders
+
+2005-05-31 04:16 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * macros.in: - add %_logdir - add some macro from conectiva
+
+2005-05-25 14:02 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * configure.ac, rpm-mandriva-setup.spec: - 1.0
+
2005-05-25 13:29 Olivier Thauvin <thauvin@aerov.jussieu.fr>
* macros.in: - disable automatic gpg key query on server
@@ -60,43 +82,6 @@
* 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
- 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
-
->>>>>>> 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 856f2fb..142efbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.0, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.1, 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 451bea3..cf28eb5 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -1,5 +1,5 @@
%define name rpm-mandriva-setup
-%define version 1.0
+%define version 1.1
%define release %mkrel 1
# This can be usefull for backport as rpm-4.2
@@ -70,7 +70,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
-- merge from old ppc64 branch:
+* Mon Jun 13 2005 Olivier Thauvin <nanardon@zarb.org> 1.1-1mdk
+- few connectiva macro
+- from Gwenole Beauschene
+ - merge from old ppc64 branch:
* find-requires: handle ppc64 loaders
* Wed May 25 2005 Olivier Thauvin <nanardon@zarb.org> 1.0-1mdk