diff options
Diffstat (limited to 'RPM4')
-rwxr-xr-x | RPM4/bin/rpm_produced | 6 | ||||
-rw-r--r-- | RPM4/lib/RPM4.pm | 14 | ||||
-rw-r--r-- | RPM4/src/RPM4.xs | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/RPM4/bin/rpm_produced b/RPM4/bin/rpm_produced index dfef2c9..09dcfc4 100755 --- a/RPM4/bin/rpm_produced +++ b/RPM4/bin/rpm_produced @@ -39,13 +39,13 @@ Options: --no-src do not show the src.rpm "; -RPM4::add_macro("_sourcedir $tmp"); -RPM4::add_macro("_specdir $tmp"); +RPM4::addmacro("_sourcedir $tmp"); +RPM4::addmacro("_specdir $tmp"); sub set_config { RPM4::readconfig(); foreach (@macros) { - RPM4::add_macro($_); + RPM4::addmacro($_); } } diff --git a/RPM4/lib/RPM4.pm b/RPM4/lib/RPM4.pm index 9324d86..1ae0d9c 100644 --- a/RPM4/lib/RPM4.pm +++ b/RPM4/lib/RPM4.pm @@ -180,9 +180,11 @@ sub format_rpmpb { # Alias for compatiblity # ########################## -sub specnew { - newspec(@_); -} +sub specnew { newspec(@_) } + +sub add_macro { addmacro(@_) } + +sub del_macro { delmacro(@_) } 1; @@ -303,15 +305,15 @@ Evaluate macros contained in C<$string>, like C<rpm --eval>. expand("%_var") return "/var". -=head2 add_macro("_macro value") +=head2 addmacro("_macro value") Define a macro into rpmlib. The macro is defined for the whole script. Ex: -C<add_macro("_macro value")>. Note that the macro name does have the prefix +C<addmacro("_macro value")>. Note that the macro name does have the prefix "%", to prevent rpm from evaluating it. =head2 del_macro("_macro") -Delete a macro from rpmlib. Exactly the reverse of add_macro(). +Delete a macro from rpmlib. Exactly the reverse of addmacro(). =head2 loadmacrosfile($filename) diff --git a/RPM4/src/RPM4.xs b/RPM4/src/RPM4.xs index 8e76c66..b122e81 100644 --- a/RPM4/src/RPM4.xs +++ b/RPM4/src/RPM4.xs @@ -720,13 +720,13 @@ expandnumeric(name) XPUSHs(sv_2mortal(newSViv(value))); void -add_macro(macro) +addmacro(macro) char * macro CODE: rpmDefineMacro(NULL, macro, RMIL_DEFAULT); void -del_macro(name) +delmacro(name) char * name CODE: delMacro(NULL, name); |