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 R14 packages

Browse Source
pull/3/head
François Andriot 11 years ago
parent 9deeed971d
commit 04dae63720
6 changed files with 114 additions and 74 deletions
Show Stats Download Patch File Download Diff File

110
redhat/buildall-r14.sh
Unescape View File

@ -1,7 +1,8 @@
#!/bin/bash
export PATH="$(dirname $0):${PATH}"
tdp='cd ~/tde/tde-packaging/redhat'
#grp='tdp; ./genrpm.sh -v 3.5.13.2 -a'
grp='./genrpm.sh -v 14.0.0 -a'
BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)"
@ -15,8 +16,9 @@ if [ -x /usr/sbin/urpmi ]; then
REPOUPDATE='(cd $(rpm -E %{_rpmdir}); genhdlist2 --clean --allow-empty noarch; genhdlist2 --clean --allow-empty $(uname -i); sudo urpmi.update rpmbuild.$(uname -i) rpmbuild.noarch)'
elif [ -x /usr/bin/zypper ]; then
PKGMGR="zypper"
PKGINST="zypper install -y"
PKGDEL="zypper remove -y"
PKGINST="sudo zypper install -y"
PKGDEL="sudo zypper remove -y"
REPOUPDATE='(cd $(rpm -E %{_rpmdir}); createrepo $(uname -i); createrepo noarch; sudo zypper refresh)'
elif [ -x /usr/bin/yum ]; then
PKGMGR="yum"
PKGINST='sudo yum install -y'
@ -43,7 +45,7 @@ is_installed() {
# Build package if not already installed
grpi() {
if ! is_installed "${1##*/}" && ! is_installed trinity-"${1##*/}"; then
if ! is_installed trinity-"${1##*/}"; then
eval ${grp} ${1}
RET=$?
if [ $RET -gt 0 ]; then
@ -54,32 +56,28 @@ grpi() {
}
# Build package if not already installed, then update repo
grpiu() {
if ! is_installed "${1##*/}" && ! is_installed trinity-"${1##*/}"; then
if ! is_installed trinity-"${1##*/}"; then
grpi "$1"
eval ${REPOUPDATE}
eval ${REPOUPDATE} || exit 1
fi
}
# Build package if not already installed, then update repo, then install package
grpiui() {
if ! is_installed "${1##*/}" && ! is_installed trinity-"${1##*/}"; then
if ! is_installed trinity-"${1##*/}"; then
grpiu "$1"
eval ${PKGINST} "trinity-${1##*/}"
eval ${PKGINST} "trinity-${1##*/}" || exit 1
fi
}
# Build package if not already installed, then update repo, then install -devel package
grpiud() {
if ! is_installed "${1##*/}" && ! is_installed trinity-"${1##*/}"; then
if ! is_installed trinity-"${1##*/}"; then
grpiu "$1"
eval ${PKGINST} "trinity-${1##*/}"
eval ${PKGINST} "trinity-${1##*/}-devel"
eval ${PKGINST} "trinity-${1##*/}" || exit 1
eval ${PKGINST} "trinity-${1##*/}-devel" || exit 1
fi
}
# Build dependencies
#if ! rpm -q libqt3-devel && ! rpm -q lib64qt3-devel && ! rpm -q qt3-devel; then
# grpiu dependencies/qt3
# eval ${PKGINST} qt3-devel
#fi
# TDE dependencies
grpiud dependencies/tqt3
grpiud dependencies/tqtinterface
grpiud dependencies/arts
@ -90,12 +88,11 @@ grpiud dependencies/libart-lgpl
grpiud dependencies/libcaldav
grpiud dependencies/libcarddav
grpiud dependencies/tqca
grpiu dependencies/tqca-tls
# Build akode now, required for some packages later ...
# Extra dependencies
grpiud extras/akode
# Build main
# TDE main
# basic packages
grpiud tdelibs
grpiud tdebase
@ -117,13 +114,23 @@ grpiui tdeartwork
grpiui tdeedu
grpiui tdetoys
grpiui tdeutils
grpiu extras/trinity-desktop
eval ${PKGINST} trinity-desktop
if ! is_installed trinity-desktop; then
grpiu extras/trinity-desktop
eval ${PKGINST} trinity-desktop || exit 1
# Disable trinity repository from here !!!
if [ -r "/etc/yum.repos.d/trinity-3.5.13.repo" ]; then
sed -i "/etc/yum.repos.d/trinity-3.5.13.repo" -e "s|enabled=.*|enabled=0|g"
fi
fi
# devel packages
grpiud tdesdk
grpiui tdevelop
grpiui tdewebdev
eval ${PKGINST} trinity-desktop-devel
if ! is_installed trinity-desktop-devel; then
eval ${PKGINST} trinity-desktop-devel || exit 1
fi
# Build libraries
grpiud libraries/libkdcraw
@ -135,6 +142,16 @@ grpiui libraries/libtqt-perl
grpiud libraries/python-trinity
grpiud libraries/pytdeextensions
# Extra libraries
if ! is_installed imlib1-devel; then
grpiu 3rdparty/imlib1
eval ${PKGINST} imlib1-devel || exit 1
fi
if ! is_installed torsocks; then
grpiu 3rdparty/torsocks
eval ${PKGINST} torsocks || exit 1
fi
# Build applications
# K3B is required later for k9copy
grpiud applications/k3b
@ -154,11 +171,12 @@ grpiui applications/gwenview
grpiui applications/gwenview-i18n
if ! is_installed trinity-k3b-i18n-French; then
grpiu applications/k3b-i18n
eval ${PKGINST} trinity-k3b-i18n-French
eval ${PKGINST} trinity-k3b-i18n-French || exit 1
fi
grpiui applications/k9copy
grpiui applications/kaffeine
grpiui applications/kaffeine-mozilla
grpiui applications/kasablanca
grpiui applications/katapult
grpiui applications/kbarcode
grpiui applications/kbfx
@ -178,6 +196,7 @@ grpiui applications/kdirstat
grpiui applications/keep
grpiui applications/kerberostray
#grpiui applications/kerry
grpiui applications/kftpgrabber
grpiui applications/kile
grpiui applications/kima
grpiui applications/kiosktool
@ -190,6 +209,7 @@ grpiui applications/knetstats
#grpiui applications/knetworkmanager
grpiui applications/knights
grpiui applications/knowit
grpiui applications/knmap
grpiui applications/knutclient
if ! is_installed trinity-koffice-suite; then
grpiu applications/koffice
@ -203,9 +223,13 @@ grpiui applications/konversation
grpiui applications/kopete-otr
grpiui applications/kpicosim
grpiui applications/kpilot
grpiui applications/kpowersave
#grpiui applications/kpowersave
grpiui applications/krecipes
grpiui applications/krename
grpiui applications/krusader
grpiui applications/ksensors
grpiui applications/kshowmail
grpiui applications/kshutdown
grpiui applications/ksplash-engine-moodin
grpiui applications/ksquirrel
grpiui applications/kstreamripper
@ -216,6 +240,7 @@ grpiui applications/kuickshow
grpiui applications/kvirc
grpiui applications/kvkbd
grpiui applications/kvpnc
grpiui applications/mplayerthumbs
grpiui applications/piklab
grpiui applications/potracegui
grpiui applications/rosegarden
@ -224,6 +249,10 @@ grpiui applications/smb4k
grpiui applications/soundkonverter
grpiui applications/tde-guidance
grpiui applications/tdeio-apt
if ! is_installed trinity-tdeio-ftps; then
grpiu applications/tdeio-ftps
eval ${PKGINST} trinity-tdeio-ftps || exit 1
fi
grpiui applications/tdeio-locate
grpiui applications/tdeio-umountwrapper
grpiui applications/tdenetworkmanager
@ -236,45 +265,40 @@ grpiui applications/tdesvn
grpiui applications/tde-systemsettings
grpiui applications/tdmtheme
grpiui applications/tellico
grpiui applications/tork
grpiui applications/twin-style-crystal
grpiui applications/wlassistant
grpiui applications/yakuake
eval ${PKGINST} trinity-desktop-applications
# Decoration-related stuff are distribution-dependant.
grpiui applications/gtk-qt-engine
[ "${DIST:0:3}" = ".el" ] || grpiui applications/gtk3-tqt-engine
grpiui applications/qt4-tqt-theme-engine
grpiui applications/kgtk-qt3
if [ "${DIST}" != ".el4" ] && [ "${DIST}" != ".el5" ]; then
grpiui applications/gtk-qt-engine
#grpiui applications/kgtk-qt3
fi
if ! is_installed trinity-desktop-applications; then
eval ${PKGINST} trinity-desktop-applications || exit 1
fi
if ! is_installed trinity-desktop-all; then
eval ${PKGINST} trinity-desktop-all || exit 1
fi
exit 0
# Build extra packages
grpiui extras/icons-crystalsvg-updated
grpiui extras/icons-kfaenza
grpiui extras/icons-oxygen
grpiui extras/kasablanca
#grpiui extras/kcheckgmail
#grpiui extras/kdebluetooth
grpiui extras/kftpgrabber
grpiui extras/kickoff-i18n
grpiui extras/knmap
#grpiui extras/knoda
grpiui extras/ksensors
grpiui extras/kshowmail
grpiui extras/mplayerthumbs
grpiui extras/style-ia-ora
if ! is_installed trinity-tdeio-ftps-plugin; then
grpiu extras/tdeio-ftps
eval ${PKGINST} trinity-tdeio-ftps-plugin
fi
#grpiui extras/tdeio-sysinfo
grpiui extras/theme-baghira
grpiu 3rdparty/torsocks
eval ${PKGINST} torsocks
grpiui extras/tork
#grpiui extras/trinity-desktop
#grpiui extras/trinity-live
grpiui extras/twinkle
eval ${PKGINST} trinity-desktop-extras
eval ${PKGINST} trinity-desktop-all

4
redhat/dependencies/tqca-tls/tqca-tls-qt3.patch
Unescape View File

@ -49,7 +49,7 @@
// Make sure tqtinterface can be found
- conf->addIncludePath("/usr/include/tqt");
+ conf->addIncludePath("/opt/trinity/include/tqt");
+ conf->addIncludePath("/usr/include/tqt");
+ // Make sure tqt3 can be found
+ conf->addIncludePath("${QTINC:-${QTDIR}/include}");
@ -69,7 +69,7 @@
CONFIG += qt x11 thread console
TARGET = conf
-INCLUDEPATH += '/usr/include/tqt'
+INCLUDEPATH += '/opt/trinity/include/tqt' '${QTINC:-${QTDIR}/include}'
+INCLUDEPATH += '/usr/include/tqt' '${QTINC:-${QTDIR}/include}'
DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"'
DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"'

2
redhat/dependencies/tqca/tqca-1.0-fix_qt3_detection.patch
Unescape View File

@ -96,7 +96,7 @@
TARGET = conf
-INCLUDEPATH += '/usr/include/tqt'
+INCLUDEPATH += '${QTINC:-${QTDIR}/include}'
+INCLUDEPATH += '/opt/trinity/include/tqt'
+INCLUDEPATH += '/usr/include/tqt'
DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"'
DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"'

13
redhat/dependencies/tqscintilla/tqscintilla-14.0.0-ftbfs.patch
Unescape View File

@ -1,5 +1,14 @@
--- trinity-tqscintilla-14.0.0~pre20+a3562a94/qt/qscintilla.pro.ORI 2013-07-02 19:27:56.391143562 +0200
+++ trinity-tqscintilla-14.0.0~pre20+a3562a94/qt/qscintilla.pro 2013-07-02 19:30:59.279346578 +0200
--- trinity-tqscintilla-14.0.0~pre20+a3562a94/qt/qscintilla.pro.ftbfs 2013-07-21 10:56:22.714582322 +0200
+++ trinity-tqscintilla-14.0.0~pre20+a3562a94/qt/qscintilla.pro 2013-09-02 20:00:39.455251114 +0200
@@ -27,7 +27,7 @@
TARGET = qscintilla
# DESTDIR = $(QTDIR)/lib
CONFIG += qt warn_off release dll thread
-INCLUDEPATH = . ../include ../src /usr/include/tqt
+INCLUDEPATH = . ../include ../src /usr/include/tqt /usr/include/tqt3
DEFINES = QEXTSCINTILLA_MAKE_DLL QT SCI_LEXER
HEADERS = \
@@ -211,10 +211,10 @@
qscintilla_ru.ts

55
redhat/extras/akode/akode-14.0.0.spec
Unescape View File

@ -21,13 +21,15 @@
Summary: Audio-decoding framework
Name: trinity-akode
Version: 2.0.2
Release: 5%{?dist}%{?_variant}
Release: 6%{?dist}%{?_variant}
License: LGPLv2+
Group: System Environment/Libraries
#URL: http://carewolf.com/akode/
URL: http://www.kde-apps.org/content/show.php?content=30375
Source0: akode-2.0.2.tar.bz2
Source1: admin-14.0.0.tar.gz
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -43,6 +45,7 @@ Patch4: akode-2.0.2-gcc43.patch
Patch10: akode-autotools.patch
Patch11: akode-2.0.2-fix_ffmpeg_include.patch
Patch12: akode-2.0.2-fix_ftbfs.patch
Patch13: akode-14.0.0-ftbfs.patch
# FLAC support
%define _with_flac --with-flac
@ -282,29 +285,44 @@ Requires: %{name} = %{version}-%{release}
%prep
%setup -q -n akode-%{version}
%__rm -rf admin
tar xfz %{SOURCE1}
%patch1 -p1 -b .pulseaudio
%patch2 -p1 -b .multilib
%patch3 -p4 -b .flac113_portable
%patch4 -p1 -b .gcc43
%patch10 -p1 -b .autotools
#patch10 -p1 -b .autotools
%patch11 -p1 -b .ffmpeg
%patch12 -p1 -b .ftbfs
%patch13 -p1 -b .ftbfs
%__rm -f libtool acinclude.m4 configure.in Makefile.cvs aclocal.m4
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f admin/Makefile.common cvs
%__make -f admin/Makefile.common
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
%configure \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_includedir} \
--datadir=%{tde_datadir} \
--disable-static \
--enable-shared \
--disable-debug --disable-warnings --disable-dependency-tracking \
\
--disable-dependency-tracking \
--disable-debug \
--enable-new-ldflags \
--enable-final \
--enable-closure \
--enable-rpath \
--enable-gcc-hidden-visibility \
\
--without-libltdl \
--with-alsa \
--with-oss \
@ -315,18 +333,18 @@ Requires: %{name} = %{version}-%{release}
--with-speex \
--with-vorbis \
--without-ffmpeg \
%{?_with_libmad} %{!?_with_libmad:--without-libmad} \
--enable-closure \
--enable-new-ldflags \
--enable-final
%{?_with_libmad} %{!?_with_libmad:--without-libmad}
%__make %{?_smp_mflags}
%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
%install
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
# unpackaged files
%__rm -f %{buildroot}%{tde_libdir}/*.a
# rpmdocs
for file in AUTHORS COPYING NEWS README TODO ; do
test -s "$file" && install -p -m644 -D "$file" "rpmdocs/$file"
@ -338,18 +356,5 @@ done
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-5
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-6
- Initial release for TDE 14.0.0
* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-4
- Initial release for TDE 3.5.13.2
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3
- Initial release for TDE 3.5.13.1
* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-2
- Re-adds '.la' files
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-1
- Port to TDE 3.5.13
- Based on spec file from Fedora 9 'akode-2.0.2-5'

4
redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
Unescape View File

@ -160,7 +160,6 @@ Requires: trinity-smb4k
Requires: trinity-smartcardauth
Requires: trinity-soundkonverter
Requires: trinity-tde-guidance
Requires: trinity-tde-guidance-powermanager
Requires: trinity-tde-style-lipstik
Requires: trinity-tde-style-qtcurve
Requires: trinity-tde-systemsettings
@ -180,6 +179,9 @@ Requires: trinity-twin-style-crystal
Requires: trinity-wlassistant
Requires: trinity-yakuake
# Obsolete stuff in R14
Obsoletes: trinity-tde-guidance-powermanager
# Decoration-related stuff (not installed by default)
#Requires: trinity-kgtk-qt3
#Requires: trinity-gtk-qt-engine

Write Preview
Loading…
Cancel
Save