RPM Packaging: update for 14.0.2

pull/3/head
François Andriot 9 years ago
parent 10d8be91c9
commit e187705a4c

@ -21,15 +21,18 @@ buildpkg = \
all: dependencies main libraries applications i18n meta extras
dependencies: tqt3 tqtinterface arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt akode
dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt
main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
libraries: libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
applications: abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
applications: abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kooldock kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
extras: icons-nuvola kdevmon kdissert klamav klibido knoda kompose koverartist kpacman mathemagics png2qrgb style-ia-ora
### Trinity Dependencies
akode: tqtinterface trinity-filesystem
$(call buildpkg,dependencies/akode)
arts: tqtinterface trinity-filesystem esound cmake
$(call buildpkg,dependencies/arts)
@ -141,8 +144,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
endif
cmake:
# Build on CentOS 5/6 only
ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
# Build on CentOS 5 only
ifneq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,3rdparty/cmake)
endif
@ -153,8 +156,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el7*),)
endif
esound:
# Build on Mageia and CentOS >= 7
ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),)
# Build on Mageia and CentOS >= 7 and Fedora >= 23
ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7* /boot/vmlinuz*.fc23*),)
$(call buildpkg,3rdparty/esound)
endif
@ -249,9 +252,6 @@ ifeq ($(wildcard /etc/mageia-release /etc/SuSE-release /etc/pclinuxos-release),)
endif
### Extra packages
akode: tqtinterface
$(call buildpkg,dependencies/akode)
cmake-macros: cmake
ifneq ($(wildcard /etc/SuSE-release),)
$(call buildpkg,extras/trinity-cmake-macros)
@ -491,6 +491,9 @@ koffice: tdebase wv2
konversation: tdebase
$(call buildpkg,applications/konversation)
kooldock: tdebase
$(call buildpkg,applications/kooldock)
kopete-otr: tdebase
$(call buildpkg,applications/kopete-otr)

@ -35,7 +35,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.91
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Calculator for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -41,7 +41,7 @@
Name: trinity-%{tde_pkg}
Summary: Package management suite for Trinity
Version: 2.1.3
Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
License: GPLv2+
Group: Applications/Utilities

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.4.10
Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Media player for TDE
Group: Applications/Multimedia
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0.3.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Taking care of your ideas
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.6.6.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: A bible study tool for Trinity
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.9.6
Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Digital photo management application for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.9.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: File manager for TDE focusing on usability
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Graphical disk usage display
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.8
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Theme engine using Qt for GTK+ 2.x and Trinity
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.5
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: GTK3 theme engine for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.4.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Internationalization support for Gwenview [Trinity]
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.4.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Gwenview is an image viewer for TDE.
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0.5
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Internationalization support for TDE [Trinity]
Group: Applications/Archiving
URL: http://www.trinitydesktop.org/

@ -39,7 +39,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0.5
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: CD/DVD burning application
Group: Applications/Archiving
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.2.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: DVD backup tool for Trinity
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -41,7 +41,7 @@
Name: trinity-%{tde_pkg}
Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity]
Version: 0.4.3.1
Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
License: GPLv2+
Group: Applications/Multimedia

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.8.8
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/

