aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2005-08-07 09:09:02 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2005-08-07 09:09:02 +0000
commit7457f65a592f04c06d1a5922aca2a7256ef856bf (patch)
treef55235bfe441afe3daee3f91013de953d4167590
parentc59084bb06e91ea858d80262ef47dc9c54e14b82 (diff)
- 1.21.2
-rw-r--r--ChangeLog10
-rw-r--r--configure.ac2
-rw-r--r--rpm-mandriva-setup.spec8
3 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 594bff6..f012b6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-07 10:00 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * Makefile.am, find-provides.in, find-requires.in, php.prov,
+ php.req: - add php-pear auto req/prov from pld (suggested by
+ oden)
+
+2005-08-03 11:55 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+
+ * macros.in: - some macro from connectiva
+
2005-06-27 17:09 Olivier Thauvin <thauvin@aerov.jussieu.fr>
* macros.in: - add %__{chkconfig,service} macros
diff --git a/configure.ac b/configure.ac
index 142efbd..d33ff0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.1, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.2, 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 c630a1e..80b0ee9 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -1,6 +1,6 @@
%define name rpm-mandriva-setup
-%define version 1.1
-%define release %mkrel 4
+%define version 1.2
+%define release %mkrel 1
# This can be usefull for backport as rpm-4.2
# provide the emacs-spec mode
@@ -92,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sun Aug 07 2005 Olivier Thauvin <nanardon@zarb.org> 1.2-1mdk
+- add req/prov for php pear
+- add conectiva macros
+
* Sat Jun 25 2005 Olivier Thauvin <nanardon@mandriva.org> 1.1-4mdk
- require multiarch-utils