TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM Packaging: update 3.5.13.2 for RHEL7

Browse Source
pull/3/head
François Andriot 11 years ago
parent 470510a717
commit ca6bbdcf85
8 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File

10
redhat/Makefile.v3.5.13-sru
Unescape View File

@ -114,8 +114,8 @@ tdewebdev: tdebase tdesdk
### 3rd party libraries and tools ### 3rd party libraries and tools
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
@ -138,8 +138,8 @@ ifeq ($(wildcard /etc/centos-release),)
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
@ -399,7 +399,7 @@ 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

6
redhat/build/rpmdist.sh
Unescape View File

@ -6,7 +6,7 @@ MGA=0
DIST="" DIST=""
if [ -r /etc/redhat-release ]; then 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 elif [ -r /etc/SuSE-release ]; then
a="opensuse" a="opensuse"
fi fi
@ -31,6 +31,10 @@ case $a in
RHEL="${c%%.*}"; DIST=".el${RHEL}" RHEL="${c%%.*}"; DIST=".el${RHEL}"
fi fi
;; ;;
"Red")
RHEL="${g%%.*}"; DIST=".el${RHEL}"
;;
# Fedora release 15 (Lovelock) # Fedora release 15 (Lovelock)
Fedora*) FEDORA="${c}"; DIST=".fc${FEDORA}";; Fedora*) FEDORA="${c}"; DIST=".fc${FEDORA}";;
# Opensuse # Opensuse

2
redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
Unescape View File

@ -80,7 +80,7 @@ BuildRequires: xmedcon-devel
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
BuildRequires: librsvg2 BuildRequires: librsvg2
%endif %endif
%if 0%{?fedora} %if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: librsvg2-tools BuildRequires: librsvg2-tools
%endif %endif
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}

5
redhat/tdeaddons/tdeaddons-3.5.13.2.spec
Unescape View File

@ -65,14 +65,14 @@ BuildRequires: db4-devel
BuildRequires: db5-devel BuildRequires: db5-devel
%endif %endif
%endif %endif
%if 0%{?fedora} >= 18 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
BuildRequires: libdb-devel BuildRequires: libdb-devel
BuildRequires: libdb-cxx-devel BuildRequires: libdb-cxx-devel
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: libdb-4_8-devel BuildRequires: libdb-4_8-devel
%endif %endif
%if 0%{?rhel} %if 0%{?rhel} && 0%{?rhel} <= 6
BuildRequires: db4-devel BuildRequires: db4-devel
%endif %endif
%endif %endif
@ -680,7 +680,6 @@ done
########## ##########
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}

2
redhat/tdeartwork/tdeartwork-3.5.13.2.spec
Unescape View File

@ -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 %{tde_datadir}/applnk/System/ScreenSavers/xmatrix.desktop
%endif %endif
%if 0%{?rhel} == 6 %if 0%{?rhel} >= 6
%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop %{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop %{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop
%endif %endif

19
redhat/tdebase/tdebase-3.5.13.2.spec
Unescape View File

@ -65,7 +65,7 @@ Source5: pamd.kscreensaver-trinity%{?dist}
Source6: suse-displaymanagers-tdm Source6: suse-displaymanagers-tdm
# Fedora 18: use SYSTEMD for TDM startup # Fedora 18: use SYSTEMD for TDM startup
%if 0%{?fedora} >= 18 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
Source7: tdm.service%{?dist} Source7: tdm.service%{?dist}
%endif %endif
@ -246,6 +246,17 @@ Requires: redhat-indexhtml
%define tde_aboutpage /usr/share/doc/HTML/index.html %define tde_aboutpage /usr/share/doc/HTML/index.html
%endif %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 # Mageia 2 Theme
%if 0%{?mgaversion} == 2 %if 0%{?mgaversion} == 2
Requires: mageia-theme-Default Requires: mageia-theme-Default
@ -433,7 +444,7 @@ BuildRequires: OpenEXR-devel
%endif %endif
# XSCREENSAVER support # XSCREENSAVER support
# Disabled on RHEL4 # Disabled on RHEL4, RHEL >= 7
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
%define with_xscreensaver 1 %define with_xscreensaver 1
%if 0%{?rhel} == 5 %if 0%{?rhel} == 5
@ -2146,7 +2157,7 @@ already. Most users won't need this.
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
/usr/lib/X11/displaymanagers/tdm /usr/lib/X11/displaymanagers/tdm
%endif %endif
%if 0%{?fedora} >= 18 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
/usr/lib/systemd/system/tdm.service /usr/lib/systemd/system/tdm.service
%endif %endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
@ -3615,7 +3626,7 @@ EOF
%endif %endif
# Fedora 18: no more SYSV init script, we have to use systemd. # 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" %__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
%endif %endif

3
redhat/tdebindings/tdebindings-3.5.13.2.spec
Unescape View File

@ -166,7 +166,7 @@ BuildRequires: java-1.6.0-sun-devel
# Others use OpenJDK # Others use OpenJDK
BuildRequires: java-openjdk BuildRequires: java-openjdk
BuildRequires: java-devel >= 1.4.2 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 BuildRequires: java-1.7.0-openjdk-devel
%else %else
BuildRequires: java-1.6.0-openjdk-devel BuildRequires: java-1.6.0-openjdk-devel
@ -214,6 +214,7 @@ Requires: trinity-libqt0-ruby = %{version}-%{release}
TDE/DCOP bindings to non-C++ languages TDE/DCOP bindings to non-C++ languages
%files %files
%defattr(-,root,root,-)
########## ##########

2
redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
Unescape View File

@ -132,7 +132,7 @@ BuildRequires: libXt-devel
%endif %endif
# XINE support # 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 %define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos} %if 0%{?pclinuxos}

Write Preview
Loading…
Cancel
Save