@ -1,27 +0,0 @@
--- trinity-kasablanca-14.0.0~pre22+07aa7379/src/ftpthread.cpp.ORI 2014-02-19 22:52:20.875005485 +0100
+++ trinity-kasablanca-14.0.0~pre22+07aa7379/src/ftpthread.cpp 2014-02-19 22:53:01.488995960 +0100
@@ -1094,8 +1094,8 @@
bool FtpThread::FormatFilelist(const char *filename, TQString current, filist *dirtable, filist *filetable)
{
- int i, blocks, space, month_int = 1;
- unsigned int loc, fileloc, datebegin, sizebegin = 0;
+ int i, blocks, space, month_int = 1, loc;
+ unsigned int fileloc, datebegin, sizebegin = 0;
string buffer, filestring;
FILE* dirfile;
diff --git a/src/Makefile.am b/src/Makefile.am
index 0b6b597..8cf8cb2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,8 +25,7 @@ kasablanca_LDFLAGS = $(TDE_RPATH) $(all_libraries)
kasablanca_LDADD = -lssl $(LIB_TDEUI) -lcrypto $(LIB_TDECORE) -lDCOP $(LIB_QT)
# this is where the desktop file will go
-shelldesktopdir = $(kde_appsdir)/Utilities
-shelldesktop_DATA = kasablanca.desktop
+xdg_apps_DATA = kasablanca.desktop
# this is where the shell's XML-GUI resource file goes
shellrcdir = $(kde_datadir)/kasablanca

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.4.0.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Graphical FTP client for Trinity
Group: Applications/Internet
Url: http://kasablanca.berlios.de/
@ -56,7 +56,6 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@ -117,7 +116,6 @@ Kasablanca is an ftp client, among its features are currently:
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .orig
%__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"

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.3.2.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Faster access to applications, bookmarks, and other items.
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 2.0.7
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: barcode and label printing application for Trinity
Group: Applications/Utilities
URL: http://www.kbarcode.net

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.4.9.3.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: An alternative to K-Menu for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.2.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: A BibTeX editor for TDE
Group: Applications/Internet
URL: http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download.html

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 3.9
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: TDE mail notification utility
Group: Applications/Internet
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.2.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: eBook reader for Trinity
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 3.1.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: CHM viewer for Trinity
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Manage applications automatic startup
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.5
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Kerberos control module for the TDE control center
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.5
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Kerberos control module for the TDE control center
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.5
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Kerberos control module for the TDE control center
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 2.00
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: CPU meter for Kicker [Trinity]
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 2.2.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Graphical debugger interface [Trinity]
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -36,7 +36,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: a DBUS notification service [Trinity]
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.9.91
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories.
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -36,7 +36,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 2.4.4
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Graphical disk usage display with cleanup facilities [Trinity]
Group: Applications/Utilities
URL: http://www.trinitydesktop.org

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.4.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Backup system for TDE [Trinity]
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.5
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Kerberos ticket manager
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -41,7 +41,7 @@
Name: trinity-%{tde_pkg}
Summary: a TDE frontend for the Beagle desktop search daemon [Trinity]
Version: 0.2.1
Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
License: GPLv2+
Group: Applications/Utilities

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.8.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: A FTP client for TDE.
Group: Applications/Internet
URL: http://www.kftp.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.10.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Use TDE dialogs in Gtk apps
Group: Applications/Utilities
URL: http://www.trinitydesktop.org

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 2.0.3
Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: TDE Integrated LaTeX Environment [Trinity]
Group: Applications/Publishing
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.7.3.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Kicker monitoring applet [Trinity]
Group: Applications/Utilities
URL: http://www.elliptique.net/~ken/kima/

@ -39,7 +39,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Tool to configure the TDE kiosk framework
Group: Applications/Multimedia
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.4.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Keyboard layout indicator for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Applet to adjust LCD brightness for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.10.0c
Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Media player for Trinity
Group: Applications/Multimedia
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.1.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Iptables based firewall configuration tool for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -39,7 +39,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0.5
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Personal finance manager for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.4.8
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Network interfaces monitor for the Trinity systray
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 2.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: A network meter for Kicker [Trinity]
Group: Applications/Utilities
URL: http://www.trinitydesktop.org

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.6.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Network interfaces monitor for the Trinity systray
Group: Applications/Utilities
URL: http://www.trinitydesktop.org

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.8
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Trinity applet for Network Manager
Group: Applications/Internet
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.6
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: A chess interface for the K Desktop Environment [Trinity]
Group: Amusements/Games
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 2.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: An NMAP frontend for TDE
Group: Applications/Internet
URL: http://sourceforge.net/projects/knmap/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.10
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Tool for managing notes [Trinity]
Group: Applications/Utilities
URL: http://www.trinitydesktop.org

@ -43,7 +43,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.6.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Internationalization support for Koffice [Trinity]
Group: User Interface/Desktops
URL: http://www.trinitydesktop.org/

@ -52,7 +52,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.6.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: An integrated office suite
Group: Applications/Productivity
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: User friendly Internet Relay Chat (IRC) client for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -0,0 +1,213 @@
#
# spec file for package kooldock (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
%define tde_version 14.0.1
%endif
%define tde_pkg kooldock
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.4.7
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Dock for TDE with cool visual enhancements
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Desktop
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
%if 0%{?opensuse_bs} && 0%{?suse_version}
# for xdg-menu script
BuildRequires: brp-check-trinity
%endif
%description
KoolDock is a fork of the original work of Dang Viet Dung,.
KSmoothDock 2.1. KoolDock is a dock for TDE with cool.
visual enhancements and effects.
Some of it features are:
* Display quick launchers to your favourite apps
* A builtin task bar
* Pager and clock. (Not done yet)
* Smooth zooming effect (like Apple's OS X dock)
* Transparent Background
Homepage: http://sourceforge.net/projects/kooldock/
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__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"
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export kde_confdir="%{tde_confdir}"
# Warning: --enable-final causes FTBFS
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
\
--disable-dependency-tracking \
--disable-debug \
--enable-new-ldflags \
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%find_lang %{tde_pkg}
# Updates applications categories for openSUSE
%if 0%{?suse_version}
%suse_update_desktop_file -G "Extended Clipboard" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility
%endif
# Apps that should stay in TDE
#echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
%clean
%__rm -rf %{buildroot}
%post
for f in crystalsvg ; do
touch --no-create %{tde_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done
/sbin/ldconfig
update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%postun
for f in crystalsvg ; do
touch --no-create %{tde_datadir}/icons/${f} || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
done
/sbin/ldconfig
update-desktop-database %{tde_tdeappdir} -q &> /dev/null
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{tde_bindir}/kooldock
%{tde_datadir}/apps/kooldock/backgrounds/border-black/background-center.png
%{tde_datadir}/apps/kooldock/backgrounds/border-black/background-left.png
%{tde_datadir}/apps/kooldock/backgrounds/border-black/background-right.png
%{tde_datadir}/apps/kooldock/backgrounds/border-white/background-center.png
%{tde_datadir}/apps/kooldock/backgrounds/border-white/background-left.png
%{tde_datadir}/apps/kooldock/backgrounds/border-white/background-right.png
%{tde_datadir}/apps/kooldock/backgrounds/crystal/background-center.png
%{tde_datadir}/apps/kooldock/backgrounds/crystal/background-left.png
%{tde_datadir}/apps/kooldock/backgrounds/crystal/background-right.png
%{tde_datadir}/apps/kooldock/backgrounds/default/background-center.png
%{tde_datadir}/apps/kooldock/backgrounds/default/background-left.png
%{tde_datadir}/apps/kooldock/backgrounds/default/background-right.png
%{tde_datadir}/apps/kooldock/backgrounds/fadeout/background-center.png
%{tde_datadir}/apps/kooldock/backgrounds/fadeout/background-left.png
%{tde_datadir}/apps/kooldock/backgrounds/fadeout/background-right.png
%{tde_datadir}/apps/kooldock/backgrounds/fadeout2/background-center.png
%{tde_datadir}/apps/kooldock/backgrounds/fadeout2/background-left.png
%{tde_datadir}/apps/kooldock/backgrounds/fadeout2/background-right.png
%{tde_datadir}/apps/kooldock/backgrounds/fadeout3/background-center.png
%{tde_datadir}/apps/kooldock/backgrounds/fadeout3/background-left.png
%{tde_datadir}/apps/kooldock/backgrounds/fadeout3/background-right.png
%{tde_datadir}/apps/kooldock/backgrounds/osx/background-center.png
%{tde_datadir}/apps/kooldock/backgrounds/osx/background-left.png
%{tde_datadir}/apps/kooldock/backgrounds/osx/background-right.png
%{tde_datadir}/apps/kooldock/icons/crystalsvg/128x128/apps/kooldock.png
%{tde_datadir}/apps/kooldock/icons/crystalsvg/16x16/apps/kooldock.png
%{tde_datadir}/apps/kooldock/icons/crystalsvg/32x32/apps/kooldock.png
%{tde_datadir}/apps/kooldock/icons/crystalsvg/64x64/apps/kooldock.png
%{tde_datadir}/icons/crystalsvg/128x128/apps/kooldock.png
%{tde_datadir}/icons/crystalsvg/16x16/apps/kooldock.png
%{tde_datadir}/icons/crystalsvg/32x32/apps/kooldock.png
%{tde_datadir}/icons/crystalsvg/64x64/apps/kooldock.png
%changelog
* Thu Oct 01 2015 Francois Andriot <francois.andriot@free.fr> - 2:0.4.7-1
- Initial release for TDE 14.0.1

@ -40,7 +40,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.7
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Off-The-Record encryption for Kopete [Trinity]
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.6a
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity]
Group: Applications/Utilities
URL: http://www.trinitydesktop.org

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.7
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: TDE Palm Pilot hot-sync tool
Group: Applications/Utilities
URL: http://www.trinitydesktop.org

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.7.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: HAL based power management applet for Trinityfiles or directories.
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0beta2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Recipes manager for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 3.0.14
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: A TDE batch file renaming utility
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.90.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Twin-panel (commander-style) file manager for TDE (and other desktops)
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.6.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Source editing environment for TDE
Group: Applications/Internet
URL: http://kscope.sourceforge.net

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.7.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Trinity Frontend to lm_sensors
Group: Applications/System
URL: http://ksensors.sourceforge.net/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 3.3.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Look messages into your mail server
Group: Applications/Internet
URL: http://sourceforge.net/projects/kshowmail/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0.4
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: An advanced shut down utility for TDE
Group: Applications/Multimedia
URL: http://kde-apps.org/content/show.php?content=41180

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.4.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Fading splash screen engine for Trinity
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.8.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Powerful Trinity image viewer
Group: Amusements/Games
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.3.4
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: TDE frontend for streamripper
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.3.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: System log viewer tool for Trinity
Group: Applications/System
URL: http://ksystemlog.forum-software.org

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Circuit simulator for microcontrollers and electronics [Trinity]
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 2.2.8
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: BitTorrent client for Trinity
Group: Applications/Utilities
URL: http://ktorrent.org

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.8.13
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Quick picture viewer for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 3.4.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Trinity based next generation IRC client with module support
Group: Applications/Utilities
URL: http://kvirc.net/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.4.8
Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Virtual keyboard for TDE
Group: Applications/System
URL: http://pan4os.info/main/index.php

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.9.6a
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Vpn clients frontend for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.5b
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: A video thumbnail generator for TDE file managers
Group: Applications/Multimedia
URL: http://kde-apps.org/content/show.php?content=41180

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.15.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: IDE for PIC-microcontroller development [Trinity]
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: TDE frontend for potrace [Trinity]
Group: Applications/Multimedia
URL: http://potracegui.sourceforge.net

@ -40,7 +40,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: TDE theme engine for Qt4
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -40,7 +40,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.7.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Music editor and MIDI/audio sequencer [Trinity]
Group: Applications/Multimedia
URL: http://www.rosegardenmusic.com/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: SmartCard Login and LUKS Decrypt, Setup Utility
Group: Applications/System
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.9.4
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: A Samba (SMB) share advanced browser for Trinity
Group: Applications/Utilities
URL: http://www.trinitydesktop.org

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.3.8
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Audio converter frontend for Trinity
Group: Application/Multimedia
URL: http://potracegui.sourceforge.net

@ -40,7 +40,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.8.0svn20080103
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: A collection of system administration tools for Trinity
Group: Applications/Utilities
URL: http://www.simonzone.com/software/guidance

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 2.2.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Lipstik style for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.55.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: This is a set of widget styles for Trinity based apps
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -39,7 +39,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.0svn20070312
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Easy to use control centre for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.13.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: An apt-cache ioslave for Trinity
Group: Applications/Utilities
URL: http://lpnotfr.free.fr/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: An ftps TDEIO slave for Trinity
Group: Productivity/Networking/Ftp/Clients
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.4.5
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Tdeio-slave for the locate command [Trinity]
Group: Applications/Utilities
URL: http://www.trinitydesktop.org

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Tdeio-slave for the Sword Bible tool
Group: Productivity/Networking/Ftp/Clients
URL: http://lukeplant.me.uk/kio-sword/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Progress dialog for safely removing devices in Trinity
Group: Applications/Utilities
URL: http://frode.kde.no/misc/tdeio_umountwrapper/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.9
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Trinity applet for Network Manager
Group: Applications/Internet
URL: http://www.trinitydesktop.org/

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.7.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Power management applet for Trinity
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -41,7 +41,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.1.1.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Comfortable Radio Application for TDE
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 2.5.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Sudo frontend for Trinity
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0.4
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Subversion client with tight TDE integration
Group: Applications/Utilities
URL: http://www.elliptique.net/~ken/kima/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.2.2
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Theme manager for TDM
Group: Applications/Utilities
URL: http://beta.smileaf.org/projects

@ -38,7 +38,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.3.2.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Icollection manager for books, videos, music [Trinity]
Group: Applications/Utilities
URL: http://periapsis.org/tellico/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.33
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Anonymity Manager for TDE
Group: Applications/Internet
URL: sourceforge.net/projects/tolrk/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 1.0.5
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Semi transparant window decoration for Trinity
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.5.7
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: User friendly TDE frontend for wireless network connection
Group: Applications/Utilities
URL: http://wlassistant.sourceforge.net/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 2.8.1
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Yakuake is a Quake-style terminal emulator based on TDE Konsole technology
Group: Applications/Utilities
URL: http://www.trinitydesktop.org/

@ -86,13 +86,7 @@ rpmbuild -ba \
--define "tde_prefix /opt/trinity" \
--define "preversion ${PREVERSION:-}" \
--define "tde_patch 1" \
--define "with_akode 1" \
--define "with_jack 1" \
--define "with_lame 1" \
--define "with_mad 1" \
--define "with_mpeg 1" \
--define "with_xine 1" \
--define "with_xscreensaver 1" \
"${TEMPDIR}/${SPECFILE##*/}"
RET=$?

@ -13,7 +13,7 @@ if [ -z "${VERSION}" ] || [[ "${VERSION}" =~ "not installed" ]]; then
VERSION=$(LC_ALL=C rpm -q --qf "%{version}-%{release}" ${PKGNAME})
fi
VERSION=${VERSION/-*_/\~}
VERSION=${VERSION/-0_/\~}
#VERSION=${VERSION%-[0-9]}
VERSION=${VERSION%.opt}
VERSION=${VERSION%.[a-z]*}

@ -102,7 +102,7 @@ if [ -n "${DEVEL}" ]; then
"libkipi") PKGDEVEL="${lib}kipi-devel";;
"tqca") PKGDEVEL="${lib}tqca-devel";;
"tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";;
"tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers";;
"tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers ${lib}tqt3-mt-sqlite3";;
# Default case: development package has same name as runtime package, plus '-devel' suffix.
*) PKGDEVEL="${PKGRUNTIME}-devel";;
esac

