diff options
| author | François Andriot <albator78@libertysurf.fr> | 2018-05-13 13:33:36 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2018-05-13 13:34:18 +0200 |
| commit | 35859abe41040ab12ea19636471ec6fc0e7686e2 (patch) | |
| tree | 2997b9547715e9711ea22ae615d20316c6a4e53a /redhat/build | |
| parent | 9512efc10de55c5689f398107df14ae96670932e (diff) | |
| download | tde-packaging-35859abe41040ab12ea19636471ec6fc0e7686e2.tar.gz tde-packaging-35859abe41040ab12ea19636471ec6fc0e7686e2.zip | |
RPM packaging: updates for Fedora 28 / OpenSUSE 15.0
Diffstat (limited to 'redhat/build')
| -rwxr-xr-x | redhat/build/get_rpm_package_name.sh | 4 | ||||
| -rwxr-xr-x | redhat/build/rpmdist.sh | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 06fafb695..222e0a2ea 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -24,7 +24,7 @@ case "${PKGNAME}" in # Most TDE libraries have no prefix #"libkdcraw") PREFIX="";; # 3rd party dependencies - "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdiff-backup"|"sword"|"tar") PREFIX="";; + "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";; # Extra build stuff "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";; # Other @@ -85,7 +85,7 @@ if [ -n "${DEVEL}" ]; then # Some other packags NOT having development package case "${PKGNAME}" in - "autoconf"|"automake"|"cmake"|"cscope"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdiff-backup"|"torsocks") exit 0;; + "autoconf"|"automake"|"cmake"|"cscope"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdesktop"|"recode"|"rdiff-backup"|"torsocks") exit 0;; "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl"|"kipi-plugins") exit 0;; esac diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh index ec4735d30..16d1468a4 100755 --- a/redhat/build/rpmdist.sh +++ b/redhat/build/rpmdist.sh @@ -7,7 +7,7 @@ DIST="" if [ -r /etc/redhat-release ]; then read a b c d e f g < /etc/redhat-release -elif [ -r /etc/SuSE-release ] || grep -qw "ID=opensuse" "/etc/os-release"; then +elif [ -r /etc/SuSE-release ] || [ -r /etc/SUSE-brand ] || grep -qw "ID=opensuse" "/etc/os-release"; then a="opensuse" fi @@ -41,6 +41,8 @@ case $a in opensuse) if [ -r "/etc/SuSE-release" ]; then DIST=".oss$((read l; read a b c; echo ${c//./}) </etc/SuSE-release)" + elif [ -r "/etc/SUSE-brand" ]; then + DIST=".oss$((read a; read a b c; echo ${c//./}) </etc/SUSE-brand)" else DIST=".oss" fi |