From 5e19ffc6b15d0b4d9d4825f7f6c3de46addcbae8 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 27 Jul 2010 09:24:02 +0000
Subject: [PATCH] 2010-07-27 11:23 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * mpkg_rpm_win.sh   - harbour-win-spec   + harbour-win.spec   *
 mpkg_rpm_wce.sh   - harbour-wce-spec   + harbour-wce.spec     * Renamed to
 have standard extension.

  * config/postinst.hbs
    - Deleted detection for no longer existing Linux distros.
---
 harbour/ChangeLog                              | 12 ++++++++++++
 harbour/config/postinst.hbs                    |  2 --
 harbour/{harbour-wce-spec => harbour-wce.spec} |  0
 harbour/{harbour-win-spec => harbour-win.spec} |  0
 harbour/mpkg_rpm_wce.sh                        |  2 +-
 harbour/mpkg_rpm_win.sh                        |  2 +-
 6 files changed, 14 insertions(+), 4 deletions(-)
 rename harbour/{harbour-wce-spec => harbour-wce.spec} (100%)
 rename harbour/{harbour-win-spec => harbour-win.spec} (100%)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 896567bc64..25b867af7a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-27 11:23 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * mpkg_rpm_win.sh
+  - harbour-win-spec
+  + harbour-win.spec
+  * mpkg_rpm_wce.sh
+  - harbour-wce-spec
+  + harbour-wce.spec
+    * Renamed to have standard extension.
+
+  * config/postinst.hbs
+    - Deleted detection for no longer existing Linux distros.
+
 2010-07-27 11:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * external/sqlite3/sqlite3.c
   * external/sqlite3/sqlite3.dif
diff --git a/harbour/config/postinst.hbs b/harbour/config/postinst.hbs
index 582bb14f7d..0b49e5ebcf 100644
--- a/harbour/config/postinst.hbs
+++ b/harbour/config/postinst.hbs
@@ -402,8 +402,6 @@ STATIC FUNCTION unix_name()
    CASE ! Empty( tmp := query_rpm( "fedora-release"      , "fc"  ) ) ; RETURN tmp
    CASE ! Empty( tmp := query_rpm( "suse-release"        , "sus" ) ) ; RETURN tmp
    CASE ! Empty( tmp := query_rpm( "openSUSE-release"    , "sus" ) ) ; RETURN tmp
-   CASE ! Empty( tmp := query_rpm( "conectiva-release"   , "cl"  ) ) ; RETURN tmp
-   CASE ! Empty( tmp := query_rpm( "aurox-release"       , "cl"  ) ) ; RETURN tmp
    /* TODO: Rewrite this in Harbour */
    CASE hb_FileExists( "/etc/pld-release" )
       RETURN "" /* cat /etc/pld-release|sed -e '/1/ !d' -e 's/[^0-9]//g' -e 's/^/pld/'` */
diff --git a/harbour/harbour-wce-spec b/harbour/harbour-wce.spec
similarity index 100%
rename from harbour/harbour-wce-spec
rename to harbour/harbour-wce.spec
diff --git a/harbour/harbour-win-spec b/harbour/harbour-win.spec
similarity index 100%
rename from harbour/harbour-win-spec
rename to harbour/harbour-win.spec
diff --git a/harbour/mpkg_rpm_wce.sh b/harbour/mpkg_rpm_wce.sh
index c02ee300ec..96644e655f 100755
--- a/harbour/mpkg_rpm_wce.sh
+++ b/harbour/mpkg_rpm_wce.sh
@@ -90,7 +90,7 @@ then
       mv ${hb_filename} ${RPMDIR}/SOURCES/
       sed -e "s/^%define version .*$/%define version   ${hb_ver}/g" \
           -e "s/^%define releasen .*$/%define releasen  ${hb_verstat}/g" \
-         harbour-wce-spec > ${RPMDIR}/SPECS/harbour-wce.spec
+         harbour-wce.spec > ${RPMDIR}/SPECS/harbour-wce.spec
       if which rpmbuild >/dev/null 2>&1
       then
          RPMBLD="rpmbuild"
diff --git a/harbour/mpkg_rpm_win.sh b/harbour/mpkg_rpm_win.sh
index 27739cc9ea..d977c12b1f 100755
--- a/harbour/mpkg_rpm_win.sh
+++ b/harbour/mpkg_rpm_win.sh
@@ -114,7 +114,7 @@ then
           -e "s|^%define releasen .*$|%define releasen  ${hb_verstat}|g" \
           -e "s|^%define hb_ccpath .*$|%define hb_ccpath ${HB_CCPATH}|g" \
           -e "s|^%define hb_ccpref .*$|%define hb_ccpref ${HB_CCPREFIX}|g" \
-         harbour-win-spec > ${RPMDIR}/SPECS/harbour-win.spec
+         harbour-win.spec > ${RPMDIR}/SPECS/harbour-win.spec
       if which rpmbuild >/dev/null 2>&1
       then
          RPMBLD="rpmbuild"