@ -12,7 +12,7 @@ SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION})
VERSION=$(sed -n "/^Version:/ s/Version:[ ]*//p" ${SPECFILE})
RELEASE=$(sed -n "/^Release:/ s/Release:[ ]*//p" ${SPECFILE})
VERSION=$(rpm -E "${VERSION}")
RELEASE=$(rpm -E "${RELEASE}")
RELEASE=$(rpm --define "tde_version ${TDE_VERSION}" -E "${RELEASE}")
RELEASE=${RELEASE%$(rpmdist.sh --dist)}
echo ${VERSION}-${RELEASE}

@ -178,7 +178,7 @@ especially suitable for embedded applications.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh"
autoreconf -fiv

@ -1265,7 +1265,7 @@ things that are possible with TQt3.
# Fix strange FTBFS on RHEL5
%if 0%{?rhel} == 5
%__sed -i src/kernel/ntqstyle.h -e "s|#ifdef ENABLE_T*QSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|"
%__sed -i "src/kernel/ntqstyle.h" -e "s|#ifdef ENABLE_T*QSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|"
%endif
# Add missing sqlite3 header

@ -41,7 +41,7 @@
Name: trinity-%{tde_pkg}
Summary: Mandriva theme for TDE - Widget design
Version: 1.0.8
Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
License: GPL
Group: Environment/Desktop

