diff options
| author | François Andriot <albator78@libertysurf.fr> | 2016-11-05 16:39:16 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2016-11-05 16:39:16 +0100 |
| commit | 32640119f4844b4809df8736e585b6e7c371683d (patch) | |
| tree | 2e4a0c08b64c60ad98598eb911dd5d52a2289fa3 | |
| parent | cf7c46d01b7655f38b14f7dbe6e2e9813d3b9f83 (diff) | |
| download | tde-packaging-32640119f4844b4809df8736e585b6e7c371683d.tar.gz tde-packaging-32640119f4844b4809df8736e585b6e7c371683d.zip | |
RPM packaging: update build scripts
| -rw-r--r-- | redhat/Makefile.r14 | 8 | ||||
| -rwxr-xr-x | redhat/build/get_rpm_package_name.sh | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 16782ac2a..f23536467 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -106,7 +106,7 @@ tdegames: tdebase tdemultimedia tdegraphics: tdebase poppler cmake lcms $(call buildpkg,main/tdegraphics) -tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem libart_lgpl +tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem libart_lgpl file $(call buildpkg,main/tdelibs) tdemultimedia: tdebase akode @@ -164,6 +164,12 @@ ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7* /boot/vmlinuz*.fc23*) $(call buildpkg,3rdparty/esound) endif +file: +# Build on CentOS 5 +ifneq ($(wildcard /boot/vmlinuz*.el5*),) + $(call buildpkg,3rdparty/file) +endif + gnuchess: # Build on CentOS 5, CentOS 7 ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),) diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index e84d99de2..ca8303ae2 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -75,8 +75,8 @@ echo "${PREFIX}${PKGRUNTIME}" if [ -n "${DEVEL}" ]; then # Check if development package is required. case "${PKGCATEGORY}" in - # Applications do NOT have 'devel' package, except K3B. - "applications") if [ "${PKGNAME}" != "k3b" ]; then exit 0; fi;; + # Applications do NOT have 'devel' package, except K3B, Koffice. + "applications") if [ "${PKGNAME}" != "k3b" ] && [ "${PKGNAME}" != "koffice" ]; then exit 0; fi;; # Extras packages do NOT have 'devel' package, except Akode "extras") if [ "${PKGNAME}" != "akode" ] && [ "${PKGNAME}" != "hk_classes" ]; then exit 0; fi;; esac |