fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #37 from raphaelgz/pr/improve_rpm_package_name

Browse Source 
Improve RPM package name
This commit is contained in:
druzus
2014-01-30 23:13:08 -08:00
parent d0b300467d b1357de429
commit e82806cc1b
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog.txt
View File

@@ -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

15
package/harbour.spec
View File

@@ -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/