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

RHEL/Fedora: fixes

Browse Source
pull/3/head
albator 13 years ago
parent 70daaabb4f
commit 4f5750cbaf
9 changed files with 112 additions and 29 deletions
Show Stats Download Patch File Download Diff File

9
redhat/applications/knetworkmanager/trinity-knetworkmanager.spec
Unescape View File

@ -5,7 +5,7 @@
%else %else
%define version 0.8 %define version 0.8
%endif %endif
%define release 1 %define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
@ -77,7 +77,7 @@ Development headers for knetworkmanager
cd knetworkmanager-0.*/src cd knetworkmanager-0.*/src
%patch0 -p3 %patch0 -p3
%patch1 -p3 #patch1 -p3
@ -142,5 +142,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{tde_libdir}/*.so %{tde_libdir}/*.so
%changelog %changelog
* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 * Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2
- Remove faulty patch for WPA authentication
* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
- Initial build - Initial build

4
redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
Unescape View File

@ -37,8 +37,6 @@ BuildRequires: gcc-c++
BuildRequires: dbus-devel BuildRequires: dbus-devel
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel
#Provides: dbus-1-qt
%description %description
Dbus TQT Interface Dbus TQT Interface
@ -54,7 +52,7 @@ Development files for %{name}
%prep %prep
%setup -q -n dependencies/%{name} %setup -q -n dependencies/%{name}
%patch0 -p1 #patch0 -p1
%build %build
unset QTDIR || : ; . /etc/profile.d/qt.sh unset QTDIR || : ; . /etc/profile.d/qt.sh

31
redhat/genrpm.sh
Unescape View File

@ -5,6 +5,7 @@ cd "$( dirname "$0" )"
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
"--auto") AUTO=1;; "--auto") AUTO=1;;
"--version") REQVERSION="$2"; shift;;
*) COMP="$1";; *) COMP="$1";;
esac esac
shift shift
@ -12,6 +13,7 @@ done
clear clear
cat <<EOF cat <<EOF
$(< /etc/redhat-release) $(uname -m)
This script generates RPM of TDE from source tarball. This script generates RPM of TDE from source tarball.
Please choose a TDE component to build. Please choose a TDE component to build.
@ -38,7 +40,11 @@ VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt )
# If no version is set in text file, get version number from source tarball name # If no version is set in text file, get version number from source tarball name
if [ -z "${VERSION}" ]; then if [ -z "${VERSION}" ]; then
set $( cd "${COMP}"; echo ${COMP##*/}*.tar.gz) if [ -n "${REQVERSION}" ]; then
set $( cd "${COMP}"; echo ${COMP##*/}*-${REQVERSION}.tar.gz)
else
set $( cd "${COMP}"; echo ${COMP##*/}*.tar.gz)
fi
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then
select VERSION in $*; do break; done select VERSION in $*; do break; done
elif [ -r "${COMP}/$1" ]; then elif [ -r "${COMP}/$1" ]; then
@ -59,7 +65,12 @@ fi
# Chooses a spec file (if many) # Chooses a spec file (if many)
set $( cd "${COMP}"; echo *.spec ) set $( cd "${COMP}"; echo *.spec )
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then
select SPEC in $*; do break; done if [ -n "${REQVERSION}" ]; then
set $( cd "${COMP}"; echo *-${REQVERSION}.spec )
SPEC="$1"
else
select SPEC in $*; do break; done
fi
elif [ -r "${COMP}/$1" ]; then elif [ -r "${COMP}/$1" ]; then
SPEC="$1" SPEC="$1"
else else
@ -87,6 +98,8 @@ if [ "$(rpm -q --qf '%{arch}' kernel)" = "i686" ]; then
ARGS="${ARGS} --target=i686" ARGS="${ARGS} --target=i686"
fi fi
LOGFILE=/tmp/log.${COMP##*/}
set -x set -x
( (
rpmbuild -ba \ rpmbuild -ba \
@ -95,6 +108,18 @@ rpmbuild -ba \
--define "version ${VERSION:-3.5.13}" \ --define "version ${VERSION:-3.5.13}" \
$ARGS \ $ARGS \
${COMP}/${SPEC} || exit 1 ${COMP}/${SPEC} || exit 1
) 2>&1 | tee /tmp/log ) 2>&1 | tee ${LOGFILE}
RET=$?
set +x set +x
if [ ${RET} -gt 0 ]; then
exit ${RET}
fi
if grep -q "error: Failed build dependencies:" ${LOGFILE}; then
# DEPS=$( sed -n -e "/.* is needed by .*/ s/^[ \t]*\([a-zA-Z2-9_-]*\) .*/\1/p" ${LOGFILE} )
set $( grep " is needed by " ${LOGFILE} | cut -d " " -f1 )
exit 2
fi

27
redhat/kdebase/trinity-kdebase-3.5.13.spec
Unescape View File

@ -2,7 +2,7 @@
%if "%{?version}" == "" %if "%{?version}" == ""
%define version 3.5.13 %define version 3.5.13
%endif %endif
%define release 6 %define release 7
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
@ -63,29 +63,32 @@ Patch8: kdebase-3.5.13-startkde_ldpreload.patch
Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch
## [kdebase/kicker/kicker/ui] ## [kdebase/kicker/kicker/ui]
Patch10: kdebase-3.5.12-kickoff_unstable.patch Patch10: kdebase-3.5.12-kickoff_unstable.patch
## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
Patch11: kdebase-3.5.13-startkde_icon.patch
# Fedora 15 Theme: "Lovelock" # Fedora 15 Theme: "Lovelock"
%if 0%{?fedora} == 15 %if 0%{?fedora} == 15
Requires: lovelock-backgrounds-single Requires: lovelock-backgrounds-single
%define kde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png %define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
%endif %endif
# Fedora 16 Theme: "Verne" # Fedora 16 Theme: "Verne"
%if 0%{?fedora} == 16 %if 0%{?fedora} == 16
Requires: verne-backgrounds-single Requires: verne-backgrounds-single
%define kde_bg /usr/share/backgrounds/verne/default/standard/verne.png %define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
%endif %endif
# RHEL 5 Theme # RHEL 5 Theme
%if 0%{?rhel} == 5 %if 0%{?rhel} == 5
Requires: desktop-backgrounds-basic Requires: desktop-backgrounds-basic
%define kde_bg /usr/share/backgrounds/images/default.jpg %define tde_bg /usr/share/backgrounds/images/default.jpg
%endif %endif
# RHEL 6 Theme # RHEL 6 Theme
%if 0%{?rhel} == 6 %if 0%{?rhel} == 6
Requires: redhat-logos Requires: redhat-logos
%define kde_bg /usr/share/backgrounds/default.png %define tde_bg /usr/share/backgrounds/default.png
%endif %endif
BuildRequires: tqtinterface-devel BuildRequires: tqtinterface-devel
@ -217,20 +220,21 @@ Protocol handlers (KIOslaves) for personal information management, including:
cd kicker/kicker cd kicker/kicker
%patch10 -p0 %patch10 -p0
cd - cd -
%patch11 -p1
# Applies an optional distro-specific graphical theme # Applies an optional distro-specific graphical theme
%if "%{?kde_bg}" != "" %if "%{?tde_bg}" != ""
# KDM Background # KDM Background
%__sed -i "kdm/kfrontend/genkdmconf.c" \ %__sed -i "kdm/kfrontend/genkdmconf.c" \
-e 's,"Wallpaper=isadora.png\n","Wallpaper=%{kde_bg}\n",' -e 's,"Wallpaper=isadora.png\n","Wallpaper=%{tde_bg}\n",'
# TDE user default background # TDE user default background
%__sed -i "kpersonalizer/keyecandypage.cpp" \ %__sed -i "kpersonalizer/keyecandypage.cpp" \
-e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{kde_bg}",' -e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{tde_bg}",'
%__sed -i "startkde" \ %__sed -i "startkde" \
-e 's,/usr/share/wallpapers/isadora.png.desktop,%{kde_bg},' \ -e 's,/usr/share/wallpapers/isadora.png.desktop,%{tde_bg},' \
-e 's,Wallpaper=isadora.png,Wallpaper=%{kde_bg},' -e 's,Wallpaper=isadora.png,Wallpaper=%{tde_bg},'
%endif %endif
%build %build
@ -579,6 +583,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/cmake/*.cmake %{_datadir}/cmake/*.cmake
%changelog %changelog
* Sun Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
- Add distribution-specific start button icon
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6 * Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
- Add graphical theme for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - Add graphical theme for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE - Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE

16
redhat/kdelibs/trinity-kdelibs-3.5.13.spec
Unescape View File

@ -2,7 +2,7 @@
%if "%{?version}" == "" %if "%{?version}" == ""
%define version 3.5.13 %define version 3.5.13
%endif %endif
%define release 2 %define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
@ -145,6 +145,13 @@ cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
%{tde_libdir} %{tde_libdir}
EOF EOF
# Moves the XDG configuration files to TDE directory
%__install -p -D -m644 \
"%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
"%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu"
%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
%clean %clean
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
@ -258,8 +265,8 @@ EOF
%endif %endif
%{_sysconfdir}/ld.so.conf.d/trinity.conf %{_sysconfdir}/ld.so.conf.d/trinity.conf
# Provided by 'redhat-menus' package # Avoid conflict with 'redhat-menus' package
%exclude %{_sysconfdir}/xdg/menus/applications.menu %{_prefix}/etc/xdg/menus/kde-applications.menu
# New in TDE 3.5.13 # New in TDE 3.5.13
%{_bindir}/kdetcompmgr %{_bindir}/kdetcompmgr
@ -285,6 +292,9 @@ EOF
%changelog %changelog
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 * Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Add missing BuildRequires - Add missing BuildRequires

14
redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
Unescape View File

@ -2,7 +2,7 @@
%if "%{?version}" == "" %if "%{?version}" == ""
%define version 3.5.13 %define version 3.5.13
%endif %endif
%define release 2 %define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
@ -223,6 +223,13 @@ for dir in k* ; do
done done
done done
# Moves the XDG configuration files to TDE directory
%__install -p -D -m644 \
"%{?buildroot}%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu" \
"%{?buildroot}%{_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu"
%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
%post %post
/sbin/ldconfig /sbin/ldconfig
@ -351,7 +358,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_datadir}/icons/crystalsvg/*/*/juk* %exclude %{_datadir}/icons/crystalsvg/*/*/juk*
%exclude %{_datadir}/icons/hicolor/*/apps/juk.png %exclude %{_datadir}/icons/hicolor/*/apps/juk.png
/etc/xdg/menus/applications-merged/* %{_prefix}/etc/xdg/menus/applications-merged/*
%{_libdir}/mcop/* %{_libdir}/mcop/*
%{_libdir}/libkdeinit_*.so %{_libdir}/libkdeinit_*.so
#%{_libdir}/liboggarts.so #%{_libdir}/liboggarts.so
@ -404,6 +411,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_libdir}/libyafxplayer.so %exclude %{_libdir}/libyafxplayer.so
%changelog %changelog
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 * Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Updates BuildRequires - Updates BuildRequires

1
redhat/trinity-desktop/trinity-desktop.spec
Unescape View File

@ -44,6 +44,7 @@ Requires: trinity-kdepim >= %{version}
Requires: trinity-kdeutils >= %{version} Requires: trinity-kdeutils >= %{version}
Requires: trinity-kdetoys >= %{version} Requires: trinity-kdetoys >= %{version}
Requires: trinity-repo >= %{version} Requires: trinity-repo >= %{version}
Requires: hal
%description %description
The TDE project aims to keep the KDE3.5 computing style alive, as well as The TDE project aims to keep the KDE3.5 computing style alive, as well as

21
redhat/trinity-live/fedora-live-tde-base.ks
Unescape View File

@ -9,8 +9,11 @@ repo --name=trinity-extras-noarch --baseurl=http://trinity.mangafrance.com/f$rel
%packages %packages
### The KDE-Desktop ### The KDE-Desktop
trinity-desktop trinity-desktop
hal
# TDE is missing a Network Applet, so we use Gnome...
NetworkManager-gnome
### fixes ### fixes
@ -81,6 +84,7 @@ touch /usr/share/icons/hicolor/
# Create user Desktop directory # Create user Desktop directory
mkdir -p /home/liveuser/Desktop mkdir -p /home/liveuser/Desktop
mkdir -p /home/liveuser/Documents
# make sure to set the right permissions and selinux contexts # make sure to set the right permissions and selinux contexts
chown -R liveuser:liveuser /home/liveuser/ chown -R liveuser:liveuser /home/liveuser/
@ -91,4 +95,19 @@ sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink
EOF EOF
# Sets 'nm-applet' to run automatically
mkdir -p /home/liveuser/.trinity/Autostart
cat <<EOF >/home/liveuser/.trinity/Autostart/nm-applet
#!/bin/sh
# Waits until kicker is started, so that
# nm-applet can dock correctly.
while ! pidof kicker; do
sleep 1
done
sleep 3
/usr/bin/nm-applet
EOF
chmod +x /home/liveuser/.trinity/Autostart/nm-applet
%end %end

16
redhat/trinity-live/fedora-livecd-tde.ks
Unescape View File

@ -10,6 +10,9 @@
%include fedora-live-tde-base.ks %include fedora-live-tde-base.ks
%include fedora-live-minimization.ks %include fedora-live-minimization.ks
# 3rd party for VLC
#repo --name=atrpms --baseurl=http://dl.atrpms.net/f$releasever-$basearch/atrpms/stable
%packages %packages
# Additional packages that are not default in trinity-desktop but useful # Additional packages that are not default in trinity-desktop but useful
@ -18,12 +21,13 @@ trinity-live-openbox
# Some TDE applications # Some TDE applications
trinity-amarok trinity-amarok
trinity-digikam #trinity-digikam
trinity-dolphin trinity-dolphin
trinity-gwenview trinity-gwenview
trinity-k3b trinity-k3b
trinity-kaffeine trinity-kaffeine
trinity-kbookreader trinity-kbookreader
#trinity-knetworkmanager
trinity-konversation trinity-konversation
trinity-ksensors trinity-ksensors
trinity-kstreamripper trinity-kstreamripper
@ -31,13 +35,19 @@ trinity-yakuake
# Some TDE translations # Some TDE translations
trinity-kde-i18n-French trinity-kde-i18n-French
trinity-kde-i18n-German #trinity-kde-i18n-German
#trinity-kde-i18n-Spanish trinity-kde-i18n-Spanish
trinity-kde-i18n-Chinese-Big5 trinity-kde-i18n-Chinese-Big5
# 3rd party stuff
#vlc
# Fedora stuff # Fedora stuff
fuse fuse
liveusb-creator liveusb-creator
#wlassistant
#wicd
#wicd-gtk
### more desktop stuff ### more desktop stuff

Write Preview
Loading…
Cancel
Save