RPM packaging: update build scripts

3 files changed, 21 insertions, 10 deletions

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index cc299d719..662c49e62 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -26,14 +26,14 @@ main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim td
 libraries:	libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
 applications:	abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knmap knowit knutclient koffice konversation kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
 i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-extras:	icons-nuvola kdevmon kdissert klamav kompose koverartist kpacman png2qrgb style-ia-ora
+extras:	icons-nuvola kdevmon kdissert klamav kompose koverartist kpacman mathemagics png2qrgb style-ia-ora
 
 
 ### Trinity Dependencies
 arts:	tqtinterface trinity-filesystem esound cmake
 	$(call buildpkg,dependencies/arts)
 
-avahi-tqt:	tqtinterface
+avahi-tqt:	tqtinterface autoconf automake libtool
 	$(call buildpkg,dependencies/avahi-tqt)
 
 dbus-1-tqt:	tqtinterface cmake
@@ -42,7 +42,7 @@ dbus-1-tqt:	tqtinterface cmake
 dbus-tqt: tqtinterface cmake
 	$(call buildpkg,dependencies/dbus-tqt)
 
-libart_lgpl:	tqtinterface
+libart_lgpl:	tqtinterface libtool
 	$(call buildpkg,dependencies/libart-lgpl)
 
 libcaldav: tqtinterface autoconf libcurl
@@ -85,7 +85,7 @@ tdeadmin:	tdebase
 tdeartwork:	tdebase
 	$(call buildpkg,tdeartwork)
 
-tdebase:	tdelibs cmake htdig fileshareset
+tdebase:	tdelibs cmake htdig fileshareset libconfig
 	$(call buildpkg,tdebase)
 
 tdebindings:	tdebase tqscintilla
@@ -100,7 +100,7 @@ tdegames:	tdebase tdemultimedia
 tdegraphics:	tdebase poppler cmake
 	$(call buildpkg,tdegraphics)
 
-tdelibs:	tqt3 tqtinterface trinity-filesystem arts dbus-tqt dbus-1-tqt cmake avahi-tqt
+tdelibs:	tqt3 tqtinterface trinity-filesystem arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset libart_lgpl
 	$(call buildpkg,tdelibs)
 
 tdemultimedia:	tdebase akode
@@ -141,9 +141,9 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 endif
 
 cmake:
-# Build on CentOS only
+# Build on CentOS 5/6 only
 ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
-#	$(call buildpkg,3rdparty/cmake)
+	$(call buildpkg,3rdparty/cmake)
 endif
 
 esound:
@@ -174,6 +174,13 @@ endif
 endif
 endif
 
+libconfig:
+# Build on CentOS 5 only
+ifneq ($(wildcard /boot/vmlinuz*.el5*),)
+	$(call buildpkg,3rdparty/libconfig)
+endif
+	
+
 libcurl: automake libtool
 # Build on CentOS 5 only
 ifneq ($(wildcard /boot/vmlinuz*.el5*),)
@@ -324,8 +331,8 @@ fusion-icon:	tdebase
 	$(call buildpkg,applications/fusion-icon)
 
 gtk3-tqt-engine:	tdebase
-# Do NOT build on CentOS
-ifeq ($(wildcard /etc/centos-release),)
+# Do NOT build on CentOS 5, CentOS 6
+ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
 	$(call buildpkg,applications/gtk3-tqt-engine)
 endif
 
@@ -683,6 +690,9 @@ koverartist:
 kpacman:
 	$(call buildpkg,extras/kpacman)
 
+mathemagics:
+	$(call buildpkg,extras/mathemagics)
+
 png2qrgb:
 	$(call buildpkg,extras/png2qrgb)
 
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 718efa648..12af765f4 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -67,6 +67,7 @@ rpmbuild -ba \
   --define "tde_version ${TDE_VERSION}" \
   --define "tde_prefix /opt/trinity" \
   --define "preversion ${PREVERSION:-}" \
+  --define "with_jack 1" \
   ${ARGS} \
   "${TEMPDIR}/${SPECFILE##*/}"
 RET=$?
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 507dc7665..18255e1a1 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -18,7 +18,7 @@ DEVEL="$2"
 # Some runtime packages are prefixed with 'trinity-', some are not.
 case "${PKGNAME}" in
   "trinity-"*|"qt3"|"tqt3"|"tqtinterface"|"python-qt3"|"esound"|"avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"fileshareset") PREFIX="";;
-  "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
+  "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
   "curl") PREFIX="trinity-lib";;
   *) PREFIX="trinity-";;
 esac