aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2006-06-17 20:36:04 (GMT)
committerOlivier Thauvin <nanardon@mandriva.org>2006-06-17 20:36:04 (GMT)
commit00120d5726a3f77c053e824f6e2468efc5b0be2b (patch)
treec76e0ede0c1c7e327d1e8a86c317c32a7b269f06
parent1515a776506dfdfa790f2e380def94bb2b369cb1 (diff)
- tag V1_23V1_23
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac2
-rw-r--r--macros.in5
-rw-r--r--rpm-mandriva-setup.spec7
5 files changed, 15 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index d45840b..30f3871 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,6 @@
-2006-05-31 22:22 Olivier Thauvin <thauvin@aerov.jussieu.fr>
+2006-06-17 20:32 nanardon
- * find-provides.in, find-requires.in: - enable pkgconfig & libtool
- provides
-
-2006-05-25 13:27 Olivier Thauvin <thauvin@aerov.jussieu.fr>
-
- * find-requires.in: - strip linux-vdso32 requirement (spturtle)
+ * soft/rpm/rpm-setup/trunk/ChangeLog: - update Changelog
2006-05-24 20:13 Olivier Thauvin <thauvin@aerov.jussieu.fr>
diff --git a/Makefile.am b/Makefile.am
index 0ef528b..070a5a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,12 +83,9 @@ rpm: dist dist-bzip2
.PHONY: ChangeLog
ChangeLog:
- LC_ALL=C svn2cl -W 400 -I ChangeLog --accum -U ../common/username
+ LC_ALL=C svn2cl ChangeLog --accum
rm -f *.bak
-cvstag:
- cvs tag $(CVSTAGOPT) $(TAG)
-
CLEANFILES = $(pkg_gdata) $(pkg_gscripts) $(macrosfiles) \
macros-perarch \
make_macrosfiles.sh
diff --git a/configure.ac b/configure.ac
index b863fe8..3e34fc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.22, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.23, nanardon@mandriva.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9)
AC_CONFIG_SRCDIR
diff --git a/macros.in b/macros.in
index 6d329df..c595221 100644
--- a/macros.in
+++ b/macros.in
@@ -118,6 +118,11 @@
%_mandir %_datadir/man
+%_webconfdir %{_sysconfdir}/httpd/conf
+%_webappconfdir %_webconfdir/webapps.d
+# compatibility
+%webappconfdir %_webappconfdir
+
#==============================================================================
# ---- Build configuration macros.
#
diff --git a/rpm-mandriva-setup.spec b/rpm-mandriva-setup.spec
index 77f8878..516fb72 100644
--- a/rpm-mandriva-setup.spec
+++ b/rpm-mandriva-setup.spec
@@ -1,5 +1,5 @@
%define name rpm-mandriva-setup
-%define version 1.22
+%define version 1.23
%define release %mkrel 1
# This can be useful for backport, as rpm-4.2
@@ -91,6 +91,11 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Sat Jun 17 2006 Olivier Thauvin <nanardon@mandriva.org> 1.23-1mdv2007.0
+- 1.23
+- add desktop and scrollkeeper macro (F. Crozat)
+- add _webapp* macros
+
* Sat Jun 03 2006 Olivier Thauvin <nanardon@mandriva.org> 1.22-1mdv2007.0
- 1.22
- enable pkgconfig/libtool provides