@ -154,6 +154,7 @@ Requires: trinity-knmap
Requires: trinity-knutclient
Requires: trinity-koffice-suite
Requires: trinity-konversation
Requires: trinity-kooldock
Requires: trinity-kopete-otr
Requires: trinity-kpicosim
Requires: trinity-krecipes

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.1.9
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Raw picture decoding C++ library (runtime) [Trinity]
Group: System/Libraries
URL: http://www.trinitydesktop.org/

@ -44,11 +44,11 @@
Name: trinity-%{tde_pkg}
Summary: Qt like interface for the libexiv2 library (runtime) [Trinity]
Group: System/Libraries
Epoch: 2
Version: 0.1.7
Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Qt like interface for the libexiv2 library (runtime) [Trinity]
Group: System/Libraries
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}

@ -44,11 +44,11 @@
Name: trinity-%{tde_pkg}
Summary: Library for apps that want to use kipi-plugins (runtime version) [Trinity]
Group: System/Libraries
Epoch: %{tde_epoch}
Version: 0.1.5
Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Library for apps that want to use kipi-plugins (runtime version) [Trinity]
Group: System/Libraries
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}

@ -1,84 +0,0 @@
diff --git a/kernel/kls_hdr/fmt_codec_hdr.cpp b/kernel/kls_hdr/fmt_codec_hdr.cpp
index 9819504..62f5360 100644
--- a/kernel/kls_hdr/fmt_codec_hdr.cpp
+++ b/kernel/kls_hdr/fmt_codec_hdr.cpp
@@ -320,6 +320,9 @@ bool fmt_codec::getHdrHead()
if(!frs.readK(&a, sizeof(s8))) return false;
++count;
+ if (count > 79) {
+ return false;
+ }
}
buff[count] = '\0';
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngpread.c b/kernel/kls_png/ksquirrel-libs-png/pngpread.c
index 3dd0f06..f34553b 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngpread.c
+++ b/kernel/kls_png/ksquirrel-libs-png/pngpread.c
@@ -1670,7 +1670,7 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
#endif
png_strncpy((png_charp)png_ptr->unknown_chunk.name,
(png_charp)png_ptr->chunk_name,
- png_sizeof((png_charp)png_ptr->chunk_name));
+ png_sizeof(png_ptr->unknown_chunk.name));
png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
png_ptr->unknown_chunk.size = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
diff --git a/kernel/kls_png/ksquirrel-libs-png/pngrutil.c b/kernel/kls_png/ksquirrel-libs-png/pngrutil.c
index 899cdc4..6552af3 100644
--- a/kernel/kls_png/ksquirrel-libs-png/pngrutil.c
+++ b/kernel/kls_png/ksquirrel-libs-png/pngrutil.c
@@ -2374,7 +2374,7 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
#endif
png_strncpy((png_charp)png_ptr->unknown_chunk.name,
(png_charp)png_ptr->chunk_name,
- png_sizeof((png_charp)png_ptr->chunk_name));
+ png_sizeof(png_ptr->unknown_chunk.name));
png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
png_ptr->unknown_chunk.size = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
diff --git a/kernel/kls_dds/dds.cpp b/kernel/kls_dds/dds.cpp
index c5551f0..4205816 100644
--- a/kernel/kls_dds/dds.cpp
+++ b/kernel/kls_dds/dds.cpp
@@ -564,7 +564,12 @@ static void FREE_ROWS(RGBAP **A, const int H)
void GetBits( uchar bit_array[16] )
{
- uint b = (uint &) bits[0];
+ // uint b = (uint &) bits[0];
+ /* avoid a warning
+ * "dereferencing type-punned pointer will break strict-aliasing rules"
+ * TODO: check endianness issues (but that was probably broken anyway) */
+ uint b;
+ memcpy(&b, &bits[0], sizeof(b));
bit_array[0] = uchar(b & 0x07); b >>= 3;
bit_array[1] = uchar(b & 0x07); b >>= 3;
bit_array[2] = uchar(b & 0x07); b >>= 3;
@@ -574,7 +579,8 @@ static void FREE_ROWS(RGBAP **A, const int H)
bit_array[6] = uchar(b & 0x07); b >>= 3;
bit_array[7] = uchar(b & 0x07); b >>= 3;
- b = (uint &) bits[3];
+ // b = (uint &) bits[3];
+ memcpy(&b, &bits[3], sizeof(b));
bit_array[8] = uchar(b & 0x07); b >>= 3;
bit_array[9] = uchar(b & 0x07); b >>= 3;
bit_array[10] = uchar(b & 0x07); b >>= 3;
diff --git a/kernel/kls_hdr/fmt_codec_hdr.cpp b/kernel/kls_hdr/fmt_codec_hdr.cpp
index 9819504..8dde09b 100644
--- a/kernel/kls_hdr/fmt_codec_hdr.cpp
+++ b/kernel/kls_hdr/fmt_codec_hdr.cpp
@@ -136,8 +136,9 @@ s32 fmt_codec::read_scanline(RGBA *scan)
if (e != 0)
e = (e - 1) << 23;
- t = *(float *)&e;
-
+ // t = *(float *)&e;
+ /* avoid "dereferencing type-punned pointer will break strict-aliasing rules" warning */
+ memcpy(&t, &e, sizeof(t));
(scan + i)->r = u8((r / 255.0f) * t);
(scan + i)->g = u8((g / 255.0f) * t);
(scan + i)->b = u8((b / 255.0f) * t);

@ -38,11 +38,11 @@
Name: trinity-%{tde_pkg}
Summary: Trinity image viewer
Group: System/Libraries
Epoch: %{tde_epoch}
Version: 0.8.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Trinity image viewer
Group: System/Libraries
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
@ -58,7 +58,6 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: %{tde_pkg}-14.0.0.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@ -523,7 +522,6 @@ This package contains the tools for KSquirrel.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch0 -p1
# FIXME: under PCLinuxOS, headers are under 'freetype2' not 'freetype'
if [ -r /usr/include/freetype2/ftbitmap.h ]; then

@ -38,11 +38,11 @@
Name: trinity-%{tde_pkg}
Summary: LDAP interface library for TDE
Group: System/Libraries
Epoch: %{tde_epoch}
Version: 0.5
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: LDAP interface library for TDE
Group: System/Libraries
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}

