RPM Packaging: update build scripts

pull/3/head
François Andriot 11 years ago
parent c6eec582c4
commit 253fbb2488

@ -139,25 +139,25 @@ endif
cmake: cmake:
# Build on CentOS only # Build on CentOS only
ifneq ($(wildcard /etc/centos-release /boot/vmlinuz*.el5*),) ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
$(call buildpkg,3rdparty/cmake) $(call buildpkg,3rdparty/cmake)
endif endif
esound: esound:
# Build on Mageia only # Build on Mageia and CentOS >= 7
ifneq ($(wildcard /etc/mageia-release),) ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
$(call buildpkg,3rdparty/esound) $(call buildpkg,3rdparty/esound)
endif endif
gnuchess: gnuchess:
# Build on CentOS 5 only # Build on CentOS 5, CentOS 7
ifneq ($(wildcard /boot/vmlinuz*.el5*),) ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),)
$(call buildpkg,3rdparty/gnuchess) $(call buildpkg,3rdparty/gnuchess)
endif endif
htdig: htdig:
# build on Mageia only # build on Mageia, and CentOS >= 7
ifneq ($(wildcard /etc/mageia-release),) ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
$(call buildpkg,3rdparty/htdig) $(call buildpkg,3rdparty/htdig)
endif endif
@ -178,8 +178,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
endif endif
libotr3: libotr3:
# Build on Mageia only # Build on Mageia, CentOS >= 7
ifneq ($(wildcard /etc/mageia-release),) ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
$(call buildpkg,3rdparty/libotr3) $(call buildpkg,3rdparty/libotr3)
endif endif
@ -190,8 +190,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
endif endif
lilypond: mftrace lilypond: mftrace
# Build on CentOS only # Build on CentOS 6 only
ifneq ($(wildcard /etc/centos-release),) ifneq ($(wildcard /boot/vmlinuz*.el6*),)
$(call buildpkg,3rdparty/lilypond) $(call buildpkg,3rdparty/lilypond)
endif endif
@ -202,8 +202,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
endif endif
mftrace: mftrace:
# Build on CentOS only # Build on CentOS 6 only
ifneq ($(wildcard /etc/centos-release),) ifneq ($(wildcard /boot/vmlinuz*.el6*),)
$(call buildpkg,3rdparty/mftrace) $(call buildpkg,3rdparty/mftrace)
endif endif
@ -229,8 +229,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
endif endif
sword: sword:
# Build on Fedora >= 20 only, or PCLinuxOS # Build on Fedora >= 20, PCLinuxOS, CentOS >= 7
ifneq ($(wildcard /boot/vmlinuz*.fc20* /etc/pclinuxos-release),) ifneq ($(wildcard /boot/vmlinuz*.fc20* /etc/pclinuxos-release /boot/vmlinuz*.el7*),)
$(call buildpkg,3rdparty/sword) $(call buildpkg,3rdparty/sword)
endif endif
@ -413,8 +413,10 @@ kftpgrabber: tdebase
kgtk-qt3: tdebase kgtk-qt3: tdebase
# Do NOT build on CentOS 5 (GTK2 is too old) # 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) # 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) $(call buildpkg,applications/kgtk-qt3)
endif endif
@ -472,14 +474,14 @@ koffice: tdebase wv2
konversation: tdebase konversation: tdebase
$(call buildpkg,applications/konversation) $(call buildpkg,applications/konversation)
kopete-otr: tdebase kopete-otr: tdebase libotr3
$(call buildpkg,applications/kopete-otr) $(call buildpkg,applications/kopete-otr)
kpicosim: tdebase kpicosim: tdebase
$(call buildpkg,applications/kpicosim) $(call buildpkg,applications/kpicosim)
kpilot: tdebase 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*),) ifeq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,applications/kpilot) $(call buildpkg,applications/kpilot)
endif endif
@ -554,8 +556,8 @@ ifeq ($(wildcard /etc/centos-release),)
endif endif
rosegarden: tdebase lilypond rosegarden: tdebase lilypond
# Do NOT build on CentOS 5 # 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) $(call buildpkg,applications/rosegarden)
endif endif
@ -596,7 +598,10 @@ tdepowersave: tdebase
$(call buildpkg,applications/tdepowersave) $(call buildpkg,applications/tdepowersave)
tderadio: tdebase tderadio: tdebase
# Do NOT build on CentOS 7
ifeq ($(wildcard /boot/vmlinuz*.el7*),)
$(call buildpkg,applications/tderadio) $(call buildpkg,applications/tderadio)
endif
tde-style-lipstik: tdebase tde-style-lipstik: tdebase
$(call buildpkg,applications/tde-style-lipstik) $(call buildpkg,applications/tde-style-lipstik)

