- Updated XML and SGML macros to include a semicolon at the end,

  instead of putting empty lines after their invocations.

Changed files:
    rpm.macros -> 1.178
    rpm.spec -> 1.607

diff --git a/rpm.macros b/rpm.macros
index ab87e9388feadab371f61bc05420749a81e6036e..0aee67ec917cb1bf4c241ead94f39f9f63464cd2 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -238,12 +238,12 @@ unset DISPLAY ||:\
 %_kernel_ver_str %(echo %{!?_without_dist_kernel:%{__kernel_rpmvr}}%{?_without_dist_kernel:%{__kernel_ver}} | sed -e 's/-/_/')
 
 # sgml macros
-%xmlcat_add()            /usr/bin/xmlcatalog --noout --add nextCatalog \"\" %1 /etc/xml/catalog
-%xmlcat_del()            /usr/bin/xmlcatalog --noout --del %1 /etc/xml/catalog
-%xmlcat_add_rewrite      /usr/bin/xmlcatalog --noout --add rewriteSystem
-%xmlcat_create()          /usr/bin/xmlcatalog --noout --create %1
-%sgmlcat_add()           /usr/bin/install-catalog --add %1 %2 > /dev/null
-%sgmlcat_del()           /usr/bin/install-catalog --remove %1 %2 > /dev/null
+%xmlcat_add()            /usr/bin/xmlcatalog --noout --add nextCatalog \"\" %1 /etc/xml/catalog ;
+%xmlcat_del()            /usr/bin/xmlcatalog --noout --del %1 /etc/xml/catalog ;
+%xmlcat_add_rewrite      /usr/bin/xmlcatalog --noout --add rewriteSystem ;
+%xmlcat_create()          /usr/bin/xmlcatalog --noout --create %1 ;
+%sgmlcat_add()           /usr/bin/install-catalog --add %1 %2 > /dev/null ;
+%sgmlcat_del()           /usr/bin/install-catalog --remove %1 %2 > /dev/null ;
 %docbook_sgmlcat_fix() { for l in \
 '' \
 '  -- default decl --' \

diff --git a/rpm.spec b/rpm.spec
index 12df0c13d839f636bca92b9001fa6627e5ebec9d..bdf850a5d7013779fe0837fd03e49f2bb4276669 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -20,7 +20,7 @@
 %define        reqdb_ver       4.2.50-1
 %define        reqpopt_ver     1.9
 %define        beecrypt_ver    2:4.1.0
-%define        rpm_macros_rev  1.177
+%define        rpm_macros_rev  1.178
 Summary:       RPM Package Manager
 Summary(de):   RPM Packet-Manager
 Summary(es):   Gestor de paquetes RPM
@@ -32,7 +32,7 @@ Name:         rpm
 %define        ver     4.4
 %define        sover   4.4
 Version:       %{ver}
-Release:       0.%{snap}.0.5
+Release:       0.%{snap}.0.6
 License:       GPL
 Group:         Base
 #Source0:      ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz