diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-11-09 12:54:35 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-11-09 12:54:35 +0100 |
| commit | a3bdc3b32bcb585ff9786e727bd8d47917ba3c10 (patch) | |
| tree | 5da21e4e0bdcc029a5b4a0cf4ae26ff4d300f5e1 /redhat/Makefile.r14 | |
| parent | e25e5dfb46bcbb9327349620eca4da0a9538bf0d (diff) | |
| download | tde-packaging-a3bdc3b32bcb585ff9786e727bd8d47917ba3c10.tar.gz tde-packaging-a3bdc3b32bcb585ff9786e727bd8d47917ba3c10.zip | |
RPM packaging: update build scripts
Diffstat (limited to 'redhat/Makefile.r14')
| -rw-r--r-- | redhat/Makefile.r14 | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 93fc99db5..cf00b4eb3 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -74,58 +74,58 @@ tqtinterface: tqt3 cmake # Main packages tdeaccessibility: tdebase tdemultimedia - $(call buildpkg,tdeaccessibility) + $(call buildpkg,main/tdeaccessibility) tdeaddons: tdebase tdegames tdemultimedia tdenetwork tdepim - $(call buildpkg,tdeaddons) + $(call buildpkg,main/tdeaddons) tdeadmin: tdebase - $(call buildpkg,tdeadmin) + $(call buildpkg,main/tdeadmin) tdeartwork: tdebase - $(call buildpkg,tdeartwork) + $(call buildpkg,main/tdeartwork) tdebase: tdelibs cmake htdig fileshareset libconfig - $(call buildpkg,tdebase) + $(call buildpkg,main/tdebase) tdebindings: tdebase tqscintilla - $(call buildpkg,tdebindings) + $(call buildpkg,main/tdebindings) tdeedu: tdebase - $(call buildpkg,tdeedu) + $(call buildpkg,main/tdeedu) tdegames: tdebase tdemultimedia - $(call buildpkg,tdegames) + $(call buildpkg,main/tdegames) tdegraphics: tdebase poppler cmake - $(call buildpkg,tdegraphics) + $(call buildpkg,main/tdegraphics) tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem libart_lgpl - $(call buildpkg,tdelibs) + $(call buildpkg,main/tdelibs) tdemultimedia: tdebase akode - $(call buildpkg,tdemultimedia) + $(call buildpkg,main/tdemultimedia) tdenetwork: tdebase - $(call buildpkg,tdenetwork) + $(call buildpkg,main/tdenetwork) tdepim: tdebase libcaldav libcarddav cmake - $(call buildpkg,tdepim) + $(call buildpkg,main/tdepim) tdesdk: tdebase tdebindings cmake - $(call buildpkg,tdesdk) + $(call buildpkg,main/tdesdk) tdetoys: tdebase - $(call buildpkg,tdetoys) + $(call buildpkg,main/tdetoys) tdeutils: tdebase - $(call buildpkg,tdeutils) + $(call buildpkg,main/tdeutils) tdevelop: tdebase tdesdk cmake - $(call buildpkg,tdevelop) + $(call buildpkg,main/tdevelop) tdewebdev: tdebase tdesdk - $(call buildpkg,tdewebdev) + $(call buildpkg,main/tdewebdev) ### 3rd party libraries and tools autoconf: m4 @@ -218,8 +218,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el6*),) endif pcsc-perl: -# Build on CentOS and openSUSE only -ifneq ($(wildcard /etc/centos-release /etc/SuSE-release /boot/vmlinuz*.el5*),) +# Build on CentOS +ifneq ($(wildcard /etc/centos-release /boot/vmlinuz*.el5*),) $(call buildpkg,3rdparty/pcsc-perl) endif @@ -563,7 +563,7 @@ endif rosegarden: tdebase lilypond # Do NOT build on CentOS 5, CentOS 7 -ifeq ($(wildcard /boot/vmlinuz*.el5*),) +ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),) $(call buildpkg,applications/rosegarden) endif |