From ca6bbdcf85658a61f8c0a6a8132310bb53809c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 18 Jun 2014 19:33:34 +0200 Subject: [PATCH] RPM Packaging: update 3.5.13.2 for RHEL7 --- redhat/Makefile.v3.5.13-sru | 10 +++++----- redhat/build/rpmdist.sh | 6 +++++- .../libksquirrel/libksquirrel-3.5.13.2.spec | 2 +- redhat/tdeaddons/tdeaddons-3.5.13.2.spec | 5 ++--- redhat/tdeartwork/tdeartwork-3.5.13.2.spec | 2 +- redhat/tdebase/tdebase-3.5.13.2.spec | 19 +++++++++++++++---- redhat/tdebindings/tdebindings-3.5.13.2.spec | 3 ++- .../tdemultimedia/tdemultimedia-3.5.13.2.spec | 2 +- 8 files changed, 32 insertions(+), 17 deletions(-) diff --git a/redhat/Makefile.v3.5.13-sru b/redhat/Makefile.v3.5.13-sru index c8c2e61ff..c8f449346 100644 --- a/redhat/Makefile.v3.5.13-sru +++ b/redhat/Makefile.v3.5.13-sru @@ -114,8 +114,8 @@ tdewebdev: tdebase tdesdk ### 3rd party libraries and tools 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 @@ -138,8 +138,8 @@ ifeq ($(wildcard /etc/centos-release),) 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 @@ -399,7 +399,7 @@ 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 diff --git a/redhat/build/rpmdist.sh b/redhat/build/rpmdist.sh index 047fbfaa6..72ccbf453 100755 --- a/redhat/build/rpmdist.sh +++ b/redhat/build/rpmdist.sh @@ -6,7 +6,7 @@ MGA=0 DIST="" if [ -r /etc/redhat-release ]; then - read a b c d e < /etc/redhat-release + read a b c d e f g < /etc/redhat-release elif [ -r /etc/SuSE-release ]; then a="opensuse" fi @@ -31,6 +31,10 @@ case $a in RHEL="${c%%.*}"; DIST=".el${RHEL}" fi ;; + + "Red") + RHEL="${g%%.*}"; DIST=".el${RHEL}" + ;; # Fedora release 15 (Lovelock) Fedora*) FEDORA="${c}"; DIST=".fc${FEDORA}";; # Opensuse diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec index 16c1ca7c4..e1d177c2d 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec +++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec @@ -80,7 +80,7 @@ BuildRequires: xmedcon-devel %if 0%{?fedora} || 0%{?rhel} BuildRequires: librsvg2 %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: librsvg2-tools %endif %if 0%{?mgaversion} || 0%{?mdkversion} diff --git a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec index 1d08e43e6..87138e373 100644 --- a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec +++ b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec @@ -65,14 +65,14 @@ BuildRequires: db4-devel BuildRequires: db5-devel %endif %endif -%if 0%{?fedora} >= 18 +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: libdb-devel BuildRequires: libdb-cxx-devel %endif %if 0%{?suse_version} BuildRequires: libdb-4_8-devel %endif -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: db4-devel %endif %endif @@ -680,7 +680,6 @@ done ########## - %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} diff --git a/redhat/tdeartwork/tdeartwork-3.5.13.2.spec b/redhat/tdeartwork/tdeartwork-3.5.13.2.spec index 6a1759d16..bd3e91d21 100644 --- a/redhat/tdeartwork/tdeartwork-3.5.13.2.spec +++ b/redhat/tdeartwork/tdeartwork-3.5.13.2.spec @@ -639,7 +639,7 @@ This package is part of Trinity, and a component of the TDE artwork module. %{tde_datadir}/applnk/System/ScreenSavers/xmatrix.desktop %endif -%if 0%{?rhel} == 6 +%if 0%{?rhel} >= 6 %{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop %{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop %endif diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec index d2664a156..83e9502a9 100644 --- a/redhat/tdebase/tdebase-3.5.13.2.spec +++ b/redhat/tdebase/tdebase-3.5.13.2.spec @@ -65,7 +65,7 @@ Source5: pamd.kscreensaver-trinity%{?dist} Source6: suse-displaymanagers-tdm # Fedora 18: use SYSTEMD for TDM startup -%if 0%{?fedora} >= 18 +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 Source7: tdm.service%{?dist} %endif @@ -246,6 +246,17 @@ Requires: redhat-indexhtml %define tde_aboutpage /usr/share/doc/HTML/index.html %endif +# RHEL 7 Theme +%if 0%{?rhel} == 7 +Requires: redhat-logos +%define tde_bg /usr/share/backgrounds/day.jpg +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png + +Requires: redhat-indexhtml +%define tde_aboutlabel Enterprise Linux 7 +%define tde_aboutpage /usr/share/doc/HTML/index.html +%endif + # Mageia 2 Theme %if 0%{?mgaversion} == 2 Requires: mageia-theme-Default @@ -433,7 +444,7 @@ BuildRequires: OpenEXR-devel %endif # XSCREENSAVER support -# Disabled on RHEL4 +# Disabled on RHEL4, RHEL >= 7 %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?rhel} == 5 @@ -2146,7 +2157,7 @@ already. Most users won't need this. %if 0%{?suse_version} >= 1210 /usr/lib/X11/displaymanagers/tdm %endif -%if 0%{?fedora} >= 18 +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 /usr/lib/systemd/system/tdm.service %endif %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} @@ -3615,7 +3626,7 @@ EOF %endif # Fedora 18: no more SYSV init script, we have to use systemd. -%if 0%{?fedora} >= 18 +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service" %endif diff --git a/redhat/tdebindings/tdebindings-3.5.13.2.spec b/redhat/tdebindings/tdebindings-3.5.13.2.spec index ff0c96d59..e23b0ce97 100644 --- a/redhat/tdebindings/tdebindings-3.5.13.2.spec +++ b/redhat/tdebindings/tdebindings-3.5.13.2.spec @@ -166,7 +166,7 @@ BuildRequires: java-1.6.0-sun-devel # Others use OpenJDK BuildRequires: java-openjdk BuildRequires: java-devel >= 1.4.2 -%if 0%{?fedora} >= 17 || 0%{?suse_version} >= 1220 || 0%{?mgaversion} >= 3 +%if 0%{?fedora} >= 17 || 0%{?suse_version} >= 1220 || 0%{?mgaversion} >= 3 || 0%{?rhel} >= 7 BuildRequires: java-1.7.0-openjdk-devel %else BuildRequires: java-1.6.0-openjdk-devel @@ -214,6 +214,7 @@ Requires: trinity-libqt0-ruby = %{version}-%{release} TDE/DCOP bindings to non-C++ languages %files +%defattr(-,root,root,-) ########## diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec index 9e5978c22..9451923d3 100644 --- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec +++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec @@ -132,7 +132,7 @@ BuildRequires: libXt-devel %endif # XINE support -%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?fedora} || 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %define with_xine 1 %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?pclinuxos}