@ -33,7 +33,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 3.008
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Perl bindings for the TQt library
Group: Development/Libraries/Perl
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.4.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Python packages to support TDE applications (scripts)
Group: Development/Libraries/Python
URL: http://www.trinitydesktop.org/

@ -37,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 3.16.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Trinity bindings for Python
Group: Development/Libraries/Python
URL: http://www.trinitydesktop.org/

@ -541,11 +541,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
# Move desktop files to correct XDG location
%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmag.desktop" "%{?buildroot}%{tde_tdeappdir}"
%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmousetool.desktop" "%{?buildroot}%{tde_tdeappdir}"
%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Applications/kmouth.desktop" "%{?buildroot}%{tde_tdeappdir}"
# Adds missing icons in 'hicolor' theme
# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64,128x128}"/apps/"

@ -61,7 +61,6 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Patch1: tdeaddons-14.0.1-fix_sdl_detection.patch
# Trinity dependencies
@ -728,7 +727,6 @@ done
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .sdl
%build

@ -1,18 +0,0 @@
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 1fedc9a..f3872b9 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -74,7 +74,12 @@ if( BUILD_NOATUN_PLUGINS )
if( WITH_SDL )
pkg_search_module( SDL sdl )
if( NOT SDL_FOUND )
- tde_message_fatal( "SDL is requested, but was not found on your system" )
+ check_include_file( SDL/SDL.h HAVE_SDL_H )
+ if( NOT HAVE_SDL_H )
+ tde_message_fatal( "SDL is requested, but was not found on your system" )
+ endif ( )
+ set ( SDL_INCLUDE_DIRS /usr/include/SDL )
+ set ( SDL_LIBRARIES SDL pthread )
endif( )
endif( WITH_SDL )

