From 5c629b67a6aea976ea3250c440587f5a5e55d07c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 28 Jul 2010 12:05:43 +0000 Subject: [PATCH] 2010-07-28 14:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/postinst.hbs ! Synced mandriva linux distro abbrev with rpm .spec files. --- harbour/ChangeLog | 4 ++++ harbour/config/postinst.hbs | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e7b43d1cd2..eda0b88a60 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-28 14:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/postinst.hbs + ! Synced mandriva linux distro abbrev with rpm .spec files. + 2010-07-28 13:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * mpkg_rpm.sh - Deleted conectiva specific branch which apparently was never run. diff --git a/harbour/config/postinst.hbs b/harbour/config/postinst.hbs index 1983f37e5e..1602cf51bf 100644 --- a/harbour/config/postinst.hbs +++ b/harbour/config/postinst.hbs @@ -433,8 +433,8 @@ STATIC FUNCTION unix_name() DO CASE CASE GetEnv( "HB_PLATFORM" ) == "dos" ; RETURN "djgpp" CASE GetEnv( "HB_PLATFORM" ) == "win" ; RETURN GetEnv( "HB_COMPILER" ) - CASE ! Empty( tmp := query_rpm( "mandriva-release-One", "mdk" ) ) ; RETURN tmp - CASE ! Empty( tmp := query_rpm( "mandriva-release" , "mdk" ) ) ; RETURN tmp + CASE ! Empty( tmp := query_rpm( "mandriva-release-One", "mdv" ) ) ; RETURN tmp + CASE ! Empty( tmp := query_rpm( "mandriva-release" , "mdv" ) ) ; RETURN tmp CASE ! Empty( tmp := query_rpm( "mandrake-release" , "mdk" ) ) ; RETURN tmp CASE ! Empty( tmp := query_rpm( "redhat-release" , "rh" ) ) ; RETURN tmp CASE ! Empty( tmp := query_rpm( "fedora-release" , "fc" ) ) ; RETURN tmp