From feffe656a174c7ec23e48b34f6571016e4457785 Mon Sep 17 00:00:00 2001 From: Herton Ronaldo Krzesinski Date: Wed, 3 Aug 2005 11:50:35 +0000 Subject: - Added syslog helpers (currently they support syslog-ng and sysklogd). - s/mandrake/mandriva on misc files. --- AUTHORS | 5 +++-- Makefile | 3 ++- README | 2 +- README.CVS | 6 +++--- rpm-helper.macros.in | 8 ++++++++ rpm-helper.spec | 5 ++++- 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/AUTHORS b/AUTHORS index 02038fb..a898bb4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,3 @@ -Frédéric Lepied -Thierry Vignaud +Frédéric Lepied +Herton Ronaldo Krzesinski (*-syslog scripts) +Thierry Vignaud diff --git a/Makefile b/Makefile index d8b25bd..0dd5982 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,8 @@ TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__') 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-group del-group add-shell del-shell verify-shell \ + add-syslog del-syslog LIBDIR=/usr/share/$(PACKAGE) RPMACROSDIR=/etc/rpm/macros.d diff --git a/README b/README index 0ac4d6e..49abe2f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ rpm-helper is a set of scripts called by rpm scriptlets. Comments and new scripts welcome. Send feedback to -. +. diff --git a/README.CVS b/README.CVS index a58517a..0308040 100644 --- a/README.CVS +++ b/README.CVS @@ -1,7 +1,7 @@ To get the last developement version, you may use CVS see the -http://www.linuxmandrake.com/en/cvs.php3 page for more information how -to use cvs. +http://qa.mandriva.com/twiki/bin/view/Main/CvsGuide page for more information +how to use cvs. Then just checkout the rpm-helper module from the base. -Frederic Lepied . +Frederic Lepied . diff --git a/rpm-helper.macros.in b/rpm-helper.macros.in index 3de893c..bcfcf37 100644 --- a/rpm-helper.macros.in +++ b/rpm-helper.macros.in @@ -37,3 +37,11 @@ %_preun_shelldel() %_del_shell_helper %{name} $1 \ %{nil} +%_add_syslog_helper @LIBDIR@/add-syslog +%_post_syslogadd() %_add_syslog_helper %{name} $1 %{1} %{?2:%2} %{?3:%3} %{?4:%4} %{?5:%5} \ +%{nil} + +%_del_syslog_helper @LIBDIR@/del-syslog +%_preun_syslogdel() %_del_syslog_helper %{name} $1 %{1} %{?2:%2} %{?3:%3} %{?4:%4} %{?5:%5} \ +%{nil} + diff --git a/rpm-helper.spec b/rpm-helper.spec index 1f498a9..699e08c 100644 --- a/rpm-helper.spec +++ b/rpm-helper.spec @@ -10,7 +10,7 @@ Summary: Helper scripts for rpm scriptlets Name: rpm-helper -Version: 0.11 +Version: 0.12 Release: %mkrel 1 Source0: %name-%version.tar.bz2 License: GPL @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %_sys_macros_dir/%name.macros %changelog +* Wed Aug 03 2005 Herton Ronaldo Krzesinski 0.12-1mdk +- Version bump: new version that contais syslog helpers + * Thu Jun 30 2005 Olivier Thauvin 0.11-1mdk - provide itself its macro (rpm 4.4 powah) - mkrel -- cgit v1.2.1