- removed unused macros I'd added (%%*kernel*, macros for the scripts)

Changed files:
    rpm.macros -> 1.58

diff --git a/rpm.macros b/rpm.macros
index 3803e93c70edb0207d70487b0f367b76b73ba2d4..2257c07f4ce00c485c32bf9b6fcba7c3ab5b825b 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -238,94 +238,3 @@ fi \
 #%_noautoreqdep                %{nil}
 #%_noautoprovfiles     %{nil}
 #%_noautoprov          %{nil}
-
-#-----------------------------------------------------------------
-# Kernel version related stuff
-#
-%_kernel_ver           %(grep UTS_RELEASE /usr/src/linux/include/linux/version.h 2>/dev/null | cut -d'"' -f2)
-%_kernel24             %(echo %{_kernel_ver} | grep -q '2\.[012]\.' ; echo $?)
-%_kernel_series                %{?_kernel24:2.4}%{!?_kernel24:2.2}
-%conflicts_kernel_ver  Conflicts: kernel < %{_kernel_ver}, kernel > %{_kernel_ver}
-%conflicts_kernel_series Conflicts: kernel %{?_kernel24:<} {!?_kernel24:>=} 2.3.0
-
-#-----------------------------------------------------------------
-# Macros commonly used in %{pre,post}{un,}
-#
-# Usage:
-# [NAME=lircd;] [DESC="lirc daemon";] %chkconfig_add (in %post)
-# [NAME=lircd;] %chkconfig_del (in %preun)
-# %fix_info_dir (in %post)
-# [GID=51;] [GROUP=http;] [NAME=apache;] %groupadd (in %pre)
-# [UID=51;] [USER=http;] [GROUP=http;] [COMMENT="HTTP User"]
-#      [HOMEDIR="/home/users/httpd [-m]";] [SHELL=/bin/false;]
-#      [NAME=apache;] %useradd (in %pre)
-# [GROUP=http;] %groupdel (in %postun)
-# [USER=http;] %userdel (in %postun)
-# %rc_inetd_post
-# %rc_inetd_postun
-#
-%chkconfig_add [ -z "$NAME" ] && NAME=%{name} \
-/sbin/chkconfig --add $NAME \
-[ -z "$DESC" ] && DESC=$NAME
-if [ -f /var/lock/subsys/$NAME ]; then \
-        /etc/rc.d/init.d/$NAME restart >&2 \
-else \
-        echo "Run \\"/etc/rc.d/init.d/$NAME start\\" to start $DESC." >&2 \
-fi
-
-%chkconfig_del [ -z "$NAME" ] && NAME=%{name} \
-if [ "$1" = "0" ]; then \
-        if [ -f /var/lock/subsys/$NAME ]; then \
-                /etc/rc.d/init.d/$NAME stop >&2 \
-        fi \
-        /sbin/chkconfig --del $NAME \
-fi
-
-%fix_info_dir  [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} > /dev/null 2>&1
-
-%groupadd [ -z "$NAME" ] && NAME=%{name} \
-[ -z "$GROUP" ] && GROUP=%{name} \
-[ -n "$GID" ] && GID="-g $GID" \
-if [ -n "`getgid $GROUP`" ]; then \
-        if [ "`getgid $GROUP`" != "$GID" ]; then \
-                echo "Warning: group $GROUP doesn't have gid=$GID. Correct this before installing $NAME." 1>&2 \
-                exit 1 \
-        fi \
-else \
-        /usr/sbin/groupadd $GID -r -f $GROUP \
-fi
-
-%useradd [ -z "$NAME" ] && NAME=%{name} \
-[ -z "$USER" ] && USER=%{name} \
-[ -z "$HOMEDIR" ] && HOMEDIR=/home/users/$NAME \
-[ -z "$GROUP" ] && GROUP=%{name} \
-[ -n "$UID" ] && UID="-u $UID -r" \
-if [ -n "`id -u $USER 2>/dev/null`" ]; then \
-        if [ "`id -u $USER`" != "$UID" ]; then \
-                echo "Warning: user $USER doesn't have uid=$UID. Correct this before installing $NAME." 1>&2 \
-                exit 1 \
-        fi \
-else \
-       test -z "$SHELL" && SHELL=/bin/false \
-        /usr/sbin/useradd $UID -d "$HOMEDIR" -s $SHELL -c "$COMMENT" -g $GROUP $USER 1>&2 \
-fi
-
-%groupdel [ -z "$GROUP" ] && GROUP=%{name} \
-if [ "$1" = "0" ]; then \
-        /usr/sbin/groupdel $GROUP \
-fi
-
-%userdel [ -z "$USER" ] && USER=%{name} \
-if [ "$1" = "0" ]; then \
-        /usr/sbin/userdel $USER \
-fi
-
-%rc_inetd_post if [ -f /var/lock/subsys/rc-inetd ]; then \
-       /etc/rc.d/init.d/rc-inetd restart 1>&2 \
-else \
-       echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2 \
-fi
-
-%rc_inetd_postun if [ -f /var/lock/subsys/rc-inetd ]; then \
-       /etc/rc.d/init.d/rc-inetd restart \
-fi