@ -744,14 +744,14 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop
%endif
%if 0%{?fedora} >= 20 || 0%{?pclinuxos}
%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?mgaversion} >= 5
%{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop
%{tde_datadir}/applnk/System/ScreenSavers/binaryring.desktop
%{tde_datadir}/applnk/System/ScreenSavers/cityflow.desktop
%{tde_datadir}/applnk/System/ScreenSavers/geodesicgears.desktop
%endif
%if 0%{?pclinuxos} || 0%{?fedora} >= 21
%if 0%{?pclinuxos} || 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5
%{tde_datadir}/applnk/System/ScreenSavers/romanboy.desktop
%{tde_datadir}/applnk/System/ScreenSavers/splitflap.desktop
%endif

@ -0,0 +1,5 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

@ -0,0 +1,16 @@
#%PAM-1.0
auth required pam_env.so
auth required pam_permit.so
auth include postlogin
account required pam_nologin.so
account include system-auth
password include system-auth
session required pam_selinux.so close
session required pam_loginuid.so
session optional pam_console.so
-session optional pam_ck_connector.so
session required pam_selinux.so open
session optional pam_keyinit.so force revoke
session required pam_namespace.so
session include system-auth
session include postlogin

@ -0,0 +1,21 @@
#%PAM-1.0
auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
auth required pam_env.so
auth substack system-auth
-auth optional pam_gnome_keyring.so
-auth optional pam_kwallet.so
auth include postlogin
account required pam_nologin.so
account include system-auth
password include system-auth
session required pam_selinux.so close
session required pam_loginuid.so
session optional pam_console.so
-session optional pam_ck_connector.so
session required pam_selinux.so open
session optional pam_keyinit.so force revoke
session required pam_namespace.so
session include system-auth
-session optional pam_gnome_keyring.so auto_start
-session optional pam_kwallet.so
session include postlogin

@ -0,0 +1,5 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

@ -176,6 +176,22 @@ Requires: fedora-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
%endif
# Fedora 22 Theme
%if 0%{?fedora} == 22
Requires: f22-backgrounds-base
%define tde_bg /usr/share/backgrounds/f22/default/standard/f22.png
Requires: fedora-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
%endif
# Fedora 23 Theme
%if 0%{?fedora} == 23
Requires: f23-backgrounds-base
%define tde_bg /usr/share/backgrounds/f23/default/standard/f23.png
Requires: fedora-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
%endif
# RHEL 4 Theme
%if 0%{?rhel} == 4
Requires: desktop-backgrounds-basic

@ -0,0 +1,12 @@
[Unit]
Description=The Trinity login manager
Conflicts=getty@tty1.service
After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
[Service]
ExecStart=/opt/trinity/bin/kdm
Restart=always
IgnoreSIGPIPE=no
[Install]
Alias=display-manager.service

@ -36,7 +36,7 @@
Name: trinity-%{tde_pkg}
Version: %{tde_version}
Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Trinity Desktop Environment - Graphics Applications
Group: Productivity/Graphics/Viewers
URL: http://www.trinitydesktop.org/

@ -0,0 +1,199 @@
alsa-lib-devel
aspell
aspell-devel
audiofile-devel
autotrace
avahi-devel
bind-devel
binutils-devel
bison
boost-devel
bzip2-devel
ccache
ccrtp-devel
cdparanoia
cdparanoia-devel
chrpath
clucene-core-devel
cmake
commoncpp2-devel
cpp
cppunit-devel
createrepo
cups-devel
db4-devel
dbus-glib-devel
djvulibre
djvulibre-devel
doxygen
dssi-devel
exiv2-devel
fdupes
ffmpeg-devel
fftw-devel
file-devel
flac-devel
flex-static
fribidi-devel
gamin-devel
gcc
gcc-c++
gettext-devel
glib-devel
gmp-devel
gnokii-devel
gperf
gpgme-devel
gphoto2-devel
GraphicsMagick-devel
gsl-devel
gstreamer-devel
gstreamer-plugins-base-devel
gtk2-devel
gtk+-devel
gtk-doc
guile-devel
hspell-devel
html2ps
icu
ImageMagick-devel
imake
imlib-devel
jack-audio-connection-kit-devel
jasper-devel
java-1.8.0-openjdk-devel
java-devel
java-openjdk
lame-devel
lcms-devel
libacl-devel
libart_lgpl-devel
libblkid-devel
libcap-devel
libcdio-devel
libcdio-paranoia-devel
libcurl-devel
libdb-cxx-devel
libdb-devel
libdvdread-devel
libfontenc-devel
libgadu-devel
libgpod-devel
libgsf-devel
libical-devel
libidn-devel
libifp-devel
liblo-devel
liblrdf-devel
libmad-devel
libmng-devel
libmp4v2-devel
libmpcdec-devel
libmtp-devel
libmusicbrainz-devel
libnjb-devel
libofx-devel
libogg-devel
libotr-devel
libpaper-devel
libpqxx-devel
libraw1394-devel
librsvg2
librsvg2-tools
libsamplerate-devel
libsmbclient-devel
libsndfile-devel
libssh2-devel
libtheora-devel
libtiff-devel
libtool
libtool-ltdl-devel
libtunepimp-devel
libudev-devel
libutempter-devel
libv4l-devel
libvisual-devel
libvorbis-devel
libwmf-devel
libwpd-devel
libXaw-devel
libXcomposite-devel
libXdamage-devel
libXdmcp-devel
libxkbfile-devel
libXScrnSaver-devel
libxslt-devel
libXtst-devel
libXv-devel
libXxf86dga-devel
libXxf86vm-devel
libzrtpcpp-devel
lirc-devel
lm_sensors-devel
meanwhile-devel
mftrace
mysql-devel
nas-devel
neon-devel
netpbm-progs
net-snmp-devel
net-tools
NetworkManager-glib-devel
ocaml
ocaml(compiler)
OpenEXR-devel
openldap-devel
openslp-devel
opensp-devel
ortp-devel
pam-devel
pciutils-devel
pcre-devel
pcsc-lite-devel
perl
perl-devel
perl(ExtUtils::MakeMaker)
perl(XML::Parser)
pilot-link-devel
poppler-devel
postgresql-devel
pth-devel
pulseaudio-libs-devel
recode
redhat-rpm-config
rpm-build
ruby
ruby-devel
sane-backends-devel
scons
SDL-devel
sip-devel
speex-devel
sqlite-devel
subversion-devel
sword-devel
t1lib-devel
t1utils
taglib-devel
tar
transfig
udisks-devel
unixODBC-devel
valgrind
wireless-tools-devel
xine-lib-devel
xmedcon
xmedcon-devel
xmlto
xorg-x11-font-utils
xscreensaver
xscreensaver-extras
xulrunner-devel
xz-devel
texinfo
fontpackages-devel
libudisks2-devel
htdig
libconfig-devel
gtk3-devel
usbutils
Loading…
Cancel
Save