aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog370
-rw-r--r--Makefile18
-rwxr-xr-xadd-webapp15
-rwxr-xr-xdel-webapp19
-rw-r--r--rpm-helper.macros.in10
-rw-r--r--rpm-helper.spec17
6 files changed, 294 insertions, 155 deletions
diff --git a/ChangeLog b/ChangeLog
index e74eaa8..266f303 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,239 +1,347 @@
-2006-02-09 11:47 Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>
+2006-02-09 11:10 rgarciasuarez
- * add-service: Patch by Ian D. Allen to handle rare case when a
- service name appears several times in rc3.d (bug 12856)
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.15-1mdk
-2005-09-20 09:05 Frederic Lepied <flepied at mandriva.com>
+2006-02-09 11:08 rgarciasuarez
- * rpm-helper.spec: 0.14-1mdk
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 09_f�v
-2005-09-20 09:04 Frederic Lepied <flepied at mandriva.com>
+2006-02-09 10:47 rgarciasuarez
- * add-service: don't add the service to all the profiles in upgrade
- mode.
+ * soft/rpm/rpm-helper/trunk/add-service: Patch by Ian D. Allen to
+ handle rare case when a service name appears several
+ times in rc3.d (bug 12856)
-2005-09-10 07:50 Frederic Lepied <flepied at mandriva.com>
+2005-09-20 07:05 flepied
- * rpm-helper.spec: 0.13-1mdk
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 20_Sep
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.14-1mdk
-2005-09-10 07:27 Frederic Lepied <flepied at mandriva.com>
+2005-09-20 07:04 flepied
- * add-group, add-shell, add-user, build-config-file, create-file,
- del-group, del-service, del-shell, del-user, rpm-helper.spec,
- verify-shell: Mandriva
+ * soft/rpm/rpm-helper/trunk/add-service: don't add the service to
+ all the profiles in upgrade mode.
-2005-09-10 07:26 Frederic Lepied <flepied at mandriva.com>
+2005-09-10 05:50 flepied
- * Makefile: add an RPMOPT to be able to pass args to rpm easily.
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 10_Sep
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.13-1mdk
-2005-09-10 07:24 Frederic Lepied <flepied at mandriva.com>
+2005-09-10 05:29 flepied
- * add-service: test /etc/security/msec/server wihout taking care of
- $SECURE_LEVEL (bug #18409).
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 10_Sep
+2005-09-10 05:27 flepied
+
+ * soft/rpm/rpm-helper/trunk/add-group,
+ soft/rpm/rpm-helper/trunk/add-shell,
+ soft/rpm/rpm-helper/trunk/add-user,
+ soft/rpm/rpm-helper/trunk/build-config-file,
+ soft/rpm/rpm-helper/trunk/create-file,
+ soft/rpm/rpm-helper/trunk/del-group,
+ soft/rpm/rpm-helper/trunk/del-service,
+ soft/rpm/rpm-helper/trunk/del-shell,
+ soft/rpm/rpm-helper/trunk/del-user,
+ soft/rpm/rpm-helper/trunk/rpm-helper.spec,
+ soft/rpm/rpm-helper/trunk/verify-shell: Mandriva
+
+2005-09-10 05:26 flepied
+
+ * soft/rpm/rpm-helper/trunk/Makefile: add an RPMOPT to be able to
+ pass args to rpm easily.
+
+2005-09-10 05:24 flepied
+
+ * soft/rpm/rpm-helper/trunk/add-service: test
+ /etc/security/msec/server wihout taking care of $SECURE_LEVEL
+ (bug #18409).
+
add by default the service to all the profiles if
ADD_SERVICES_TO_CURRENT_PROFILE_ONLY isn't set in
/etc/sysconfig/system.
-2005-08-19 21:06 Herton Ronaldo Krzesinski <herton at mandriva.com>
+2005-08-19 19:06 herton
- * add-syslog, del-syslog: - Fix bug when handling log entries
- comprised of all levels at syslog-ng configuration file. -
- Correctly handle '*' character inside names of configuration
- tokes, not make it be interpreted like a shell wildcard or sed
- regular expression. - Fix bug when get source name inside
- add-syslog, in the case there isn't a different source, instead
- the default source /dev/log is used (the case where $source
- variable is empty).
+ * soft/rpm/rpm-helper/trunk/add-syslog,
+ soft/rpm/rpm-helper/trunk/del-syslog: - Fix bug when handling
+ log entries comprised of all levels at syslog-ng
+ configuration file.
+ - Correctly handle '*' character inside names of configuration
+ tokes,
+ not make it be interpreted like a shell wildcard or sed regular
+ expression.
+ - Fix bug when get source name inside add-syslog, in the case
+ there
+ isn't a different source, instead the default source /dev/log
+ is used
+ (the case where $source variable is empty).
-2005-08-04 20:26 Herton Ronaldo Krzesinski <herton at mandriva.com>
+2005-08-04 18:26 herton
- * add-syslog, del-syslog: - Fix usage bug: add-syslog and
- del-syslog can also accept only one parameter, the unix stream
- log source. - Shell script must exit with 'exit' command, not
- 'return'. - Before using service command we must check if the
- initscript exist. - Fixed sed expression for adding a syslog
- source to syslog-ng inside the same source of /dev/log. -
- Removed duplicated comment. - We must check level if empty in
- del-syslog, in the case we're using only source argument,
- otherwise we get various grep usage erros.
+ * soft/rpm/rpm-helper/trunk/add-syslog,
+ soft/rpm/rpm-helper/trunk/del-syslog: - Fix usage bug:
+ add-syslog and del-syslog can also accept only one
+ parameter, the unix stream log source.
+ - Shell script must exit with 'exit' command, not 'return'.
+ - Before using service command we must check if the initscript
+ exist.
+ - Fixed sed expression for adding a syslog source to syslog-ng
+ inside
+ the same source of /dev/log.
+ - Removed duplicated comment.
+ - We must check level if empty in del-syslog, in the case we're
+ using
+ only source argument, otherwise we get various grep usage
+ erros.
-2005-08-03 13:55 Herton Ronaldo Krzesinski <herton at mandriva.com>
+2005-08-03 12:33 herton
- * add-syslog, del-syslog: - Argh: forgot to add the script files.
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 03_Ago
-2005-08-03 13:50 Herton Ronaldo Krzesinski <herton at mandriva.com>
+2005-08-03 11:55 herton
- * AUTHORS, Makefile, README, README.CVS, rpm-helper.macros.in,
- rpm-helper.spec: - Added syslog helpers (currently they support
- syslog-ng and sysklogd). - s/mandrake/mandriva on misc files.
+ * soft/rpm/rpm-helper/trunk/add-syslog,
+ soft/rpm/rpm-helper/trunk/del-syslog: - Argh: forgot to add the
+ script files.
-2005-06-30 10:40 Olivier Thauvin <thauvin at aerov.jussieu.fr>
+2005-08-03 11:50 herton
- * rpm-helper.spec: - s/mandrake/mandriva/
+ * soft/rpm/rpm-helper/trunk/AUTHORS,
+ soft/rpm/rpm-helper/trunk/Makefile,
+ soft/rpm/rpm-helper/trunk/README,
+ soft/rpm/rpm-helper/trunk/README.CVS,
+ soft/rpm/rpm-helper/trunk/rpm-helper.macros.in,
+ soft/rpm/rpm-helper/trunk/rpm-helper.spec: - Added syslog
+ helpers (currently they support syslog-ng and sysklogd).
+ - s/mandrake/mandriva on misc files.
-2005-06-30 10:33 Olivier Thauvin <thauvin at aerov.jussieu.fr>
+2005-06-30 08:40 othauvin
- * Makefile, rpm-helper.macros.in, rpm-helper.spec: - make
- rpm-helper provide itself its macros
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: - s/mandrake/mandriva/
-2005-03-09 21:11 Frederic Lepied <flepied at mandriva.com>
+2005-06-30 08:33 othauvin
- * .cvsignore: first version
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 30_jun
+ * soft/rpm/rpm-helper/trunk/ChangeLog,
+ soft/rpm/rpm-helper/trunk/Makefile,
+ soft/rpm/rpm-helper/trunk/rpm-helper.macros.in,
+ soft/rpm/rpm-helper/trunk/rpm-helper.spec: - make rpm-helper
+ provide itself its macros
-2004-09-23 03:03 Frederic Lepied <flepied at mandriva.com>
+2005-03-09 20:11 flepied
- * rpm-helper.spec: 0.10-1mdk
+ * soft/rpm/rpm-helper/trunk, soft/rpm/rpm-helper/trunk/.cvsignore:
+ first version
-2004-09-23 03:02 Frederic Lepied <flepied at mandriva.com>
+2004-09-23 01:03 flepied
- * add-service: add the service again on upgrade if the service is
- activated
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 23_Sep
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.10-1mdk
-2003-11-01 08:43 Frederic Lepied <flepied at mandriva.com>
+2004-09-23 01:02 flepied
- * build-config-file: first version. Needs testing.
+ * soft/rpm/rpm-helper/trunk/add-service: add the service again on
+ upgrade if the service is activated
-2003-09-17 15:52 Frederic Lepied <flepied at mandriva.com>
+2003-11-01 07:43 flepied
- * rpm-helper.spec: 0.9.1-1mdk
+ * soft/rpm/rpm-helper/trunk/build-config-file: first version.
+ Needs testing.
-2003-01-14 21:59 Frederic Lepied <flepied at mandriva.com>
+2003-09-17 13:53 flepied
- * rpm-helper.spec: 0.9-1mdk
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 17_Sep
-2002-12-23 00:09 Frederic Lepied <flepied at mandriva.com>
+2003-09-17 13:52 flepied
- * rpm-helper.spec: 0.8
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.9.1-1mdk
-2002-12-23 00:08 Frederic Lepied <flepied at mandriva.com>
+2003-01-14 20:59 flepied
- * add-group: do not delete supplementary groups already added
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 14_Jan
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.9-1mdk
-2002-12-22 22:46 Frederic Lepied <flepied at mandriva.com>
+2002-12-22 23:09 flepied
- * add-user: removed unused variable
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 23_Dec
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.8
-2002-12-22 22:42 Frederic Lepied <flepied at mandriva.com>
+2002-12-22 23:08 flepied
- * add-service: corrected behaviour when SECURE_LEVEL isn't set
+ * soft/rpm/rpm-helper/trunk/add-group: do not delete supplementary
+ groups already added
-2002-12-22 22:39 Frederic Lepied <flepied at mandriva.com>
+2002-12-22 21:46 flepied
- * add-shell: corrected bad grep use
+ * soft/rpm/rpm-helper/trunk/add-user: removed unused variable
-2002-11-07 15:01 Thierry Vignaud <tvignaud at mandriva.com>
+2002-12-22 21:42 flepied
- * add-shell: keep /etc/shells sorted, thus enabling to ensure uniq
- entries
+ * soft/rpm/rpm-helper/trunk/add-service: corrected behaviour when
+ SECURE_LEVEL isn't set
-2002-11-05 15:20 Thierry Vignaud <tvignaud at mandriva.com>
+2002-12-22 21:39 flepied
- * Makefile, add-shell, del-shell, rpm-helper.spec, verify-shell:
- add verify-shell
+ * soft/rpm/rpm-helper/trunk/add-shell: corrected bad grep use
-2002-11-05 14:36 Thierry Vignaud <tvignaud at mandriva.com>
+2002-11-07 14:01 tvignaud
- * rpm-helper.spec: 0.7.1mdk
+ * soft/rpm/rpm-helper/trunk/add-shell: keep /etc/shells sorted,
+ thus enabling to ensure uniq entries
-2002-11-05 14:36 Thierry Vignaud <tvignaud at mandriva.com>
+2002-11-05 14:20 tvignaud
- * Makefile: - add {add,del}-shell
+ * soft/rpm/rpm-helper/trunk/Makefile,
+ soft/rpm/rpm-helper/trunk/add-shell,
+ soft/rpm/rpm-helper/trunk/del-shell,
+ soft/rpm/rpm-helper/trunk/rpm-helper.spec,
+ soft/rpm/rpm-helper/trunk/verify-shell: add verify-shell
+2002-11-05 13:38 tvignaud
+
+ * soft/rpm/rpm-helper/trunk/ChangeLog: *** empty log message ***
+
+2002-11-05 13:36 tvignaud
+
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.7.1mdk
+ * soft/rpm/rpm-helper/trunk/Makefile: - add {add,del}-shell
+
- add localsrpm target
-2002-11-05 14:35 Thierry Vignaud <tvignaud at mandriva.com>
+2002-11-05 13:35 tvignaud
+
+ * soft/rpm/rpm-helper/trunk/AUTHORS: add me
+ * soft/rpm/rpm-helper/trunk/add-shell,
+ soft/rpm/rpm-helper/trunk/del-shell: add {add,del}-shell
+
+2002-09-06 07:26 flepied
- * AUTHORS: add me
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 06_Sep
-2002-11-05 14:35 Thierry Vignaud <tvignaud at mandriva.com>
+2002-09-06 07:22 flepied
- * add-shell, del-shell: add {add,del}-shell
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: add conflicts with
+ chkconfig
-2002-09-06 09:22 Frederic Lepied <flepied at mandriva.com>
+2002-09-06 07:14 flepied
- * rpm-helper.spec: add conflicts with chkconfig
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.6-1mdk
-2002-09-06 09:14 Frederic Lepied <flepied at mandriva.com>
+2002-09-06 07:12 flepied
- * rpm-helper.spec: 0.6-1mdk
+ * soft/rpm/rpm-helper/trunk/add-service: do the security stuff
-2002-09-06 09:12 Frederic Lepied <flepied at mandriva.com>
+2002-08-01 17:40 flepied
- * add-service: do the security stuff
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 01_Aug
-2002-08-01 19:39 Frederic Lepied <flepied at mandriva.com>
+2002-08-01 17:39 flepied
- * rpm-helper.spec: 0.5-1mdk
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.5-1mdk
+ * soft/rpm/rpm-helper/trunk/add-service: restart services that
+ depend of portmap
-2002-08-01 19:39 Frederic Lepied <flepied at mandriva.com>
+2002-07-31 08:47 flepied
- * add-service: restart services that depend of portmap
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 31_Jul
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.4.1-1mdk
+ * soft/rpm/rpm-helper/trunk/add-group: corrected group add without
+ a user to add
-2002-07-31 10:47 Frederic Lepied <flepied at mandriva.com>
+2002-07-29 15:26 flepied
- * rpm-helper.spec: 0.4.1-1mdk
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 29_Jul
-2002-07-31 10:47 Frederic Lepied <flepied at mandriva.com>
+2002-07-29 15:25 flepied
- * add-group: corrected group add without a user to add
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.4-1mdk
+ * soft/rpm/rpm-helper/trunk/add-user: removed group management
-2002-07-29 17:25 Frederic Lepied <flepied at mandriva.com>
+2002-07-29 15:24 flepied
- * rpm-helper.spec: 0.4-1mdk
+ * soft/rpm/rpm-helper/trunk/del-group: added comment
-2002-07-29 17:25 Frederic Lepied <flepied at mandriva.com>
+2002-07-29 15:22 flepied
- * add-user: removed group management
+ * soft/rpm/rpm-helper/trunk/add-group: corrected group argument
+ passing
-2002-07-29 17:24 Frederic Lepied <flepied at mandriva.com>
+2002-07-29 15:16 flepied
- * del-group: added comment
+ * soft/rpm/rpm-helper/trunk/Makefile: add-group del-group
-2002-07-29 17:22 Frederic Lepied <flepied at mandriva.com>
+2002-07-29 14:16 flepied
- * add-group: corrected group argument passing
+ * soft/rpm/rpm-helper/trunk/add-group,
+ soft/rpm/rpm-helper/trunk/del-group: first version
-2002-07-29 17:16 Frederic Lepied <flepied at mandriva.com>
+2002-07-12 15:23 flepied
- * Makefile: add-group del-group
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 12_Jul
-2002-07-29 16:15 Frederic Lepied <flepied at mandriva.com>
+2002-07-12 15:22 flepied
- * del-group, add-group: first version
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.3-1mdk
-2002-07-12 17:22 Frederic Lepied <flepied at mandriva.com>
+2002-07-12 15:20 flepied
- * rpm-helper.spec: 0.3-1mdk
+ * soft/rpm/rpm-helper/trunk/add-user: added missing groupadd call
-2002-07-12 17:20 Frederic Lepied <flepied at mandriva.com>
+2002-07-12 15:19 flepied
- * add-user: added missing groupadd call
+ * soft/rpm/rpm-helper/trunk/add-user: added support for extended
+ groups
-2002-07-12 17:19 Frederic Lepied <flepied at mandriva.com>
+2002-07-10 13:12 flepied
- * add-user: added support for extended groups
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 10_Jul
+ * soft/rpm/rpm-helper/trunk/rpm-helper.spec: 0.2-1mdk
-2002-07-10 15:12 Frederic Lepied <flepied at mandriva.com>
+2002-07-10 13:10 flepied
- * rpm-helper.spec: 0.2-1mdk
+ * soft/rpm/rpm-helper/trunk/Makefile: added create-file
-2002-07-10 15:10 Frederic Lepied <flepied at mandriva.com>
+2002-07-10 13:08 flepied
- * Makefile: added create-file
+ * soft/rpm/rpm-helper/trunk/create-file: first version
-2002-07-10 15:08 Frederic Lepied <flepied at mandriva.com>
+2002-07-09 15:09 flepied
- * create-file: first version
+ * soft/rpm/rpm-helper/trunk/ChangeLog: Generated by cvs2cl the
+ 09_Jul
-2002-07-09 17:04 Frederic Lepied <flepied at mandriva.com>
+2002-07-09 15:04 flepied
- * AUTHORS, COPYING, Makefile, README, README.CVS, add-service,
- add-user, del-service, del-user, rpm-helper.spec: Initial
- revision
+ * soft/rpm/rpm-helper/trunk/AUTHORS,
+ soft/rpm/rpm-helper/trunk/COPYING,
+ soft/rpm/rpm-helper/trunk/ChangeLog,
+ soft/rpm/rpm-helper/trunk/Makefile,
+ soft/rpm/rpm-helper/trunk/README,
+ soft/rpm/rpm-helper/trunk/README.CVS,
+ soft/rpm/rpm-helper/trunk/add-service,
+ soft/rpm/rpm-helper/trunk/add-user,
+ soft/rpm/rpm-helper/trunk/del-service,
+ soft/rpm/rpm-helper/trunk/del-user,
+ soft/rpm/rpm-helper/trunk/rpm-helper.spec: Initial revision
-2002-07-09 17:04 Frederic Lepied <flepied at mandriva.com>
+2002-07-09 15:04
- * AUTHORS, COPYING, Makefile, README, README.CVS, add-service,
- add-user, del-service, del-user, rpm-helper.spec: Initial version
+ * soft/rpm/rpm-helper/branches, soft/rpm/rpm-helper/tags,
+ soft/rpm/rpm-helper/trunk: New repository initialized by cvs2svn.
diff --git a/Makefile b/Makefile
index 903d0c3..7058f66 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ FILES = AUTHORS README README.CVS COPYING ChangeLog Makefile \
$(PACKAGE).spec $(SCRIPTS) $(MACROFILEIN)
SCRIPTS = add-user del-user add-service del-service create-file \
add-group del-group add-shell del-shell verify-shell \
- add-syslog del-syslog
+ add-syslog del-syslog add-webapp del-webapp
LIBDIR=/usr/share/$(PACKAGE)
RPMACROSDIR=/etc/rpm/macros.d
@@ -73,19 +73,13 @@ buildsrpm:
# rules to build a distributable rpm
-rpm: changelog cvstag dist buildrpm
+rpm: changelog dist buildrpm
-dist: cleandist dir export tar
+dist: cleandist dir tar
-export:
- cvs export -d $(PACKAGE)-$(VERSION) -r $(TAG) $(PACKAGE)
-
-cvstag:
- cvs tag $(CVSTAGOPT) $(TAG)
-
-changelog: ../common/username
- cvs2cl -U ../common/username -I ChangeLog
+changelog:
+ svn2cl -o ChangeLog
rm -f ChangeLog.bak
- cvs commit -m "Generated by cvs2cl the `date '+%d_%b'`" ChangeLog
+ svn commit -m "Generated by svn2cl" ChangeLog
# Makefile ends here
diff --git a/add-webapp b/add-webapp
new file mode 100755
index 0000000..6468280
--- /dev/null
+++ b/add-webapp
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ $# != 2 ]; then
+ echo "usage: $0 <pkg name> <number installed>" 1>&2
+ exit 1
+fi
+
+pkg=$1 # name of the package
+num=$2 # number of packages installed
+
+if [ $num = 1 ]; then
+ # installation: restart web server if running,
+ # as there is a new configuration file
+ /sbin/service httpd condrestart
+fi
diff --git a/del-webapp b/del-webapp
new file mode 100755
index 0000000..95a4eef
--- /dev/null
+++ b/del-webapp
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if [ $# != 2 ]; then
+ echo "usage: $0 <pkg name> <number installed>" 1>&2
+ exit 1
+fi
+
+pkg=$1 # name of the package
+num=$2 # number of packages installed
+
+if [ $num = 0 ]; then
+ # uninstallation: restart web server if running,
+ # a there is one less configuration file
+ /sbin/service httpd condrestart
+else
+ # update: just reload web server if running,
+ # as the number of configuration files didn't change
+ /sbin/service httpd condreload
+fi
diff --git a/rpm-helper.macros.in b/rpm-helper.macros.in
index bcfcf37..5907c12 100644
--- a/rpm-helper.macros.in
+++ b/rpm-helper.macros.in
@@ -45,3 +45,13 @@
%_preun_syslogdel() %_del_syslog_helper %{name} $1 %{1} %{?2:%2} %{?3:%3} %{?4:%4} %{?5:%5} \
%{nil}
+# Web App dir
+
+%_add_webapp_helper @LIBDIR@/add-webapp
+%_post_webapp() %_add_webapp_helper %{name} $1 %{1} \
+%{nil}
+
+%_del_webapp_helper @LIBDIR@/del-webapp
+%_postun_webapp() %_del_webapp_helper %{name} $1 %{1} \
+%{nil}
+
diff --git a/rpm-helper.spec b/rpm-helper.spec
index f15000d..741d8fd 100644
--- a/rpm-helper.spec
+++ b/rpm-helper.spec
@@ -1,16 +1,8 @@
-#############################################################################
-# Project : Mandriva Linux
-# Module : rpm-helper
-# File : rpm-helper.spec
-# Version : $Id$
-# Author : Frederic Lepied
-# Created On : Tue Jul 9 08:21:29 2002
-# Purpose : rpm build rules
-#############################################################################
+# $Id$
Summary: Helper scripts for rpm scriptlets
Name: rpm-helper
-Version: 0.15
+Version: 0.16
Release: %mkrel 1
Source0: %name-%version.tar.bz2
License: GPL
@@ -31,8 +23,6 @@ Helper scripts for rpm scriptlets to help create/remove :
%prep
%setup
-%build
-
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall_std LIBDIR=%_datadir/%name
@@ -47,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT
%_sys_macros_dir/%name.macros
%changelog
+* Sat Jun 17 2006 Olivier Thauvin <nanardon@mandriva.org> 0.16-1mdv2007.0
+- add webapp macros and scrips (G. Rousse)
+
* Thu Feb 09 2006 Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> 0.15-1mdk
- add-service: handle case when a service name appears several times.