diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2015-03-20 07:55:09 +0100 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2015-03-20 07:55:09 +0100 |
| commit | bbee322fcd79831b42a61cbc8eb65042fe845c78 (patch) | |
| tree | 7b85849f402aa6e34cb0b50890a7b68a769eab7a | |
| parent | 622bfba690b065143ed476e0cf582dbd74265b2d (diff) | |
| download | pgfuse-bbee322fcd79831b42a61cbc8eb65042fe845c78.tar.gz pgfuse-bbee322fcd79831b42a61cbc8eb65042fe845c78.tar.bz2 | |
some more build fixes
| -rw-r--r-- | redhat/pgfuse.spec | 27 | ||||
| -rwxr-xr-x | tools/deploy_to_osc.sh | 2 |
2 files changed, 18 insertions, 11 deletions
diff --git a/redhat/pgfuse.spec b/redhat/pgfuse.spec index 2aab6e6..2a4a475 100644 --- a/redhat/pgfuse.spec +++ b/redhat/pgfuse.spec @@ -5,6 +5,7 @@ %define rhel 0 %define rhel5 0 %define rhel6 0 +%define rhel7 0 %if 0%{?rhel_version} >= 500 && 0%{?rhel_version} <= 599 %define dist rhel5 %define rhel 1 @@ -15,42 +16,46 @@ %define rhel 1 %define rhel6 1 %endif +%if 0%{?rhel_version} >= 700 && 0%{?rhel_version} <= 799 +%define dist rhel7 +%define rhel 1 +%define rhel7 1 +%endif %define centos 0 +%define centos5 0 +%define centos6 0 +%define centos7 0 %if 0%{?centos_version} >= 500 && 0%{?centos_version} <= 599 %define dist centos5 %define centos 1 -%define rhel5 1 +%define centos5 1 %endif - %if 0%{?centos_version} >= 600 && 0%{?centos_version} <= 699 %define dist centos6 %define centos 1 -%define rhel6 1 +%define centos6 1 %endif - %if 0%{?centos_version} >= 700 && 0%{?centos_version} <= 799 %define dist centos7 %define centos 1 -%define rhel7 1 +%define centos7 1 %endif %define scilin 0 %define scilin5 0 +%define scilin6 0 +%define scilin7 0 %if 0%{?scilin_version} >= 500 && 0%{?scilin_version} <= 599 %define dist scilin5 %define scilin 1 %define scilin5 1 %endif - -%define scilin6 0 %if 0%{?scilin_version} >= 600 && 0%{?scilin_version} <= 699 %define dist scilin6 %define scilin 1 %define scilin6 1 %endif - -%define scilin7 0 %if 0%{?scilin_version} >= 700 && 0%{?scilin_version} <= 799 %define dist scilin7 %define scilin 1 @@ -129,7 +134,7 @@ %endif %if 0%{?suse_version} >= 1310 %define dist osu131 -%define osu122 1 +%define osu131 1 %define suse 1 %endif @@ -165,7 +170,7 @@ BuildRequires: pkg-config BuildRequires: gcc %if %{rhel} || %{centos} || %{fedora} || %{scilin} -%if %{rhel5} +%if %{rhel5} || %{centos5} || %{scilin5} BuildRequires: postgresql84-devel Requires: postgresql84-libs %else diff --git a/tools/deploy_to_osc.sh b/tools/deploy_to_osc.sh index 9de3294..075b2d8 100755 --- a/tools/deploy_to_osc.sh +++ b/tools/deploy_to_osc.sh @@ -14,3 +14,5 @@ CHKSUM=`md5sum $OSC_HOME/${PACKAGE_NAME}_${PACKAGE_VERSION}.tar.gz | cut -f 1 - cat tools/$PACKAGE_NAME.dsc > $OSC_HOME/$PACKAGE_NAME.dsc echo " $CHKSUM $SIZE ${PACKAGE_NAME}_${PACKAGE_VERSION}.tar.gz" >> $OSC_HOME/$PACKAGE_NAME.dsc + +echo "md5sums=('$CHKSUM')" >> $OSC_HOME/PKGBUILD |