diff options
| -rw-r--r-- | redhat/Makefile.r14 | 106 | ||||
| -rwxr-xr-x | redhat/build/get_rpm_package_name.sh | 4 | ||||
| -rw-r--r-- | redhat/main/tdebase/tdebase-14.0.0.spec | 1 | ||||
| -rw-r--r-- | redhat/main/tdebindings/tdebindings-14.0.0.spec | 2 | ||||
| -rw-r--r-- | redhat/packages.el5 | 184 | ||||
| -rw-r--r-- | redhat/packages.el6 | 192 |
6 files changed, 66 insertions, 423 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 352b2a343..68bf3e41f 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -137,19 +137,19 @@ tdewebdev: tdebase tdesdk ### 3rd party libraries and tools autoconf: m4 # Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +ifneq (,$(filter $(DIST),.el5 .el6)) $(call buildpkg,3rdparty/autoconf) endif automake: # Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +ifneq (,$(filter $(DIST),.el5)) $(call buildpkg,3rdparty/automake) endif cmake: # Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +ifneq (,$(filter $(DIST),.el5)) $(call buildpkg,3rdparty/cmake) endif @@ -173,13 +173,25 @@ endif file: # Build on CentOS 5 -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +ifneq (,$(filter $(DIST),.el5)) $(call buildpkg,3rdparty/file) endif +gmime: +# Build on CentOS 6 +ifneq (,$(filter $(DIST),.el6)) + $(call buildpkg,3rdparty/gmime) +endif + +intltool: +# Build on CentOS 5 +ifneq (,$(filter $(DIST),.el5)) + $(call buildpkg,3rdparty/intltool) +endif + gnuchess: # Build on CentOS 5, CentOS 7 -ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),) +ifneq (,$(filter $(DIST),.el5 .el7)) $(call buildpkg,3rdparty/gnuchess) endif @@ -192,12 +204,10 @@ endif imlib1: # Do NOT build on Fedora, nor CentOS, nor PCLOS ifeq ($(wildcard /etc/fedora-release),) -ifeq ($(wildcard /etc/centos-release),) -ifeq ($(wildcard /boot/vmlinuz*.el5*),) +ifeq (,$(filter $(DIST),.el5 .el6 .el7)) $(call buildpkg,3rdparty/imlib1) endif endif -endif lcms: ifneq ($(wildcard /boot/vmlinuz*.el7*),) @@ -206,35 +216,34 @@ endif libcurl: automake libtool2 # Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el4*),) +ifneq (,$(filter $(DIST),.el4)) $(call buildpkg,3rdparty/curl) endif libtool2: autoconf automake # Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +ifneq (,$(filter $(DIST),.el5)) $(call buildpkg,3rdparty/libtool2) endif lilypond: mftrace # Build on CentOS 6 only -ifneq ($(wildcard /boot/vmlinuz*.el6*),) +ifneq (,$(filter $(DIST),.el6)) $(call buildpkg,3rdparty/lilypond) endif m4: -# Build on CentOS 5 only (vendor-provided m4 is too old) -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +# Build on CentOS 5 and CentOS 6 only (vendor-provided m4 is too old) +ifneq (,$(filter $(DIST),.el5 .el6)) $(call buildpkg,3rdparty/m4) endif mftrace: # Build on CentOS 6 only -ifneq ($(wildcard /boot/vmlinuz*.el6*),) +ifneq (,$(filter $(DIST),.el6)) $(call buildpkg,3rdparty/mftrace) endif - mp4v2: # Build on OpenSUSE only ifneq ($(wildcard /etc/SuSE-release),) @@ -243,13 +252,13 @@ endif pcsc-perl: # Build on CentOS -ifneq ($(wildcard /etc/centos-release /boot/vmlinuz*.el5*),) +ifneq (,$(filter $(DIST),.el5 .el6 .el7)) $(call buildpkg,3rdparty/pcsc-perl) endif poppler: # Build on CentOS 5 only (vendor-provided Poppler is too old) -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +ifneq (,$(filter $(DIST),.el5)) $(call buildpkg,3rdparty/poppler) endif @@ -264,19 +273,25 @@ endif sip: # Build on CentOS 5 only (vendor-provided SIP is too old) -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +ifneq (,$(filter $(DIST),.el5)) $(call buildpkg,3rdparty/sip) endif +sword: +# Build on CentOS 5 only +ifneq (,$(filter $(DIST),.el5)) + $(call buildpkg,3rdparty/sword) +endif + tar: # Build on CentOS 5 only (vendor-provided TAR is too old) -ifneq ($(wildcard /boot/vmlinuz*.el5*),) +ifneq (,$(filter $(DIST),.el5)) $(call buildpkg,3rdparty/tar) endif torsocks: -# Do NOT build on RHEL 6, RHEL 7, Fedora > 20, Mageia -ifeq ($(wildcard /boot/vmlinuz*.el6* /boot/vmlinuz*.el7* /etc/fedora-release /boot/mageia.dat /etc/SuSE-release),) +# Build on opensuse +ifneq (,$(filter $(DIST), .oss)) $(call buildpkg,3rdparty/torsocks) endif @@ -339,7 +354,7 @@ amarok: tdebase cmake mp4v2 basket: tdebase tdepim $(call buildpkg,applications/basket) -bibletime: tdebase +bibletime: tdebase sword $(call buildpkg,applications/bibletime) compizconfig-backend-kconfig: tdebase @@ -365,13 +380,13 @@ fusion-icon: tdebase gtk3-tqt-engine: tdebase # Do NOT build on CentOS 5, CentOS 6 -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) +ifeq (,$(filter $(DIST),.el5 .el6)) $(call buildpkg,applications/gtk3-tqt-engine) endif gtk-qt-engine: tdebase # Do NOT build on CentOS 5 (GTK2 is too old) -ifeq ($(wildcard /boot/vmlinuz*.el5*),) +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/gtk-qt-engine) endif @@ -380,13 +395,13 @@ gwenview: tdebase k3b: tdebase # Do NOT build on CentOS 5 (No TDE HWLIB support) -ifeq ($(wildcard /boot/vmlinuz*.el5*),) +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/k3b) endif k9copy: tdebase k3b # Do NOT build on CentOS 5 (No K3B) -ifeq ($(wildcard /boot/vmlinuz*.el5*),) +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/k9copy) endif @@ -425,19 +440,19 @@ kcmautostart: tdebase kcmldap: tdebase libtdeldap # Do NOT build on CentOS 5, PCLinuxOS -ifeq ($(wildcard /boot/vmlinuz*.el5* /etc/pclinuxos-release),) +ifeq (,$(filter $(DIST),.el5 .pclos)) $(call buildpkg,applications/kcmldap) endif kcmldapcontroller: tdebase kcmldap # Do NOT build on CentOS 5, PCLinuxOS -ifeq ($(wildcard /boot/vmlinuz*.el5* /etc/pclinuxos-release),) +ifeq (,$(filter $(DIST),.el5 .pclos)) $(call buildpkg,applications/kcmldapcontroller) endif kcmldapmanager: tdebase kcmldap # Do NOT build on CentOS 5, PCLinuxOS -ifeq ($(wildcard /boot/vmlinuz*.el5* /etc/pclinuxos-release),) +ifeq (,$(filter $(DIST),.el5 .pclos)) $(call buildpkg,applications/kcmldapmanager) endif @@ -464,7 +479,7 @@ keep: tdebase rdiff-backup kerberostray: tdebase # Do NOT build on CentOS 5, PCLinuxOS -ifeq ($(wildcard /boot/vmlinuz*.el5* /etc/pclinuxos-release),) +ifeq (,$(filter $(DIST),.el5 .pclos)) $(call buildpkg,applications/kerberostray) endif @@ -490,7 +505,8 @@ kile: tdebase $(call buildpkg,applications/kile) kima: tdebase -ifeq ($(wildcard /boot/vmlinuz*.el5*),) +# Not on RHEL5 +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kima) endif @@ -522,7 +538,8 @@ knetstats: tdebase $(call buildpkg,applications/knetstats) knetworkmanager8: tdebase -ifneq ($(wildcard /boot/vmlinuz*.el6*),) +# RHEL6 only +ifneq (,$(filter $(DIST),.el6)) $(call buildpkg,applications/knetworkmanager8) endif @@ -555,7 +572,7 @@ kpicosim: tdebase kpilot: tdebase # Do NOT build on CentOS 5 (pilot-link library is too old) -ifeq ($(wildcard /boot/vmlinuz*.el5*),) +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kpilot) endif @@ -630,19 +647,19 @@ potracegui: tdebase qalculate-tde: tdebase # Do NOT build on CentOS 5, CentOS 6 -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) +ifeq (,$(filter $(DIST),.el5 .el6)) $(call buildpkg,applications/qalculate-tde) endif qt4-tqt-theme-engine: tdebase # Do NOT build on CentOS 5, CentOS 6 -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) +ifeq (,$(filter $(DIST),.el5 .el6)) $(call buildpkg,applications/qt4-tqt-theme-engine) endif rosegarden: tdebase lilypond # Do NOT build on CentOS 5, CentOS 7 -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),) +ifeq (,$(filter $(DIST),.el5 .el7)) $(call buildpkg,applications/rosegarden) endif @@ -670,7 +687,7 @@ tdeio-ftps: tdebase tdeio-locate: tdebase $(call buildpkg,applications/tdeio-locate) -tdeio-sword: tdebase +tdeio-sword: tdebase sword $(call buildpkg,applications/tdeio-sword) tdeio-umountwrapper: tdebase @@ -678,13 +695,13 @@ tdeio-umountwrapper: tdebase tdenetworkmanager: tdebase # Do NOT build on CentOS 5, CentOS 6 -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) +ifeq (,$(filter $(DIST),.el5 .el6)) $(call buildpkg,applications/tdenetworkmanager) endif tdepowersave: tdebase # Do NOT build on CentOS 5 -ifeq ($(wildcard /boot/vmlinuz*.el5*),) +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/tdepowersave) endif @@ -720,7 +737,7 @@ tdmtheme: tdebase tellico: tdebase tdemultimedia # Do NOT build on CentOS 5 -ifeq ($(wildcard /boot/vmlinuz*.el5*),) +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/tellico) endif @@ -742,7 +759,7 @@ gwenview-i18n: tdebase k3b-i18n: tdebase # Do NOT build on CentOS 5 -ifeq ($(wildcard /boot/vmlinuz*.el5*),) +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/k3b-i18n) endif @@ -790,7 +807,8 @@ klamav: $(call buildpkg,extras/klamav) klibido: pan -ifeq ($(wildcard /boot/vmlinuz*.el5*),) +# Not on RHEL5 +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,extras/klibido) endif @@ -809,8 +827,8 @@ kpacman: mathemagics: $(call buildpkg,extras/mathemagics) -pan: -ifeq ($(wildcard /boot/vmlinuz*.el5*),) +pan: gmime intltool +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,3rdparty/pan) endif diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index f29d37968..b0818789b 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -24,7 +24,7 @@ case "${PKGNAME}" in # Most TDE libraries have no prefix #"libkdcraw") PREFIX="";; # 3rd party dependencies - "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"hk_classes"|"lcms"|"mp4v2"|"python-qt3"|"rdiff-backup"|"tar") PREFIX="";; + "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdiff-backup"|"sword"|"tar") PREFIX="";; # Extra build stuff "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";; # Other @@ -85,7 +85,7 @@ if [ -n "${DEVEL}" ]; then # Some other packags NOT having development package case "${PKGNAME}" in - "autoconf"|"cmake"|"cscope"|"hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"rdiff-backup"|"torsocks") exit 0;; + "autoconf"|"automake"|"cmake"|"cscope"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdiff-backup"|"torsocks") exit 0;; "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl"|"kipi-plugins") exit 0;; esac diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec index 786589e4a..632305827 100644 --- a/redhat/main/tdebase/tdebase-14.0.0.spec +++ b/redhat/main/tdebase/tdebase-14.0.0.spec @@ -483,6 +483,7 @@ BuildRequires: OpenEXR-devel # XSCREENSAVER support # RHEL 4: disabled +# RHEL 5: available in centos-extras # RHEL 6: available in EPEL # RHEL 7: available in NUX %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings-14.0.0.spec index d8c8d2b97..7e0607e73 100644 --- a/redhat/main/tdebindings/tdebindings-14.0.0.spec +++ b/redhat/main/tdebindings/tdebindings-14.0.0.spec @@ -189,7 +189,7 @@ BuildRequires: rubypick %endif %endif %endif -%if 0%{?rhel} == 5 +%if 0%{?rhel} == 5 || 0%{?rhel} == 6 %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]') %endif diff --git a/redhat/packages.el5 b/redhat/packages.el5 deleted file mode 100644 index e6110b3c0..000000000 --- a/redhat/packages.el5 +++ /dev/null @@ -1,184 +0,0 @@ -alsa-lib-devel -aspell -aspell-devel -audiofile-devel -autotrace -avahi-devel -bind-devel -binutils-devel -bison -boost-devel -bzip2-devel -ccache -ccrtp-devel -cdparanoia -cdparanoia-devel -chrpath -clucene-core-devel -cmake -commoncpp2-devel -cpp -cppunit-devel -createrepo -cups-devel -db4-devel -dbus-glib-devel -doxygen -emacs -esound-devel -exiv2-devel -ffmpeg-devel -fftw-devel -flac-devel -fribidi-devel -gamin-devel -gcc -gcc-c++ -gcc-gfortran -gcc-java -gettext-devel -glib-devel -gmp-devel -gnokii-devel -gperf -gpgme-devel -gphoto2-devel -GraphicsMagick-devel -gsl-devel -gstreamer-devel -gstreamer-plugins-base-devel -gtk2-devel -gtk+-devel -gtk-doc -guile-devel -hal-devel -hspell-devel -html2ps -icu -ImageMagick-devel -imake -imlib-devel -jack-audio-connection-kit-devel -jasper-devel -java-1.4.2-gcj-compat-devel -java-1.7.0-openjdk-devel -java-devel -java-openjdk -lame-devel -lcms-devel -libacl-devel -libarchive-devel -libart_lgpl-devel -libcap-devel -libcdio-devel -libdvdread-devel -libfontenc-devel -libgcj-devel -libgpod-devel -libgsf-devel -libgssapi-devel -libical-devel -libidn-devel -liblrdf-devel -libmad-devel -libmng-devel -libmp4v2-devel -libmpcdec-devel -libmusicbrainz-devel -libofx-devel -libogg-devel -libotr-devel -libpaper-devel -libpqxx-devel -libraw1394-devel -libsamplerate-devel -libsmbclient-devel -libsndfile-devel -libssh2-devel -libtheora-devel -libtiff-devel -libtool -libtool-ltdl-devel -libtunepimp-devel -libutempter-devel -libvisual-devel -libvorbis-devel -libwmf-devel -libwpd-devel -libXaw-devel -libXcomposite-devel -libXdamage-devel -libXdmcp-devel -libxkbfile-devel -libXScrnSaver-devel -libxslt-devel -libXtst-devel -libXv-devel -libXxf86dga-devel -libXxf86vm-devel -libzrtpcpp-devel -lm_sensors-devel -meanwhile-devel -mysql-devel -nas-devel -ncurses-devel -neon-devel -netpbm-progs -net-snmp-devel -net-tools -NetworkManager-glib-devel -ocaml -OpenEXR-devel -openldap-devel -openslp-devel -opensp-devel -pam-devel -pciutils-devel -pcre-devel -pcsc-lite-devel -perl -perl(ExtUtils::MakeMaker) -perl(XML::Parser) -pilot-link-devel -poppler-devel -postgresql-devel -pth-devel -pulseaudio-libs-devel -recode -redhat-rpm-config -rpm-build -ruby -ruby-devel -sane-backends-devel -scons -SDL-devel -sip-devel -speex-devel -sqlite-devel -subversion-devel -sword-devel -t1lib-devel -t1utils -taglib-devel -tar -transfig -unixODBC-devel -valgrind -wireless-tools-devel -xine-lib-devel -xmlto -xorg-x11-font-utils -xorg-x11-server-utils -xscreensaver -xscreensaver-extras -xulrunner-devel -xz-devel -texinfo -fontpackages-devel -compat-gcc-34-g77 -dejagnu -expect -python-docutils -texinfo-tex -fdupes -htdig diff --git a/redhat/packages.el6 b/redhat/packages.el6 deleted file mode 100644 index f49cc0207..000000000 --- a/redhat/packages.el6 +++ /dev/null @@ -1,192 +0,0 @@ -GraphicsMagick-devel -ImageMagick-devel -NetworkManager-glib-devel -OpenEXR-devel -SDL-devel -alsa-lib-devel -aspell -aspell-devel -audiofile-devel -autotrace -avahi-devel -bind-devel -binutils-devel -bison -boost-devel -bzip2-devel -ccache -ccrtp-devel -cdparanoia -cdparanoia-devel -chrpath -clucene-core-devel -cmake -commoncpp2-devel -cpp -cppunit-devel -createrepo -cups-devel -db4-devel -dbus-glib-devel -djvulibre -djvulibre-devel -doxygen -emacs -esound-devel -exiv2-devel -fdupes -ffmpeg-devel -fftw-devel -file-devel -flac-devel -fontpackages-devel -fribidi-devel -gamin-devel -gcc -gcc-c++ -gcc-gfortran -gcc-java -gettext-devel -glib-devel -gmp-devel -gnokii-devel -gperf -gpgme-devel -gphoto2-devel -gsl-devel -gstreamer-devel -gstreamer-plugins-base-devel -gtk+-devel -gtk-doc -gtk2-devel -guile-devel -hal-devel -hspell-devel -htdig -html2ps -icu -imake -imlib-devel -jack-audio-connection-kit-devel -jasper-devel -java-1.4.2-gcj-compat-devel -java-1.7.0-openjdk-devel -java-devel -java-openjdk -lame-devel -lcms-devel -libXScrnSa -ver-devel -libXaw-devel -libXcomposite-devel -libXdamage-devel -libXdmcp-devel -libXScrnSaver-devel -libXtst-devel -libXv-devel -libXxf86dga-devel -libXxf86vm-devel -libacl-devel -libarchive-devel -libart_lgpl-devel -libblkid-devel -libcap-devel -libcdio-devel -libconfig-devel -libcurl-devel -libdvdread-devel -libfontenc-devel -libgcj-devel -libgpod-devel -libgsf-devel -libgssapi-devel -libical-devel -libidn-devel -liblo-devel -libmad-devel -libmng-devel -libmp4v2-devel -libmpcdec-devel -libmtp-devel -libmusicbrainz-devel -libofx-devel -libogg-devel -libotr-devel -libpaper-devel -libraw1394-devel -libsamplerate-devel -libsmbclient-devel -libsndfile-devel -libssh2-devel -libtheora-devel -libtiff-devel -libtool -libtool-ltdl-devel -libudev-devel -libutempter-devel -libv4l-devel -libvisual-devel -libvorbis-devel -libwmf-devel -libwpd-devel -libxkbfile-devel -libxslt-devel -libzrtpcpp-devel -lirc-devel -lm_sensors-devel -meanwhile-devel -mysql-devel -nas-devel -neon-devel -net-snmp-devel -net-tools -netpbm-progs -ocaml -ocaml(compiler) -openldap-devel -openslp-devel -opensp-devel -pam-devel -pciutils-devel -pcre-devel -pcsc-lite-devel -perl -perl(ExtUtils::MakeMaker) -perl(XML::Parser) -perl-devel -pilot-link-devel -poppler-devel -postgresql-devel -pth-devel -pulseaudio-libs-devel -recode -redhat-rpm-config -rpm-build -ruby -ruby-devel -sane-backends-devel -scons -sip-devel -speex-devel -sqlite-devel -subversion-devel -sword-devel -t1lib-devel -t1utils -taglib-devel -tar -texinfo -texlive-utils -transfig -udisks-devel -unixODBC-devel -valgrind -wireless-tools-devel -xine-lib-devel -xmlto -xorg-x11-font-utils -xscreensaver -xscreensaver-extras -xulrunner-devel -xz-devel -flex-devel |