@ -27,22 +27,22 @@ i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
### Trinity Dependencies ### Trinity Dependencies
arts: tqtinterface esound arts: tqtinterface esound cmake
$(call buildpkg,dependencies/arts) $(call buildpkg,dependencies/arts)
avahi-tqt: tqtinterface avahi-tqt: tqtinterface
$(call buildpkg,dependencies/avahi-tqt) $(call buildpkg,dependencies/avahi-tqt)
dbus-1-tqt: tqtinterface dbus-1-tqt: tqtinterface cmake
$(call buildpkg,dependencies/dbus-1-tqt) $(call buildpkg,dependencies/dbus-1-tqt)
dbus-tqt: tqtinterface dbus-tqt: tqtinterface cmake
$(call buildpkg,dependencies/dbus-tqt) $(call buildpkg,dependencies/dbus-tqt)
libcaldav: tqtinterface libcurl libcaldav: tqtinterface autoconf libcurl
$(call buildpkg,dependencies/libcaldav) $(call buildpkg,dependencies/libcaldav)
libcarddav: tqtinterface libcurl libcarddav: tqtinterface autoconf libcurl
$(call buildpkg,dependencies/libcarddav) $(call buildpkg,dependencies/libcarddav)
tqca: tqtinterface tqca: tqtinterface
@ -54,7 +54,7 @@ tqca-tls: tqtinterface tqca
qt3: esound qt3: esound
$(call buildpkg,dependencies/qt3) $(call buildpkg,dependencies/qt3)
tqtinterface: qt3 tqtinterface: qt3 cmake
$(call buildpkg,dependencies/tqtinterface) $(call buildpkg,dependencies/tqtinterface)
# Main packages # Main packages
@ -70,7 +70,7 @@ tdeadmin: tdebase
tdeartwork: tdebase tdeartwork: tdebase
$(call buildpkg,tdeartwork) $(call buildpkg,tdeartwork)
tdebase: tdelibs htdig hal tdebase: tdelibs htdig cmake hal
$(call buildpkg,tdebase) $(call buildpkg,tdebase)
tdebindings: tdebase tdebindings: tdebase
@ -82,10 +82,10 @@ tdeedu: tdebase
tdegames: tdebase tdemultimedia tdegames: tdebase tdemultimedia
$(call buildpkg,tdegames) $(call buildpkg,tdegames)
tdegraphics: tdebase poppler tdegraphics: tdebase poppler cmake
$(call buildpkg,tdegraphics) $(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) $(call buildpkg,tdelibs)
tdemultimedia: tdebase akode tdemultimedia: tdebase akode
@ -94,10 +94,10 @@ tdemultimedia: tdebase akode
tdenetwork: tdebase tdenetwork: tdebase
$(call buildpkg,tdenetwork) $(call buildpkg,tdenetwork)
tdepim: tdebase libcaldav libcarddav tdepim: tdebase libcaldav libcarddav cmake
$(call buildpkg,tdepim) $(call buildpkg,tdepim)
tdesdk: tdebase tdebindings tdesdk: tdebase tdebindings cmake
$(call buildpkg,tdesdk) $(call buildpkg,tdesdk)
tdetoys: tdebase tdetoys: tdebase
@ -106,13 +106,31 @@ tdetoys: tdebase
tdeutils: tdebase tdeutils: tdebase
$(call buildpkg,tdeutils) $(call buildpkg,tdeutils)
tdevelop: tdebase tdesdk tdevelop: tdebase tdesdk cmake
$(call buildpkg,tdevelop) $(call buildpkg,tdevelop)
tdewebdev: tdebase tdesdk tdewebdev: tdebase tdesdk
$(call buildpkg,tdewebdev) $(call buildpkg,tdewebdev)
### 3rd party libraries and tools ### 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: esound:
# Build on Mageia and CentOS >= 7 # Build on Mageia and CentOS >= 7
ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
@ -153,7 +171,7 @@ endif
endif endif
endif endif
libcurl: libcurl: automake libtool
# Build on CentOS 5 only # Build on CentOS 5 only
ifneq ($(wildcard /boot/vmlinuz*.el5*),) ifneq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,3rdparty/curl) $(call buildpkg,3rdparty/curl)
@ -165,12 +183,24 @@ ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
$(call buildpkg,3rdparty/libotr3) $(call buildpkg,3rdparty/libotr3)
endif endif
libtool: autoconf automake
# Build on CentOS 5 only
ifneq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,3rdparty/libtool)
endif
lilypond: mftrace lilypond: mftrace
# Build on CentOS 6 only # Build on CentOS 6 only
ifneq ($(wildcard /boot/vmlinuz*.el6*),) ifneq ($(wildcard /boot/vmlinuz*.el6*),)
$(call buildpkg,3rdparty/lilypond) $(call buildpkg,3rdparty/lilypond)
endif endif
m4:
# Build on CentOS 5 only (vendor-provided Poppler is too old)
ifneq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,3rdparty/m4)
endif
mftrace: mftrace:
# Build on CentOS 6 only # Build on CentOS 6 only
ifneq ($(wildcard /boot/vmlinuz*.el6*),) ifneq ($(wildcard /boot/vmlinuz*.el6*),)
@ -249,7 +279,7 @@ abakus: tdebase
adept: tdebase adept: tdebase
$(call buildpkg,applications/adept) $(call buildpkg,applications/adept)
amarok: tdebase amarok: tdebase cmake
$(call buildpkg,applications/amarok) $(call buildpkg,applications/amarok)
basket: tdebase basket: tdebase
@ -520,7 +550,7 @@ k3b-i18n: tdebase
koffice-i18n: tdebase koffice-i18n: tdebase
$(call buildpkg,applications/koffice-i18n) $(call buildpkg,applications/koffice-i18n)
tde-i18n: tdebase tde-i18n: tdebase cmake
$(call buildpkg,tde-i18n) $(call buildpkg,tde-i18n)
### Meta packages ### Meta packages

