RPM: update for opensuse tumbleweed

Signed-off-by: François Andriot <albator78@libertysurf.fr>
pull/104/head
François Andriot 3 years ago
parent 95b9a3f964
commit 1140c7d6f5

@ -426,7 +426,7 @@ kpicosim: tdebase
$(call buildpkg,applications/kpicosim)
kpilot: tdebase tdepim
ifeq (,$(filter $(DIST),.el5))
ifeq (,$(filter $(DIST),.el5 .osstw))
$(call buildpkg,applications/kpilot)
endif

@ -40,7 +40,12 @@ Summary: Frontend for clamav
Version: 0.46
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
License: GPLv2+
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
Group: Applications/Utilities
Vendor: Trinity Project

@ -119,7 +119,7 @@ export PATH="%{tde_bindir}:${PATH}"
%doc AUTHORS COPYING README
%{tde_bindir}/mathemagics
%{tde_tdeappdir}/mathemagics.desktop
%{tde_datadir}/apps/mathemagics/mathemagicsui.rc
%{tde_datadir}/apps/mathemagics/
%{tde_datadir}/icons/hicolor/22x22/apps/mathemagics.png
%{tde_datadir}/icons/hicolor/32x32/apps/mathemagics.png
%{tde_datadir}/icons/hicolor/48x48/apps/mathemagics.png

@ -13,11 +13,24 @@ pkg_version="$(rpm -qp --qf "%{version}" "${RPM}")"
pkg_release="$(rpm -qp --qf "%{release}" "${RPM}")"
# Application packages: version does not match TDE version
if [[ "${pkg_release}" =~ _0_ ]] || [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then
eval VERSION="${pkg_release/_0_/\~}"
if [[ "${pkg_release}" =~ ^0_ ]]; then
# Preversion
if [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then
# Likely application package
eval VERSION="${pkg_release/0_/\~}"
else
# Likely core package
eval VERSION="${pkg_version}${pkg_release/0_/\~}"
fi
else
# Base package (tdelibs ...)
eval VERSION="${pkg_version}_${pkg_release/0_/\~}"
# Stable version
if [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then
# Likely application package
eval VERSION="${pkg_release/_*/}"
else
# Likely core package
eval VERSION="${pkg_version}"
fi
fi
VERSION="${VERSION%.opt}" # Remove '.opt' suffix

@ -32,14 +32,20 @@ sudo zypper --root "${INSTALLROOT}" \
sudo setarch i686 zypper --root "${INSTALLROOT}" \
install --download-only -y \
bash \
docbook-utils \
filesystem \
gawk \
glibc \
glibc-extra \
grep \
gzip \
libpcre1 \
libselinux1 \
openSUSE-release \
system-user-root \
util-linux vim \
xz \
zlib \
zypper
sudo rpm -Uvh --root "${INSTALLROOT}" "${INSTALLROOT}/var/cache/zypp/packages/oss/"*"/"*".rpm"

@ -172,6 +172,7 @@ python3-sip-devel
recode
rpcgen
rpm-build
rpmlint
rsvg-convert
ruby
ruby-devel

@ -111,7 +111,6 @@ libofx-devel
libopenssl-devel
libotr-devel
libpaper-devel
libpisock-devel
libpng16-devel
libpoppler-devel
libpqxx-devel

@ -97,7 +97,7 @@ chmod 0755 "%{?buildroot}%{_bindir}/fileshareset"
# Rename binary to avoid conflict with kde3
mv "%{?buildroot}%{_bindir}/fileshareset" "%{?buildroot}%{_bindir}/fileshareset2"
ln -sf "fileshareset2" "%{?buildroot}%{_bindir}/filesharelist"
%clean

Loading…
Cancel
Save