- updated etc_dir patch (s/ETC_DIR/HOME_ETC/, leave dots)

- cosmetics

Changed files:
    antiword-etc_dir.patch -> 1.2
    antiword.spec -> 1.22

diff --git a/antiword-etc_dir.patch b/antiword-etc_dir.patch
index 96f69b908cf87d0d3d329d69aeee64d2e5e1f73c..cf151fd92b8b13792c2adf7b01c539c0bd99bbf6 100644 (file)
--- a/antiword-etc_dir.patch
+++ b/antiword-etc_dir.patch
@@ -5,7 +5,7 @@ diff -Nru antiword-0.33/antiword.h antiword-0.33.new/antiword.h
  #else /* All others */
  #define GLOBAL_ANTIWORD_DIR   "/usr/share/antiword"
  #define ANTIWORD_DIR          ".antiword"
-+#define ETC_DIR_ANTIWORD_DIR "antiword"
++#define ETC_DIR_ANTIWORD_DIR  ".antiword"
  #define FONTNAMES_FILE                "fontnames"
  #endif /* __dos */
  /* The name of the default mapping file */
@@ -32,7 +32,7 @@ diff -Nru antiword-0.33/options.c antiword-0.33.new/options.c
 -      } else {
 -              werr(0, "Local mappingfilename too long, ignored");
 -      }
-+  szHome = getenv("ETC_DIR");
++  szHome = getenv("HOME_ETC");
 +  if (szHome) {
 +        if (strlen(szHome) + strlen(szLeafname) <
 +            sizeof(szMappingFile) -
@@ -78,7 +78,7 @@ diff -Nru antiword-0.33/options.c antiword-0.33.new/options.c
 -      werr(0, "I can't open your mapping file (%s)\n"
 -              "It is not in '%s" FILE_SEPARATOR ANTIWORD_DIR "' nor in '"
 -              GLOBAL_ANTIWORD_DIR "'.", szLeafname, szHome);
-+  if (getenv("ETC_DIR") != NULL)
++  if (getenv("HOME_ETC") != NULL)
 +        werr(0, "I can't open your mapping file (%s)\n"
 +                "It is not in '%s" FILE_SEPARATOR ETC_DIR_ANTIWORD_DIR "' nor in '"
 +                GLOBAL_ANTIWORD_DIR "'.", szLeafname, szHome);

diff --git a/antiword.spec b/antiword.spec
index ca8ad467dc6fab592d25d57b395231119d0442c1..8151a6a61db3c474ae41358bd4a4e88403309efd 100644 (file)
--- a/antiword.spec
+++ b/antiword.spec
@@ -26,7 +26,9 @@ Postscriptu. Antiword pr
 %patch -p1
 
 %build
-%{__make} OPT="%{rpmcflags}" CC="%{__cc}"
+%{__make} \
+       CC="%{__cc}" \
+       OPT="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT