diff options
| -rw-r--r-- | redhat/Makefile | 2 | ||||
| -rw-r--r-- | redhat/applications/klamav/klamav.spec | 7 | ||||
| -rw-r--r-- | redhat/applications/mathemagics/mathemagics.spec | 2 | ||||
| -rwxr-xr-x | redhat/build/get_latest_built_package_version.sh | 21 | ||||
| -rwxr-xr-x | redhat/docker/opensuse32.sh | 6 | ||||
| -rw-r--r-- | redhat/docker/oss153/packages | 1 | ||||
| -rw-r--r-- | redhat/docker/osstw/packages | 1 | ||||
| -rw-r--r-- | redhat/extras/fileshareset/fileshareset.spec | 2 |
8 files changed, 33 insertions, 9 deletions
diff --git a/redhat/Makefile b/redhat/Makefile index be407f043..bf7fb4822 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -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 diff --git a/redhat/applications/klamav/klamav.spec b/redhat/applications/klamav/klamav.spec index 45a506ee6..7b4846d9e 100644 --- a/redhat/applications/klamav/klamav.spec +++ b/redhat/applications/klamav/klamav.spec @@ -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 diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/mathemagics/mathemagics.spec index a770cf090..fb610a949 100644 --- a/redhat/applications/mathemagics/mathemagics.spec +++ b/redhat/applications/mathemagics/mathemagics.spec @@ -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 diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh index c0dd53c02..06a150913 100755 --- a/redhat/build/get_latest_built_package_version.sh +++ b/redhat/build/get_latest_built_package_version.sh @@ -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 diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh index f2d686df5..1a78e6340 100755 --- a/redhat/docker/opensuse32.sh +++ b/redhat/docker/opensuse32.sh @@ -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" diff --git a/redhat/docker/oss153/packages b/redhat/docker/oss153/packages index 70b135dd7..800b1e17b 100644 --- a/redhat/docker/oss153/packages +++ b/redhat/docker/oss153/packages @@ -172,6 +172,7 @@ python3-sip-devel recode rpcgen rpm-build +rpmlint rsvg-convert ruby ruby-devel diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index 623129a61..8a8f664f1 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -111,7 +111,6 @@ libofx-devel libopenssl-devel libotr-devel libpaper-devel -libpisock-devel libpng16-devel libpoppler-devel libpqxx-devel diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec index f445562fc..2470b3412 100644 --- a/redhat/extras/fileshareset/fileshareset.spec +++ b/redhat/extras/fileshareset/fileshareset.spec @@ -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 |