summaryrefslogtreecommitdiffstats
path: root/redhat/build
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-04-04 21:17:27 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-04-04 21:17:27 +0200
commit7b26da834f79b8b6eb2d8e99a1467ffea2791380 (patch)
treef26773747d20d14d82fe43fd5c245d2f9e803eee /redhat/build
parent61c9cb24d0d3319c8c800fabf1af8153dcabce2c (diff)
downloadtde-packaging-7b26da834f79b8b6eb2d8e99a1467ffea2791380.tar.gz
tde-packaging-7b26da834f79b8b6eb2d8e99a1467ffea2791380.zip
RPM Packaging: update build scripts
Diffstat (limited to 'redhat/build')
-rw-r--r--redhat/build/Makefile.r14593
-rw-r--r--redhat/build/Makefile.v3.5.13-sru506
-rwxr-xr-xredhat/build/build_rpm_package.sh2
-rwxr-xr-xredhat/build/configure_repository.sh22
-rwxr-xr-xredhat/build/get_latest_built_package_filename.sh19
-rwxr-xr-xredhat/build/get_latest_built_package_version.sh2
-rwxr-xr-xredhat/build/get_rpm_package_name.sh46
-rwxr-xr-xredhat/build/install_rpm_package.sh34
-rwxr-xr-xredhat/build/is_latest_package_built.sh2
-rwxr-xr-xredhat/build/is_latest_package_installed.sh2
-rwxr-xr-xredhat/build/update_repository.sh9
11 files changed, 99 insertions, 1138 deletions
diff --git a/redhat/build/Makefile.r14 b/redhat/build/Makefile.r14
deleted file mode 100644
index 281f96906..000000000
--- a/redhat/build/Makefile.r14
+++ /dev/null
@@ -1,593 +0,0 @@
-SHELL := /bin/bash
-PATH := $(PATH):$(shell pwd)
-
-buildpkg = \
- @echo "Now processing '$(1)' ."; \
- if ! is_latest_package_installed.sh "$(1)" 14.0.0; then \
- if ! is_latest_package_built.sh "$(1)" 14.0.0; then \
- echo " Building package."; \
- build_rpm_package.sh "$(1)" 14.0.0 || exit 1; \
- echo " Updating repository."; \
- update_repository.sh; \
- fi; \
- echo "Now installing package '$(1)'"; \
- install_rpm_package.sh "$(1)" || exit 2; \
- fi
-
-
-all: dependencies main libraries applications i18n meta
-dependencies: tqt3 tqtinterface arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt akode
-main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
-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
-
-
-# Dependencies
-arts: tqtinterface esound
- $(call buildpkg,dependencies/arts)
-
-avahi-tqt: tqtinterface
- $(call buildpkg,dependencies/avahi-tqt)
-
-dbus-1-tqt: tqtinterface
- $(call buildpkg,dependencies/dbus-1-tqt)
-
-dbus-tqt: tqtinterface
- $(call buildpkg,dependencies/dbus-tqt)
-
-libart_lgpl: tqtinterface
- $(call buildpkg,dependencies/libart-lgpl)
-
-libcaldav: tqtinterface libcurl
- $(call buildpkg,dependencies/libcaldav)
-
-libcarddav: tqtinterface
- $(call buildpkg,dependencies/libcarddav)
-
-python-tqt: sip4-tqt tdelibs
- $(call buildpkg,dependencies/python-tqt)
-
-sip4-tqt:
- $(call buildpkg,dependencies/sip4-tqt)
-
-tqca: tqtinterface
- $(call buildpkg,dependencies/tqca)
-
-tqca-tls: tqtinterface tqca
- $(call buildpkg,dependencies/tqca-tls)
-
-tqscintilla: tqca-tls tdelibs
- $(call buildpkg,dependencies/tqscintilla)
-
-tqt3:
- $(call buildpkg,dependencies/tqt3)
-
-tqtinterface: tqt3
- $(call buildpkg,dependencies/tqtinterface)
-
-# Main packages
-tdeaccessibility: tdebase tdemultimedia
- $(call buildpkg,tdeaccessibility)
-
-tdeaddons: tdebase tdegames tdemultimedia tdenetwork tdepim
- $(call buildpkg,tdeaddons)
-
-tdeadmin: tdebase
- $(call buildpkg,tdeadmin)
-
-tdeartwork: tdebase
- $(call buildpkg,tdeartwork)
-
-tdebase: tdelibs
- $(call buildpkg,tdebase)
-
-tdebindings: tdebase tqscintilla
- $(call buildpkg,tdebindings)
-
-tdeedu: tdebase
- $(call buildpkg,tdeedu)
-
-tdegames: tdebase tdemultimedia
- $(call buildpkg,tdegames)
-
-tdegraphics: tdebase poppler
- $(call buildpkg,tdegraphics)
-
-tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt
- $(call buildpkg,tdelibs)
-
-tdemultimedia: tdebase akode
- $(call buildpkg,tdemultimedia)
-
-tdenetwork: tdebase
- $(call buildpkg,tdenetwork)
-
-tdepim: tdebase libcaldav libcarddav
- $(call buildpkg,tdepim)
-
-tdesdk: tdebase tdebindings
- $(call buildpkg,tdesdk)
-
-tdetoys: tdebase
- $(call buildpkg,tdetoys)
-
-tdeutils: tdebase
- $(call buildpkg,tdeutils)
-
-tdevelop: tdebase tdesdk
- $(call buildpkg,tdevelop)
-
-tdewebdev: tdebase tdesdk
- $(call buildpkg,tdewebdev)
-
-# 3rd party libraries and tools
-esound:
-# Build on Mageia only
-ifneq ($(wildcard /etc/mageia-release),)
- $(call buildpkg,3rdparty/esound)
-endif
-
-htdig:
- $(call buildpkg,3rdparty/htdig)
-
-imlib1:
-# Do NOT build on Fedora / CentOS
-ifeq ($(wildcard /etc/fedora-release /etc/centos-release),)
- $(call buildpkg,3rdparty/imlib1)
-endif
-
-libcurl:
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/curl)
-endif
-
-libotr3:
-# Build on Mageia only
-ifneq ($(wildcard /etc/mageia-release),)
- $(call buildpkg,3rdparty/libotr3)
-endif
-
-lilypond: mftrace
-# Build on CentOS only
-ifneq ($(wildcard /etc/centos-release),)
- $(call buildpkg,3rdparty/lilypond)
-endif
-
-mftrace:
-# Build on CentOS only
-ifneq ($(wildcard /etc/centos-release),)
- $(call buildpkg,3rdparty/mftrace)
-endif
-
-pcsc-perl:
-# Build on CentOS and openSUSE only
-ifneq ($(wildcard /etc/centos-release /etc/SuSE-release),)
- $(call buildpkg,3rdparty/pcsc-perl)
-endif
-
-poppler:
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/poppler)
-endif
-
-python-qt3: tdelibs sip
- $(call buildpkg,3rdparty/python-qt3)
-
-sip:
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/sip)
-endif
-
-sword:
-# Build on Fedora >= 20 only, or PCLinuxOS
-ifneq ($(wildcard /boot/vmlinuz*.fc20* /etc/pclinuxos-release),)
- $(call buildpkg,3rdparty/sword)
-endif
-
-torsocks:
- $(call buildpkg,3rdparty/torsocks)
-
-wv2:
-# Do NOT build on Mageia or openSUSE or PCLINUXOS
-ifeq ($(wildcard /etc/mageia-release /etc/SuSE-release /etc/pclinuxos-release),)
- $(call buildpkg,3rdparty/wv2)
-endif
-
-# Extra packages
-akode: tqtinterface
- $(call buildpkg,extras/akode)
-
-# Libraries
-kipi-plugins: tqtinterface libkipi
- $(call buildpkg,libraries/kipi-plugins)
-
-libkdcraw: tqtinterface
- $(call buildpkg,libraries/libkdcraw)
-
-libkexiv2: tqtinterface
- $(call buildpkg,libraries/libkexiv2)
-
-libkipi: tqtinterface
- $(call buildpkg,libraries/libkipi)
-
-libksquirrel: tqtinterface
- $(call buildpkg,libraries/libksquirrel)
-
-libtdeldap: tqtinterface
- $(call buildpkg,libraries/libtdeldap)
-
-libtqt-perl: tqtinterface
- $(call buildpkg,libraries/libtqt-perl)
-
-mlt: tqtinterface
- $(call buildpkg,libraries/mlt)
-
-mlt++: tqtinterface
- $(call buildpkg,libraries/mlt++)
-
-pytdeextensions: tqtinterface python-trinity
- $(call buildpkg,libraries/pytdeextensions)
-
-python-trinity: tqtinterface python-tqt
- $(call buildpkg,libraries/python-trinity)
-
-# Applications
-abakus: tdebase
- $(call buildpkg,applications/abakus)
-
-adept: tdebase
- $(call buildpkg,applications/adept)
-
-amarok: tdebase
- $(call buildpkg,applications/amarok)
-
-basket: tdebase
- $(call buildpkg,applications/basket)
-
-bibletime: tdebase sword
- $(call buildpkg,applications/bibletime)
-
-compizconfig-backend-kconfig: tdebase
- $(call buildpkg,applications/compizconfig-backend-kconfig)
-
-desktop-effects-tde: tdebase
- $(call buildpkg,applications/desktop-effects-tde)
-
-digikam: tdebase libkdcraw libkexiv2 libkipi libksquirrel
- $(call buildpkg,applications/digikam)
-
-dolphin: tdebase
- $(call buildpkg,applications/dolphin)
-
-filelight: tdebase
- $(call buildpkg,applications/filelight)
-
-filelight-l10n: tdebase
- $(call buildpkg,applications/filelight-l10n)
-
-fusion-icon: tdebase
- $(call buildpkg,applications/fusion-icon)
-
-gtk3-tqt-engine: tdebase
-# Do NOT build on CentOS
-ifeq ($(wildcard /etc/centos-release),)
- $(call buildpkg,applications/gtk3-tqt-engine)
-endif
-
-gtk-qt-engine: tdebase
-# Do NOT build on CentOS 5
-ifeq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,applications/gtk-qt-engine)
-endif
-
-gwenview: tdebase
- $(call buildpkg,applications/gwenview)
-
-k3b: tdebase
- $(call buildpkg,applications/k3b)
-
-k9copy: tdebase k3b
- $(call buildpkg,applications/k9copy)
-
-kaffeine: tdebase
- $(call buildpkg,applications/kaffeine)
-
-kaffeine-mozilla: tdebase kaffeine
- $(call buildpkg,applications/kaffeine-mozilla)
-
-kasablanca: tdebase
- $(call buildpkg,applications/kasablanca)
-
-katapult: tdebase
- $(call buildpkg,applications/katapult)
-
-kbarcode: tdebase
- $(call buildpkg,applications/kbarcode)
-
-kbfx: tdebase
- $(call buildpkg,applications/kbfx)
-
-kbibtex: tdebase
- $(call buildpkg,applications/kbibtex)
-
-kbiff: tdebase
- $(call buildpkg,applications/kbiff)
-
-kbookreader: tdebase
- $(call buildpkg,applications/kbookreader)
-
-kchmviewer: tdebase
- $(call buildpkg,applications/kchmviewer)
-
-kcmautostart: tdebase
- $(call buildpkg,applications/kcmautostart)
-
-kcmldap: tdebase libtdeldap
- $(call buildpkg,applications/kcmldap)
-
-kcmldapcontroller: tdebase kcmldap
- $(call buildpkg,applications/kcmldapcontroller)
-
-kcmldapmanager: tdebase kcmldap
- $(call buildpkg,applications/kcmldapmanager)
-
-kcpuload: tdebase
- $(call buildpkg,applications/kcpuload)
-
-kdbg: tdebase
- $(call buildpkg,applications/kdbg)
-
-kdbusnotification: tdebase
- $(call buildpkg,applications/kdbusnotification)
-
-kdiff3: tdebase
- $(call buildpkg,applications/kdiff3)
-
-kdirstat: tdebase
- $(call buildpkg,applications/kdirstat)
-
-kdpkg: tdebase
- $(call buildpkg,applications/kdpkg)
-
-keep: tdebase
- $(call buildpkg,applications/keep)
-
-kerberostray: tdebase
- $(call buildpkg,applications/kerberostray)
-
-kerry: tdebase
- $(call buildpkg,applications/kerry)
-
-kftpgrabber: tdebase
- $(call buildpkg,applications/kftpgrabber)
-
-kgtk-qt3: tdebase
- $(call buildpkg,applications/kgtk-qt3)
-
-kile: tdebase
- $(call buildpkg,applications/kile)
-
-kima: tdebase
- $(call buildpkg,applications/kima)
-
-kiosktool: tdebase
- $(call buildpkg,applications/kiosktool)
-
-kkbswitch: tdebase
- $(call buildpkg,applications/kkbswitch)
-
-klcddimmer: tdebase
- $(call buildpkg,applications/klcddimmer)
-
-kmplayer: tdebase
- $(call buildpkg,applications/kmplayer)
-
-kmyfirewall: tdebase
- $(call buildpkg,applications/kmyfirewall)
-
-kmymoney: tdebase
- $(call buildpkg,applications/kmymoney)
-
-knemo: tdebase
- $(call buildpkg,applications/knemo)
-
-knetload: tdebase
- $(call buildpkg,applications/knetload)
-
-knetstats: tdebase
- $(call buildpkg,applications/knetstats)
-
-knetworkmanager8: tdebase
- $(call buildpkg,applications/knetworkmanager8)
-
-knights: tdebase
- $(call buildpkg,applications/knights)
-
-knmap: tdebase
- $(call buildpkg,applications/knmap)
-
-knowit: tdebase
- $(call buildpkg,applications/knowit)
-
-knutclient: tdebase
- $(call buildpkg,applications/knutclient)
-
-koffice: tdebase wv2
- $(call buildpkg,applications/koffice)
-
-konversation: tdebase
- $(call buildpkg,applications/konversation)
-
-kopete-otr: tdebase
- $(call buildpkg,applications/kopete-otr)
-
-kpicosim: tdebase
- $(call buildpkg,applications/kpicosim)
-
-kpilot: tdebase
- $(call buildpkg,applications/kpilot)
-
-kpowersave: tdebase
- $(call buildpkg,applications/kpowersave)
-
-krecipes: tdebase
- $(call buildpkg,applications/krecipes)
-
-krename: tdebase
- $(call buildpkg,applications/krename)
-
-krusader: tdebase
- $(call buildpkg,applications/krusader)
-
-kscope: tdebase
- $(call buildpkg,applications/kscope)
-
-ksensors: tdebase
- $(call buildpkg,applications/ksensors)
-
-kshowmail: tdebase
- $(call buildpkg,applications/kshowmail)
-
-kshutdown: tdebase
- $(call buildpkg,applications/kshutdown)
-
-ksplash-engine-moodin: tdebase
- $(call buildpkg,applications/ksplash-engine-moodin)
-
-ksquirrel: tdebase libksquirrel
- $(call buildpkg,applications/ksquirrel)
-
-kstreamripper: tdebase
- $(call buildpkg,applications/kstreamripper)
-
-ksystemlog: tdebase
- $(call buildpkg,applications/ksystemlog)
-
-ktechlab: tdebase
- $(call buildpkg,applications/ktechlab)
-
-ktorrent: tdebase
- $(call buildpkg,applications/ktorrent)
-
-kuickshow: tdebase imlib1
- $(call buildpkg,applications/kuickshow)
-
-kvirc: tdebase
- $(call buildpkg,applications/kvirc)
-
-kvkbd: tdebase
- $(call buildpkg,applications/kvkbd)
-
-kvpnc: tdebase
- $(call buildpkg,applications/kvpnc)
-
-mplayerthumbs: tdebase
- $(call buildpkg,applications/mplayerthumbs)
-
-piklab: tdebase
- $(call buildpkg,applications/piklab)
-
-potracegui: tdebase
- $(call buildpkg,applications/potracegui)
-
-qt4-tqt-theme-engine: tdebase
-# Do NOT build on CentOS
-ifeq ($(wildcard /etc/centos-release),)
- $(call buildpkg,applications/qt4-tqt-theme-engine)
-endif
-
-rosegarden: tdebase lilypond
- $(call buildpkg,applications/rosegarden)
-
-smartcardauth: tdebase pcsc-perl
- $(call buildpkg,applications/smartcardauth)
-
-smb4k: tdebase
- $(call buildpkg,applications/smb4k)
-
-soundkonverter: tdebase
- $(call buildpkg,applications/soundkonverter)
-
-tde-guidance: tdebase pytdeextensions
- $(call buildpkg,applications/tde-guidance)
-
-tdeio-apt: tdebase
- $(call buildpkg,applications/tdeio-apt)
-
-tdeio-ftps: tdebase
- $(call buildpkg,applications/tdeio-ftps)
-
-tdeio-locate: tdebase
- $(call buildpkg,applications/tdeio-locate)
-
-tdeio-sword: tdebase sword
- $(call buildpkg,applications/tdeio-sword)
-
-tdeio-umountwrapper: tdebase
- $(call buildpkg,applications/tdeio-umountwrapper)
-
-tdenetworkmanager: tdebase
-# Do NOT build on CentOS
-ifeq ($(wildcard /etc/centos-release),)
- $(call buildpkg,applications/tdenetworkmanager)
-endif
-
-tdepowersave: tdebase
- $(call buildpkg,applications/tdepowersave)
-
-tderadio: tdebase
- $(call buildpkg,applications/tderadio)
-
-tde-style-lipstik: tdebase
- $(call buildpkg,applications/tde-style-lipstik)
-
-tde-style-qtcurve: tdebase
- $(call buildpkg,applications/tde-style-qtcurve)
-
-tdesudo: tdebase
- $(call buildpkg,applications/tdesudo)
-
-tdesvn: tdebase
- $(call buildpkg,applications/tdesvn)
-
-tde-systemsettings: tdebase
- $(call buildpkg,applications/tde-systemsettings)
-
-tdmtheme: tdebase
- $(call buildpkg,applications/tdmtheme)
-
-tellico: tdebase
- $(call buildpkg,applications/tellico)
-
-tork: tdebase torsocks
- $(call buildpkg,applications/tork)
-
-twin-style-crystal: tdebase
- $(call buildpkg,applications/twin-style-crystal)
-
-wlassistant: tdebase
- $(call buildpkg,applications/wlassistant)
-
-yakuake: tdebase
- $(call buildpkg,applications/yakuake)
-
-# Translations
-gwenview-i18n: tdebase
- $(call buildpkg,applications/gwenview-i18n)
-
-k3b-i18n: tdebase
- $(call buildpkg,applications/k3b-i18n)
-
-koffice-i18n: tdebase
- $(call buildpkg,applications/koffice-i18n)
-
-tde-i18n: tdebase
- $(call buildpkg,tde-i18n)
-
-# Meta packages
-meta:
- $(call buildpkg,extras/trinity-desktop)
diff --git a/redhat/build/Makefile.v3.5.13-sru b/redhat/build/Makefile.v3.5.13-sru
deleted file mode 100644
index 013542c04..000000000
--- a/redhat/build/Makefile.v3.5.13-sru
+++ /dev/null
@@ -1,506 +0,0 @@
-SHELL := /bin/bash
-PATH := $(PATH):$(shell pwd)
-
-buildpkg = \
- @echo "Now processing '$(1)' ."; \
- if ! is_latest_package_installed.sh "$(1)" 3.5.13.2; then \
- echo " Package '${1}' is not yet installed."; \
- if ! is_latest_package_built.sh "$(1)" 3.5.13.2; then \
- echo " Building package."; \
- build_rpm_package.sh "$(1)" 3.5.13.2 || exit 1; \
- echo " Updating repository."; \
- update_repository.sh; \
- fi; \
- echo " Now installing package '$(1)'"; \
- install_rpm_package.sh "$(1)" || exit 2; \
- fi; \
- echo
-
-
-all: dependencies main libraries applications i18n meta
-dependencies: qt3 tqtinterface arts libcaldav libcarddav tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt akode hal
-main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
-libraries: libkdcraw libkexiv2 libkipi libksquirrel pytdeextensions python-trinity
-applications: abakus amarok basket bibletime digikam dolphin filelight gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla katapult kbarcode kbfx kbookreader kchmviewer kcmautostart kcpuload kdbusnotification kdiff3 kdirstat kgtk-qt3 keep kile kima kiosktool kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knowit knutclient koffice konversation kopete-otr kpicosim kpilot krename krusader ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd piklab potracegui rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-locate tdeio-umountwrapper tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico twin-style-crystal wlassistant yakuake
-i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
-
-
-### Trinity Dependencies
-arts: tqtinterface
- $(call buildpkg,dependencies/arts)
-
-avahi-tqt: tqtinterface
- $(call buildpkg,dependencies/avahi-tqt)
-
-dbus-1-tqt: tqtinterface
- $(call buildpkg,dependencies/dbus-1-tqt)
-
-dbus-tqt: tqtinterface
- $(call buildpkg,dependencies/dbus-tqt)
-
-libcaldav: tqtinterface libcurl
- $(call buildpkg,dependencies/libcaldav)
-
-libcarddav: tqtinterface libcurl
- $(call buildpkg,dependencies/libcarddav)
-
-tqca: tqtinterface
- $(call buildpkg,dependencies/tqca)
-
-tqca-tls: tqtinterface tqca
- $(call buildpkg,dependencies/tqca-tls)
-
-qt3:
- $(call buildpkg,dependencies/qt3)
-
-tqtinterface: qt3
- $(call buildpkg,dependencies/tqtinterface)
-
-# Main packages
-tdeaccessibility: tdebase tdemultimedia
- $(call buildpkg,tdeaccessibility)
-
-tdeaddons: tdebase tdegames tdemultimedia tdenetwork tdepim
- $(call buildpkg,tdeaddons)
-
-tdeadmin: tdebase
- $(call buildpkg,tdeadmin)
-
-tdeartwork: tdebase
- $(call buildpkg,tdeartwork)
-
-tdebase: tdelibs
- $(call buildpkg,tdebase)
-
-tdebindings: tdebase
- $(call buildpkg,tdebindings)
-
-tdeedu: tdebase
- $(call buildpkg,tdeedu)
-
-tdegames: tdebase tdemultimedia
- $(call buildpkg,tdegames)
-
-tdegraphics: tdebase poppler
- $(call buildpkg,tdegraphics)
-
-tdelibs: qt3 tqtinterface arts dbus-tqt dbus-1-tqt
- $(call buildpkg,tdelibs)
-
-tdemultimedia: tdebase akode
- $(call buildpkg,tdemultimedia)
-
-tdenetwork: tdebase
- $(call buildpkg,tdenetwork)
-
-tdepim: tdebase libcaldav libcarddav
- $(call buildpkg,tdepim)
-
-tdesdk: tdebase tdebindings
- $(call buildpkg,tdesdk)
-
-tdetoys: tdebase
- $(call buildpkg,tdetoys)
-
-tdeutils: tdebase
- $(call buildpkg,tdeutils)
-
-tdevelop: tdebase tdesdk
- $(call buildpkg,tdevelop)
-
-tdewebdev: tdebase tdesdk
- $(call buildpkg,tdewebdev)
-
-### 3rd party libraries and tools
-gnuchess:
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/gnuchess)
-endif
-
-hal: hal-info
-# Do NOT build on CentOS
-ifneq ($(wildcard /etc/centos-release),)
- $(call buildpkg,3rdparty/hal)
-endif
-
-hal-info:
-# Do NOT build on CentOS
-ifneq ($(wildcard /etc/centos-release),)
- $(call buildpkg,3rdparty/hal-info)
-endif
-
-htdig:
- $(call buildpkg,3rdparty/htdig)
-
-imlib1:
-# Do NOT build on Fedora, nor CentOS
-ifeq ($(wildcard /etc/fedora-release),)
-ifeq ($(wildcard /etc/centos-release),)
-ifeq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/imlib1)
-endif
-endif
-endif
-
-libcurl:
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/curl)
-endif
-
-libotr3:
-# Build on Mageia only
-ifneq ($(wildcard /etc/mageia-release),)
- $(call buildpkg,3rdparty/libotr3)
-endif
-
-lilypond: mftrace
-# Build on CentOS >= 6 only
-ifneq ($(wildcard /etc/centos-release),)
- $(call buildpkg,3rdparty/lilypond)
-endif
-
-mftrace:
-# Build on CentOS >= only
-ifneq ($(wildcard /etc/centos-release),)
- $(call buildpkg,3rdparty/mftrace)
-endif
-
-pcsc-perl:
-# Build on CentOS and openSUSE only
-ifneq ($(wildcard /etc/centos-release /etc/SuSE-release /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/pcsc-perl)
-endif
-
-poppler:
-# Build on CentOS 5 only (vendor-provided Poppler is too old)
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/poppler)
-endif
-
-python-qt3: tdelibs sip
- $(call buildpkg,3rdparty/python-qt3)
-
-sip:
-# Build on CentOS 5 only (vendor-provided SIP is too old)
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,3rdparty/sip)
-endif
-
-wv2:
-# Do NOT build on Mageia (package already exists)
-ifeq ($(wildcard /etc/mageia-release),)
- $(call buildpkg,3rdparty/wv2)
-endif
-
-### Extra packages
-akode: tqtinterface
- $(call buildpkg,extras/akode)
-
-### Trinity Libraries
-kipi-plugins: tqtinterface libkipi
- $(call buildpkg,libraries/kipi-plugins)
-
-libkdcraw: tqtinterface
- $(call buildpkg,libraries/libkdcraw)
-
-libkexiv2: tqtinterface
- $(call buildpkg,libraries/libkexiv2)
-
-libkipi: tqtinterface
- $(call buildpkg,libraries/libkipi)
-
-libksquirrel: tqtinterface
- $(call buildpkg,libraries/libksquirrel)
-
-mlt: tqtinterface
- $(call buildpkg,libraries/mlt)
-
-mlt++: tqtinterface
- $(call buildpkg,libraries/mlt++)
-
-pytdeextensions: tqtinterface python-trinity
- $(call buildpkg,libraries/pytdeextensions)
-
-python-trinity: tqtinterface python-qt3
- $(call buildpkg,libraries/python-trinity)
-
-### Trinity Applications
-abakus: tdebase
- $(call buildpkg,applications/abakus)
-
-adept: tdebase
- $(call buildpkg,applications/adept)
-
-amarok: tdebase
- $(call buildpkg,applications/amarok)
-
-basket: tdebase
- $(call buildpkg,applications/basket)
-
-bibletime: tdebase
- $(call buildpkg,applications/bibletime)
-
-compizconfig-backend-kconfig: tdebase
- $(call buildpkg,applications/compizconfig-backend-kconfig)
-
-desktop-effects-tde: tdebase
- $(call buildpkg,applications/desktop-effects-tde)
-
-digikam: tdebase libkdcraw libkexiv2 libkipi libksquirrel
- $(call buildpkg,applications/digikam)
-
-dolphin: tdebase
- $(call buildpkg,applications/dolphin)
-
-filelight: tdebase
- $(call buildpkg,applications/filelight)
-
-filelight-l10n: tdebase
- $(call buildpkg,applications/filelight-l10n)
-
-fusion-icon: tdebase
- $(call buildpkg,applications/fusion-icon)
-
-gtk-qt-engine: tdebase
-# Do NOT build on CentOS 5 (GTK2 is too old)
-ifeq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,applications/gtk-qt-engine)
-endif
-
-gwenview: tdebase
- $(call buildpkg,applications/gwenview)
-
-k3b: tdebase
- $(call buildpkg,applications/k3b)
-
-k9copy: tdebase k3b
- $(call buildpkg,applications/k9copy)
-
-kaffeine: tdebase
- $(call buildpkg,applications/kaffeine)
-
-kaffeine-mozilla: tdebase kaffeine
- $(call buildpkg,applications/kaffeine-mozilla)
-
-katapult: tdebase
- $(call buildpkg,applications/katapult)
-
-kbarcode: tdebase
- $(call buildpkg,applications/kbarcode)
-
-kbfx: tdebase
- $(call buildpkg,applications/kbfx)
-
-kbookreader: tdebase
- $(call buildpkg,applications/kbookreader)
-
-kchmviewer: tdebase
- $(call buildpkg,applications/kchmviewer)
-
-kcmautostart: tdebase
- $(call buildpkg,applications/kcmautostart)
-
-kcpuload: tdebase
- $(call buildpkg,applications/kcpuload)
-
-kdbusnotification: tdebase
- $(call buildpkg,applications/kdbusnotification)
-
-kdiff3: tdebase
- $(call buildpkg,applications/kdiff3)
-
-kdirstat: tdebase
- $(call buildpkg,applications/kdirstat)
-
-kdpkg: tdebase
- $(call buildpkg,applications/kdpkg)
-
-keep: tdebase
- $(call buildpkg,applications/keep)
-
-kerry: tdebase
- $(call buildpkg,applications/kerry)
-
-kgtk-qt3: tdebase
-# Do NOT build on CentOS 5 (GTK2 is too old)
-ifeq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,applications/kgtk-qt3)
-endif
-
-kile: tdebase
- $(call buildpkg,applications/kile)
-
-kima: tdebase
- $(call buildpkg,applications/kima)
-
-kiosktool: tdebase
- $(call buildpkg,applications/kiosktool)
-
-kmplayer: tdebase
- $(call buildpkg,applications/kmplayer)
-
-kmyfirewall: tdebase
- $(call buildpkg,applications/kmyfirewall)
-
-kmymoney: tdebase
- $(call buildpkg,applications/kmymoney)
-
-knemo: tdebase
- $(call buildpkg,applications/knemo)
-
-knetload: tdebase
- $(call buildpkg,applications/knetload)
-
-knetstats: tdebase
- $(call buildpkg,applications/knetstats)
-
-knetworkmanager8: tdebase
- $(call buildpkg,applications/knetworkmanager8)
-
-knights: tdebase gnuchess
- $(call buildpkg,applications/knights)
-
-knowit: tdebase
- $(call buildpkg,applications/knowit)
-
-knutclient: tdebase
- $(call buildpkg,applications/knutclient)
-
-koffice: tdebase wv2
- $(call buildpkg,applications/koffice)
-
-konversation: tdebase
- $(call buildpkg,applications/konversation)
-
-kopete-otr: tdebase
- $(call buildpkg,applications/kopete-otr)
-
-kpicosim: tdebase
- $(call buildpkg,applications/kpicosim)
-
-kpilot: tdebase
-# Do NOT build on CentOS 5
-ifeq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,applications/kpilot)
-endif
-
-kpowersave: tdebase
- $(call buildpkg,applications/kpowersave)
-
-krename: tdebase
- $(call buildpkg,applications/krename)
-
-krusader: tdebase
- $(call buildpkg,applications/krusader)
-
-ksplash-engine-moodin: tdebase
- $(call buildpkg,applications/ksplash-engine-moodin)
-
-ksquirrel: tdebase libksquirrel
- $(call buildpkg,applications/ksquirrel)
-
-kstreamripper: tdebase
- $(call buildpkg,applications/kstreamripper)
-
-ksystemlog: tdebase
- $(call buildpkg,applications/ksystemlog)
-
-ktechlab: tdebase
- $(call buildpkg,applications/ktechlab)
-
-ktorrent: tdebase
- $(call buildpkg,applications/ktorrent)
-
-kuickshow: tdebase imlib1
- $(call buildpkg,applications/kuickshow)
-
-kvirc: tdebase
- $(call buildpkg,applications/kvirc)
-
-kvkbd: tdebase
- $(call buildpkg,applications/kvkbd)
-
-piklab: tdebase
- $(call buildpkg,applications/piklab)
-
-potracegui: tdebase
- $(call buildpkg,applications/potracegui)
-
-rosegarden: tdebase lilypond
-# Do NOT build on CentOS 5
-ifeq ($(wildcard /boot/vmlinuz*.el5*),)
- $(call buildpkg,applications/rosegarden)
-endif
-
-smartcardauth: tdebase pcsc-perl
- $(call buildpkg,applications/smartcardauth)
-
-smb4k: tdebase
- $(call buildpkg,applications/smb4k)
-
-soundkonverter: tdebase
- $(call buildpkg,applications/soundkonverter)
-
-tde-guidance: tdebase pytdeextensions
- $(call buildpkg,applications/tde-guidance)
-
-tdeio-apt: tdebase
- $(call buildpkg,applications/tdeio-apt)
-
-tdeio-locate: tdebase
- $(call buildpkg,applications/tdeio-locate)
-
-tdeio-umountwrapper: tdebase
- $(call buildpkg,applications/tdeio-umountwrapper)
-
-tderadio: tdebase
- $(call buildpkg,applications/tderadio)
-
-tde-style-lipstik: tdebase
- $(call buildpkg,applications/tde-style-lipstik)
-
-tde-style-qtcurve: tdebase
- $(call buildpkg,applications/tde-style-qtcurve)
-
-tdesudo: tdebase
- $(call buildpkg,applications/tdesudo)
-
-tdesvn: tdebase
- $(call buildpkg,applications/tdesvn)
-
-tde-systemsettings: tdebase
- $(call buildpkg,applications/tde-systemsettings)
-
-tdmtheme: tdebase
- $(call buildpkg,applications/tdmtheme)
-
-tellico: tdebase
- $(call buildpkg,applications/tellico)
-
-twin-style-crystal: tdebase
- $(call buildpkg,applications/twin-style-crystal)
-
-wlassistant: tdebase
- $(call buildpkg,applications/wlassistant)
-
-yakuake: tdebase
- $(call buildpkg,applications/yakuake)
-
-### Trinity Translations
-gwenview-i18n: tdebase
- $(call buildpkg,applications/gwenview-i18n)
-
-k3b-i18n: tdebase
- $(call buildpkg,applications/k3b-i18n)
-
-koffice-i18n: tdebase
- $(call buildpkg,applications/koffice-i18n)
-
-tde-i18n: tdebase
- $(call buildpkg,tde-i18n)
-
-### Meta packages
-meta:
- $(call buildpkg,extras/trinity-desktop)
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 5b274fde2..5d9a7d6cd 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -28,12 +28,14 @@ fi
[ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}"
+RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})"
rpmbuild -ba \
--define "_specdir ${TEMPDIR}" \
--define "_sourcedir ${TEMPDIR}" \
--define "_builddir ${BUILDDIR}" \
--define "_buildrootdir ${BUILDROOTDIR}" \
+ --define "_rpmdir ${RPMDIR}" \
--define "tde_version ${TDE_VERSION}" \
--define "tde_prefix /opt/trinity" \
--define "preversion ${PREVERSION}" \
diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh
new file mode 100755
index 000000000..2456b1a6a
--- /dev/null
+++ b/redhat/build/configure_repository.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+TDE_VERSION=${1:-14.0.0}
+ARCH=$(uname -i)
+RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
+
+if [ -x /usr/bin/yum ]; then
+ cat <<EOF >/tmp/rpmbuild-tde.repo
+[rpmbuild.${ARCH}]
+name=rpmbuild.${ARCH}
+baseurl=file://${RPMDIR}/${ARCH}
+enabled=1
+gpgcheck=0
+
+[rpmbuild.noarch]
+name=rpmbuild.noarch
+baseurl=file://${RPMDIR}/noarch
+enabled=1
+gpgcheck=0
+EOF
+ sudo mv -f /tmp/rpmbuild-tde.repo /etc/yum.repos.d/
+fi
diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh
index 2d9f9ee39..46c664578 100755
--- a/redhat/build/get_latest_built_package_filename.sh
+++ b/redhat/build/get_latest_built_package_filename.sh
@@ -2,13 +2,26 @@
PKGNAME="$1"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
+TDE_VERSION="${2:-14.0.0}"
-RPMDIR=$(rpm -E %_rpmdir)
+RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})"
+if [ $(uname -i) == "x86_64" ]; then
+ RPMDIR_ARCH=${RPMDIR}/x86_64
+else
+ RPMDIR_ARCH=${RPMDIR}/i?86
+fi
+RPMDIR_NOARCH=${RPMDIR}/noarch
+RPMDIRS="${RPMDIR_ARCH} ${RPMDIR_NOARCH}"
+
+case "${PKGNAME##*/}" in
+ "koffice") PKGNAME="koffice-suite";;
+ "tde-i18n") PKGNAME="tde-i18n-French";;
+esac
-RPM=$(find ${RPMDIR} -name "trinity-${PKGNAME}-[0-9]*.rpm" | sort -n | tail -n 1)
+RPM=$(find ${RPMDIRS} -name "trinity-${PKGNAME##*/}-[0-9]*.rpm" | sort -n | tail -n 1)
if [ ! -r "${RPM}" ]; then
- RPM=$(find ${RPMDIR} -name "${PKGNAME}-[0-9]*.rpm" | sort -n | tail -n 1)
+ RPM=$(find ${RPMDIRS} -name "${PKGNAME##*/}-[0-9]*.rpm" | sort -n | tail -n 1)
if [ ! -r "${RPM}" ]; then
echo "Error, cannot find any package for '${PKGNAME}' !"
exit 1
diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh
index fa649c30f..f1e251b65 100755
--- a/redhat/build/get_latest_built_package_version.sh
+++ b/redhat/build/get_latest_built_package_version.sh
@@ -5,7 +5,7 @@ TDE_VERSION="${2:-14.0.0}"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
-RPM=$(get_latest_built_package_filename.sh "${PKGNAME}")
+RPM=$(get_latest_built_package_filename.sh "${PKGNAME}" ${TDE_VERSION})
[ ! -r "${RPM}" ] && echo "No package found for '${PKGNAME}' !" && exit 2
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
new file mode 100755
index 000000000..14a32f2d7
--- /dev/null
+++ b/redhat/build/get_rpm_package_name.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# Gets the RPM package name from the component name.
+# This is useful because some RPM packages do not have prefix "trinity"
+# while others do.
+#
+# E.g :
+# trinity-qt3 => qt3
+# trinity-tdelibs => trinity-tdelibs
+
+
+PKGCATEGORY="${1%%/*}"
+PKGNAME="${1##*/}"
+DEVEL="$2"
+
+# Language package: install only French language package
+case "${PKGNAME}" in
+ "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="${PKGNAME}-French";;
+ "koffice") PKGNAME="${PKGNAME}-suite";;
+esac
+
+# Use the Trinity Prefix, or not.
+case "${PKGNAME}" in
+ "trinity-"*|"qt3"|"python-qt3"|"esound") PREFIX="";;
+ "gnuchess"|"htdig"|"imlib1"|"libotr3"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
+ "curl") PREFIX="trinity-lib";;
+ *) PREFIX="trinity-";;
+esac
+
+echo "${PREFIX}${PKGNAME}"
+
+if [ -n "${DEVEL}" ]; then
+ # Check if development package is required.
+ # Applications do NOT have development packages
+ case "${PKGCATEGORY}" in
+ "applications") if [ "${PKGNAME}" != "k3b" ]; then exit 0; fi;;
+ esac
+ # Other packags NOT having development package
+ case "${PKGNAME}" in
+ "hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks") exit 0;;
+ "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl") exit 0;;
+ esac
+
+ echo "${PREFIX}${PKGNAME}-devel"
+fi
+
diff --git a/redhat/build/install_rpm_package.sh b/redhat/build/install_rpm_package.sh
index dfaf46e17..93e2b5036 100755
--- a/redhat/build/install_rpm_package.sh
+++ b/redhat/build/install_rpm_package.sh
@@ -6,8 +6,7 @@ while [ -e "${LOCKFILE}" ]; do
sleep 3
done
-PKGCATEGORY="${1%%/*}"
-PKGNAME="${1##*/}"
+PKGNAME="${1}"
if [ -x /usr/sbin/urpmi ]; then
PKGINST='sudo urpmi --auto --no-verify-rpm'
@@ -19,33 +18,8 @@ elif [ -x /usr/bin/apt-get ]; then
PKGINST='sudo apt-get install -y'
fi
-# Language package: install only French language package
-case "${PKGNAME}" in
- "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="${PKGNAME}-French";;
- "koffice") PKGNAME="${PKGNAME}-suite";;
-esac
-
-# Use the Trinity Prefix, or not.
-case "${PKGNAME}" in
- "trinity-"*|"qt3"|"python-qt3"|"esound") PREFIX="";;
- "gnuchess"|"imlib1"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
- "curl") PREFIX="trinity-lib";;
- *) PREFIX="trinity-";;
-esac
+# Gets RPM package name and development package (if any)
+RPM_PKGNAME="$(get_rpm_package_name.sh ${PKGNAME} devel)"
# Installing main package
-eval ${PKGINST} "${PREFIX}${PKGNAME}" || exit 1
-
-# Installing development package
-
-# Applications do NOT have development packages
-case "${PKGCATEGORY}" in
- "applications") if [ "${PKGNAME}" != "k3b" ]; then exit 0; fi;;
-esac
-# Other packags NOT having development package
-case "${PKGNAME}" in
- "hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks") exit 0;;
- "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl") exit 0;;
-esac
-
-eval ${PKGINST} "${PREFIX}${PKGNAME}-devel"
+eval ${PKGINST} ${RPM_PKGNAME} || exit 1
diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh
index 4cec2702e..1950aa9d3 100755
--- a/redhat/build/is_latest_package_built.sh
+++ b/redhat/build/is_latest_package_built.sh
@@ -6,11 +6,13 @@ TDE_VERSION="${2:-14.0.0}"
BUILT=$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION})
TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})
+# If package version contains a "~": it's a pre-release
if [ "${BUILT/\~/}" != "${BUILT}" ]; then
if [ "${BUILT#*\~}" = "${TARBALL#*\~}" ]; then
echo "Latest package '${PKGNAME}' version '${BUILT}' is already built."
exit 0
fi
+# Nominal case: no "~" caracter
else
if [ "${TARBALL%-*}" = "${BUILT%-*}" ]; then
echo "Latest package '${PKGNAME}' version '${BUILT}' is already built."
diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh
index 6e1ed79d0..685fa7a05 100755
--- a/redhat/build/is_latest_package_installed.sh
+++ b/redhat/build/is_latest_package_installed.sh
@@ -3,7 +3,7 @@
PKGNAME="${1##*/}"
TDE_VERSION="${2:-14.0.0}"
-INSTALLED=$(get_installed_package_version.sh ${PKGNAME})
+INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION})
TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})
SPEC=$(get_spec_version.sh ${PKGNAME} ${TDE_VERSION})
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index 8ffeabe93..c651fc3f5 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -1,6 +1,7 @@
#!/bin/bash
WORKERS=$(getconf _NPROCESSORS_ONLN)
+TDE_VERSION="${1:-14.0.0}"
LOCKFILE="/tmp/lock.${0##*/}"
while [ -e "${LOCKFILE}" ]; do
@@ -9,13 +10,13 @@ while [ -e "${LOCKFILE}" ]; do
done
if [ -x /usr/sbin/urpmi ]; then
- REPOUPDATE='(cd $(rpm -E %{_rpmdir}); genhdlist2 --clean --allow-empty noarch; genhdlist2 --clean --allow-empty $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)'
+ REPOUPDATE='(cd $(rpm -E %{_rpmdir}.tde-${TDE_VERSION}); genhdlist2 --clean --allow-empty noarch; genhdlist2 --clean --allow-empty $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)'
elif [ -x /usr/bin/zypper ]; then
- REPOUPDATE='(cd $(rpm -E %{_rpmdir}); createrepo --workers=${WORKERS} $(uname -i); createrepo --workers=${WORKERS} noarch; sudo zypper refresh rpmbuild.$(uname -i) rpmbuild.noarch)'
+ REPOUPDATE='(cd $(rpm -E %{_rpmdir}.tde-${TDE_VERSION}); createrepo --workers=${WORKERS} $(uname -i); createrepo --workers=${WORKERS} noarch; sudo zypper refresh rpmbuild.$(uname -i) rpmbuild.noarch)'
elif [ -x /usr/bin/yum ]; then
- REPOUPDATE='(cd $(rpm -E %{_rpmdir}); createrepo $(uname -i); createrepo noarch; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
+ REPOUPDATE='(cd $(rpm -E %{_rpmdir}.tde-${TDE_VERSION}); createrepo $(uname -i); createrepo noarch; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
elif [ -x /usr/bin/apt-get ]; then
- REPOUPDATE='(cd $(rpm -E %{_rpmdir}); genpkglist $PWD noarch; genpkglist $PWD i586; genpkglist $PWD x86_64; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)'
+ REPOUPDATE='(cd $(rpm -E %{_rpmdir}.tde-${TDE_VERSION}); genpkglist $PWD noarch; genpkglist $PWD i586; genpkglist $PWD x86_64; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)'
fi
eval "${REPOUPDATE}; rm -f ${LOCKFILE}"|| exit 1