@ -23,6 +23,6 @@ fi
VERSION=${VERSION/-*_/\~} VERSION=${VERSION/-*_/\~}
VERSION=${VERSION%-[0-9]} VERSION=${VERSION%-[0-9]}
VERSION=${VERSION%.opt} VERSION=${VERSION%.opt}
VERSION=${VERSION%.*} VERSION=${VERSION%.[a-z]*}
echo $VERSION echo $VERSION

@ -11,7 +11,7 @@ RPM=$(get_latest_built_package_filename.sh "${PKGNAME}" ${TDE_VERSION})
VERSION=$(rpm -qp --qf "%{version}-%{release}" "${RPM}") VERSION=$(rpm -qp --qf "%{version}-%{release}" "${RPM}")
VERSION=${VERSION%.opt} VERSION=${VERSION%.opt}
VERSION=${VERSION%.*} VERSION=${VERSION%.[a-z]*}
VERSION=${VERSION/-*_/\~} VERSION=${VERSION/-*_/\~}

@ -20,7 +20,11 @@ if [ -x /usr/sbin/urpmi ]; then
elif [ -x /usr/bin/zypper ]; then elif [ -x /usr/bin/zypper ]; then
REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)' REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
elif [ -x /usr/bin/yum ]; then elif [ -x /usr/bin/yum ]; then
if [ "$(rpm -E %dist)" = ".el5" ]; then
REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")' REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
else
REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
fi
elif [ -x /usr/bin/apt-get ]; then elif [ -x /usr/bin/apt-get ]; then
REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir $PWD ${ARCH} noarch; sudo apt-get update)' REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir $PWD ${ARCH} noarch; sudo apt-get update)'
fi fi

@ -54,6 +54,27 @@ checknew() {
done done
} }
do_optimizegraphics() {
if ! (which optipng && which advdef && which pngout) ; then
echo "Missing utility ! Check that 'optipng', 'advdef' and 'pngout' utilities are available !"
return 1
fi
while read m; do
if [ -d "${m}" ]; then
pushd "${m}"
if [ -r .optimizegraphics ]; then
echo "Graphics are already optimized !"
else
optimizegraphics
touch .optimizegraphics
fi
popd
fi
done < submodules
}
alias rr='rpm -qa --qf "%{name} %{buildhost}\n" | grep "\.vtf" | awk "{print \$1}"' alias rr='rpm -qa --qf "%{name} %{buildhost}\n" | grep "\.vtf" | awk "{print \$1}"'
# Update main repository # Update main repository

