RPM Packaging: update packages for 3.5.13.2 under Fedora 19

pull/3/head
François Andriot 11 years ago
parent ed0fc65a82
commit d54fc1da95

@ -0,0 +1,11 @@
--- trinity-koffice-3.5.13.2/lib/kformula/creationstrategy.h.ORI 2013-08-17 16:45:10.505854525 +0200
+++ trinity-koffice-3.5.13.2/lib/kformula/creationstrategy.h 2013-08-17 16:45:15.120749288 +0200
@@ -86,7 +86,7 @@
*/
class OrdinaryCreationStrategy : public ElementCreationStrategy {
public:
- virtual BasicElement* createElement( TQString type, const TQDomElement& element = 0 );
+ virtual BasicElement* createElement( TQString type, const TQDomElement& element );
virtual TextElement* createTextElement( const TQChar& ch, bool symbol=false );
virtual EmptyElement* createEmptyElement();

@ -0,0 +1,11 @@
--- trinity-krusader-3.5.13.2/krusader/VFS/temp_vfs.cpp.ORI 2013-08-17 18:57:18.857074444 +0200
+++ trinity-krusader-3.5.13.2/krusader/VFS/temp_vfs.cpp 2013-08-17 18:57:21.352017680 +0200
@@ -56,7 +56,7 @@
}
temp_vfs::~temp_vfs(){
- if( vfs_type == "-iso" ){
+ if( vfs_type == TEMP ){
// unmount the ISO image
KShellProcess umount;
umount << "umount -f" << tmpDir;

@ -0,0 +1,11 @@
--- trinity-ktechlab-3.5.13.2/microbe/pic14.cpp.ORI 2013-08-17 17:57:55.624307580 +0200
+++ trinity-ktechlab-3.5.13.2/microbe/pic14.cpp 2013-08-17 17:58:11.174961943 +0200
@@ -277,7 +277,7 @@
bool PIC14::isValidInterrupt( const TQString & interruptName ) const
{
- if(m_type == "P16F84" || m_type =="P16C84")
+ if(m_type == P16F84 || m_type == P16C84)
{
return ( interruptName == "change" ||
interruptName == "timer" ||

@ -0,0 +1,264 @@
#!/bin/bash
tdp='cd ~/tde/tde-packaging/redhat'
grp='tdp; ./genrpm.sh -v 3.5.13.2 -a'
BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)"
BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)"
DIST="$(rpm -E %{dist})"
if [ -x /usr/sbin/urpmi ]; then
PKGMGR="urpmi"
PKGINST='sudo urpmi --auto --no-verify-rpm'
PKGDEL='sudo urpme --auto'
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"
elif [ -x /usr/bin/yum ]; then
PKGMGR="yum"
PKGINST='sudo yum install -y'
PKGDEL='sudo yum remove -y'
REPOUPDATE='(cd $(rpm -E %{_rpmdir}); createrepo $(uname -i); createrepo noarch; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
fi
BUILDDIR=$(rpm -E "%{_builddir}")
echo "Package Manager is '${PKGMGR}'"
pkg_listlocal() {
rpm -qa --qf "%{name} %{buildhost}\n" | while read a b; do case "$b" in *.vtf) echo $a;; esac;done
}
pkg_delall() {
PKGDEL $(pkg_listlocal)
}
is_installed() {
rpm -q "$1" &>/dev/null
return $?
}
# Build package if not already installed
grpi() {
if ! is_installed "${1##*/}" && ! is_installed trinity-"${1##*/}"; then
eval ${grp} ${1}
RET=$?
if [ $RET -gt 0 ]; then
echo "ERROR $RET !!!"
exit $RET
fi
fi
}
# Build package if not already installed, then update repo
grpiu() {
if ! is_installed "${1##*/}" && ! is_installed trinity-"${1##*/}"; then
grpi "$1"
eval ${REPOUPDATE}
fi
}
# Build package if not already installed, then update repo, then install package
grpiui() {
if ! is_installed "${1##*/}" && ! is_installed trinity-"${1##*/}"; then
grpiu "$1"
eval ${PKGINST} "trinity-${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
grpiu "$1"
eval ${PKGINST} "trinity-${1##*/}"
eval ${PKGINST} "trinity-${1##*/}-devel"
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
grpiud dependencies/tqtinterface
grpiud dependencies/arts
grpiud dependencies/avahi-tqt
grpiud dependencies/dbus-1-tqt
grpiud dependencies/dbus-tqt
grpiud dependencies/libcaldav
grpiud dependencies/libcarddav
grpiud dependencies/tqca
grpiu dependencies/tqca-tls
# Build akode now, required for some packages later ...
grpiud extras/akode
# Build main
# basic packages
grpiud tdelibs
grpiud tdebase
# Main packages which are required by later main packages
grpiud tdepim
grpiud tdemultimedia
grpiud tdegames
grpiud tdebindings
grpiud tdegraphics
grpiud tdenetwork
# other main packages
grpiui tdeaccessibility
grpiui tdeaddons
grpiui tdeadmin
grpiui tdeartwork
grpiui tdeedu
grpiui tdetoys
grpiui tdeutils
grpiu extras/trinity-desktop
eval ${PKGINST} trinity-desktop
# Disable trinity repository from here !!!
# devel packages
grpiud tdesdk
grpiui tdevelop
grpiui tdewebdev
eval ${PKGINST} trinity-desktop-devel
# Build libraries
grpiud libraries/libkdcraw
grpiud libraries/libkexiv2
grpiud libraries/libkipi
grpiud libraries/libksquirrel
grpiud libraries/python-trinity
grpiud libraries/pytdeextensions
# Build applications
# K3B is required later for k9copy
grpiud applications/k3b
# other applications, any order ...
grpiui applications/abakus
#grpiui applications/adept
grpiui applications/amarok
grpiui applications/basket
grpiui applications/bibletime
#grpiui applications/compizconfig-backend-kconfig
grpiui applications/digikam
grpiui applications/dolphin
grpiui applications/filelight
#grpiui applications/filelight-l10n
#grpiui applications/fusion-icon
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
fi
grpiui applications/k9copy
grpiui applications/kaffeine
grpiui applications/kaffeine-mozilla
grpiui applications/katapult
grpiui applications/kbarcode
grpiui applications/kbfx
grpiui applications/kbookreader
grpiui applications/kchmviewer
grpiui applications/kcmautostart
grpiui applications/kcpuload
grpiui applications/kdbusnotification
grpiui applications/kdiff3
grpiui applications/kdirstat
grpiui applications/keep
#grpiui applications/kerry
grpiui applications/kile
grpiui applications/kima
grpiui applications/kiosktool
grpiui applications/kmplayer
grpiui applications/kmyfirewall
grpiui applications/kmymoney
grpiui applications/knemo
grpiui applications/knetload
grpiui applications/knetstats
#grpiui applications/knetworkmanager
grpiui applications/knights
grpiui applications/knowit
grpiui applications/knutclient
if ! is_installed trinity-koffice-suite; then
grpiu applications/koffice
eval ${PKGINST} trinity-koffice-suite
fi
if ! is_installed trinity-koffice-i18n-French; then
grpiu applications/koffice-i18n
eval ${PKGINST} trinity-koffice-i18n-French
fi
grpiui applications/konversation
grpiui applications/kopete-otr
grpiui applications/kpicosim
grpiui applications/kpilot
grpiui applications/kpowersave
grpiui applications/krename
grpiui applications/krusader
grpiui applications/ksplash-engine-moodin
grpiui applications/ksquirrel
grpiui applications/kstreamripper
grpiui applications/ksystemlog
grpiui applications/ktechlab
grpiui applications/ktorrent
grpiui applications/kuickshow
grpiui applications/kvirc
grpiui applications/kvkbd
grpiui applications/piklab
grpiui applications/potracegui
grpiui applications/rosegarden
grpiui applications/smartcardauth
grpiui applications/smb4k
grpiui applications/soundkonverter
grpiui applications/tde-guidance
grpiui applications/tdeio-apt
grpiui applications/tdeio-locate
grpiui applications/tdeio-umountwrapper
grpiui applications/tderadio
grpiui applications/tde-style-lipstik
grpiui applications/tde-style-qtcurve
grpiui applications/tdesudo
grpiui applications/tdesvn
grpiui applications/tde-systemsettings
grpiui applications/tdmtheme
grpiui applications/tellico
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
grpiui applications/kgtk-qt3
# Build extra packages
grpiui extras/icons-crystalsvg-updated
grpiui extras/icons-kfaenza
grpiui extras/icons-oxygen
#grpiui extras/kasablanca
#grpiui applications/kbibtex
#grpiui applications/kbiff
#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

@ -1,20 +0,0 @@
--- ./kcontrol/kcontrol/KControl.desktop~ 2013-01-09 02:12:13.000000000 +0100
+++ ./kcontrol/kcontrol/KControl.desktop 2013-05-08 17:55:54.250733219 +0200
@@ -5,7 +5,7 @@
DocPath=kcontrol/index.html
X-KDE-StartupNotify=true
-Name=Control Center
+Name=Trinity Control Center
Name[af]=Beheer Sentrum
Name[ar]=مركز التحكم
Name[az]=İdarə Mərkəzi
@@ -28,7 +28,7 @@
Name[eu]=Kontrol gunea
Name[fa]=مرکز کنترل
Name[fi]=Ohjauskeskus
-Name[fr]=Centre de configuration de KDE
+Name[fr]=Centre de configuration de Trinity
Name[fy]=Konfiguraasjesintrum
Name[ga]=Lárionad Rialaithe
Name[gl]=Centro de Control

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save