[prev in list] [next in list] [prev in thread] [next in thread]
List: annvix-cvs
Subject: [cvs] CVS commit in packages/rpm-helper on 2005/09/25 17:18:25
From: cvsrep () annvix ! org
Date: 2005-09-25 17:18:26
Message-ID: E1EJa8w-0003Ef-DA () build ! annvix ! org
[Download RAW message or body]
Module name: packages/rpm-helper
Changes by: vdanen
Date: 2005/09/25 17:18:25
Commit log:
- update P0 to add mkdepends script
Index: rpm-helper-0.14-avx-srv.patch
===================================================================
RCS file: /work/annvix/cvsroot/packages/rpm-helper/Attic/rpm-helper-0.14-avx-srv.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- rpm-helper-0.14-avx-srv.patch 23 Sep 2005 04:06:18 -0000 1.1.2.1
+++ rpm-helper-0.14-avx-srv.patch 25 Sep 2005 17:18:25 -0000 1.1.2.2
@@ -5,7 +5,7 @@
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-srv del-srv
++ add-syslog del-syslog add-srv del-srv mkdepends
LIBDIR=/usr/share/$(PACKAGE)
RPMACROSDIR=/etc/rpm/macros.d
@@ -116,26 +116,6 @@
+fi
+
+# del-srv ends here
---- rpm-helper.macros.in.avx 2005-09-21 11:20:09.000000000 -0400
-+++ rpm-helper.macros.in 2005-09-21 11:21:49.000000000 -0400
-@@ -14,7 +14,7 @@
- %{nil}
-
- %_add_user_helper @LIBDIR@/add-user
--%_pre_useradd() %_add_user_helper %{name} $1 %{1} %{2} %{3} \
-+%_pre_useradd() %_add_user_helper %{name} $1 %{1} %{2} %{3} %{4} \
- %{nil}
-
- %_del_user_helper @LIBDIR@/del-user
-@@ -22,7 +22,7 @@
- %{nil}
-
- %_add_group_helper @LIBDIR@/add-group
--%_pre_groupadd() %_add_group_helper %{name} $1 %{1} %{?2:%2} \
-+%_pre_groupadd() %_add_group_helper %{name} $1 %{1} %{2} %{?3:%3} \
- %{nil}
-
- %_del_group_helper @LIBDIR@/del-group
--- add-service.avx 2005-09-22 23:53:43.000000000 -0400
+++ add-service 2005-09-22 23:53:43.000000000 -0400
@@ -27,40 +27,12 @@
@@ -180,3 +160,69 @@
}
if [ $num = 1 ]; then
+--- mkdepends.avx 2005-09-25 12:46:27.000000000 -0400
++++ mkdepends 2005-09-25 12:47:05.000000000 -0400
+@@ -0,0 +1,24 @@
++#!/bin/sh
++#
++# This is a rpm helper script that creates dependencies for runit-based services
++# given two parameters; the name of the service and the name of the service it
++# depends on. For instance:
++#
++# mkdepends.sh %{buildroot} amd portmap
++#
++# this creates a dependency on the portmap service for the amd service and does so
++# by creating a symlink in the dependency directory for the amd service.
++#
++# Copyright (c) 2005 Vincent Danen <vdanen@annvix.org>
++
++SERVICE=$1
++DEPENDS=$2
++
++if [ -d ${RPM_BUILD_ROOT}/var/service/${SERVICE}/depends ]; then
++ pushd ${RPM_BUILD_ROOT}/var/service/${SERVICE}/depends >/dev/null 2>&1
++ ln -s ../../${DEPENDS} .
++ popd >/dev/null 2>&1
++else
++ echo "Dependency directory does not exist!"
++ exit 1
++fi
+--- rpm-helper.macros.in.avx 2005-08-03 07:50:35.000000000 -0400
++++ rpm-helper.macros.in 2005-09-25 12:51:24.000000000 -0400
+@@ -14,7 +14,7 @@
+ %{nil}
+
+ %_add_user_helper @LIBDIR@/add-user
+-%_pre_useradd() %_add_user_helper %{name} $1 %{1} %{2} %{3} \
++%_pre_useradd() %_add_user_helper %{name} $1 %{1} %{2} %{3} %{4} \
+ %{nil}
+
+ %_del_user_helper @LIBDIR@/del-user
+@@ -22,7 +22,7 @@
+ %{nil}
+
+ %_add_group_helper @LIBDIR@/add-group
+-%_pre_groupadd() %_add_group_helper %{name} $1 %{1} %{?2:%2} \
++%_pre_groupadd() %_add_group_helper %{name} $1 %{1} %{2} %{?3:%3} \
+ %{nil}
+
+ %_del_group_helper @LIBDIR@/del-group
+@@ -45,3 +45,18 @@
+ %_preun_syslogdel() %_del_syslog_helper %{name} $1 %{1} %{?2:%2} %{?3:%3} %{?4:%4} \
%{?5:%5} \ + %{nil}
+
++
++# service macros
++%_add_srv_helper @LIBDIR@/add-srv
++%_post_srv() %_add_srv_helper %{name} $1 %{1} \
++%{nil}
++
++%_del_srv_helper @LIBDIR@/del-srv
++%_preun_srv() %_del_srv_helper %{name} $1 %{1} \
++%{nil}
++
++%_mkdepends @LIBDIR@/mkdepends
++
++# afterboot macros
++%_mkafterboot if [[ -f %{_datadir}/afterboot/mkafterboot ]]; then \
%{_datadir}/afterboot/mkafterboot; fi \ ++%{nil}
Index: rpm-helper.spec
===================================================================
RCS file: /work/annvix/cvsroot/packages/rpm-helper/rpm-helper.spec,v
retrieving revision 1.3.4.5
retrieving revision 1.3.4.6
diff -u -r1.3.4.5 -r1.3.4.6
--- rpm-helper.spec 23 Sep 2005 04:06:18 -0000 1.3.4.5
+++ rpm-helper.spec 25 Sep 2005 17:18:25 -0000 1.3.4.6
@@ -9,7 +9,7 @@
%define name rpm-helper
%define version 0.14
-%define release 1avx
+%define release 2avx
Summary: Helper scripts for rpm scriptlets
Name: %{name}
@@ -41,7 +41,7 @@
%build
-chmod 0755 {add,del}-srv
+chmod 0755 {add,del}-srv mkdepends
%install
@@ -62,6 +62,9 @@
%changelog
+* Sun Sep 25 2005 Vincent Danen <vdanen@annvix.org> 0.14-2avx
+- update P0 to add mkdepends script
+
* Thu Sep 22 2005 Vincent Danen <vdanen@annvix.org> 0.14-1avx
- 0.14
- update P0 to rip out all references to msec
_______________________________________________
cvs mailing list
cvs@annvix.org
http://annvix.org/mailman/listinfo/cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic