Branch: master

d7f4f94a 2016-10-09 07:29:20 François Andriot
RPM packaging: update build scripts
M redhat/build/rpmdist.sh
M redhat/buildenv.sh
diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh
index 81f0774..ec4735d 100755
--- a/redhat/build/rpmdist.sh
+++ b/redhat/build/rpmdist.sh
@@ -7,7 +7,7 @@
 
 if [ -r /etc/redhat-release ]; then
   read a b c d e f g < /etc/redhat-release
-elif [ -r /etc/SuSE-release ]; then
+elif [ -r /etc/SuSE-release ] || grep -qw "ID=opensuse" "/etc/os-release"; then
   a="opensuse"
 fi
 
@@ -39,7 +39,11 @@
   Fedora*) FEDORA="${c}"; DIST=".fc${FEDORA}";;
   # Opensuse
   opensuse)
-    DIST=".oss$((read l; read a b c; echo ${c//./}) </etc/SuSE-release)"
+    if [ -r "/etc/SuSE-release" ]; then
+      DIST=".oss$((read l; read a b c; echo ${c//./}) </etc/SuSE-release)"
+    else
+      DIST=".oss"
+    fi
   ;;
   # PCLinuxOS
   PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos${c}";;
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index 2f82a1a..4b8e8e9 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -28,7 +28,7 @@
   export TDE_COMPRESS=gzip
 fi
 alias tdep3='(rm -rf ~/tde/tde-tarballs/3.5.13.2; cd ~/tde/tde_v3.5.13-sru; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)'
-alias tdep4='(rm -rf ${TDE_TARBALLS}; cd ${TDE_GITBASESRC}; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)'
+alias tdep4='(cd ${TDE_GITBASESRC}; export SUFFIX=0; export COMPRESS=${TDE_COMPRESS:-gzip}; export TDE_REBRAND=1; ./scripts/create_all_tarballs)'
 
 # Build a single package
 alias cdp='cd ~/tde/tde-packaging/redhat'
5625c249 2016-10-09 07:29:52 François Andriot
RPM packaging: fix tqtinterface build on opensuse tumbleweed
M redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 1dbfd75..181529f 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -80,7 +80,7 @@
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
 BuildRequires:	pth-devel
 %endif
-%if 0%{?suse_version}
+%if 0%{?suse_version} && 0%{?suse_version} != 1330
 BuildRequires:	libpth-devel
 %endif