diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-12-28 20:24:42 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-12-28 20:24:42 +0100 |
| commit | 173aeaded0e4e6ca4dee09ed401e3c483fd2ff7d (patch) | |
| tree | 7a163adea6ea00b87214328d6f5413dbd6072d16 /redhat | |
| parent | 5ffeb7a6799ee097cb794803e60116821102f305 (diff) | |
| download | tde-packaging-173aeaded0e4e6ca4dee09ed401e3c483fd2ff7d.tar.gz tde-packaging-173aeaded0e4e6ca4dee09ed401e3c483fd2ff7d.zip | |
RPM Packaging: minor update for 3.5.13.2
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/applications/tdesvn/tdesvn-3.5.13.2.spec | 3 | ||||
| -rw-r--r-- | redhat/tdebase/tdebase-3.5.13.2.spec | 28 |
2 files changed, 28 insertions, 3 deletions
diff --git a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec index 332db275e..8fe83ab72 100644 --- a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec +++ b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec @@ -118,7 +118,8 @@ find . -name "*.cmake" -exec %__sed -i {} \ %build -unset QTDIR; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec index b8f3cc267..884f86b9d 100644 --- a/redhat/tdebase/tdebase-3.5.13.2.spec +++ b/redhat/tdebase/tdebase-3.5.13.2.spec @@ -74,8 +74,14 @@ Source7: tdm.service%{?dist} Source7: xdm.oss114 %endif -# Fedora 17: special selinux policy required -%if 0%{?fedora} == 17 ||0%{?fedora} == 19 || 0%{?rhel} == 6 +# Fedora >= 17: special selinux policy required for TDM +# If login through TDM takes ages, then look at '/var/log/audit/audit.log'. +# Locate the line containing 'USER_AVC' and dbus stuff. +# Put this line into a temporary file, then (e.g for Fedora 17): +# audit2allow -i /tmp/file -m tdm.fc17 >tdm.fc17.te +# audit2allow -i /tmp/file -M tdm.fc17 + +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 %define with_selinux_policy 1 Source8: tdm%{?dist}.pp %endif @@ -192,6 +198,18 @@ Requires: fedora-release-notes %define tde_aboutpage /usr/share/doc/fedora-release-notes-19/index.html %endif +# Fedora 20 Theme: "Heisenburg" +%if 0%{?fedora} == 20 +Requires: heisenbug-backgrounds-base +%define tde_bg /usr/share/backgrounds/heisenbug/default/standard/heisenbug.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png + +Requires: fedora-release-notes +%define tde_aboutlabel Fedora 20 +%define tde_aboutpage /usr/share/doc/fedora-release-notes/index.html +%endif + # RHEL 4 Theme %if 0%{?rhel} == 4 Requires: desktop-backgrounds-basic @@ -349,7 +367,12 @@ BuildRequires: glib2-devel BuildRequires: pcre-devel # SASL support +%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} +BuildRequires: %{_lib}sasl2-devel +%endif +%if 0%{?suse_version} BuildRequires: cyrus-sasl-devel +%endif # LIBUSB support BuildRequires: pam-devel @@ -3544,6 +3567,7 @@ EOF # Fedora 18: no more SYSV init script, we have to use systemd. %if 0%{?fedora} >= 18 %__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service" +%__sed -i "s|tdm|kdm|g" "%{?buildroot}/usr/lib/systemd/system/tdm.service" %endif # Symlink TDM configuration |