diff --git a/ChangeLog.txt b/ChangeLog.txt index 9b0b87587b..b50b8c1286 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,12 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2014-01-30 16:28 UTC-0200 Raphael Gozzo (raphaelgz users.noreply.github.com) + * package/harbour.spec + + Added detection of CentOS + * The package name was changed to follow these guidelines: + https://fedoraproject.org/wiki/Packaging:NamingGuidelines?rd=PackageNamingGuidelines#Non-Numeric_Version_in_Release + 2014-01-30 11:53 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/3rd/zlib/zutil.h ! removed not longer necessary hack for missing fdopen() function in diff --git a/package/harbour.spec b/package/harbour.spec index 05e4bd5217..4ee3bbbf5e 100644 --- a/package/harbour.spec +++ b/package/harbour.spec @@ -27,15 +27,21 @@ %define platform %(release=$(rpm -q --queryformat='%{VERSION}' mandriva-release-common 2>/dev/null) && echo "mdv$release"|tr -d ".") %if "%{platform}" == "" -%define platform %(release=$(rpm -q --queryformat='%{VERSION}' redhat-release 2>/dev/null) && echo "rh$release"|tr -d ".") -%if "%{platform}" == "" %define platform %(release=$(rpm -q --queryformat='%{VERSION}' fedora-release 2>/dev/null) && echo "fc$release"|tr -d ".") %if "%{platform}" == "" +%define platform %(release=$(rpm -q --queryformat='%{VERSION}' centos-release 2>/dev/null) && echo "el$release"|tr -d ".") +%if "%{platform}" == "" %define platform %(release=$(rpm -q --queryformat='%{VERSION}' suse-release 2>/dev/null) && echo "sus$release"|tr -d ".") %if "%{platform}" == "" %define platform %(release=$(rpm -q --queryformat='%{VERSION}' openSUSE-release 2>/dev/null) && echo "sus$release"|tr -d ".") %if "%{platform}" == "" +%define platform %(release=$(rpm -q --queryformat='%{VERSION}' redhat-release 2>/dev/null) && echo "rh$release"|tr -d ".") +%if "%{platform}" == "" %define platform %([ -f /etc/pld-release ] && cat /etc/pld-release|sed -e '/1/ !d' -e 's/[^0-9]//g' -e 's/^/pld/') +%if "%{platform}" == "" +%undefine platform +%endif +%endif %endif %endif %endif @@ -50,7 +56,8 @@ %define name harbour %define dname Harbour %define version 3.2.0 -%define releasen dev +%define releasen 0.1 +%define alphatag dev %define hb_etcdir /etc/%{name} %define hb_plat export HB_PLATFORM=linux %define hb_cc export HB_COMPILER=gcc @@ -87,7 +94,7 @@ Summary(ru): ????????? ??????????, ??????????? ? ?????? Clipper. Summary(hu): Szabad szoftver Clipper kompatibilis fordító Name: %{name} Version: %{version} -Release: %{releasen}%{platform} +Release: %{releasen}%{?alphatag:.%{alphatag}}%{?platform:.%{platform}} License: GPL (plus exception) Group: Development/Languages URL: http://harbour-project.org/