- removed duplicated macros from rpm-helper, the macros in rpm-helperv1.411.41

  are the ones used, so we don't need to also copy them here (see ticket
  #30568).
- bump version to 1.41.

2 files changed, 1 insertions, 40 deletions

diff --git a/configure.ac b/configure.ac
index 3c802dc..94958de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # $Id$
 
 AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.40, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.41, nanardon@mandriva.org)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.9)
 AC_CONFIG_SRCDIR
diff --git a/macros.in b/macros.in
index 7cb2dd6..5278203 100644
--- a/macros.in
+++ b/macros.in
@@ -233,45 +233,6 @@ done ; fi \
 then %{_scrollkeeper_bin} -q || true ; fi \
 %{nil}
 
-# From rpm-helper
-
-%_create_ghostfile_helper /usr/share/rpm-helper/create-file
-%create_ghostfile() %_create_ghostfile_helper %{name} $1 %{1} %{2} %{3} %{4} \
-%{nil}
-
-# initscripts macros
-%_add_service_helper /usr/share/rpm-helper/add-service
-%_post_service() %_add_service_helper %{name} $1 %{1} \
-%{nil}
-
-%_del_service_helper /usr/share/rpm-helper/del-service
-%_preun_service() %_del_service_helper %{name} $1 %{1} \
-%{nil}
-
-%_add_user_helper /usr/share/rpm-helper/add-user
-%_pre_useradd() %_add_user_helper %{name} $1 %{1} %{2} %{3} \
-%{nil}
-
-%_del_user_helper /usr/share/rpm-helper/del-user
-%_postun_userdel() %_del_user_helper %{name} $1 %{1} \
-%{nil}
-
-%_add_group_helper /usr/share/rpm-helper/add-group
-%_pre_groupadd() %_add_group_helper %{name} $1 %{1} %{?2:%2} \
-%{nil}
-
-%_del_group_helper /usr/share/rpm-helper/del-group
-%_postun_groupdel() %_del_group_helper %{name} $1 %{1} \
-%{nil}
-
-%_add_shell_helper /usr/share/rpm-helper/add-shell
-%_post_shelladd() %_add_shell_helper %{name} $1 %{1} \
-%{nil}
-
-%_del_shell_helper /usr/share/rpm-helper/del-shell
-%_preun_shelldel() %_del_shell_helper %{name} $1 \
-%{nil}
-
 # Mandriva Linux version
 # - "9.1"    =>  910
 # - "10.2.2" => 1022