| 253fbb24 | 2014-07-20 06:25:02 | François Andriot |
RPM Packaging: update build scripts |
||
|
M redhat/Makefile.r14 M redhat/Makefile.v3.5.13-sru M redhat/build/get_installed_package_version.sh M redhat/build/get_latest_built_package_version.sh M redhat/build/update_repository.sh M redhat/buildenv.sh M redhat/packages.el7 M redhat/packages.mga4 |
||
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 2f8826c..4c24c2a 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -139,25 +139,25 @@ cmake: # Build on CentOS only -ifneq ($(wildcard /etc/centos-release /boot/vmlinuz*.el5*),) +ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) $(call buildpkg,3rdparty/cmake) endif esound: -# Build on Mageia only -ifneq ($(wildcard /etc/mageia-release),) +# Build on Mageia and CentOS >= 7 +ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) $(call buildpkg,3rdparty/esound) endif gnuchess: -# Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +# Build on CentOS 5, CentOS 7 +ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),) $(call buildpkg,3rdparty/gnuchess) endif htdig: -# build on Mageia only -ifneq ($(wildcard /etc/mageia-release),) +# build on Mageia, and CentOS >= 7 +ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) $(call buildpkg,3rdparty/htdig) endif @@ -178,8 +178,8 @@ endif libotr3: -# Build on Mageia only -ifneq ($(wildcard /etc/mageia-release),) +# Build on Mageia, CentOS >= 7 +ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) $(call buildpkg,3rdparty/libotr3) endif @@ -190,8 +190,8 @@ endif lilypond: mftrace -# Build on CentOS only -ifneq ($(wildcard /etc/centos-release),) +# Build on CentOS 6 only +ifneq ($(wildcard /boot/vmlinuz*.el6*),) $(call buildpkg,3rdparty/lilypond) endif @@ -202,8 +202,8 @@ endif mftrace: -# Build on CentOS only -ifneq ($(wildcard /etc/centos-release),) +# Build on CentOS 6 only +ifneq ($(wildcard /boot/vmlinuz*.el6*),) $(call buildpkg,3rdparty/mftrace) endif @@ -229,8 +229,8 @@ endif sword: -# Build on Fedora >= 20 only, or PCLinuxOS -ifneq ($(wildcard /boot/vmlinuz*.fc20* /etc/pclinuxos-release),) +# Build on Fedora >= 20, PCLinuxOS, CentOS >= 7 +ifneq ($(wildcard /boot/vmlinuz*.fc20* /etc/pclinuxos-release /boot/vmlinuz*.el7*),) $(call buildpkg,3rdparty/sword) endif @@ -413,8 +413,10 @@ kgtk-qt3: tdebase # Do NOT build on CentOS 5 (GTK2 is too old) +# Do NOT build on CentOS >=7 (GTK2 is too new) # Do NOT build on Fedora >= 20 (GTK2 is too new) -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.fc20*),) +# Do NOT build on Mageia >= 4 (GTK2 is too new) +ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc20* /boot/vmlinuz*.mga4*),) $(call buildpkg,applications/kgtk-qt3) endif @@ -472,14 +474,14 @@ konversation: tdebase $(call buildpkg,applications/konversation) -kopete-otr: tdebase +kopete-otr: tdebase libotr3 $(call buildpkg,applications/kopete-otr) kpicosim: tdebase $(call buildpkg,applications/kpicosim) kpilot: tdebase -# Do NOT build on CentOS 5 +# Do NOT build on CentOS 5 (pilot-link library is too old) ifeq ($(wildcard /boot/vmlinuz*.el5*),) $(call buildpkg,applications/kpilot) endif @@ -554,8 +556,8 @@ endif rosegarden: tdebase lilypond -# Do NOT build on CentOS 5 -ifeq ($(wildcard /boot/vmlinuz*.el5*),) +# Do NOT build on CentOS 5, CentOS 7 +ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),) $(call buildpkg,applications/rosegarden) endif @@ -596,7 +598,10 @@ $(call buildpkg,applications/tdepowersave) tderadio: tdebase +# Do NOT build on CentOS 7 +ifeq ($(wildcard /boot/vmlinuz*.el7*),) $(call buildpkg,applications/tderadio) +endif tde-style-lipstik: tdebase $(call buildpkg,applications/tde-style-lipstik) diff --git a/redhat/Makefile.v3.5.13-sru b/redhat/Makefile.v3.5.13-sru index c3ad3e7..ecce678 100644 --- a/redhat/Makefile.v3.5.13-sru +++ b/redhat/Makefile.v3.5.13-sru @@ -27,22 +27,22 @@ ### Trinity Dependencies -arts: tqtinterface esound +arts: tqtinterface esound cmake $(call buildpkg,dependencies/arts) avahi-tqt: tqtinterface $(call buildpkg,dependencies/avahi-tqt) -dbus-1-tqt: tqtinterface +dbus-1-tqt: tqtinterface cmake $(call buildpkg,dependencies/dbus-1-tqt) -dbus-tqt: tqtinterface +dbus-tqt: tqtinterface cmake $(call buildpkg,dependencies/dbus-tqt) -libcaldav: tqtinterface libcurl +libcaldav: tqtinterface autoconf libcurl $(call buildpkg,dependencies/libcaldav) -libcarddav: tqtinterface libcurl +libcarddav: tqtinterface autoconf libcurl $(call buildpkg,dependencies/libcarddav) tqca: tqtinterface @@ -54,7 +54,7 @@ qt3: esound $(call buildpkg,dependencies/qt3) -tqtinterface: qt3 +tqtinterface: qt3 cmake $(call buildpkg,dependencies/tqtinterface) # Main packages @@ -70,7 +70,7 @@ tdeartwork: tdebase $(call buildpkg,tdeartwork) -tdebase: tdelibs htdig hal +tdebase: tdelibs htdig cmake hal $(call buildpkg,tdebase) tdebindings: tdebase @@ -82,10 +82,10 @@ tdegames: tdebase tdemultimedia $(call buildpkg,tdegames) -tdegraphics: tdebase poppler +tdegraphics: tdebase poppler cmake $(call buildpkg,tdegraphics) -tdelibs: qt3 tqtinterface arts dbus-tqt dbus-1-tqt +tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake $(call buildpkg,tdelibs) tdemultimedia: tdebase akode @@ -94,10 +94,10 @@ tdenetwork: tdebase $(call buildpkg,tdenetwork) -tdepim: tdebase libcaldav libcarddav +tdepim: tdebase libcaldav libcarddav cmake $(call buildpkg,tdepim) -tdesdk: tdebase tdebindings +tdesdk: tdebase tdebindings cmake $(call buildpkg,tdesdk) tdetoys: tdebase @@ -106,13 +106,31 @@ tdeutils: tdebase $(call buildpkg,tdeutils) -tdevelop: tdebase tdesdk +tdevelop: tdebase tdesdk cmake $(call buildpkg,tdevelop) tdewebdev: tdebase tdesdk $(call buildpkg,tdewebdev) ### 3rd party libraries and tools +autoconf: m4 +# Build on CentOS 5 only +ifneq ($(wildcard /boot/vmlinuz*.el5*),) + $(call buildpkg,3rdparty/autoconf) +endif + +automake: +# Build on CentOS 5 only +ifneq ($(wildcard /boot/vmlinuz*.el5*),) + $(call buildpkg,3rdparty/automake) +endif + +cmake: +# Build on CentOS only +ifneq ($(wildcard /etc/centos-release /boot/vmlinuz*.el5*),) + $(call buildpkg,3rdparty/cmake) +endif + esound: # Build on Mageia and CentOS >= 7 ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) @@ -153,7 +171,7 @@ endif endif -libcurl: +libcurl: automake libtool # Build on CentOS 5 only ifneq ($(wildcard /boot/vmlinuz*.el5*),) $(call buildpkg,3rdparty/curl) ** Diff limit reached (max: 250 lines) ** |
||
| 101428a4 | 2014-07-20 06:25:08 | François Andriot |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging |
||
|
M debian/lenny/applications/tde-guidance/debian/control M debian/lenny/applications/tde-guidance/debian/guidance-backends-trinity.install M debian/lenny/applications/tde-guidance/debian/rules M debian/lenny/applications/tde-guidance/debian/tde-guidance-trinity.install M debian/squeeze/applications/tde-guidance/debian/control M debian/squeeze/applications/tde-guidance/debian/guidance-backends-trinity.install M debian/squeeze/applications/tde-guidance/debian/rules M debian/squeeze/applications/tde-guidance/debian/tde-guidance-trinity.install M ubuntu/maverick/applications/tde-guidance/debian/control M ubuntu/maverick/applications/tde-guidance/debian/guidance-backends-trinity.install M ubuntu/maverick/applications/tde-guidance/debian/rules M ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.install R debian/lenny/applications/tde-guidance/debian/dirs R debian/lenny/applications/tde-guidance/debian/displayconfig-trinity.1 R debian/lenny/applications/tde-guidance/debian/tde-guidance-trinity.init R debian/squeeze/applications/tde-guidance/debian/dirs R debian/squeeze/applications/tde-guidance/debian/displayconfig-trinity.1 R debian/squeeze/applications/tde-guidance/debian/tde-guidance-trinity.init R ubuntu/maverick/applications/tde-guidance/debian/dirs R ubuntu/maverick/applications/tde-guidance/debian/displayconfig-trinity.1 R ubuntu/maverick/applications/tde-guidance/debian/tde-guidance-trinity.init |
||
** Diff limit reached (max: 250 lines) ** |
||
| a7609c87 | 2014-07-20 06:27:19 | François Andriot |
RPM packaging: minor tdebase update |
||
|
M redhat/tdebase/tdebase-3.5.13.2.spec |
||
** Diff limit reached (max: 250 lines) ** |
||
| e07b6bd3 | 2014-07-20 06:29:57 | François Andriot |
RPM Packaging: update R14 packages |
||
|
M redhat/applications/tde-guidance/tde-guidance-14.0.0.spec M redhat/dependencies/sip4-tqt/sip4-tqt.spec M redhat/dependencies/tqt3/tqt3-14.0.0.spec M redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec M redhat/tdebase/tdebase-14.0.0.spec M redhat/tdelibs/tdelibs-14.0.0.spec M redhat/tdenetwork/tdenetwork-14.0.0.spec |
||
** Diff limit reached (max: 250 lines) ** |
||