@ -15,13 +15,11 @@ bison
boost-devel boost-devel
bzip2-devel bzip2-devel
ccache ccache
ccrtp-devel
cdparanoia cdparanoia
cdparanoia-devel cdparanoia-devel
chrpath chrpath
clucene-core-devel clucene-core-devel
cmake cmake
commoncpp2-devel
cpp cpp
cppunit-devel cppunit-devel
createrepo createrepo
@ -32,7 +30,6 @@ djvulibre
djvulibre-devel djvulibre-devel
doxygen doxygen
emacs emacs
esound-devel
exiv2-devel exiv2-devel
ffmpeg-devel ffmpeg-devel
fftw-devel fftw-devel
@ -44,11 +41,9 @@ gamin-devel
gcc gcc
gcc-c++ gcc-c++
gcc-gfortran gcc-gfortran
gcc-java
gettext-devel gettext-devel
glib-devel glib-devel
gmp-devel gmp-devel
gnokii-devel
gperf gperf
gpgme-devel gpgme-devel
gphoto2-devel gphoto2-devel
@ -59,21 +54,17 @@ gtk+-devel
gtk-doc gtk-doc
gtk2-devel gtk2-devel
guile-devel guile-devel
hal-devel
hspell-devel hspell-devel
htdig
html2ps html2ps
icu icu
imake imake
imlib-devel imlib-devel
jack-audio-connection-kit-devel jack-audio-connection-kit-devel
jasper-devel jasper-devel
java-1.4.2-gcj-compat-devel
java-1.7.0-openjdk-devel java-1.7.0-openjdk-devel
java-devel java-devel
java-openjdk java-openjdk
lame-devel lame-devel
lcms-devel
libXScrnSaver-devel libXScrnSaver-devel
libXaw-devel libXaw-devel
libXcomposite-devel libXcomposite-devel
@ -93,16 +84,12 @@ libconfig-devel
libcurl-devel libcurl-devel
libdvdread-devel libdvdread-devel
libfontenc-devel libfontenc-devel
libgcj-devel
libgpod-devel libgpod-devel
libgsf-devel libgsf-devel
libgssapi-devel
libical-devel libical-devel
libidn-devel libidn-devel
liblo-devel
libmad-devel libmad-devel
libmng-devel libmng-devel
libmp4v2-devel
libmpcdec-devel libmpcdec-devel
libmtp-devel libmtp-devel
libmusicbrainz-devel libmusicbrainz-devel
@ -128,12 +115,9 @@ libwmf-devel
libwpd-devel libwpd-devel
libxkbfile-devel libxkbfile-devel
libxslt-devel libxslt-devel
libzrtpcpp-devel
lirc-devel
lm_sensors-devel lm_sensors-devel
meanwhile-devel meanwhile-devel
mysql-devel mysql-devel
nas-devel
neon-devel neon-devel
net-snmp-devel net-snmp-devel
net-tools net-tools
@ -151,7 +135,6 @@ perl
perl(ExtUtils::MakeMaker) perl(ExtUtils::MakeMaker)
perl(XML::Parser) perl(XML::Parser)
perl-devel perl-devel
pilot-link-devel
poppler-devel poppler-devel
postgresql-devel postgresql-devel
pth-devel pth-devel
@ -167,23 +150,16 @@ sip-devel
speex-devel speex-devel
sqlite-devel sqlite-devel
subversion-devel subversion-devel
sword-devel
t1lib-devel t1lib-devel
t1utils t1utils
taglib-devel taglib-devel
tar tar
texinfo texinfo
texlive-utils
transfig transfig
udisks-devel
unixODBC-devel unixODBC-devel
valgrind valgrind
wireless-tools-devel
xine-lib-devel
xmlto xmlto
xorg-x11-font-utils xorg-x11-font-utils
xscreensaver
xscreensaver-extras
xulrunner-devel xulrunner-devel
xz-devel xz-devel
libcdio-paranoia-devel libcdio-paranoia-devel

@ -3,6 +3,7 @@ ImageMagick-devel
NetworkManager-glib-devel NetworkManager-glib-devel
OpenEXR-devel OpenEXR-devel
SDL-devel SDL-devel
advancecomp
alsa-lib-devel alsa-lib-devel
aspell aspell
aspell-devel aspell-devel
@ -45,11 +46,13 @@ gphoto2-devel
gsl-devel gsl-devel
gtk-doc gtk-doc
gtk2-devel gtk2-devel
gtk+3.0-devel
hspell-devel hspell-devel
imake imake
java-1.7.0-openjdk java-1.7.0-openjdk
java-1.7.0-openjdk-devel java-1.7.0-openjdk-devel
karma-sharp karma-sharp
kde-dev-scripts
lcms-devel lcms-devel
lib64binutils-devel lib64binutils-devel
lib64clucene-devel lib64clucene-devel
@ -90,6 +93,7 @@ libblkid-devel
libcdda-devel libcdda-devel
libclucene-devel libclucene-devel
libcommoncpp-devel libcommoncpp-devel
libconfig-devel
libcurl-devel libcurl-devel
libdvdread-devel libdvdread-devel
libffmpeg-devel libffmpeg-devel
@ -161,6 +165,7 @@ ocaml
openldap-devel openldap-devel
openslp-devel openslp-devel
opensp-devel opensp-devel
optipng
pam-devel pam-devel
pciutils-devel pciutils-devel
perl(XML::Parser) perl(XML::Parser)
@ -173,6 +178,7 @@ postgresql9.3-devel
pth-devel pth-devel
python-devel python-devel
python-sip python-sip
qt4-devel
readline-devel readline-devel
recode recode
rpm-build rpm-build
@ -186,6 +192,8 @@ subversion-devel
sword-devel sword-devel
taglib-devel taglib-devel
transfig transfig
udisks-devel
udisks2-devel
unixODBC-devel unixODBC-devel
valgrind valgrind
wv2-devel wv2-devel

Loading…
Cancel
Save