diff options
565 files changed, 4232 insertions, 51843 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile index b2a3480bd..76bc9bf25 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile @@ -1,7 +1,9 @@ SHELL := /bin/bash PATH := $(PATH):$(shell pwd)/build -TDE_VERSION := $(shell echo $${TDE_VERSION:-14.0.5}) +TDE_VERSION := $(shell echo $${TDE_VERSION:-14.0.7}) +TDE_GIT_DIR := $(shell cd ../../tde; pwd) TDE_PACKAGING_DIR := $(shell [ -n "$${TDE_PACKAGING_DIR}" ] && cd "$${TDE_PACKAGING_DIR}" || cd ..; pwd) +RPMDIR := "$(shell rpm -E %{_rpmdir}.tde-$(TDE_VERSION))" DIST := $(shell rpm -E %dist) buildpkg = \ @@ -21,43 +23,40 @@ buildpkg = \ echo -all: dependencies main libraries applications i18n meta extras -dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt +all: dependencies main libraries applications i18n meta +dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls tqscintilla 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: kipi-plugins 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 keximdb kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kooldock kopete-otr kpicosim kpilot kplayer krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd kvpnc kxmleditor mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tastymenu tdedocker tde-guidance tdeio-apt tdeio-ftps tdeio-gopher tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-baghira tde-style-domino tde-style-ia-ora tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake +applications: abakus amarok basket bibletime codeine 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 keximdb 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 kvirc kvkbd kvpnc kxmleditor mathemagics mplayerthumbs piklab potracegui qalculate-tde qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tastymenu tdedocker tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepacman tdepowersave tderadio tde-style-baghira tde-style-domino tde-style-ia-ora 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-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kompose koverartist kpacman mathemagics png2qrgb +extras: icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kmpose koverartist kpacman png2qrgb ### Trinity Dependencies akode: tqtinterface trinity-filesystem $(call buildpkg,dependencies/akode) -arts: tqtinterface trinity-filesystem esound cmake +arts: tqtinterface trinity-filesystem esound $(call buildpkg,dependencies/arts) -avahi-tqt: tqtinterface autoconf automake libtool2 +avahi-tqt: tqtinterface $(call buildpkg,dependencies/avahi-tqt) -dbus-1-tqt: tqtinterface cmake +dbus-1-tqt: tqtinterface $(call buildpkg,dependencies/dbus-1-tqt) -dbus-tqt: tqtinterface cmake +dbus-tqt: tqtinterface $(call buildpkg,dependencies/dbus-tqt) -libart_lgpl: tqtinterface libtool2 +libart_lgpl: tqtinterface $(call buildpkg,dependencies/libart-lgpl) -libcaldav: tqtinterface autoconf libcurl +libcaldav: tqtinterface $(call buildpkg,dependencies/libcaldav) -libcarddav: tqtinterface autoconf libcurl +libcarddav: tqtinterface $(call buildpkg,dependencies/libcarddav) -libr: - $(call buildpkg,dependencies/libr) - python-tqt: sip4-tqt tdelibs tqscintilla $(call buildpkg,dependencies/python-tqt) @@ -76,7 +75,7 @@ tqscintilla: tqca-tls tdelibs tqt3: $(call buildpkg,dependencies/tqt3) -tqtinterface: tqt3 cmake +tqtinterface: tqt3 $(call buildpkg,dependencies/tqtinterface) # Main packages @@ -92,7 +91,7 @@ tdeadmin: tdebase tdeartwork: tdebase $(call buildpkg,main/tdeartwork) -tdebase: tdelibs cmake htdig fileshareset +tdebase: tdelibs htdig fileshareset $(call buildpkg,main/tdebase) tdebindings: tdebase tqscintilla @@ -104,11 +103,10 @@ tdeedu: tdebase tdegames: tdebase tdemultimedia $(call buildpkg,main/tdegames) -tdegraphics: tdebase poppler cmake lcms +tdegraphics: tdebase lcms $(call buildpkg,main/tdegraphics) -tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem libart_lgpl file - [ -x /usr/libexec/utempter/utempter ] && sudo chmod a+r /usr/libexec/utempter/utempter || : +tdelibs: brp-check-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt avahi-tqt fileshareset trinity-filesystem libart_lgpl $(call buildpkg,main/tdelibs) tdemultimedia: tdebase akode @@ -117,10 +115,10 @@ tdemultimedia: tdebase akode tdenetwork: tdebase rdesktop $(call buildpkg,main/tdenetwork) -tdepim: tdebase libcaldav libcarddav cmake dirmngr +tdepim: tdebase libcaldav libcarddav $(call buildpkg,main/tdepim) -tdesdk: tdebase tdebindings cmake +tdesdk: tdebase tdebindings $(call buildpkg,main/tdesdk) tdetoys: tdebase @@ -129,147 +127,48 @@ tdetoys: tdebase tdeutils: tdebase $(call buildpkg,main/tdeutils) -tdevelop: tdebase tdesdk cmake tar +tdevelop: tdebase tdesdk $(call buildpkg,main/tdevelop) tdewebdev: tdebase tdesdk $(call buildpkg,main/tdewebdev) ### 3rd party libraries and tools -autoconf: m4 -# Build on CentOS 5 only -ifneq (,$(filter $(DIST),.el5 .el6)) - $(call buildpkg,3rdparty/autoconf) -endif - -automake: -# Build on CentOS 5 only -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/automake) -endif - -cmake: -# Build on CentOS 5 only -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/cmake) -endif - -cscope: -# Build on PCLOS only -ifneq ($(wildcard /etc/pclinuxos-release),) - $(call buildpkg,3rdparty/cscope) -endif - -dirmngr: -# Build on CentOS >= 7 -ifneq ($(wildcard /boot/vmlinuz*.el7*),) - $(call buildpkg,3rdparty/dirmngr) +brp-check-trinity: +ifneq (,$(filter $(DIST), .oss151 .oss152 .osstw )) + $(call buildpkg,3rdparty/brp-check-trinity) endif esound: -# Build on Mageia, Fedora >= 23, Opensuse >= 15.0 -ifneq (,$(filter $(DIST),.mga5 .mga6 .fc23 .fc24 .fc25 .fc26 .fc27 .oss150 .osstw)) +ifneq (,$(filter $(DIST), .el8 .mga6 .mga7 .oss151 .oss152 .osstw )) $(call buildpkg,3rdparty/esound) endif -file: -# Build on CentOS 5 -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/file) -endif - -gmime: -# Build on CentOS 6 -ifneq (,$(filter $(DIST),.el6)) - $(call buildpkg,3rdparty/gmime) -endif - -intltool: -# Build on CentOS 5 -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/intltool) -endif - -gnuchess: -# Build on CentOS 5 -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/gnuchess) -endif - htdig: -# build on Mageia, and CentOS >= 7 -ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) +ifneq (,$(filter $(DIST), .el7 .el8 .mga6 .mga7 )) $(call buildpkg,extras/htdig) endif imlib1: -# Do NOT build on Fedora, nor CentOS, nor PCLOS -ifeq ($(wildcard /etc/fedora-release),) -ifeq (,$(filter $(DIST),.el5 .el6 .el7)) +ifneq (,$(filter $(DIST), .mga6 .mga7 .oss151 .osstw )) $(call buildpkg,3rdparty/imlib1) endif -endif lcms: -# Build on EL7, OSS150, OSSTW -ifneq (,$(filter $(DIST),.el7 .oss150 .osstw)) +ifneq (,$(filter $(DIST), .el7 .el8 .mga7 .oss151 .oss152 .osstw )) $(call buildpkg,3rdparty/lcms) endif -libcurl: automake libtool2 -# Build on CentOS 5 only -ifneq (,$(filter $(DIST),.el4)) - $(call buildpkg,3rdparty/curl) -endif - -libtool2: autoconf automake -# Build on CentOS 5 only -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/libtool2) -endif - -lilypond: mftrace -# Build on CentOS 6 only -ifneq (,$(filter $(DIST),.el6)) - $(call buildpkg,3rdparty/lilypond) -endif - -m4: -# Build on CentOS 5 and CentOS 6 only (vendor-provided m4 is too old) -ifneq (,$(filter $(DIST),.el5 .el6)) - $(call buildpkg,3rdparty/m4) -endif - -mftrace: -# Build on CentOS 6 only -ifneq (,$(filter $(DIST),.el6)) - $(call buildpkg,3rdparty/mftrace) -endif +libbeagle: + $(call buildpkg,3rdparty/libbeagle) mp4v2: -# Build on OpenSUSE only -ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .osstw)) +ifneq (,$(filter $(DIST), .oss151 .oss152 .osstw )) $(call buildpkg,3rdparty/mp4v2) endif -pcsc-perl: -# Build on CentOS 5 -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/pcsc-perl) -endif - -poppler: -# Build on CentOS 5 only (vendor-provided Poppler is too old) -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/poppler) -endif - -python-qt3: tdelibs sip - $(call buildpkg,3rdparty/python-qt3) - rdesktop: -# Build on OpenSUSE >= 15.0 only -ifneq (,$(filter $(DIST),.oss150)) +ifneq (,$(filter $(DIST), .oss150 )) $(call buildpkg,3rdparty/rdesktop) endif @@ -280,46 +179,16 @@ ifneq ($(wildcard /etc/pclinuxos-release),) endif recode: -# Build on OpenSUSE >= 15.0 only -ifneq (,$(filter $(DIST),.oss150 .osstw)) +# Build on OpenSUSE >= 15.0 only (not tw) +ifneq (,$(filter $(DIST),.oss150 .oss151)) $(call buildpkg,3rdparty/recode) endif -sip: -# Build on CentOS 5 only (vendor-provided SIP is too old) -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/sip) -endif - -sword: -# Build on CentOS 5 only -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/sword) -endif - -tar: -# Build on CentOS 5 only (vendor-provided TAR is too old) -ifneq (,$(filter $(DIST),.el5)) - $(call buildpkg,3rdparty/tar) -endif - -torsocks: -# Build on opensuse -ifneq (,$(filter $(DIST), .oss)) - $(call buildpkg,3rdparty/torsocks) -endif - wv2: -# Do NOT build on Mageia or openSUSE or PCLINUXOS -ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .oss150 .osstw .pclos .pclos2018)) +ifneq (,$(filter $(DIST), .el5 .el6 .el7 .el8 .fc30 .fc31 .fc32 .fc33 )) $(call buildpkg,3rdparty/wv2) endif -### Extra packages -cmake-macros: cmake -ifneq ($(wildcard /etc/SuSE-release),) - $(call buildpkg,extras/trinity-cmake-macros) -endif ### Trinity Libraries kipi-plugins: tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi @@ -328,7 +197,7 @@ kipi-plugins: tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi libkdcraw: tqtinterface lcms $(call buildpkg,libraries/libkdcraw) -libkexiv2: tqtinterface +libkexiv2: tqtinterface tdelibs $(call buildpkg,libraries/libkexiv2) libkipi: tqtinterface @@ -359,15 +228,18 @@ abakus: tdebase adept: tdebase $(call buildpkg,applications/adept) -amarok: tdebase cmake mp4v2 +amarok: tdebase mp4v2 $(call buildpkg,applications/amarok) basket: tdebase tdepim $(call buildpkg,applications/basket) -bibletime: tdebase sword +bibletime: tdebase $(call buildpkg,applications/bibletime) +codeine: tdebase + $(call buildpkg,applications/codeine) + compizconfig-backend-kconfig: tdebase $(call buildpkg,applications/compizconfig-backend-kconfig) @@ -390,13 +262,11 @@ fusion-icon: tdebase $(call buildpkg,applications/fusion-icon) gtk3-tqt-engine: tdebase -# Do NOT build on CentOS 5, CentOS 6 ifeq (,$(filter $(DIST),.el5 .el6)) $(call buildpkg,applications/gtk3-tqt-engine) endif gtk-qt-engine: tdebase -# Do NOT build on CentOS 5 (GTK2 is too old) ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/gtk-qt-engine) endif @@ -405,16 +275,10 @@ gwenview: tdebase $(call buildpkg,applications/gwenview) k3b: tdebase -# Do NOT build on CentOS 5 (No TDE HWLIB support) -ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/k3b) -endif k9copy: tdebase k3b -# Do NOT build on CentOS 5 (No K3B) -ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/k9copy) -endif kaffeine: tdebase $(call buildpkg,applications/kaffeine) @@ -450,22 +314,13 @@ kcmautostart: tdebase $(call buildpkg,applications/kcmautostart) kcmldap: tdebase libtdeldap -# Do NOT build on CentOS 5 -ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kcmldap) -endif kcmldapcontroller: tdebase kcmldap -# Do NOT build on CentOS 5 -ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kcmldapcontroller) -endif kcmldapmanager: tdebase kcmldap -# Do NOT build on CentOS 5 -ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kcmldapmanager) -endif kcpuload: tdebase $(call buildpkg,applications/kcpuload) @@ -489,10 +344,7 @@ keep: tdebase rdiff-backup $(call buildpkg,applications/keep) kerberostray: tdebase -# Do NOT build on CentOS 5 -ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kerberostray) -endif keximdb: tdebase koffice $(call buildpkg,applications/keximdb) @@ -501,22 +353,13 @@ kftpgrabber: tdebase $(call buildpkg,applications/kftpgrabber) kgtk-qt3: tdebase -# Do NOT build on CentOS 5 (GTK2 is too old) -# Do NOT build on CentOS >=7 (GTK2 is too new) -# Do NOT build on Fedora >= 20 (GTK2 is too new) -# Do NOT build on Mageia >= 4 (GTK2 is too new) -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc20* /boot/vmlinuz*.mga4*),) $(call buildpkg,applications/kgtk-qt3) -endif kile: tdebase $(call buildpkg,applications/kile) kima: tdebase -# Not on RHEL5 -ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kima) -endif kiosktool: tdebase $(call buildpkg,applications/kiosktool) @@ -546,12 +389,11 @@ knetstats: tdebase $(call buildpkg,applications/knetstats) knetworkmanager8: tdebase -# RHEL6 only ifneq (,$(filter $(DIST),.el6)) $(call buildpkg,applications/knetworkmanager8) endif -knights: tdebase gnuchess +knights: tdebase $(call buildpkg,applications/knights) knmap: tdebase @@ -579,13 +421,7 @@ kpicosim: tdebase $(call buildpkg,applications/kpicosim) kpilot: tdebase tdepim -# Do NOT build on CentOS 5 (pilot-link library is too old) -ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kpilot) -endif - -kplayer: tdebase - $(call buildpkg,applications/kplayer) kpowersave: tdebase $(call buildpkg,applications/kpowersave) @@ -599,13 +435,13 @@ krename: tdebase krusader: tdebase tdebindings $(call buildpkg,applications/krusader) -kscope: tdebase cscope +kscope: tdebase $(call buildpkg,applications/kscope) ksensors: tdebase $(call buildpkg,applications/ksensors) -kshowmail: tdebase +kshowmail: tdebase tdepim $(call buildpkg,applications/kshowmail) kshutdown: tdebase @@ -629,9 +465,6 @@ ktechlab: tdebase ktorrent: tdebase $(call buildpkg,applications/ktorrent) -kuickshow: tdebase imlib1 - $(call buildpkg,applications/kuickshow) - kvirc: tdebase $(call buildpkg,applications/kvirc) @@ -644,6 +477,9 @@ kvpnc: tdebase kxmleditor: tdebase $(call buildpkg,applications/kxmleditor) +mathemagics: tdebase + $(call buildpkg,applications/mathemagics) + mplayerthumbs: tdebase $(call buildpkg,applications/mplayerthumbs) @@ -653,25 +489,20 @@ piklab: tdebase potracegui: tdebase $(call buildpkg,applications/potracegui) -qalculate-tde: tdebase -# Do NOT build on CentOS 5, CentOS 6 -ifeq (,$(filter $(DIST),.el5 .el6)) +qalculate-tde: $(call buildpkg,applications/qalculate-tde) -endif qt4-tqt-theme-engine: tdebase -# Do NOT build on CentOS 5, CentOS 6 -ifeq (,$(filter $(DIST),.el5 .el6)) +ifeq (,$(filter $(DIST),.el5 .el6 .el8 .osstw)) $(call buildpkg,applications/qt4-tqt-theme-engine) endif -rosegarden: tdebase lilypond -# Do NOT build on CentOS 5, CentOS 7 -ifeq (,$(filter $(DIST),.el5 .el7)) +rosegarden: tdebase +ifeq (,$(filter $(DIST),.el5 .el6 .el7 .el8)) $(call buildpkg,applications/rosegarden) endif -smartcardauth: tdebase pcsc-perl +smartcardauth: tdebase $(call buildpkg,applications/smartcardauth) smb4k: tdebase @@ -680,7 +511,7 @@ smb4k: tdebase soundkonverter: tdebase $(call buildpkg,applications/soundkonverter) -tastymenu: tdebase pytdeextensions +tastymenu: $(call buildpkg,applications/tastymenu) tdedocker: tdebase @@ -695,26 +526,24 @@ tdeio-apt: tdebase tdeio-ftps: tdebase $(call buildpkg,applications/tdeio-ftps) -tdeio-gopher: tdebase - $(call buildpkg,applications/tdeio-gopher) - tdeio-locate: tdebase $(call buildpkg,applications/tdeio-locate) -tdeio-sword: tdebase sword +tdeio-sword: tdebase $(call buildpkg,applications/tdeio-sword) tdeio-umountwrapper: tdebase $(call buildpkg,applications/tdeio-umountwrapper) tdenetworkmanager: tdebase -# Do NOT build on CentOS 5, CentOS 6 ifeq (,$(filter $(DIST),.el5 .el6)) $(call buildpkg,applications/tdenetworkmanager) endif +tdepacman: tdebase + $(call buildpkg,applications/tdepacman) + tdepowersave: tdebase -# Do NOT build on CentOS 5 ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/tdepowersave) endif @@ -722,13 +551,13 @@ endif tderadio: tdebase $(call buildpkg,applications/tderadio) -tde-style-baghira: tdebase +tde-style-baghira: tdebase $(call buildpkg,applications/tde-style-baghira) -tde-style-domino: tdebase +tde-style-domino: tdebase $(call buildpkg,applications/tde-style-domino) -tde-style-ia-ora: tdebase +tde-style-ia-ora: tdebase $(call buildpkg,applications/tde-style-ia-ora) tde-style-lipstik: tdebase @@ -749,13 +578,10 @@ tde-systemsettings: tdebase tdmtheme: tdebase $(call buildpkg,applications/tdmtheme) -tellico: tdebase tdemultimedia -# Do NOT build on CentOS 5 -ifeq (,$(filter $(DIST),.el5)) +tellico: tdebase tdegraphics tdemultimedia tdepim $(call buildpkg,applications/tellico) -endif -tork: tdebase torsocks +tork: tdebase $(call buildpkg,applications/tork) twin-style-crystal: tdebase @@ -772,15 +598,12 @@ gwenview-i18n: tdebase $(call buildpkg,applications/gwenview-i18n) k3b-i18n: tdebase -# Do NOT build on CentOS 5 -ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/k3b-i18n) -endif koffice-i18n: tdebase $(call buildpkg,applications/koffice-i18n) -tde-i18n: tdebase cmake +tde-i18n: tdebase $(call buildpkg,tde-i18n) ### Meta packages @@ -792,9 +615,7 @@ celestia: $(call buildpkg,extras/celestia) fileshareset: -ifeq ($(wildcard /boot/vmlinuz*.mga6*),) $(call buildpkg,extras/fileshareset) -endif icons-crystalsvg-updated: $(call buildpkg,extras/icons-crystalsvg-updated) @@ -829,11 +650,8 @@ koverartist: kpacman: $(call buildpkg,extras/kpacman) -mathemagics: - $(call buildpkg,extras/mathemagics) - -pan: gmime intltool -ifeq (,$(filter $(DIST),.el5 .oss150 .osstw)) +pan: gmime +ifeq (,$(filter $(DIST),.oss150 .osstw)) $(call buildpkg,3rdparty/pan) endif @@ -846,3 +664,15 @@ scribus: trinity-filesystem: $(call buildpkg,extras/trinity-filesystem) + +# Developers options +git: + cd "$(TDE_GIT_DIR)" && ./scripts/switch_all_submodules_to_head_and_clean anonymous + +tarballs: + cd "$(TDE_GIT_DIR)" && COMPRESS=pigz SUFFIX=0 ./scripts/create_all_tarballs + + +# External packages +external: + [ -d "${HOME}/rpmbuild/RPMS" ] && cp -rfv "${HOME}/rpmbuild/RPMS/"* "$(RPMDIR)" diff --git a/redhat/Makefile.v3.5.13-sru b/redhat/Makefile.v3.5.13-sru deleted file mode 100644 index 6ec4fa162..000000000 --- a/redhat/Makefile.v3.5.13-sru +++ /dev/null @@ -1,569 +0,0 @@ -SHELL := /bin/bash -PACKAGING_DIR := $(shell cd ..; pwd) -PATH := $(PATH):$(shell pwd)/build -TDE_VERSION = 3.5.13.2 - -buildpkg = \ - @echo "Now processing '$(1)' [from $(PACKAGING_DIR)]."; \ - export PACKAGING_DIR=$(PACKAGING_DIR); \ - if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_installed.sh "$(1)" ${TDE_VERSION}; then \ - echo " Package '${1}' is not yet installed."; \ - if [ "${REBUILD}" = "$(1)" ] || ! is_latest_package_built.sh "$(1)" ${TDE_VERSION}; then \ - echo " Building package."; \ - build_rpm_package.sh "$(1)" ${TDE_VERSION} || exit 1; \ - echo " Updating repository."; \ - update_repository.sh ${TDE_VERSION}; \ - fi; \ - echo "Now installing package '$(1)'"; \ - install_rpm_package.sh "$(1)" || exit 2; \ - fi; \ - echo - - -all: dependencies main libraries applications i18n meta extras -dependencies: qt3 tqtinterface arts libcaldav libcarddav tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt akode hal -main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev -libraries: libkdcraw libkexiv2 libkipi libksquirrel pytdeextensions python-trinity -applications: abakus amarok basket bibletime digikam dolphin filelight gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla katapult kbarcode kbfx kbookreader kchmviewer kcmautostart kcpuload kdbusnotification kdiff3 kdirstat kgtk-qt3 keep kile kima kiosktool kmplayer kmyfirewall kmymoney knemo knetload knetstats knights knowit knutclient koffice konversation kopete-otr kpicosim kpilot kpowersave krename krusader ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kuickshow kvirc kvkbd piklab potracegui rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-locate tdeio-umountwrapper tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico twin-style-crystal wlassistant yakuake -i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n - - -### Trinity Dependencies -arts: tqtinterface trinity-filesystem esound cmake - $(call buildpkg,dependencies/arts) - -avahi-tqt: tqtinterface autoconf automake libtool - $(call buildpkg,dependencies/avahi-tqt) - -dbus-1-tqt: tqtinterface cmake - $(call buildpkg,dependencies/dbus-1-tqt) - -dbus-tqt: tqtinterface cmake - $(call buildpkg,dependencies/dbus-tqt) - -libcaldav: tqtinterface autoconf libcurl - $(call buildpkg,dependencies/libcaldav) - -libcarddav: tqtinterface autoconf libcurl - $(call buildpkg,dependencies/libcarddav) - -tqca: tqtinterface - $(call buildpkg,dependencies/tqca) - -tqca-tls: tqtinterface tqca - $(call buildpkg,dependencies/tqca-tls) - -qt3: esound - $(call buildpkg,dependencies/qt3) - -tqtinterface: qt3 cmake - $(call buildpkg,dependencies/tqtinterface) - -# Main packages -tdeaccessibility: tdebase tdemultimedia - $(call buildpkg,main/tdeaccessibility) - -tdeaddons: tdebase tdegames tdemultimedia tdenetwork tdepim - $(call buildpkg,main/tdeaddons) - -tdeadmin: tdebase - $(call buildpkg,main/tdeadmin) - -tdeartwork: tdebase - $(call buildpkg,main/tdeartwork) - -tdebase: tdelibs cmake htdig fileshareset hal - $(call buildpkg,main/tdebase) - -tdebindings: tdebase - $(call buildpkg,main/tdebindings) - -tdeedu: tdebase - $(call buildpkg,main/tdeedu) - -tdegames: tdebase tdemultimedia - $(call buildpkg,main/tdegames) - -tdegraphics: tdebase poppler cmake - $(call buildpkg,main/tdegraphics) - -tdelibs: qt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem - $(call buildpkg,main/tdelibs) - -tdemultimedia: tdebase akode - $(call buildpkg,main/tdemultimedia) - -tdenetwork: tdebase - $(call buildpkg,main/tdenetwork) - -tdepim: tdebase libcaldav libcarddav cmake - $(call buildpkg,main/tdepim) - -tdesdk: tdebase tdebindings cmake - $(call buildpkg,main/tdesdk) - -tdetoys: tdebase - $(call buildpkg,main/tdetoys) - -tdeutils: tdebase - $(call buildpkg,main/tdeutils) - -tdevelop: tdebase tdesdk cmake - $(call buildpkg,main/tdevelop) - -tdewebdev: tdebase tdesdk - $(call buildpkg,main/tdewebdev) - -### 3rd party libraries and tools -autoconf: m4 -# Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el5*),) - $(call buildpkg,3rdparty/autoconf) -endif - -automake: -# Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el5*),) - $(call buildpkg,3rdparty/automake) -endif - -cmake: -# Build on CentOS 5/6 only -ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) - $(call buildpkg,3rdparty/cmake) -endif - -esound: -# Build on Mageia and CentOS >= 7 -ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) - $(call buildpkg,3rdparty/esound) -endif - -gnuchess: -# Build on CentOS 5, CentOS 7 -ifneq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),) - $(call buildpkg,3rdparty/gnuchess) -endif - -hal: hal-info -# Do NOT build on CentOS 5, CentOS 6 -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) - $(call buildpkg,3rdparty/hal) -endif - -hal-info: -# Do NOT build on CentOS 5, CentOS 6 -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),) - $(call buildpkg,3rdparty/hal-info) -endif - -htdig: -# build on Mageia, and CentOS >= 7 -ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) - $(call buildpkg,extras/htdig) -endif - -imlib1: -# Do NOT build on Fedora, nor CentOS -ifeq ($(wildcard /etc/fedora-release),) -ifeq ($(wildcard /etc/centos-release),) -ifeq ($(wildcard /boot/vmlinuz*.el5*),) - $(call buildpkg,3rdparty/imlib1) -endif -endif -endif - -libcurl: automake libtool -# Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el5*),) - $(call buildpkg,3rdparty/curl) -endif - -libotr3: -# Build on Mageia, CentOS >= 7 -ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*),) - $(call buildpkg,3rdparty/libotr3) -endif - -libtool: autoconf automake -# Build on CentOS 5 only -ifneq ($(wildcard /boot/vmlinuz*.el5*),) - $(call buildpkg,3rdparty/libtool) -endif - -lilypond: mftrace -# Build on CentOS 6 only -ifneq ($(wildcard /boot/vmlinuz*.el6*),) - $(call buildpkg,3rdparty/lilypond) -endif - -m4: -# Build on CentOS 5 only (vendor-provided m4 is too old) -ifneq ($(wildcard /boot/vmlinuz*.el5*),) - $(call buildpkg,3rdparty/m4) -endif - -mftrace: -# Build on CentOS 6 only -ifneq ($(wildcard /boot/vmlinuz*.el6*),) - $(call buildpkg,3rdparty/mftrace) -endif - -pcsc-perl: -# Build on CentOS and openSUSE only -ifneq ($(wildcard /etc/centos-release /etc/SuSE-release /boot/vmlinuz*.el5*),) - $(call buildpkg,3rdparty/pcsc-perl) -endif - -poppler: -# Build on CentOS 5 only (vendor-provided Poppler is too old) -ifneq ($(wildcard /boot/vmlinuz*.el5*),) - $(call buildpkg,3rdparty/poppler) -endif - -python-qt3: tdelibs sip - $(call buildpkg,3rdparty/python-qt3) - -sip: -# Build on CentOS 5 only (vendor-provided SIP is too old) -ifneq ($(wildcard /boot/vmlinuz*.el5*),) - $(call buildpkg,3rdparty/sip) -endif - -sword: -# Build on Fedora >= 20, PCLinuxOS, CentOS >= 7 -ifneq ($(wildcard /boot/vmlinuz*.fc20* /etc/pclinuxos-release /boot/vmlinuz*.el7*),) - $(call buildpkg,3rdparty/sword) -endif - -wv2: -# Do NOT build on Mageia or openSUSE or PCLINUXOS -ifeq ($(wildcard /etc/mageia-release /etc/SuSE-release /etc/pclinuxos-release),) - $(call buildpkg,3rdparty/wv2) -endif - -### Extra packages -akode: tqtinterface - $(call buildpkg,extras/akode) - -cmake-macros: cmake -ifneq ($(wildcard /etc/SuSE-release),) - $(call buildpkg,extras/trinity-cmake-macros) -endif - -### Trinity Libraries -kipi-plugins: tqtinterface libkipi - $(call buildpkg,libraries/kipi-plugins) - -libkdcraw: tqtinterface - $(call buildpkg,libraries/libkdcraw) - -libkexiv2: tqtinterface - $(call buildpkg,libraries/libkexiv2) - -libkipi: tqtinterface - $(call buildpkg,libraries/libkipi) - -libksquirrel: tqtinterface - $(call buildpkg,libraries/libksquirrel) - -mlt: tqtinterface - $(call buildpkg,libraries/mlt) - -pytdeextensions: tqtinterface python-trinity - $(call buildpkg,libraries/pytdeextensions) - -python-trinity: tqtinterface python-qt3 - $(call buildpkg,libraries/python-trinity) - -### Trinity Applications -abakus: tdebase - $(call buildpkg,applications/abakus) - -adept: tdebase - $(call buildpkg,applications/adept) - -amarok: tdebase cmake - $(call buildpkg,applications/amarok) - -basket: tdebase - $(call buildpkg,applications/basket) - -bibletime: tdebase sword - $(call buildpkg,applications/bibletime) - -compizconfig-backend-kconfig: tdebase - $(call buildpkg,applications/compizconfig-backend-kconfig) - -desktop-effects-tde: tdebase - $(call buildpkg,applications/desktop-effects-tde) - -digikam: tdebase libkdcraw libkexiv2 libkipi libksquirrel - $(call buildpkg,applications/digikam) - -dolphin: tdebase - $(call buildpkg,applications/dolphin) - -filelight: tdebase - $(call buildpkg,applications/filelight) - -filelight-l10n: tdebase - $(call buildpkg,applications/filelight-l10n) - -fusion-icon: tdebase - $(call buildpkg,applications/fusion-icon) - -gtk-qt-engine: tdebase -# Do NOT build on CentOS 5 (GTK2 is too old) -ifeq ($(wildcard /boot/vmlinuz*.el5*),) - $(call buildpkg,applications/gtk-qt-engine) -endif - -gwenview: tdebase - $(call buildpkg,applications/gwenview) - -k3b: tdebase - $(call buildpkg,applications/k3b) - -k9copy: tdebase k3b - $(call buildpkg,applications/k9copy) - -kaffeine: tdebase - $(call buildpkg,applications/kaffeine) - -kaffeine-mozilla: tdebase kaffeine - $(call buildpkg,applications/kaffeine-mozilla) - -katapult: tdebase - $(call buildpkg,applications/katapult) - -kbarcode: tdebase - $(call buildpkg,applications/kbarcode) - -kbfx: tdebase - $(call buildpkg,applications/kbfx) - -kbookreader: tdebase - $(call buildpkg,applications/kbookreader) - -kchmviewer: tdebase - $(call buildpkg,applications/kchmviewer) - -kcmautostart: tdebase - $(call buildpkg,applications/kcmautostart) - -kcpuload: tdebase - $(call buildpkg,applications/kcpuload) - -kdbusnotification: tdebase - $(call buildpkg,applications/kdbusnotification) - -kdiff3: tdebase - $(call buildpkg,applications/kdiff3) - -kdirstat: tdebase - $(call buildpkg,applications/kdirstat) - -kdpkg: tdebase - $(call buildpkg,applications/kdpkg) - -keep: tdebase - $(call buildpkg,applications/keep) - -kgtk-qt3: tdebase -# Do NOT build on CentOS 5 (GTK2 is too old) -# Do NOT build on CentOS >=7 (GTK2 is too new) -# Do NOT build on Fedora >= 20 (GTK2 is too new) -# Do NOT build on Mageia >= 4 (GTK2 is too new) -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc20* /boot/vmlinuz*.mga4*),) - $(call buildpkg,applications/kgtk-qt3) -endif - -kile: tdebase - $(call buildpkg,applications/kile) - -kima: tdebase - $(call buildpkg,applications/kima) - -kiosktool: tdebase - $(call buildpkg,applications/kiosktool) - -kmplayer: tdebase - $(call buildpkg,applications/kmplayer) - -kmyfirewall: tdebase - $(call buildpkg,applications/kmyfirewall) - -kmymoney: tdebase - $(call buildpkg,applications/kmymoney) - -knemo: tdebase - $(call buildpkg,applications/knemo) - -knetload: tdebase - $(call buildpkg,applications/knetload) - -knetstats: tdebase - $(call buildpkg,applications/knetstats) - -knetworkmanager8: tdebase - $(call buildpkg,applications/knetworkmanager8) - -knights: tdebase gnuchess - $(call buildpkg,applications/knights) - -knowit: tdebase - $(call buildpkg,applications/knowit) - -knutclient: tdebase - $(call buildpkg,applications/knutclient) - -koffice: tdebase wv2 - $(call buildpkg,applications/koffice) - -konversation: tdebase - $(call buildpkg,applications/konversation) - -kopete-otr: tdebase libotr3 - $(call buildpkg,applications/kopete-otr) - -kpicosim: tdebase - $(call buildpkg,applications/kpicosim) - -kpilot: tdebase -# Do NOT build on CentOS 5 (pilot-link library is too old) -ifeq ($(wildcard /boot/vmlinuz*.el5*),) - $(call buildpkg,applications/kpilot) -endif - -kpowersave: tdebase - $(call buildpkg,applications/kpowersave) - -krename: tdebase - $(call buildpkg,applications/krename) - -krusader: tdebase - $(call buildpkg,applications/krusader) - -ksplash-engine-moodin: tdebase - $(call buildpkg,applications/ksplash-engine-moodin) - -ksquirrel: tdebase libksquirrel - $(call buildpkg,applications/ksquirrel) - -kstreamripper: tdebase - $(call buildpkg,applications/kstreamripper) - -ksystemlog: tdebase - $(call buildpkg,applications/ksystemlog) - -ktechlab: tdebase - $(call buildpkg,applications/ktechlab) - -ktorrent: tdebase - $(call buildpkg,applications/ktorrent) - -kuickshow: tdebase imlib1 - $(call buildpkg,applications/kuickshow) - -kvirc: tdebase - $(call buildpkg,applications/kvirc) - -kvkbd: tdebase - $(call buildpkg,applications/kvkbd) - -piklab: tdebase - $(call buildpkg,applications/piklab) - -potracegui: tdebase - $(call buildpkg,applications/potracegui) - -rosegarden: tdebase lilypond -# Do NOT build on CentOS 5, CentOS 7 -ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el7*),) - $(call buildpkg,applications/rosegarden) -endif - -smartcardauth: tdebase pcsc-perl - $(call buildpkg,applications/smartcardauth) - -smb4k: tdebase - $(call buildpkg,applications/smb4k) - -soundkonverter: tdebase - $(call buildpkg,applications/soundkonverter) - -tde-guidance: tdebase pytdeextensions - $(call buildpkg,applications/tde-guidance) - -tdeio-apt: tdebase - $(call buildpkg,applications/tdeio-apt) - -tdeio-locate: tdebase - $(call buildpkg,applications/tdeio-locate) - -tdeio-umountwrapper: tdebase - $(call buildpkg,applications/tdeio-umountwrapper) - -tderadio: tdebase -# Do NOT build on CentOS 7 -ifeq ($(wildcard /boot/vmlinuz*.el7*),) - $(call buildpkg,applications/tderadio) -endif - -tde-style-lipstik: tdebase - $(call buildpkg,applications/tde-style-lipstik) - -tde-style-qtcurve: tdebase - $(call buildpkg,applications/tde-style-qtcurve) - -tdesudo: tdebase - $(call buildpkg,applications/tdesudo) - -tdesvn: tdebase - $(call buildpkg,applications/tdesvn) - -tde-systemsettings: tdebase - $(call buildpkg,applications/tde-systemsettings) - -tdmtheme: tdebase - $(call buildpkg,applications/tdmtheme) - -tellico: tdebase - $(call buildpkg,applications/tellico) - -twin-style-crystal: tdebase - $(call buildpkg,applications/twin-style-crystal) - -wlassistant: tdebase - $(call buildpkg,applications/wlassistant) - -yakuake: tdebase - $(call buildpkg,applications/yakuake) - -### Trinity Translations -gwenview-i18n: tdebase - $(call buildpkg,applications/gwenview-i18n) - -k3b-i18n: tdebase - $(call buildpkg,applications/k3b-i18n) - -koffice-i18n: tdebase - $(call buildpkg,applications/koffice-i18n) - -tde-i18n: tdebase cmake - $(call buildpkg,tde-i18n) - -### Meta packages -meta: - $(call buildpkg,extras/trinity-desktop) - -### Extra packages -fileshareset: - $(call buildpkg,extras/fileshareset) - -trinity-filesystem: - $(call buildpkg,extras/trinity-filesystem) - -ksensors: - $(call buildpkg,applications/ksensors) diff --git a/redhat/applications/abakus/abakus-3.5.13.2.spec b/redhat/applications/abakus/abakus-3.5.13.2.spec deleted file mode 100644 index 9200c19a4..000000000 --- a/redhat/applications/abakus/abakus-3.5.13.2.spec +++ /dev/null @@ -1,126 +0,0 @@ -# Default version for this component -%define tde_pkg abakus -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: Calculator for TDE -Version: 0.91 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: cmake >= 2.8 -BuildRequires: bison - -%description -AbaKus is a complex calculator, which provides -many different kinds of calculations. -Think of it as bc (the command-line calculator) with a nice GUI. -It also gives information about mathematical variables and -has the user-friendly menu options of a normal TDE application. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Do not build against any "/usr" installed KDE -export KDEDIR="%{tde_prefix}" - -# Specific path for RHEL4 -if [ -d "/usr/X11R6" ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DBUILD_ALL=ON \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/abakus -%{tde_datadir}/apps/abakus/ -%{tde_datadir}/icons/hicolor/*/apps/abakus.png -%{tde_tdedocdir}/HTML/en/abakus/ -%{tde_datadir}/applnk/Utilities/abakus.desktop - -%changelog diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/abakus/abakus.spec index fe63fd198..c4077a07d 100644 --- a/redhat/applications/abakus/abakus.spec +++ b/redhat/applications/abakus/abakus.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg abakus %define tde_prefix /opt/trinity @@ -28,6 +28,7 @@ %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 @@ -82,6 +83,16 @@ BuildRequires: gamin-devel # OPENSSL support BuildRequires: openssl-devel +# 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 AbaKus is a complex calculator, which provides @@ -139,6 +150,11 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/abakus.desktop" Utility Calculator +%endif + %clean %__rm -rf %{buildroot} @@ -151,7 +167,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/abakus/ %{tde_datadir}/icons/hicolor/*/apps/abakus.png %{tde_tdedocdir}/HTML/en/abakus/ -%{tde_datadir}/applnk/Utilities/abakus.desktop +%{tde_tdeappdir}/abakus.desktop %changelog diff --git a/redhat/applications/adept/adept-3.5.13.2.spec b/redhat/applications/adept/adept-3.5.13.2.spec deleted file mode 100644 index 0939d80f0..000000000 --- a/redhat/applications/adept/adept-3.5.13.2.spec +++ /dev/null @@ -1,183 +0,0 @@ -# Default version for this component -%define tde_pkg adept -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Package management suite for Trinity -Version: 2.1.3 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://lpnotfr.free.fr/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -Requires: %{name}-manager = %{version}-%{release} -Requires: %{name}-installer = %{version}-%{release} -Requires: %{name}-updater = %{version}-%{release} -Requires: %{name}-notifier = %{version}-%{release} -Requires: %{name}-batch = %{version}-%{release} - - -%description -These packages belong to the adept suite: - * adept-manager - package manager - * adept-installer - application manager - * adept-updater - system upgrade wizard - * adept-notifier - systray notification of available updates - - -%files -%defattr(-,root,root,-) -%doc AUTHORS CHANGELOG ChangeLog COPYING - -########## - -%package common -Requires: trinity-konsole -Summary: Package manager for Trinity -- common files - -%description common -Icons and other common files for all adept components. - -########## - -%package manager -Requires: %{name}-common = %{version}-%{release} -Summary: package manager for Trinity - -%description manager -Adept Manager is a graphical user interface for package management. - -Besides these basic functions the following features are provided: - * Search and filter the list of available packages (also using debtags) - * Perform smart system upgrades - * Edit the list of used repositories (sources.list) - * Configure packages through the debconf system - -Please also install libtqt-perl if you want the TDE Debconf frontend -to function. - -########## - -%package installer -Requires: %{name}-common = %{version}-%{release} -Summary: simple user interface for application management (for Trinity) - -%description installer -Adept Installer presents a list of applications available through the -Advanced Package Tool (APT). An application is considered a package -that contains a .desktop file for use with TDE, GNOME or other -desktop environment. - -########## - -%package updater -Requires: %{name}-common = %{version}-%{release} -Summary: system update tool for Trinity - -%description updater -Adept Updater provides a simple wizard-style user interface to system -upgrades. It uses same algorithms as apt-get dist-upgrade. - -########## - -%package notifier -Requires: %{name}-common = %{version}-%{release} -Requires: %{name}-updater = %{version}-%{release} -Summary: System tray notifier of available system updates - -%description notifier -Adept Notifier provides a system tray icon notifying the user of -available updates. It will run Adept Updater for the user when -clicked. - -########## - -%package batch -Requires: %{name}-manager = %{version}-%{release} -Summary: command line install for Adept - -%description batch -Adept Batch lets you install packages with Adept from the -command line. It is intended for shell scripts and being run -by external applications. - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --disable-rpath \ - --enable-closure - -%__make %{?_smp_mflags} -C adept - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - - - -%changelog diff --git a/redhat/applications/adept/adept-14.0.0.spec b/redhat/applications/adept/adept.spec index 62e996ddf..ba1c416f4 100644 --- a/redhat/applications/adept/adept-14.0.0.spec +++ b/redhat/applications/adept/adept.spec @@ -18,7 +18,7 @@ # Default version for this component %define tde_pkg adept %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif # TDE specific building variables diff --git a/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch b/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch deleted file mode 100644 index 0b6d3259b..000000000 --- a/redhat/applications/amarok/amarok-3.5.13.1-fix_rhel4_libs.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- amarok-3.5.13.1/amarok/src/engine/yauap/ConfigureChecks.cmake.ORI 2012-10-11 22:54:02.017468265 +0200 -+++ amarok-3.5.13.1/amarok/src/engine/yauap/ConfigureChecks.cmake 2012-10-11 22:54:52.644445209 +0200 -@@ -16,8 +16,8 @@ - endif( ) - - # dbus-tqt --pkg_search_module( DBUS_TQT dbus-tqt ) --if( NOT DBUS_TQT_FOUND ) -- tde_message_fatal( "dbus-tqt is required, but was not found on your system" ) --endif( ) -+#pkg_search_module( DBUS_TQT dbus-tqt ) -+#if( NOT DBUS_TQT_FOUND ) -+# tde_message_fatal( "dbus-tqt is required, but was not found on your system" ) -+#endif( ) - diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec deleted file mode 100644 index 9f6c153db..000000000 --- a/redhat/applications/amarok/amarok-3.5.13.2.spec +++ /dev/null @@ -1,438 +0,0 @@ -# Basic package informations -%define tde_pkg amarok -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Media player -Version: 1.4.10 -Release: %{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist} - -Group: Applications/Multimedia -License: GPLv2+ -Url: http://amarok.kde.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch3: amarok-3.5.13.1-fix_rhel4_libs.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-konqueror-devel >= %{tde_version} - -BuildRequires: alsa-lib-devel -BuildRequires: desktop-file-utils -BuildRequires: esound-devel -BuildRequires: gettext -BuildRequires: pcre-devel -BuildRequires: taglib-devel - -# LIBTOOL -BuildRequires: libtool -%if 0%{?fedora} > 4 || 0%{?rhel} > 4 -BuildRequires: libtool-ltdl-devel -%endif - -BuildRequires: libusb-devel -BuildRequires: mysql-devel -BuildRequires: postgresql-devel -BuildRequires: SDL-devel -BuildRequires: taglib-devel -BuildRequires: sqlite-devel -# not used anymore, in favor of libvisual ? -- Rex -#{?fedora:BuildRequires: xmms-devel} - - -# DBUS support -%if 0%{?suse_version} -BuildRequires: dbus-1-devel -%else -BuildRequires: dbus-devel -%endif - -# DBUS-(T)QT support -%if 0%{?rhel} == 4 -BuildRequires: dbus-qt -%else -BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 -%endif - -# IFP support -# IFP package is broken under PCLinuxOS. -%if 0%{?pclinuxos} == 0 -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_ifp 1 -BuildRequires: libifp-devel -%endif -%endif - -# KARMA support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} == 0 -%define with_karma 1 -BuildRequires: libkarma-devel -BuildRequires: karma-sharp -%endif -%endif - -# GPOD (ipod) support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_gpod 1 -BuildRequires: libgpod-devel >= 0.4.2 -%endif - -# MTP players -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_mtp 1 -BuildRequires: libmtp-devel -BuildRequires: libmusicbrainz-devel -%endif - -# Creative Nomad Jukebox -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 -%define with_njb 1 -BuildRequires: libnjb-devel -%endif - -# VISUAL support -%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_libvisual 1 -BuildRequires: libvisual-devel -%endif - -# TUNEPIMP support -%if 0%{?mgaversion} && 0%{?mgaversion} <= 2 -BuildRequires: libtunepimp-devel -%endif -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version} -BuildRequires: libtunepimp-devel -%endif - -# INOTIFY support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_inotify 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}inotifytools-devel -%endif -%endif - -# XINE support -%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: %{_lib}xine-devel -%else -BuildRequires: %{_lib}xine1.2-devel -%endif -%endif -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: xine-lib-devel -%endif -%if 0%{?suse_version} -BuildRequires: libxine-devel -%endif -%endif - -# YAUAP support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_yauap 1 -%endif - -# AKODE support -%if 0 -%define with_akode 1 -BuildRequires: trinity-akode-devel -%endif - -# MP4V2 support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_mp4v2 1 -BuildRequires: libmp4v2-devel -%endif - -# ruby -BuildRequires: ruby -BuildRequires: ruby-devel - -# To open the selected browser, works with Patch2 -Requires: xdg-utils -Requires(post): xdg-utils -Requires(postun): xdg-utils - - -%description -Amarok is a multimedia player with: - - fresh playlist concept, very fast to use, with drag and drop - - plays all formats supported by the various engines - - audio effects, like reverb and compressor - - compatible with the .m3u and .pls formats for playlists - - nice GUI, integrates into the TDE look, but with a unique touch - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc COPYING AUTHORS ChangeLog README -%{tde_bindir}/amarok -%{tde_bindir}/amarokapp -%{tde_bindir}/amarokcollectionscanner -%{tde_bindir}/amarok_proxy.rb -%{tde_datadir}/apps/amarok/ -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_tdeappdir}/*.desktop -%{tde_datadir}/servicetypes/*.desktop -%{tde_datadir}/apps/profiles/amarok.profile.xml -%{tde_datadir}/config/amarokrc -%{tde_datadir}/config.kcfg/*.kcfg -%{tde_datadir}/services/amarokitpc.protocol -%{tde_datadir}/services/amaroklastfm.protocol -%{tde_datadir}/services/amarokpcast.protocol -# -libs ? -- Rex -%{tde_libdir}/libamarok.so.0 -%{tde_libdir}/libamarok.so.0.0.0 -# DAAP -%{tde_bindir}/amarok_daapserver.rb -%{tde_tdelibdir}/libamarok_daap-mediadevice.* -%{tde_datadir}/services/amarok_daap-mediadevice.desktop -# Mass-storage -%{tde_datadir}/services/amarok_massstorage-device.desktop -%{tde_tdelibdir}/libamarok_massstorage-device.* -# NFS -%{tde_datadir}/services/amarok_nfs-device.desktop -%{tde_tdelibdir}/libamarok_nfs-device.* -# SMB -%{tde_datadir}/services/amarok_smb-device.desktop -%{tde_tdelibdir}/libamarok_smb-device.* -# IPod -%if 0%{?with_gpod} -%{tde_datadir}/services/amarok_ipod-mediadevice.desktop -%{tde_tdelibdir}/libamarok_ipod-mediadevice.* -%endif -# VFAT -%{tde_datadir}/services/amarok_generic-mediadevice.desktop -%{tde_tdelibdir}/libamarok_generic-mediadevice.* -# iRiver -%if 0%{?with_ifp} -%{tde_datadir}/services/amarok_ifp-mediadevice.desktop -%{tde_tdelibdir}/libamarok_ifp-mediadevice.* -%endif -# Creative Zen -%if 0%{?with_njb} -%{tde_datadir}/services/amarok_njb-mediadevice.desktop -%{tde_tdelibdir}/libamarok_njb-mediadevice.* -%endif -# MTP players -%if 0%{?with_mtp} -%{tde_datadir}/services/amarok_mtp-mediadevice.desktop -%{tde_tdelibdir}/libamarok_mtp-mediadevice.* -%endif -# Rio Karma -%if 0%{?with_karma} -%{tde_datadir}/services/amarok_riokarma-mediadevice.desktop -%{tde_tdelibdir}/libamarok_riokarma-mediadevice.* -%endif -# Void engine (noop) -%{tde_datadir}/services/amarok_void-engine_plugin.desktop -%{tde_tdelibdir}/libamarok_void-engine_plugin.* -# Xine engine -%if 0%{?with_xine} -%{tde_datadir}/services/amarok_xine-engine.desktop -%{tde_tdelibdir}/libamarok_xine-engine.* -%endif -## Gstreamer engine -#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop -#%{tde_tdelibdir}/libamarok_gst10engine_plugin.* -# YAUAP -%if 0%{?with_yauap} -%{tde_datadir}/services/amarok_yauap-engine_plugin.desktop -%{tde_tdelibdir}/libamarok_yauap-engine_plugin.* -%endif -# AKODE -%if 0%{?with_akode} -%{tde_datadir}/services/amarok_aKode-engine.desktop -%{tde_tdelibdir}/libamarok_aKode-engine.* -%endif - -%post -/sbin/ldconfig -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -xdg-desktop-menu forceupdate 2> /dev/null || : - -%postun -/sbin/ldconfig -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -xdg-desktop-menu forceupdate 2> /dev/null || : - - -########## - -%package ruby -Summary: %{name} Ruby support -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -# For dir ownership and some default plugins (lyrics) -Requires: ruby - -%description ruby -%{summary}. - -%files ruby -%defattr(-,root,root,-) -%{tde_libdir}/ruby_lib/* - -########## - -%package konqueror -Summary: Amarok konqueror (service menus, sidebar) support -Group: Applications/Multimedia - -Requires: %{name} = %{version}-%{release} -Requires: trinity-konqueror - -%description konqueror -%{summary}. - -%files konqueror -%defattr(-,root,root,-) -%{tde_datadir}/apps/konqueror/servicemenus/*.desktop -%{tde_tdelibdir}/konqsidebar_universalamarok.* -%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop - - -########## - -%if 0%{?with_libvisual} - -%package visualisation -Summary: Visualisation plugins for Amarok -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -# No plugins by default, we need libvisual-plugins -#Requires: libvisual-plugins - -%description visualisation -Amarok can use visualisation plugins from different origins. -Right now, only xmms is supported, which means that you can -use any of xmms' visualisation plugins with Amarok. - -%files visualisation -%defattr(-,root,root,-) -%{tde_bindir}/amarok_libvisual - -%endif - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?rhel} == 4 -%patch3 -p1 -b .rhel4 -%endif - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Do not build against any "/usr" installed KDE -export KDEDIR=%{tde_prefix} - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - %{?with_libvisual:-DWITH_LIBVISUAL=ON} \ - -DWITH_KONQSIDEBAR=ON \ - %{?with_xine:-DWITH_XINE=ON} \ - %{?with_yauap:-DWITH_YAUAP=ON} \ - %{?with_akode:-DWITH_AKODE=ON} \ - %{?with_gpod:-DWITH_IPOD=ON} \ - %{?with_ifp:-DWITH_IFP=ON} \ - %{?with_njb:-DWITH_NJB=ON} \ - %{?with_mtp:-DWITH_MTP=ON} \ - %{?with_karma:-DWITH_RIOKARMA=ON} \ - -DWITH_DAAP=ON \ - %{?with_mp4v2:-DWITH_MP4V2=ON} \ - %{?with_inotify:-DWITH_INOTIFY=ON} \ - -DBUILD_ALL=ON \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -fr $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT -C build - - -# unpackaged files -%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la -# Removes '.so' to avoid automatic -devel dependency -%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/libamarok.so - -# Locales -%find_lang %{tde_pkg} - -# HTML -for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - [ "$lang" == "en" ] && d=en/amarok || d=$lang - echo "%lang($lang) %doc %{tde_tdedocdir}/HTML/$d" >> amarok.lang - fi -done - - - -%clean -%__rm -fr $RPM_BUILD_ROOT - - -%changelog diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok.spec index a18b8f583..c483cd3ed 100644 --- a/redhat/applications/amarok/amarok-14.0.0.spec +++ b/redhat/applications/amarok/amarok.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg amarok %define tde_prefix /opt/trinity @@ -133,6 +133,9 @@ BuildRequires: dbus-qt BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 %endif +# DAAP support +%define with_daap 0 + # IFP support # IFP package is broken under PCLinuxOS. %if 0%{?pclinuxos} == 0 @@ -207,17 +210,21 @@ BuildRequires: %{_lib}inotifytools-devel %endif # XINE support -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?rhel} >= 5 +%if 0%{?fedora} && 0%{?fedora} <= 31 %define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xine1.2-devel +BuildRequires: xine-lib-devel %endif -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 7 +#define with_xine 1 BuildRequires: xine-lib-devel %endif -%if 0%{?suse_version} -BuildRequires: libxine-devel +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +%define with_xine 1 +BuildRequires: %{_lib}xine1.2-devel %endif +%if 0%{?sle_version} && 0%{?sle_version} <= 150000 +%define with_xine 1 +BuildRequires: libxine-devel %endif # YAUAP support @@ -285,18 +292,23 @@ Amarok is a multimedia player with: %{tde_tdeappdir}/*.desktop %{tde_datadir}/servicetypes/*.desktop %{tde_datadir}/apps/profiles/amarok.profile.xml -%{tde_confdir}/amarokrc +%config(noreplace) %{tde_confdir}/amarokrc %{tde_datadir}/config.kcfg/*.kcfg %{tde_datadir}/services/amarokitpc.protocol %{tde_datadir}/services/amaroklastfm.protocol %{tde_datadir}/services/amarokpcast.protocol +%{tde_mandir}/man1/amarok.1* +%{tde_mandir}/man1/amarokapp.1* +%{tde_mandir}/man1/amarokcollectionscanner.1* # -libs ? -- Rex %{tde_libdir}/libamarok.so.0 %{tde_libdir}/libamarok.so.0.0.0 # DAAP +%if 0%{?with_daap} %{tde_bindir}/amarok_daapserver.rb %{tde_tdelibdir}/libamarok_daap-mediadevice.* %{tde_datadir}/services/amarok_daap-mediadevice.desktop +%endif # Mass-storage %{tde_datadir}/services/amarok_massstorage-device.desktop %{tde_tdelibdir}/libamarok_massstorage-device.* @@ -343,8 +355,8 @@ Amarok is a multimedia player with: %{tde_tdelibdir}/libamarok_xine-engine.* %endif ## Gstreamer engine -#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop -#%{tde_tdelibdir}/libamarok_gst10engine_plugin.* +#{tde_datadir}/services/amarok_gst10engine_plugin.desktop +#{tde_tdelibdir}/libamarok_gst10engine_plugin.* # YAUAP %if 0%{?with_yauap} %{tde_datadir}/services/amarok_yauap-engine_plugin.desktop @@ -358,22 +370,6 @@ Amarok is a multimedia player with: ########## -%package ruby -Summary: %{name} Ruby support -Group: Applications/Multimedia -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -# For dir ownership and some default plugins (lyrics) -Requires: ruby - -%description ruby -%{summary}. - -%files ruby -%defattr(-,root,root,-) -%{tde_libdir}/ruby_lib/ - -########## - %package konqueror Summary: Amarok konqueror (service menus, sidebar) support Group: Applications/Multimedia @@ -410,6 +406,7 @@ use any of xmms' visualisation plugins with Amarok. %files visualisation %defattr(-,root,root,-) %{tde_bindir}/amarok_libvisual +%{tde_mandir}/man1/amarok_libvisual.1* %endif @@ -431,6 +428,18 @@ if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )" -e "s|Config\.|RbConfig\.|g" fi +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%__sed -i "amarok/src/scripts/common/Publisher.py" \ + "amarok/src/scripts/common/Zeroconf.py" \ + "amarok/src/scripts/playlist2html/Playlist.py" \ + "amarok/src/scripts/playlist2html/playlist2html.py" \ + "amarok/src/scripts/playlist2html/PlaylistServer.py" \ + "amarok/src/scripts/webcontrol/Playlist.py" \ + "amarok/src/scripts/webcontrol/RequestHandler.py" \ + "amarok/src/scripts/webcontrol/WebControl.py" \ + -e "s|/usr/bin/env python|/usr/bin/env python2|" +%endif + %build unset QTDIR QTINC QTLIB @@ -466,7 +475,7 @@ fi \ %{?with_libvisual:-DWITH_LIBVISUAL=ON} \ -DWITH_KONQSIDEBAR=ON \ - %{?with_xine:-DWITH_XINE=ON} \ + %{?with_xine:-DWITH_XINE=ON} %{?!with_xine:-DWITH_XINE=OFF}\ %{?with_yauap:-DWITH_YAUAP=ON} \ -DWITH_AKODE=OFF \ %{?with_gpod:-DWITH_IPOD=ON} \ @@ -474,9 +483,10 @@ fi %{?with_njb:-DWITH_NJB=ON} \ %{?with_mtp:-DWITH_MTP=ON} \ %{?with_karma:-DWITH_RIOKARMA=ON} \ - -DWITH_DAAP=ON \ + %{!?with_daap:-DWITH_DAAP=OFF} \ %{?with_mp4v2:-DWITH_MP4V2=ON} \ %{?with_inotify:-DWITH_INOTIFY=ON} \ + -DWITH_SYSTEM_SQLITE=ON \ -DBUILD_ALL=ON \ .. diff --git a/redhat/applications/basket/basket-3.5.13.2.spec b/redhat/applications/basket/basket-3.5.13.2.spec deleted file mode 100644 index c392dea83..000000000 --- a/redhat/applications/basket/basket-3.5.13.2.spec +++ /dev/null @@ -1,157 +0,0 @@ -# Default version for this component -%define tde_pkg basket -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Taking care of your ideas. -Version: 1.0.3.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: trinity-tdepim-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gpgme-devel - -%description -This application is mainly an all-purpose notes taker. It provide several baskets where -to drop every sort of items: text, rich text, links, images, sounds, files, colors, -application launcher... Objects can be edited, copied, dragged... So, you can arrange -them as you want ! This application can be used to quickly drop web objects (link, text, -images...) or notes, as well as to free your clutered desktop (if any). It is also useful -to collect informations for a report. Those data can be shared with co-workers by exporting -baskets to HTML. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -# 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 \ - --disable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%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 COPYING -%{tde_bindir}/basket -%{tde_tdeappdir}/basket.desktop -%{tde_datadir}/apps/basket/ -%{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg -%{tde_libdir}/libbasketcommon.la -%{tde_libdir}/libbasketcommon.so -%{tde_tdelibdir}/basketthumbcreator.la -%{tde_tdelibdir}/basketthumbcreator.so -%{tde_tdelibdir}/kcm_basket.la -%{tde_tdelibdir}/kcm_basket.so -%{tde_tdelibdir}/libbasketpart.la -%{tde_tdelibdir}/libbasketpart.so -%{tde_tdelibdir}/libkontact_basket.la -%{tde_tdelibdir}/libkontact_basket.so -%{tde_datadir}/config/magic/basket.magic -%{tde_datadir}/icons/crystalsvg/*/*/* -%{tde_datadir}/mimelnk/application/x-basket-archive.desktop -%{tde_datadir}/mimelnk/application/x-basket-template.desktop -%{tde_datadir}/services/basket_config_apps.desktop -%{tde_datadir}/services/basket_config_baskets.desktop -%{tde_datadir}/services/basket_config_features.desktop -%{tde_datadir}/services/basket_config_general.desktop -%{tde_datadir}/services/basket_config_new_notes.desktop -%{tde_datadir}/services/basket_config_notes.desktop -%{tde_datadir}/services/basket_config_notes_appearance.desktop -%{tde_datadir}/services/basket_part.desktop -%{tde_datadir}/services/basketthumbcreator.desktop -%{tde_datadir}/services/kontact/basket.desktop -%{tde_datadir}/services/kontact/basket_v4.desktop -%{tde_tdedocdir}/HTML/en/basket/ - - -%changelog diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket.spec index 66138fcdb..99cc3f21b 100644 --- a/redhat/applications/basket/basket-14.0.0.spec +++ b/redhat/applications/basket/basket.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg basket %define tde_prefix /opt/trinity @@ -60,11 +60,12 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdepim-devel >= %{tde_version} +BuildRequires: trinity-kontact-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gpgme-devel -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -100,40 +101,43 @@ baskets to HTML. %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/"*"/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} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS="ON" \ + .. -%__make %{?_smp_mflags} || %__make +%__make %{?_smp_mflags} %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -168,23 +172,21 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %{tde_tdelibdir}/libbasketpart.so %{tde_tdelibdir}/libkontact_basket.la %{tde_tdelibdir}/libkontact_basket.so -%{tde_confdir}/magic/basket.magic +%config(noreplace) %{tde_confdir}/magic/basket.magic %{tde_datadir}/icons/crystalsvg/*/*/* %{tde_datadir}/mimelnk/application/x-basket-archive.desktop %{tde_datadir}/mimelnk/application/x-basket-template.desktop %{tde_datadir}/services/basket_config_apps.desktop %{tde_datadir}/services/basket_config_baskets.desktop -#%{tde_datadir}/services/basket_config_features.desktop %{tde_datadir}/services/basket_config_general.desktop %{tde_datadir}/services/basket_config_new_notes.desktop -#%{tde_datadir}/services/basket_config_notes.desktop %{tde_datadir}/services/basket_config_notes_appearance.desktop %{tde_datadir}/services/basket_part.desktop %{tde_datadir}/services/basketthumbcreator.desktop %{tde_datadir}/services/kontact/basket.desktop -%{tde_datadir}/services/kontact/basket_v4.desktop %{tde_tdedocdir}/HTML/en/basket/ -%{tde_confdir}/magic/basket.magic.mgc +%config(noreplace) %{tde_confdir}/magic/basket.magic.mgc +%{tde_mandir}/man1/basket.* %changelog diff --git a/redhat/applications/bibletime/bibletime-3.5.13.2.spec b/redhat/applications/bibletime/bibletime-3.5.13.2.spec deleted file mode 100644 index 8bec59af8..000000000 --- a/redhat/applications/bibletime/bibletime-3.5.13.2.spec +++ /dev/null @@ -1,146 +0,0 @@ -# Default version for this component -%define tde_pkg bibletime -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: A bible study tool for Trinity -Version: 1.6.6.0 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -# Requires: clucene -%if 0%{?fedora} || 0%{?suse_version} -BuildRequires: clucene-core-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}clucene-devel -%endif - -# Requires: sword -BuildRequires: sword-devel -Requires: sword - -%description -BibleTime is a free and easy to use bible study tool for UNIX systems. -It requires a working TDE environment and the SWORD library. -BibleTime provides easy handling of digitized texts (Bibles, commentaries -and lexicons) and powerful features to work with these texts (search in -texts, write own notes, save, print etc.). - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/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 -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ -%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7 - --with-sword-dir=%{tde_prefix} -%endif - -# Not SMP safe ! -%__make -C bibletime/frontend - -# SMP safe ! -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/* -%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc -%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_datadir}/applications -q &> /dev/null - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_datadir}/applications -q &> /dev/null - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/bibletime -%{tde_tdeincludedir}/bibletimeinterface.h -%{tde_datadir}/applications/bibletime.desktop -%{tde_datadir}/apps/bibletime/ -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_tdedocdir}/HTML/en/bibletime/ - - -%changelog diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime.spec index c6a0991a1..2efbcfb47 100644 --- a/redhat/applications/bibletime/bibletime-14.0.0.spec +++ b/redhat/applications/bibletime/bibletime.spec @@ -23,7 +23,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg bibletime %define tde_prefix /opt/trinity @@ -124,6 +124,10 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" +%if 0%{?fedora} >= 31 +CXXFLAGS="${RPM_OPT_FLAGS} -std=c++11" +%endif + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ diff --git a/redhat/applications/codeine/codeine.spec b/redhat/applications/codeine/codeine.spec new file mode 100644 index 000000000..13a395b94 --- /dev/null +++ b/redhat/applications/codeine/codeine.spec @@ -0,0 +1,165 @@ +# +# spec file for package kaffeine (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.1.0 +%endif +%define tde_pkg codeine +%define tde_prefix /opt/trinity +%define tde_appdir %{tde_datadir}/applications +%define tde_bindir %{tde_prefix}/bin +%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: 1.0.1 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Simple TDE video player +Group: Applications/Multimedia +URL: http://kaffeine.sourceforge.net/ + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif + +#Vendor: Trinity Desktop +#Packager: Francois Andriot <francois.andriot@free.fr> + +Prefix: %{_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: gettext + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig + +# 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 + +# XINE support +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} +%define with_xine 1 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}xine1.2-devel +%endif +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: xine-lib-devel +%endif +%if 0%{?suse_version} +BuildRequires: libxine-devel +%endif +%endif + + +%description +A video player with a different philosophy: simple, uncluttered interface + +Features: +- Plays DVDs, VCDs, all video formats supported by Xine +- Bundled with a simple web-page KPart +- Starts quickly + + +########## + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + +########## + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc COPYING FAQ README TODO +%{tde_bindir}/codeine +%{tde_tdeappdir}/codeine.desktop +%{tde_datadir}/apps/codeine/ +%{tde_datadir}/apps/konqueror/servicemenus/codeine_play_dvd.desktop +%{tde_tdedocdir}/HTML/en/codeine/ +%{tde_datadir}/icons/hicolor/*/apps/codeine.png +%{tde_mandir}/man1/codeine.1* +%{tde_datadir}/services/codeine_part.desktop +%{tde_tdelibdir}/libcodeine.la +%{tde_tdelibdir}/libcodeine.so + + +%changelog diff --git a/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec b/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec deleted file mode 100644 index 85a90a849..000000000 --- a/redhat/applications/compizconfig-backend-kconfig/compizconfig-backend-kconfig-3.5.12.spec +++ /dev/null @@ -1,86 +0,0 @@ -# Default version for this component -%if "%{?version}" == "" -%define kdecomp compizconfig-backend-kconfig -%define version 3.5.12 -%endif -%define release 1 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" -%define _docdir %{tde_prefix}/share/doc -%endif - -# TDE 3.5.12 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir} -%define tde_libdir %{tde_libdir}/kde3 - - -Name: trinity-%{?kdecomp} -Version: %{?version} -Release: %{?release}%{?dist} -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -Summary: kconfig backend for compizconfig - -Group: System Environment/Libraries -License: GPLv2+ -URL: http://www.opencompositing.org - -Prefix: %{tde_prefix} - -Source0: %{kdecomp}-%{version}.tar.gz - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - -BuildRequires: libcompizconfig-devel intltool -Requires: compiz - - -%description -The Compiz Fusion Project brings 3D desktop visual effects that improve -usability of the X Window System and provide increased productivity -through plugins and themes contributed by the community giving a -rich desktop experience. - -This package contains the kconfig backend for libcompizconfig - -%prep -%setup -q -n applications/%{kdecomp} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common - - -%build -unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --with-extra-includes=%{tde_includedir}/tqt - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{?buildroot} -%make_install - - -%clean -%__rm -rf %{?buildroot} - - -%files -%defattr(-,root,root,-) -%doc COPYING.GPL COPYING.LGPL -%{_usr}/%{_lib}/compizconfig/backends/*.so -%exclude %{_usr}/%{_lib}/compizconfig/backends/*.la - -%changelog diff --git a/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch b/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch deleted file mode 100644 index 8a5262dda..000000000 --- a/redhat/applications/digikam/digikam-3.5.13.2-fix_png12_support.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- trinity-digikam-3.5.13.2/digikam/libs/dimg/loaders/pngloader.cpp.ORI 2013-03-10 21:44:37.468543760 +0100 -+++ trinity-digikam-3.5.13.2/digikam/libs/dimg/loaders/pngloader.cpp 2013-03-10 21:45:23.246560198 +0100 -@@ -258,7 +258,7 @@ - #ifdef ENABLE_DEBUG_MESSAGES - DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl; - #endif -- png_set_expand_gray_1_2_4_to_8(png_ptr); -+ png_set_gray_1_2_4_to_8(png_ptr); - png_set_gray_to_rgb(png_ptr); - - if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel ---- trinity-digikam-3.5.13.2/digikam/kioslave/digikamthumbnail.cpp.ORI 2013-03-10 21:50:56.994910746 +0100 -+++ trinity-digikam-3.5.13.2/digikam/kioslave/digikamthumbnail.cpp 2013-03-10 21:51:09.150668622 +0100 -@@ -465,7 +465,7 @@ - { - png_set_gray_to_rgb(png_ptr); - if (png_get_bit_depth(png_ptr, info_ptr) < 8) -- png_set_expand_gray_1_2_4_to_8(png_ptr); -+ png_set_gray_1_2_4_to_8(png_ptr); - } - - int sizeOfUint = sizeof(unsigned int); diff --git a/redhat/applications/digikam/digikam-3.5.13.2.spec b/redhat/applications/digikam/digikam-3.5.13.2.spec deleted file mode 100644 index 46bb635af..000000000 --- a/redhat/applications/digikam/digikam-3.5.13.2.spec +++ /dev/null @@ -1,311 +0,0 @@ -# Default version for this component -%define tde_pkg digikam -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: digital photo management application for TDE [Trinity] -Version: 0.9.6 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -# [Digikam] Revert PNG support to libpng12 (for RHEL4) -Patch1: digikam-3.5.13.2-fix_png12_support.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-libkexiv2-devel -BuildRequires: trinity-libkdcraw-devel -BuildRequires: trinity-libkipi-devel - -BuildRequires: libtiff-devel -BuildRequires: gettext - -# GPHOTO2 support -%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: gphoto2-devel -%else -BuildRequires: libgphoto2-devel -%endif - -# JASPER support -%if 0%{?suse_version} -BuildRequires: libjasper-devel -%else -BuildRequires: jasper-devel -%endif - -# EXIV2 support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}exiv2-devel -%endif -%if 0%{?suse_version} -BuildRequires: libexiv2-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: exiv2-devel -%endif - -Requires: trinity-libkexiv2 -Requires: trinity-libkdcraw -Requires: trinity-libkipi - -%description -An easy to use and powerful digital photo management -application, which makes importing, organizing and manipulating -digital photos a "snap". An interface is provided to connect to -your digital camera, preview the images and download and/or -delete them. - -The digiKam built-in image editor makes the common photo correction -a simple task. The image editor is extensible via plugins and, -the digikamimageplugins project has been merged to digiKam core -since release 0.9.2, all useful image editor plugins are available -in the base installation. - -digiKam can also make use of the KIPI image handling plugins to -extend its capabilities even further for photo manipulations, -import and export, etc. The kipi-plugins package contains many -very useful extentions. - -digiKam is based in part on the work of the Independent JPEG Group. - - -%package devel -Group: Development/Libraries -Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} - -%description devel -%{summary} - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?rhel} == 4 -%patch1 -p1 -b .png12 -%endif - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export KDEDIR="%{tde_prefix}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/digikam -%{tde_bindir}/digikamthemedesigner -%{tde_bindir}/digitaglinktree -%{tde_bindir}/showfoto -%{tde_libdir}/libdigikam.so.0 -%{tde_libdir}/libdigikam.so.0.0.0 -%{tde_tdelibdir}/kio_digikamalbums.la -%{tde_tdelibdir}/kio_digikamalbums.so -%{tde_tdelibdir}/kio_digikamdates.la -%{tde_tdelibdir}/kio_digikamdates.so -%{tde_tdelibdir}/digikamimageplugin_adjustcurves.la -%{tde_tdelibdir}/digikamimageplugin_adjustcurves.so -%{tde_tdelibdir}/digikamimageplugin_adjustlevels.la -%{tde_tdelibdir}/digikamimageplugin_adjustlevels.so -%{tde_tdelibdir}/digikamimageplugin_antivignetting.la -%{tde_tdelibdir}/digikamimageplugin_antivignetting.so -%{tde_tdelibdir}/digikamimageplugin_blurfx.la -%{tde_tdelibdir}/digikamimageplugin_blurfx.so -%{tde_tdelibdir}/digikamimageplugin_border.la -%{tde_tdelibdir}/digikamimageplugin_border.so -%{tde_tdelibdir}/digikamimageplugin_channelmixer.la -%{tde_tdelibdir}/digikamimageplugin_channelmixer.so -%{tde_tdelibdir}/digikamimageplugin_charcoal.la -%{tde_tdelibdir}/digikamimageplugin_charcoal.so -%{tde_tdelibdir}/digikamimageplugin_colorfx.la -%{tde_tdelibdir}/digikamimageplugin_colorfx.so -%{tde_tdelibdir}/digikamimageplugin_core.la -%{tde_tdelibdir}/digikamimageplugin_core.so -%{tde_tdelibdir}/digikamimageplugin_distortionfx.la -%{tde_tdelibdir}/digikamimageplugin_distortionfx.so -%{tde_tdelibdir}/digikamimageplugin_emboss.la -%{tde_tdelibdir}/digikamimageplugin_emboss.so -%{tde_tdelibdir}/digikamimageplugin_filmgrain.la -%{tde_tdelibdir}/digikamimageplugin_filmgrain.so -%{tde_tdelibdir}/digikamimageplugin_freerotation.la -%{tde_tdelibdir}/digikamimageplugin_freerotation.so -%{tde_tdelibdir}/digikamimageplugin_hotpixels.la -%{tde_tdelibdir}/digikamimageplugin_hotpixels.so -%{tde_tdelibdir}/digikamimageplugin_infrared.la -%{tde_tdelibdir}/digikamimageplugin_infrared.so -%{tde_tdelibdir}/digikamimageplugin_inpainting.la -%{tde_tdelibdir}/digikamimageplugin_inpainting.so -%{tde_tdelibdir}/digikamimageplugin_inserttext.la -%{tde_tdelibdir}/digikamimageplugin_inserttext.so -%{tde_tdelibdir}/digikamimageplugin_lensdistortion.la -%{tde_tdelibdir}/digikamimageplugin_lensdistortion.so -%{tde_tdelibdir}/digikamimageplugin_noisereduction.la -%{tde_tdelibdir}/digikamimageplugin_noisereduction.so -%{tde_tdelibdir}/digikamimageplugin_oilpaint.la -%{tde_tdelibdir}/digikamimageplugin_oilpaint.so -%{tde_tdelibdir}/digikamimageplugin_perspective.la -%{tde_tdelibdir}/digikamimageplugin_perspective.so -%{tde_tdelibdir}/digikamimageplugin_raindrop.la -%{tde_tdelibdir}/digikamimageplugin_raindrop.so -%{tde_tdelibdir}/digikamimageplugin_restoration.la -%{tde_tdelibdir}/digikamimageplugin_restoration.so -%{tde_tdelibdir}/digikamimageplugin_sheartool.la -%{tde_tdelibdir}/digikamimageplugin_sheartool.so -%{tde_tdelibdir}/digikamimageplugin_superimpose.la -%{tde_tdelibdir}/digikamimageplugin_superimpose.so -%{tde_tdelibdir}/digikamimageplugin_texture.la -%{tde_tdelibdir}/digikamimageplugin_texture.so -%{tde_tdelibdir}/digikamimageplugin_whitebalance.la -%{tde_tdelibdir}/digikamimageplugin_whitebalance.so -%{tde_tdelibdir}/kio_digikamsearch.la -%{tde_tdelibdir}/kio_digikamsearch.so -%{tde_tdelibdir}/kio_digikamtags.la -%{tde_tdelibdir}/kio_digikamtags.so -%{tde_tdelibdir}/kio_digikamthumbnail.la -%{tde_tdelibdir}/kio_digikamthumbnail.so -%{tde_tdeappdir}/digikam.desktop -%{tde_tdeappdir}/showfoto.desktop -%{tde_datadir}/apps/digikam/ -%{tde_datadir}/apps/konqueror/servicemenus/digikam-download.desktop -%{tde_datadir}/apps/konqueror/servicemenus/digikam-gphoto2-camera.desktop -%{tde_datadir}/apps/konqueror/servicemenus/digikam-mount-and-download.desktop -%{tde_datadir}/apps/showfoto/ -%{tde_datadir}/icons/hicolor/*/apps/digikam.png -%{tde_datadir}/icons/hicolor/*/apps/showfoto.png -%{tde_datadir}/services/digikamalbums.protocol -%{tde_datadir}/services/digikamdates.protocol -%{tde_datadir}/services/digikamimageplugin_adjustcurves.desktop -%{tde_datadir}/services/digikamimageplugin_adjustlevels.desktop -%{tde_datadir}/services/digikamimageplugin_antivignetting.desktop -%{tde_datadir}/services/digikamimageplugin_blurfx.desktop -%{tde_datadir}/services/digikamimageplugin_border.desktop -%{tde_datadir}/services/digikamimageplugin_channelmixer.desktop -%{tde_datadir}/services/digikamimageplugin_charcoal.desktop -%{tde_datadir}/services/digikamimageplugin_colorfx.desktop -%{tde_datadir}/services/digikamimageplugin_core.desktop -%{tde_datadir}/services/digikamimageplugin_distortionfx.desktop -%{tde_datadir}/services/digikamimageplugin_emboss.desktop -%{tde_datadir}/services/digikamimageplugin_filmgrain.desktop -%{tde_datadir}/services/digikamimageplugin_freerotation.desktop -%{tde_datadir}/services/digikamimageplugin_hotpixels.desktop -%{tde_datadir}/services/digikamimageplugin_infrared.desktop -%{tde_datadir}/services/digikamimageplugin_inpainting.desktop -%{tde_datadir}/services/digikamimageplugin_inserttext.desktop -%{tde_datadir}/services/digikamimageplugin_lensdistortion.desktop -%{tde_datadir}/services/digikamimageplugin_noisereduction.desktop -%{tde_datadir}/services/digikamimageplugin_oilpaint.desktop -%{tde_datadir}/services/digikamimageplugin_perspective.desktop -%{tde_datadir}/services/digikamimageplugin_raindrop.desktop -%{tde_datadir}/services/digikamimageplugin_restoration.desktop -%{tde_datadir}/services/digikamimageplugin_sheartool.desktop -%{tde_datadir}/services/digikamimageplugin_superimpose.desktop -%{tde_datadir}/services/digikamimageplugin_texture.desktop -%{tde_datadir}/services/digikamimageplugin_whitebalance.desktop -%{tde_datadir}/services/digikamsearch.protocol -%{tde_datadir}/services/digikamtags.protocol -%{tde_datadir}/services/digikamthumbnail.protocol -%{tde_datadir}/servicetypes/digikamimageplugin.desktop -%{tde_mandir}/man*/* -#%{tde_tdedocdir}/HTML/en/digikam-apidocs/ - - -%files devel -%{tde_tdeincludedir}/digikam_export.h -%{tde_tdeincludedir}/digikam/ -%{tde_libdir}/libdigikam.so -%{tde_libdir}/libdigikam.la - - -%changelog diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam.spec index dc95cb8c7..11ea6135a 100644 --- a/redhat/applications/digikam/digikam-14.0.0.spec +++ b/redhat/applications/digikam/digikam.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg digikam %define tde_prefix /opt/trinity diff --git a/redhat/applications/dolphin/dolphin-3.5.13.2.spec b/redhat/applications/dolphin/dolphin-3.5.13.2.spec deleted file mode 100644 index 30db977f4..000000000 --- a/redhat/applications/dolphin/dolphin-3.5.13.2.spec +++ /dev/null @@ -1,139 +0,0 @@ -# Default version for this component -%define tde_pkg dolphin -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: File manager for TDE focusing on usability -Version: 0.9.2 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -Dolphin focuses on being only a file manager. -This approach allows to optimize the user -interface for the task of file management. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/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 -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Makes 'media_safelyremove.desktop' an alternative -%__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin - -# Locales -%find_lang d3lphin - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_tdeappdir} -q &> /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-alternatives --install \ - %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop \ - media_safelyremove.desktop_d3lphin \ - %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin \ - 15 - -%preun -if [ $1 -eq 0 ]; then - update-alternatives --remove \ - media_safelyremove.desktop_d3lphin \ - %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin || : -fi - -%postun -update-desktop-database %{tde_tdeappdir} -q &> /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f d3lphin.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING TODO -%{tde_bindir}/d3lphin -%{tde_tdeappdir}/d3lphin.desktop -%{tde_datadir}/apps/d3lphin/ -%{tde_datadir}/icons/hicolor/*/apps/d3lphin.png -%lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/ - - -%changelog diff --git a/redhat/applications/dolphin/dolphin.spec b/redhat/applications/dolphin/dolphin.spec index de4f5d627..6d18340c2 100644 --- a/redhat/applications/dolphin/dolphin.spec +++ b/redhat/applications/dolphin/dolphin.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg dolphin %define tde_prefix /opt/trinity diff --git a/redhat/applications/filelight-l10n/filelight-l10n.spec b/redhat/applications/filelight-l10n/filelight-l10n.spec index 5feb96b8f..1525e5eb3 100644 --- a/redhat/applications/filelight-l10n/filelight-l10n.spec +++ b/redhat/applications/filelight-l10n/filelight-l10n.spec @@ -5,6 +5,7 @@ # TDE 3.5.13 specific building variables +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -40,7 +41,6 @@ BuildArch: noarch Source0: %{kdecomp}-3.5.13.tar.gz -BuildRequires: tqtinterface-devel BuildRequires: trinity-tdelibs-devel BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils diff --git a/redhat/applications/filelight/filelight-3.5.13.2.spec b/redhat/applications/filelight/filelight-3.5.13.2.spec deleted file mode 100644 index f1b71ae47..000000000 --- a/redhat/applications/filelight/filelight-3.5.13.2.spec +++ /dev/null @@ -1,134 +0,0 @@ -# Default version for this component -%define tde_pkg filelight -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Graphical disk usage display -Version: 1.0 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -Obsoletes: filelight-l10n < %{version}-%{release} -Provides: filelight-l10n = %{version}-%{release} - -%description -Filelight creates a complex, but data-rich graphical representation of the files and -directories on your computer. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/filelight -%{tde_tdeappdir}/filelight.desktop -%{tde_datadir}/apps/filelight/ -%{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png -%{tde_datadir}/icons/hicolor/*/apps/filelight.png -%{tde_datadir}/config/filelightrc -%{tde_datadir}/services/*.desktop -%{tde_tdelibdir}/libfilelight.so -%{tde_tdelibdir}/libfilelight.la -%lang(da) %{tde_tdedocdir}/HTML/da/filelight/ -%lang(en) %{tde_tdedocdir}/HTML/en/filelight/ -%lang(es) %{tde_tdedocdir}/HTML/es/filelight/ -%lang(et) %{tde_tdedocdir}/HTML/et/filelight/ -%lang(it) %{tde_tdedocdir}/HTML/it/filelight/ -%lang(pt) %{tde_tdedocdir}/HTML/pt/filelight/ -%lang(ru) %{tde_tdedocdir}/HTML/ru/filelight/ -%lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/ - -%changelog diff --git a/redhat/applications/filelight/filelight-14.0.0.spec b/redhat/applications/filelight/filelight.spec index 674b56560..312b507fc 100644 --- a/redhat/applications/filelight/filelight-14.0.0.spec +++ b/redhat/applications/filelight/filelight.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg filelight %define tde_prefix /opt/trinity @@ -155,7 +155,7 @@ export PATH="%{tde_bindir}:${PATH}" # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file filelight FileManager +%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/filelight.desktop FileManager %endif @@ -171,7 +171,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/filelight/ %{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png %{tde_datadir}/icons/hicolor/*/apps/filelight.png -%{tde_confdir}/filelightrc +%config(noreplace) %{tde_confdir}/filelightrc %{tde_datadir}/services/*.desktop %{tde_tdelibdir}/libfilelight.so %{tde_tdelibdir}/libfilelight.la @@ -183,6 +183,7 @@ export PATH="%{tde_bindir}:${PATH}" %lang(pt) %{tde_tdedocdir}/HTML/pt/filelight/ %lang(ru) %{tde_tdedocdir}/HTML/ru/filelight/ %lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/ +%{tde_mandir}/man1/filelight.1* %changelog diff --git a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec deleted file mode 100644 index 8f2e0cd6d..000000000 --- a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec +++ /dev/null @@ -1,92 +0,0 @@ -# Default version for this component -%define tde_pkg fusion-icon -%if "%{?tde_version}" == "" -%define tde_version 14.0.0 -%endif - -%if "%{?python2_sitelib}" == "" -%define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") -%endif - - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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 _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: tray icon to launch and manage Compiz Fusion [Trinity] -Version: 0.0.0+git20071028 -Release: 2%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: python -Requires: python -Requires: trinity-compizconfig-backend-kconfig - -%description -The OpenCompositing Project brings 3D desktop visual effects that -improve the usability and eye candy of the X Window System and provide -increased productivity. - -This package contains a tray icon that can launch Compiz and its -decorators. - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" - -%__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install \ - DESTDIR=%{buildroot} \ - PREFIX=%{tde_prefix} - -# Removes 'egg-info' -find "%{?buildroot}%{python2_sitelib}" -name "*.egg-info" -delete - - -%clean -%__rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/fusion-icon -%{python2_sitelib}/FusionIcon/ -%{tde_datadir}/applications/fusion-icon.desktop -%{tde_datadir}/icons/hicolor/*/apps/fusion-icon.png -%{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg - - -%changelog diff --git a/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch b/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch deleted file mode 100644 index 6ad5c045c..000000000 --- a/redhat/applications/fusion-icon/fusion-icon-3.5.13-fix_python_sitelib.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- fusion-icon/Makefile.ori 2012-08-04 11:13:26.208733002 +0200 -+++ fusion-icon/Makefile 2012-08-04 11:16:13.354858961 +0200 -@@ -1,12 +1,13 @@ - PREFIX = '/usr' - DESTDIR = '/' -+PYTHON_SITELIB = '/usr/lib/python2.7/site-packages' - #interfaces = 'gtk qt4' - - all: - @python setup.py build - - install: -- @python setup.py install --prefix=${PREFIX} --root=${DESTDIR} -+ @python setup.py install --prefix=${PREFIX} --root=${DESTDIR} --install-lib=${PYTHON_SITELIB} - - uninstall: - @python setup.py uninstall diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec index 99f8992ff..e3f8bf5cb 100644 --- a/redhat/applications/fusion-icon/fusion-icon.spec +++ b/redhat/applications/fusion-icon/fusion-icon.spec @@ -1,6 +1,6 @@ # Default version for this component %define tde_pkg fusion-icon -%define tde_version 14.0.0 +%define tde_version 14.1.0 %if "%{?python2_sitelib}" == "" %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") @@ -23,10 +23,10 @@ %define _docdir %{tde_docdir} -Name: trinity-%{tde_pkg} -Summary: tray icon to launch and manage Compiz Fusion [Trinity] -Version: 0.0.0+git20071028 -Release: 2%{?dist} +Name: trinity-%{tde_pkg} +Summary: tray icon to launch and manage Compiz Fusion [Trinity] +Version: 0.0.0+git20071028 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/gtk-qt-engine/1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff b/redhat/applications/gtk-qt-engine/1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff deleted file mode 100644 index 8548d545c..000000000 --- a/redhat/applications/gtk-qt-engine/1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff +++ /dev/null @@ -1,50 +0,0 @@ -commit f181fbbb337a75257089e64afabd04dac2e1d466 -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1383169502 -0500 - - Fix severe iceweasel/icedove tab bar corruption - Clean up minor build warnings - -diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp -index 067cf24..d3e13bb 100644 ---- a/src/qt_qt_wrapper.cpp -+++ b/src/qt_qt_wrapper.cpp -@@ -337,7 +337,7 @@ void createTQApp() - #endif // USE_FREEBSD - #endif // USE_SOLARIS - -- mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox") || cmdLine.contains("thunderbird")); -+ mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox") || cmdLine.contains("iceweasel") || cmdLine.contains("thunderbird") || cmdLine.contains("icedove")); - - openOfficeFix = (cmdLine.endsWith("soffice.bin")) - | (cmdLine.endsWith("swriter.bin")) -@@ -692,10 +692,9 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa - TQPushButton button(meepWidget); - button.setBackgroundOrigin(TQWidget::ParentOrigin); - button.setGeometry(x, y, w, h); -- if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0) -+ if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0) { - button.setPaletteBackgroundColor(gdkColorToTQColor(&style->rc_style->bg[GTK_STATE_NORMAL])); -- TQPoint p = button.backgroundOffset(); -- TQPoint pos = button.pos(); -+ } - - TQStyle::SFlags sflags = stateToSFlags(state); - -@@ -730,8 +729,6 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa - button.setGeometry(x, y, w, h); - if (style->rc_style->bg[GTK_STATE_NORMAL].pixel != 0) - button.setPaletteBackgroundColor(gdkColorToTQColor(&style->rc_style->bg[GTK_STATE_NORMAL])); -- TQPoint p = button.backgroundOffset(); -- TQPoint pos = button.pos(); - - TQStyle::SFlags sflags = stateToSFlags(state); - -@@ -1802,6 +1799,7 @@ void drawArrow(GdkWindow* window, GtkStyle* style, GtkStateType state, GtkArrowT - case GTK_ARROW_LEFT: element = TQStyle::PE_ArrowLeft; break; - case GTK_ARROW_RIGHT: element = TQStyle::PE_ArrowRight; break; - case GTK_ARROW_NONE: return; -+ default: return; - } - - diff --git a/redhat/applications/gtk-qt-engine/1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff b/redhat/applications/gtk-qt-engine/1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff deleted file mode 100644 index fadce37cf..000000000 --- a/redhat/applications/gtk-qt-engine/1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff +++ /dev/null @@ -1,553 +0,0 @@ -commit 6e6dbb068e03a8bb818a76ba774d6f94ade7389f -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1387752298 -0600 - - Fix numerous drawing glitches in Firefox - -diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp -index d3e13bb..928aef3 100644 ---- a/src/qt_qt_wrapper.cpp -+++ b/src/qt_qt_wrapper.cpp -@@ -640,7 +640,7 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa - } - - if (gwidget) { -- TQString gwLabel(gtk_button_get_label(gwidget)); -+ TQString gwLabel(gtk_button_get_label(gwidget)); - if (gtk_button_get_use_stock(gwidget)) { - GtkStockItem stockData; - gtk_stock_lookup(gwLabel.ascii(), &stockData); -@@ -649,8 +649,8 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa - gwLabel.replace("&", "&&"); - gwLabel.replace("_", "&"); - -- TQPixmap buttonicon; -- TQBitmap buttonicon_mask; -+ TQPixmap buttonicon; -+ TQBitmap buttonicon_mask; - - GtkWidget* giconwidget = gtk_button_get_image(gwidget); - if (giconwidget) { -@@ -735,9 +735,9 @@ void drawButton(GdkWindow* window, GtkStyle* style, GtkStateType state, int defa - if (defaultButton) - sflags |= TQStyle::Style_ButtonDefault; - button.setDefault(defaultButton); -- -+ - painter.fillRect(0, 0, w, h, tqApp->palette().active().background()); -- -+ - tqApp->style().drawControl(TQStyle::CE_PushButton, &painter, &button, - TQRect(0,0,w,h), button.palette().active(), sflags); - -diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c -index 20d8c87..e84c4f7 100644 ---- a/src/qt_theme_draw.c -+++ b/src/qt_theme_draw.c -@@ -676,8 +676,9 @@ draw_box(GtkStyle * style, - int nbpages; - sanitize_size(window, &width, &height); - -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Box (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail); -+ } - - if (GTK_IS_SCROLLBAR(widget)) - { -@@ -685,38 +686,54 @@ draw_box(GtkStyle * style, - { - GtkAdjustment* adj = (GtkAdjustment*)gtk_range_get_adjustment(GTK_RANGE(widget)); - int orientation = ((width>height) ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL); -- -+ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawScrollBar(window, style, state_type, orientation, adj, x, y, width, height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - return; - } - if (DETAIL("menuitem")) - { - /* Crude way of checking if it's a menu item, or a menubar item */ -- if (x != 0) -+ if (x != 0) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawMenuBarItem(window,style,state_type,x,y,width,height); -- else -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } -+ else { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawMenuItem(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } - return; - } - if (DETAIL("menubar")) - { -- if (openOfficeFix == 1) -+ if (openOfficeFix == 1) { - parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); -- else if (mozillaFix == 1) -+ } -+ else if (mozillaFix == 1) { - parent_class->draw_box (style, window, state_type, GTK_SHADOW_NONE, area, widget, detail, x, y, width, height); -- else -+ } -+ else { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawMenubar(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } - return; - } - if (DETAIL("menu")) - { -- if (openOfficeFix == 1) -+ if (openOfficeFix == 1) { - parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); -- else -- { -- if ((x >= 0) && (y >= 0)) /* Work around weirdness in firefox */ -+ } -+ else { -+ if ((x >= 0) && (y >= 0)) { /* Work around weirdness in firefox */ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawMenu(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } - } - return; - } -@@ -724,16 +741,15 @@ draw_box(GtkStyle * style, - { - double fraction = gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(widget)); - GtkProgressBarOrientation orientation = gtk_progress_bar_get_orientation(GTK_PROGRESS_BAR(widget)); -- -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawProgressBar(window,style,state_type,orientation,fraction,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } - if (GTK_IS_PROGRESS(widget) && DETAIL("bar")) - { - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); -- - drawProgressChunk(window,style,state_type,x,y,width,height); -- - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } -@@ -742,8 +758,7 @@ draw_box(GtkStyle * style, - GtkAdjustment* adj; - int inverted; - GValue *val = (GValue*)g_malloc( sizeof(GValue) ); -- if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) -- { -+ if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) { - GdkPixbuf *gpix; - gpix = gdk_pixbuf_get_from_drawable(NULL, gtk_widget_get_parent_window(widget),NULL, x, y, 0, 0, width, height); - setFillPixmap(gpix); -@@ -758,7 +773,9 @@ draw_box(GtkStyle * style, - g_free(val); - - adj = gtk_range_get_adjustment((GtkRange *) widget); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawSlider(window,style,state_type,adj,x,y,width,height, (GTK_RANGE(widget))->orientation, inverted); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } - if (DETAIL("button")) -@@ -767,18 +784,15 @@ draw_box(GtkStyle * style, - int toolbutton = 0; - parent = gtk_widget_get_parent(widget); - -- if (parent && (GTK_IS_CLIST(parent) || GTK_IS_LIST(parent) || GTK_IS_TREE_VIEW(parent))) -- { -+ if (parent && (GTK_IS_CLIST(parent) || GTK_IS_LIST(parent) || GTK_IS_TREE_VIEW(parent))) { - drawListHeader(window,style,state_type,x,y,width,height); - return; - } - - /* this is a very very bad hack but there seems to be no way to find if a button is on a - * toolbar in gtk */ -- while (1) -- { -- if (GTK_IS_WIDGET(parent)) -- { -+ while (1) { -+ if (GTK_IS_WIDGET(parent)) { - #ifdef HAVE_BONOBO - if (GTK_IS_TOOLBAR(parent) || BONOBO_IS_UI_TOOLBAR(parent)) - #else -@@ -789,17 +803,20 @@ draw_box(GtkStyle * style, - break; - } - } -- else -+ else { - break; -+ } - parent = gtk_widget_get_parent(parent); - } - - parent = gtk_widget_get_parent(widget); - -- if (toolbutton) -+ if (toolbutton) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawToolButton(window,style,state_type,x,y,width,height); -- else -- { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } -+ else { - /* Baghira hack -- rounded buttons really ugly when they are small like - on a dropdown entry box -- eg. search/replace in gedit */ - /* Draw square buttons only if number of children in the hbox is 2 and -@@ -807,31 +824,35 @@ draw_box(GtkStyle * style, - int defaultButton = gtk_widget_has_focus(widget); - GtkWindow* toplevel; - -- if (isBaghira && GTK_IS_BOX(parent) && (g_list_length(GTK_BOX(parent)->children) == 2)) -- { -+ if (isBaghira && GTK_IS_BOX(parent) && (g_list_length(GTK_BOX(parent)->children) == 2)) { - child_list = g_list_first((GTK_BOX(parent)->children)); - child = (GtkWidget *)child_list->data; -- if (GTK_IS_ENTRY(child)) -- { -+ if (GTK_IS_ENTRY(child)) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawSquareButton(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } - - child_list = g_list_last((GTK_BOX(parent)->children)); - child = ((GtkBoxChild *)child_list->data)->widget; -- if (GTK_IS_ENTRY(child)) -- { -+ if (GTK_IS_ENTRY(child)) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawSquareButton(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } - - } - - toplevel = GTK_WINDOW(gtk_widget_get_toplevel(widget)); -- if (toplevel && toplevel->default_widget == widget) -+ if (toplevel && toplevel->default_widget == widget) { - defaultButton = 1; -- -+ } -+ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawButton(window,style,state_type,defaultButton,x,y,width,height,GTK_BUTTON(widget)); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - return; - } -@@ -860,43 +881,55 @@ draw_box(GtkStyle * style, - - /* Now draw the tab -- tab position is also calculated in this function - checkout drawTabFrame() for drawing tabbarbase. */ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawTabNG(window,style,state_type,x, y, width/*-2*/, height, nb ); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - else { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawTab(window,style,state_type,x,y,width/*-2*/,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - return; - } -- if (DETAIL("optionmenu")) -- { -+ if (DETAIL("optionmenu")) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawComboBox(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } -- if (DETAIL("toolbar")) -- { -+ if (DETAIL("toolbar")) { - if (openOfficeFix == 1) - parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - else -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawToolbar(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } -- if (DETAIL("spinbutton_up")) -- { -+ if (DETAIL("spinbutton_up")) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawSpinButton(window, style, state_type, 0, x, y, width, height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } -- if (DETAIL("spinbutton_down")) -- { -+ if (DETAIL("spinbutton_down")) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawSpinButton(window, style, state_type, 1, x, y, width, height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } -- if (DETAIL("spinbutton")) -+ if (DETAIL("spinbutton")) { - return; -+ } - -- if (DETAIL("optionmenutab") || DETAIL("buttondefault")) -+ if (DETAIL("optionmenutab") || DETAIL("buttondefault")) { - return; -- -+ } -+ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawFrame(window,style,state_type,shadow_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - - -@@ -916,11 +949,11 @@ draw_flat_box(GtkStyle * style, - { - sanitize_size(window, &width, &height); - -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Flat Box (%d,%d,%d,%d) Widget: %s Detail: %s %d %d\n",x,y,width,height,gtk_widget_get_name(widget),detail, state_type, GTK_STATE_SELECTED); -+ } - -- if (DETAIL("tooltip")) -- { -+ if (DETAIL("tooltip")) { - GdkColor tooltipColor; - GdkGCValues gc_values; - GdkGCValuesMask gc_values_mask; -@@ -940,21 +973,25 @@ draw_flat_box(GtkStyle * style, - gtk_gc_release(tooltipGc); - } - -- if ((DETAILHAS("cell_even") || DETAILHAS("cell_odd")) && (state_type == GTK_STATE_SELECTED)) -- { -+ if ((DETAILHAS("cell_even") || DETAILHAS("cell_odd")) && (state_type == GTK_STATE_SELECTED)) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawListViewItem(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } -- else if (DETAIL("listitem")) -- { -+ else if (DETAIL("listitem")) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawListViewItem(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } -- else if (DETAILHAS("cell_even")) -- { -+ else if (DETAILHAS("cell_even")) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - gdk_draw_rectangle(window, style->base_gc[GTK_STATE_NORMAL], TRUE, x, y, width, height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } -- else if (DETAILHAS("cell_odd")) -- { -+ else if (DETAILHAS("cell_odd")) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - gdk_draw_rectangle(window, alternateBackgroundGc(style), TRUE, x, y, width, height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - } - -@@ -972,26 +1009,28 @@ draw_check(GtkStyle * style, - gint width, - gint height) - { -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Check (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -+ } - -- if (GTK_IS_MENU_ITEM(widget)) -- { -- if (shadow_type == GTK_SHADOW_IN) -- { -- if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) -- { -+ if (GTK_IS_MENU_ITEM(widget)) { -+ if (shadow_type == GTK_SHADOW_IN) { -+ if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) { - GdkPixbuf *gpix; - gpix = gdk_pixbuf_get_from_drawable(NULL, gtk_widget_get_parent_window(widget), NULL, x, y, 0, 0, width, height); - setFillPixmap(gpix); - g_object_unref(gpix); - } -- -+ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawMenuCheck(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - return; - } -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawCheckBox(window,style,state_type,(shadow_type==GTK_SHADOW_IN),x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - - -@@ -1009,11 +1048,11 @@ draw_option(GtkStyle * style, - gint width, - gint height) - { -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Option (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -+ } - -- if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) -- { -+ if (gdk_window_is_viewable(gtk_widget_get_parent_window(widget))) { - GdkPixbuf *gpix; - gpix = gdk_pixbuf_get_from_drawable(NULL, gtk_widget_get_parent_window(widget),NULL, x, y, 0, 0, width, height); - setFillPixmap(gpix); -@@ -1022,11 +1061,16 @@ draw_option(GtkStyle * style, - - if (GTK_IS_MENU_ITEM(widget)) - { -- if (shadow_type == GTK_SHADOW_IN) -+ if (shadow_type == GTK_SHADOW_IN) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawMenuCheck(window,style,state_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } - return; - } -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawRadioButton(window,style,state_type,(shadow_type==GTK_SHADOW_IN),x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - - -@@ -1043,8 +1087,9 @@ draw_tab(GtkStyle * style, - gint width, - gint height) - { -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Tab (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -+ } - - gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - } -@@ -1218,11 +1263,15 @@ draw_box_gap(GtkStyle* style, - - if (width<0 || height<0) return; /* Eclipse really can be this stupid! */ - -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Box_gap (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -+ } - -- if (DETAIL("notebook")) -+ if (DETAIL("notebook")) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawTabFrame(window,style,state_type,x,y-2,width,height+2, gtk_notebook_get_tab_pos((GtkNotebook *)widget)); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } - } - - -@@ -1245,8 +1294,9 @@ draw_extension(GtkStyle * style, - - sanitize_size (window, &width, &height); - -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Extension (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -+ } - - gtk_paint_box(style, window, state_type, shadow_type, area, widget, detail, - x, y, width, height); -@@ -1265,8 +1315,9 @@ draw_focus (GtkStyle *style, - gint width, - gint height) - { -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Focus Rect (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -+ } - - GtkWidget* parent = gtk_widget_get_parent(widget); - -@@ -1274,7 +1325,9 @@ draw_focus (GtkStyle *style, - GTK_IS_RADIO_BUTTON(widget) || - (parent && (GTK_IS_CLIST(parent) || GTK_IS_LIST(parent) || GTK_IS_TREE_VIEW(parent)))) - { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawFocusRect(window, style, x, y, width, height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - return; - } -@@ -1293,24 +1346,31 @@ draw_slider(GtkStyle * style, - gint height, - GtkOrientation orientation) - { -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Slider (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -+ } - -- if (DETAIL("slider")) -- { -+ if (DETAIL("slider")) { - GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(widget)); - int widgetX, widgetY; - - GtkWidget* parent = widget; -- while (gtk_widget_get_parent(parent) != NULL) -+ while (gtk_widget_get_parent(parent) != NULL) { - parent = gtk_widget_get_parent(parent); -+ } - - gtk_widget_translate_coordinates(widget, parent, 0, 0, &widgetX, &widgetY); - -- if (orientation == GTK_ORIENTATION_VERTICAL) -+ if (orientation == GTK_ORIENTATION_VERTICAL) { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawScrollBarSlider(window, style, state_type, orientation, adj, x-1, y, width+2, height, y-widgetY, widget->allocation.height); -- else -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } -+ else { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawScrollBarSlider(window, style, state_type, orientation, adj, x, y-1, width, height+2, x-widgetX, widget->allocation.width); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); -+ } - return; - } - } -@@ -1334,10 +1394,13 @@ draw_handle(GtkStyle * style, - - sanitize_size(window, &width, &height); - -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Handle (%d,%d,%d,%d) Widget: %s Detail: %s State Type: %d\n",x,y,width,height,gtk_widget_get_name(widget),detail, state_type); -- -+ } -+ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawSplitter(window,style,state_type,orientation,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } - diff --git a/redhat/applications/gtk-qt-engine/1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff b/redhat/applications/gtk-qt-engine/1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff deleted file mode 100644 index 2985283a6..000000000 --- a/redhat/applications/gtk-qt-engine/1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff +++ /dev/null @@ -1,435 +0,0 @@ -commit a90aa09722d47f5f4009b089d8d874354899bdb8 -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1387757695 -0600 - - Fix Firefox scrollbars - -diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp -index 28faded..ccd18c1 100644 ---- a/kcm_gtk/kcmgtk.cpp -+++ b/kcm_gtk/kcmgtk.cpp -@@ -185,6 +185,5 @@ KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&) - widget->styleIcon->setPixmap(iconLoader.loadIcon("style", KIcon::Desktop)); - widget->fontIcon->setPixmap(iconLoader.loadIcon("fonts", KIcon::Desktop)); -- widget->firefoxIcon->setPixmap(iconLoader.loadIcon("firefox", KIcon::Desktop)); - widget->keyboardIcon->setPixmap(iconLoader.loadIcon("keyboard", KIcon::Desktop)); - - getInstalledThemes(); -@@ -199,5 +198,4 @@ KcmGtk::KcmGtk(TQWidget *parent, const char *name, const TQStringList&) - connect(widget->emacsBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(itemChanged())); - connect(widget->fontChange, TQT_SIGNAL(clicked()), TQT_SLOT(fontChangeClicked())); -- connect(widget->firefoxFix, TQT_SIGNAL(clicked()), TQT_SLOT(firefoxFixClicked())); - connect(widget->emacsDetails, TQT_SIGNAL(clicked()), TQT_SLOT(emacsDetailsClicked())); - connect(widget->warning3, TQT_SIGNAL(clicked()), TQT_SLOT(searchPathsClicked())); -@@ -453,190 +451,6 @@ TQString KcmGtk::quickHelp() const - return i18n(""); - } - -- --void KcmGtk::firefoxFixClicked() --{ -- profiles.clear(); -- getProfiles(TQDir::homeDirPath() + "/.mozilla/firefox/", 0); -- getProfiles(TQDir::homeDirPath() + "/.thunderbird/", 1); -- -- TQString profilePath; -- if (profiles.count() == 0) -- { -- KMessageBox::error(this, i18n("No Mozilla profiles found"), i18n("Could not load Mozilla profiles")); -- return; -- } -- else if (profiles.count() == 1) -- { -- fixProfile(profiles.begin().data()); -- } -- else -- { -- KDialogBase* dialog = new KDialogBase(this, "", true, i18n("Mozilla profile"), KDialogBase::Ok | KDialogBase::Cancel); -- MozillaProfileWidget* w = new MozillaProfileWidget(dialog); -- w->profilesList->header()->hide(); -- w->profilesList->hideColumn(1); -- -- TQPixmap icon = KGlobal::iconLoader()->loadIcon("kuser", KIcon::Small); -- -- for ( TQMapIterator<TQString,TQString> it = profiles.begin(); it != profiles.end(); ++it ) -- { -- KListViewItem* i = new KListViewItem(w->profilesList); -- i->setPixmap(0, icon); -- i->setText(0, it.key()); -- i->setText(1, it.data()); -- } -- -- dialog->setMainWidget(w); -- if (dialog->exec() == TQDialog::Rejected) -- { -- delete dialog; -- return; -- } -- -- TQListViewItemIterator it2(w->profilesList, TQListViewItemIterator::Selected); -- while (it2.current()) -- { -- KListViewItem* i = (KListViewItem*) it2.current(); -- ++it2; -- -- fixProfile(i->text(1)); -- } -- delete dialog; -- } -- -- KMessageBox::information(this, i18n("Your Mozilla profile was updated sucessfully. You must close and restart all Firefox and Thunderbird windows for the changes to take effect"), i18n("Mozilla profile")); --} -- --void KcmGtk::getProfiles(const TQString& basePath, int type) --{ -- TQString fileName = basePath + "/profiles.ini"; -- if (TQFile::exists(fileName)) -- { -- KConfig config(fileName, true, false); -- TQStringList groups = config.groupList(); -- -- for ( TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it ) -- { -- if (!(*it).lower().startsWith("profile")) -- continue; -- -- config.setGroup(*it); -- TQString name = (type ? i18n("Thunderbird") : i18n("Firefox")) + " - " + config.readEntry("Name"); -- TQString path = config.readEntry("Path"); -- if (!path.startsWith("/")) -- path = basePath + path; -- profiles.insert(name, path); -- } -- } --} -- --void KcmGtk::fixProfile(const TQString& path) --{ -- if (!TQFile::exists(path + "/chrome")) -- { -- TQDir dir(path); -- dir.mkdir("chrome"); -- } -- -- TQString data = scrollBarCSS(); -- writeFirefoxCSS(path + "/chrome/userChrome.css", data); -- writeFirefoxCSS(path + "/chrome/userContent.css", data); --} -- --TQString KcmGtk::scrollBarCSS() --{ -- // The following code determines how many buttons are on a scrollbar -- // It works by looking at each pixel of the scrollbar's area not taken up by the groove, -- // and asking the style which subcontrol is at that location. -- TQScrollBar sbar(NULL); -- sbar.setOrientation(Qt::Horizontal); -- sbar.setValue(1); -- sbar.resize(200,25); -- -- TQRect rect = tqApp->style().querySubControlMetrics(TQStyle::CC_ScrollBar, &sbar, TQStyle::SC_ScrollBarGroove); -- -- bool back1 = false; -- bool forward1 = false; -- bool back2 = false; -- bool forward2 = false; -- -- TQStyle::SubControl sc = TQStyle::SC_None; -- for (TQPoint pos(0,7) ; pos.x()<rect.x() ; pos.setX(pos.x()+1)) -- { -- TQStyle::SubControl sc2 = tqApp->style().querySubControl(TQStyle::CC_ScrollBar, &sbar, pos); -- if (sc != sc2) -- { -- if (sc2 == TQStyle::SC_ScrollBarAddLine) forward1 = true; -- if (sc2 == TQStyle::SC_ScrollBarSubLine) back1 = true; -- sc = sc2; -- } -- } -- sc = TQStyle::SC_None; -- for (TQPoint pos(rect.x()+rect.width(),7) ; pos.x()<200 ; pos.setX(pos.x()+1)) -- { -- TQStyle::SubControl sc2 = tqApp->style().querySubControl(TQStyle::CC_ScrollBar, &sbar, pos); -- if (sc != sc2) -- { -- if (sc2 == TQStyle::SC_ScrollBarAddLine) forward2 = true; -- if (sc2 == TQStyle::SC_ScrollBarSubLine) back2 = true; -- sc = sc2; -- } -- } -- -- TQString upTop = (back1 ? "-moz-box" : "none"); -- TQString downTop = (forward1 ? "-moz-box" : "none"); -- TQString upBottom = (back2 ? "-moz-box" : "none"); -- TQString downBottom = (forward2 ? "-moz-box" : "none"); -- -- TQString data; -- data += "/* The following four lines were added by KDE */\n"; -- data += "scrollbarbutton[sbattr=\"scrollbar-up-top\"] { display: " + upTop + " !important; }\n"; -- data += "scrollbarbutton[sbattr=\"scrollbar-down-top\"] { display: " + downTop + " !important; }\n"; -- data += "scrollbarbutton[sbattr=\"scrollbar-up-bottom\"] { display: " + upBottom + " !important; }\n"; -- data += "scrollbarbutton[sbattr=\"scrollbar-down-bottom\"] { display: " + downBottom + " !important; }\n"; -- -- return data; --} -- --void KcmGtk::writeFirefoxCSS(const TQString& path, const TQString& data) --{ -- TQString fileData; -- TQFile file(path); -- if (file.open(IO_ReadOnly)) -- { -- TQTextStream stream(&file); -- for (;;) -- { -- TQString line = stream.readLine(); -- if (line.isNull()) -- break; -- -- if ((line == "# The following four lines were added by KDE") || -- (line == "/* The following four lines were added by KDE */")) -- { -- for (int i=0 ; i<4 ; i++) -- stream.readLine(); -- continue; -- } -- -- fileData += line + "\n"; -- } -- file.close(); -- } -- -- if (!file.open(IO_WriteOnly | IO_Truncate)) -- { -- KMessageBox::error(this, i18n("Could not write to %1").arg(path), i18n("Mozilla profile")); -- return; -- } -- TQTextStream stream(&file); -- stream << fileData << data; -- file.close(); -- -- return; --} -- - void KcmGtk::emacsDetailsClicked() - { - if (emacsDetailsDialog == NULL) -diff --git a/kcm_gtk/kcmgtk.h b/kcm_gtk/kcmgtk.h -index 542a043..2c04919 100644 ---- a/kcm_gtk/kcmgtk.h -+++ b/kcm_gtk/kcmgtk.h -@@ -71,7 +71,6 @@ public slots: - void styleChanged(); - void fontChangeClicked(); - void itemChanged(); -- void firefoxFixClicked(); - void emacsDetailsClicked(); - void searchPathsClicked(); - void searchPathsOk(); -@@ -82,10 +81,6 @@ public slots: - - private: - void updateFontPreview(); -- void getProfiles(const TQString& basePath, int type); -- void fixProfile(const TQString& path); -- TQString scrollBarCSS(); -- void writeFirefoxCSS(const TQString& path, const TQString& data); - void getInstalledThemes(); - - TQString env(TQString key); -diff --git a/kcm_gtk/kcmgtkwidget.ui b/kcm_gtk/kcmgtkwidget.ui -index 512a610..705655b 100644 ---- a/kcm_gtk/kcmgtkwidget.ui -+++ b/kcm_gtk/kcmgtkwidget.ui -@@ -481,118 +481,6 @@ - </widget> - </hbox> - </widget> -- <widget class="TQGroupBox"> -- <property name="name"> -- <cstring>groupBox1</cstring> -- </property> -- <property name="sizePolicy"> -- <sizepolicy> -- <hsizetype>5</hsizetype> -- <vsizetype>4</vsizetype> -- <horstretch>0</horstretch> -- <verstretch>0</verstretch> -- </sizepolicy> -- </property> -- <property name="title"> -- <string>Firefox and Thunderbird</string> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="TQLayoutWidget"> -- <property name="name"> -- <cstring>layout7_2_2</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="TQLabel"> -- <property name="name"> -- <cstring>firefoxIcon</cstring> -- </property> -- <property name="scaledContents"> -- <bool>true</bool> -- </property> -- </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer3_2_2</cstring> -- </property> -- <property name="orientation"> -- <enum>Vertical</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>20</width> -- <height>31</height> -- </size> -- </property> -- </spacer> -- </vbox> -- </widget> -- <widget class="TQLayoutWidget"> -- <property name="name"> -- <cstring>layout12</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="TQLabel"> -- <property name="name"> -- <cstring>textLabel1</cstring> -- </property> -- <property name="text"> -- <string>Scrollbar buttons may sometimes be displayed incorrectly in Firefox and Thunderbird. This can be fixed by installing some files into your Mozilla profile.</string> -- </property> -- <property name="alignment"> -- <set>WordBreak|AlignVCenter</set> -- </property> -- </widget> -- <widget class="TQLayoutWidget"> -- <property name="name"> -- <cstring>layout11</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="TQPushButton"> -- <property name="name"> -- <cstring>firefoxFix</cstring> -- </property> -- <property name="text"> -- <string>I&nstall scrollbar fix...</string> -- </property> -- </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer11</cstring> -- </property> -- <property name="orientation"> -- <enum>Horizontal</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>101</width> -- <height>21</height> -- </size> -- </property> -- </spacer> -- </hbox> -- </widget> -- </vbox> -- </widget> -- </hbox> -- </widget> - <widget class="TQLabel"> - <property name="name"> - <cstring>textLabel1_2</cstring> -@@ -634,7 +522,6 @@ - <tabstop>fontChange</tabstop> - <tabstop>emacsBox</tabstop> - <tabstop>emacsDetails</tabstop> -- <tabstop>firefoxFix</tabstop> - </tabstops> - <layoutdefaults spacing="6" margin="11"/> - <includehints> -diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp -index 928aef3..eebcc93 100644 ---- a/src/qt_qt_wrapper.cpp -+++ b/src/qt_qt_wrapper.cpp -@@ -2085,7 +2085,7 @@ void setRcProperties(GtkRcStyle* rc_style, int forceRecreate) - stream << parse_rc_string("GtkScrollbar::stepper-size = " + TQString::number(tqApp->style().querySubControlMetrics(TQStyle::CC_ScrollBar, &sbar, TQStyle::SC_ScrollBarSubLine).width() - 1), "*"); - - stream << parse_rc_string("GtkScrollbar::min-slider-length = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ScrollBarSliderMin)), "*"); -- stream << parse_rc_string("GtkScrollbar::slider-width = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ScrollBarExtent)-2), "*"); -+ stream << parse_rc_string("GtkScrollbar::slider-width = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ScrollBarExtent)), "*"); - - stream << parse_rc_string("GtkButton::child-displacement-x = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ButtonShiftHorizontal)), "*"); - stream << parse_rc_string("GtkButton::child-displacement-y = " + TQString::number(tqApp->style().pixelMetric(TQStyle::PM_ButtonShiftVertical)), "*"); -diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c -index e84c4f7..4a2ee12 100644 ---- a/src/qt_theme_draw.c -+++ b/src/qt_theme_draw.c -@@ -506,13 +506,16 @@ draw_arrow(GtkStyle* style, - { - sanitize_size(window, &width, &height); - -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("Arrow (%d,%d,%d,%d) Widget: %s Detail: %s\n", x, y, width, height,gtk_widget_get_name(widget),detail); -- -- if (DETAIL("hscrollbar") || DETAIL("vscrollbar")) -+ } -+ -+ if (DETAIL("hscrollbar") || DETAIL("vscrollbar")) { - return; -- if (DETAIL("spinbutton")) -+ } -+ if (DETAIL("spinbutton")) { - return; -+ } - if (DETAIL("notebook")) - { - drawArrow(window, style, state_type, arrow_type, x, y, width, height); -@@ -688,7 +691,12 @@ draw_box(GtkStyle * style, - int orientation = ((width>height) ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL); - - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); -- drawScrollBar(window, style, state_type, orientation, adj, x, y, width, height); -+ if (orientation == GTK_ORIENTATION_VERTICAL) { -+ drawScrollBar(window, style, state_type, orientation, adj, x+1, y, width, height); -+ } -+ else { -+ drawScrollBar(window, style, state_type, orientation, adj, x, y+1, width, height); -+ } - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - return; -@@ -1363,12 +1371,12 @@ draw_slider(GtkStyle * style, - - if (orientation == GTK_ORIENTATION_VERTICAL) { - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); -- drawScrollBarSlider(window, style, state_type, orientation, adj, x-1, y, width+2, height, y-widgetY, widget->allocation.height); -+ drawScrollBarSlider(window, style, state_type, orientation, adj, x, y, width, height, y-widgetY, widget->allocation.height); - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - else { - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); -- drawScrollBarSlider(window, style, state_type, orientation, adj, x, y-1, width, height+2, x-widgetX, widget->allocation.width); -+ drawScrollBarSlider(window, style, state_type, orientation, adj, x, y, width, height, x-widgetX, widget->allocation.width); - if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - return; diff --git a/redhat/applications/gtk-qt-engine/1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff b/redhat/applications/gtk-qt-engine/1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff deleted file mode 100644 index 66b206591..000000000 --- a/redhat/applications/gtk-qt-engine/1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff +++ /dev/null @@ -1,138 +0,0 @@ -commit 0330b848db129b3dc4daa2a57272ec3b2fb7984c -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1387965535 -0600 - - Fix Firefox text edit widget glitches - Clean up minor build warnings - -diff --git a/src/qt_theme_draw.c b/src/qt_theme_draw.c -index 4a2ee12..c7992d5 100644 ---- a/src/qt_theme_draw.c -+++ b/src/qt_theme_draw.c -@@ -29,7 +29,7 @@ - extern gboolean tde_showIconsOnPushButtons; - - static GdkPixbuf * (*stockRenderIcon)() = NULL; --static void * (*stockDrawString)() = NULL; -+// static void * (*stockDrawString)() = NULL; - - static void qtengine_style_init (QtEngineStyle *style); - static void qtengine_style_class_init (QtEngineStyleClass *klass); -@@ -128,13 +128,17 @@ draw_hline(GtkStyle* style, - gint x2, - gint y) - { -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("HLINE (%d,%p,%d) Widget: %s Detail: %s\n",x1,y1,y,gtk_widget_get_name(widget),detail); -+ } - -- if (DETAIL("vscale")) -+ if (DETAIL("vscale")) { - return; -+ } - -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawHLine(window,style,state_type,y,x1,x2); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - - -@@ -149,13 +153,17 @@ draw_vline(GtkStyle* style, - gint yDest, - gint x) - { -- if (gtkQtDebug) -+ if (gtkQtDebug) { - printf("VLINE (%d,%d,%d) Widget: %s Detail: %s\n",ySource ,yDest ,x,gtk_widget_get_name(widget),detail); -+ } - - -- if (DETAIL("hscale")) -+ if (DETAIL("hscale")) { - return; -+ } -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawVLine(window,style,state_type,x,ySource,yDest); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - } - - static void -@@ -192,7 +200,9 @@ draw_shadow(GtkStyle *style, - return; - if (DETAIL("entry")) - { -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawLineEdit(window,style,state_type,gtk_widget_is_focus(widget),x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } - if (DETAIL("frame") || DETAIL("trough") || DETAIL("viewport")) -@@ -200,7 +210,9 @@ draw_shadow(GtkStyle *style, - if (!GTK_IS_SCALE(widget)) - { - /*printf("Frame (%d,%d) %dx%d %d %d\n", x,y,width,height,state_type, shadow_type);*/ -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], area); - drawFrame(window,style,state_type,shadow_type,x,y,width,height); -+ if (area) gdk_gc_set_clip_rectangle(style->bg_gc[state_type], NULL); - return; - } - } -@@ -644,20 +656,20 @@ draw_diamond(GtkStyle * style, - { - } - --static void --draw_string(GtkStyle *style, -- GdkWindow *window, -- GtkStateType state_type, -- GdkRectangle *area, -- GtkWidget *widget, -- const gchar *detail, -- gint x, -- gint y, -- const gchar *string) --{ -- if (gtkQtDebug) -- printf("STRING Widget: %s Detail: %s\n",gtk_widget_get_name(widget),detail); --} -+// static void -+// draw_string(GtkStyle *style, -+// GdkWindow *window, -+// GtkStateType state_type, -+// GdkRectangle *area, -+// GtkWidget *widget, -+// const gchar *detail, -+// gint x, -+// gint y, -+// const gchar *string) -+// { -+// if (gtkQtDebug) -+// printf("STRING Widget: %s Detail: %s\n",gtk_widget_get_name(widget),detail); -+// } - - static void - draw_box(GtkStyle * style, -@@ -1464,13 +1476,11 @@ void draw_layout (GtkStyle *style, - PangoAttrList *layoutattr; - - const gchar *text; -- gint text_length = 0; - gint text_bytelen = 0; - text = pango_layout_get_text (layout); - if (text != 0) - { - PangoAttribute *textcolorattr; -- text_length = g_utf8_strlen (text, -1); - text_bytelen = strlen (text); - - textcolorattr = pango_attr_foreground_new(color.red, color.green, color.blue); -@@ -2040,7 +2050,7 @@ qtengine_style_class_init (QtEngineStyleClass *klass) - parent_class = g_type_class_peek_parent (klass); - - stockRenderIcon = style_class->render_icon; -- stockDrawString = style_class->draw_string; -+// stockDrawString = style_class->draw_string; - - style_class->render_icon = draw_icon; - diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec deleted file mode 100644 index d6c1a5311..000000000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-3.5.13.2.spec +++ /dev/null @@ -1,146 +0,0 @@ -# Default version for this component -%define tde_pkg gtk-qt-engine -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: theme engine using Qt for GTK+ 2.x and Trinity -Version: 0.8 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: gtk-qt-engine.rc.sh -Source2: gtkrc-2.0-kde4 -Source3: gtkrc-2.0-kde-kde4 - -# Fix severe iceweasel/icedove tab bar corruption -# Clean up minor build warnings -Patch1: 1383169502:f181fbbb337a75257089e64afabd04dac2e1d466.diff -# Fix numerous drawing glitches in Firefox -Patch2: 1387752298:6e6dbb068e03a8bb818a76ba774d6f94ade7389f.diff -# Fix Firefox scrollbars -Patch3: 1387757695:a90aa09722d47f5f4009b089d8d874354899bdb8.diff -# Fix Firefox text edit widget glitches -# Clean up minor build warnings -Patch4: 1387965535:0330b848db129b3dc4daa2a57272ec3b2fb7984c.diff - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -The GTK-Qt Theme Engine (also known as gtk-qt-engine) is a GTK 2 theme engine -that calls Qt to do the actual drawing. This makes your GTK 2 applications -look almost like real Qt applications and gives you a more unified desktop -experience. - -Please note that this package is targeted at Trinity users and therefore provides -a way to configure it from within KControl. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-3.5.13.2%{?preversion:~%{preversion}} - -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DDATA_INSTALL_DIR=%{tde_datadir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -%find_lang gtkqtengine - -# Adds TDE's specific GTKRC -%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh -%__install -D -m 644 %{SOURCE2} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4 -%__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 - - -%clean -%__rm -rf %{buildroot} - - -%files -f gtkqtengine.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_tdelibdir}/kcm_kcmgtk.la -%{tde_tdelibdir}/kcm_kcmgtk.so -%{tde_appdir}/kcmgtk.desktop -%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh -%{tde_datadir}/kgtk/.gtkrc-2.0-kde4 -%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 - -# The following files are outside TDE's directory -%{_libdir}/gtk-2.0/2.10.0/engines/libqtengine.so -%{_datadir}/themes/Qt/gtk-2.0/gtkrc - - -%changelog diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh index d22c56f35..0c82b8b5f 120000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.rc.sh @@ -1 +1 @@ -../../../ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file +../../../ubuntu/xenial/applications/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
\ No newline at end of file diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec index ef32736f0..6f5f6b3b7 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg gtk-qt-engine %define tde_prefix /opt/trinity @@ -141,7 +141,7 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DDATA_INSTALL_DIR=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ .. @@ -157,9 +157,9 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang gtkqtengine # Adds TDE's specific GTKRC -%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh" -%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde4" -%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4" +%__install -D -m 644 "%{SOURCE1}" "%{buildroot}%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh" +%__install -D -m 644 "%{SOURCE2}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4" +%__install -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4" %clean @@ -172,10 +172,10 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_tdelibdir}/kcm_kcmgtk.la %{tde_tdelibdir}/kcm_kcmgtk.so %{tde_appdir}/kcmgtk.desktop -%dir %{tde_datadir}/kgtk -%{tde_datadir}/kgtk/gtk-qt-engine.rc.sh -%{tde_datadir}/kgtk/.gtkrc-2.0-kde4 -%{tde_datadir}/kgtk/.gtkrc-2.0-kde-kde4 +%dir %{tde_datadir}/apps/kgtk +%{tde_datadir}/apps/kgtk/gtk-qt-engine.rc.sh +%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde4 +%{tde_datadir}/apps/kgtk/.gtkrc-2.0-kde-kde4 %{tde_tdedocdir}/HTML/en/kcmgtk/ # The following files are outside TDE's directory diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 index fbb967811..f71a6795b 120000 --- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 +++ b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde-kde4 @@ -1 +1 @@ -../../../ubuntu/maverick/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file +../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
\ No newline at end of file diff --git a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 index 122ae8e16..8e006a46b 120000 --- a/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 +++ b/redhat/applications/gtk-qt-engine/gtkrc-2.0-kde4 @@ -1 +1 @@ -../../../ubuntu/maverick/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file +../../../ubuntu/xenial/applications/gtk-qt-engine/debian/.gtkrc-2.0-kde4
\ No newline at end of file diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec index be57d2f0e..e4100aaca 100644 --- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec +++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg gtk3-tqt-engine %define tde_prefix /opt/trinity diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec b/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec deleted file mode 100644 index f04999d0e..000000000 --- a/redhat/applications/gwenview-i18n/gwenview-i18n-3.5.13.2.spec +++ /dev/null @@ -1,167 +0,0 @@ -# Default version for this component -%define tde_pkg gwenview-i18n -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Internationalization support for Gwenview [Trinity] -Version: 1.4.2 -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -# EXIV2 support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}exiv2-devel -%endif -%if 0%{?suse_version} -BuildRequires: libexiv2-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: exiv2-devel -%endif - -%if "%{?tde_prefix}" == "/usr" -Conflicts: kdegraphics -%endif - - -%description -Gwenview is a fast and easy to use image viewer/browser for TDE. -All common image formats are supported, such as PNG(including transparency), -JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp -image format), BMP, XPM and others. Standard features include slideshow, -fullscreen view, image thumbnails, drag'n'drop, image zoom, full network -transparency using the KIO framework, including basic file operations and -browsing in compressed archives, non-blocking GUI with adjustable views. -Gwenview also provides image and directory KParts components for use e.g. in -Konqueror. Additional features, such as image renaming, comparing, -converting, and batch processing, HTML gallery and others are provided by the -KIPI image framework. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export KDEDIR="%{tde_prefix}" - -./configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -## File lists -%find_lang gwenview - -# Removes useless files (-devel ?) -%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig - - -%postun -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig - - -%files -f gwenview.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING TODO -%lang(da) %{tde_tdedocdir}/HTML/da/gwenview/ -%lang(de) %{tde_tdedocdir}/HTML/de/gwenview/ -%lang(et) %{tde_tdedocdir}/HTML/et/gwenview/ -%lang(fr) %{tde_tdedocdir}/HTML/fr/gwenview/ -%lang(it) %{tde_tdedocdir}/HTML/it/gwenview/ -%lang(nl) %{tde_tdedocdir}/HTML/nl/gwenview/ -%lang(pl) %{tde_tdedocdir}/HTML/pl/gwenview/ -%lang(pt) %{tde_tdedocdir}/HTML/pt/gwenview/ -%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/gwenview/ -%lang(ru) %{tde_tdedocdir}/HTML/ru/gwenview/ -%lang(sv) %{tde_tdedocdir}/HTML/sv/gwenview/ - - -%changelog diff --git a/redhat/applications/gwenview-i18n/gwenview-i18n.spec b/redhat/applications/gwenview-i18n/gwenview-i18n.spec index 59bbfaa5b..ab08edf97 100644 --- a/redhat/applications/gwenview-i18n/gwenview-i18n.spec +++ b/redhat/applications/gwenview-i18n/gwenview-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg gwenview-i18n %define tde_prefix /opt/trinity diff --git a/redhat/applications/gwenview/gwenview-3.5.13.2.spec b/redhat/applications/gwenview/gwenview-3.5.13.2.spec deleted file mode 100644 index 55105a6c9..000000000 --- a/redhat/applications/gwenview/gwenview-3.5.13.2.spec +++ /dev/null @@ -1,187 +0,0 @@ -# Default version for this component -%define tde_pkg gwenview -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Gwenview is an image viewer for TDE. -Version: 1.4.2 -Release: %{?!preversion:11}%{?preversion:10_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -# EXIV2 support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}exiv2-devel -%endif -%if 0%{?suse_version} -BuildRequires: libexiv2-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: exiv2-devel -%endif - -%if "%{?tde_prefix}" == "/usr" -Conflicts: kdegraphics -%endif - - -%description -Gwenview is a fast and easy to use image viewer/browser for TDE. -All common image formats are supported, such as PNG(including transparency), -JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp -image format), BMP, XPM and others. Standard features include slideshow, -fullscreen view, image thumbnails, drag'n'drop, image zoom, full network -transparency using the KIO framework, including basic file operations and -browsing in compressed archives, non-blocking GUI with adjustable views. -Gwenview also provides image and directory KParts components for use e.g. in -Konqueror. Additional features, such as image renaming, comparing, -converting, and batch processing, HTML gallery and others are provided by the -KIPI image framework. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Removes useless files (-devel ?) -%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig - - -%postun -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/gwenview -%{tde_libdir}/libgwenviewcore.la -%{tde_libdir}/libgwenviewcore.so.1 -%{tde_libdir}/libgwenviewcore.so.1.0.0 -%{tde_libdir}/libkdeinit_gwenview.la -%{tde_libdir}/libkdeinit_gwenview.so -%{tde_tdelibdir}/gwenview.la -%{tde_tdelibdir}/gwenview.so -%{tde_tdelibdir}/libgvdirpart.la -%{tde_tdelibdir}/libgvdirpart.so -%{tde_tdelibdir}/libgvimagepart.la -%{tde_tdelibdir}/libgvimagepart.so -%{tde_tdeappdir}/gwenview.desktop -%{tde_datadir}/apps/gwenview/ -%{tde_datadir}/apps/gvdirpart/gvdirpart.rc -%{tde_datadir}/apps/gvimagepart/gvimagepart.rc -%{tde_datadir}/apps/gvimagepart/gvimagepartpopup.rc -%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.sh -%{tde_datadir}/apps/kconf_update/gwenview_1.4_osdformat.upd -%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.sh -%{tde_datadir}/apps/kconf_update/gwenview_thumbnail_size.upd -%{tde_datadir}/apps/konqueror/servicemenus/konqgwenview.desktop -%{tde_datadir}/config.kcfg/fileoperationconfig.kcfg -%{tde_datadir}/config.kcfg/fileviewconfig.kcfg -%{tde_datadir}/config.kcfg/fullscreenconfig.kcfg -%{tde_datadir}/config.kcfg/gvdirpartconfig.kcfg -%{tde_datadir}/config.kcfg/imageviewconfig.kcfg -%{tde_datadir}/config.kcfg/miscconfig.kcfg -%{tde_datadir}/config.kcfg/slideshowconfig.kcfg -%{tde_datadir}/icons/crystalsvg/*/apps/gvdirpart.png -%{tde_datadir}/icons/crystalsvg/scalable/apps/gvdirpart.svg -%{tde_datadir}/icons/hicolor/*/apps/gwenview.png -%{tde_datadir}/icons/hicolor/*/apps/gvdirpart.png -%{tde_datadir}/icons/hicolor/scalable/apps/gvdirpart.svg -%{tde_datadir}/icons/hicolor/scalable/apps/gwenview.svgz -%{tde_datadir}/man/man1/gwenview.1* -%{tde_datadir}/services/gvdirpart.desktop -%{tde_datadir}/services/gvimagepart.desktop -%lang(en) %{tde_tdedocdir}/HTML/en/gwenview/ - -%changelog diff --git a/redhat/applications/gwenview/gwenview-14.0.0.spec b/redhat/applications/gwenview/gwenview.spec index 8f635bf08..723996a29 100644 --- a/redhat/applications/gwenview/gwenview-14.0.0.spec +++ b/redhat/applications/gwenview/gwenview.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg gwenview %define tde_prefix /opt/trinity diff --git a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec b/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec deleted file mode 100644 index 13ce2e60f..000000000 --- a/redhat/applications/k3b-i18n/k3b-i18n-3.5.13.2.spec +++ /dev/null @@ -1,405 +0,0 @@ -# Default version for this component -%define tde_pkg k3n-i18n -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-k3b-i18n -Summary: Internationalization support for TDE [Trinity] -Version: 1.0.5 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -BuildArch: noarch - -# Speed build options -%define debug_package %{nil} -%define __spec_install_post %{nil} -AutoReq: no - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Group: Applications/Archiving -License: GPLv2+ - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Requires(post): coreutils -Requires(postun): coreutils - -Requires: trinity-k3b - - -%description -K3b provides a comfortable user interface to perform most CD/DVD -burning tasks. While the experienced user can take influence in all -steps of the burning process the beginner may find comfort in the -automatic settings and the reasonable k3b defaults which allow a quick -start. - -########## - -%package Danish -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Danish (da) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-da < %{version}-%{release} -Provides: trinity-k3b-i18n-da = %{version}-%{release} - -%description Danish -This package contains the Danish translations for K3B. - -%files Danish -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/da/k3b -%{tde_datadir}/locale/da/LC_MESSAGES/*.mo - -########## - -%package German -Group: Applications/Archiving -Requires: trinity-k3b -Summary: German (de) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-de < %{version}-%{release} -Provides: trinity-k3b-i18n-de = %{version}-%{release} - -%description German -This package contains the German translations for K3B. - -%files German -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/de/k3b -%{tde_datadir}/locale/de/LC_MESSAGES/*.mo - -########## - -%package Greek -Group: Applications/Archiving -Requires: trinity-k3b >= %{version} -Summary: Greek (el) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-el < %{version}-%{release} -Provides: trinity-k3b-i18n-el = %{version}-%{release} - -%description Greek -This package contains the greek translations for K3B. - -%files Greek -%defattr(-,root,root,-) -#%{tde_tdedocdir}/HTML/el/k3b -%{tde_datadir}/locale/el/LC_MESSAGES/*.mo - -########## - -%package Spanish -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Spanish (es) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-es < %{version}-%{release} -Provides: trinity-k3b-i18n-es = %{version}-%{release} - -%description Spanish -This package contains the Spanish translations for K3B. - -%files Spanish -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/es/k3b -%{tde_datadir}/locale/es/LC_MESSAGES/*.mo - -########## - -%package Estonian -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Estonian (et) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-et < %{version}-%{release} -Provides: trinity-k3b-i18n-et = %{version}-%{release} - -%description Estonian -This package contains the Estonian translations for K3B. - -%files Estonian -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/et/k3b -%{tde_datadir}/locale/et/LC_MESSAGES/*.mo - -########## - -%package French -Group: Applications/Archiving -Requires: trinity-k3b -Summary: French (fr) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-fr < %{version}-%{release} -Provides: trinity-k3b-i18n-fr = %{version}-%{release} - -%description French -This package contains the French translations for K3B. - -%files French -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/fr/k3b -%{tde_datadir}/locale/fr/LC_MESSAGES/*.mo - -########## - -%package Italian -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Italian (it) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-it < %{version}-%{release} -Provides: trinity-k3b-i18n-it = %{version}-%{release} - -%description Italian -This package contains the Italian translations for K3B. - -%files Italian -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/it/k3b -%{tde_datadir}/locale/it/LC_MESSAGES/*.mo - -########## - -%package Dutch -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Dutch (nl) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-nl < %{version}-%{release} -Provides: trinity-k3b-i18n-nl = %{version}-%{release} - -%description Dutch -This package contains the Dutch translations for K3B. - -%files Dutch -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/nl/k3b -%{tde_datadir}/locale/nl/LC_MESSAGES/*.mo - -########## - -%package Polish -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Polish (pl) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-pl < %{version}-%{release} -Provides: trinity-k3b-i18n-pl = %{version}-%{release} - -%description Polish -This package contains the Polish translations for K3B. - -%files Polish -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/pl/k3b -%{tde_datadir}/locale/pl/LC_MESSAGES/*.mo - -########## - -%package Portuguese -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Portuguese (pt) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-pt < %{version}-%{release} -Provides: trinity-k3b-i18n-pt = %{version}-%{release} - -%description Portuguese -This package contains the Portuguese translations for K3B. - -%files Portuguese -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/pt/k3b -%{tde_datadir}/locale/pt/LC_MESSAGES/*.mo - -########## - -%package Brazil -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Brazilian Portuguese (pt_BR) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-pt_BR < %{version}-%{release} -Provides: trinity-k3b-i18n-pt_BR = %{version}-%{release} -Obsoletes: trinity-k3b-i18n-ptbr < %{version}-%{release} -Provides: trinity-k3b-i18n-ptbr = %{version}-%{release} - -%description Brazil -This package contains the Brazilian Portuguese translations for K3B. - -%files Brazil -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/pt_BR/k3b -%{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo - -########## - -%package Russian -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Russian (ru) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-ru < %{version}-%{release} -Provides: trinity-k3b-i18n-ru = %{version}-%{release} - -%description Russian -This package contains the Russian translations for K3B. - -%files Russian -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/ru/k3b -%{tde_datadir}/locale/ru/LC_MESSAGES/*.mo - -########## - -%package Swedish -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Swedish (sv) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-sv < %{version}-%{release} -Provides: trinity-k3b-i18n-sv = %{version}-%{release} - -%description Swedish -This package contains the Swedish translations for K3B. - -%files Swedish -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/sv/k3b -%{tde_datadir}/locale/sv/LC_MESSAGES/*.mo - -########## - -%package Ukrainian -Group: Applications/Archiving -Requires: trinity-k3b -Summary: Ukrainian (uk) translations for K3B [Trinity] - -Obsoletes: trinity-k3b-i18n-uk < %{version}-%{release} -Provides: trinity-k3b-i18n-uk = %{version}-%{release} - -%description Ukrainian -This package contains the Ukrainian translations for K3B. - -%files Ukrainian -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/uk/k3b -%{tde_datadir}/locale/uk/LC_MESSAGES/*.mo - -########## - -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -./configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__rm -rf %{buildroot}%{tde_datadir}/locale/af -%__rm -rf %{buildroot}%{tde_datadir}/locale/ar -%__rm -rf %{buildroot}%{tde_datadir}/locale/bg -%__rm -rf %{buildroot}%{tde_datadir}/locale/br -%__rm -rf %{buildroot}%{tde_datadir}/locale/bs -%__rm -rf %{buildroot}%{tde_datadir}/locale/ca -%__rm -rf %{buildroot}%{tde_datadir}/locale/cs -%__rm -rf %{buildroot}%{tde_datadir}/locale/cy -%__rm -rf %{buildroot}%{tde_datadir}/locale/en_GB -%__rm -rf %{buildroot}%{tde_datadir}/locale/eu -%__rm -rf %{buildroot}%{tde_datadir}/locale/fa -%__rm -rf %{buildroot}%{tde_datadir}/locale/fi -%__rm -rf %{buildroot}%{tde_datadir}/locale/ga -%__rm -rf %{buildroot}%{tde_datadir}/locale/gl -%__rm -rf %{buildroot}%{tde_datadir}/locale/he -%__rm -rf %{buildroot}%{tde_datadir}/locale/hi -%__rm -rf %{buildroot}%{tde_datadir}/locale/hu -%__rm -rf %{buildroot}%{tde_datadir}/locale/is -%__rm -rf %{buildroot}%{tde_datadir}/locale/ja -%__rm -rf %{buildroot}%{tde_datadir}/locale/ka -%__rm -rf %{buildroot}%{tde_datadir}/locale/km -%__rm -rf %{buildroot}%{tde_datadir}/locale/lt -%__rm -rf %{buildroot}%{tde_datadir}/locale/mk -%__rm -rf %{buildroot}%{tde_datadir}/locale/ms -%__rm -rf %{buildroot}%{tde_datadir}/locale/nb -%__rm -rf %{buildroot}%{tde_datadir}/locale/nds -%__rm -rf %{buildroot}%{tde_datadir}/locale/ne -%__rm -rf %{buildroot}%{tde_datadir}/locale/nn -%__rm -rf %{buildroot}%{tde_datadir}/locale/pa -%__rm -rf %{buildroot}%{tde_datadir}/locale/rw -%__rm -rf %{buildroot}%{tde_datadir}/locale/se -%__rm -rf %{buildroot}%{tde_datadir}/locale/sk -%__rm -rf %{buildroot}%{tde_datadir}/locale/sr -%__rm -rf %{buildroot}%{tde_datadir}/locale/sr@Latn -%__rm -rf %{buildroot}%{tde_datadir}/locale/ta -%__rm -rf %{buildroot}%{tde_datadir}/locale/tr -%__rm -rf %{buildroot}%{tde_datadir}/locale/uz -%__rm -rf %{buildroot}%{tde_datadir}/locale/uz@cyrillic -%__rm -rf %{buildroot}%{tde_datadir}/locale/zh_CN -%__rm -rf %{buildroot}%{tde_datadir}/locale/zh_TW - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec b/redhat/applications/k3b-i18n/k3b-i18n.spec index c641a739f..37b598615 100644 --- a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec +++ b/redhat/applications/k3b-i18n/k3b-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg k3b-i18n %define tde_prefix /opt/trinity diff --git a/redhat/applications/k3b/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec deleted file mode 100644 index 851cf978e..000000000 --- a/redhat/applications/k3b/k3b-3.5.13.2.spec +++ /dev/null @@ -1,468 +0,0 @@ -# Default version for this component -%define tde_pkg k3b -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: CD/DVD burning application -Epoch: 1 -Version: 1.0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Group: Applications/Archiving -License: GPLv2+ - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source2: k3brc - -# Fix FTBFS because AVCODEC_MAX_AUDIO_FRAME_SIZE is obsolete -Patch1: k3b-3.5.13.2-fix_ffmpeg_support.patch - -# Legacy RedHat / Fedora patches -# manual bufsize (upstream?) -Patch4: k3b-1.0.4-manualbufsize.patch -# RHEL6: Fix K3B icon -Patch106: trinity-k3b-icons.patch - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: alsa-lib-devel -BuildRequires: audiofile-devel -BuildRequires: hal-devel -BuildRequires: gettext -BuildRequires: libmpcdec-devel -BuildRequires: libmusicbrainz-devel -BuildRequires: libvorbis-devel -BuildRequires: taglib-devel -BuildRequires: zlib-devel - -Requires(post): coreutils -Requires(postun): coreutils - -Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} - -%if 0%{?suse_version} >= 1310 -Requires: wodim -REquires: genisoimage -%else -Requires: cdrecord -REquires: mkisofs -%endif -Requires: dvd+rw-tools - -# CDRDAO support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 5 -Requires: cdrdao -%endif - -# DBUS support -# TQT bindings not available for RHEL4 -%if 0%{?rhel} == 4 -# Dbus bindings were rebuilt with Qt support -BuildRequires: dbus-devel >= 0.22-12.EL.9p1 -Requires: dbus-qt >= 0.22-12.EL.9p1 -%else -BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 -Requires: trinity-dbus-tqt >= 1:0.63 -%endif - -# SNDFILE support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4 -%define with_sndfile 1 -BuildRequires: libsndfile-devel -%endif - -# SAMPLERATE support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4 -%define with_samplerate 1 -BuildRequires: libsamplerate-devel -%endif - -# DVDREAD support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4 -%define with_dvdread 1 -%if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: %{_lib}dvdread-devel -%else -BuildRequires: libdvdread-devel -%endif -%endif - -# FLAC support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: libflac-devel -BuildRequires: libflac++-devel -%else -BuildRequires: %{_lib}flac-devel -BuildRequires: %{_lib}flac++-devel -%endif -%else -BuildRequires: flac-devel -%endif - -# MAD support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -%define with_libmad 1 -%if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: %{_lib}mad-devel -%endif -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -BuildRequires: libmad-devel -%endif -%endif - -# LAME support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -%define with_lame 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: liblame-devel -%else -BuildRequires: %{_lib}lame-devel -%endif -%endif -%if 0%{?suse_version} -BuildRequires: libmp3lame-devel -%endif -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: lame-devel -%endif -%endif - -# FFMPEG support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -%define with_ffmpeg 1 -%if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: %{_lib}ffmpeg-devel -%endif -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -BuildRequires: ffmpeg-devel -%endif -%endif - - -%description -K3b provides a comfortable user interface to perform most CD/DVD -burning tasks. While the experienced user can take influence in all -steps of the burning process the beginner may find comfort in the -automatic settings and the reasonable k3b defaults which allow a quick -start. - - -%files -%defattr(-,root,root,-) -%doc AUTHORS README COPYING TODO ChangeLog -%{tde_bindir}/k3b -%{tde_tdelibdir}/kfile_k3b.la -%{tde_tdelibdir}/kfile_k3b.so -%{tde_tdelibdir}/kio_videodvd.la -%{tde_tdelibdir}/kio_videodvd.so -%{tde_tdelibdir}/libk3balsaoutputplugin.la -%{tde_tdelibdir}/libk3balsaoutputplugin.so -%{tde_tdelibdir}/libk3bartsoutputplugin.la -%{tde_tdelibdir}/libk3bartsoutputplugin.so -%{tde_tdelibdir}/libk3baudiometainforenamerplugin.la -%{tde_tdelibdir}/libk3baudiometainforenamerplugin.so -%{tde_tdelibdir}/libk3baudioprojectcddbplugin.la -%{tde_tdelibdir}/libk3baudioprojectcddbplugin.so -%{tde_tdelibdir}/libk3bexternalencoder.la -%{tde_tdelibdir}/libk3bexternalencoder.so -%{tde_tdelibdir}/libk3bflacdecoder.la -%{tde_tdelibdir}/libk3bflacdecoder.so -%if 0%{?with_sndfile} -%{tde_tdelibdir}/libk3blibsndfiledecoder.la -%{tde_tdelibdir}/libk3blibsndfiledecoder.so -%endif -%{tde_tdelibdir}/libk3bmpcdecoder.la -%{tde_tdelibdir}/libk3bmpcdecoder.so -%{tde_tdelibdir}/libk3boggvorbisdecoder.la -%{tde_tdelibdir}/libk3boggvorbisdecoder.so -%{tde_tdelibdir}/libk3boggvorbisencoder.la -%{tde_tdelibdir}/libk3boggvorbisencoder.so -%{tde_tdelibdir}/libk3bsoxencoder.la -%{tde_tdelibdir}/libk3bsoxencoder.so -%{tde_tdelibdir}/libk3bwavedecoder.la -%{tde_tdelibdir}/libk3bwavedecoder.so -%lang(en) %{tde_tdedocdir}/HTML/en/k3b/ - - -########## - -%package common -Summary: Common files of %{name} -Group: Applications/Archiving -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} -BuildArch: noarch -%endif - -%description common -%{summary}. - -%files common -%defattr(-,root,root,-) -%{tde_tdeappdir}/k3b.desktop -%{tde_datadir}/applnk/.hidden/k3b-cue.desktop -%{tde_datadir}/applnk/.hidden/k3b-iso.desktop -%{tde_datadir}/apps/k3b/ -%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop -%{tde_datadir}/apps/konqueror/servicemenus/k3b_audiocd_rip.desktop -%{tde_datadir}/apps/konqueror/servicemenus/k3b_cd_copy.desktop -%{tde_datadir}/apps/konqueror/servicemenus/k3b_dvd_copy.desktop -%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop -%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop -%{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop -%{tde_datadir}/config/k3brc -%{tde_datadir}/mimelnk/application/x-k3b.desktop -%{tde_datadir}/icons/hicolor/*/apps/k3b.png -%{tde_datadir}/services/kfile_k3b.desktop -%{tde_datadir}/services/videodvd.protocol -%{tde_datadir}/sounds/k3b_error1.wav -%{tde_datadir}/sounds/k3b_success1.wav -%{tde_datadir}/sounds/k3b_wait_media1.wav - - -%post common -touch --no-create %{tde_datadir}/icons/hicolor ||: - -%postun common -if [ $1 -eq 0 ] ; then - touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null - gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : - update-desktop-database %{tde_appdir} -q &> /dev/null -fi - -%posttrans common -gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : -update-desktop-database %{tde_appdir} -q &> /dev/null - -########## - -%package libs -Summary: Runtime libraries for %{name} -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description libs -%{summary}. - -%files libs -%defattr(-,root,root,-) -%{tde_libdir}/libk3b.so.3 -%{tde_libdir}/libk3b.so.3.0.0 -%{tde_libdir}/libk3bdevice.so.5 -%{tde_libdir}/libk3bdevice.so.5.0.0 - -%post libs -/sbin/ldconfig - -%postun libs -/sbin/ldconfig - -########## - -%package devel -Summary: Files for the development of applications which will use %{name} -Group: Development/Libraries -Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} - -%description devel -%{summary}. - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/*.h -%{tde_libdir}/libk3b.so -%{tde_libdir}/libk3bdevice.so - -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig - -########## - -%if 0%{?with_libmad} -%package plugin-mad -Summary: The MAD plugin for K3B -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description plugin-mad -%{summary}. - -MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1 -and the MPEG-2 extension to Lower Sampling Frequencies, as well as the -so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II, -and Layer III a.k.a. MP3) are fully implemented. - -%files plugin-mad -%defattr(-,root,root,-) -%{tde_tdelibdir}/libk3bmaddecoder.la -%{tde_tdelibdir}/libk3bmaddecoder.so -%endif - -########## - -%if 0%{?with_lame} -%package plugin-lame -Summary: The LAME plugin for K3B -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description plugin-lame -%{summary}. - -Personal and commercial use of compiled versions of LAME (or any other mp3 -encoder) requires a patent license in some countries. - -This package is in tainted, as MP3 encoding is covered by software patents. - -%files plugin-lame -%defattr(-,root,root,-) -%{tde_tdelibdir}/libk3blameencoder.la -%{tde_tdelibdir}/libk3blameencoder.so -%endif - -########## - -%if 0%{?with_ffmpeg} -%package plugin-ffmpeg -Summary: The FFMPEG plugin for K3B -Group: System Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description plugin-ffmpeg -%{summary}. - -ffmpeg is a hyper fast realtime audio/video encoder, a streaming server -and a generic audio and video file converter. - -%files plugin-ffmpeg -%defattr(-,root,root,-) -%{tde_tdelibdir}/libk3bffmpegdecoder.la -%{tde_tdelibdir}/libk3bffmpegdecoder.so -%endif - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%patch1 -p1 -b .ffmpeg -%patch4 -p1 -b .manualbufsize -%patch106 -p1 -b .desktopfile - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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 -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -# FFMPEG trick ... -if [ -d /usr/include/ffmpeg ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg" -fi - -# Notice: extra-includes is required to find arts headers -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-extra-includes=%{tde_includedir} \ - \ - --with-k3bsetup=no \ - --without-cdrecord-suid-root \ - --with-oggvorbis \ - --with-flac \ - %{?with_samplerate:--with-external-libsamplerate} \ - %{?with_dvdread:--with-libdvdread} %{?!with_dvdread:--without-libdvdread} \ - --with-musicbrainz \ - %{?with_sndfile:--with-sndfile} %{?!with_sndfile:--without-sndfile} \ - %{?with_ffmpeg:--with-ffmpeg} %{?!with_ffmpeg:--without-ffmpeg} \ - %{?with_lame:--with-lame} %{?!with_lame:--without-lame} \ - %{?with_libmad:--with-libmad} %{?!with_libmad:--without-libmad} \ - --with-musepack \ - --without-resmgr \ - --with-hal - -# Strange behaviour on RHEL4 ... -%if 0%{?rhel} == 4 -%__sed -i "libk3b/jobs/Makefile" -e "/^am_libjobs_la_final_OBJECTS/ s/ lo//g" -%__mkdir_p "libk3bdevice/.libs" -%__ln_s . "libk3bdevice/.libs/.libs" -%endif - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_datadir}/config/k3brc - -# remove the .la files -%__rm -f %{buildroot}%{tde_libdir}/libk3b*.la - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b.spec index fd33e5a7a..5cddbd662 100644 --- a/redhat/applications/k3b/k3b-14.0.0.spec +++ b/redhat/applications/k3b/k3b.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg k3b %define tde_prefix /opt/trinity diff --git a/redhat/applications/k3b/k3brc b/redhat/applications/k3b/k3brc new file mode 100644 index 000000000..5d967f599 --- /dev/null +++ b/redhat/applications/k3b/k3brc @@ -0,0 +1,6 @@ +[General Options] +check system config=false +Manual buffer size=true + +[Notification Messages] +Don't prompt me again.=No diff --git a/redhat/applications/k9copy/k9copy-3.5.13.2.spec b/redhat/applications/k9copy/k9copy-3.5.13.2.spec deleted file mode 100644 index a7a026ab9..000000000 --- a/redhat/applications/k9copy/k9copy-3.5.13.2.spec +++ /dev/null @@ -1,146 +0,0 @@ -# Default version for this component -%define tde_pkg k9copy -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: DVD backup tool for Trinity -Version: 1.2.3 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch1: k9copy-3.5.13.2-fix_k3b_link.patch -Patch2: k9copy-3.5.13.2-ftbfs.patch -Patch3: k9copy-3.5.13.2-use_external_dvdread.patch -Patch4: k9copy-3.5.13.2-avcodec.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-k3b-devel - -# Warning: the target distribution must have ffmpeg ! -BuildRequires: ffmpeg-devel -Requires: ffmpeg - - -%description -k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9 -to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R). -This is the Trinity version. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .ftbfs -%patch2 -p1 -b .ftbfs -%patch3 -p1 -b .dvdread -%patch4 -p1 -b .avcodec - -# Removes internal dvdread headers -%__rm -rf dvdread - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# FFMPEG ... -if [ -d /usr/include/ffmpeg ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg" -fi - -# NOTICE: --enable-final causes FTBFS ! -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - \ - --enable-k3bdevices - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/k9copy -%{tde_tdeappdir}/k9copy.desktop -%{tde_datadir}/apps/k9copy/ -%{tde_datadir}/apps/konqueror/servicemenus/k9copy_open.desktop -%lang(en) %{tde_tdedocdir}/HTML/en/k9copy/ -%{tde_datadir}/icons/hicolor/*/apps/k9copy.png - - -%changelog diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy.spec index f03137ba4..656727906 100644 --- a/redhat/applications/k9copy/k9copy-14.0.0.spec +++ b/redhat/applications/k9copy/k9copy.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg k9copy %define tde_prefix /opt/trinity diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch deleted file mode 100644 index 210fff5f1..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kaffeine-mozilla/src/jni_md.h.ORI 2012-04-26 20:44:15.080210122 +0200 -+++ kaffeine-mozilla/src/jni_md.h 2012-04-26 20:44:28.006895031 +0200 -@@ -40,7 +40,7 @@ - #ifndef JNI_MD_H - #define JNI_MD_H - --#include <nspr/prtypes.h> /* needed for _declspec */ -+#include <nspr4/prtypes.h> /* needed for _declspec */ - - /******************************************************************************* - * WHAT'S UP WITH THIS FILE? ---- kaffeine-mozilla/src/jri_md.h.ORI 2012-04-26 20:44:20.528077329 +0200 -+++ kaffeine-mozilla/src/jri_md.h 2012-04-26 20:44:36.239694357 +0200 -@@ -43,7 +43,7 @@ - #define JRI_MD_H - - #include <assert.h> --#include <nspr/prtypes.h> /* Needed for HAS_LONG_LONG ifdefs */ -+#include <nspr4/prtypes.h> /* Needed for HAS_LONG_LONG ifdefs */ - - #ifdef __cplusplus - extern "C" { diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec deleted file mode 100644 index e00b81a06..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec +++ /dev/null @@ -1,120 +0,0 @@ -# Default version for this component -%define kdecomp kaffeine-mozilla - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] -Version: 0.4.3.1 -Release: 3%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -# Fix 'nspr' includes location -Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils - -%if 0%{?suse_version} -BuildRequires: mozilla-nspr-devel -%else -BuildRequires: nspr-devel -%endif - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xaw-devel -%else -BuildRequires: libXaw-devel -%endif - -Requires: trinity-kaffeine - -%description -This mozilla plugin launches kaffeine, the xine-based media player for KDE, -when a page containing a supported media format is loaded. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -unset QTDIR; . /etc/profile.d/qt3.sh -%setup -q -n %{kdecomp}-3.5.13.1 -%patch1 -p1 - -%__cp -f "/usr/share/aclocal/libtool.m4" . -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" . - -autoreconf -fiv - - -%build -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure \ - --prefix=%{_libdir}/mozilla - -%__make %{?_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Remove useless filess -%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README -# These files are installed outside TDE prefix -%{_libdir}/mozilla/plugins/kaffeineplugin.la -%{_libdir}/mozilla/plugins/kaffeineplugin.so - - -%changelog diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch deleted file mode 100644 index e4a255dce..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trinity-kaffeine-mozilla-3.5.13.2/admin/cvs.sh.ORI 2014-03-23 11:29:59.873837637 +0100 -+++ trinity-kaffeine-mozilla-3.5.13.2/admin/cvs.sh 2014-03-23 11:30:39.942924217 +0100 -@@ -130,7 +130,7 @@ - fi - - echo "*** Creating Makefile templates" --$AUTOMAKE || exit 1 -+$AUTOMAKE --add-missing || exit 1 - - if test "$UNSERMAKE" = no; then - echo "*** Postprocessing Makefile templates" diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec deleted file mode 100644 index b2230c6b3..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec +++ /dev/null @@ -1,131 +0,0 @@ -# Default version for this component -%define tde_pkg kaffeine-mozilla -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] -Version: 0.4.3.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -# Fix 'nspr' includes location -Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch -# Fix build with newer automake -Patch2: kaffeine-mozilla-3.5.13.2-fix_automake.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -%if 0%{?suse_version} -BuildRequires: mozilla-nspr-devel -%else -BuildRequires: nspr-devel -%endif - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xaw-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXaw-devel -%endif - -Requires: trinity-kaffeine - -%description -This mozilla plugin launches kaffeine, the xine-based media player for TDE, -when a page containing a supported media format is loaded. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .nspr -%patch2 -p1 -b .automake - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{_libdir}/mozilla \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Remove useless filess -%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a - - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README -# These files are installed outside TDE prefix -%{_libdir}/mozilla/plugins/kaffeineplugin.la -%{_libdir}/mozilla/plugins/kaffeineplugin.so - - -%changelog diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec deleted file mode 100644 index fdaafa4b0..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec +++ /dev/null @@ -1,110 +0,0 @@ -# Default version for this component -%define kdecomp kaffeine-mozilla - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] -Version: 0.4.3.1 -Release: 2%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -# Fix 'nspr' includes location -Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: nspr-devel - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xaw-devel -%else -BuildRequires: libXaw-devel -%endif - -Requires: trinity-kaffeine - -%description -This mozilla plugin launches kaffeine, the xine-based media player for KDE, -when a page containing a supported media format is loaded. - - -%prep -unset QTDIR; . /etc/profile.d/qt.sh -%setup -q -n applications/%{kdecomp} -%patch1 -p1 - -%__cp -f "/usr/share/aclocal/libtool.m4" . -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" . - -autoreconf -fiv - - -%build -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure \ - --prefix=%{_libdir}/mozilla - -%__make %{?_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Remove useless filess -%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README -# These files are installed outside TDE prefix -%{_libdir}/mozilla/plugins/kaffeineplugin.la -%{_libdir}/mozilla/plugins/kaffeineplugin.so - - -%changelog diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec index f9d3be544..775501caa 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec @@ -17,8 +17,9 @@ # Default version for this component %define tde_pkg kaffeine-mozilla +%define tde_prefix /opt/trinity %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif # TDE specific building variables @@ -37,7 +38,7 @@ %define _docdir %{tde_docdir} -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8 %define debug_package %{nil} %endif @@ -58,8 +59,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -# Fix 'nspr' includes location -Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -94,7 +97,6 @@ when a page containing a supported media format is loaded. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .nspr %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh" @@ -136,6 +138,8 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README # These files are installed outside TDE prefix +%dir %{_libdir}/mozilla +%dir %{_libdir}/mozilla/plugins %{_libdir}/mozilla/plugins/kaffeineplugin.la %{_libdir}/mozilla/plugins/kaffeineplugin.so diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec deleted file mode 100644 index e46e985cc..000000000 --- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec +++ /dev/null @@ -1,289 +0,0 @@ -# Default version for this component -%define tde_pkg kaffeine -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -Name: trinity-%{tde_pkg} -Summary: Xine-based media player - -Version: 0.8.8 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia -URL: http://kaffeine.sourceforge.net/ - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -# VORBIS support -BuildRequires: libvorbis-devel - -# CDDA support -BuildRequires: libcdio-devel -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libcdda-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -BuildRequires: cdparanoia -BuildRequires: cdparanoia-devel -%endif -%if 0%{?suse_version} >= 1210 || 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -BuildRequires: libcdio-paranoia-devel -%endif - -# X11 stuff -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xext-devel -BuildRequires: %{_lib}xtst-devel -BuildRequires: %{_lib}xinerama-devel -%else -BuildRequires: %{_lib}xext%{?mgaversion:6}-devel -BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel -BuildRequires: %{_lib}xinerama%{?mgaversion:1}-devel -%endif -%endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXext-devel -BuildRequires: libXtst-devel -BuildRequires: libXinerama-devel -%endif -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 -BuildRequires: libxcb-devel -%endif - -# GSTREAMER support -%if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_gstreamer 1 -%if 0%{?suse_version} -BuildRequires: gstreamer-0_10-devel -BuildRequires: gstreamer-0_10-plugins-base-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: gstreamer-devel -BuildRequires: gstreamer-plugins-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: gstreamer-plugins-base-devel >= 0.10 -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libgstreamer-devel >= 0.10 -BuildRequires: libgstreamer-plugins-base-devel >= 0.10 -%endif -%endif - -# XINE support -%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: %{_lib}xine-devel -%else -BuildRequires: %{_lib}xine1.2-devel -%endif -%endif -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: xine-lib-devel -%endif -%if 0%{?suse_version} -BuildRequires: libxine-devel -%endif -%endif - -# LAME support -%if 0%{?suse_version} -BuildRequires: libmp3lame-devel -%else -BuildRequires: lame-devel -%endif - -# WTF support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} == 0 -BuildRequires: kernel-headers -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: glibc-kernheaders -%endif - -Requires: %{name}-libs = %{version}-%{release} - -%description -Kaffeine is a xine-based media player for TDE. It plays back CDs, -and VCDs, and can decode all (local or streamed) multimedia formats -supported by xine-lib. -Additionally, Kaffeine is fully integrated in TDE, it supports drag -and drop and provides an editable playlist, a bookmark system, a -Konqueror plugin, OSD and much more. - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO -%{tde_bindir}/kaffeine -%{tde_libdir}/libkaffeinepart.so -%{tde_tdelibdir}/lib*.* -%{tde_datadir}/appl*/*/*.desktop -%if 0%{?with_gstreamer} -%{tde_datadir}/apps/gstreamerpart/ -%endif -%{tde_datadir}/apps/kaffeine/ -%{tde_datadir}/apps/konqueror/servicemenus/*.desktop -%{tde_datadir}/apps/profiles/ -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_datadir}/mimelnk/*/*.desktop -%{tde_datadir}/service*/*.desktop -%{tde_tdedocdir}/HTML/en/kaffeine/ - -%post -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database >& /dev/null ||: -/sbin/ldconfig || : - -%postun -touch --no-create %{_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database >& /dev/null ||: -/sbin/ldconfig || : - -########## - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} -Requires: trinity-tdelibs-devel - -%description devel -%{summary}. - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kaffeine/ -%{tde_libdir}/lib*.so -%exclude %{tde_libdir}/libkaffeinepart.so - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -########## - -%package libs -Summary: %{name} runtime libraries -Group: System Environment/Libraries - -# include to be paranoid, installing libs-only is still mostly untested -- Rex -Requires: %{name} = %{version}-%{release} - -%description libs -%{summary}. - -%files libs -%defattr(-,root,root,-) -%{tde_libdir}/lib*.so.* - -%post libs -/sbin/ldconfig || : - -%postun libs -/sbin/ldconfig || : - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export KDEDIR=%{tde_prefix} - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-xinerama \ - --with-gstreamer \ - --with-lame \ -%if 0%{?rhel} > 0 && 0%{?rhel} <= 5 - --without-dvb \ -%endif - - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT - -## File lists -# locale's -%find_lang %{tde_pkg} - -# Unpackaged files -rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la -rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%changelog diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine.spec index d38e6a27d..2ff080f22 100644 --- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec +++ b/redhat/applications/kaffeine/kaffeine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kaffeine %define tde_prefix /opt/trinity @@ -140,9 +140,9 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %endif # XINE support -%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: %{_lib}xine1.2-devel %endif %if 0%{?fedora} || 0%{?rhel} diff --git a/redhat/applications/kasablanca/kasablanca-14.0.0.spec b/redhat/applications/kasablanca/kasablanca.spec index 3a92fd87c..7680c1cff 100644 --- a/redhat/applications/kasablanca/kasablanca-14.0.0.spec +++ b/redhat/applications/kasablanca/kasablanca.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kasablanca %define tde_prefix /opt/trinity @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -77,6 +77,12 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + # OPENSSL support BuildRequires: openssl-devel @@ -117,43 +123,44 @@ Kasablanca is an ftp client, among its features are currently: %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/"*"/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 PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -## Needed(?) for older/legacy setups, harmless otherwise -if pkg-config openssl ; then - export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - --datadir=%{tde_datadir} \ +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT -C build # locale's %find_lang %{tde_pkg} @@ -170,13 +177,14 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS ChangeLog COPYING README %{tde_bindir}/kasablanca %{tde_datadir}/apps/kasablanca/ %{tde_datadir}/config.kcfg/kbconfig.kcfg %{tde_datadir}/icons/hicolor/*/apps/kasablanca.png %{tde_tdedocdir}/HTML/en/kasablanca/ %{tde_tdeappdir}/kasablanca.desktop +%{tde_mandir}/man1/kasablanca.* %changelog diff --git a/redhat/applications/katapult/katapult-3.5.13.2.spec b/redhat/applications/katapult/katapult-3.5.13.2.spec deleted file mode 100644 index c26f46fbd..000000000 --- a/redhat/applications/katapult/katapult-3.5.13.2.spec +++ /dev/null @@ -1,173 +0,0 @@ -# Default version for this component -%define tde_pkg katapult -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Faster access to applications, bookmarks, and other items. -Version: 0.3.2.1 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -Katapult is an application for TDE, designed to allow faster access to -applications, bookmarks, and other items. It is plugin-based, so it can -launch anything that is has a plugin for. Its display is driven by -plugins as well, so its appearance is completely customizable. It was -inspired by Quicksilver for OS X. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -# Removes useless files (-devel ?) -%__rm -f %{?buildroot}%{tde_libdir}/*.so -%__rm -f %{?buildroot}%{tde_libdir}/*.la - -%clean -%__rm -rf %{buildroot} - - -%post -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} &> /dev/null - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/katapult -%{tde_libdir}/libkatapult.so.2 -%{tde_libdir}/libkatapult.so.2.0.0 -%{tde_tdelibdir}/katapult_amarokcatalog.la -%{tde_tdelibdir}/katapult_amarokcatalog.so -%{tde_tdelibdir}/katapult_bookmarkcatalog.la -%{tde_tdelibdir}/katapult_bookmarkcatalog.so -%{tde_tdelibdir}/katapult_calculatorcatalog.la -%{tde_tdelibdir}/katapult_calculatorcatalog.so -%{tde_tdelibdir}/katapult_documentcatalog.la -%{tde_tdelibdir}/katapult_documentcatalog.so -%{tde_tdelibdir}/katapult_execcatalog.la -%{tde_tdelibdir}/katapult_execcatalog.so -%{tde_tdelibdir}/katapult_glassdisplay.la -%{tde_tdelibdir}/katapult_glassdisplay.so -%{tde_tdelibdir}/katapult_googlecatalog.la -%{tde_tdelibdir}/katapult_googlecatalog.so -%{tde_tdelibdir}/katapult_o2display.la -%{tde_tdelibdir}/katapult_o2display.so -%{tde_tdelibdir}/katapult_programcatalog.la -%{tde_tdelibdir}/katapult_programcatalog.so -%{tde_tdelibdir}/katapult_puredisplay.la -%{tde_tdelibdir}/katapult_puredisplay.so -%{tde_tdelibdir}/katapult_spellcatalog.la -%{tde_tdelibdir}/katapult_spellcatalog.so -%{tde_tdeappdir}/katapult.desktop -%{tde_datadir}/icons/crystalsvg/128x128/actions/katapultspellcheck.png -%{tde_datadir}/icons/crystalsvg/scalable/actions/katapultspellcheck.svgz -%{tde_datadir}/icons/hicolor/128x128/actions/checkmark.png -%{tde_datadir}/icons/hicolor/128x128/actions/no.png -%{tde_datadir}/icons/hicolor/128x128/apps/xcalc.png -%{tde_datadir}/icons/hicolor/*/apps/katapult.png -%{tde_datadir}/icons/hicolor/scalable/apps/katapult.svgz -%{tde_datadir}/services/katapult_amarokcatalog.desktop -%{tde_datadir}/services/katapult_bookmarkcatalog.desktop -%{tde_datadir}/services/katapult_calculatorcatalog.desktop -%{tde_datadir}/services/katapult_documentcatalog.desktop -%{tde_datadir}/services/katapult_execcatalog.desktop -%{tde_datadir}/services/katapult_glassdisplay.desktop -%{tde_datadir}/services/katapult_googlecatalog.desktop -%{tde_datadir}/services/katapult_o2display.desktop -%{tde_datadir}/services/katapult_programcatalog.desktop -%{tde_datadir}/services/katapult_puredisplay.desktop -%{tde_datadir}/services/katapult_spellcatalog.desktop -%{tde_datadir}/servicetypes/katapultcatalog.desktop -%{tde_datadir}/servicetypes/katapultdisplay.desktop -%{tde_tdedocdir}/HTML/en/katapult/ - - -%changelog diff --git a/redhat/applications/katapult/katapult.spec b/redhat/applications/katapult/katapult.spec index f0e281a27..1e71f52d7 100644 --- a/redhat/applications/katapult/katapult.spec +++ b/redhat/applications/katapult/katapult.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg katapult %define tde_prefix /opt/trinity @@ -153,7 +153,7 @@ export PATH="%{tde_bindir}:${PATH}" # Fix desktop files (openSUSE only) echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %if 0%{?suse_version} -%suse_update_desktop_file -G "Application Launcher" katapult DesktopUtility +%suse_update_desktop_file -G "Application Launcher" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility %endif diff --git a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec b/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec deleted file mode 100644 index 1713feaab..000000000 --- a/redhat/applications/kbarcode/kbarcode-3.5.13.2.spec +++ /dev/null @@ -1,154 +0,0 @@ -# Default version for this component -%define tde_pkg kbarcode -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: barcode and label printing application for Trinity -Version: 2.0.6 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.kbarcode.net - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -KBarcode is a barcode and label printing application for Trinity. It can be used -to print everything from simple business cards up to complex labels with -several barcodes (e.g. article descriptions). - -KBarcode comes with an easy to use WYSIWYG label designer, a setup wizard, -batch import of data for batch printing labels (directly from the delivery -note), thousands of predefined labels, database management tools and -translations in many languages. Even printing more than 10.000 labels in one -go is no problem for KBarcode. Data for printing can be imported from several -different data sources, including SQL databases, CSV files and the TDE address -book. - -Additionally it is a simple barcode generator (similar to the old xbarcode you -might know). All major types of barcodes like EAN, UPC, CODE39 and ISBN are -supported. Even complex 2D barcodes are supported using third party tools. The -generated barcodes can be directly printed or you can export them into images -to use them in another application. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-extra-includes=%{_includedir}/pcre - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%find_lang %{tde_pkg} - - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kbarcode -%{tde_tdelibdir}/kfile_kbarcode.la -%{tde_tdelibdir}/kfile_kbarcode.so -%{tde_tdeappdir}/kbarcode-batch.desktop -%{tde_tdeappdir}/kbarcode-editor.desktop -%{tde_tdeappdir}/kbarcode-label.desktop -%{tde_tdeappdir}/kbarcode-single.desktop -%{tde_tdeappdir}/kbarcode.desktop -%{tde_datadir}/apps/kbarcode/ -%{tde_datadir}/icons/hicolor/*/actions/barcode.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png -%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png -%{tde_datadir}/services/kfile_kbarcode.desktop - - -%changelog diff --git a/redhat/applications/kbarcode/kbarcode.spec b/redhat/applications/kbarcode/kbarcode.spec index a10cd0ab1..423d99ebe 100644 --- a/redhat/applications/kbarcode/kbarcode.spec +++ b/redhat/applications/kbarcode/kbarcode.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kbarcode %define tde_prefix /opt/trinity @@ -114,7 +114,7 @@ to use them in another application. %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING README TODO %{tde_bindir}/kbarcode %{tde_tdeappdir}/kbarcode-batch.desktop %{tde_tdeappdir}/kbarcode-editor.desktop @@ -136,7 +136,6 @@ to use them in another application. %package tdefile-plugin Summary: tdefile-plugin for %{name} Group: Applications/Utilities -#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description tdefile-plugin %{summary}. @@ -207,10 +206,10 @@ export PATH="%{tde_bindir}:${PATH}" # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file -r kbarcode Utility PrintingUtility -%suse_update_desktop_file -r kbarcode-batch Utility PrintingUtility -%suse_update_desktop_file -r kbarcode-editor Utility PrintingUtility -%suse_update_desktop_file -r kbarcode-single Utility PrintingUtility +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode.desktop" Utility PrintingUtility +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-batch.desktop" Utility PrintingUtility +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-editor.desktop" Utility PrintingUtility +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kbarcode-single.desktop" Utility PrintingUtility %endif diff --git a/redhat/applications/kbfx/kbfx-3.5.13.2.spec b/redhat/applications/kbfx/kbfx-3.5.13.2.spec deleted file mode 100644 index f3e9f4694..000000000 --- a/redhat/applications/kbfx/kbfx-3.5.13.2.spec +++ /dev/null @@ -1,173 +0,0 @@ -# Default version for this component -%define tde_pkg kbfx -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: an alternative to K-Menu for TDE [Trinity] -Version: 0.4.9.3.1 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -KBFX is an alternative to the classical K-Menu button and its menu. -It improves the user experience by enabling him to set a bigger (and thus more -visible) start button and by finally replacing the Win95-like K-Menu. -If you still want the old menu, because you're used to it, it is still -available as an option in kbfx. We recommend, however, that you give the Spinx -bar a try. - -Homepage: http://www.kbfx.org - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -# Fix TDE executable path in 'CMakeLists.txt' ... -%__sed -i "CMakeLists.txt" \ - -e "s|/usr/bin/uic-tqt|%{tde_bindir}/uic-tqt|" \ - -e "s|/usr/bin/tmoc|%{tde_bindir}/tmoc|" \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|" - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Shitty hack for RHEL4 ... -if [ -d "/usr/X11R6" ]; then - export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ - -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \ - -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \ - -DSHARE_INSTALL_PREFIX="%{tde_datadir}"\ - -DDOC_INSTALL_DIR=%{tde_tdedocdir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - \ - -DUSE_STRIGI=OFF \ - -DUSE_MENUDRAKE=OFF \ - -DBUILD_DOC=ON \ - -DBUILD_ALL=OFF \ - .. - -# Not SMP safe ! -%__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build VERBOSE=1 - - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kbfxconfigapp -%{tde_tdeincludedir}/kbfx/ -%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.la -%{tde_libdir}/kbfx/plugins/libkbfxplasmadataplasmoid.so -%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.la -%{tde_libdir}/kbfx/plugins/libkbfxplasmadatasettings.so -%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.la -%{tde_libdir}/kbfx/plugins/libkbfxplasmadatastub.so -%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.la -%{tde_libdir}/kbfx/plugins/libkbfxplasmarecentstuff.so -%{tde_libdir}/libkbfxcommon.la -%{tde_libdir}/libkbfxcommon.so -%{tde_libdir}/libkbfxdata.la -%{tde_libdir}/libkbfxdata.so -%{tde_tdelibdir}/kbfxspinx.la -%{tde_tdelibdir}/kbfxspinx.so -%{tde_tdeappdir}/kbfx_theme.desktop -%{tde_tdeappdir}/kbfxconfigapp.desktop -%{tde_datadir}/apps/kbfx/skins/*/* -%{tde_datadir}/apps/kbfxconfigapp/kbfxconfigappui.rc -%{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop -%{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop -%{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop -#%{tde_tdedocdir}/HTML/en/common/kbfx-*.jpg -#%{tde_tdedocdir}/HTML/en/kbfxconfigapp/ -%{tde_tdedocdir}/kbfx/ -%{tde_datadir}/icons/hicolor/*/apps/kbfx.png -%{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png -#%{tde_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo -%{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop - - -%changelog diff --git a/redhat/applications/kbfx/kbfx.spec b/redhat/applications/kbfx/kbfx.spec index 50da69568..b38c55ab2 100644 --- a/redhat/applications/kbfx/kbfx.spec +++ b/redhat/applications/kbfx/kbfx.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kbfx %define tde_prefix /opt/trinity @@ -222,6 +222,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/hicolor/*/apps/kbfx.png %{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png %lang(bg) %{tde_datadir}/locale/bg/LC_MESSAGES/kbfxconfigapp.mo +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/kbfxconfigapp.mo %lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kbfxconfigapp.mo %lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo %lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo diff --git a/redhat/applications/kbibtex/kbibtex.spec b/redhat/applications/kbibtex/kbibtex.spec index 9148c5f29..2a822f934 100644 --- a/redhat/applications/kbibtex/kbibtex.spec +++ b/redhat/applications/kbibtex/kbibtex.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kbibtex %define tde_prefix /opt/trinity @@ -152,7 +152,7 @@ fi # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file -G "Bibliography Manager" kbibtex TDE Office Database +%suse_update_desktop_file -G "Bibliography Manager" "%{?buildroot}%{tde_tdeappdir}/kbibtex.desktop" TDE Office Database %endif @@ -162,7 +162,7 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING NEWS README TODO ChangeLog +%doc AUTHORS COPYING NEWS README TODO ChangeLog %{tde_bindir}/kbibtex %{tde_tdelibdir}/libkbibtexpart.la %{tde_tdelibdir}/libkbibtexpart.so diff --git a/redhat/applications/kbiff/kbiff.spec b/redhat/applications/kbiff/kbiff.spec index 52a298657..10a297c6a 100644 --- a/redhat/applications/kbiff/kbiff.spec +++ b/redhat/applications/kbiff/kbiff.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kbiff %define tde_prefix /opt/trinity @@ -147,14 +147,10 @@ fi %find_lang %{tde_pkg} -# Fix icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Internet/kbiff.desktop" "%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" - # Updates applications categories for openSUSE %if 0%{?suse_version} echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" -%suse_update_desktop_file kbiff Applet +%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/kbiff.desktop" Applet %endif diff --git a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec b/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec deleted file mode 100644 index 61f8a726c..000000000 --- a/redhat/applications/kbookreader/kbookreader-3.5.13.2.spec +++ /dev/null @@ -1,118 +0,0 @@ -# Default version for this component -%define tde_pkg kbookreader -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: eBook reader for Trinity. -Version: 0.2.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -kbookreader is an application which allows you to view eBooks -within the Trinity Desktop Environment. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f admin/Makefile.common - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/bookreader -%{tde_bindir}/bookreader_client -%{tde_datadir}/applnk/Utilities/bookreader.desktop -%{tde_datadir}/apps/bookreader/ -%{tde_datadir}/config.kcfg/bookreader.kcfg -%{tde_tdedocdir}/HTML/en/bookreader/ -%{tde_datadir}/icons/hicolor/*/apps/bookreader.png - - -%changelog diff --git a/redhat/applications/kbookreader/kbookreader.spec b/redhat/applications/kbookreader/kbookreader.spec index 90e316458..a0832ce80 100644 --- a/redhat/applications/kbookreader/kbookreader.spec +++ b/redhat/applications/kbookreader/kbookreader.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kbookreader %define tde_prefix /opt/trinity @@ -142,21 +142,19 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -# Fix desktop icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Office/bookreader.desktop" "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" - # Updates applications categories for openSUSE %if 0%{?suse_version} %suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/bookreader.desktop" Office Viewer %endif +%find_lang %{tde_pkg} || touch %{tde_pkg}.lang + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_bindir}/bookreader diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec deleted file mode 100644 index 36012a73f..000000000 --- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec +++ /dev/null @@ -1,145 +0,0 @@ -# Default version for this component -%define tde_pkg kchmviewer -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: CHM viewer for Trinity -Version: 3.1.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -KchmViewer is a chm (MS HTML help file format) viewer, written in C++. -Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget -library, and does not depend on TDE or GNOME. However, it may be compiled -with full Trinity support, including Trinity widgets and KIO/KHTML. - -The main advantage of KchmViewer is non-English language support. Unlike -others, KchmViewer in most cases correctly detects help file encoding, -correctly shows tables of context of Russian, Korean, Chinese and Japanese -help files, and correctly searches in non-English help files (search for -MBCS languages - ja/ko/ch is still in progress). - -Completely safe and harmless. Does not support JavaScript in any way, -optionally warns you before opening an external web page, or switching to -another help file. Shows an appropriate image for every TOC entry. - -KchmViewer Has complete chm index support, including multiple index entries, -cross-links and parent/child entries in index as well as Persistent bookmarks -support. Correctly detects and shows encoding of any valid chm file. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -# Warning: --enable-final causes FTBFS ! -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-x \ - --with-kde - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -# Removes useless files -%__rm -f %{?buildroot}%{tde_libdir}/*.a - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc ChangeLog COPYING FAQ README -%{tde_bindir}/kchmviewer -%{tde_tdelibdir}/kio_msits.la -%{tde_tdelibdir}/kio_msits.so -%{tde_datadir}/applnk/kchmviewer.desktop -%{tde_datadir}/icons/crystalsvg/*/apps/kchmviewer.png -%{tde_datadir}/services/msits.protocol - - -%changelog diff --git a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec b/redhat/applications/kchmviewer/kchmviewer.spec index dca19c1d4..b03422fb8 100644 --- a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec +++ b/redhat/applications/kchmviewer/kchmviewer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kchmviewer %define tde_prefix /opt/trinity @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -76,8 +76,21 @@ BuildRequires: brp-check-trinity %endif # CHMLIB support +%if 0%{?rhel} == 8 +%define with_chmlib 0 +%else +%define with_chmlib 1 BuildRequires: chmlib-devel +%endif + +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel +# OPENSSL support +BuildRequires: openssl-devel %description KchmViewer is a chm (MS HTML help file format) viewer, written in C++. @@ -112,47 +125,47 @@ support. Correctly detects and shows encoding of any valid chm file. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -# Warning: --enable-final causes FTBFS ! -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + -DWITH_CHMLIB=%{?with_chmlib} \ \ - --with-x \ - --with-kde + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -160,8 +173,11 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -f %{?buildroot}%{tde_libdir}/*.a # Fix desktop icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/kchmviewer.desktop" "%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" +if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then + %__mkdir_p "%{?buildroot}%{tde_tdeappdir}" + %__mv -f "%{?buildroot}%{tde_datadir}/applnk/kchmviewer.desktop" "%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" + %__rm -r "%{buildroot}%{tde_datadir}/applnk" +fi # Updates applications categories for openSUSE echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" @@ -185,6 +201,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kchmviewer.desktop" %{tde_datadir}/services/msits.protocol %{tde_tdedocdir}/HTML/en/kchmviewer/ %{tde_tdedocdir}/HTML/en/tdeioslave/msits/ +%{tde_mandir}/man1/kchmviewer.* %changelog diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec b/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec deleted file mode 100644 index 0ccd9d6d5..000000000 --- a/redhat/applications/kcmautostart/kcmautostart-3.5.13.2.spec +++ /dev/null @@ -1,124 +0,0 @@ -# Default version for this component -%define tde_pkg kchmviewer -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-kcmautostart -Summary: Manage applications automatic startup. -Version: 1.0 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: kcmautostart-3.5.13.tar.gz - -# [kcmautostart] Fix FTBFS with TDE 3.5.13 -Patch1: kcmautostart-3.5.13-ftbfs.patch -# [kcmautostart] Add French support -Patch2: kcmautostart-3.5.13-add_french.patch -# [kcmautostart] kcmautostart crash on exit -Patch3: kcmautostart-3.5.13-fix_crash_on_exit.patch -# [kcmautostart] Fix french translation -Patch4: kcmautostart-3.5.13-fix_fr_translation.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gcc-c++ - -Requires: trinity-tdebase >= %{tde_version} - -%description -%{summary} - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n applications/kcmautostart -%patch1 -p1 -b .ftbfs -%patch2 -p1 -%patch3 -p1 -b .crash_on_exit -%patch4 -p1 -b .fr_translation - -%__sed -i admin/acinclude.m4.in \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang autostart - - -%clean -%__rm -rf %{buildroot} - - -%files -f autostart.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO -%{tde_tdelibdir}/kcm_autostart.la -%{tde_tdelibdir}/kcm_autostart.so -%{tde_tdeappdir}/autostart.desktop -%{tde_tdedocdir}/HTML/en/autostart/ - - -%changelog diff --git a/redhat/applications/kcmautostart/kcmautostart-fr.po b/redhat/applications/kcmautostart/kcmautostart-fr.po deleted file mode 100644 index 6d898bc97..000000000 --- a/redhat/applications/kcmautostart/kcmautostart-fr.po +++ /dev/null @@ -1,52 +0,0 @@ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2012-05-10 12:01+0100\n" -"Project-Id-Version: autostart_ca\n" -"Language-Team: <ca@li.org>\n" -"X-Generator: KBabel 1.11.4\n" -"MIME-Version: 1.0\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Last-Translator: Josep Febrer <josep@extens.info>\n" - -#: ../src/autostart.cpp:61 -msgid "Startup" -msgstr "Démarrage" - -#: ../src/autostart.cpp:62 -msgid "Shutdown" -msgstr "Arrêt" - -#: ../src/autostart.cpp:63 -msgid "ENV" -msgstr "ENV" - -#: ../src/autostart.cpp:102 -msgid "Name" -msgstr "Nom" - -#: ../src/autostart.cpp:103 -msgid "Command" -msgstr "Comande" - -#: ../src/autostart.cpp:104 -msgid "Run on" -msgstr "Executer" - -#: ../src/autostart.cpp:129 -msgid "&Add" -msgstr "&Ajouter" - -#: ../src/autostart.cpp:131 -msgid "&Remove" -msgstr "&Supprimer" - -#: ../src/autostart.cpp:133 -msgid "&Properties" -msgstr "&Propiétés" - -#: ../src/autostart.cpp:317 -msgid "This module helps you configure which applications KDE runs When starting up and shutting down." -msgstr "Ce module vous aide à configurer quelles applications sont exécutées à l'ouverture et à la fermeture de session de TDE." - diff --git a/redhat/applications/kcmautostart/kcmautostart.spec b/redhat/applications/kcmautostart/kcmautostart.spec index 0006b6f31..76ab3145d 100644 --- a/redhat/applications/kcmautostart/kcmautostart.spec +++ b/redhat/applications/kcmautostart/kcmautostart.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kcmautostart %define tde_prefix /opt/trinity @@ -152,7 +152,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f autostart.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO +%doc AUTHORS ChangeLog COPYING INSTALL README %{tde_tdelibdir}/kcm_autostart.la %{tde_tdelibdir}/kcm_autostart.so %{tde_tdeappdir}/autostart.desktop diff --git a/redhat/applications/kcmldap/kcmldap.spec b/redhat/applications/kcmldap/kcmldap.spec index 5fcf25a9b..5fd5cef1e 100644 --- a/redhat/applications/kcmldap/kcmldap.spec +++ b/redhat/applications/kcmldap/kcmldap.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kcmldap %define tde_prefix /opt/trinity @@ -101,13 +101,16 @@ BuildRequires: openldap2-devel BuildRequires: openldap24-libs-devel %endif +# KRB5 support +#BuildRequires: krb5-devel + # HEIMDAL support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: heimdal-devel -%endif -%if 0%{?suse_version} -BuildRequires: libheimdal-devel -%endif +#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +#BuildRequires: heimdal-devel +#%endif +#%if 0%{?suse_version} +#BuildRequires: libheimdal-devel +#%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -141,7 +144,7 @@ This is a TDE control center module to manage TDE connections to Kerberos realms %files -n trinity-kcontrol-ldap-bonding %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING +%doc AUTHORS COPYING %{tde_bindir}/tdeldapbonding %{tde_tdelibdir}/kcm_ldapbonding.la %{tde_tdelibdir}/kcm_ldapbonding.so @@ -162,7 +165,7 @@ This is a small daemon which keeps the LDAP root certificate up to date with the %files -n trinity-tde-ldap-cert-updater %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING +%doc AUTHORS COPYING %{tde_bindir}/tdeldapcertupdater ########## @@ -208,11 +211,6 @@ fi -DBUILD_DOC=ON \ -DBUILD_TRANSLATIONS=ON \ \ -%if 0%{?suse_version} - -DKRB5_FOUND=1 \ - -DKRB5_LIBRARIES="-lkrb5" \ - -DKRB5_INCLUDE_DIRS="/usr/include" \ -%endif .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec index 88a889e4e..b84e6d939 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kcmldapcontroller %define tde_prefix /opt/trinity @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-libtdeldap-devel >= 0.5 -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -91,13 +91,16 @@ BuildRequires: openldap2-devel BuildRequires: openldap24-libs-devel %endif +# KRB5 support +#BuildRequires: krb5-devel + # HEIMDAL support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: heimdal-devel -%endif -%if 0%{?suse_version} -BuildRequires: libheimdal-devel -%endif +#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +#BuildRequires: heimdal-devel +#%endif +#%if 0%{?suse_version} +#BuildRequires: libheimdal-devel +#%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -113,6 +116,15 @@ BuildRequires: libcom_err-devel BuildRequires: %{_lib}ext2fs-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + Requires: trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release} @@ -132,9 +144,9 @@ This is a TDE control center module to manage users, groups, and machines in Ker %files -n trinity-kcontrol-ldap-controller %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING +%doc AUTHORS COPYING %{tde_bindir}/primaryrccertupdater -%if 0%{?pclinuxos} == 0 +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?rhel} >= 7 %{tde_libdir}/slapi-acl-manager.la %{tde_libdir}/slapi-acl-manager.so %endif @@ -161,55 +173,48 @@ This is a TDE control center module to manage users, groups, and machines in Ker %__rm -rf acl-updater %endif -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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 PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -extra_includes="%{_includedir}" -extra_libs="%{_libdir}" - -if [ -d "%{_includedir}/openldap24" ]; then - extra_includes="%{_includedir}/openldap24:${extra_includes}" - extra_libs="%{_libdir}/openldap24:${extra_libs}" -fi - -if [ -d "%{_includedir}/heimdal" ]; then - extra_includes="%{_includedir}/heimdal:${extra_includes}" - extra_libs="%{_libdir}/heimdal:${extra_libs}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ \ - --with-extra-includes=${extra_includes} \ - --with-extra-libs=${extra_libs} \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %clean diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec b/redhat/applications/kcmldapmanager/kcmldapmanager.spec index 008da620d..86c7b27d3 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec +++ b/redhat/applications/kcmldapmanager/kcmldapmanager.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kcmldapmanager %define tde_prefix /opt/trinity @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-libtdeldap-devel >= 0.5 -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -88,13 +88,16 @@ BuildRequires: openldap2-devel BuildRequires: openldap24-libs-devel %endif +# KRB5 support +#BuildRequires: krb5-devel + # HEIMDAL support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: heimdal-devel -%endif -%if 0%{?suse_version} -BuildRequires: libheimdal-devel -%endif +#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +#BuildRequires: heimdal-devel +#%endif +#%if 0%{?suse_version} +#BuildRequires: libheimdal-devel +#%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -110,6 +113,15 @@ BuildRequires: libcom_err-devel BuildRequires: %{_lib}ext2fs-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + Requires: trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release} @@ -127,9 +139,9 @@ Group: Applications/Utilities %description -n trinity-kcontrol-ldap-manager This is a TDE control center module to manage users, groups, and machines in Kerberos realms. -%files -n trinity-kcontrol-ldap-manager +%files -n trinity-kcontrol-ldap-manager -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING +%doc AUTHORS COPYING %{tde_bindir}/tdeldapmanager %{tde_tdelibdir}/kcm_ldapmanager.la %{tde_tdelibdir}/kcm_ldapmanager.so @@ -146,55 +158,49 @@ This is a TDE control center module to manage users, groups, and machines in Ker %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/"*"/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 PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -extra_includes="%{_includedir}" -extra_libs="%{_libdir}" - -if [ -d "%{_includedir}/openldap24" ]; then - extra_includes="%{_includedir}/openldap24:${extra_includes}" - extra_libs="%{_libdir}/openldap24:${extra_libs}" -fi - -if [ -d "%{_includedir}/heimdal" ]; then - extra_includes="%{_includedir}/heimdal:${extra_includes}" - extra_libs="%{_libdir}/heimdal:${extra_libs}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ \ - --with-extra-includes=${extra_includes} \ - --with-extra-libs=${extra_libs} \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +%find_lang %{tde_pkg} || touch %{tde_pkg}.lang %clean diff --git a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec b/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec deleted file mode 100644 index df8ec2705..000000000 --- a/redhat/applications/kcpuload/kcpuload-3.5.13.2.spec +++ /dev/null @@ -1,125 +0,0 @@ -# Default version for this component -%define tde_pkg kcpuload -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: a CPU meter for Kicker [Trinity] -Version: 2.00 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -KCPULoad is a small program for Kicker (the TDE panel). It shows a -recent history of CPU usage in the form of one or two configurable -diagrams in the system tray. These diagrams have settings for colours -and various different styles. - -KCPULoad has support for SMP and separate user/system loads. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kcpuload -%{tde_datadir}/applnk/System/kcpuload.desktop -%{tde_datadir}/apps/kcpuload/icons/*/*/*/*.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcpuload.png -%{tde_datadir}/icons/locolor/*/apps/kcpuload.png -%{tde_tdedocdir}/HTML/en/kcpuload/ - - -%changelog diff --git a/redhat/applications/kcpuload/kcpuload.spec b/redhat/applications/kcpuload/kcpuload.spec index cda688320..437b8b9dd 100644 --- a/redhat/applications/kcpuload/kcpuload.spec +++ b/redhat/applications/kcpuload/kcpuload.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kcpuload %define tde_prefix /opt/trinity @@ -144,14 +144,12 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -# Fix desktop icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/System/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" +%find_lang %{tde_pkg} || touch %{tde_pkg}.lang # Fix desktop files (openSUSE only) echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %if 0%{?suse_version} -%suse_update_desktop_file kcpuload System Monitor +%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System Monitor %endif @@ -159,7 +157,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/kcpuload %{tde_tdeappdir}/kcpuload.desktop diff --git a/redhat/applications/kdbg/kdbg-14.0.0.spec b/redhat/applications/kdbg/kdbg.spec index 0728d9ad7..b37eef30f 100644 --- a/redhat/applications/kdbg/kdbg-14.0.0.spec +++ b/redhat/applications/kdbg/kdbg.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kdbg %define tde_prefix /opt/trinity @@ -161,7 +161,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_bindir}/kdbg %{tde_tdeappdir}/kdbg.desktop %{tde_datadir}/apps/kdbg/ -%{tde_confdir}/kdbgrc +%config(noreplace) %{tde_confdir}/kdbgrc %lang(de) %{tde_tdedocdir}/HTML/de/kdbg/ %lang(en) %{tde_tdedocdir}/HTML/en/kdbg/ %lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/ diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch deleted file mode 100644 index 4ed8c1c52..000000000 --- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp.ORI 2013-07-20 11:16:18.010011618 +0200 -+++ trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp 2013-07-20 11:27:19.135889426 +0200 -@@ -231,9 +231,10 @@ - } - - // Send a notification request to KDE here... -- TQString messageText = TQString(body); -+ TQString messageCaption = TQString::fromLocal8Bit(summary); -+ TQString messageText = TQString::fromLocal8Bit(body); - -- GTKNotifierContainer->displayMessage(TQString(summary), TQString(body), TQString(icon), x, y); -+ GTKNotifierContainer->displayMessage(messageCaption, messageText, TQString(icon), x, y); - - return_id = 0; - diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec deleted file mode 100644 index 36202497b..000000000 --- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec +++ /dev/null @@ -1,117 +0,0 @@ -# Default version for this component -%define tde_pkg kdbusnotification -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: a DBUS notification service [Trinity] - -Version: 0.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch1: kdbusnotification-3.5.13.2-fix_utf8.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gtk2-devel - -%if 0%{?suse_version} -BuildRequires: dbus-1-glib-devel -%else -BuildRequires: dbus-glib-devel -%endif - -%description -kdbusnotification is a small program for Trinity that displays -DBUS notifications via unobtrusive, easily dismissed passive popups. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .utf8 - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/notification-daemon-tde -%{tde_datadir}/autostart/kdbusnotification-autostart.desktop - - - -%changelog diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec b/redhat/applications/kdbusnotification/kdbusnotification.spec index 25fbabe11..28fb3058d 100644 --- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec +++ b/redhat/applications/kdbusnotification/kdbusnotification.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kdbusnotification %define tde_prefix /opt/trinity @@ -59,7 +59,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -84,6 +84,15 @@ BuildRequires: dbus-1-glib-devel BuildRequires: dbus-glib-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description kdbusnotification is a small program for Trinity that displays @@ -102,38 +111,53 @@ DBUS notifications via unobtrusive, easily dismissed passive popups. %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/"*"/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}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +# Fix for Fedora 31 +if [ -r "/usr/include/harfbuzz/hb.h" ]; then + #export CMAKE_INCLUDE_PATH="/usr/include/harfbuzz" + RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/harfbuzz" +fi + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec deleted file mode 100644 index e4099e05b..000000000 --- a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec +++ /dev/null @@ -1,138 +0,0 @@ -# Default version for this component -%define tde_pkg kdiff3 -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. -Version: 0.9.91 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -Shows the differences line by line and character by character (!). -Provides an automatic merge-facility and -an integrated editor for comfortable solving of merge-conflicts. -Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.). -Unicode & UTF-8 support - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -# These are not HTML files but weird files in wrong place ?? -%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/ - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || : -done - -%postun -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/kdiff3 -%{tde_datadir}/apps/kdiff3/ -%{tde_datadir}/apps/kdiff3part/ -%{tde_datadir}/icons/hicolor/*/apps/kdiff3.png -%{tde_datadir}/icons/locolor/*/apps/kdiff3.png -%{tde_tdedocdir}/HTML/*/kdiff3/ -%{tde_datadir}/services/kdiff3_plugin.desktop -%{tde_datadir}/services/kdiff3part.desktop -%{tde_datadir}/applnk/Development/*.desktop -%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop -%{tde_mandir}/man*/* -%{tde_tdelibdir}/libkdiff3part.la -%{tde_tdelibdir}/libkdiff3part.so -%{tde_tdelibdir}/libkdiff3plugin.la -%{tde_tdelibdir}/libkdiff3plugin.so - -%changelog diff --git a/redhat/applications/kdiff3/kdiff3-14.0.0.spec b/redhat/applications/kdiff3/kdiff3.spec index 50a13a04c..964ca2151 100644 --- a/redhat/applications/kdiff3/kdiff3-14.0.0.spec +++ b/redhat/applications/kdiff3/kdiff3.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kdiff3 %define tde_prefix /opt/trinity @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -70,6 +70,15 @@ BuildRequires: libtool BuildRequires: update-desktop-files %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description Shows the differences line by line and character by character (!). @@ -91,52 +100,66 @@ Unicode & UTF-8 support %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/"*"/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}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/kdiff3.desktop" Development RevisionControl +%endif # Unwanted files # These are not HTML files but weird files in wrong place ?? %__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/ %find_lang %{tde_pkg} +%find_lang %{tde_pkg}_plugin %clean %__rm -rf %{buildroot} -%files -f %{tde_pkg}.lang +%files -f %{tde_pkg}.lang -f %{tde_pkg}_plugin.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_bindir}/kdiff3 @@ -144,10 +167,11 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/kdiff3part/ %{tde_datadir}/icons/hicolor/*/apps/kdiff3.png %{tde_datadir}/icons/locolor/*/apps/kdiff3.png +%{tde_docdir}/kdiff3/ %{tde_tdedocdir}/HTML/*/kdiff3/ %{tde_datadir}/services/kdiff3_plugin.desktop %{tde_datadir}/services/kdiff3part.desktop -%{tde_datadir}/applnk/Development/*.desktop +%{tde_tdeappdir}/kdiff3.desktop %{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop %{tde_mandir}/man*/* %{tde_tdelibdir}/libkdiff3part.la diff --git a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec b/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec deleted file mode 100644 index 7eae449e0..000000000 --- a/redhat/applications/kdirstat/kdirstat-3.5.13.2.spec +++ /dev/null @@ -1,133 +0,0 @@ -# Default version for this component -%define tde_pkg kdirstat -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: graphical disk usage display with cleanup facilities [Trinity] -Version: 2.4.4 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -KDirStat (TDE Directory Statistics) is a small utility program that sums -up disk usage for directory trees, very much like the Unix 'du' command. -It displays the disk space used up by a directory tree, both numerically -and graphically. It is network transparent (i.e., you can use it to sum -up FTP servers), and comes with predefined and user configurable cleanup -actions. You can directly open a directory branch in Konqueror or the -shell of your choice, compress it to a .tar.bz2 archive, or define your -own cleanup actions. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/kdirstat -%{tde_datadir}/applnk/Utilities/kdirstat.desktop -%{tde_datadir}/apps/kconf_update/fix_move_to_trash_bin.pl -%{tde_datadir}/apps/kconf_update/kdirstat.upd -%{tde_datadir}/apps/kdirstat/ -%{tde_tdedocdir}/HTML/en/kdirstat/ -%{tde_datadir}/icons/hicolor/*/apps/kdirstat.png -%{tde_datadir}/icons/locolor/*/apps/kdirstat.png - - -%changelog diff --git a/redhat/applications/kdirstat/kdirstat.spec b/redhat/applications/kdirstat/kdirstat.spec index bdb19ef5d..cd63cfcc3 100644 --- a/redhat/applications/kdirstat/kdirstat.spec +++ b/redhat/applications/kdirstat/kdirstat.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kdirstat %define tde_prefix /opt/trinity @@ -151,13 +151,9 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} -# Fix desktop file location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/kdirstat.desktop" "%{?buildroot}%{tde_tdeappdir}" - # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file -N "KDirStat" -G "Directory Statistics" kdirstat Filesystem +%suse_update_desktop_file -N "KDirStat" -G "Directory Statistics" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" Filesystem %endif diff --git a/redhat/applications/keep/keep-3.5.13.2.spec b/redhat/applications/keep/keep-3.5.13.2.spec deleted file mode 100644 index 7dba42000..000000000 --- a/redhat/applications/keep/keep-3.5.13.2.spec +++ /dev/null @@ -1,128 +0,0 @@ -# Default version for this component -%define tde_pkg keep -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: backup system for TDE [Trinity] -Version: 0.4.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Requires: rdiff-backup - -%description -Keep is an automatic backup program that allows users to set the parameters of -the backup, including the frequency and the number of backups. - -Homepage: http://jr.falleri.free.fr/keep - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/keep -%{tde_tdelibdir}/kded_keep.la -%{tde_tdelibdir}/kded_keep.so -%{tde_tdeappdir}/keep.desktop -%{tde_datadir}/icons/hicolor/scalable/apps/keep.svgz -%{tde_datadir}/apps/keep/ -%{tde_datadir}/config.kcfg/keepsettings.kcfg -%{tde_datadir}/icons/hicolor/*/apps/keep.png -%{tde_datadir}/services/kded/keep.desktop - - -%changelog diff --git a/redhat/applications/keep/keep-14.0.0.spec b/redhat/applications/keep/keep.spec index 56557f0e5..93e9627ee 100644 --- a/redhat/applications/keep/keep-14.0.0.spec +++ b/redhat/applications/keep/keep.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg keep %define tde_prefix /opt/trinity @@ -62,7 +62,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -77,6 +77,15 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + Requires: rdiff-backup @@ -99,39 +108,47 @@ Homepage: http://jr.falleri.free.fr/keep %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/"*"/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}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -156,6 +173,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/config.kcfg/keepsettings.kcfg %{tde_datadir}/icons/hicolor/*/apps/keep.png %{tde_datadir}/services/kded/keep.desktop +%{tde_mandir}/man1/keep.* %changelog diff --git a/redhat/applications/kerberostray/kerberostray-14.0.0.spec b/redhat/applications/kerberostray/kerberostray.spec index de55e48e7..4bd5a4c85 100644 --- a/redhat/applications/kerberostray/kerberostray-14.0.0.spec +++ b/redhat/applications/kerberostray/kerberostray.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kerberostray %define tde_prefix /opt/trinity @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: trinity-libtdeldap-devel >= 0.5 -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -88,13 +88,16 @@ BuildRequires: openldap2-devel BuildRequires: openldap24-libs-devel %endif +# KRB5 support +#BuildRequires: krb5-devel + # HEIMDAL support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: heimdal-devel -%endif -%if 0%{?suse_version} -BuildRequires: libheimdal-devel -%endif +#%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +#BuildRequires: heimdal-devel +#%endif +#%if 0%{?suse_version} +#BuildRequires: libheimdal-devel +#%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -110,6 +113,15 @@ BuildRequires: libcom_err-devel BuildRequires: %{_lib}ext2fs-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description Kerberos ticket manager which sits in the system tray and allows viewing/control of Kerberos tickets @@ -125,55 +137,49 @@ Kerberos ticket manager which sits in the system tray and allows viewing/control %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/"*"/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 PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -extra_includes="%{_includedir}" -extra_libs="%{_libdir}" - -if [ -d "%{_includedir}/openldap24" ]; then - extra_includes="%{_includedir}/openldap24:${extra_includes}" - extra_libs="%{_libdir}/openldap24:${extra_libs}" -fi - -if [ -d "%{_includedir}/heimdal" ]; then - extra_includes="%{_includedir}/heimdal:${extra_includes}" - extra_libs="%{_libdir}/heimdal:${extra_libs}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ \ - --with-extra-includes=${extra_includes} \ - --with-extra-libs=${extra_libs} \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +%find_lang %{tde_pkg} # Apps that should stay in TDE echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" @@ -183,7 +189,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %{tde_bindir}/kerberostray %{tde_tdeappdir}/kerberostray.desktop %{tde_datadir}/apps/kerberostray/ diff --git a/redhat/applications/keximdb/keximdb.spec b/redhat/applications/keximdb/keximdb.spec index 6627c48ec..cfdef0f13 100644 --- a/redhat/applications/keximdb/keximdb.spec +++ b/redhat/applications/keximdb/keximdb.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg keximdb %define tde_prefix /opt/trinity @@ -61,12 +61,22 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils +BuildRequires: trinity-koffice-devel +BuildRequires: trinity-koffice-kexi + BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool -BuildRequires: trinity-koffice-devel +# IDN support +BuildRequires: libidn-devel + +# ACL support +BuildRequires: libacl-devel + +# OPENSSL support +BuildRequires: openssl-devel # SUSE desktop files utility %if 0%{?suse_version} diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch b/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch deleted file mode 100644 index f8e019e63..000000000 --- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/kftpgrabber/src/engine/ftpdirectoryparser.cpp b/kftpgrabber/src/engine/ftpdirectoryparser.cpp -index 981d0b6..71e2cd2 100644 ---- a/kftpgrabber/src/engine/ftpdirectoryparser.cpp -+++ b/kftpgrabber/src/engine/ftpdirectoryparser.cpp -@@ -421,6 +421,8 @@ bool FtpDirectoryParser::parseUnixPermissions(const TQString &permissions, Direc - if (permissions[9] == 't' || permissions[9] == 'T') p |= S_ISVTX; - - entry.setPermissions(p); -+ -+ return(p); - } - - bool FtpDirectoryParser::parseLine(const TQString &line, DirectoryEntry &entry) -diff --git a/kftpgrabber/src/misc/desencryptor.cpp b/kftpgrabber/src/misc/desencryptor.cpp -index 126fad7..fac681f 100644 ---- a/kftpgrabber/src/misc/desencryptor.cpp -+++ b/kftpgrabber/src/misc/desencryptor.cpp -@@ -65,8 +65,8 @@ void DESEncryptor::DESExec(const TQString &str, int mode) - char *o_message = (char*) malloc(8); - char *o_output = (char*) malloc(8); - -- memset(o_message, 0, 9); -- memset(o_output, 0, 9); -+ memset(o_message, 0, sizeof o_message); -+ memset(o_output, 0, sizeof o_output); - //out.resize(in.size() * 2); - - while (i < in.size()) { -@@ -79,8 +79,8 @@ void DESEncryptor::DESExec(const TQString &str, int mode) - i += 8; - - // Clear everything -- memset(o_message, 0, 9); -- memset(o_output, 0, 9); -+ memset(o_message, 0, sizeof o_message); -+ memset(o_output, 0, sizeof o_output); - } - - free(o_message); diff --git a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec b/redhat/applications/kftpgrabber/kftpgrabber.spec index 75cb03836..07c03d26e 100644 --- a/redhat/applications/kftpgrabber/kftpgrabber-14.0.0.spec +++ b/redhat/applications/kftpgrabber/kftpgrabber.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kftpgrabber %define tde_prefix /opt/trinity @@ -55,7 +55,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} @@ -124,7 +123,6 @@ Requires: %{name} = %{version}-%{release} %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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec b/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec deleted file mode 100644 index 6bde2ebd1..000000000 --- a/redhat/applications/kgtk-qt3/kgtk-qt3-3.5.13.2.spec +++ /dev/null @@ -1,126 +0,0 @@ -# Default version for this component -%define tde_pkg kgtk-qt3 -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Use TDE dialogs in Gtk apps -Version: 0.10.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -This is an LD_PRELOAD hack that allows most GTK -applications to use Trinity's file dialogs when run under Trinity. - -The Gtk file chooser functions have been overridden to communicate -with this TDE module/application. - -This package includes the kqt3-wrapper - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DBUILD_ALL=ON \ - .. - -# SMP safe ! -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -# The "preload" file is used by "startkde" script -%__install -d -m 755 "%{buildroot}%{tde_datadir}/kgtk" -echo "%{tde_libdir}/kgtk/libkgtk2.so" >"%{buildroot}%{tde_datadir}/kgtk/preload" - -%find_lang kgtk - - - -%clean -%__rm -rf %{buildroot} - - -%files -f kgtk.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO -%{tde_bindir}/kdialogd-wrapper -%{tde_bindir}/kdialogd3 -%{tde_bindir}/kgtk-wrapper -%{tde_bindir}/kgtk2-wrapper -%{tde_bindir}/kqt3-wrapper -%{tde_libdir}/kgtk/libkgtk2.so -%{tde_libdir}/kgtk/libkqt3.so -%{tde_datadir}/kgtk/preload - -%changelog diff --git a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec b/redhat/applications/kgtk-qt3/kgtk-qt3.spec index c78610f1c..0f5e282f7 100644 --- a/redhat/applications/kgtk-qt3/kgtk-qt3-14.0.0.spec +++ b/redhat/applications/kgtk-qt3/kgtk-qt3.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kgtk-qt3 %define tde_prefix /opt/trinity diff --git a/redhat/applications/kile/kile-3.5.13.2.spec b/redhat/applications/kile/kile-3.5.13.2.spec deleted file mode 100644 index 9967337e3..000000000 --- a/redhat/applications/kile/kile-3.5.13.2.spec +++ /dev/null @@ -1,194 +0,0 @@ -# Default version for this component -%define tde_pkg kile -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: TDE Integrated LaTeX Environment [Trinity] -Version: 2.0.2 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Publishing - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Obsoletes: %{name}-i18n-ar -Obsoletes: %{name}-i18n-bg -Obsoletes: %{name}-i18n-br -Obsoletes: %{name}-i18n-ca -Obsoletes: %{name}-i18n-cs -Obsoletes: %{name}-i18n-cy -Obsoletes: %{name}-i18n-da -Obsoletes: %{name}-i18n-de -Obsoletes: %{name}-i18n-el -Obsoletes: %{name}-i18n-engb -Obsoletes: %{name}-i18n-es -Obsoletes: %{name}-i18n-et -Obsoletes: %{name}-i18n-eu -Obsoletes: %{name}-i18n-fi -Obsoletes: %{name}-i18n-fr -Obsoletes: %{name}-i18n-ga -Obsoletes: %{name}-i18n-gl -Obsoletes: %{name}-i18n-hi -Obsoletes: %{name}-i18n-hu -Obsoletes: %{name}-i18n-is -Obsoletes: %{name}-i18n-it -Obsoletes: %{name}-i18n-ja -Obsoletes: %{name}-i18n-lt -Obsoletes: %{name}-i18n-ms -Obsoletes: %{name}-i18n-mt -Obsoletes: %{name}-i18n-nb -Obsoletes: %{name}-i18n-nds -Obsoletes: %{name}-i18n-nl -Obsoletes: %{name}-i18n-nn -Obsoletes: %{name}-i18n-pa -Obsoletes: %{name}-i18n-pl -Obsoletes: %{name}-i18n-pt -Obsoletes: %{name}-i18n-ptbr -Obsoletes: %{name}-i18n-ro -Obsoletes: %{name}-i18n-ru -Obsoletes: %{name}-i18n-rw -Obsoletes: %{name}-i18n-sk -Obsoletes: %{name}-i18n-sr -Obsoletes: %{name}-i18n-srlatin -Obsoletes: %{name}-i18n-sv -Obsoletes: %{name}-i18n-ta -Obsoletes: %{name}-i18n-th -Obsoletes: %{name}-i18n-tr -Obsoletes: %{name}-i18n-uk -Obsoletes: %{name}-i18n-zhcn - - -%description -Kile is a user-friendly LaTeX source editor and TeX shell for TDE. - -The source editor is a multi-document editor designed for .tex and .bib -files. Menus, wizards and auto-completion are provided to assist with -tag insertion and code generation. A structural view of the document -assists with navigation within source files. - -The TeX shell integrates the various tools required for TeX processing. -It assists with LaTeX compilation, DVI and postscript document viewing, -generation of bibliographies and indices and other common tasks. - -Kile can support large projects consisting of several smaller files. - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__chmod +x %{buildroot}%{tde_datadir}/apps/kile/test/runTests.sh - -# Unwanted files ... -%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/bibtex.xml -%__rm -f %{?buildroot}%{tde_datadir}/apps/katepart/syntax/latex.xml - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/kile -%{tde_tdeappdir}/kile.desktop -%{tde_datadir}/apps/kconf_update -%{tde_datadir}/apps/kile -%{tde_datadir}/config.kcfg/kile.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kile.png -%{tde_datadir}/icons/hicolor/scalable/apps/kile.svgz -%{tde_tdedocdir}/HTML/en/kile -%{tde_datadir}/mimelnk/text/x-kilepr.desktop - -%lang(da) %{tde_tdedocdir}/HTML/da/kile/ -%lang(es) %{tde_tdedocdir}/HTML/es/kile/ -%lang(et) %{tde_tdedocdir}/HTML/et/kile/ -%lang(it) %{tde_tdedocdir}/HTML/it/kile/ -%lang(nl) %{tde_tdedocdir}/HTML/nl/kile/ -%lang(pt) %{tde_tdedocdir}/HTML/pt/kile/ -%lang(sv) %{tde_tdedocdir}/HTML/sv/kile/ - - - -%changelog diff --git a/redhat/applications/kile/kile-14.0.0.spec b/redhat/applications/kile/kile.spec index 33bc88722..75d27dd5c 100644 --- a/redhat/applications/kile/kile-14.0.0.spec +++ b/redhat/applications/kile/kile.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kile %define tde_prefix /opt/trinity diff --git a/redhat/applications/kima/kima-3.5.13.2.spec b/redhat/applications/kima/kima-3.5.13.2.spec deleted file mode 100644 index aad28627b..000000000 --- a/redhat/applications/kima/kima-3.5.13.2.spec +++ /dev/null @@ -1,121 +0,0 @@ -# Default version for this component -%define tde_pkg kima -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: kicker monitoring applet [Trinity] -Version: 0.7.3.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.elliptique.net/~ken/kima/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -# HAL support -# On RHEL4, we do not use HAL (too old) -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} -%define with_hal 1 -BuildRequires: hal-devel >= 0.4.8 -%endif - - -%description -This applet monitors various temperature, -frequency and fan sources in your kicker -panel. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%find_lang %{tde_pkg} - - - -%clean -%__rm -rf %{buildroot} - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_tdelibdir}/libkima.la -%{tde_tdelibdir}/libkima.so -%{tde_datadir}/apps/kicker/applets/kima.desktop -%{tde_tdedocdir}/HTML/en/kima/ - - -%changelog diff --git a/redhat/applications/kima/kima-14.0.0.spec b/redhat/applications/kima/kima.spec index 8cbd7bce1..99765d364 100644 --- a/redhat/applications/kima/kima-14.0.0.spec +++ b/redhat/applications/kima/kima.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kima %define tde_prefix /opt/trinity @@ -63,7 +63,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -83,6 +83,12 @@ BuildRequires: brp-check-trinity BuildRequires: libudev-devel %endif +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description This applet monitors various temperature, @@ -102,40 +108,48 @@ panel. %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/"*"/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}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + -DWITH_NVCONTROL=OFF \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + .. -# SMP safe ! -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -148,7 +162,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING README TODO %{tde_tdelibdir}/libkima.la %{tde_tdelibdir}/libkima.so %{tde_datadir}/apps/kicker/applets/kima.desktop diff --git a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec b/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec deleted file mode 100644 index 68c088ba5..000000000 --- a/redhat/applications/kiosktool/kiosktool-3.5.13.2.spec +++ /dev/null @@ -1,125 +0,0 @@ -# Default version for this component -%define tde_pkg kiosktool -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Version: 1.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} -Summary: tool to configure the TDE kiosk framework - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -A Point&Click tool for system administrators to enable -TDE's KIOSK features or otherwise preconfigure TDE for -groups of users. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||: -update-desktop-database >& /dev/null ||: - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/crystalsvg 2> /dev/null ||: -update-desktop-database >& /dev/null ||: - - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc ChangeLog COPYING README TODO -%{tde_bindir}/kiosktool -%{tde_bindir}/kiosktool-kdedirs -%{tde_tdeappdir}/kiosktool.desktop -%{tde_datadir}/apps/kiosktool/*.png -%{tde_tdedocdir}/HTML/en/kiosktool/ -%{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png -%{tde_datadir}/apps/kiosktool/kiosk_data.xml -%{tde_datadir}/apps/kiosktool/kiosktoolui.rc - -%changelog diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/kiosktool/kiosktool.spec index 3112132a4..083103000 100644 --- a/redhat/applications/kiosktool/kiosktool.spec +++ b/redhat/applications/kiosktool/kiosktool.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kiosktool %define tde_prefix /opt/trinity @@ -157,7 +157,7 @@ EOF # Updates applications categories for openSUSE echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %if 0%{?suse_version} -%suse_update_desktop_file %{tde_pkg} System SystemSetup +%suse_update_desktop_file "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System SystemSetup %endif @@ -179,7 +179,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %lang(pt) %{tde_tdedocdir}/HTML/pt/kiosktool/ %lang(sv) %{tde_tdedocdir}/HTML/sv/kiosktool/ %{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png -%{tde_confdir}/kiosktoolrc +%config(noreplace) %{tde_confdir}/kiosktoolrc %{tde_mandir}/man1/*.1* diff --git a/redhat/applications/kkbswitch/kkbswitch.spec b/redhat/applications/kkbswitch/kkbswitch.spec index b4ef8ddb4..d83aa58af 100644 --- a/redhat/applications/kkbswitch/kkbswitch.spec +++ b/redhat/applications/kkbswitch/kkbswitch.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kkbswitch %define tde_prefix /opt/trinity @@ -156,12 +156,15 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} # Fix desktop icon location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" +if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then + %__mkdir_p "%{?buildroot}%{tde_tdeappdir}" + %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" + %__rm -r "%{buildroot}%{tde_datadir}/applnk" +fi # Updates applications categories for openSUSE %if 0%{?suse_version} -%suse_update_desktop_file -r %{tde_pkg} System TrayIcon +%suse_update_desktop_file -r "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" System TrayIcon %endif diff --git a/redhat/applications/klcddimmer/klcddimmer.spec b/redhat/applications/klcddimmer/klcddimmer.spec index b50b36d10..73dd98e28 100644 --- a/redhat/applications/klcddimmer/klcddimmer.spec +++ b/redhat/applications/klcddimmer/klcddimmer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg klcddimmer %define tde_prefix /opt/trinity @@ -138,16 +138,18 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} || touch %{tde_pkg}.lang + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING LICENSE NEWS README -%{tde_libdir}/libklcddimmer_panelapplet.la -%{tde_libdir}/libklcddimmer_panelapplet.so +%{tde_libdir}/klcddimmer_panelapplet.la +%{tde_libdir}/klcddimmer_panelapplet.so %{tde_datadir}/apps/kicker/applets/klcddimmer.desktop %{tde_tdedocdir}/HTML/en/klcddimmer/ %{tde_datadir}/icons/hicolor/*/apps/klcddimmer.png diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec deleted file mode 100644 index ef8bb091c..000000000 --- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec +++ /dev/null @@ -1,275 +0,0 @@ -# Default version for this component -%define tde_pkg kmplayer -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: media player for Trinity -Version: 0.10.0c -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://kmplayer.kde.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -# DBUS support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -BuildRequires: trinity-dbus-tqt-devel >= %{tde_version} -%endif - -# GSTREAMER support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: libgstreamer0.10-devel -%else -BuildRequires: %{_lib}gstreamer0.10-devel -%endif -BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: gstreamer-devel -#BuildRequires: gstreamer-plugins-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: gstreamer-devel -BuildRequires: gstreamer-plugins-base-devel -%endif -%if 0%{?suse_version} -BuildRequires: gstreamer-0_10-devel -BuildRequires: gstreamer-0_10-plugins-base-devel -%endif - -# XINE support -%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: %{_lib}xine-devel -%else -BuildRequires: %{_lib}xine1.2-devel -%endif -%endif -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: xine-lib-devel -%endif -%if 0%{?suse_version} -BuildRequires: libxine-devel -%endif -%endif - -# X11 stuff -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libxt-devel -BuildRequires: libxv-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210 -BuildRequires: libXv-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?suse_version} == 1140 -BuildRequires: xorg-x11-libXv-devel -%endif - -# GTK2 stuff -BuildRequires: gtk2-devel - -# DBUS stuff -%if 0%{?suse_version} -BuildRequires: dbus-1-glib-devel -%else -BuildRequires: dbus-glib-devel -%endif - -Requires: %{name}-base = %{version}-%{release} - -%description -A basic audio/video viewer application for Trinity. - -KMPlayer can: -* play DVD (DVDNav only with the Xine player) -* play VCD -* let the backend players play from a pipe (read from stdin) -* play from a TV device (experimental) -* show backend player's console output -* launch ffserver (only 0.4.8 works) when viewing from a v4l device -* DCOP KMediaPlayer interface support -* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard TDE - shortcut configure window -* Lots of configurable shortcuts. Highly recommended for the VDR keys - (if you have VDR) and volume increase/decrease - - -%package base -Group: Applications/Multimedia -Summary: Base files for KMPlayer [Trinity] - -%description base -Core files needed for KMPlayer. - - -%package konq-plugins -Group: Applications/Multimedia -Requires: %{name}-base = %{version}-%{release} -Requires: trinity-tdebase >= %{tde_version} -Summary: KMPlayer plugin for KHTML/Konqueror [Trinity] - -%description konq-plugins -This plugin enables audio/video playback inside konqueror, using Xine (with -*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web -tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin -browser plugins. - - -%package doc -Group: Applications/Multimedia -Requires: %{name} = %{version}-%{release} -Summary: Handbook for KMPlayer [Trinity] - -%description doc -Documention for KMPlayer, a basic audio/video viewer application for TDE. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -# Removes unwanted files -%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop - - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -%post base -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : - -%postun base -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm -%{tde_bindir}/kmplayer -%{tde_bindir}/knpplayer -%{tde_bindir}/kxvplayer -%{tde_libdir}/libkdeinit_kmplayer.la -%{tde_libdir}/libkdeinit_kmplayer.so -%{tde_tdelibdir}/kmplayer.la -%{tde_tdelibdir}/kmplayer.so -%{tde_tdeappdir}/kmplayer.desktop -%{tde_datadir}/apps/kmplayer -%{tde_datadir}/services/kmplayer_part.desktop - -%files base -%defattr(-,root,root,-) -%{tde_libdir}/libkmplayercommon.la -%{tde_libdir}/libkmplayercommon.so -%{tde_bindir}/kgstplayer -%{tde_bindir}/kxineplayer -%{tde_datadir}/config/kmplayerrc -%{tde_datadir}/apps/kmplayer/bookmarks.xml -%{tde_datadir}/apps/kmplayer/noise.gif -%{tde_datadir}/apps/kmplayer/pluginsinfo -%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png -%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz -%{tde_datadir}/mimelnk/application/x-kmplayer.desktop -%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop - -%files doc -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/*/kmplayer - -%files konq-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/libkmplayerpart.la -%{tde_tdelibdir}/libkmplayerpart.so -%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc -%{tde_datadir}/apps/kmplayer/pluginsinfo -%{tde_datadir}/services/kmplayer_part.desktop - - -%changelog diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer.spec index f68698644..2dd05dd51 100644 --- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec +++ b/redhat/applications/kmplayer/kmplayer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kmplayer %define tde_prefix /opt/trinity @@ -101,9 +101,9 @@ BuildRequires: gstreamer1-plugins-base-devel >= 1.0 %endif # XINE support -%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: %{_lib}xine1.2-devel %endif %if 0%{?fedora} || 0%{?rhel} @@ -160,7 +160,7 @@ KMPlayer can: %files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm +%doc AUTHORS COPYING ChangeLog INSTALL README TODO %{tde_bindir}/kmplayer %{tde_bindir}/knpplayer %{tde_bindir}/kxvplayer @@ -190,7 +190,7 @@ Core files needed for KMPlayer. %{tde_libdir}/libkmplayercommon.so %{tde_bindir}/kgstplayer %{tde_bindir}/kxineplayer -%{tde_confdir}/kmplayerrc +%config(noreplace) %{tde_confdir}/kmplayerrc %{tde_datadir}/apps/kmplayer/bookmarks.xml %{tde_datadir}/apps/kmplayer/noise.gif %{tde_datadir}/icons/hicolor/*/apps/kmplayer.png diff --git a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec b/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec deleted file mode 100644 index ffea0e925..000000000 --- a/redhat/applications/kmyfirewall/kmyfirewall-3.5.13.2.spec +++ /dev/null @@ -1,193 +0,0 @@ -# Default version for this component -%define tde_pkg kmyfirewall -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: iptables based firewall configuration tool for TDE [Trinity] -Version: 1.1.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -KMyFirewall attempts to make it easier to setup iptables based firewalls on -Linux systems. It will be the right tool if you like to have a so called -"Personal Firewall" running on your Linux box, but don't have the time and/or -the interest to spend hours in front of the iptables manual just to setup a -Firewall that keeps the "bad" people out. - -There is also the possibility to save entire rule sets, so you only have to -configure your rule set one time and then you can use it on several computers -giving each of them a similar configuration (p.e. school networks, office, -university etc.) - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -%{summary} - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO -%{tde_bindir}/kmyfirewall -%{tde_libdir}/libkmfcore.so.* -%{tde_libdir}/libkmfwidgets.so.* -%{tde_tdelibdir}/libkmfcompiler_ipt.la -%{tde_tdelibdir}/libkmfcompiler_ipt.so -%{tde_tdelibdir}/libkmfgenericinterfacepart.la -%{tde_tdelibdir}/libkmfgenericinterfacepart.so -%{tde_tdelibdir}/libkmfinstaller_linux.la -%{tde_tdelibdir}/libkmfinstaller_linux.so -%{tde_tdelibdir}/libkmfinstallerplugin.la -%{tde_tdelibdir}/libkmfinstallerplugin.so -%{tde_tdelibdir}/libkmfipteditorpart.la -%{tde_tdelibdir}/libkmfipteditorpart.so -%{tde_tdelibdir}/libkmfruleoptionedit_custom.la -%{tde_tdelibdir}/libkmfruleoptionedit_custom.so -%{tde_tdelibdir}/libkmfruleoptionedit_interface.la -%{tde_tdelibdir}/libkmfruleoptionedit_interface.so -%{tde_tdelibdir}/libkmfruleoptionedit_ip.la -%{tde_tdelibdir}/libkmfruleoptionedit_ip.so -%{tde_tdelibdir}/libkmfruleoptionedit_limit.la -%{tde_tdelibdir}/libkmfruleoptionedit_limit.so -%{tde_tdelibdir}/libkmfruleoptionedit_mac.la -%{tde_tdelibdir}/libkmfruleoptionedit_mac.so -%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la -%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so -%{tde_tdelibdir}/libkmfruleoptionedit_state.la -%{tde_tdelibdir}/libkmfruleoptionedit_state.so -%{tde_tdelibdir}/libkmfruleoptionedit_tos.la -%{tde_tdelibdir}/libkmfruleoptionedit_tos.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so -%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la -%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so -%{tde_tdeappdir}/kmyfirewall.desktop -%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc -%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc -%{tde_datadir}/apps/kmfsystray -%{tde_datadir}/apps/kmyfirewall -%{tde_datadir}/config.kcfg/kmfconfig.kcfg -%{tde_datadir}/config/kmyfirewallrc -%{tde_tdedocdir}/HTML/en/kmyfirewall/ -%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png -%{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png -%{tde_datadir}/mimelnk/application/kmfgrs.desktop -%{tde_datadir}/mimelnk/application/kmfnet.desktop -%{tde_datadir}/mimelnk/application/kmfpkg.desktop -%{tde_datadir}/mimelnk/application/kmfrs.desktop -%{tde_datadir}/services/kmf*.desktop -%{tde_datadir}/servicetypes/kmf*.desktop - -%files devel -%{tde_tdeincludedir}/kmyfirewall -%{tde_libdir}/libkmfcore.la -%{tde_libdir}/libkmfcore.so -%{tde_libdir}/libkmfwidgets.la -%{tde_libdir}/libkmfwidgets.so - -%changelog diff --git a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec b/redhat/applications/kmyfirewall/kmyfirewall.spec index a24777758..7998140e5 100644 --- a/redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec +++ b/redhat/applications/kmyfirewall/kmyfirewall.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kmyfirewall %define tde_prefix /opt/trinity @@ -136,7 +136,7 @@ university etc.) %{tde_datadir}/apps/kmfsystray/ %{tde_datadir}/apps/kmyfirewall/ %{tde_datadir}/config.kcfg/kmfconfig.kcfg -%{tde_confdir}/kmyfirewallrc +%config(noreplace) %{tde_confdir}/kmyfirewallrc %{tde_tdedocdir}/HTML/en/kmyfirewall/ %{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png %{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec deleted file mode 100644 index ce17fff0b..000000000 --- a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec +++ /dev/null @@ -1,268 +0,0 @@ -# Default version for this component -%define tde_pkg kmymoney -%define tde_version 3.5.13.2 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -%if 0%{?mgaversion} || 0%{?mdkversion} -%define qt3pluginsdir %{_libdir}/qt3/plugins -%endif -%if 0%{?rhel} || 0%{?fedora} -%define qt3pluginsdir %{_libdir}/qt-3.3/plugins -%endif -%if 0%{?suse_version} -%define qt3pluginsdir /usr/lib/qt3/plugins -%endif - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: personal finance manager for TDE - -Version: 1.0.5 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: kmymoneytitlelabel.png - -# [kmymoney] Fix FTBFS -Patch1: kmymoney-3.5.13.2-ftbfs.patch - -# [admin] Fix automake 1.13 build issue -Patch2: admin-fix-parallel-test.diff - -# [kmymoney] Missing LDFLAGS causing FTBFS -Patch4: kmymoney-3.5.13-missing_ldflags.patch - -# [kmymoney] Fix QT3 plugins directory location -Patch5: kmymoney-3.5.13-fix_qt3_plugins_location.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: recode -BuildRequires: libofx-devel - -# OPENSP support -%if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion} -%if 0%{?mgaversion} || 0%{?pclinuxos} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}osp-devel -%else -BuildRequires: %{_lib}OpenSP5-devel -%endif -%else -BuildRequires: opensp-devel -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -BuildRequires: opensp-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: openjade-devel -%endif - -Requires: %{name}-common == %{version}-%{release} - -%description -KMyMoney is the Personal Finance Manager for TDE. It operates similar to -MS-Money and Quicken, supports different account types, categorisation of -expenses, QIF import/export, multiple currencies and initial online banking -support. - - -%package common -Summary: KMyMoney architecture independent files -Group: Applications/Utilities -Requires: %{name} == %{version} - -%description common -This package contains architecture independent files needed for KMyMoney to -run properly. It also provides KMyMoney documentation. Therefore, unless you -have '%{name}' package installed, you will hardly find this package useful. - - -%package devel -Summary: KMyMoney development files -Group: Development/Libraries -Requires: %{name} == %{version} - -%description devel -This package contains development files needed for KMyMoney plugins. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .ftbfs -%patch2 -p1 -b .automake113 -%if 0%{?mgaversion} || 0%{?mdkversion} -%patch5 -p1 -b .qtpluginsdir -%endif - -%__install -m644 %{SOURCE1} kmymoney2/widgets/ - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -export KDEDIR="%{tde_prefix}" - -# Required to find the QT3 plugins directory -%if 0%{?mgaversion} || 0%{?mdkversion} -export QTPLUGINS="%{_libdir}/qt3/plugins" -%endif - -# Fix strange FTBFS on RHEL4 -%if 0%{?rhel} == 4 -grep -v "^#~" po/it.po >/tmp/it.po && mv -f /tmp/it.po po/it.po -%endif - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - \ - --disable-pdf-docs \ - --enable-ofxplugin \ - --enable-ofxbanking \ - --enable-qtdesigner \ - --enable-sqlite3 - -# Fix FTBFS inside sqlite3 archive -patch -p1 < %{PATCH4} - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} - -# Required to find the QT3 plugins directory -%if 0%{?mgaversion} || 0%{?mdkversion} -export QTPLUGINS=%{_libdir}/qt3/plugins -%endif - -%__make install DESTDIR=%{buildroot} - -%find_lang kmymoney2 - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -for f in hicolor locolor Tango oxygen; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -for f in hicolor locolor Tango oxygen; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kmymoney -%{tde_bindir}/kmymoney2 -%{tde_tdeappdir}/kmymoney2.desktop -%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop -%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop -%{tde_datadir}/servicetypes/kmymoneyplugin.desktop -%{tde_libdir}/*.so.* -%{tde_tdelibdir}/kmm_ofximport.la -%{tde_tdelibdir}/kmm_ofximport.so - -%files common -f kmymoney2.lang -%defattr(-,root,root,-) -%{tde_datadir}/apps/kmymoney2/html/ -%{tde_datadir}/apps/kmymoney2/icons/*/*/*/*.png -%{tde_datadir}/apps/kmymoney2/kmymoney2ui.rc -%{tde_datadir}/apps/kmymoney2/misc/financequote.pl -%{tde_datadir}/apps/kmymoney2/pics/*.png -%{tde_datadir}/apps/kmymoney2/templates/*/*.kmt -%{tde_datadir}/apps/kmymoney2/tips -%{tde_datadir}/config.kcfg/kmymoney2.kcfg -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/Tango/*/*/*.png -%{tde_datadir}/icons/Tango/scalable/*.svgz -%{tde_datadir}/icons/locolor/*/*/*.png -%{tde_datadir}/icons/oxygen/*/*/*.png -%{tde_datadir}/icons/oxygen/scalable/*.svgz -%{tde_tdedocdir}/HTML/en/kmymoney2/ -%{tde_mandir}/man1/kmymoney2.* -%{tde_datadir}/apps/kmm_ofximport/kmm_ofximport.rc -%{tde_datadir}/services/kmm_ofximport.desktop - - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kmymoney/*.h -%{tde_libdir}/libkmm_kdchart.la -%{tde_libdir}/libkmm_mymoney.la -%{tde_libdir}/libkmm_plugin.la -%{tde_libdir}/*.so -%{qt3pluginsdir}/sqldrivers/libsqlite3*.so -%{qt3pluginsdir}/designer/libkmymoney.so - -%changelog diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney.spec index 7ad17a36b..bbe79ffb4 100644 --- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec +++ b/redhat/applications/kmymoney/kmymoney.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} >= 23 +%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8 %define _configure_libtool_hardening_hack 0 %endif @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kmymoney %define tde_prefix /opt/trinity @@ -181,7 +181,7 @@ This package contains development files needed for KMyMoney plugins. %{tde_libdir}/libkmm_mymoney.la %{tde_libdir}/libkmm_plugin.la %{tde_libdir}/*.so -%{_libdir}/tqt3/plugins/designer/libkmymoney.so +#{_libdir}/tqt3/plugins/designer/libkmymoney.so ########## @@ -207,7 +207,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -%if 0%{?fedora} >= 29 +%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 LDFLAGS="-Wl,--allow-shlib-undefined" %endif diff --git a/redhat/applications/knemo/knemo-3.5.13.2.spec b/redhat/applications/knemo/knemo-3.5.13.2.spec deleted file mode 100644 index efdd7ccfc..000000000 --- a/redhat/applications/knemo/knemo-3.5.13.2.spec +++ /dev/null @@ -1,136 +0,0 @@ -# Default version for this component -%define tde_pkg knemo -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: network interfaces monitor for the Trinity systray -Version: 0.4.8 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://beta.smileaf.org/projects - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -%if 0%{?fedora} >= 18 -BuildRequires: net-tools -%endif - - -%description -KNemo displays an icon in the systray for every network interface. -Tooltips and an info dialog provide further information about the -interface. Passive popups inform about interface changes. -A traffic plotter is also integrated. - -knemo polls the network interface status every second using the -ifconfig, route and iwconfig tools. - -Homepage: http://extragear.kde.org/apps/knemo/ - - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : - - -%files -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcm_knemo.la -%{tde_tdelibdir}/kcm_knemo.so -%{tde_tdelibdir}/kded_knemod.la -%{tde_tdelibdir}/kded_knemod.so -%{tde_tdeappdir}/kcm_knemo.desktop -%{tde_datadir}/apps/knemo/eventsrc -%{tde_datadir}/icons/crystalsvg/*/*/*.png -%{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo -%{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo -%{tde_datadir}/services/kded/knemod.desktop - - -%changelog diff --git a/redhat/applications/knemo/knemo-14.0.0.spec b/redhat/applications/knemo/knemo.spec index 8ccd55fda..793129a92 100644 --- a/redhat/applications/knemo/knemo-14.0.0.spec +++ b/redhat/applications/knemo/knemo.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knemo %define tde_prefix /opt/trinity @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -88,6 +88,29 @@ BuildRequires: net-tools-deprecated Requires: net-tools-deprecated %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + +# Wireless support +%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 +BuildRequires: wireless-tools-devel +%endif +%if 0%{?mgaversion} == 2 || 0%{?mdkversion} +BuildRequires: %{_lib}iw29-devel +%endif +%if 0%{?rhel} == 5 || 0%{?suse_version} +BuildRequires: wireless-tools +%endif +%if 0%{?suse_version} || 0%{?mgaversion} >= 3 +BuildRequires: libiw-devel +%endif + %description KNemo displays an icon in the systray for every network interface. @@ -111,40 +134,45 @@ Homepage: http://extragear.kde.org/apps/knemo/ %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" - - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %clean diff --git a/redhat/applications/knetload/knetload-3.5.13.2.spec b/redhat/applications/knetload/knetload-3.5.13.2.spec deleted file mode 100644 index f61799be5..000000000 --- a/redhat/applications/knetload/knetload-3.5.13.2.spec +++ /dev/null @@ -1,132 +0,0 @@ -# Default version for this component -%define tde_pkg knetload -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: a network meter for Kicker [Trinity] -Version: 2.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -KNetLoad is a small network meter for Kicker (the TDE panel). It shows -a recent history of network usage in the form of two configurable -diagrams in the system tray, one for incoming and one for outgoing -data. These diagrams have settings for colours and various different -styles. - -KNetLoad can monitor just about any network device. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -update-desktop-database %{tde_appdir} > /dev/null -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/knetload -%{tde_tdeappdir}/knetload.desktop -%{tde_datadir}/apps/knetload -%{tde_datadir}/icons/crystalsvg/*/apps/knetload.png -%{tde_datadir}/icons/locolor/*/apps/knetload.png - - -%changelog diff --git a/redhat/applications/knetload/knetload.spec b/redhat/applications/knetload/knetload.spec index 13e71be7f..b4830fbf0 100644 --- a/redhat/applications/knetload/knetload.spec +++ b/redhat/applications/knetload/knetload.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knetload %define tde_prefix /opt/trinity diff --git a/redhat/applications/knetstats/knetstats-3.5.13.2.spec b/redhat/applications/knetstats/knetstats-3.5.13.2.spec deleted file mode 100644 index d38b4db5c..000000000 --- a/redhat/applications/knetstats/knetstats-3.5.13.2.spec +++ /dev/null @@ -1,123 +0,0 @@ -# Default version for this component -%define tde_pkg knetstats -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: network interfaces monitor for the Trinity systray -Version: 1.6.1 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -A simple TDE network monitor that show rx/tx LEDs of any -network interface on a system tray icon - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/knetstats -%{tde_tdeappdir}/knetstats.desktop -%{tde_datadir}/apps/knetstats -%{tde_tdedocdir}/HTML/en/knetstats/ -%{tde_datadir}/icons/hicolor/*/apps/knetstats.png - - -%changelog diff --git a/redhat/applications/knetstats/knetstats.spec b/redhat/applications/knetstats/knetstats.spec index d519f2224..d94faebc6 100644 --- a/redhat/applications/knetstats/knetstats.spec +++ b/redhat/applications/knetstats/knetstats.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knetstats %define tde_prefix /opt/trinity diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch deleted file mode 100644 index 175d299e7..000000000 --- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-missing_includes.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt.ORI 2011-11-11 15:06:49.854247242 -0500 -+++ knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt 2011-11-11 15:06:58.662060747 -0500 -@@ -18,6 +18,7 @@ - ${CMAKE_BINARY_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -+ ${DBUS_INCLUDE_DIRS} - ${DBUS_TQT_INCLUDE_DIRS} - ${NM_UTIL_INCLUDE_DIRS} - ) diff --git a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch b/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch deleted file mode 100644 index 9db3ab5de..000000000 --- a/redhat/applications/knetworkmanager8/knetworkmanager-3.5.13-subdir_version.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- knetworkmanager9/CMakeLists.txt.ORI 2011-11-11 13:36:01.462536187 -0500 -+++ knetworkmanager9/CMakeLists.txt 2011-11-11 13:36:10.762446937 -0500 -@@ -63,7 +63,7 @@ - - ##### source directories ######################## - --add_subdirectory( knetworkmanager-0.8 ) -+add_subdirectory( knetworkmanager-0.9 ) - - - ##### write configure files ##################### ---- knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt.ORI 2011-11-11 13:39:32.866229477 -0500 -+++ knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt 2011-11-11 13:39:48.169042904 -0500 -@@ -18,7 +18,7 @@ - - ##### knm_dbus (static) ######################### - --set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.8/introspection" ) -+set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.9/introspection" ) - - # options: - # p - generate proxy files diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec deleted file mode 100644 index 0ada2aed4..000000000 --- a/redhat/applications/knetworkmanager8/knetworkmanager8-3.5.13.2.spec +++ /dev/null @@ -1,179 +0,0 @@ -# Default version for this component -%define tde_pkg knetworkmanager8 -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Version: 0.8 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -Summary: Trinity applet for Network Manager - -Group: Applications/Internet -License: GPLv2+ -URL: http://en.opensuse.org/Projects/KNetworkManager - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch0: knetworkmanager-3.5.13-missing_includes.patch - -# For knetworkmanager 0.9 only ! -Patch10: knetworkmanager-3.5.13-subdir_version.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: desktop-file-utils - -# NETWORKMANAGER support -%if 0%{?rhel} || 0%{?fedora} -Requires: NetworkManager-gnome -%endif -%if 0%{?mdkversion} || 0%{?mgaversion} -Requires: networkmanager -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: NetworkManager-glib-devel -%endif -%if 0%{?suse_version} -BuildRequires: NetworkManager-devel -Requires: NetworkManager -%endif - -BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9 -BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 - -Obsoletes: trinity-knetworkmanager < %{version}-%{release} -Provides: trinity-knetworkmanager = %{version}-%{release} - -%description -KNetworkManager is a system tray applet for controlling network -connections on systems that use the NetworkManager daemon. - - -%package devel -Summary: Common data shared among the MySQL GUI Suites -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -Obsoletes: trinity-knetworkmanager-devel < %{version}-%{release} -Provides: trinity-knetworkmanager-devel = %{version}-%{release} - -%description devel -Development headers for knetworkmanager - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%if "%{?version}" == "0.9" -%patch10 -p1 -%endif - -cd knetworkmanager-0.*/src -%patch0 -p3 - - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Missing TDE macros -%__mkdir_p cmake -%__ln_s %{tde_datadir}/cmake cmake/modules - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - .. - -%__make %{?_smp_mflags} - -%install -%__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=%{?buildroot} -C build - - -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%post -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%postun -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%post devel -/sbin/ldconfig - - -%postun devel -/sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/knetworkmanager -%{tde_libdir}/*.la -%{tde_libdir}/*.so -%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf -%{tde_tdeappdir}/knetworkmanager.desktop -%{tde_datadir}/apps/knetworkmanager -%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager* -%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop -%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop - - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/*.h -%{tde_tdelibdir}/*.la -%{tde_tdelibdir}/*.so - -%changelog diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8.spec index f1434e905..334a82076 100644 --- a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec +++ b/redhat/applications/knetworkmanager8/knetworkmanager8.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knetworkmanager %define tde_prefix /opt/trinity diff --git a/redhat/applications/knights/knights-3.5.13.2.spec b/redhat/applications/knights/knights-3.5.13.2.spec deleted file mode 100644 index 523111ac8..000000000 --- a/redhat/applications/knights/knights-3.5.13.2.spec +++ /dev/null @@ -1,132 +0,0 @@ -# Default version for this component -%define tde_pkg knights -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: A chess interface for the K Desktop Environment [Trinity] -Version: 0.6 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Amusements/Games - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Requires: gnuchess - -%description -Knights aims to be the ultimate chess resource on your computer. -Written for the K Desktop Environment, it's designed to be both friendly -to new chess players and functional for Grand Masters. - -Here's a quick list of Knights' key features: -* Play against yourself, against computer opponents, - or against others over the Internet. -* Customize your board and pieces with over 30 different themes, - or make your own! -* Audio cues help alert you to important events. -* Novice players can preview potential moves. -* Save your unfinished matches and play them again later. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/knights -%{tde_datadir}/applnk/Games/Board/knights.desktop -%{tde_datadir}/apps/knights -%{tde_tdedocdir}/HTML/*/knights -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/mimelnk/application/pgn.desktop - - -%changelog diff --git a/redhat/applications/knights/knights.spec b/redhat/applications/knights/knights.spec index eb75677b9..9684594d8 100644 --- a/redhat/applications/knights/knights.spec +++ b/redhat/applications/knights/knights.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knights %define tde_prefix /opt/trinity @@ -157,6 +157,18 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Fix desktop icon location +if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then + %__mkdir_p "%{?buildroot}%{tde_tdeappdir}" + %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Games/Board/knights.desktop" "%{?buildroot}%{tde_tdeappdir}" + %__rm -r "%{buildroot}%{tde_datadir}/applnk" +fi + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -r "%{buildroot}%{tde_tdeappdir}/knights.desktop" Game BoardGame +%endif + %clean %__rm -rf %{buildroot} @@ -165,7 +177,7 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/knights -%{tde_datadir}/applnk/Games/Board/knights.desktop +%{tde_tdeappdir}/knights.desktop %{tde_datadir}/apps/knights %{tde_tdedocdir}/HTML/*/knights %{tde_datadir}/icons/hicolor/*/*/*.png diff --git a/redhat/applications/knmap/knmap.spec b/redhat/applications/knmap/knmap.spec index 76ac8c8c7..eb52e123d 100644 --- a/redhat/applications/knmap/knmap.spec +++ b/redhat/applications/knmap/knmap.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knmap %define tde_prefix /opt/trinity @@ -156,10 +156,14 @@ fi %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build +%find_lang %{tde_pkg} + # Move desktop icon to XDG directory -%__mkdir_p %{buildroot}%{tde_tdeappdir} -%__mv "%{buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" -%__rm -r "%{buildroot}%{tde_datadir}/applnk" +if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then + %__mkdir_p %{buildroot}%{tde_tdeappdir} + %__mv "%{buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" + %__rm -r "%{buildroot}%{tde_datadir}/applnk" +fi # Updates applications categories for openSUSE %if 0%{?suse_version} @@ -171,7 +175,7 @@ fi %__rm -rf $RPM_BUILD_ROOT -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog %{tde_bindir}/knmap diff --git a/redhat/applications/knowit/knowit-3.5.13.2.spec b/redhat/applications/knowit/knowit-3.5.13.2.spec deleted file mode 100644 index 00791f091..000000000 --- a/redhat/applications/knowit/knowit-3.5.13.2.spec +++ /dev/null @@ -1,135 +0,0 @@ -# Default version for this component -%define tde_pkg knowit -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Tool for managing notes [Trinity] -Version: 0.10 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -KnowIt is a tool for managing notes which are organized in -tree-like hierarchy. It is similar to TuxCards, -but TDE-based, and requires Trinity. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__mkdir_p %{buildroot}%{tde_tdeappdir} -%__mv %{buildroot}%{tde_datadir}/applnk/Applications/knowit.desktop %{buildroot}%{tde_tdeappdir}/knowit.desktop -%__rm -r %{buildroot}%{tde_datadir}/applnk - - -%find_lang %{tde_pkg} - - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/knowit -%{tde_tdeappdir}/knowit.desktop -%{tde_datadir}/apps/knowit/knowitui.rc -%{tde_datadir}/apps/knowit/tips -%{tde_tdedocdir}/HTML/en/knowit/common -%{tde_tdedocdir}/HTML/en/knowit/index.cache.bz2 -%{tde_tdedocdir}/HTML/en/knowit/index.docbook -%{tde_tdedocdir}/HTML/en/knowit/screenshot.png -%{tde_datadir}/icons/hicolor/*/apps/knowit.png - - -%changelog diff --git a/redhat/applications/knowit/knowit.spec b/redhat/applications/knowit/knowit.spec index 67cac8595..0c04143fc 100644 --- a/redhat/applications/knowit/knowit.spec +++ b/redhat/applications/knowit/knowit.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knowit %define tde_prefix /opt/trinity diff --git a/redhat/applications/knutclient/knutclient-3.5.13.2.spec b/redhat/applications/knutclient/knutclient-3.5.13.2.spec deleted file mode 100644 index 016bb891e..000000000 --- a/redhat/applications/knutclient/knutclient-3.5.13.2.spec +++ /dev/null @@ -1,126 +0,0 @@ -# Default version for this component -%define tde_pkg knutclient -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: A TDE GUI that displays UPS statistics from NUT's upsd [Trinity] -Version: 0.9.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.knut.noveradsl.cz/knutclient/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -KNutClient monitors UPS statistics through the NUT (Network UPS Tools, -http://www.networkupstools.org/) framework on Linux and other systems. This -information, presented in a nice visual format, can be invaluable on -stations using an UPS. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/knutclient -%{tde_datadir}/applnk/Utilities/knutclient.desktop -%{tde_datadir}/apps/knutclient/knutclientui.rc -%{tde_datadir}/apps/knutclient -%{tde_tdedocdir}/HTML/cs/knutclient -%{tde_tdedocdir}/HTML/en/knutclient -%{tde_datadir}/icons/hicolor/*/apps/*.png -%{tde_datadir}/icons/locolor/*/apps/*.png - -%changelog diff --git a/redhat/applications/knutclient/knutclient.spec b/redhat/applications/knutclient/knutclient.spec index 2c729fb71..588addd4e 100644 --- a/redhat/applications/knutclient/knutclient.spec +++ b/redhat/applications/knutclient/knutclient.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg knutclient %define tde_prefix /opt/trinity @@ -106,7 +106,7 @@ stations using an UPS. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} # Fix permissions -chmod 644 AUTHORS README TODO COPYING ChangeLog +chmod 644 AUTHORS README COPYING ChangeLog %build @@ -150,6 +150,13 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} +# Move desktop icon to XDG directory +if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then + %__mkdir_p %{buildroot}%{tde_tdeappdir} + %__mv "%{buildroot}%{tde_datadir}/applnk/Utilities/knutclient.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" + %__rm -r "%{buildroot}%{tde_datadir}/applnk" +fi + # Links duplicate files %fdupes "%{?buildroot}%{tde_datadir}" @@ -162,7 +169,7 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{tde_bindir}/knutclient -%{tde_datadir}/applnk/Utilities/knutclient.desktop +%{tde_tdeappdir}/knutclient.desktop %{tde_datadir}/apps/knutclient/knutclientui.rc %{tde_datadir}/apps/knutclient %{tde_tdedocdir}/HTML/cs/knutclient diff --git a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec b/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec deleted file mode 100644 index 88a4619fb..000000000 --- a/redhat/applications/koffice-i18n/koffice-i18n-3.5.13.2.spec +++ /dev/null @@ -1,1045 +0,0 @@ -# Default version for this component -%define tde_pkg koffice-i18n -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -# Builds all supported languages (not unsupported ones) -%if "%{?TDE_LANGS}" == "" -%define TDE_LANGS bg ca cs da de el en_GB es et fi fr hu it ja km lv ms nb nds ne nl pl pt pt_BR ru sk sl sr sv tr uk zh_CN zh_TW -%endif - - -Name: trinity-%{tde_pkg} -Summary: Internationalization support for Koffice [Trinity] -Version: 1.6.3 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# GFDL, with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. -License: GFDL -Group: User Interface/Desktops -BuildArch: noarch - -# Speed build options -%define debug_package %{nil} -%define __spec_install_post %{nil} -AutoReq: no - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: findutils -BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 - -%description -%{summary}. - -%package Bulgarian -Summary: Bulgarian(bg) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-bg = %{version}-%{release} -%description Bulgarian -%{summary}. - -%package Bengali -Summary: Bengali(bn) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-bn = %{version}-%{release} -%description Bengali -%{summary}. - -%package Tibetan -Summary: Tibetan(bo) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-bo = %{version}-%{release} -%description Tibetan -%{summary}. - -%package Breton -Summary: Breton(br) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-br = %{version}-%{release} -%description Breton -%{summary}. - -%package Bosnian -Summary: Bosnian(bs) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-bs = %{version}-%{release} -%description Bosnian -%{summary}. - -%package Catalan -Summary: Catalan(ca) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ca = %{version}-%{release} -%description Catalan -%{summary}. - -%package Czech -Summary: Czech(cs) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-cs = %{version}-%{release} -%description Czech -%{summary}. - -%package Cymraeg -Summary: Cymraeg language support for Koffice [Trinity] -Group: User Interface/Desktops -%description Cymraeg -%{summary}. - -%package Welsh -Summary: Welsh(cy) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-cy = %{version}-%{release} -%description Welsh -%{summary}. - -%package Danish -Summary: Danish(da) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-da = %{version}-%{release} -%description Danish -%{summary}. - -%package German -Summary: German(de) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-de = %{version}-%{release} -%description German -%{summary}. - -%package Greek -Summary: Greek(el) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-el = %{version}-%{release} -%description Greek -%{summary}. - -%package British -Summary: British(en_GB) English support for TDE -Group: User Interface/Desktops -Provides: %{name}-en_GB = %{version}-%{release} -%description British -%{summary}. - -%package Esperanto -Summary: Esperanto(eo) support for TDE -Group: User Interface/Desktops -Provides: %{name}-eo = %{version}-%{release} -%description Esperanto -%{summary}. - -%package Spanish -Summary: Spanish(es) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-es = %{version}-%{release} -%description Spanish -%{summary}. - -%package Estonian -Summary: Estonian(et) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-et = %{version}-%{release} -%description Estonian -%{summary}. - -%package Basque -Summary: Basque(eu) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-eu = %{version}-%{release} -%description Basque -%{summary}. - -%package Finnish -Summary: Finnish(fi) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-fi = %{version}-%{release} -%description Finnish -%{summary}. - -%package Faroese -Summary: Faroese(fo) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-fo = %{version}-%{release} -%description Faroese -%{summary}. - -%package French -Summary: French(fr) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-fr = %{version}-%{release} -%description French -%{summary}. - -%package Frisian -Summary: Frisian(fy) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-fy = %{version}-%{release} -%description Frisian -%{summary}. - -%package Irish -Summary: Irish(ga) language support for Koffice [Trinity] -Group: User Interface/Desktops -Obsoletes: kde-i18n-Gaeilge < %{version} -Provides: %{name}-ga = %{version}-%{release} -%description Irish -%{summary}. - -%package Galician -Summary: Galician(gl) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-gl = %{version}-%{release} -%description Galician -%{summary}. - -%package Hebrew -Summary: Hebrew(he) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-he = %{version}-%{release} -%description Hebrew -%{summary}. - -%package Hindi -Summary: Hindi(hi) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-hi = %{version}-%{release} -%description Hindi -%{summary}. - -%package Croatian -Summary: Croatian(hr) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-hr = %{version}-%{release} -%description Croatian -%{summary}. - -%package Hungarian -Summary: Hungarian(hu) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-hu = %{version}-%{release} -%description Hungarian -%{summary}. - -%package Indonesian -Summary: Indonesian(id) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-id = %{version}-%{release} -%description Indonesian -%{summary}. - -%package Icelandic -Summary: Icelandic(is) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-is = %{version}-%{release} -%description Icelandic -%{summary}. - -%package Italian -Summary: Italian(it) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-it = %{version}-%{release} -%description Italian -%{summary}. - -%package Japanese -Summary: Japanese(ja) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ja = %{version}-%{release} -%description Japanese -%{summary}. - -%package Khmer -Summary: Khmer(km) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-km = %{version}-%{release} -%description Khmer -%{summary}. - -%package Korean -Summary: Korean(ko) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ko = %{version}-%{release} -%description Korean -%{summary}. - -%package Kurdish -Summary: Kurdish(ku) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ku = %{version}-%{release} -%description Kurdish -%{summary}. - -%package Lao -Summary: Lao(lo) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-lo = %{version}-%{release} -%description Lao -%{summary}. - -%package Lithuanian -Summary: Lithuanian(lt) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-lt = %{version}-%{release} -%description Lithuanian -%{summary}. - -%package Latvian -Summary: Latvian(lv) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-lv = %{version}-%{release} -%description Latvian -%{summary}. - -%package Maori -Summary: Maori(mi) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-mi = %{version}-%{release} -%description Maori -%{summary}. - -%package Macedonian -Summary: Macedonian(mk) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-mk = %{version}-%{release} -%description Macedonian -%{summary}. - -%package Malay -Summary: Malay(ms) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ms = %{version}-%{release} -%description Malay -%{summary}. - -%package Maltese -Summary: Maltese(mt) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-mt = %{version}-%{release} -%description Maltese -%{summary}. - -%package LowSaxon -Summary: Low Saxon (nds) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-nds = %{version}-%{release} -%description LowSaxon -%{summary}. - -%package Nepali -Summary: Nepali(ne) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ne = %{version}-%{release} -%description Nepali -%{summary}. - -%package Dutch -Summary: Dutch(nl) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-nl = %{version}-%{release} -%description Dutch -%{summary}. - -%package Norwegian -Summary: Norwegian(no) (Bokmaal) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-no = %{version}-%{release} -%description Norwegian -%{summary}. - -%package Norwegian-Nynorsk -Summary: Norwegian(nn) (Nynorsk) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-nn = %{version}-%{release} -%description Norwegian-Nynorsk -%{summary}. - -%package Occitan -Summary: Occitan(oc) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-oc = %{version}-%{release} -%description Occitan -%{summary}. - -%package Polish -Summary: Polish(pl) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-pl = %{version}-%{release} -%description Polish -%{summary}. - -%package Portuguese -Summary: Portuguese(pt) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-pt = %{version}-%{release} -%description Portuguese -%{summary}. - -%package Punjabi -Summary: Punjabi(pa) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-pa = %{version}-%{release} -%description Punjabi -%{summary}. - -%package Brazil -Summary: Brazil(pt_BR) Portuguese language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-pt_BR = %{version}-%{release} -%description Brazil -%{summary}. - -%package Romanian -Summary: Romanian(ro) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ro = %{version}-%{release} -%description Romanian -%{summary}. - -%package Russian -Summary: Russian(ru) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ru = %{version}-%{release} -%description Russian -%{summary}. - -%package Slovak -Summary: Slovak(sk) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-sk = %{version}-%{release} -%description Slovak -%{summary}. - -%package Slovenian -Summary: Slovenian(sl) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-sl = %{version}-%{release} -%description Slovenian -%{summary}. - -%package Serbian -Summary: Serbian(sr) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-sr = %{version}-%{release} -%description Serbian -%{summary}. - -%package Swedish -Summary: Swedish(sv) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-sv = %{version}-%{release} -%description Swedish -%{summary}. - -%package Tamil -Summary: Tamil(ta) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ta = %{version}-%{release} -%description Tamil -%{summary}. - -%package Tajik -Summary: Tajik(tg) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-tg = %{version}-%{release} -%description Tajik -%{summary}. - -%package Thai -Summary: Thai(th) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-th = %{version}-%{release} -%description Thai -%{summary}. - -%package Turkish -Summary: Turkish(tr) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-tr = %{version}-%{release} -%description Turkish -%{summary}. - -%package Ukrainian -Summary: Ukrainian(uk) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-uk = %{version}-%{release} -%description Ukrainian -%{summary}. - -%package Venda -Summary: Venda(ven) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-ven = %{version}-%{release} -%description Venda -%{summary}. - -%package Vietnamese -Summary: Vietnamese(vi) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-vi = %{version}-%{release} -%description Vietnamese -%{summary}. - -%package Walloon -Summary: Walloon(wa) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-wa = %{version}-%{release} -%description Walloon -%{summary}. - -%package Xhosa -Summary: Xhosa(xh) (a Bantu language) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-xh = %{version}-%{release} -%description Xhosa -%{summary}. - -%package Chinese -Summary: Chinese(zh_CN) (Simplified Chinese) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-zh_CN = %{version}-%{release} -%description Chinese -%{summary}. - -%package Chinese-Big5 -Summary: Chinese(zh_TW) (Big5) language support for Koffice [Trinity] -Group: User Interface/Desktops -Provides: %{name}-tz_TW = %{version}-%{release} -%description Chinese-Big5 -%{summary}. - - - -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" - - -%build -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -export kde_htmldir="%{tde_tdedocdir}/HTML" - -for l in %{TDE_LANGS}; do - for f in koffice-i18n-${l}/; do - if [ -d "${f}" ]; then - pushd ${f} - %__sed -i "configure.in" -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADER|" - %__make -f "admin/Makefile.common" - %configure \ - --prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} - %__make %{?_smp_mflags} - popd - fi - done -done - -%install -%__rm -rf %{?buildroot} -export PATH="%{tde_bindir}:${PATH}" - -for l in %{TDE_LANGS}; do - for f in koffice-i18n-${l}/; do - if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then - %__make install DESTDIR="%{?buildroot}" -C "${f}" - fi - done -done - -# remove zero-length file -find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; - -%clean -%__rm -rf %{buildroot} - -%if "%( grep -w af <<< '%{TDE_LANGS}' )" != "" -%files Afrikaans -%defattr(-,root,root,-) -%{tde_datadir}/locale/af/* -%endif - -%if "%( grep -w ar <<< '%{TDE_LANGS}' )" != "" -%files Arabic -%defattr(-,root,root,-) -%{tde_datadir}/locale/ar/* -%endif - -%if "%( grep -w az <<< '%{TDE_LANGS}' )" != "" -%files Azerbaijani -%defattr(-,root,root,-) -%{tde_datadir}/locale/az/* -%endif - -%if "%( grep -w be <<< '%{TDE_LANGS}' )" != "" -%files Belarusian -%defattr(-,root,root,-) -%{tde_datadir}/locale/be/* -%endif - -%if "%( grep -w bg <<< '%{TDE_LANGS}' )" != "" -%files Bulgarian -%defattr(-,root,root,-) -%{tde_datadir}/locale/bg/* -%endif - -%if "%( grep -w bn <<< '%{TDE_LANGS}' )" != "" -%files Bengali -%defattr(-,root,root,-) -%{tde_datadir}/locale/bn/* -%endif - -%if "%( grep -w bo <<< '%{TDE_LANGS}' )" != "" -%files Tibetan -%defattr(-,root,root,-) -%{tde_datadir}/locale/bo/* -%endif - -%if "%( grep -w br <<< '%{TDE_LANGS}' )" != "" -%files Breton -%defattr(-,root,root,-) -%{tde_datadir}/locale/br/* -%endif - -%if "%( grep -w bs <<< '%{TDE_LANGS}' )" != "" -%files Bosnian -%defattr(-,root,root,-) -%{tde_datadir}/locale/bs/* -%endif - -%if "%( grep -w ca <<< '%{TDE_LANGS}' )" != "" -%files Catalan -%defattr(-,root,root,-) -%{tde_datadir}/locale/ca/* -%{tde_tdedocdir}/HTML/ca/ -%{tde_datadir}/apps/koffice/autocorrect/ca.xml -%endif - -%if "%( grep -w cs <<< '%{TDE_LANGS}' )" != "" -%files Czech -%defattr(-,root,root,-) -%{tde_datadir}/locale/cs/* -%{tde_datadir}/apps/koffice/autocorrect/cs.xml -%endif - -%if "%( grep -w cy <<< '%{TDE_LANGS}' )" != "" -%files Welsh -%defattr(-,root,root,-) -%{tde_datadir}/locale/cy/* -%endif - -%if "%( grep -w da <<< '%{TDE_LANGS}' )" != "" -%files Danish -%defattr(-,root,root,-) -%{tde_datadir}/locale/da/* -%{tde_tdedocdir}/HTML/da/ -%endif - -%if "%( grep -w de <<< '%{TDE_LANGS}' )" != "" -%files German -%defattr(-,root,root,-) -%{tde_datadir}/locale/de/* -%{tde_tdedocdir}/HTML/de/ -%{tde_datadir}/apps/koffice/autocorrect/de.xml -%endif - -%if "%( grep -w el <<< '%{TDE_LANGS}' )" != "" -%files Greek -%defattr(-,root,root,-) -%{tde_datadir}/locale/el/* -%endif - -%if "%( grep -w en_GB <<< '%{TDE_LANGS}' )" != "" -%files British -%defattr(-,root,root,-) -%{tde_datadir}/locale/en_GB/* -%{tde_tdedocdir}/HTML/en_GB/ -%endif - -%if "%( grep -w eo <<< '%{TDE_LANGS}' )" != "" -%files Esperanto -%defattr(-,root,root,-) -%{tde_datadir}/locale/eo/* -%endif - -%if "%( grep -w es <<< '%{TDE_LANGS}' )" != "" -%files Spanish -%defattr(-,root,root,-) -%{tde_datadir}/locale/es/* -%{tde_tdedocdir}/HTML/es/ -%{tde_datadir}/apps/koffice/autocorrect/es.xml -%endif - -%if "%( grep -w et <<< '%{TDE_LANGS}' )" != "" -%files Estonian -%defattr(-,root,root,-) -%{tde_datadir}/locale/et/* -%{tde_tdedocdir}/HTML/et/ -%endif - -%if "%( grep -w eu <<< '%{TDE_LANGS}' )" != "" -%files Basque -%defattr(-,root,root,-) -%{tde_datadir}/locale/eu/* -%endif - -%if "%( grep -w fa <<< '%{TDE_LANGS}' )" != "" -%files Farsi -%defattr(-,root,root,-) -%{tde_datadir}/locale/fa/* -%endif - -%if "%( grep -w fi <<< '%{TDE_LANGS}' )" != "" -%files Finnish -%defattr(-,root,root,-) -%{tde_datadir}/locale/fi/* -%endif - -%if "%( grep -w fo <<< '%{TDE_LANGS}' )" != "" -%files Faroese -%defattr(-,root,root,-) -%{tde_datadir}/locale/fo/* -%endif - -%if "%( grep -w fr <<< '%{TDE_LANGS}' )" != "" -%files French -%defattr(-,root,root,-) -%{tde_datadir}/locale/fr/* -%{tde_tdedocdir}/HTML/fr/ -%{tde_datadir}/apps/koffice/autocorrect/fr.xml -%endif - -%if "%( grep -w fy <<< '%{TDE_LANGS}' )" != "" -%files Frisian -%defattr(-,root,root,-) -%{tde_datadir}/locale/fy/* -%endif - -%if "%( grep -w ga <<< '%{TDE_LANGS}' )" != "" -%files Irish -%defattr(-,root,root,-) -%{tde_datadir}/locale/ga/* -%endif - -%if "%( grep -w gl <<< '%{TDE_LANGS}' )" != "" -%files Galician -%defattr(-,root,root,-) -%{tde_datadir}/locale/gl/* -%endif - -%if "%( grep -w he <<< '%{TDE_LANGS}' )" != "" -%files Hebrew -%defattr(-,root,root,-) -%{tde_datadir}/locale/he/* -%endif - -%if "%( grep -w hi <<< '%{TDE_LANGS}' )" != "" -%files Hindi -%defattr(-,root,root,-) -%{tde_datadir}/locale/hi/* -%endif - -%if "%( grep -w hr <<< '%{TDE_LANGS}' )" != "" -%files Croatian -%defattr(-,root,root,-) -%{tde_datadir}/locale/hr/* -%endif - -%if "%( grep -w hu <<< '%{TDE_LANGS}' )" != "" -%files Hungarian -%defattr(-,root,root,-) -%{tde_datadir}/locale/hu/* -%{tde_datadir}/apps/koffice/autocorrect/hu.xml -%endif - -%if "%( grep -w id <<< '%{TDE_LANGS}' )" != "" -%files Indonesian -%defattr(-,root,root,-) -%{tde_datadir}/locale/id/* -%endif - -%if "%( grep -w is <<< '%{TDE_LANGS}' )" != "" -%files Icelandic -%defattr(-,root,root,-) -%{tde_datadir}/locale/is/* -%endif - -%if "%( grep -w it <<< '%{TDE_LANGS}' )" != "" -%files Italian -%defattr(-,root,root,-) -%{tde_datadir}/locale/it/* -%{tde_tdedocdir}/HTML/it/ -%{tde_datadir}/apps/koffice/autocorrect/it.xml -%endif - -%if "%( grep -w ja <<< '%{TDE_LANGS}' )" != "" -%files Japanese -%defattr(-,root,root,-) -%{tde_datadir}/locale/ja/* -%endif - -%if "%( grep -w km <<< '%{TDE_LANGS}' )" != "" -%files Khmer -%defattr(-,root,root,-) -%{tde_datadir}/locale/km/* -%endif - -%if "%( grep -w ko <<< '%{TDE_LANGS}' )" != "" -%files Korean -%defattr(-,root,root,-) -%{tde_datadir}/locale/ko/* -%endif - -%if "%( grep -w ku <<< '%{TDE_LANGS}' )" != "" -%files Kurdish -%defattr(-,root,root,-) -%{tde_datadir}/locale/ku/* -%endif - -%if "%( grep -w lao <<< '%{TDE_LANGS}' )" != "" -%files Lao -%defattr(-,root,root,-) -%{tde_datadir}/locale/lo/* -%endif - -%if "%( grep -w lt <<< '%{TDE_LANGS}' )" != "" -%files Lithuanian -%defattr(-,root,root,-) -%{tde_datadir}/locale/lt/* -%endif - -%if "%( grep -w lv <<< '%{TDE_LANGS}' )" != "" -%files Latvian -%defattr(-,root,root,-) -%{tde_datadir}/locale/lv/* -%endif - -%if "%( grep -w mi <<< '%{TDE_LANGS}' )" != "" -%files Maori -%defattr(-,root,root,-) -%{tde_datadir}/locale/mi/* -%endif - -%if "%( grep -w mk <<< '%{TDE_LANGS}' )" != "" -%files Macedonian -%defattr(-,root,root,-) -%{tde_datadir}/locale/mk/* -%endif - -%if "%( grep -w ms <<< '%{TDE_LANGS}' )" != "" -%files Malay -%defattr(-,root,root,-) -%{tde_datadir}/locale/ms/* -%endif - -%if "%( grep -w mt <<< '%{TDE_LANGS}' )" != "" -%files Maltese -%defattr(-,root,root,-) -%{tde_datadir}/locale/mt/* -%endif - -%if "%( grep -w nds <<< '%{TDE_LANGS}' )" != "" -%files LowSaxon -%defattr(-,root,root,-) -%{tde_datadir}/locale/nds/* -%endif - -%if "%( grep -w ne <<< '%{TDE_LANGS}' )" != "" -%files Nepali -%defattr(-,root,root,-) -%{tde_datadir}/locale/ne/* -%endif - -%if "%( grep -w nl <<< '%{TDE_LANGS}' )" != "" -%files Dutch -%defattr(-,root,root,-) -%{tde_datadir}/locale/nl/* -%{tde_tdedocdir}/HTML/nl/ -%endif - -%if "%( grep -w nb <<< '%{TDE_LANGS}' )" != "" -%files Norwegian -%defattr(-,root,root,-) -%{tde_datadir}/locale/nb/* -%endif - -%if "%( grep -w nn <<< '%{TDE_LANGS}' )" != "" -%files Norwegian-Nynorsk -%defattr(-,root,root,-) -%{tde_datadir}/locale/nn/* -%endif - -%if "%( grep -w oc <<< '%{TDE_LANGS}' )" != "" -%files Occitan -%defattr(-,root,root,-) -%{tde_datadir}/locale/oc/* -%endif - -%if "%( grep -w pa <<< '%{TDE_LANGS}' )" != "" -%files Punjabi -%defattr(-,root,root,-) -%{tde_datadir}/locale/pa/* -%endif - -%if "%( grep -w pl <<< '%{TDE_LANGS}' )" != "" -%files Polish -%defattr(-,root,root,-) -%{tde_datadir}/locale/pl/* -%endif - -%if "%( grep -w pt <<< '%{TDE_LANGS}' )" != "" -%files Portuguese -%defattr(-,root,root,-) -%{tde_datadir}/locale/pt/* -%{tde_tdedocdir}/HTML/pt/ -%endif - -%if "%( grep -w pt_BR <<< '%{TDE_LANGS}' )" != "" -%files Brazil -%defattr(-,root,root,-) -%{tde_datadir}/locale/pt_BR/* -%{tde_tdedocdir}/HTML/pt_BR/ -%endif - -%if "%( grep -w ro <<< '%{TDE_LANGS}' )" != "" -%files Romanian -%defattr(-,root,root,-) -%{tde_datadir}/locale/ro/* -%endif - -%if "%( grep -w ru <<< '%{TDE_LANGS}' )" != "" -%files Russian -%defattr(-,root,root,-) -%{tde_datadir}/locale/ru/* -%{tde_tdedocdir}/HTML/ru/ -%endif - -%if "%( grep -w sk <<< '%{TDE_LANGS}' )" != "" -%files Slovak -%defattr(-,root,root,-) -%{tde_datadir}/locale/sk/* -%{tde_tdedocdir}/HTML/sk/ -%{tde_datadir}/apps/koffice/autocorrect/sk.xml -%endif - -%if "%( grep -w sl <<< '%{TDE_LANGS}' )" != "" -%files Slovenian -%defattr(-,root,root,-) -%{tde_datadir}/locale/sl/* -%{tde_tdedocdir}/HTML/sl/ -%endif - -%if "%( grep -w sr <<< '%{TDE_LANGS}' )" != "" -%files Serbian -%defattr(-,root,root,-) -%{tde_datadir}/locale/sr/* -%endif - -%if "%( grep -w sv <<< '%{TDE_LANGS}' )" != "" -%files Swedish -%defattr(-,root,root,-) -%{tde_datadir}/locale/sv/* -%{tde_tdedocdir}/HTML/sv/ -%endif - -%if "%( grep -w ta <<< '%{TDE_LANGS}' )" != "" -%files Tamil -%defattr(-,root,root,-) -%{tde_datadir}/locale/ta/* -%endif - -%if "%( grep -w tg <<< '%{TDE_LANGS}' )" != "" -%files Tajik -%defattr(-,root,root,-) -%{tde_datadir}/locale/tg/* -%endif - -%if "%( grep -w th <<< '%{TDE_LANGS}' )" != "" -%files Thai -%defattr(-,root,root,-) -%{tde_datadir}/locale/th/* -%endif - -%if "%( grep -w tr <<< '%{TDE_LANGS}' )" != "" -%files Turkish -%defattr(-,root,root,-) -%{tde_datadir}/locale/tr/* -%endif - -%if "%( grep -w uk <<< '%{TDE_LANGS}' )" != "" -%files Ukrainian -%defattr(-,root,root,-) -%{tde_datadir}/locale/uk/* -%endif - -%if "%( grep -w ven <<< '%{TDE_LANGS}' )" != "" -%files Venda -%defattr(-,root,root,-) -%{tde_datadir}/locale/ven/* -%endif - -%if "%( grep -w vi <<< '%{TDE_LANGS}' )" != "" -%files Vietnamese -%defattr(-,root,root,-) -%{tde_datadir}/locale/vi/* -%endif - -%if "%( grep -w wa <<< '%{TDE_LANGS}' )" != "" -%files Walloon -%defattr(-,root,root,-) -%{tde_datadir}/locale/wa/* -%endif - -%if "%( grep -w xh <<< '%{TDE_LANGS}' )" != "" -%files Xhosa -%defattr(-,root,root,-) -%{tde_datadir}/locale/xh/* -%endif - -%if "%( grep -w zh_CN <<< '%{TDE_LANGS}' )" != "" -%files Chinese -%defattr(-,root,root,-) -%{tde_datadir}/locale/zh_CN/* -%endif - -%if "%( grep -w zh_TW <<< '%{TDE_LANGS}' )" != "" -%files Chinese-Big5 -%defattr(-,root,root,-) -%{tde_datadir}/locale/zh_TW/* -%endif - - -%changelog diff --git a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec b/redhat/applications/koffice-i18n/koffice-i18n.spec index 479a72b5f..5c4f1785a 100644 --- a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec +++ b/redhat/applications/koffice-i18n/koffice-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg koffice-i18n %define tde_prefix /opt/trinity diff --git a/redhat/applications/koffice/koffice-3.5.13.2.spec b/redhat/applications/koffice/koffice-3.5.13.2.spec deleted file mode 100644 index b620d022d..000000000 --- a/redhat/applications/koffice/koffice-3.5.13.2.spec +++ /dev/null @@ -1,1157 +0,0 @@ -# Default version for this component -%define tde_pkg koffice -%define tde_version 3.5.13.2 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -# Disable Kross support for RHEL <= 5 (python is too old) -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_kross 1 -%endif - -# Ruby support -%define with_ruby 1 - -# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file) -%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') - - -Name: trinity-%{tde_pkg} -Summary: An integrated office suite -Version: 1.6.3 -Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist} - -Group: Applications/Productivity -License: GPLv2+ - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -# BuildRequires: world-devel ;) -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-tdegraphics-devel >= %{tde_version} -BuildRequires: trinity-tdegraphics-libpoppler-tqt-devel >= %{tde_version} -BuildRequires: automake libtool -BuildRequires: fontconfig-devel -BuildRequires: libart_lgpl-devel -BuildRequires: libtiff-devel -BuildRequires: libjpeg-devel -BuildRequires: ImageMagick-devel -BuildRequires: zlib-devel -BuildRequires: openssl-devel -BuildRequires: python-devel -BuildRequires: pcre-devel -BuildRequires: gettext-devel -BuildRequires: mysql-devel -BuildRequires: perl -BuildRequires: doxygen -BuildRequires: aspell-devel -BuildRequires: libxslt-devel -BuildRequires: OpenEXR-devel -BuildRequires: libexif-devel -BuildRequires: readline-devel - -%if 0%{?suse_version} -BuildRequires: libbz2-devel -BuildRequires: liblcms-devel -%else -BuildRequires: bzip2-devel -BuildRequires: lcms-devel - -BuildRequires: libpaper-devel -%endif - -# RUBY support -%if 0%{?with_ruby} -BuildRequires: ruby ruby-devel >= 1.8.1 -%endif - -# FREETYPE support -%if 0%{?suse_version} == 1140 -BuildRequires: freetype2-devel -%else -BuildRequires: freetype-devel -%endif - -# LIBPNG support -%if 0%{?mgaversion} -BuildRequires: %{_lib}png-devel -%endif -%if 0%{?mdkversion} && 0%{?pclinuxos} == 0 -BuildRequires: %{_lib}png15-devel -%endif -%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} -BuildRequires: libpng-devel -%endif - -# GRAPHICSMAGICK support -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 -%define with_graphicsmagick 1 -%if 0%{?suse_version} -BuildRequires: GraphicsMagick >= 1.1.0 -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} -BuildRequires: GraphicsMagick-devel >= 1.1.0 -%endif -%endif - -# UTEMPTER support -%if 0%{?suse_version} -BuildRequires: utempter-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: utempter -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 -BuildRequires: libutempter-devel -%endif - -# POSTGRESQL support -# Requires 'libpqxx', for kexi-driver-pgqsl -%if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} -%define with_postgresql 1 -BuildRequires: postgresql-devel -BuildRequires: libpqxx-devel -%endif -Obsoletes: trinity-libpqxx - -# WPD support -# For chalk and filters -BuildRequires: libwpd-devel -Obsoletes: trinity-libwpd - -# WV2 support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}wv2-devel -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: wv2-devel -%endif - -# MESA support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}mesagl1-devel -BuildRequires: %{_lib}mesaglu1-devel -%endif -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: libGL-devel -BuildRequires: libGLU-devel -%endif -%if 0%{?suse_version} >= 1220 -BuildRequires: Mesa-libGL-devel -BuildRequires: Mesa-libGLU-devel -%endif - -# OPENJPEG -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}openjpeg-devel -%endif - -# LIBXI support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xi-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: libXi-devel -%endif -%if 0%{?suse_version} == 1140 -BuildRequires: libXi6-devel -%endif -%if 0%{?suse_version} >= 1220 -BuildRequires: libXi-devel -%endif - - -%description -KOffice is an integrated office suite. - -########## - -%package suite -Summary: An integrated office suite -Group: Applications/Productivity -Obsoletes: %{name} <= %{version}-%{release} -Obsoletes: %{name}-i18n < 4:%{version} -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-kword = %{version}-%{release} -Requires: %{name}-kspread = %{version}-%{release} -Requires: %{name}-kpresenter = %{version}-%{release} -Requires: %{name}-kivio = %{version}-%{release} -Requires: %{name}-karbon = %{version}-%{release} -Requires: %{name}-kugar = %{version}-%{release} -Requires: %{name}-kexi = %{version}-%{release} -Requires: %{name}-kexi-driver-mysql = %{version}-%{release} -%{?with_postgresql:Requires: %{name}-kexi-driver-pgsql = %{version}-%{release}} -Requires: %{name}-kchart = %{version}-%{release} -Requires: %{name}-kformula = %{version}-%{release} -Requires: %{name}-filters = %{version}-%{release} -Requires: %{name}-kplato = %{version}-%{release} -Requires: %{name}-chalk = %{version}-%{release} - -%description suite -KOffice is an integrated office suite. - -%files suite -#empty => virtual package - -########## - -%package core -Summary: Core support files for %{name} -Group: Applications/Productivity -Requires: %{name}-libs = %{version}-%{release} -Requires: perl - -%description core -%{summary}. - -%posttrans core -gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || : -gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : -gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || : -update-desktop-database -q &> /dev/null ||: - -%post core -touch --no-create %{tde_datadir}/icons/crystalsvg &> /dev/null || : -touch --no-create %{tde_datadir}/icons/hicolor &> /dev/null || : -touch --no-create %{tde_datadir}/icons/locolor &> /dev/null || : - -%postun core -if [ $1 -eq 0 ]; then - gtk-update-icon-cache %{tde_datadir}/icons/crystalsvg &> /dev/null || : - gtk-update-icon-cache %{tde_datadir}/icons/hicolor &> /dev/null || : - gtk-update-icon-cache %{tde_datadir}/icons/locolor &> /dev/null || : - update-desktop-database -q &> /dev/null ||: -fi - -%files core -%defattr(-,root,root,-) -%doc AUTHORS COPYING README -%{tde_bindir}/koshell -%{tde_bindir}/kthesaurus -%{tde_bindir}/koconverter -%{tde_libdir}/libkdeinit_koshell.so -%{tde_libdir}/libkdeinit_kthesaurus.so -%{tde_tdelibdir}/kfile_koffice.* -%{tde_tdelibdir}/kfile_ooo.* -%{tde_tdelibdir}/kfile_abiword.* -%{tde_tdelibdir}/kfile_gnumeric.* -%{tde_tdelibdir}/kodocinfopropspage.* -%{tde_tdelibdir}/kofficescan.* -%{tde_tdelibdir}/kofficethumbnail.* -%{tde_tdelibdir}/koshell.* -%{tde_tdelibdir}/kthesaurus.* -%{tde_tdelibdir}/kwmailmerge_classic.* -%{tde_tdelibdir}/kwmailmerge_kabc.* -%{tde_tdelibdir}/kwmailmerge_qtsqldb_power.* -%{tde_tdelibdir}/kwmailmerge_qtsqldb.* -%{tde_tdelibdir}/libkounavailpart.* -%{tde_tdelibdir}/libkprkword.* -%{tde_tdelibdir}/libthesaurustool.* -%{tde_tdelibdir}/clipartthumbnail.* -%{tde_datadir}/apps/koffice/ -%{tde_datadir}/apps/konqueror/servicemenus/* -%{tde_datadir}/apps/koshell/ -%{tde_datadir}/apps/thesaurus/ -%{tde_datadir}/config.kcfg/koshell.kcfg -%{tde_tdedocdir}/HTML/en/koffice/ -%{tde_tdedocdir}/HTML/en/koshell/ -%{tde_tdedocdir}/HTML/en/thesaurus/ -%{tde_datadir}/icons/crystalsvg/*/*/* -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_datadir}/icons/locolor/*/*/* -%{tde_datadir}/services/clipartthumbnail.desktop -%{tde_datadir}/services/kfile*.desktop -%{tde_datadir}/services/kwmailmerge*.desktop -%{tde_datadir}/services/kodocinfopropspage.desktop -%{tde_datadir}/services/kofficethumbnail.desktop -%{tde_datadir}/services/kounavail.desktop -%{tde_datadir}/services/kprkword.desktop -%{tde_datadir}/services/thesaurustool.desktop -%{tde_datadir}/servicetypes/kochart.desktop -%{tde_datadir}/servicetypes/kofficepart.desktop -%{tde_datadir}/servicetypes/koplugin.desktop -%{tde_datadir}/servicetypes/kwmailmerge.desktop -%{tde_datadir}/servicetypes/widgetfactory.desktop -%{tde_tdeappdir}/*koffice.desktop -%{tde_tdeappdir}/*KThesaurus.desktop -%{tde_tdeappdir}/*koshell.desktop -%{tde_datadir}/apps/kofficewidgets/ -%if 0%{?with_kross} -%{tde_datadir}/apps/kross/ -%{tde_tdelibdir}/krosspython.* -%if 0%{?with_ruby} -%{tde_tdelibdir}/krossruby.* -%endif -%endif - -########## - -%package libs -Summary: Runtime libraries for %{name} -Group: System Environment/Libraries -Conflicts: %{name} <= %{version}-%{release} -Requires: trinity-tdelibs -License: LGPLv2+ - -%description libs -%{summary}. - -%files libs -%defattr(-,root,root,-) -%doc COPYING.LIB -#_libdir/libk*common.so.* -%{tde_libdir}/libkarboncommon.so.* -%{tde_libdir}/libkspreadcommon.so.* -%{tde_libdir}/libkdchart.so.* -%{tde_libdir}/libkochart.so.* -%{tde_libdir}/libkofficecore.so.* -%{tde_libdir}/libkofficeui.so.* -%{tde_libdir}/libkotext.so.* -%{tde_libdir}/libkowmf.so.* -%{tde_libdir}/libkopainter.so.* -%{tde_libdir}/libkstore.so.* -%{tde_libdir}/libkwmailmerge_interface.so.* -%{tde_libdir}/libkwmf.so.* -%{tde_libdir}/libkformulalib.so.* -%{tde_libdir}/libkopalette.so.* -%{tde_libdir}/libkoproperty.so.* -%if 0%{?with_kross} -%{tde_libdir}/libkrossapi.so.* -%{tde_libdir}/libkrossmain.so.* -%endif - -%post libs -/sbin/ldconfig || : - -%postun libs -/sbin/ldconfig || : - -########## - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} -License: LGPLv2+ - -%description devel -%{summary}. - -%files devel -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/koffice-apidocs/ -%{tde_includedir}/* -# FIXME: include only shlib symlinks we know/want to export -%{tde_libdir}/lib*.so -%exclude %{tde_libdir}/libkdeinit_*.so -%exclude %{tde_libdir}/libkudesignercore.so - -########## - -%package kword -Summary: A frame-based word processor capable of professional standard documents -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description kword -%{summary}. - -%post kword -/sbin/ldconfig || : - -%postun kword -/sbin/ldconfig || : - -%posttrans kword -update-desktop-database -q &> /dev/null ||: - -%files kword -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kword/ -%{tde_bindir}/kword -%{tde_libdir}/libkdeinit_kword.so -%{tde_libdir}/libkwordprivate.so.* -%{tde_tdelibdir}/libkwordpart.* -%{tde_tdelibdir}/kword.* -%{tde_datadir}/apps/kword/ -%{tde_datadir}/services/kword*.desktop -%{tde_datadir}/services/kwserial*.desktop -%{tde_datadir}/templates/TextDocument.desktop -%{tde_datadir}/templates/.source/TextDocument.kwt -%{tde_tdeappdir}/*kword.desktop - -########## - -%package kspread -Summary: A powerful spreadsheet application -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description kspread -%{summary}. - -%files kspread -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kspread/ -%{tde_bindir}/kspread -%{tde_libdir}/libkdeinit_kspread.so -%{tde_tdelibdir}/kspread.* -%{tde_tdelibdir}/libkspreadpart.* -%{tde_tdelibdir}/kwmailmerge_kspread.* -%{tde_tdelibdir}/libcsvexport.* -%{tde_tdelibdir}/libcsvimport.* -%{tde_tdelibdir}/libgnumericexport.* -%{tde_tdelibdir}/libgnumericimport.* -%{tde_tdelibdir}/libkspreadhtmlexport.* -%{tde_tdelibdir}/libkspreadinsertcalendar.* -%{tde_tdelibdir}/libopencalcexport.* -%{tde_tdelibdir}/libopencalcimport.* -%{tde_tdelibdir}/libqproimport.* -%{tde_datadir}/apps/kspread/ -%{tde_datadir}/services/kspread*.desktop -%{tde_datadir}/templates/SpreadSheet.desktop -%{tde_datadir}/templates/.source/SpreadSheet.kst -%{tde_tdeappdir}/*kspread.desktop -%if 0%{?with_kross} -%{tde_tdelibdir}/kspreadscripting.* -%{tde_tdelibdir}/krosskspreadcore.* -%endif - -########## - -%package kpresenter -Summary: A full-featured presentation program -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description kpresenter -%{summary}. - -%post kpresenter -/sbin/ldconfig || : - -%postun kpresenter -/sbin/ldconfig || : - -%posttrans kpresenter -update-desktop-database -q &> /dev/null ||: - -%files kpresenter -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kpresenter/ -%{tde_bindir}/kpresenter -%{tde_bindir}/kprconverter.pl -%{tde_libdir}/libkdeinit_kpresenter.so -%{tde_libdir}/libkpresenterimageexport.so.* -%{tde_libdir}/libkpresenterprivate.so.* -%{tde_tdelibdir}/*kpresenter*.* -%{tde_datadir}/apps/kpresenter/ -%{tde_datadir}/services/kpresenter*.desktop -%{tde_datadir}/templates/Presentation.desktop -%{tde_datadir}/templates/.source/Presentation.kpt -%{tde_tdeappdir}/*kpresenter.desktop - -########## - -%package kivio -Summary: A flowcharting application -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -Obsoletes: kivio < %{version}-%{release} - -%description kivio -%{summary}. - -%files kivio -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kivio/ -%{tde_bindir}/kivio -%{tde_libdir}/libkdeinit_kivio.so -%{tde_libdir}/libkiviocommon.so.* -%{tde_tdelibdir}/*kivio*.* -%{tde_tdelibdir}/straight_connector.* -%{tde_datadir}/apps/kivio/ -%{tde_datadir}/config.kcfg/kivio.kcfg -%{tde_datadir}/services/kivio*.desktop -%{tde_tdeappdir}/*kivio.desktop - -########## - -%package karbon -Summary: A vector drawing application -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description karbon -%{summary}. - -%post karbon -/sbin/ldconfig || : - -%postun karbon -/sbin/ldconfig || : - -%files karbon -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/karbon/ -%{tde_bindir}/karbon -%{tde_libdir}/libkdeinit_karbon.so -%{tde_tdelibdir}/*karbon*.* -%{tde_tdelibdir}/libwmfexport.* -%{tde_tdelibdir}/libwmfimport.* -%{tde_datadir}/apps/karbon/ -%{tde_datadir}/services/karbon* -%{tde_datadir}/servicetypes/karbon_module.desktop -%{tde_datadir}/templates/Illustration.desktop -%{tde_datadir}/templates/.source/Illustration.karbon -%{tde_tdeappdir}/*karbon.desktop - -########## - -%package kugar -Summary: A tool for generating business quality reports -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description kugar -%{summary}. - -%post kugar -/sbin/ldconfig || : - -%postun kugar -/sbin/ldconfig || : - -%posttrans kugar -update-desktop-database -q &> /dev/null ||: - -%files kugar -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kugar/ -%{tde_bindir}/kugar -%{tde_bindir}/kudesigner -%{tde_libdir}/libkdeinit_kugar.so -%{tde_libdir}/libkdeinit_kudesigner.so -%{tde_libdir}/libkugarlib.so.* -%{tde_libdir}/libkudesignercore.so -%{tde_tdelibdir}/kudesigner.* -%{tde_tdelibdir}/kugar.* -%{tde_tdelibdir}/libkudesignerpart.* -%{tde_tdelibdir}/libkugarpart.* -%{tde_datadir}/apps/kudesigner/ -%{tde_datadir}/apps/kugar/ -%{tde_datadir}/services/kugar*.desktop -%{tde_tdeappdir}/*kugar.desktop -%{tde_tdeappdir}/*kudesigner.desktop - -########## - -%package kexi -Summary: An integrated environment for managing data -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%if 0%{?with_postgresql} == 0 -Obsoletes: %{name}-kexi-driver-pgsql -%endif - -%description kexi -%{summary}. -For additional database drivers take a look at %{name}-kexi-driver-* - -%post kexi -/sbin/ldconfig || : - -%postun kexi -/sbin/ldconfig || : - -%posttrans kexi -update-desktop-database -q &> /dev/null ||: - -%files kexi -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kexi/ -%{tde_bindir}/kexi* -%{tde_bindir}/ksqlite* -%{tde_libdir}/libkdeinit_kexi.so -%{tde_libdir}/libkexi*.so.* -%{tde_libdir}/libkformdesigner.so.* -%{tde_tdelibdir}/kformdesigner_*.* -%{tde_tdelibdir}/kexidb_sqlite2driver.* -%{tde_tdelibdir}/kexidb_sqlite3driver.* -%{tde_tdelibdir}/kexihandler_*.* -%{tde_tdelibdir}/kexi.* -# moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs) -%{tde_tdelibdir}/libkspreadkexiimport.* -%{tde_datadir}/config/kexirc -%{tde_datadir}/config/magic/kexi.magic -%{tde_datadir}/mimelnk/application/* -%{tde_datadir}/servicetypes/kexi*.desktop -%{tde_datadir}/services/kexi/ -%{tde_datadir}/apps/kexi/ -%{tde_datadir}/services/kformdesigner/* -%{tde_tdeappdir}/*kexi.desktop -%{tde_datadir}/services/kexidb_sqlite*driver.desktop -%if 0%{?with_kross} -%{tde_bindir}/krossrunner -%{tde_tdelibdir}/krosskexiapp.* -%{tde_tdelibdir}/krosskexidb.* -%endif - -########## - -%package kexi-driver-mysql -Summary: Mysql-driver for kexi -Group: Applications/Productivity -Requires: %{name}-kexi = %{version}-%{release} - -%description kexi-driver-mysql -%{summary}. - -%files kexi-driver-mysql -%defattr(-,root,root,-) -%{tde_tdelibdir}/kexidb_mysqldriver.* -%{tde_tdelibdir}/keximigrate_mysql.* -%{tde_datadir}/services/keximigrate_mysql.desktop -%{tde_datadir}/services/kexidb_mysqldriver.desktop - -########## - -%if 0%{?with_postgresql} - -%package kexi-driver-pgsql -Summary: Postgresql driver for kexi -Group: Applications/Productivity -Requires: %{name}-kexi = %{version}-%{release} - -%description kexi-driver-pgsql -%{summary}. - -%files kexi-driver-pgsql -%defattr(-,root,root,-) -%{tde_tdelibdir}/kexidb_pqxxsqldriver.* -%{tde_tdelibdir}/keximigrate_pqxx.* -%{tde_datadir}/services/kexidb_pqxxsqldriver.desktop -%{tde_datadir}/services/keximigrate_pqxx.desktop - -%endif - -########## - -%package kchart -Summary: An integrated graph and chart drawing tool -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description kchart -%{summary}. - -%post kchart -/sbin/ldconfig || : - -%postun kchart -/sbin/ldconfig || : - -%posttrans kchart -update-desktop-database -q &> /dev/null ||: - -%files kchart -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kchart/ -%{tde_bindir}/kchart -%{tde_libdir}/libkchart*.so.* -%{tde_libdir}/libkdeinit_kchart.so -%{tde_tdelibdir}/*kchart*.* -%{tde_datadir}/apps/kchart/ -%{tde_datadir}/services/kchart*.desktop -%{tde_tdeappdir}/*kchart.desktop - -########## - -%package kformula -Summary: A powerful formula editor -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%if 0%{?mgaversion} || 0%{?mdkversion} -Requires: fonts-ttf-dejavu -%else -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 -Requires: dejavu-lgc-sans-fonts -Requires: lyx-cmex10-fonts -%endif -%if 0%{?rhel} == 5 -Requires: dejavu-lgc-fonts -Requires: lyx-cmex10-fonts -%endif -%if 0%{?suse_version} >= 1220 -Requires: dejavu-fonts -%endif -%if 0%{?suse_version} == 1140 -Requires: dejavu -%endif -%endif - -%description kformula -%{summary}. - -%files kformula -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kformula/ -%{tde_bindir}/kformula -%{tde_libdir}/libkdeinit_kformula.so -%{tde_tdelibdir}/*kformula*.* -%{tde_datadir}/apps/kformula/ -%{tde_datadir}/services/kformula*.desktop -%{tde_tdeappdir}/*kformula.desktop - -########## - -%package filters -Summary: Import and Export Filters for KOffice -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description filters -%{summary}. - -%post filters -/sbin/ldconfig || : - -%postun filters -/sbin/ldconfig || : - -%files filters -%defattr(-,root,root,-) -%{tde_libdir}/libkwordexportfilters.so.* -%{tde_tdelibdir}/libabiwordexport.* -%{tde_tdelibdir}/libabiwordimport.* -%{tde_tdelibdir}/libamiproexport.* -%{tde_tdelibdir}/libamiproimport.* -%{tde_tdelibdir}/libapplixspreadimport.* -%{tde_tdelibdir}/libapplixwordimport.* -%{tde_tdelibdir}/libasciiexport.* -%{tde_tdelibdir}/libasciiimport.* -%{tde_tdelibdir}/libdbaseimport.* -%{tde_tdelibdir}/libdocbookexport.* -%{tde_tdelibdir}/libexcelimport.* -%{tde_tdelibdir}/libgenerickofilter.* -%{tde_tdelibdir}/libhtmlexport.* -%{tde_tdelibdir}/libhtmlimport.* -%{tde_tdelibdir}/libkarbonepsimport.* -%{tde_tdelibdir}/libkfolatexexport.* -%{tde_tdelibdir}/libkfomathmlexport.* -%{tde_tdelibdir}/libkfomathmlimport.* -%{tde_tdelibdir}/libkfopngexport.* -%{tde_tdelibdir}/libkspreadlatexexport.* -%{tde_tdelibdir}/libkugarnopimport.* -%{tde_tdelibdir}/libkwordkword1dot3import.* -%{tde_tdelibdir}/libkwordlatexexport.* -%{tde_tdelibdir}/libmswriteexport.* -%{tde_tdelibdir}/libmswriteimport.* -%{tde_tdelibdir}/libooimpressexport.* -%{tde_tdelibdir}/libooimpressimport.* -%{tde_tdelibdir}/liboowriterexport.* -%{tde_tdelibdir}/liboowriterimport.* -%{tde_tdelibdir}/libpalmdocexport.* -%{tde_tdelibdir}/libpalmdocimport.* -%{tde_tdelibdir}/libpdfimport.* -%{tde_tdelibdir}/librtfexport.* -%{tde_tdelibdir}/librtfimport.* -%{tde_tdelibdir}/libwmlexport.* -%{tde_tdelibdir}/libwmlimport.* -%{tde_tdelibdir}/libwpexport.* -%{tde_tdelibdir}/libwpimport.* -%{tde_tdelibdir}/libmswordimport.* -%{tde_tdelibdir}/libxsltimport.* -%{tde_tdelibdir}/libxsltexport.* -%{tde_tdelibdir}/libhancomwordimport.* -%{tde_tdelibdir}/libkfosvgexport.* -%{tde_tdelibdir}/liboodrawimport.* -%{tde_tdelibdir}/libolefilter.* -%{tde_datadir}/apps/xsltfilter/ -%{tde_datadir}/services/generic_filter.desktop -%{tde_datadir}/services/ole_powerpoint97_import.desktop -%{tde_datadir}/services/xslt*.desktop -%{tde_datadir}/servicetypes/kofilter*.desktop - -########## - -%package kplato -Summary: An integrated project management and planning tool -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} - -%description kplato -%{summary}. - -%files kplato -%defattr(-,root,root,-) -%lang(en) %{tde_tdedocdir}/HTML/en/kplato/ -%{tde_bindir}/kplato -%{tde_libdir}/libkdeinit_kplato.so -%{tde_tdelibdir}/kplato.* -%{tde_tdelibdir}/libkplatopart.* -%{tde_datadir}/apps/kplato/ -%{tde_datadir}/services/kplatopart.desktop -%{tde_tdeappdir}/*kplato.desktop - -########## - -%package chalk -Summary: pixel-based image manipulation program for the TDE Office Suite [Trinity] -Group: Applications/Productivity -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-chalk-data = %{version}-%{release} -Requires: %{name}-filters - -%description chalk -Chalk is a painting and image editing application for KOffice. Chalk contains -both ease-of-use and fun features like guided painting. - -This package is part of the TDE Office Suite. - -%post chalk -/sbin/ldconfig || : - -%postun chalk -/sbin/ldconfig || : - -%posttrans chalk -update-desktop-database -q &> /dev/null ||: - -%files chalk -%defattr(-,root,root,-) -%{tde_bindir}/chalk -%{tde_tdelibdir}/chalkblurfilter.la -%{tde_tdelibdir}/chalkblurfilter.so -%{tde_tdelibdir}/chalkbumpmap.la -%{tde_tdelibdir}/chalkbumpmap.so -%{tde_tdelibdir}/chalkcimg.la -%{tde_tdelibdir}/chalkcimg.so -%{tde_tdelibdir}/chalk_cmyk_* -%{tde_tdelibdir}/chalkcmykplugin.la -%{tde_tdelibdir}/chalkcmykplugin.so -%{tde_tdelibdir}/chalkcolorify.la -%{tde_tdelibdir}/chalkcolorify.so -%{tde_tdelibdir}/chalkcolorrange.la -%{tde_tdelibdir}/chalkcolorrange.so -%{tde_tdelibdir}/chalkcolorsfilters.la -%{tde_tdelibdir}/chalkcolorsfilters.so -%{tde_tdelibdir}/chalkcolorspaceconversion.la -%{tde_tdelibdir}/chalkcolorspaceconversion.so -%{tde_tdelibdir}/chalkconvolutionfilters.la -%{tde_tdelibdir}/chalkconvolutionfilters.so -%{tde_tdelibdir}/chalkdefaultpaintops.la -%{tde_tdelibdir}/chalkdefaultpaintops.so -%{tde_tdelibdir}/chalkdefaulttools.la -%{tde_tdelibdir}/chalkdefaulttools.so -%{tde_tdelibdir}/chalkdropshadow.la -%{tde_tdelibdir}/chalkdropshadow.so -%{tde_tdelibdir}/chalkembossfilter.la -%{tde_tdelibdir}/chalkembossfilter.so -%{tde_tdelibdir}/chalkexample.la -%{tde_tdelibdir}/chalkexample.so -%{tde_tdelibdir}/chalkextensioncolorsfilters.la -%{tde_tdelibdir}/chalkextensioncolorsfilters.so -%{tde_tdelibdir}/chalkfastcolortransfer.la -%{tde_tdelibdir}/chalkfastcolortransfer.so -%{tde_tdelibdir}/chalkfiltersgallery.la -%{tde_tdelibdir}/chalkfiltersgallery.so -%{tde_tdelibdir}/chalk_gray_* -%{tde_tdelibdir}/chalkgrayplugin.la -%{tde_tdelibdir}/chalkgrayplugin.so -%{tde_tdelibdir}/chalkhistogramdocker.la -%{tde_tdelibdir}/chalkhistogramdocker.so -%{tde_tdelibdir}/chalkhistogram.la -%{tde_tdelibdir}/chalkhistogram.so -%{tde_tdelibdir}/chalkimageenhancement.la -%{tde_tdelibdir}/chalkimageenhancement.so -%{tde_tdelibdir}/chalkimagesize.la -%{tde_tdelibdir}/chalkimagesize.so -%{tde_tdelibdir}/chalk.la -%{tde_tdelibdir}/chalklenscorrectionfilter.la -%{tde_tdelibdir}/chalklenscorrectionfilter.so -%{tde_tdelibdir}/chalklevelfilter.la -%{tde_tdelibdir}/chalklevelfilter.so -%{tde_tdelibdir}/chalk_lms_* -%{tde_tdelibdir}/chalkmodifyselection.la -%{tde_tdelibdir}/chalkmodifyselection.so -%{tde_tdelibdir}/chalknoisefilter.la -%{tde_tdelibdir}/chalknoisefilter.so -%{tde_tdelibdir}/chalkoilpaintfilter.la -%{tde_tdelibdir}/chalkoilpaintfilter.so -%{tde_tdelibdir}/chalkpixelizefilter.la -%{tde_tdelibdir}/chalkpixelizefilter.so -%{tde_tdelibdir}/chalkraindropsfilter.la -%{tde_tdelibdir}/chalkraindropsfilter.so -%{tde_tdelibdir}/chalkrandompickfilter.la -%{tde_tdelibdir}/chalkrandompickfilter.so -%{tde_tdelibdir}/chalk_rgb_* -%{tde_tdelibdir}/chalkrgbplugin.la -%{tde_tdelibdir}/chalkrgbplugin.so -%{tde_tdelibdir}/chalkrotateimage.la -%{tde_tdelibdir}/chalkrotateimage.so -%{tde_tdelibdir}/chalkroundcornersfilter.la -%{tde_tdelibdir}/chalkroundcornersfilter.so -%{tde_tdelibdir}/chalkselectiontools.la -%{tde_tdelibdir}/chalkselectiontools.so -%{tde_tdelibdir}/chalkselectopaque.la -%{tde_tdelibdir}/chalkselectopaque.so -%{tde_tdelibdir}/chalkseparatechannels.la -%{tde_tdelibdir}/chalkseparatechannels.so -%{tde_tdelibdir}/chalkshearimage.la -%{tde_tdelibdir}/chalkshearimage.so -%{tde_tdelibdir}/chalksmalltilesfilter.la -%{tde_tdelibdir}/chalksmalltilesfilter.so -%{tde_tdelibdir}/chalk.so -%{tde_tdelibdir}/chalkscreenshot.la -%{tde_tdelibdir}/chalkscreenshot.so -%{tde_tdelibdir}/chalksobelfilter.la -%{tde_tdelibdir}/chalksobelfilter.so -%{tde_tdelibdir}/chalksubstrate.la -%{tde_tdelibdir}/chalksubstrate.so -%{tde_tdelibdir}/chalktoolcrop.la -%{tde_tdelibdir}/chalktoolcrop.so -%{tde_tdelibdir}/chalktoolcurves.la -%{tde_tdelibdir}/chalktoolcurves.so -%{tde_tdelibdir}/chalktoolfilter.la -%{tde_tdelibdir}/chalktoolfilter.so -%{tde_tdelibdir}/chalktoolperspectivegrid.la -%{tde_tdelibdir}/chalktoolperspectivegrid.so -%{tde_tdelibdir}/chalktoolperspectivetransform.la -%{tde_tdelibdir}/chalktoolperspectivetransform.so -%{tde_tdelibdir}/chalktoolpolygon.la -%{tde_tdelibdir}/chalktoolpolygon.so -%{tde_tdelibdir}/chalktoolpolyline.la -%{tde_tdelibdir}/chalktoolpolyline.so -%{tde_tdelibdir}/chalktoolselectsimilar.la -%{tde_tdelibdir}/chalktoolselectsimilar.so -%{tde_tdelibdir}/chalktoolstar.la -%{tde_tdelibdir}/chalktoolstar.so -%{tde_tdelibdir}/chalktooltransform.la -%{tde_tdelibdir}/chalktooltransform.so -%{tde_tdelibdir}/chalkunsharpfilter.la -%{tde_tdelibdir}/chalkunsharpfilter.so -%{tde_tdelibdir}/chalkwavefilter.la -%{tde_tdelibdir}/chalkwavefilter.so -%{tde_tdelibdir}/chalkwetplugin.la -%{tde_tdelibdir}/chalkwetplugin.so -%{tde_tdelibdir}/chalk_ycbcr_* -%if 0%{?with_graphicsmagick} -%{tde_tdelibdir}/libchalkgmagickexport.la -%{tde_tdelibdir}/libchalkgmagickexport.so -%{tde_tdelibdir}/libchalkgmagickimport.la -%{tde_tdelibdir}/libchalkgmagickimport.so -%{tde_tdelibdir}/libchalkjpegexport.la -%{tde_tdelibdir}/libchalkjpegexport.so -%{tde_tdelibdir}/libchalkjpegimport.la -%{tde_tdelibdir}/libchalkjpegimport.so -%endif -%{tde_tdelibdir}/libchalk_openexr_export.la -%{tde_tdelibdir}/libchalk_openexr_export.so -%{tde_tdelibdir}/libchalk_openexr_import.la -%{tde_tdelibdir}/libchalk_openexr_import.so -%{tde_tdelibdir}/libchalkpart.la -%{tde_tdelibdir}/libchalkpart.so -%{tde_tdelibdir}/libchalkpdfimport.la -%{tde_tdelibdir}/libchalkpdfimport.so -%{tde_tdelibdir}/libchalkpngexport.la -%{tde_tdelibdir}/libchalkpngexport.so -%{tde_tdelibdir}/libchalkpngimport.la -%{tde_tdelibdir}/libchalkpngimport.so -%{tde_tdelibdir}/libchalk_raw_import.la -%{tde_tdelibdir}/libchalk_raw_import.so -%if 0%{?with_graphicsmagick} -%{tde_tdelibdir}/libchalktiffexport.la -%{tde_tdelibdir}/libchalktiffexport.so -%{tde_tdelibdir}/libchalktiffimport.la -%{tde_tdelibdir}/libchalktiffimport.so -%endif -%{tde_libdir}/libkdeinit_chalk.so -%{tde_libdir}/libchalk_cmyk_*.so.* -%{tde_libdir}/libchalkcolor.so.* -%{tde_libdir}/libchalkcommon.so.* -%{tde_libdir}/libchalkgrayscale.so.* -%{tde_libdir}/libchalk_gray_*.so.* -%{tde_libdir}/libchalkimage.so.* -%{tde_libdir}/libchalk_lms_*.so.* -%{tde_libdir}/libchalk_rgb_*.so.* -%{tde_libdir}/libchalkrgb.so.* -%{tde_libdir}/libchalkui.so.* -%{tde_libdir}/libchalk_ycbcr_*.so.* -%if 0%{?with_kross} -%{tde_tdelibdir}/krosschalkcore.la -%{tde_tdelibdir}/krosschalkcore.so -%{tde_tdelibdir}/chalkscripting.la -%{tde_tdelibdir}/chalkscripting.so -%{tde_libdir}/libchalkscripting.so.* -%endif - -########## - -%package chalk-data -Summary: data files for Chalk painting program [Trinity] -Group: Applications/Productivity - -%description chalk-data -This package contains architecture-independent data files for Chalk, -the painting program shipped with the TDE Office Suite. - -See the chalk package for further information. - -This package is part of the TDE Office Suite. - -%files chalk-data -%defattr(-,root,root,-) -%{tde_tdeappdir}/chalk.desktop -%{tde_datadir}/applnk/.hidden/chalk_*.desktop -%{tde_datadir}/apps/konqueror/servicemenus/chalk_konqi.desktop -%{tde_datadir}/apps/chalk/ -%{tde_datadir}/apps/chalkplugins/ -%lang(en) %{tde_tdedocdir}/HTML/en/chalk/ -%{tde_datadir}/icons/hicolor/*/apps/chalk.png -%{tde_datadir}/services/chalk*.desktop -%{tde_datadir}/servicetypes/chalk*.desktop - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -# use LGC variant instead -%__sed -i.dejavu-lgc \ - -e 's|DejaVu Sans|DejaVu LGC Sans|' \ - -e 's|dejavu sans|dejavu lgc sans|' \ - lib/kformula/{contextstyle,fontstyle,symboltable}.cc - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -export KDEDIR="%{tde_prefix}" - -%if 0%{?suse_version} == 1220 -RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])') -export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" -%endif - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-extra-libs=%{tde_libdir} \ - --with-extra-includes=%{tde_includedir}/arts \ - \ - --disable-kexi-macros \ - %{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \ - %{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \ - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Moves menu elements to XDG folder -desktop-file-install \ - --dir=%{buildroot}%{tde_tdeappdir} \ - --vendor="" \ - --delete-original \ - %{buildroot}%{tde_datadir}/applnk/Office/*.desktop - -# Replace absolute symlinks with relative ones -pushd %{buildroot}%{tde_tdedocdir}/HTML -for lang in *; do - if [ -d $lang ]; then - pushd $lang - for i in */*; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common - done - popd - fi -done -popd - - -## unpackaged files -# fonts -rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/ -# libtool archives -rm -f %{buildroot}%{tde_libdir}/lib*.la -# shouldn't these be in koffice-l10n? -rm -f %{buildroot}%{tde_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh -# -devel symlinks to nuke -rm -f %{buildroot}%{tde_libdir}/lib*common.so -rm -f %{buildroot}%{tde_libdir}/lib*filters.so -rm -f %{buildroot}%{tde_libdir}/lib*private.so -rm -f %{buildroot}%{tde_libdir}/libkarbon*.so -rm -f %{buildroot}%{tde_libdir}/libkchart*.so -rm -f %{buildroot}%{tde_libdir}/libkexi*.so -rm -f %{buildroot}%{tde_libdir}/libkisexiv2.so -rm -f %{buildroot}%{tde_libdir}/libkformdesigner.so -rm -f %{buildroot}%{tde_libdir}/libkplato*.so -rm -f %{buildroot}%{tde_libdir}/libkpresenter*.so -rm -f %{buildroot}%{tde_libdir}/libkword*.so -rm -f %{buildroot}%{tde_libdir}/libkross*.so -rm -f %{buildroot}%{tde_libdir}/libkugar*.so - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice.spec index ce0cec112..420a08dc3 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg koffice %define tde_prefix /opt/trinity @@ -101,7 +101,6 @@ BuildRequires: libjpeg-devel BuildRequires: ImageMagick-devel BuildRequires: zlib-devel BuildRequires: openssl-devel -BuildRequires: python-devel BuildRequires: pcre-devel BuildRequires: gettext-devel BuildRequires: mysql-devel @@ -113,6 +112,18 @@ BuildRequires: OpenEXR-devel BuildRequires: libexif-devel BuildRequires: readline-devel +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel + # LCMS support %if 0%{?suse_version} || 0%{?rhel} >= 7 BuildRequires: liblcms-devel @@ -625,8 +636,8 @@ For additional database drivers take a look at %{name}-kexi-driver-* %{tde_tdelibdir}/kexi.* # moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs) %{tde_tdelibdir}/libkspreadkexiimport.* -%{tde_confdir}/kexirc -%{tde_confdir}/magic/kexi.magic +%config(noreplace) %{tde_confdir}/kexirc +%config(noreplace) %{tde_confdir}/magic/kexi.magic %{tde_datadir}/mimelnk/application/* %{tde_datadir}/servicetypes/kexi*.desktop %{tde_datadir}/services/kexi/ @@ -639,7 +650,7 @@ For additional database drivers take a look at %{name}-kexi-driver-* %{tde_tdelibdir}/krosskexiapp.* %{tde_tdelibdir}/krosskexidb.* %endif -%{tde_confdir}/magic/kexi.magic.mgc +%config(noreplace) %{tde_confdir}/magic/kexi.magic.mgc ########## @@ -710,8 +721,10 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?mgaversion} || 0%{?mdkversion} Requires: fonts-ttf-dejavu %else -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 +%if 0%{?fedora} >= 11 || 0%{?rhel} == 6 || 0%{?rhel} == 7 Requires: dejavu-lgc-sans-fonts +%endif +%if 0%{?fedora} >= 11 || 0%{?rhel} == 6 || 0%{?rhel} == 7 Requires: lyx-cmex10-fonts %endif %if 0%{?rhel} == 5 @@ -1054,7 +1067,11 @@ export kde_confdir="%{tde_confdir}" %if 0%{?suse_version} == 1220 RD=$(ruby -r rbconfig -e 'printf("%s",Config::CONFIG["rubyhdrdir"])') -export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" +CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux" +%endif + +%if 0%{?suse_version} >= 1550 +CXXFLAGS="${CXXFLAGS} -std=c++11" %endif # FTBFS on RHEL 5 diff --git a/redhat/applications/koffice/koshell.png b/redhat/applications/koffice/koshell.png Binary files differnew file mode 100644 index 000000000..c66ef99e8 --- /dev/null +++ b/redhat/applications/koffice/koshell.png diff --git a/redhat/applications/konversation/konversation-3.5.13.2.spec b/redhat/applications/konversation/konversation-3.5.13.2.spec deleted file mode 100644 index 98f1f0472..000000000 --- a/redhat/applications/konversation/konversation-3.5.13.2.spec +++ /dev/null @@ -1,174 +0,0 @@ -# Default version for this component -%define tde_pkg konversation -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: user friendly Internet Relay Chat (IRC) client for TDE [Trinity] -Version: 1.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -BuildRequires: libxslt-devel -%if 0%{?suse_version} -BuildRequires: docbook-xsl-stylesheets -%else -BuildRequires: docbook-style-xsl -%endif - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xi-devel -%endif -%if 0%{?rhel} >= 5|| 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXi-devel -%endif -%if 0%{?suse_version} == 1140 -BuildRequires: libXi6-devel -%endif - -%description -Konversation is a client for the Internet Relay Chat (IRC) protocol. -It is easy to use and well-suited for novice IRC users, but novice -and experienced users alike will appreciate its many features: - - * Standard IRC features - * Easy to use graphical interface - * Multiple server and channel tabs in a single window - * IRC color support - * Pattern-based message highlighting and OnScreen Display - * Multiple identities for different servers - * Multi-language scripting support (with DCOP) - * Customizable command aliases - * NickServ-aware log-on (for registered nicknames) - * Smart logging - * Traditional or enhanced-shell-style nick completion - * DCC file transfer with resume support - - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/konversation -%{tde_tdeappdir}/konversation.desktop -%{tde_datadir}/apps/kconf_update/konversation-0.19-appearance.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-colorcodes.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-colors.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-custombrowser.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-notifylists.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-sortorder.pl -%{tde_datadir}/apps/kconf_update/konversation-0.19-tabplacement.pl -%{tde_datadir}/apps/kconf_update/konversation-0.20-customfonts.pl -%{tde_datadir}/apps/kconf_update/konversation-0.20-quickbuttons.pl -%{tde_datadir}/apps/kconf_update/konversation.upd -%{tde_datadir}/apps/konversation/ -%{tde_datadir}/config.kcfg/konversation.kcfg -%{tde_datadir}/services/konvirc.protocol -%{tde_datadir}/services/konvirc6.protocol -%{tde_tdedocdir}/HTML/*/konversation/ -%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyaway.png -%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyoffline.png -%{tde_datadir}/icons/crystalsvg/*/actions/kimproxyonline.png -%{tde_datadir}/icons/crystalsvg/*/actions/char.png -%{tde_datadir}/icons/crystalsvg/*/actions/konv_message.png -%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyaway.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyoffline.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/kimproxyonline.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/konv_message.svgz -%{tde_datadir}/icons/hicolor/*/apps/konversation.png -%{tde_datadir}/icons/hicolor/scalable/apps/konversation.svgz - - -%changelog diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/konversation/konversation.spec index 27aa8edaa..389edbe64 100644 --- a/redhat/applications/konversation/konversation.spec +++ b/redhat/applications/konversation/konversation.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg konversation %define tde_prefix /opt/trinity @@ -109,7 +109,7 @@ BuildRequires: libXi6-devel # RHEL 5: available in centos-extras # RHEL 6: available in EPEL # RHEL 7: available in NUX -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -176,6 +176,12 @@ and experienced users alike will appreciate its many features: %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%__sed -i "konversation/scripts/media" \ + "konversation/scripts/weather" \ + -e "s|/usr/bin/env python|/usr/bin/env python2|" +%endif + %build unset QTDIR QTINC QTLIB diff --git a/redhat/applications/kooldock/kooldock.spec b/redhat/applications/kooldock/kooldock.spec index 647d511c7..0adc94cb8 100644 --- a/redhat/applications/kooldock/kooldock.spec +++ b/redhat/applications/kooldock/kooldock.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.1 +%define tde_version 14.1.0 %endif %define tde_pkg kooldock %define tde_prefix /opt/trinity @@ -67,6 +67,15 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool +# IDN support +BuildRequires: libidn-devel + +# ACL support +BuildRequires: libacl-devel + +# OPENSSL support +BuildRequires: openssl-devel + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -154,30 +163,7 @@ export PATH="%{tde_bindir}:${PATH}" %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/ %{tde_datadir}/icons/crystalsvg/16x16/apps/kooldock.png %{tde_datadir}/icons/crystalsvg/32x32/apps/kooldock.png %{tde_datadir}/icons/crystalsvg/64x64/apps/kooldock.png diff --git a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec b/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec deleted file mode 100644 index 6b1eee75b..000000000 --- a/redhat/applications/kopete-otr/kopete-otr-3.5.13.2.spec +++ /dev/null @@ -1,151 +0,0 @@ -# openSUSE 12.3: do NOT install libotr-devel, use libotr2-devel instead ! - -# Default version for this component -%define tde_pkg kopete-otr -%define tde_version 3.5.13.2 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# Under Mageia 3, we require "libotr3" package - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Off-The-Record encryption for Kopete [Trinity] -Version: 0.7 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-tdenetwork-devel >= %{tde_version} - -# Kopete is provided by kdenetwork -Requires: trinity-kopete >= %{tde_version} -%if 0%{?suse_version} >= 1230 -BuildRequires: libotr2-devel -%else -BuildRequires: libotr-devel -%endif - -%description -This plugin enables Off-The-Record encryption for the TDE instant -messenger Kopete. Using this plugin you can encrypt chatsessions to other -users with IM-Cients supporting the OTR encryption method. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-extra-includes=/usr/include/tqt - -%__make %{_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -%__rm -f %{?buildroot}%{tde_libdir}/libkotr.so - -%find_lang kopete_otr - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - - -%files -f kopete_otr.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README TODO -%{tde_libdir}/libkotr.la -%{tde_libdir}/libkotr.so.0 -%{tde_libdir}/libkotr.so.0.0.0 -%{tde_tdelibdir}/kcm_kopete_otr.la -%{tde_tdelibdir}/kcm_kopete_otr.so -%{tde_tdelibdir}/kopete_otr.la -%{tde_tdelibdir}/kopete_otr.so -%{tde_datadir}/apps/kopete_otr -%{tde_datadir}/config.kcfg/kopete_otr.kcfg -%{tde_tdedocdir}/HTML/en/kopete_otr/ -%{tde_datadir}/icons/crystalsvg/16x16/apps/kopete_otr.png -%{tde_datadir}/services/kconfiguredialog/kopete_otr_config.desktop -%{tde_datadir}/services/kopete_otr.desktop - - -%changelog diff --git a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec b/redhat/applications/kopete-otr/kopete-otr.spec index 602ab32c3..b2f6fe6fa 100644 --- a/redhat/applications/kopete-otr/kopete-otr-14.0.0.spec +++ b/redhat/applications/kopete-otr/kopete-otr.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kopete-otr %define tde_prefix /opt/trinity diff --git a/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec b/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec deleted file mode 100644 index 284de9ad5..000000000 --- a/redhat/applications/kpicosim/kpicosim-3.5.13.2.spec +++ /dev/null @@ -1,124 +0,0 @@ -# Default version for this component -%define tde_pkg kpicosim -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: IDE and simulator for the Xilinx PicoBlaze-3 [Trinity] -Version: 0.6a -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -kpicosim is a development environment for the Xilinx -PicoBlaze-3 soft-core processor for the TDE Desktop (Linux). -The environment has an editor with syntax highlighting, compiler, -simulator and export functions to VHDL, HEX and MEM files. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README -%{tde_bindir}/kpicosim -%{tde_datadir}/applnk/Development/kpicosim.desktop -%{tde_datadir}/apps/katepart/syntax/psm.xml -%{tde_datadir}/apps/kpicosim -%{tde_tdedocdir}/HTML/en/kpicosim -%{tde_datadir}/icons/hicolor/*/apps/kpicosim.png - - -%changelog diff --git a/redhat/applications/kpicosim/kpicosim.spec b/redhat/applications/kpicosim/kpicosim.spec index a1623f95b..d8161830b 100644 --- a/redhat/applications/kpicosim/kpicosim.spec +++ b/redhat/applications/kpicosim/kpicosim.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kpicosim %define tde_prefix /opt/trinity @@ -137,16 +137,31 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + +# Move desktop icon to XDG directory +if [ -d "%{buildroot}%{tde_datadir}/applnk" ]; then + %__mkdir_p %{buildroot}%{tde_tdeappdir} + %__mv "%{buildroot}%{tde_datadir}/applnk/Development/kpicosim.desktop" "%{buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" + %__rm -r "%{buildroot}%{tde_datadir}/applnk" +fi + + +# Updates applications categories for openSUSE +%if 0%{?suse_version} +%suse_update_desktop_file -D kpicosim -C "%summary" kpicosim Development IDE +%endif + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS ChangeLog COPYING README %{tde_bindir}/kpicosim -%{tde_datadir}/applnk/Development/kpicosim.desktop +%{tde_tdeappdir}/kpicosim.desktop %{tde_datadir}/apps/katepart/syntax/psm.xml %{tde_datadir}/apps/kpicosim %{tde_tdedocdir}/HTML/en/kpicosim diff --git a/redhat/applications/kpilot/kpilot-3.5.13.2.spec b/redhat/applications/kpilot/kpilot-3.5.13.2.spec deleted file mode 100644 index 4bfb1a46e..000000000 --- a/redhat/applications/kpilot/kpilot-3.5.13.2.spec +++ /dev/null @@ -1,173 +0,0 @@ -# Default version for this component -%define tde_pkg kpilot -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: TDE Palm Pilot hot-sync tool -Version: 0.7 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: flex-devel -BuildRequires: gettext -BuildRequires: pilot-link-devel >= 0.12 -BuildRequires: trinity-tdepim-devel >= %{tde_version} - -%description -KPilot is an application that synchronizes your Palm Pilot or similar device -(like the Handspring Visor) with your TDE desktop, much like the Palm HotSync -software does for Windows. KPilot can back-up and restore your Palm Pilot -and synchronize the built-in applications with their TDE counterparts. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -%__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so - - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor locolor crystalsvg; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor locolor crystalsvg; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kpalmdoc -%{tde_bindir}/kpilot -%{tde_bindir}/kpilotDaemon -%{tde_tdeincludedir}/kpilot -%{tde_libdir}/libkpilot.la -%{tde_libdir}/libkpilot.so.0 -%{tde_libdir}/libkpilot.so.0.0.0 -%{tde_tdelibdir}/conduit_address.la -%{tde_tdelibdir}/conduit_address.so -%{tde_tdelibdir}/conduit_doc.la -%{tde_tdelibdir}/conduit_doc.so -%{tde_tdelibdir}/conduit_knotes.la -%{tde_tdelibdir}/conduit_knotes.so -%{tde_tdelibdir}/conduit_memofile.la -%{tde_tdelibdir}/conduit_memofile.so -%{tde_tdelibdir}/conduit_notepad.la -%{tde_tdelibdir}/conduit_notepad.so -%{tde_tdelibdir}/conduit_popmail.la -%{tde_tdelibdir}/conduit_popmail.so -%{tde_tdelibdir}/conduit_sysinfo.la -%{tde_tdelibdir}/conduit_sysinfo.so -%{tde_tdelibdir}/conduit_time.la -%{tde_tdelibdir}/conduit_time.so -%{tde_tdelibdir}/conduit_todo.la -%{tde_tdelibdir}/conduit_todo.so -%{tde_tdelibdir}/conduit_vcal.la -%{tde_tdelibdir}/conduit_vcal.so -%{tde_tdelibdir}/kcm_kpilot.la -%{tde_tdelibdir}/kcm_kpilot.so -%{tde_tdeappdir}/kpalmdoc.desktop -%{tde_tdeappdir}/kpilot.desktop -%{tde_tdeappdir}/kpilotdaemon.desktop -%{tde_datadir}/apps/kaddressbook/contacteditorpages/KPilotCustomFieldEditor.ui -%{tde_datadir}/apps/kconf_update/kpalmdoc.upd -%{tde_datadir}/apps/kconf_update/kpilot.upd -%{tde_datadir}/apps/kpilot -%{tde_datadir}/config.kcfg/*.kcfg -%{tde_datadir}/icons/crystalsvg/*/apps/*.png -%{tde_datadir}/icons/hicolor/*/apps/*.png -%{tde_datadir}/icons/locolor/*/apps/*.png -%{tde_datadir}/services/*.desktop -%{tde_datadir}/servicetypes/kpilotconduit.desktop - - -%changelog diff --git a/redhat/applications/kpilot/kpilot.spec b/redhat/applications/kpilot/kpilot.spec index 179e464d2..c8cc0e565 100644 --- a/redhat/applications/kpilot/kpilot.spec +++ b/redhat/applications/kpilot/kpilot.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kpilot %define tde_prefix /opt/trinity diff --git a/redhat/applications/kplayer/kplayer.spec b/redhat/applications/kplayer/kplayer.spec index 45a4ae38f..8bbad32df 100644 --- a/redhat/applications/kplayer/kplayer.spec +++ b/redhat/applications/kplayer/kplayer.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kplayer %define tde_prefix /opt/trinity diff --git a/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec b/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec deleted file mode 100644 index 9abc1468c..000000000 --- a/redhat/applications/kpowersave/kpowersave-3.5.13.2.spec +++ /dev/null @@ -1,158 +0,0 @@ -# Default version for this component -%define tde_pkg kpowersave -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Version: 0.7.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} -Summary: HAL based power management applet for Trinityfiles or directories. - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: hal-devel -BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 - - -%description -KPowersave is a TDE systray applet which allows to control the power -management settings and policies of your computer. -It relies on HAL to do the heavy lifting. - -Current feature list: - * support for ACPI, APM and PMU - * trigger suspend to disk/ram and standby - * switch cpu frequency policy (between: performance, dynamic and powersave) - * applet icon with information about AC state, battery fill and battery - (warning) states - * applet tooltip with information about battery fill and remaining battery - time/percentage - * autosuspend (to suspend the machine if the user has been inactive for a - defined time) - * a global configurable blacklist with programs which prevent autosuspend - (e.g. videoplayer and cd burning tools) - * trigger lock screen and select the lock method - * KNotify support - * online help - * localisations for many languages - -KPowersave supports schemes with following configurable specific -settings for: - * screensaver - * DPMS - * autosuspend - * scheme specific blacklist for autosuspend - * notification settings - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DWITH_GCC_VISIBILITY=OFF \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DBUILD_ALL=ON \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kpowersave -%{tde_libdir}/libkdeinit_kpowersave.la -%{tde_libdir}/libkdeinit_kpowersave.so -%{tde_tdelibdir}/kpowersave.la -%{tde_tdelibdir}/kpowersave.so -%{tde_tdeappdir}/kpowersave.desktop -%{tde_datadir}/apps/kpowersave/eventsrc -%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/autostart/kpowersave-autostart.desktop -%{tde_datadir}/config/kpowersaverc - -%changelog diff --git a/redhat/applications/kpowersave/kpowersave-14.0.0.spec b/redhat/applications/kpowersave/kpowersave.spec index 2bb9fe60a..992e6c7d3 100644 --- a/redhat/applications/kpowersave/kpowersave-14.0.0.spec +++ b/redhat/applications/kpowersave/kpowersave.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kpowersave %define tde_prefix /opt/trinity @@ -82,7 +82,7 @@ BuildRequires: brp-check-trinity # RHEL 4: disabled # RHEL 6: available in EPEL # RHEL 7: available in NUX -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 diff --git a/redhat/applications/krecipes/krecipes-14.0.0.spec b/redhat/applications/krecipes/krecipes.spec index b04652b96..69c3d81f8 100644 --- a/redhat/applications/krecipes/krecipes-14.0.0.spec +++ b/redhat/applications/krecipes/krecipes.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg krecipes %define tde_prefix /opt/trinity diff --git a/redhat/applications/krename/krename-3.5.13.2.spec b/redhat/applications/krename/krename-3.5.13.2.spec deleted file mode 100644 index f5267c587..000000000 --- a/redhat/applications/krename/krename-3.5.13.2.spec +++ /dev/null @@ -1,127 +0,0 @@ -# Default version for this component -%define tde_pkg krename -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: A TDE batch file renaming utility. -Version: 3.0.14 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -KRename is a powerful batch renamer for TDE. It allows you to easily rename hundreds or -even more files in one go. The filenames can be created by parts of the original filename, -numbering the files or accessing hundreds of informations about the file, like creation date -or Exif informations of an image. - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -update-desktop-database %{tde_appdir} &> /dev/null - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/krename -%{tde_tdeappdir}/krename.desktop -%{tde_datadir}/apps/konqueror/servicemenus/krename_dir.desktop -%{tde_datadir}/apps/konqueror/servicemenus/krenameservicemenu.desktop -%{tde_datadir}/apps/krename/ -%{tde_tdedocdir}/HTML/en/krename/ -%{tde_datadir}/icons/hicolor/*/apps/krename.png -%{tde_datadir}/icons/locolor/*/apps/krename.png - - -%changelog diff --git a/redhat/applications/krename/krename.spec b/redhat/applications/krename/krename.spec index c0f464690..f1bd53432 100644 --- a/redhat/applications/krename/krename.spec +++ b/redhat/applications/krename/krename.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg krename %define tde_prefix /opt/trinity diff --git a/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch b/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch deleted file mode 100644 index eb1f41ffd..000000000 --- a/redhat/applications/krusader/krusader-3.5.13.2-tmpvfs-ftbfs.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/krusader/VFS/temp_vfs.cpp b/krusader/VFS/temp_vfs.cpp -index 25f3a15..ee68521 100644 ---- a/krusader/VFS/temp_vfs.cpp -+++ b/krusader/VFS/temp_vfs.cpp -@@ -56,7 +56,7 @@ temp_vfs::temp_vfs( TQString origin, TQString type, TQWidget* panel, bool ): - } - - temp_vfs::~temp_vfs(){ -- if( vfs_type == "-iso" ){ -+ if( tmpvfs_type == ISO ){ - // unmount the ISO image - KShellProcess umount; - umount << "umount -f" << tmpDir; -@@ -94,6 +94,13 @@ bool temp_vfs::vfs_refresh(const KURL& origin){ - } - - void temp_vfs::handleAceArj(TQString origin, TQString type){ -+ if (type == "-ace") { -+ tmpvfs_type = ACE; -+ } -+ else if (type == "-arj") { -+ tmpvfs_type = ARJ; -+ } -+ - // for ace and arj we just unpack to the tmpDir - if( !KRarcHandler::arcHandled(type) ){ - if (!quietMode) KMessageBox::error(krApp,"This archive type is NOT supported"); -@@ -117,6 +124,7 @@ void temp_vfs::handleRpm(TQString origin){ - rpm.clearArguments(); - rpm << "rpm -lpq"<<"\""+origin+"\""+" > "+tmpDir+"/filelist.txt"; - rpm.start(KProcess::Block); -+ tmpvfs_type = RPM; - } - - void temp_vfs::handleIso(TQString origin){ -@@ -124,4 +132,5 @@ void temp_vfs::handleIso(TQString origin){ - KShellProcess mount; - mount << KrServices::fullPathName( "mount" ) << "-o loop" << origin << tmpDir; - mount.start(KProcess::Block); -+ tmpvfs_type = ISO; - } -diff --git a/krusader/VFS/temp_vfs.h b/krusader/VFS/temp_vfs.h -index 3b94248..d35169b 100644 ---- a/krusader/VFS/temp_vfs.h -+++ b/krusader/VFS/temp_vfs.h -@@ -37,6 +37,8 @@ - - class temp_vfs : public normal_vfs { - public: -+ enum TMPVFS_TYPE{ERROR=0,ACE,ARJ,RPM,ISO}; -+ - temp_vfs( TQString origin, TQString type, TQWidget* panel, bool writeable); - ~temp_vfs(); - TQString vfs_workingDir(); -@@ -50,6 +52,7 @@ protected: - void handleAceArj(TQString origin, TQString type); - void handleRpm(TQString origin); - void handleIso(TQString origin); -+ TMPVFS_TYPE tmpvfs_type; //< the tmp vfs type. - TQString tmpDir; - - }; diff --git a/redhat/applications/krusader/krusader-3.5.13.2.spec b/redhat/applications/krusader/krusader-3.5.13.2.spec deleted file mode 100644 index 615b95ea4..000000000 --- a/redhat/applications/krusader/krusader-3.5.13.2.spec +++ /dev/null @@ -1,155 +0,0 @@ -# Default version for this component -%define tde_pkg krusader -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: twin-panel (commander-style) file manager for TDE (and other desktops) -Version: 1.90.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch0: krusader-3.5.13.2-tmpvfs-ftbfs.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-tdebindings-devel >= %{tde_version} - - -%description -Krusader is a simple, easy, powerful, twin-panel (commander-style) file -manager for TDE and other desktops, similar to Midnight Commander (C) or Total -Commander (C). - -It provides all the file management features you could possibly want. - -Plus: extensive archive handling, mounted filesystem support, FTP, -advanced search module, viewer/editor, directory synchronisation, -file content comparisons, powerful batch renaming and much much more. - -It supports archive formats: ace, arj, bzip2, deb, iso, lha, rar, rpm, tar, -zip and 7-zip. - -It handles KIOSlaves such as smb:// or fish://. - -Almost completely customizable, Krusader is very user friendly, fast and looks -great on your desktop. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .ftbfs - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -update-desktop-database %{tde_appdir} > /dev/null -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING FAQ README TODO -%{tde_bindir}/krusader -%{tde_tdelibdir}/kio_krarc.la -%{tde_tdelibdir}/kio_krarc.so -%{tde_tdelibdir}/kio_virt.la -%{tde_tdelibdir}/kio_virt.so -%{tde_tdeappdir}/krusader.desktop -%{tde_tdeappdir}/krusader_root-mode.desktop -%{tde_datadir}/apps/krusader -%{tde_tdedocdir}/HTML/en/krusader/ -%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/ -%{tde_datadir}/icons/crystalsvg/*/apps/*.png -%{tde_datadir}/icons/locolor/*/apps/*.png -%{tde_datadir}/services/krarc.protocol -%{tde_datadir}/services/virt.protocol -%{tde_mandir}/man1/krusader.1 - - -%changelog diff --git a/redhat/applications/krusader/krusader-14.0.0.spec b/redhat/applications/krusader/krusader.spec index 260c97e4a..cf314c68f 100644 --- a/redhat/applications/krusader/krusader-14.0.0.spec +++ b/redhat/applications/krusader/krusader.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg krusader %define tde_prefix /opt/trinity diff --git a/redhat/applications/kscope/kscope-14.0.0.spec b/redhat/applications/kscope/kscope.spec index c684c1e6e..0df980cff 100644 --- a/redhat/applications/kscope/kscope-14.0.0.spec +++ b/redhat/applications/kscope/kscope.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kscope %define tde_prefix /opt/trinity diff --git a/redhat/applications/ksensors/ksensors-3.5.13.2.spec b/redhat/applications/ksensors/ksensors-3.5.13.2.spec deleted file mode 100644 index e1874db69..000000000 --- a/redhat/applications/ksensors/ksensors-3.5.13.2.spec +++ /dev/null @@ -1,139 +0,0 @@ -# Default version for this component -%define tde_pkg ksensors -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -Name: trinity-ksensors -Version: 0.7.3 -Release: %{?!preversion:20}%{?preversion:19_%{preversion}}%{?dist} - -Summary: Trinity Frontend to lm_sensors -Group: Applications/System -License: GPLv2+ -URL: http://ksensors.sourceforge.net/ - -Source0: %{tde_pkg}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -%if 0%{?suse_version} -BuildRequires: libsensors4-devel -%else -BuildRequires: lm_sensors-devel -%endif - -# Keep archs in sync with lm_sensors -ExcludeArch: s390 s390x - -%description -KSensors is a nice lm-sensors frontend for the K Desktop Environment. -Install the hddtemp package if you wish to monitor hard disk -temperatures with KSensors. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{tde_pkg}-%{version} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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 -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} - - -%install -%__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT - -# Creates autostart shortcut -%__install -dm 755 $RPM_BUILD_ROOT%{tde_datadir}/autostart -%__ln_s ../applnk/Utilities/ksensors.desktop \ - $RPM_BUILD_ROOT%{tde_datadir}/autostart - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%post -for f in locolor hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || : - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || : -done - -%postun -for f in locolor hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null || : - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null || : -done - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING FAQ README TODO -%lang(es) %doc LEEME -%lang(de) %doc LIESMICH -%lang(fr) %doc LISEZMOI -%{tde_bindir}/ksensors -%{tde_datadir}/applnk/System/ksensors.desktop -%{tde_datadir}/apps/ksensors/ -%{tde_datadir}/autostart/ksensors.desktop -%{tde_datadir}/icons/hicolor/*/apps/ksensors.png -%{tde_datadir}/icons/locolor/*/apps/ksensors.png -%{tde_datadir}/sounds/ksensors_alert.wav -%{tde_tdedocdir}/HTML/en/ksensors/ - - -%changelog diff --git a/redhat/applications/ksensors/ksensors.spec b/redhat/applications/ksensors/ksensors.spec index ba1b1f917..e26f4f704 100644 --- a/redhat/applications/ksensors/ksensors.spec +++ b/redhat/applications/ksensors/ksensors.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg ksensors %define tde_prefix /opt/trinity @@ -149,10 +149,6 @@ fi %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -C build -# Move desktop icon to correct location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" - %find_lang %{tde_pkg} # Updates applications categories for openSUSE @@ -168,9 +164,6 @@ fi %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING FAQ README TODO -%lang(es) %doc LEEME -%lang(de) %doc LIESMICH -%lang(fr) %doc LISEZMOI %{tde_bindir}/ksensors %{tde_tdeappdir}/ksensors.desktop %{tde_datadir}/apps/ksensors/ diff --git a/redhat/applications/kshowmail/kshowmail-14.0.0.spec b/redhat/applications/kshowmail/kshowmail.spec index 6fecd9bad..e560e72b5 100644 --- a/redhat/applications/kshowmail/kshowmail-14.0.0.spec +++ b/redhat/applications/kshowmail/kshowmail.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kshowmail %define tde_prefix /opt/trinity @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: trinity-tdepim-devel >= %{tde_version} -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -76,6 +76,15 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description Very simply kshowmail is a program that allows you to look in on your mail server, @@ -93,44 +102,48 @@ All without dragging any messages into your computer. %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/"*"/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}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} + -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. + +%__make %{?_smp_mflags} || %__make %install %__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT -C build %find_lang %{tde_pkg} -# Move desktop icon to correct location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" - # Install missing icons install -D -m 644 "pics/cr16-app-kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/16x16/apps/kshowmail.png" install -D -m 644 "pics/kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/icons/hicolor/48x48/apps/kshowmail.png" @@ -174,6 +187,7 @@ install -D -m 644 "pics/kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/i %{tde_datadir}/services/kshowmailconfiggeneral.desktop %{tde_datadir}/services/kshowmailconfiglog.desktop %{tde_datadir}/services/kshowmailconfigspamcheck.desktop +%lang(cs) %{tde_tdedocdir}/HTML/cs/kshowmail/ %lang(de) %{tde_tdedocdir}/HTML/de/kshowmail/ %lang(en) %{tde_tdedocdir}/HTML/en/kshowmail/ %lang(es) %{tde_tdedocdir}/HTML/es/kshowmail/ @@ -182,6 +196,7 @@ install -D -m 644 "pics/kshowmail.png" "$RPM_BUILD_ROOT%{tde_datadir}/i %lang(it) %{tde_tdedocdir}/HTML/it/kshowmail/ %lang(ru) %{tde_tdedocdir}/HTML/ru/kshowmail/ %lang(sv) %{tde_tdedocdir}/HTML/sv/kshowmail/ +%{tde_mandir}/man1/kshowmail.* %changelog diff --git a/redhat/applications/kshutdown/kshutdown.spec b/redhat/applications/kshutdown/kshutdown.spec index 3e8fe4ee1..395324ec7 100644 --- a/redhat/applications/kshutdown/kshutdown.spec +++ b/redhat/applications/kshutdown/kshutdown.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kshutdown %define tde_prefix /opt/trinity @@ -152,7 +152,7 @@ fi # Updates applications categories for openSUSE %if 0%{?suse_version} -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/kshutdown.desktop" +echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kshutdown.desktop" %suse_update_desktop_file %{tde_pkg} Utility DesktopUtility %endif @@ -167,7 +167,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/kshutdown.des %{tde_bindir}/kshutdown %{tde_tdelibdir}/kshutdownlockout_panelapplet.la %{tde_tdelibdir}/kshutdownlockout_panelapplet.so -%{tde_datadir}/applications/kshutdown.desktop +%{tde_tdeappdir}/kshutdown.desktop %{tde_datadir}/apps/kicker/applets/kshutdownlockout.desktop %{tde_datadir}/apps/kshutdown/ %{tde_datadir}/apps/tdeconf_update/kshutdown.upd diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec deleted file mode 100644 index a27f7d851..000000000 --- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin-3.5.13.2.spec +++ /dev/null @@ -1,121 +0,0 @@ -# Default version for this component -%define tde_pkg ksplash-engine-moodin -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: fading splash screen engine for Trinity -Version: 0.4.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -Heavily customizable engine for various types of themes. - -Features: -* scale cache -* fading images -* use current icon set or custom images -* unlimited Custom text labels -* set fading delay and length -* custom image arrangement -* resolution independent themes - -This TDE splash screen engine is based upon Linspire's -engine by Sean Meiners <Sean.Meiners@LinspireInc.com> - -Homepage: http://moodwrod.com - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{tde_tdelibdir}/ksplashmoodin.la -%{tde_tdelibdir}/ksplashmoodin.so -%{tde_datadir}/apps/ksplash/Themes/FingerPrint/ -%{tde_datadir}/apps/ksplash/Themes/MoodinKDE/ -%{tde_datadir}/services/ksplashmoodin.desktop - - -%changelog diff --git a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec index d22e32925..b12004bf5 100644 --- a/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec +++ b/redhat/applications/ksplash-engine-moodin/ksplash-engine-moodin.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg ksplash-engine-moodin %define tde_prefix /opt/trinity @@ -153,12 +153,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_tdelibdir}/ksplashmoodin.la %{tde_tdelibdir}/ksplashmoodin.so diff --git a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec b/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec deleted file mode 100644 index d9b8d3d35..000000000 --- a/redhat/applications/ksquirrel/ksquirrel-3.5.13.2.spec +++ /dev/null @@ -1,146 +0,0 @@ -# Default version for this component -%define tde_pkg ksquirrel -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Powerful Trinity image viewer -Version: 0.8.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Amusements/Games - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext -BuildRequires: trinity-libkipi-devel -BuildRequires: trinity-libksquirrel-devel -#BuildRequires: libkexif-devel - -%description -KSquirrel is an image viewer for TDE with disk navigator, file tree, -multiple directory view, thumbnails, extended thumbnails, dynamic -format support, DCOP interface, KEXIF and KIPI plugins support. - -KSquirrel is a fast and convenient image viewer for TDE featuring -OpenGL and dynamic format support. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO -%{tde_bindir}/ksquirrel -%{tde_bindir}/ksquirrel-libs-configurator -%{tde_bindir}/ksquirrel-libs-configurator-real -%{tde_tdelibdir}/libksquirrelpart.la -%{tde_tdelibdir}/libksquirrelpart.so -%{tde_tdeappdir}/ksquirrel.desktop -%{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop -%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop -%{tde_datadir}/apps/ksquirrel/ -%{tde_datadir}/apps/ksquirrelpart/ksquirrelpart.rc -%{tde_datadir}/config/magic/x-ras.magic -%{tde_datadir}/config/magic/x-sun.magic -%{tde_datadir}/config/magic/x-utah.magic -%{tde_tdedocdir}/HTML/*/ksquirrel -%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png -%{tde_datadir}/mimelnk/image/*.desktop -%{tde_datadir}/services/ksquirrelpart.desktop -%{tde_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo -%{tde_mandir}/man1/ksquirrel.1 - -%changelog diff --git a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec b/redhat/applications/ksquirrel/ksquirrel.spec index 0a12ea867..fc17cceda 100644 --- a/redhat/applications/ksquirrel/ksquirrel-14.0.0.spec +++ b/redhat/applications/ksquirrel/ksquirrel.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg ksquirrel %define tde_prefix /opt/trinity @@ -179,17 +179,17 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop %{tde_datadir}/apps/ksquirrel/ %{tde_datadir}/apps/ksquirrelpart/ -%{tde_confdir}/magic/x-ras.magic -%{tde_confdir}/magic/x-sun.magic -%{tde_confdir}/magic/x-utah.magic +%config(noreplace) %{tde_confdir}/magic/x-ras.magic +%config(noreplace) %{tde_confdir}/magic/x-sun.magic +%config(noreplace) %{tde_confdir}/magic/x-utah.magic %{tde_tdedocdir}/HTML/*/ksquirrel %{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png %{tde_datadir}/mimelnk/image/*.desktop %{tde_datadir}/services/ksquirrelpart.desktop %{tde_mandir}/man1/ksquirrel.1 -%{tde_confdir}/magic/x-ras.magic.mgc -%{tde_confdir}/magic/x-sun.magic.mgc -%{tde_confdir}/magic/x-utah.magic.mgc +%config(noreplace) %{tde_confdir}/magic/x-ras.magic.mgc +%config(noreplace) %{tde_confdir}/magic/x-sun.magic.mgc +%config(noreplace) %{tde_confdir}/magic/x-utah.magic.mgc %changelog diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec b/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec deleted file mode 100644 index 215f398d3..000000000 --- a/redhat/applications/kstreamripper/kstreamripper-3.5.13.2.spec +++ /dev/null @@ -1,95 +0,0 @@ -# Default version for this component -%define tde_pkg kstreamripper -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: TDE frontend for streamripper - -Version: 0.3.4 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: scons - - -%description -KStreamRipper is a small frontend for the streamripper command -line utility. Streamripper captures internet shoutcast radio streams -on your harddisk and splits them up in mp3 files. KStreamRipper helps -you with managing/ripping your preferred streams. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__sed -i kde.py \ - -e "s|include/kde|include/tde|g" - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -scons -Q -j4 \ - qtlibs=${QTLIB:-${QTDIR}/%{_lib}} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kstreamripper -%{tde_datadir}/applnk/Utilities/kstreamripper.desktop -%{tde_datadir}/apps/kstreamripper/kstreamripperui.rc -%{tde_tdedocdir}/HTML/en/kstreamripper/ - - - -%changelog diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper.spec index d5395491a..430d5bfe3 100644 --- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec +++ b/redhat/applications/kstreamripper/kstreamripper.spec @@ -15,14 +15,14 @@ # Please submit bugfixes or comments via http://www.trinitydesktop.org/ # -%if 0%{?fedora} >= 28 +%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8 %global debug_package %{nil} %endif # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kstreamripper %define tde_prefix /opt/trinity @@ -59,6 +59,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: scons-local-2.5.1.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -79,8 +80,19 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -BuildRequires: scons -BuildRequires: python +#BuildRequires: scons + +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel %description @@ -100,7 +112,7 @@ you with managing/ripping your preferred streams. %prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -a 1 %__rm -f kde.py @@ -109,14 +121,14 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export QTDIR=/usr -scons configure prefix="%{_prefix}" -scons %{?_smp_mflags} +%__python ./scons.py configure prefix="%{_prefix}" +%__python ./scons.py %{?_smp_mflags} %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -DESTDIR="%{?buildroot}" scons install +DESTDIR="%{?buildroot}" %__python ./scons.py install # Missing icon file will make this fail. echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" diff --git a/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz b/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz Binary files differnew file mode 100644 index 000000000..ef63468b1 --- /dev/null +++ b/redhat/applications/kstreamripper/scons-local-2.5.1.tar.gz diff --git a/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec b/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec deleted file mode 100644 index 8251cdf6d..000000000 --- a/redhat/applications/ksystemlog/ksystemlog-3.5.13.2.spec +++ /dev/null @@ -1,122 +0,0 @@ -# Default version for this component -%define tde_pkg ksystemlog -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: system log viewer tool for Trinity -Version: 0.3.2 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/System - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://ksystemlog.forum-software.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -ksystemlog is a system log viewer tool for Trinity. - -This program is developed for being used by beginner users, which don't know -how to find information about their Linux system, and how the log files are in -their computer. But it is also designed for advanced users, who want to -quickly see problems occuring on their server. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README -%{tde_bindir}/ksystemlog -%{tde_datadir}/applnk/Utilities/ksystemlog.desktop -%{tde_datadir}/apps/ksystemlog/ksystemlogui.rc -%{tde_datadir}/config.kcfg/ksystemlog.kcfg -%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.png -%{tde_datadir}/icons/hicolor/*/apps/ksystemlog.svgz - - -%changelog diff --git a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec b/redhat/applications/ksystemlog/ksystemlog.spec index 874974b0b..38f6d8f7b 100644 --- a/redhat/applications/ksystemlog/ksystemlog-14.0.0.spec +++ b/redhat/applications/ksystemlog/ksystemlog.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg ksystemlog %define tde_prefix /opt/trinity @@ -131,19 +131,17 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -# Move desktop file to XDG folder -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" - # Missing category will make this fail. echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{tde_bindir}/ksystemlog diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.2-ftbfs.patch b/redhat/applications/ktechlab/ktechlab-3.5.13.2-ftbfs.patch deleted file mode 100644 index cee50ee8f..000000000 --- a/redhat/applications/ktechlab/ktechlab-3.5.13.2-ftbfs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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" || diff --git a/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec b/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec deleted file mode 100644 index 9d0799c7f..000000000 --- a/redhat/applications/ktechlab/ktechlab-3.5.13.2.spec +++ /dev/null @@ -1,132 +0,0 @@ -# Default version for this component -%define tde_pkg ktechlab -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: circuit simulator for microcontrollers and electronics [Trinity] -Version: 0.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch0: ktechlab-3.5.13.2-ftbfs.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -KTechlab is a circuit simulator with a nice, clickable and discoverable -interface. It supports many discrete components, logic circuits as well -as PIC programming in its own Basic dialect and some form of assembler. - -Homepage: http://ktechlab.org/ - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .ftbfs - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/ktechlab -%{tde_bindir}/microbe -%{tde_datadir}/applnk/Development/ktechlab.desktop -%{tde_datadir}/apps/katepart/syntax/microbe.xml -%{tde_datadir}/apps/ktechlab -%{tde_datadir}/config.kcfg/ktechlab.kcfg -%{tde_tdedocdir}/HTML/en/ktechlab/ -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/mimelnk/application/x-circuit.desktop -%{tde_datadir}/mimelnk/application/x-flowcode.desktop -%{tde_datadir}/mimelnk/application/x-ktechlab.desktop -%{tde_datadir}/mimelnk/application/x-microbe.desktop - - -%changelog diff --git a/redhat/applications/ktechlab/ktechlab-14.0.0.spec b/redhat/applications/ktechlab/ktechlab.spec index 9fec6ce5a..848381fce 100644 --- a/redhat/applications/ktechlab/ktechlab-14.0.0.spec +++ b/redhat/applications/ktechlab/ktechlab.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg ktechlab %define tde_prefix /opt/trinity @@ -66,6 +66,10 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes +%if 0%{?fedora} +#BuildRequires: gpsim-devel +%endif + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files diff --git a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec b/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec deleted file mode 100644 index 992ef2e1a..000000000 --- a/redhat/applications/ktorrent/ktorrent-3.5.13.2.spec +++ /dev/null @@ -1,184 +0,0 @@ -# Default version for this component -%define tde_pkg ktorrent -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: BitTorrent client for Trinity -Version: 2.2.8 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://ktorrent.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -# AVAHI support -# Disabled on RHEL4 and RHEL5 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} -%define with_avahi 1 -BuildRequires: trinity-avahi-tqt-devel -Requires: trinity-avahi-tqt -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}avahi-client-devel -Requires: %{_lib}avahi-client3 -%else -BuildRequires: avahi-devel -Requires: avahi -%endif -%endif - - -%description -KTorrent is a BitTorrent program for Trinity. Its features include speed capping -(both down and up), integrated searching, UDP tracker support, preview of -certain file types (video and audio) and integration into the TDE Panel -enabling background downloading. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . "/etc/profile.d/qt3.sh" -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix="%{tde_prefix}" \ - --exec-prefix="%{tde_prefix}" \ - --bindir="%{tde_bindir}" \ - --datadir="%{tde_datadir}" \ - --libdir="%{tde_libdir}" \ - --mandir="%{tde_mandir}" \ - --includedir="%{tde_tdeincludedir}" \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - \ - %{?!with_avahi:--without-avahi} - - -# Not SMP safe ! -%__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf "%{buildroot}" -%__make install DESTDIR="%{buildroot}" - -%find_lang %{tde_pkg} - -# Unwanted files -%__rm -f "%{?buildroot}%{tde_libdir}/libktorrent.so" - - -%clean -%__rm -rf "%{buildroot}" - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/ktcachecheck -%{tde_bindir}/ktorrent -%{tde_bindir}/ktshell -%{tde_bindir}/kttorinfo -%{tde_bindir}/ktupnptest -%{tde_libdir}/libktorrent-%{version}.so -%{tde_libdir}/libktorrent.la -%{tde_tdelibdir}/ktinfowidgetplugin.la -%{tde_tdelibdir}/ktinfowidgetplugin.so -%{tde_tdelibdir}/ktipfilterplugin.la -%{tde_tdelibdir}/ktipfilterplugin.so -%{tde_tdelibdir}/ktlogviewerplugin.la -%{tde_tdelibdir}/ktlogviewerplugin.so -%{tde_tdelibdir}/ktpartfileimportplugin.la -%{tde_tdelibdir}/ktpartfileimportplugin.so -%{tde_tdelibdir}/ktrssfeedplugin.la -%{tde_tdelibdir}/ktrssfeedplugin.so -%{tde_tdelibdir}/ktscanfolderplugin.la -%{tde_tdelibdir}/ktscanfolderplugin.so -%{tde_tdelibdir}/ktschedulerplugin.la -%{tde_tdelibdir}/ktschedulerplugin.so -%{tde_tdelibdir}/ktsearchplugin.la -%{tde_tdelibdir}/ktsearchplugin.so -%{tde_tdelibdir}/ktstatsplugin.la -%{tde_tdelibdir}/ktstatsplugin.so -%{tde_tdelibdir}/ktupnpplugin.la -%{tde_tdelibdir}/ktupnpplugin.so -%{tde_tdelibdir}/ktwebinterfaceplugin.la -%{tde_tdelibdir}/ktwebinterfaceplugin.so -%{tde_tdeappdir}/ktorrent.desktop -%{tde_datadir}/apps/ktorrent -%{tde_datadir}/config.kcfg/*.kcfg -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/hicolor/*/*/*.svgz -%{tde_datadir}/services/*.desktop -%{tde_datadir}/servicetypes/ktorrentplugin.desktop - -%if 0%{?with_avahi} -%{tde_tdelibdir}/ktzeroconfplugin.la -%{tde_tdelibdir}/ktzeroconfplugin.so -%endif - - -%changelog diff --git a/redhat/applications/ktorrent/ktorrent-14.0.0.spec b/redhat/applications/ktorrent/ktorrent.spec index 2ecf72dac..0b3b055f0 100644 --- a/redhat/applications/ktorrent/ktorrent-14.0.0.spec +++ b/redhat/applications/ktorrent/ktorrent.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg ktorrent %define tde_prefix /opt/trinity diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec deleted file mode 100644 index e87b7ad2f..000000000 --- a/redhat/applications/kuickshow/kuickshow-3.5.13.2.spec +++ /dev/null @@ -1,127 +0,0 @@ -# Default version for this component -%define tde_pkg kuickshow -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Quick picture viewer for TDE -Version: 0.8.13 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} -BuildRequires: imlib-devel -%endif -%if 0%{?suse_version} || 0%{?mgaversion} -BuildRequires: imlib1-devel -%endif - -%description -Kuickshow is a picture viewer for TDE. It displays the directory structure, -displaying images as thumbnails. -Clicking on an image shows the image in its normal size. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{?buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -/sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/kuickshow -%{tde_datadir}/applications/*/*.desktop -%{tde_datadir}/apps/kuickshow/ -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_libdir}/libkdeinit_%{tde_pkg}.so -%{tde_libdir}/*.la -%{tde_tdelibdir}/*.so -%{tde_tdelibdir}/*.la -%{tde_tdedocdir}/HTML/en/kuickshow/ - - -%changelog diff --git a/redhat/applications/kuickshow/kuickshow-14.0.0.spec b/redhat/applications/kuickshow/kuickshow.spec index 1862df13f..d8a94d07c 100644 --- a/redhat/applications/kuickshow/kuickshow-14.0.0.spec +++ b/redhat/applications/kuickshow/kuickshow.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kuickshow %define tde_prefix /opt/trinity diff --git a/redhat/applications/kvirc/kvirc-3.5.13.2.spec b/redhat/applications/kvirc/kvirc-3.5.13.2.spec deleted file mode 100644 index 32c340e5b..000000000 --- a/redhat/applications/kvirc/kvirc-3.5.13.2.spec +++ /dev/null @@ -1,211 +0,0 @@ -# REMOVE KDELIBS4-DEVEL before building !!!! - -# Default version for this component -%define tde_pkg kvirc -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Trinity based next generation IRC client with module support -Version: 3.4.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://kvirc.net/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -# [kvirc] Modules do not install in correct folder [RHEL/Fedora] -Patch0: kvirc-3.5.13.2-fix_ftbfs.patch -# [kvirc] FTBFS because of missing link libraries [Bug #991] -Patch1: kvirc-3.5.13-ftbfs.patch -Patch2: kvirc-3.5.13.2-install_directory.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Requires: %{name}-data = %{version}-%{release} - -%description -A highly configurable graphical IRC client with an MDI interface, -built-in scripting language, support for IRC DCC, drag & drop file -browsing, and much more. KVIrc uses the TDE widget set, can be extended -using its own scripting language, integrates with TDE, and supports -custom plugins. - -If you are a developer and you want to write a custom module for KVIrc, -you need to install the kvirc-dev package. - -%package data -Group: Applications/Utilities -Summary: Data files for KVIrc -Requires: %{name} = %{version}-%{release} - -%description data -This package contains the architecture-independent data needed by KVIrc in -order to run, such as icons and images, language files, and shell scripts. -It also contains complete reference guides on scripting and functions -within KVIrc in its internal help format. Unless you want to use KVIrc only -as a very simple IRC client you are likely to want to write scripts to -tailor KVIrc to your needs. - -KVIrc is a graphical IRC client based on the TDE widget set which integrates -with the Trinity Desktop Environment version 3. - -%package devel -Group: Development/Libraries -Summary: Development files for KVIrc -Requires: %{name} = %{version}-%{release} - -%description devel -This package contains KVIrc libraries and include files you need if you -want to develop plugins for KVIrc. - -KVIrc is a graphical IRC client based on the TDE widget set which integrates -with the K Desktop Environment version 3. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -#patch0 -p1 -%patch1 -p1 -%patch2 -p1 -b .installdir - -# Hardcoded absolute PATH to KDEDIR in source code ! That sucks ! -%__sed -i "src/kvirc/kernel/kvi_app_fs.cpp" \ - -e "s|/opt/kde3/lib|%{tde_prefix}/%{_lib}|g" -%__sed -i "src/kvirc/kernel/kvi_app_setup.cpp" \ - -e "s|/opt/kde3|%{tde_prefix}|g" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -./autogen.sh - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export KDEDIR=%{tde_prefix} - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-wall \ - \ - --with-pic \ - \ - --with-big-channels \ - --enable-perl \ - --with-ix86-asm \ - --with-kde-services-dir=%{tde_datadir}/services \ - --with-kde-library-dir=%{tde_libdir} \ - --with-kde-include-dir=%{tde_tdeincludedir} \ - --with-qt-library-dir=${QTLIB:-${QTDIR}/%{_lib}} \ - --with-qt-include-dir=${QTINC:-${QTDIR}/include} \ - --with-qt-moc=${QTDIR}/bin/moc - -# Symbolic links must exist prior to parallel building -%__make symlinks -C src/kvilib/build -%__make symlinks -C src/kvirc/build - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ... -%__mv \ - %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \ - %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA - - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -/sbin/ldconfig -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc ChangeLog FAQ README TODO -%{tde_bindir}/kvirc -%{tde_libdir}/*.so.* -%{tde_libdir}/kvirc/*/modules/*.so - -%files data -%defattr(-,root,root,-) -%{tde_bindir}/kvi_run_netscape -%{tde_bindir}/kvi_search_help -%{tde_libdir}/kvirc/ -%{tde_datadir}/applnk/Internet/kvirc.desktop -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/hicolor/*/*/*.svgz -%{tde_datadir}/icons/hicolor/*/*/*.xpm -%{tde_datadir}/kvirc -%{tde_datadir}/mimelnk/text/*.desktop -%{tde_datadir}/services/*.protocol -%{tde_mandir}/man1/kvirc.1 - -%files devel -%defattr(-,root,root,-) -%{tde_bindir}/kvirc-config -%{tde_includedir}/kvirc/ -%{tde_libdir}/*.la -%{tde_libdir}/*.so -%{tde_libdir}/kvirc/*/modules/*.la - - -%changelog diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc.spec index 46d6a6d21..da3af96ad 100644 --- a/redhat/applications/kvirc/kvirc-14.0.0.spec +++ b/redhat/applications/kvirc/kvirc.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kvirc %define tde_prefix /opt/trinity diff --git a/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec b/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec deleted file mode 100644 index 0e66dd2ad..000000000 --- a/redhat/applications/kvkbd/kvkbd-3.5.13.2.spec +++ /dev/null @@ -1,117 +0,0 @@ -# Default version for this component -%define tde_pkg kvkbd -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Virtual keyboard for TDE [Trinity] -Version: 0.4.8 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/System - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://pan4os.info/main/index.php - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -Virtual keyboard for TDE for use with accessibility. Application contains -a systray widget as well as a dockwidget. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kvkbd -%{tde_datadir}/applnk/Utilities/kvkbd.desktop -%{tde_datadir}/apps/kvkbd/pics/dock.png -%{tde_datadir}/apps/kvkbd/pics/tray.png -%{tde_datadir}/icons/hicolor/*/apps/kvkbd.png - - -%changelog diff --git a/redhat/applications/kvkbd/kvkbd.spec b/redhat/applications/kvkbd/kvkbd.spec index a39ca1f22..9488cccd1 100644 --- a/redhat/applications/kvkbd/kvkbd.spec +++ b/redhat/applications/kvkbd/kvkbd.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kvkbd %define tde_prefix /opt/trinity @@ -143,9 +143,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -# Move desktop file to XDG location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" +%find_lang %{tde_pkg} # Updates applications categories for openSUSE %if 0%{?suse_version} @@ -157,9 +155,9 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS COPYING README %{tde_bindir}/kvkbd %{tde_tdeappdir}/kvkbd.desktop %{tde_datadir}/apps/kvkbd/ diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0.patch b/redhat/applications/kvpnc/kvpnc-14.0.0.patch deleted file mode 100644 index 1d5b6b300..000000000 --- a/redhat/applications/kvpnc/kvpnc-14.0.0.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am.ORI 2013-07-20 12:35:51.155931996 +0200 -+++ trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am 2013-07-20 12:37:49.601226585 +0200 -@@ -57,13 +57,13 @@ - - - install-data-local: -- $(mkinstalldirs) $(kde_appsdir)/ -- $(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(kde_appsdir)/kvpnc.desktop -+ $(mkinstalldirs) $(xdg_appsdir)/ -+ $(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(xdg_appsdir)/kvpnc.desktop - $(mkinstalldirs) $(kde_datadir)/kvpnc/ - $(INSTALL_DATA) $(srcdir)/kvpncui.rc $(kde_datadir)/kvpnc/kvpncui.rc - $(mkinstalldirs) $(kde_datadir)/kvpnc/ - $(INSTALL_DATA) $(srcdir)/eventsrc $(kde_datadir)/kvpnc/eventsrc -- $(INSTALL_DATA) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh -+ $(INSTALL_SCRIPT) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh - $(INSTALL_DATA) $(srcdir)/newprofilewizard.png $(kde_datadir)/kvpnc/newprofilewizard.png - $(INSTALL_DATA) $(srcdir)/newprofilewizard_final.png $(kde_datadir)/kvpnc/newprofilewizard_final.png - # $(INSTALL_DATA) $(srcdir)/x-cisco.desktop $(kde_mimedir)/application/x-cisco.desktop diff --git a/redhat/applications/kvpnc/kvpnc.spec b/redhat/applications/kvpnc/kvpnc.spec index d2d9fc81b..ad44e6173 100644 --- a/redhat/applications/kvpnc/kvpnc.spec +++ b/redhat/applications/kvpnc/kvpnc.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kvpnc %define tde_prefix /opt/trinity @@ -56,8 +56,6 @@ 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} BuildRequires: desktop-file-utils @@ -111,7 +109,6 @@ It supports : %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .installdir %build diff --git a/redhat/applications/kxmleditor/kxmleditor.spec b/redhat/applications/kxmleditor/kxmleditor.spec index cf0447a98..846645b56 100644 --- a/redhat/applications/kxmleditor/kxmleditor.spec +++ b/redhat/applications/kxmleditor/kxmleditor.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kxmleditor %define tde_prefix /opt/trinity @@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -98,40 +98,36 @@ contents. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DBUILD_ALL=ON \ + .. -%__make %{?_smp_mflags} || %__make +%__make %{?_smp_mflags} %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -152,16 +148,17 @@ export PATH="%{tde_bindir}:${PATH}" %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_bindir}/kxmleditor -%{tde_tdelibdir}/libkxmleditorpart.la -%{tde_tdelibdir}/libkxmleditorpart.so -%{tde_tdelibdir}/libkxmleditorpart.so.1 -%{tde_tdelibdir}/libkxmleditorpart.so.1.0.0 +%{tde_libdir}/libkxmleditorpart.la +%{tde_libdir}/libkxmleditorpart.so +%{tde_libdir}/libkxmleditorpart.so.1 +%{tde_libdir}/libkxmleditorpart.so.1.0.0 %{tde_tdeappdir}/kxmleditor.desktop %{tde_datadir}/apps/kxmleditor/ %{tde_tdedocdir}/HTML/en/kxmleditor/ %{tde_datadir}/icons/hicolor/*/apps/kxmleditor.png %{tde_datadir}/icons/locolor/*/apps/kxmleditor.png %{tde_datadir}/services/kxmleditorpart.desktop +%{tde_mandir}/man1/kxmleditor.1* %post diff --git a/redhat/applications/mathemagics/mathemagics.spec b/redhat/applications/mathemagics/mathemagics.spec new file mode 100644 index 000000000..7825222a4 --- /dev/null +++ b/redhat/applications/mathemagics/mathemagics.spec @@ -0,0 +1,130 @@ +# +# spec file for package mathemagics (version R14.0.0) +# +# 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.1.0 +%endif +%define tde_pkg mathemagics +%define tde_prefix /opt/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_mandir %{tde_datadir}/man +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%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} +Summary: Mathemagics is a RPN Calculator. +Version: 1.1 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +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: %{_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: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + + +%description +Mathemagics is a RPN Calculator. + +%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 +%debug_package +%endif + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + + +%build +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%clean +%__rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING README +%{tde_bindir}/mathemagics +%{tde_tdeappdir}/mathemagics.desktop +%{tde_datadir}/apps/mathemagics/mathemagicsui.rc +%{tde_datadir}/icons/hicolor/22x22/apps/mathemagics.png +%{tde_datadir}/icons/hicolor/32x32/apps/mathemagics.png +%{tde_datadir}/icons/hicolor/48x48/apps/mathemagics.png +%{tde_datadir}/icons/locolor/16x16/apps/mathemagics.png +%{tde_datadir}/icons/locolor/32x32/apps/mathemagics.png +%{tde_tdedocdir}/HTML/en/mathemagics/ +%{tde_mandir}/man1/mathemagics.1* + + +%changelog diff --git a/redhat/applications/mplayerthumbs/mplayerthumbs.spec b/redhat/applications/mplayerthumbs/mplayerthumbs.spec index 625d7d810..96e9c7042 100644 --- a/redhat/applications/mplayerthumbs/mplayerthumbs.spec +++ b/redhat/applications/mplayerthumbs/mplayerthumbs.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg mplayerthumbs %define tde_prefix /opt/trinity @@ -147,12 +147,14 @@ fi %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + %clean %__rm -rf $RPM_BUILD_ROOT -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{tde_bindir}/mplayerthumbsconfig diff --git a/redhat/applications/piklab/piklab-3.5.13.2.spec b/redhat/applications/piklab/piklab-3.5.13.2.spec deleted file mode 100644 index 425bb42a5..000000000 --- a/redhat/applications/piklab/piklab-3.5.13.2.spec +++ /dev/null @@ -1,145 +0,0 @@ -# Default version for this component -%define tde_pkg piklab -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: IDE for PIC-microcontroller development [Trinity] -Version: 0.15.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext -BuildRequires: readline-devel - -%description -Piklab is an integrated development environment for applications based on -Microchip PIC and dsPIC microcontrollers similar to the MPLAB environment. - -Support for several compiler and assembler toolchains is integrated. The -GPSim simulator, the ICD1 programmer, the ICD2 debugger, the PICkit1 and -PICkit2 programmers, the PicStart+ programmer, and most direct programmers -are supported. A command-line programmer and debugger are also available. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Warning: --enable-final causes FTBFS -# Warning: RHEL5 FTBFS: https://bugzilla.redhat.com/show_bug.cgi?id=499837 -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ -%if 0%{?rhel} == 5 - --disable-libreadline \ -%endif - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Incorrect extension on manpage -%__mv -f %{buildroot}%{tde_mandir}/man1/piklab.1x %{buildroot}%{tde_mandir}/man1/piklab.1 - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/piklab -%{tde_bindir}/piklab-coff -%{tde_bindir}/piklab-hex -%{tde_bindir}/piklab-prog -%{tde_tdeappdir}/piklab.desktop -%{tde_datadir}/apps/katepart/syntax/asm-pic.xml -%{tde_datadir}/apps/katepart/syntax/coff-c-pic.xml -%{tde_datadir}/apps/katepart/syntax/coff-pic.xml -%{tde_datadir}/apps/katepart/syntax/jal-pic.xml -%{tde_datadir}/apps/piklab -%{tde_tdedocdir}/HTML/en/piklab -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/mimelnk/application/x-piklab.desktop -%{tde_mandir}/man1/piklab-coff.1 -%{tde_mandir}/man1/piklab-hex.1 -%{tde_mandir}/man1/piklab-prog.1 -%{tde_mandir}/man1/piklab.1 - - -%changelog diff --git a/redhat/applications/piklab/piklab-14.0.0.spec b/redhat/applications/piklab/piklab.spec index 7bcffe525..ff8d574d2 100644 --- a/redhat/applications/piklab/piklab-14.0.0.spec +++ b/redhat/applications/piklab/piklab.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg piklab %define tde_prefix /opt/trinity diff --git a/redhat/applications/potracegui/potracegui-3.5.13.2.spec b/redhat/applications/potracegui/potracegui-3.5.13.2.spec deleted file mode 100644 index d8b4709c7..000000000 --- a/redhat/applications/potracegui/potracegui-3.5.13.2.spec +++ /dev/null @@ -1,122 +0,0 @@ -# Default version for this component -%define tde_pkg potracegui -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: TDE frontend for potrace [Trinity] -Version: 1.3 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://potracegui.sourceforge.net - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -A TDE interface for the commandline tracing tools potrace and/or autotrace. It -supports drag and drop as well as all image types recognized by TDE, which are -a lot more than the 4 recognized by the potrace commandline tool. Loading of -remote files (web, ftp, ...) is also supported. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/potracegui -%{tde_datadir}/applnk/Utilities/potracegui.desktop -%{tde_datadir}/apps/potracegui/potraceguiui.rc -%{tde_tdedocdir}/HTML/en/potracegui/common -%{tde_tdedocdir}/HTML/en/potracegui/index.cache.bz2 -%{tde_tdedocdir}/HTML/en/potracegui/index.docbook -%{tde_datadir}/icons/hicolor/16x16/apps/potracegui.png -%{tde_datadir}/icons/hicolor/32x32/apps/potracegui.png -%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/potracegui.mo - - -%changelog diff --git a/redhat/applications/potracegui/potracegui.spec b/redhat/applications/potracegui/potracegui.spec index 8b54c5611..79938421f 100644 --- a/redhat/applications/potracegui/potracegui.spec +++ b/redhat/applications/potracegui/potracegui.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg potracegui %define tde_prefix /opt/trinity @@ -144,9 +144,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -# Move desktop file to XDG location -%__mkdir_p "%{?buildroot}%{tde_tdeappdir}" -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/%{tde_pkg}.desktop" "%{?buildroot}%{tde_tdeappdir}" +%find_lang %{tde_pkg} # Updates applications categories for openSUSE %if 0%{?suse_version} @@ -158,16 +156,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS ChangeLog COPYING README %{tde_bindir}/potracegui %{tde_tdeappdir}/potracegui.desktop %{tde_datadir}/apps/potracegui/ %{tde_tdedocdir}/HTML/en/potracegui/ -%{tde_datadir}/icons/hicolor/16x16/apps/potracegui.png -%{tde_datadir}/icons/hicolor/32x32/apps/potracegui.png -%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/potracegui.mo +%{tde_datadir}/icons/hicolor/*/apps/potracegui.png %{tde_mandir}/man1/*.1* diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec index 365e96bd8..ccfd3eac8 100644 --- a/redhat/applications/qalculate-tde/qalculate-tde.spec +++ b/redhat/applications/qalculate-tde/qalculate-tde.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg qalculate-tde %define tde_prefix /opt/trinity @@ -74,6 +74,9 @@ BuildRequires: cln-devel %if 0%{?pclinuxos} >= 2018 BuildRequires: libcln-devel %endif +%if 0%{?mgaversion} >= 7 +BuildRequires: %{_lib}cln-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -106,6 +109,9 @@ This package contains the TDE user interface of qalculate. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +# Fix build on r14.0.x +%__sed -i *"/Makefile.am" -e "s|\$(LIB_TQT)|-ltqt-mt|" + %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec index bced59322..d564e576e 100644 --- a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec +++ b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg qt4-tqt-theme-engine %define tde_prefix /opt/trinity @@ -81,7 +81,11 @@ BuildRequires: brp-check-trinity # QT4 support %if 0%{?suse_version} +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 +BuildRequires: libqt4-devel +%else BuildRequires: qt-devel +%endif %else BuildRequires: qt4-devel %endif diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec b/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec deleted file mode 100644 index 6a96604e9..000000000 --- a/redhat/applications/rosegarden/rosegarden-3.5.13.2.spec +++ /dev/null @@ -1,217 +0,0 @@ -# Default version for this component -%define tde_pkg rosegarden -%define tde_version 3.5.13.2 - -# Required for Mageia 2: removes the ldflag '--no-undefined' -%define _disable_ld_no_undefined 1 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: music editor and MIDI/audio sequencer [Trinity] -Version: 1.7.0 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.rosegardenmusic.com/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext -BuildRequires: fftw-devel -BuildRequires: liblo-devel -BuildRequires: fontconfig-devel - -# DSSI support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: dssi-devel -%endif - -# LRDF support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: liblrdf-devel -%endif - -# JACK support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}jack-devel -%else -BuildRequires: jack-audio-connection-kit-devel -%endif - -# LIRC support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 -%define with_lirc 1 -BuildRequires: lirc-devel -%endif - -Requires: lilypond -Requires: perl-XML-Twig - -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -Requires: libsndfile-progs -%else -%if 0%{?rhel} -Requires: libsndfile -%else -Requires: libsndfile-utils -%endif -%endif - - -Requires: %{name}-data == %{version}-%{release} - -%description -Rosegarden is a TDE application which provides a mixed Audio/MIDI -sequencer (for playback and recording), a multi-track editor, music -editing using both piano-roll and score notation, MIDI file IO, -lilypond and Csound files export, etc. - -%package data -Group: Applications/Multimedia -Requires: %{name} == %{version}-%{release} -Summary: music editor and MIDI/audio sequencer data files [Trinity] - -%description data -Rosegarden is a TDE application which provides a mixed Audio/MIDI -sequencer (for playback and recording), a multi-track editor, music -editing using both piano-roll and score notation, MIDI file IO, -lilypond and Csound files export, etc. - -This package provides the data files necessary for running Rosegarden - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -. %{_sysconfdir}/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_tdeincludedir}" - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DWANT_SOUND=ON \ - -DWANT_JACK=ON \ - -DWANT_DSSI=ON \ - %{?with_lirc:-DWANT_LIRC=ON} %{?!with_lirc:-DWANT_LIRC=OFF} \ - -DWANT_PCH=OFF \ - -DWANT_TEST=OFF \ - -DWANT_DEBUG=OFF \ - -DWANT_FULLDBG=OFF \ - -DBUILD_ALL=ON \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -# Unwanted files -%__rm -f %{?buildroot}%{tde_libdir}/*.a - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -update-desktop-database %{tde_appdir} > /dev/null -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/rosegarden -%{tde_bindir}/rosegarden-audiofile-importer -%{tde_bindir}/rosegarden-lilypondview -%{tde_bindir}/rosegarden-project-package -%{tde_bindir}/rosegardensequencer - -%files data -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_tdeappdir}/rosegarden.desktop -%{tde_datadir}/apps/profiles/rosegarden.profile.xml -%lang(en) %{tde_tdedocdir}/HTML/en/rosegarden -%lang(es) %{tde_tdedocdir}/HTML/es/rosegarden -%lang(ja) %{tde_tdedocdir}/HTML/ja/rosegarden -%lang(sv) %{tde_tdedocdir}/HTML/sv/rosegarden -%{tde_datadir}/apps/rosegarden -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_datadir}/icons/locolor/*/*/* -%{tde_datadir}/mimelnk/audio/x-rosegarden-device.desktop -%{tde_datadir}/mimelnk/audio/x-rosegarden.desktop -%{tde_datadir}/mimelnk/audio/x-rosegarden21.desktop -%{tde_datadir}/mimelnk/audio/x-soundfont.desktop - - -%changelog diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden.spec index ddc7115cd..1ecc20f45 100644 --- a/redhat/applications/rosegarden/rosegarden-14.0.0.spec +++ b/redhat/applications/rosegarden/rosegarden.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg rosegarden %define tde_prefix /opt/trinity diff --git a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec b/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec deleted file mode 100644 index 18d214b2c..000000000 --- a/redhat/applications/smartcardauth/smartcardauth-3.5.13.2.spec +++ /dev/null @@ -1,138 +0,0 @@ -# Default version for this component -%define tde_pkg smartcardauth -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: SmartCard Login and LUKS Decrypt, Setup Utility -Version: 1.0 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/System - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -#BuildRequires: perl-PAR-Packer -%if 0%{?mgaversion} || 0%{?mdkversion} -Requires: perl-pcsc-perl -%endif -%if 0%{?rhel} || 0%{?fedora} -Requires: pcsc-perl -%endif -%if 0%{?suse_version} -Requires: perl-pcsc -%endif - -%description -This utility will allow you to set up your computer to accept a SmartCard as an authentication source for: -- Your encrypted LUKS partition -- TDE3.x, including automatic login, lock, and unlock features - -It is designed to work with any ISO 7816-1,2,3,4 compliant smartcard -Examples of such cards are: -- The Schlumberger MultiFlex -- The ACS ACOS5 / ACOS6 series of cryptographic ISO 7816 cards - -If a card is chosen that has PKSC support, such as the ACOS cards, this utility can run -simultaneously with the certificate reading program(s) to provide single sign on -in addition to the PKCS certificate functionality - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__sed -i "Makefile" \ - -e "s|/usr/lib/perl5/Chipcard|%{_libdir}/perl5/vendor_perl/Chipcard|g" - - -%build -export PATH="%{tde_bindir}:${PATH}" - -./build_ckpasswd - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} - -%__install -D -m 755 scriptor_standalone.pl %{buildroot}%{tde_bindir}/scriptor.pl -%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthckpasswd -#%__install -D -m 755 src/ckpasswd %{buildroot}%{tde_bindir}/smartauthmon -%__ln_s smartauthckpasswd %{buildroot}%{tde_bindir}/smartauthmon -%__cp -Rp usr/* %{buildroot}%{tde_prefix} - -%__mkdir_p %{buildroot}%{_sysconfdir} -%__cp -Rp etc/* %{buildroot}%{_sysconfdir} - - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc gpl.txt -%{_sysconfdir}/init/smartauthlogin.conf -%{_sysconfdir}/smartauth/smartauth.sh.in -%{_sysconfdir}/smartauth/smartauthmon.sh.in -%{tde_bindir}/cryptosmartcard.sh -%{tde_bindir}/scriptor.pl -%{tde_bindir}/setupcard.sh -%{tde_bindir}/setupslavecard.sh -%{tde_bindir}/smartauth.sh -%{tde_bindir}/smartauthckpasswd -%{tde_bindir}/smartauthmon -%{tde_datadir}/applications/smartcardauth.desktop -%{tde_datadir}/applications/smartcardrestrict.desktop -%{tde_datadir}/icons/hicolor/16x16/apps/smartcardauth.png -%{tde_datadir}/icons/hicolor/32x32/apps/smartcardauth.png -%{tde_datadir}/initramfs-tools/hooks/cryptlukssc - - -%changelog diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth.spec index 27ed4338c..15e037274 100644 --- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec +++ b/redhat/applications/smartcardauth/smartcardauth.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg smartcardauth %define tde_prefix /opt/trinity @@ -33,10 +33,11 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?mgaversion} %define debug_package %{nil} %endif +%define dont_check_desktop_files 1 Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} @@ -65,7 +66,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -80,10 +81,8 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -#BuildRequires: perl-PAR-Packer - # PCSC support -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} Requires: perl-pcsc-perl %endif %if 0%{?rhel} || 0%{?fedora} @@ -105,12 +104,8 @@ BuildRequires: pkcs11-helper-devel %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion} %define with_db 1 %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: db4-devel -%else BuildRequires: db5-devel %endif -%endif %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: libdb-devel BuildRequires: libdb-cxx-devel @@ -133,6 +128,9 @@ BuildRequires: libgnutls-devel BuildRequires: gnutls-devel %endif +# The 'pp' utility +BuildRequires: perl-PAR-Packer + %description This utility will allow you to set up your computer to accept a SmartCard as an authentication source for: @@ -162,27 +160,52 @@ in addition to the PKCS certificate functionality %build +unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -cd src -make CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ +%if 0%{?mgaversion} || 0%{?pclinuxos} + -DPERL_PAR_PACKER="pp.pl" \ +%endif +%if 0%{?mgaversion} == 6 || 0%{?pclinuxos} + -DPERL_LIB_CHIPCARD="%{perl_sitearch}" \ +%endif +%if 0%{?suse_version} + -DPERL_LIB_CHIPCARD="%{perl_vendorarch}" \ +%endif + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. + +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} +%__make install DESTDIR="%{?buildroot}" -C build -%if "%{tde_version}" == "14.1.0" -%__make install DESTDIR="%{?buildroot}" -%else -%__install -D -m 755 "scriptor_standalone.pl" "%{buildroot}%{_bindir}/scriptor.pl" -%__install -D -m 755 "src/ckpasswd" "%{buildroot}%{_bindir}/smartauthckpasswd" -%__ln_s "smartauthckpasswd" "%{buildroot}%{_bindir}/smartauthmon" -%__cp -Rp "usr/"* "%{buildroot}%{_prefix}" - -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardauth.desktop" -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardrestrict.desktop" -%endif +# Debian stuff +%__rm -f %{buildroot}/usr/share/initramfs-tools/hooks/cryptlukssc %clean @@ -192,22 +215,8 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{_datadir}/applications/smartcardrestric %files %defattr(-,root,root,-) %doc gpl.txt -%{_bindir}/cryptosmartcard.sh -%{_datadir}/initramfs-tools/ -%if "%{tde_version}" == "14.1.0" %{_bindir}/cardpincheck -%else -%{_bindir}/scriptor.pl -%{_bindir}/setupcard.sh -%{_bindir}/setupslavecard.sh -%{_bindir}/smartauth.sh -%{_bindir}/smartauthckpasswd -%{_bindir}/smartauthmon -%{_datadir}/applications/smartcardauth.desktop -%{_datadir}/applications/smartcardrestrict.desktop -%{_datadir}/icons/hicolor/16x16/apps/smartcardauth.png -%{_datadir}/icons/hicolor/32x32/apps/smartcardauth.png -%endif +%{_bindir}/cryptosmartcard.sh %changelog diff --git a/redhat/applications/smb4k/smb4k-3.5.13.2.spec b/redhat/applications/smb4k/smb4k-3.5.13.2.spec deleted file mode 100644 index de9634699..000000000 --- a/redhat/applications/smb4k/smb4k-3.5.13.2.spec +++ /dev/null @@ -1,174 +0,0 @@ -# Default version for this component -%define tde_pkg smb4k -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: A Samba (SMB) share advanced browser for Trinity -Version: 0.9.4 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - - -%description -Smb4K is a SMB (Windows) share browser for TDE. It uses the Samba software -suite to access the SMB shares of the local network neighborhood. Its purpose -is to provide a program that's easy to use and has as many features as -possible. - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/smb4k -%{tde_bindir}/smb4k_cat -%{tde_bindir}/smb4k_kill -%{tde_bindir}/smb4k_mount -%{tde_bindir}/smb4k_mv -%{tde_bindir}/smb4k_umount -%{tde_libdir}/libsmb4kcore.so.2 -%{tde_libdir}/libsmb4kcore.so.2.0.0 -%{tde_libdir}/libsmb4kdialogs.la -%{tde_libdir}/libsmb4kdialogs.so -%{tde_tdelibdir}/konqsidebar_smb4k.la -%{tde_tdelibdir}/konqsidebar_smb4k.so -%{tde_tdelibdir}/libsmb4kconfigdialog.la -%{tde_tdelibdir}/libsmb4kconfigdialog.so -%{tde_tdelibdir}/libsmb4knetworkbrowser.la -%{tde_tdelibdir}/libsmb4knetworkbrowser.so -%{tde_tdelibdir}/libsmb4ksearchdialog.la -%{tde_tdelibdir}/libsmb4ksearchdialog.so -%{tde_tdelibdir}/libsmb4ksharesiconview.la -%{tde_tdelibdir}/libsmb4ksharesiconview.so -%{tde_tdelibdir}/libsmb4kshareslistview.la -%{tde_tdelibdir}/libsmb4kshareslistview.so -%{tde_tdeappdir}/smb4k.desktop -%{tde_datadir}/apps/konqsidebartng/add/smb4k_add.desktop -%{tde_datadir}/apps/smb4k/smb4k_shell.rc -%{tde_datadir}/apps/smb4knetworkbrowserpart/smb4knetworkbrowser_part.rc -%{tde_datadir}/apps/smb4ksharesiconviewpart/smb4ksharesiconview_part.rc -%{tde_datadir}/apps/smb4kshareslistviewpart/smb4kshareslistview_part.rc -%{tde_datadir}/config.kcfg/smb4k.kcfg -%{tde_datadir}/icons/crystalsvg/*/apps/smb4k.png -%{tde_tdedocdir}/HTML/en/smb4k/ - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -########## - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -%{summary} - -%files devel -%{tde_tdeincludedir}/*.h -%{tde_libdir}/libsmb4kcore.la -%{tde_libdir}/libsmb4kcore.so - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -export KDEDIR="%{tde_prefix}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/applications/smb4k/smb4k-14.0.0.spec b/redhat/applications/smb4k/smb4k.spec index 9e30a9b06..8d1ee44d5 100644 --- a/redhat/applications/smb4k/smb4k-14.0.0.spec +++ b/redhat/applications/smb4k/smb4k.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg smb4k %define tde_prefix /opt/trinity @@ -160,6 +160,7 @@ export PATH="%{tde_bindir}:${PATH}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ + --program-prefix="" \ \ --disable-dependency-tracking \ --disable-debug \ diff --git a/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec b/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec deleted file mode 100644 index c64351829..000000000 --- a/redhat/applications/soundkonverter/soundkonverter-3.5.13.2.spec +++ /dev/null @@ -1,171 +0,0 @@ -# Default version for this component -%define tde_pkg soundkonverter -%define tde_version 3.5.13.2 - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: audio converter frontend for Trinity -Version: 0.3.8 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Application/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://potracegui.sourceforge.net - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -soundKonverter is a frontend to various audio converters. - -The key features are: - - Audio conversion - - Replay Gain calculation - - CD ripping - -soundKonverter supports reading and writing tags for many formats, so the tags -are preserved when converting files. - -It comes with an Amarok script. - -See 'soundkonverter-amarok' package for more informations. - -See README.Debian for more informations on supported formats. - - -%package amarok -Summary: audio converter frontend for Trinity (Amarok script) -Group: Application/Multimedia -Requires: %{name} = %{version}-%{release} -Requires: trinity-amarok - -%description amarok -Amarok script for soundKonverter. It allows you to easily transcode files when -transferring them to your media device. - -See the 'soundkonverter-trinity' package for more information. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - \ - --with-extra-includes=/usr/include/cdda - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -update-desktop-database %{tde_appdir} > /dev/null -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/soundkonverter -%{tde_bindir}/userscript.sh -%{tde_tdeappdir}/soundkonverter.desktop -%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop -%{tde_datadir}/apps/soundkonverter -%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/README -%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb -%{tde_tdedocdir}/HTML/en/soundkonverter/common -%{tde_tdedocdir}/HTML/en/soundkonverter/index.cache.bz2 -%{tde_tdedocdir}/HTML/en/soundkonverter/index.docbook -%{tde_datadir}/icons/hicolor/*/apps/soundkonverter*.png -%{tde_datadir}/mimelnk/application/x-la.soundkonverter.desktop -%{tde_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop -%{tde_datadir}/mimelnk/application/x-ofr.soundkonverter.desktop -%{tde_datadir}/mimelnk/application/x-ofs.soundkonverter.desktop -%{tde_datadir}/mimelnk/application/x-shorten.soundkonverter.desktop -%{tde_datadir}/mimelnk/audio/amr.soundkonverter.desktop -%{tde_datadir}/mimelnk/audio/x-ape.soundkonverter.desktop -%{tde_datadir}/mimelnk/audio/x-bonk.soundkonverter.desktop -%{tde_datadir}/mimelnk/audio/x-pac.soundkonverter.desktop -%{tde_datadir}/mimelnk/audio/x-tta.soundkonverter.desktop -%{tde_datadir}/mimelnk/audio/x-wavpack-correction.soundkonverter.desktop -%{tde_datadir}/mimelnk/audio/x-wavpack.soundkonverter.desktop -%{tde_datadir}/mimelnk/video/x-flv.soundkonverter.desktop - -%files amarok -%defattr(-,root,root,-) -%{tde_datadir}/apps/soundkonverter/amarokscript/README -%{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb - - -%changelog diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter.spec index 25ee3424d..6c3ffae19 100644 --- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec +++ b/redhat/applications/soundkonverter/soundkonverter.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg soundkonverter %define tde_prefix /opt/trinity @@ -146,6 +146,7 @@ export PATH="%{tde_bindir}:${PATH}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ + --program-prefix="" \ \ --disable-dependency-tracking \ --disable-debug \ diff --git a/redhat/applications/tastymenu/tastymenu.spec b/redhat/applications/tastymenu/tastymenu.spec index 984912246..096a7d580 100644 --- a/redhat/applications/tastymenu/tastymenu.spec +++ b/redhat/applications/tastymenu/tastymenu.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tastymenu %define tde_prefix /opt/trinity diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch deleted file mode 100644 index 34b15b791..000000000 --- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit 3b6ac8e5301bb482b02af7e2b1f0ec613be61218 -Author: Francois Andriot <albator78@libertysurf.fr> -Date: 1371158323 -0500 - - Work around mountconfig incorrectly handling LABEL tag - This resolves Bug 1545 - Add ext4 support - -diff --git a/mountconfig/MicroHAL.py b/mountconfig/MicroHAL.py -index 9ce8b83..9a913fa 100755 ---- a/mountconfig/MicroHAL.py -+++ b/mountconfig/MicroHAL.py -@@ -669,6 +669,10 @@ class MicroHAL(object): - - if u"volume.label" in parsed_hash: - new_device.label = self._parseString(parsed_hash[u"volume.label"][0]) -+ # If HAL returns label beginning with '#', it usually means that the -+ # actual label contains an Unix path. So we replace '#' with '/'. -+ if len(new_device.label) and new_device.label[0]=='%': -+ new_device.label = new_device.label.replace('%', '/') - - if u"volume.size" in parsed_hash: - size = parsed_hash[u"volume.size"][0] -diff --git a/mountconfig/mountconfig.py b/mountconfig/mountconfig.py -index eefa9fd..9c00b7d 100755 ---- a/mountconfig/mountconfig.py -+++ b/mountconfig/mountconfig.py -@@ -82,6 +82,7 @@ Supported filesystems - nfs - ext2 - ext3 -+ext4 - reiserfs - vfat - ntfs -@@ -1047,6 +1048,7 @@ class MountEntry(object): - - 'ext2' : (MountEntryExtCommonUnixLocal,i18n("Ext2 - Second Extended FS")), - 'ext3' : (MountEntryExtCommonUnixLocal,i18n("Ext3 - Third Extended FS")), -+ 'ext4' : (MountEntryExtCommonUnixLocal,i18n("Ext4 - Fourth Extended FS")), - 'reiserfs' : (MountEntryExtCommonUnixLocal,i18n("ReiserFS")), - 'reiser4' : (MountEntryExtCommonUnixLocal,i18n("Reiser4")), - 'xfs' : (MountEntryExtCommonUnixLocal,i18n("XFS - SGI's journaling filesystem")), -@@ -2389,6 +2391,7 @@ class MountEntryDialog(KDialogBase): - MountTypeEditorsDisk = { - 'ext2' : MountEntryDialogOptionsCommonUnix, - 'ext3' : MountEntryDialogOptionsCommonUnix, -+ 'ext4' : MountEntryDialogOptionsCommonUnix, - 'reiserfs' : MountEntryDialogOptionsCommonUnix, - 'reiser4' : MountEntryDialogOptionsCommonUnix, - 'xfs' : MountEntryDialogOptionsCommonUnix, diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec deleted file mode 100644 index 7fbb91222..000000000 --- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec +++ /dev/null @@ -1,466 +0,0 @@ -# Default version for this component -%define tde_pkg tde-guidance -%define tde_version 3.5.13.2 - -# REMOVE KDELIBS4-DEVEL before building !!!! - -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -%define __arch_install_post %{nil} - -Name: trinity-%{tde_pkg} -Summary: A collection of system administration tools for Trinity -Version: 0.8.0svn20080103 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.simonzone.com/software/guidance - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -# [tde-guidance] Work around mountconfig incorrectly handling LABEL tag -# This resolves Bug 1545 -# Add ext4 support -Patch1: tde-guidance-3.5.13.2-fix_mountconfig.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: trinity-pytdeextensions -BuildRequires: trinity-libpythonize0-devel -BuildRequires: trinity-python-trinity -BuildRequires: chrpath -BuildRequires: gcc-c++ - -# SIP support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: python-sip -%endif -%if 0%{?suse_version} -BuildRequires: python-sip-devel -%endif -%if 0%{?rhel} == 5 -BuildRequires: trinity-sip-devel -%endif -%if 0%{?rhel} >= 6 || 0%{?fedora} -BuildRequires: sip-devel -%endif - -# PYTHON-QT support -BuildRequires: python-qt3-devel -BuildRequires: trinity-python-trinity-devel - -Requires: python-qt3 -Requires: trinity-python-trinity -Requires: trinity-pytdeextensions -Requires: python -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -Requires: hwdata -%endif - -Requires: %{name}-backends = %{version}-%{release} - -# POWERMANAGER support (requires HAL) -%define with_powermanager 1 - -# DISPLAYCONFIG support (deprecated) -#define with_displayconfig 1 - -Obsoletes: trinity-guidance < %{version}-%{release} -Provides: trinity-guidance = %{version}-%{release} - -%description -Guidance currently consists of four programs designed to help you -look after your system: - o userconfig - User and Group administration - o serviceconfig - Service/daemon administration - o mountconfig - Disk and filesystem administration - o wineconfig - Wine configuration - -These tools are available in Trinity Control Center, System Settings -or can be run as standalone applications. - -%files -%defattr(-,root,root,-) -%doc ChangeLog COPYING README TODO -%if 0%{?with_displayconfig} -%{tde_bindir}/displayconfig -%{tde_bindir}/displayconfig-restore -%endif -%{tde_bindir}/grubconfig -%{tde_bindir}/mountconfig -%{tde_bindir}/serviceconfig -%{tde_bindir}/userconfig -%{tde_bindir}/wineconfig -%attr(0644,root,root) %{tde_tdelibdir}/*.so -%attr(0644,root,root) %{tde_tdelibdir}/*.la -%{tde_datadir}/apps/guidance/ -%{tde_tdeappdir}/*.desktop -%{tde_datadir}/icons/crystalsvg/*/*/*.png -%{tde_datadir}/icons/crystalsvg/*/*/*.svg -%{python_sitearch}/%{name}/SMBShareSelectDialog.py* -%{python_sitearch}/%{name}/SimpleCommandRunner.py* -%{python_sitearch}/%{name}/fuser.py* -%{python_sitearch}/%{name}/fuser_ui.py* -%{python_sitearch}/%{name}/grubconfig.py* -%{python_sitearch}/%{name}/ktimerdialog.py* -%{python_sitearch}/%{name}/mountconfig.py* -%{python_sitearch}/%{name}/servertestdialog.py* -%{python_sitearch}/%{name}/serviceconfig.py* -%{python_sitearch}/%{name}/sizeview.py* -%{python_sitearch}/%{name}/unixauthdb.py* -%{python_sitearch}/%{name}/userconfig.py* -%{python_sitearch}/%{name}/wineconfig.py* -%{tde_tdedocdir}/HTML/en/guidance/ - -# Files from backends -%exclude %{tde_datadir}/apps/guidance/vesamodes -%exclude %{tde_datadir}/apps/guidance/extramodes -%exclude %{tde_datadir}/apps/guidance/widescreenmodes -%exclude %{tde_datadir}/apps/guidance/Cards+ -%exclude %{tde_datadir}/apps/guidance/pcitable -%exclude %{tde_datadir}/apps/guidance/MonitorsDB - -# Files from powermanager -%if 0%{?with_powermanager} -%exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%endif -%exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png -%exclude %{tde_datadir}/apps/guidance/pics/battery*.png -%exclude %{tde_datadir}/apps/guidance/pics/processor.png - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -/sbin/ldconfig || : - -########## - -%package backends -Group: Applications/Utilities -Summary: collection of system administration tools for GNU/Linux [Trinity] -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -Requires: hwdata -%endif -Requires: python - -Obsoletes: trinity-guidance-backends < %{version}-%{release} -Provides: trinity-guidance-backends = %{version}-%{release} - -%description backends -This package contains the platform neutral backends used in the -Guidance configuration tools. - -%files backends -%defattr(-,root,root,-) -%{python_sitearch}/%{name}/MicroHAL.py* -%{python_sitearch}/%{name}/ScanPCI.py* -%{python_sitearch}/%{name}/infimport.py* -%if 0%{?with_displayconfig} -%{python_sitearch}/%{name}/displayconfigabstraction.py* -%{python_sitearch}/%{name}/displayconfig-hwprobe.py* -%{python_sitearch}/%{name}/displayconfig-restore.py* -%endif -%{python_sitearch}/%{name}/drivedetect.py* -%{python_sitearch}/%{name}/execwithcapture.py* -%{python_sitearch}/%{name}/wineread.py* -%{python_sitearch}/%{name}/winewrite.py* -%{python_sitearch}/%{name}/xf86misc.py* -%{python_sitearch}/%{name}/xorgconfig.py* -%{python_sitearch}/ixf86misc.so -%{tde_datadir}/apps/guidance/vesamodes -%{tde_datadir}/apps/guidance/extramodes -%{tde_datadir}/apps/guidance/widescreenmodes -%{tde_datadir}/apps/guidance/Cards+ -%{tde_datadir}/apps/guidance/pcitable -%{tde_datadir}/apps/guidance/MonitorsDB - -########## - -%if 0%{?with_powermanager} - -%package powermanager -Group: Applications/Utilities -Summary: HAL based power manager applet [Trinity] -Requires: %{name} = %{version}-%{release} -Requires: hal - -Obsoletes: trinity-guidance-powermanager < %{version}-%{release} -Provides: trinity-guidance-powermanager = %{version}-%{release} - -%if "%{tde_prefix}" == "/usr" -Conflicts: guidance-power-manager -Conflicts: kde-guidance-powermanager -%endif - -%description powermanager -A power management applet to indicate battery levels and perform hibernate or -suspend using HAL. - -%files powermanager -%defattr(-,root,root,-) -%{tde_bindir}/guidance-power-manager -%{python_sitearch}/%{name}/MicroHAL.py* -%{python_sitearch}/%{name}/guidance-power-manager.py* -%{python_sitearch}/%{name}/powermanage.py* -%{python_sitearch}/%{name}/gpmhelper.py* -%{python_sitearch}/%{name}/powermanager_ui.py* -%{python_sitearch}/%{name}/guidance_power_manager_ui.py* -%{python_sitearch}/%{name}/notify.py* -%{python_sitearch}/%{name}/tooltip.py* -%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%{tde_datadir}/apps/guidance/pics/ac-adapter.png -%{tde_datadir}/apps/guidance/pics/battery*.png -%{tde_datadir}/apps/guidance/pics/processor.png -%{tde_datadir}/autostart/guidance-power-manager.desktop - -%post powermanager -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun powermanager -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%endif - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -#patch1 -p1 -b .mountconfig - -%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion} -%__sed -i "userconfig/unixauthdb.py" \ - -e "s|self.first_uid = .*|self.first_uid = 500|" \ - -e "s|self.first_gid = .*|self.first_gid = 500|" -%endif - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 -export KDEDIR=%{tde_prefix} - -# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia -export PYTHONDONTWRITEBYTECODE= - -# FTBFS on PCLOS ... -export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}" - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" - %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g" -fi - -./setup.py build - - -%install -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" - -# For RHEL4 only -export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 - -# For Mageia/Mandriva: Avoids 'error: byte-compiling must be disabled. -export PYTHONDONTWRITEBYTECODE= - -%__rm -rf %{buildroot} -./setup.py install \ - --prefix=%{tde_prefix} \ - --root=%{buildroot} - -# Fix temporary build directories remaining inside .py files -for f in %{buildroot}%{tde_datadir}/apps/guidance/*.py; do - %__sed -i "${f}" -e "s|%{buildroot}||g" -done - -##### MAIN PACKAGE INSTALLATION (based on Debian/Ubuntu packaging rules) -# install icons to right place -%__mkdir_p %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-app-daemons.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/daemons.png -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/kcmpartitions.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/disksfilesystems.png -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-user.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/userconfig.png -#%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \ -# %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/32-wine.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/wineconfig.png -%__install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/apps/wineconfig.png - -# fix binary-or-shlib-defines-rpath -chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so - -# fix executable-not-elf-or-script -%__chmod 0644 %{buildroot}%{tde_datadir}/apps/guidance/pics/kdewinewizard.png - -# move python modules in %{python_sitearch} (/usr/lib/pythonXX/site-packages) -%__mkdir_p %{buildroot}%{python_sitearch}/%{name} -%__mv -f %{buildroot}%{tde_datadir}/apps/guidance/*.py* %{buildroot}%{python_sitearch}/%{name} - -# Generates the startup scripts -%__rm -f %{buildroot}%{tde_bindir}/* -#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig -%__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig -%__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig -%__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig -%__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig -%__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig - -# (obsolete) put this here since gnome people probably don't want it by default -#%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore - -# fix script-not-executable -%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py -%__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py - -#%__mv -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop %{buildroot}%{tde_tdeappdir}/guidance-displayconfig.desktop - -##### BACKENDS INSTALLATION -# install displayconfig-hwprobe.py script -#%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \ -# %{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py - -# The xf86misc stuff should not go under /opt/trinity bur under /usr !!! -%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/ixf86misc.so %{buildroot}%{python_sitearch} -%__mv -f %{buildroot}%{tde_libdir}/python*/site-packages/xf86misc.py* %{buildroot}%{python_sitearch}/%{name} - -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB -%__ln_s -f /usr/share/hwdata/MonitorsDB %{buildroot}%{tde_datadir}/apps/guidance/MonitorsDB -%endif - -%if 0%{?with_powermanager} -##### POWERMANAGER INSTALLATION -# install icon to right place -%__install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \ - %{buildroot}%{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png -%__install -D -p -m0644 kde/powermanager/pics/*.png \ - %{buildroot}%{tde_datadir}/apps/guidance/pics/ - -# install desktop file -%__install -D -p -m0644 powermanager/guidance-power-manager.desktop \ - %{buildroot}%{tde_datadir}/autostart/guidance-power-manager.desktop - -# copy python modules in PYSUPPORT_PATH -%__cp powermanager/guidance_power_manager_ui.py %{buildroot}%{python_sitearch}/%{name} -%__cp powermanager/notify.py %{buildroot}%{python_sitearch}/%{name} -%__cp powermanager/tooltip.py %{buildroot}%{python_sitearch}/%{name} - -# generate guidance-power-manager script -cat <<EOF >%{?buildroot}%{tde_bindir}/guidance-power-manager -#!/bin/sh -export PYTHONPATH=%{python_sitearch}/%{name}:%{python_sitearch}/python-qt3 -%{python_sitearch}/%{name}/guidance-power-manager.py & -EOF -chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager - -# fix script-not-executable -chmod 0755 %{buildroot}%{python_sitearch}/%{name}/powermanage.py -chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py - -%else - -%__rm -f %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance-power-manager.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/guidance_power_manager_ui.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanage.py* -%__rm -f %{buildroot}%{python_sitearch}/%{name}/powermanager_ui.py* -%__rm -f %{buildroot}%{tde_datadir}/apps/guidance/powermanager_ui.ui - -%endif - -# DISPLAYCONFIG (obsolete) -%if 0%{?with_displayconfig} -%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \ - %{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png -%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig -%__mv -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop %{buildroot}%{tde_tdeappdir}/guidance-displayconfig.desktop - -# install displayconfig-hwprobe.py script -%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \ - %{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py - -%else -# Removes obsolete display config manager -%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig* -%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore -%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.* -%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py* -%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py* -%__rm -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop -%__rm -f %{buildroot}%{tde_datadir}/icons/*/*/apps/displayconfig.png -%__rm -fr %{buildroot}%{tde_datadir}/apps/guidance/pics/displayconfig -%endif - - -# Replace all '#!' calls to python with /usr/bin/python -# and make them executable -for i in `find %{buildroot} -type f`; do - sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \ - $i > $i.temp; - if cmp --quiet $i $i.temp; then - rm -f $i.temp; - else - mv -f $i.temp $i; - chmod 755 $i; - echo "fixed interpreter: $i"; - fi; -done - -# Removes useless files -find %{buildroot} -name "*.egg-info" -exec rm -f {} \; -find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \; - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance.spec index 02b6c3b33..e2c865bbd 100644 --- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec +++ b/redhat/applications/tde-guidance/tde-guidance.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-guidance %define tde_prefix /opt/trinity @@ -33,7 +33,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define __arch_install_post %{nil} @@ -105,7 +104,7 @@ BuildRequires: libXxf86vm-devel # RHEL 4: disabled # RHEL 6: available in EPEL # RHEL 7: available in NUX -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -140,10 +139,21 @@ BuildRequires: xscreensaver-gl %endif %endif +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel + Requires: python-tqt Requires: trinity-python-trinity Requires: trinity-pytdeextensions -Requires: python %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} Requires: hwdata %endif @@ -212,7 +222,7 @@ Summary: collection of system administration tools for GNU/Linux [Trinity] %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} Requires: hwdata %endif -Requires: python +Requires: %{python} Obsoletes: trinity-guidance-backends < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-guidance-backends = %{?epoch:%{epoch}:}%{version}-%{release} @@ -307,7 +317,7 @@ if [ -d /usr/X11R6 ]; then %__sed -i "setup.py" -e "s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|g" fi -./setup.py build +%__python ./setup.py build %install @@ -324,7 +334,7 @@ export PYTHONPATH="%{python_sitearch}/sip4_tqt:${PYTHONPATH}" export PYTHONDONTWRITEBYTECODE= %__rm -rf %{buildroot} -./setup.py install \ +%__python ./setup.py install \ --prefix=%{tde_prefix} \ --root=%{buildroot} @@ -421,8 +431,13 @@ chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py # Replace all '#!' calls to python with /usr/bin/python # and make them executable +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%define python /usr/bin/python2 +%else +%define python /usr/bin/python +%endif for i in `find %{buildroot} -type f`; do - sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \ + sed '1s,#!.*python[^ ]*\(.*\),#! %python\1,' \ $i > $i.temp; if cmp --quiet $i $i.temp; then rm -f $i.temp; diff --git a/redhat/applications/tde-style-baghira/tde-style-baghira.spec b/redhat/applications/tde-style-baghira/tde-style-baghira.spec index 41fa8fb19..2736edb74 100644 --- a/redhat/applications/tde-style-baghira/tde-style-baghira.spec +++ b/redhat/applications/tde-style-baghira/tde-style-baghira.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-style-baghira %define tde_prefix /opt/trinity @@ -62,7 +62,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -90,38 +90,36 @@ Panther and Jaguar looks, and also includes its own 'Baghira' look %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/"*"/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}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} %install -%__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build %clean @@ -146,9 +144,8 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_libdir}/usermanager_panelapplet.la %{tde_libdir}/usermanager_panelapplet.so %{tde_datadir}/apps/baghira/ -%{tde_datadir}/apps/kicker/applets/b_menuapplet.desktop -%{tde_datadir}/apps/kicker/applets/starter.desktop -%{tde_datadir}/apps/kicker/applets/usermanager.desktop +%{tde_datadir}/apps/kicker/applets/baghira-starter.desktop +%{tde_datadir}/apps/kicker/applets/baghira-usermanager.desktop %{tde_datadir}/apps/tdedisplay/color-schemes/AquaBlue.kcsrc %{tde_datadir}/apps/tdedisplay/color-schemes/AquaGraphite.kcsrc %{tde_datadir}/apps/tdestyle/themes/baghira.themerc @@ -191,6 +188,8 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_grey.png %{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_white.png %{tde_datadir}/icons/crystalsvg/64x64/apps/baghira_yellow.png +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/baghira-starter.mo +%{tde_mandir}/man1/bab.1* %changelog diff --git a/redhat/applications/tde-style-domino/tde-style-domino.spec b/redhat/applications/tde-style-domino/tde-style-domino.spec index a2dfdd079..20230ce2c 100644 --- a/redhat/applications/tde-style-domino/tde-style-domino.spec +++ b/redhat/applications/tde-style-domino/tde-style-domino.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-style-domino %define tde_prefix /opt/trinity @@ -62,7 +62,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -86,38 +86,36 @@ of the widgets by customizable color gradients. %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/"*"/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}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DBUILD_ALL=ON \ + .. %__make %{?_smp_mflags} %install -%__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build %clean @@ -137,6 +135,7 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/apps/tdedisplay/color-schemes/Domino.kcsrc %{tde_datadir}/apps/tdestyle/themes/domino.themerc %{tde_datadir}/apps/twin/domino.desktop +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/tdestyle_domino_config.mo %changelog diff --git a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec index bd89d6687..0e6fec2a9 100644 --- a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec +++ b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-style-ia-ora %define tde_prefix /opt/trinity diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec deleted file mode 100644 index 08e51de57..000000000 --- a/redhat/applications/tde-style-lipstik/tde-style-lipstik-3.5.13.2.spec +++ /dev/null @@ -1,116 +0,0 @@ -# Default version for this component -%define tde_pkg tde-style-lipstik -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-tde-style-lipstik -Summary: Lipstik style for TDE -Version: 2.2.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Obsoletes: trinity-kde-style-lipstik < %{version}-%{release} -Provides: trinity-kde-style-lipstik = %{version}-%{release} -Obsoletes: trinity-style-lipstik < %{version}-%{release} -Provides: trinity-style-lipstik = %{version}-%{release} - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -Based on the plastik style, Lipstik is a purified style with many options to -tune your desktop look. - -Lipstik also provides Lipstik-color-schemes - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_tdelibdir}/kstyle_lipstik_config.la -%{tde_tdelibdir}/kstyle_lipstik_config.so -%{tde_tdelibdir}/plugins/styles/lipstik.la -%{tde_tdelibdir}/plugins/styles/lipstik.so -%{tde_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc -%{tde_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc -%{tde_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc -%{tde_datadir}/apps/kstyle/themes/lipstik.themerc - - -%changelog diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec index 055ca88d7..01a6a9352 100644 --- a/redhat/applications/tde-style-lipstik/tde-style-lipstik-14.0.0.spec +++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-style-lipstik %define tde_prefix /opt/trinity @@ -65,7 +65,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -80,6 +80,12 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description Based on the plastik style, Lipstik is a purified style with many options to @@ -100,37 +106,46 @@ Lipstik also provides Lipstik-color-schemes %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/"*"/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}" -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DDATA_INSTALL_DIR="%{tde_datadir}/apps" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build + +%find_lang %{tde_pkg} %clean @@ -138,7 +153,7 @@ export PATH="%{tde_bindir}:${PATH}" -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING %{tde_tdelibdir}/tdestyle_lipstik_config.la diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec deleted file mode 100644 index 562fb4510..000000000 --- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-3.5.13.2.spec +++ /dev/null @@ -1,139 +0,0 @@ -# Default version for this component -%define tde_pkg tde-style-qtcurve -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-tde-style-qtcurve -Summary: This is a set of widget styles for Trinity based apps -Version: 0.55.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Obsoletes: trinity-kde-style-qtcurve < %{version}-%{release} -Provides: trinity-kde-style-qtcurve = %{version}-%{release} -Obsoletes: trinity-style-qtcurve < %{version}-%{release} -Provides: trinity-style-qtcurve = %{version}-%{release} - -%description -This package together with gtk2-engines-qtcurve aim to provide a unified look -and feel on the desktop when using TDE and Gnome applications. - -This package is most useful when installed together with -gtk2-engines-qtcurve. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export KDEDIR="%{tde_prefix}" - -# Shitty hack for RHEL4 ... -if [ -d "/usr/X11R6" ]; then - export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -# Error in "po/tr.po" -%if 0%{?rhel} == 4 -%__rm -f "po/tr.po" -%endif - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DTDE_INCLUDE_DIR=%{tde_tdeincludedir} \ - -DQTC_QT_ONLY=false \ - -DQTC_STYLE_SUPPORT=true \ - -DBUILD_ALL=on \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -%find_lang qtcurve || touch qtcurve.lang - - -%clean -%__rm -rf %{buildroot} - - - -%files -f qtcurve.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_tdelibdir}/kstyle_qtcurve_config.la -%{tde_tdelibdir}/kstyle_qtcurve_config.so -%{tde_tdelibdir}/plugins/styles/qtcurve.so -%{tde_tdelibdir}/plugins/styles/qtcurve.la -%{tde_datadir}/apps/kdisplay/color-schemes/QtCurve.kcsrc -%{tde_datadir}/apps/kstyle/themes/qtcurve.themerc -%{tde_datadir}/apps/QtCurve/*.qtcurve - - -%changelog diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec index 3bb94eadd..f9f788779 100644 --- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve-14.0.0.spec +++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-style-qtcurve %define tde_prefix /opt/trinity diff --git a/redhat/applications/tde-systemsettings/kde-settings-laptops.directory b/redhat/applications/tde-systemsettings/tde-settings-laptops.directory index d37d9ba13..d37d9ba13 100644 --- a/redhat/applications/tde-systemsettings/kde-settings-laptops.directory +++ b/redhat/applications/tde-systemsettings/tde-settings-laptops.directory diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec deleted file mode 100644 index c06af35f6..000000000 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec +++ /dev/null @@ -1,145 +0,0 @@ -# Default version for this component -%define tde_pkg tde-systemsettings -%define tde_version 3.5.13.2 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -# Currently, menu files under /etc/xdg conflict with KDE4 -%define tde_sysconfdir %{tde_prefix}/etc -%endif - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-tde-systemsettings -Summary: easy to use control centre for TDE -Version: 0.0svn20070312 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: kde-settings-laptops.directory - -Provides: trinity-kde-systemsettings = %{version}-%{release} -Obsoletes: trinity-kde-systemsettings < %{version}-%{release} -Provides: trinity-systemsettings = %{version}-%{release} -Obsoletes: trinity-systemsettings < %{version}-%{release} - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -Requires: trinity-guidance - -%description -System preferences is a replacement for the TDE -Control Centre with an improved user interface. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export KDEDIR="%{tde_prefix}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --sysconfdir=%{tde_sysconfdir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-laptops.directory - -# Unwanted files -%__rm -f %{buildroot}%{tde_datadir}/applications/kde/kcmfontinst.desktop -%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-power.directory -%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-system.directory - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -update-desktop-database %{tde_tdeappdir} -q &> /dev/null - -%postun -touch --no-create %{tde_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : -update-desktop-database %{tde_tdeappdir} -q &> /dev/null - -%files -%defattr(-,root,root,-) -%doc README TODO -%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu -%{tde_sysconfdir}/xdg/menus/system-settings.menu -%{tde_bindir}/systemsettings -%{tde_datadir}/applications/kde/audioencoding.desktop -%{tde_datadir}/applications/kde/defaultapplication.desktop -%{tde_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop -%{tde_datadir}/applications/kde/laptoppowermanagement.desktop -%{tde_datadir}/applications/kde/medianotifications.desktop -%{tde_datadir}/applications/kde/systemsettings.desktop -%{tde_datadir}/apps/systemsettings/systemsettingsui.rc -%{tde_datadir}/config/systemsettingsrc -%{tde_datadir}/desktop-directories/*.directory -%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png - - - -%changelog diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings.spec index 812b2329d..74527fb76 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-systemsettings %define tde_prefix /opt/trinity @@ -57,7 +57,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: kde-settings-laptops.directory +Source1: tde-settings-laptops.directory Provides: trinity-kde-systemsettings = %{?epoch:%{epoch}:}%{version}-%{release} @@ -120,6 +120,8 @@ export kde_confdir="%{tde_confdir}" --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ --sysconfdir=%{tde_sysconfdir} \ + --mandir=%{tde_mandir} \ + --program-prefix="" \ \ --disable-dependency-tracking \ --disable-debug \ @@ -152,12 +154,19 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/kcm_knetworkconfmodule_s echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/medianotifications.desktop" echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop" +# Fix translation names +for d in "%{buildroot}%{tde_datadir}/locale/"*"/LC_MESSAGES"; do + mv "${d}/"*".mo" "${d}/%{tde_pkg}.mo" +done + +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc README TODO %dir %{tde_sysconfdir}/xdg @@ -169,14 +178,13 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop" %{tde_datadir}/applications/tde/audioencoding.desktop %{tde_datadir}/applications/tde/defaultapplication.desktop %{tde_datadir}/applications/tde/kcm_knetworkconfmodule_ss.desktop -#%{tde_datadir}/applications/tde/laptop.desktop %{tde_datadir}/applications/tde/medianotifications.desktop %{tde_datadir}/applications/tde/systemsettings.desktop %{tde_datadir}/apps/systemsettings/ -%{tde_confdir}/systemsettingsrc +%config(noreplace) %{tde_confdir}/systemsettingsrc %{tde_datadir}/desktop-directories/*.directory %{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png %{tde_tdedocdir}/HTML/en/systemsettings/ - +%{tde_mandir}/man1/systemsettings.1* %changelog diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/tdedocker/tdedocker.spec index 5685e4075..66e8c3132 100644 --- a/redhat/applications/tdedocker/tdedocker.spec +++ b/redhat/applications/tdedocker/tdedocker.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdedocker %define tde_prefix /opt/trinity @@ -77,6 +77,28 @@ BuildRequires: openssl-devel # XKBFILES support BuildRequires: libxkbfile-devel +# XMU support +%if 0%{?suse_version} == 1140 +BuildRequires: xorg-x11-libXmu-devel +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210 +BuildRequires: libXmu-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} >= 4 +BuildRequires: libxmu-devel +%endif +%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 +BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel +%endif + +# XPM support +%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora} +BuildRequires: libXpm-devel +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}xpm-devel +%endif + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -89,7 +111,7 @@ BuildRequires: brp-check-trinity %description -KDocker will help you dock any application into the system tray. +tdedocker will help you dock any application into the system tray. This means you can dock openoffice, xmms, firefox, thunderbird, anything! Just point and click. Works for all NET WM compliant window managers - that includes TDE, KDE, GNOME, Xfce, Fluxbox @@ -148,19 +170,22 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang kdocker +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files -f kdocker.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS BUGS ChangeLog COPYING CREDITS HACKING INSTALL README TODO VERSION -%{tde_bindir}/kdocker -%{tde_tdeappdir}/kdocker.desktop -%{tde_datadir}/apps/kdocker/icons/kdocker.png -%{tde_datadir}/apps/kdocker/icons/question.png +%{tde_bindir}/tdedocker +%{tde_tdeappdir}/tdedocker.desktop +%{tde_datadir}/apps/tdedocker/ +%{tde_datadir}/icons/hicolor/*/apps/tdedocker.png +%{tde_datadir}/apps/tdedocker/icons/question.png +%{tde_mandir}/man1/tdedocker.1* %changelog diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch deleted file mode 100644 index b83b3f3ad..000000000 --- a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp.ORI 2013-07-29 11:26:26.740982531 +0200 -+++ trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp 2013-07-29 11:26:53.970250335 +0200 -@@ -143,10 +143,10 @@ - */ - - static const TQString -- html_form_begin("\n<form action=\"apt:/\" method=\"GET\">\n" -+ html_form_begin_apt("\n<form action=\"apt:/\" method=\"GET\">\n" - "<table class=\"query\">\n"); - static const TQString -- html_form_end("<tr>\n" -+ html_form_end_apt("<tr>\n" - "\t<td class=\"button\" colspan=\"2\"><input type=\"submit\" value=\"%1\"></td>\n" - "</tr>\n" - "</table>\n" -@@ -197,7 +197,7 @@ - if (online) - stream << "<table class=\"queryform\"><tr><td>\n"; - -- stream << html_form_begin; -+ stream << html_form_begin_apt; - stream << "<tr><td colspan=\"2\" class=\"title\">" + i18n("Offline search") + "</td></tr>" << endl; - stream << make_html_form_line("search", i18n("Package search")); - if (ext_form) -@@ -206,7 +206,7 @@ - stream << make_html_form_line("fsearch", i18n("File search")); - stream << make_html_form_line("show", i18n("Package info")); - } -- stream << html_form_end.arg( i18n("Search") ); -+ stream << html_form_end_apt.arg( i18n("Search") ); - - if (online) - { diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec deleted file mode 100644 index e45848c73..000000000 --- a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec +++ /dev/null @@ -1,121 +0,0 @@ -# Default version for this component -%define tde_pkg tdeio-apt -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: An apt-cache ioslave for Trinity -Version: 0.13.2 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://lpnotfr.free.fr/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch1: tdeio-apt-3.5.13.2-ftbfs.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -tdeio-apt is an ioslave which provides the apt:/ protocol. It -integrates apt-cache functionalities into Konqueror, making -browsing the packages easier. It provides: - - apt-cache search: apt:/search?expression - - apt-cache show: apt:/show?package . The show? target - prints the policy too. - - apt-cache policy: apt:/policy?package - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .ftbfs - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang kio-apt - - -%clean -%__rm -rf %{buildroot} - - -%files -f kio-apt.lang -%defattr(-,root,root,-) -%doc AUTHORS CHANGELOG ChangeLog COPYING -%{tde_tdelibdir}/kio_apt.la -%{tde_tdelibdir}/kio_apt.so -%{tde_datadir}/apps/kio_apt/kdedeb_logo.png -%{tde_datadir}/apps/kio_apt/kio_apt.css -%{tde_datadir}/services/apt+http.protocol -%{tde_datadir}/services/apt.protocol -%{tde_datadir}/services/searchproviders/apt-file.desktop -%{tde_datadir}/services/searchproviders/apt-files.desktop -%{tde_datadir}/services/searchproviders/apt-search.desktop - - -%changelog diff --git a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec b/redhat/applications/tdeio-apt/tdeio-apt.spec index c405bfa07..cd085ba18 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec +++ b/redhat/applications/tdeio-apt/tdeio-apt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeio-apt %define tde_prefix /opt/trinity @@ -60,11 +60,17 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -97,39 +103,43 @@ browsing the packages easier. It provides: %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DBUILD_TRANSLATIONS=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio-ftps/tdeio-ftps.spec index cd0b89d14..13ca048d8 100644 --- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec +++ b/redhat/applications/tdeio-ftps/tdeio-ftps.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeio-ftps %define tde_prefix /opt/trinity @@ -144,8 +144,15 @@ fi %__rm -rf %{?buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} -%files + +%clean +%__rm -rf %{?buildroot} + + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) %defattr(-,root,root,-) %doc README Changelog COPYING AUTHORS %{tde_tdelibdir}/tdeio_ftps.la diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio-gopher/tdeio-gopher.spec index e13482992..4c36b407a 100644 --- a/redhat/applications/tdeio-gopher/tdeio-gopher.spec +++ b/redhat/applications/tdeio-gopher/tdeio-gopher.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeio-gopher %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec b/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec deleted file mode 100644 index 508da013b..000000000 --- a/redhat/applications/tdeio-locate/tdeio-locate-3.5.13.2.spec +++ /dev/null @@ -1,128 +0,0 @@ -# Default version for this component -%define tde_pkg tdeio-locate -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: kio-slave for the locate command [Trinity] -Version: 0.4.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: cmake >= 2.8 - -Obsoletes: trinity-kio-locate < %{version}-%{release} -Provides: trinity-kio-locate = %{version}-%{release} - -%description -Adds support for the "locate" and "locater:" -protocols to Konqueror and other TDE applications. - -This enables you to perform locate searches as you -would in a terminal. The result is displayed just -as a directory. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DBUILD_ALL=ON \ - .. - -# SMP safe ! -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -%find_lang kio-locate - -%clean -%__rm -rf %{buildroot} - - - -%files -f kio-locate.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING TODO -%{tde_tdelibdir}/kio_locate.la -%{tde_tdelibdir}/kio_locate.so -%{tde_tdedocdir}/HTML/en/kio-locate/ -%{tde_datadir}/services/locate.protocol -%{tde_datadir}/services/locater.protocol -%{tde_datadir}/services/rlocate.protocol -%{tde_datadir}/services/searchproviders/locate.desktop - -%changelog diff --git a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec b/redhat/applications/tdeio-locate/tdeio-locate.spec index 2c389bbee..d1784e171 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec +++ b/redhat/applications/tdeio-locate/tdeio-locate.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeio-locate %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio-sword/tdeio-sword.spec index bd1e3f003..ea214101d 100644 --- a/redhat/applications/tdeio-sword/tdeio-sword.spec +++ b/redhat/applications/tdeio-sword/tdeio-sword.spec @@ -23,7 +23,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeio-sword %define tde_prefix /opt/trinity @@ -154,8 +154,14 @@ fi %__rm -rf %{?buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} -%files + +%clean +%__rm -rf %{?buildroot} + + +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{tde_tdelibdir}/tdeio_sword.la diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec deleted file mode 100644 index 22903f422..000000000 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec +++ /dev/null @@ -1,130 +0,0 @@ -# Default version for this component -%define tde_pkg tdeio-umountwrapper -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: progress dialog for safely removing devices in Trinity. -Version: 0.2 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://frode.kde.no/misc/tdeio_umountwrapper/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: media_safelyremove.desktop - - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -Obsoletes: trinity-kio-umountwrapper < %{version}-%{release} -Provides: trinity-kio-umountwrapper = %{version}-%{release} - -%description -Wrapper around kio_media_mountwrapper. -Provides a progress dialog for Safely Removing of devices in Trinity. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper -%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper - - -%clean -%__rm -rf %{buildroot} - -%post -for f in konqueror d3lphin; do - update-alternatives --install \ - %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \ - media_safelyremove.desktop_${f} \ - %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \ - 20 -done - -%postun -if [ $1 -eq 0 ]; then - for f in konqueror d3lphin; do - update-alternatives --remove \ - media_safelyremove.desktop_${f} \ - %{tde_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper - done -fi - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kio_umountwrapper -%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper -%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper - - -%changelog diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec index 81e416d4e..53a8b0f8c 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeio-umountwrapper %define tde_prefix /opt/trinity @@ -150,10 +150,13 @@ export PATH="%{tde_bindir}:${PATH}" %__install -D -m 644 "%{SOURCE1}" %{?buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper %__install -D -m 644 "%{SOURCE1}" %{?buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper +%find_lang tdeio_umountwrapper + %clean %__rm -rf %{buildroot} + %post for f in konqueror d3lphin; do update-alternatives --install \ @@ -163,6 +166,7 @@ for f in konqueror d3lphin; do 20 done + %postun if [ $1 -eq 0 ]; then for f in konqueror d3lphin; do @@ -172,9 +176,10 @@ if [ $1 -eq 0 ]; then done fi -%files + +%files -f tdeio_umountwrapper.lang %defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%doc AUTHORS COPYING README %{tde_bindir}/tdeio_umountwrapper %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper %dir %{tde_datadir}/apps/d3lphin diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec index cf3edd2bb..9f1a67da7 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec +++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdenetworkmanager %define tde_prefix /opt/trinity @@ -84,7 +84,7 @@ Provides: trinity-knetworkmanager = %{version}-%{release} %if 0%{?rhel} || 0%{?fedora} %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 Requires: NetworkManager -%if 0%{?fedora} >= 29 +%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 BuildRequires: NetworkManager-libnm-devel %else BuildRequires: NetworkManager-devel @@ -98,7 +98,7 @@ Requires: networkmanager %endif %if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} %if 0%{?pclinuxos} == 0 -%if 0%{?fedora} >= 29 +%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 BuildRequires: NetworkManager-libnm-devel %else BuildRequires: NetworkManager-glib-devel @@ -151,7 +151,7 @@ if [ -r "/etc/xdg/autostart/nm-applet.desktop" ]; then fi fi -%files -f %{tde_pkg}.lang +%files %defattr(-,root,root,-) %{tde_bindir}/tdenetworkmanager %{tde_libdir}/*.la @@ -163,11 +163,11 @@ fi %{tde_datadir}/servicetypes/tdenetworkmanager_plugin.desktop %{tde_datadir}/servicetypes/tdenetworkmanager_vpnplugin.desktop %{tde_datadir}/autostart/tdenetworkmanager.desktop -%{tde_datadir}/services/tdenetman_openvpn.desktop -%{tde_datadir}/services/tdenetman_pptp.desktop -%{tde_datadir}/services/tdenetman_strongswan.desktop -%{tde_datadir}/services/tdenetman_vpnc.desktop -%{tde_tdedocdir}/HTML/en/tdenetworkmanager/ +#{tde_datadir}/services/tdenetman_openvpn.desktop +#{tde_datadir}/services/tdenetman_pptp.desktop +#{tde_datadir}/services/tdenetman_strongswan.desktop +#{tde_datadir}/services/tdenetman_vpnc.desktop +#{tde_tdedocdir}/HTML/en/tdenetworkmanager/ ########## @@ -231,8 +231,6 @@ fi %__rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=%{?buildroot} -C build -%find_lang %{tde_pkg} - # Updates applications categories for openSUSE %if 0%{?suse_version} %suse_update_desktop_file -r %{tde_pkg} Utility TrayIcon System Applet diff --git a/redhat/extras/kpacman/kpacman-14.0.0.spec b/redhat/applications/tdepacman/tdepacman.spec index 64b54ba35..4588b8bb6 100644 --- a/redhat/extras/kpacman/kpacman-14.0.0.spec +++ b/redhat/applications/tdepacman/tdepacman.spec @@ -1,5 +1,5 @@ # -# spec file for package kpacman (version R14) +# spec file for package tdepacman (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -16,12 +16,13 @@ # # Default version for this component -%define tde_pkg kpacman +%define tde_pkg tdepacman %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif # TDE specific building variables +%define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin %define tde_confdir %{_sysconfdir}/trinity %define tde_datadir %{tde_prefix}/share @@ -40,7 +41,7 @@ Name: trinity-%{tde_pkg} -Summary: A pacman game for the Trinity Desktop. +Summary: A pacman game for the Trinity Desktop Version: 0.3.2 Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} @@ -54,18 +55,22 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{tde_pkg}-%{tde_version}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: trinity-tdegames-devel >= %{tde_version} BuildRequires: desktop-file-utils -BuildRequires: trinity-libtdegames-devel >= %{tde_version} - BuildRequires: gettext +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool + %description Pacman is a legendary game with an enthusiastic following from around @@ -80,79 +85,65 @@ United States by Bally, Pacman is an icon of 1980's popular culture %prep -%setup -q -n %{tde_pkg}-%{version} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export kde_confdir="%{tde_confdir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DBUILD_ALL=ON \ + .. -%__make %{?_smp_mflags} || %__make +%__make %{?_smp_mflags} %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%post -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig - - -%postun -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig - - %files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO -%{tde_bindir}/kpacman -%{tde_datadir}/applnk/Games/kpacman.desktop -%{tde_datadir}/apps/kpacman/ -%{tde_confdir}/kpacmanrc -%lang(de) %{tde_tdedocdir}/HTML/de/kpacman/ -%{tde_tdedocdir}/HTML/en/kpacman/ -%{tde_datadir}/icons/hicolor/16x16/apps/kpacman.png -%{tde_datadir}/icons/hicolor/32x32/apps/kpacman.png -%{tde_datadir}/icons/locolor/16x16/apps/kpacman.png -%{tde_datadir}/icons/locolor/32x32/apps/kpacman.png +%{tde_bindir}/tdepacman +%{tde_tdeappdir}/tdepacman.desktop +%{tde_datadir}/apps/tdepacman/ +%dir %{tde_datadir}/config +%{tde_datadir}/config/tdepacmanrc +%lang(de) %{tde_tdedocdir}/HTML/de/tdepacman/ +%{tde_tdedocdir}/HTML/en/tdepacman/ +%{tde_datadir}/icons/hicolor/16x16/apps/tdepacman.png +%{tde_datadir}/icons/hicolor/32x32/apps/tdepacman.png +%{tde_datadir}/icons/locolor/16x16/apps/tdepacman.png +%{tde_datadir}/icons/locolor/32x32/apps/tdepacman.png +%{tde_mandir}/man1/tdepacman.1* %changelog diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave.spec index 613e0ba2f..2b80f902d 100644 --- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec +++ b/redhat/applications/tdepowersave/tdepowersave.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdepowersave %define tde_prefix /opt/trinity @@ -86,7 +86,7 @@ BuildRequires: libudev-devel # XSCREENSAVER support # Disabled on RHEL4 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?rhel} == 5 BuildRequires: xorg-x11-proto-devel @@ -240,7 +240,8 @@ fi %{tde_datadir}/apps/tdepowersave/ %{tde_datadir}/icons/hicolor/*/*/*.png %{tde_datadir}/autostart/tdepowersave-autostart.desktop -%{tde_confdir}/tdepowersaverc +%config(noreplace) %{tde_confdir}/tdepowersaverc +%{tde_mandir}/man1/tdepowersave.* %lang(cs) %{tde_tdedocdir}/HTML/cs/tdepowersave/ %lang(de) %{tde_tdedocdir}/HTML/de/tdepowersave/ diff --git a/redhat/applications/tderadio/tderadio-3.5.13.2.spec b/redhat/applications/tderadio/tderadio-3.5.13.2.spec deleted file mode 100644 index 04b82fc4e..000000000 --- a/redhat/applications/tderadio/tderadio-3.5.13.2.spec +++ /dev/null @@ -1,171 +0,0 @@ -# Default version for this component -%define tde_pkg tderadio -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_lirc 1 -%endif - -Name: trinity-%{tde_pkg} -Summary: Comfortable Radio Application for TDE [Trinity] -Version: 0.1.1.1 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext -BuildRequires: libsndfile-devel -%{?with_lirc:BuildRequires: lirc-devel} - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}twolame-devel -%endif -%if 0%{?suse_version} -BuildRequires: libtwolame-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: lame-devel -%endif - -Obsoletes: trinity-kradio < %{version}-%{release} -Provides: trinity-kradio = %{version}-%{release} - -%description -KRadio is a comfortable radio application for Trinity with support for -V4L and V4L2 radio cards drivers. - -KRadio currently provides - - * V4L/V4L2 radio support -%if 0%{?with_lirc} - * Remote control support (LIRC) -%endif - * Alarms, sleep Countdown - * Several GUI Controls (Docking Menu, Station Quickbar, Radio Display) - * Recording capabilities, including MP3 and Ogg/Vorbis encoding - * Timeshifter functionality - * Extendable plugin architecture - -This package also includes a growing collection of station preset -files for many cities around the world contributed by KRadio users. - -As KRadio is based on an extendable plugin architecture, contributions -of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - \ - %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \ - --enable-v4l2 \ - --enable-lame \ - --enable-ogg \ - --enable-alsa \ - --enable-oss - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang kradio - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -update-desktop-database %{tde_appdir} -q &> /dev/null ||: - -%postun -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -update-desktop-database %{tde_appdir} -q &> /dev/null ||: - - -%files -f kradio.lang -%defattr(-,root,root,-) -%{tde_bindir}/convert-presets -%{tde_bindir}/kradio -%{tde_libdir}/kradio/plugins/*.la -%{tde_libdir}/kradio/plugins/*.so -%{tde_tdeappdir}/kradio.desktop -%{tde_datadir}/apps/kradio/ -%{tde_datadir}/icons/hicolor/*/*/kradio*.png -%{tde_datadir}/icons/locolor/*/*/kradio*.png -%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo -%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo - -%changelog diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio.spec index 7b15298df..57216d054 100644 --- a/redhat/applications/tderadio/tderadio-14.0.0.spec +++ b/redhat/applications/tderadio/tderadio.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tderadio %define tde_prefix /opt/trinity @@ -166,6 +166,7 @@ export PATH="%{tde_bindir}:${PATH}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ + --program-prefix="" \ \ --disable-dependency-tracking \ --disable-debug \ @@ -221,6 +222,8 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_datadir}/icons/hicolor/*/*/tderadio*.png %{tde_datadir}/icons/locolor/*/*/tderadio*.png %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo +%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo %{tde_tdedocdir}/HTML/en/tderadio/ diff --git a/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec b/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec deleted file mode 100644 index e7dd22faf..000000000 --- a/redhat/applications/tdesudo/tdesudo-3.5.13.2.spec +++ /dev/null @@ -1,110 +0,0 @@ -# Default version for this component -%define tde_pkg tdesudo -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: sudo frontend for Trinity - -Version: 2.5.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -Obsoletes: trinity-kdesudo < %{version}-%{release} -Provides: trinity-kdesudo = %{version}-%{release} - -Requires: sudo - -%description -TdeSudo is a graphical frontend for the sudo utility. -It allows you to run programs as another user by entering your password. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_docdir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang kdesudo - - -%clean -%__rm -rf %{buildroot} - - - -%files -f kdesudo.lang -%defattr(-,root,root,-) -%{tde_bindir}/kdesudo -%{tde_tdedocdir}/HTML/en/kdesudo/ - - -%changelog diff --git a/redhat/applications/tdesudo/tdesudo.spec b/redhat/applications/tdesudo/tdesudo.spec index 83e1bff8f..2b4d8509d 100644 --- a/redhat/applications/tdesudo/tdesudo.spec +++ b/redhat/applications/tdesudo/tdesudo.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdesudo %define tde_prefix /opt/trinity diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.patch b/redhat/applications/tdesvn/tdesvn-14.0.0.patch deleted file mode 100644 index b22e7f2e4..000000000 --- a/redhat/applications/tdesvn/tdesvn-14.0.0.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/CMakeLists.txt.sqlite3 2013-12-30 17:57:05.867723485 +0100 -+++ trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/CMakeLists.txt 2014-09-16 21:49:29.774968683 +0200 -@@ -45,19 +45,6 @@ - cache/DatabaseException.cpp - ) - --# IF (SQLITE_FOUND) -- MESSAGE(STATUS "Build own sqlite3 database modul") -- SET(SOURCES -- ${SOURCES} -- cache/sqlite3/qsqlcachedresult.cpp -- cache/sqlite3/qsql_sqlite3.cpp -- cache/sqlite3/qsqlcachedresult.h -- cache/sqlite3/qsql_sqlite3.h -- ) --# ELSE (SQLITE_FOUND) --# MESSAGE(SEND_ERROR "The QT3 version requires sqlite3 but could not found") --# ENDIF (SQLITE_FOUND) -- - SET(CACHEINST_HEADERS - cache/LogCache.hpp - cache/ReposLog.hpp -@@ -150,7 +137,7 @@ - - # IF (SQLITE_FOUND) - TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES}) -- INCLUDE_DIRECTORIES(SQLITE_INCLUDE_DIR) -+ INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIR}) - # ELSE (SQLITE_FOUND) - # TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY}) - # ENDIF (SQLITE_FOUND) ---- trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/cache/LogCache.cpp.sqlite3 2014-01-28 20:25:28.711539518 +0100 -+++ trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/cache/LogCache.cpp 2014-09-16 21:51:37.826387614 +0200 -@@ -10,9 +10,10 @@ - #include "svnqt/cache/DatabaseException.hpp" - - #ifndef NO_SQLITE3 --#include "sqlite3/qsql_sqlite3.h" -+#include <qsql_sqlite3.h> - #define SQLTYPE "QSQLITE3" - #else -+#include <qsql_sqlite.h> - #define SQLTYPE "QSQLITE" - #endif - -@@ -262,11 +263,6 @@ - - void LogCache::setupMainDb() - { --#ifndef NO_SQLITE3 -- if (!TQSqlDatabase::isDriverAvailable(SQLTYPE)) { -- TQSqlDatabase::registerSqlDriver(SQLTYPE,new TQSqlDriverCreator<TQSQLite3Driver>); -- } --#endif - TQDataBase mainDB = m_CacheData->getMainDB(); - if (!mainDB || !mainDB->open()) { - tqWarning("Failed to open main database: %s", (mainDB?mainDB->lastError().text().TOUTF8().data():"No database object.")); diff --git a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec deleted file mode 100644 index 06473162e..000000000 --- a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec +++ /dev/null @@ -1,255 +0,0 @@ -# Default version for this component -%define tde_pkg tdesvn -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: subversion client with tight TDE integration [Trinity] -Version: 1.0.4 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.elliptique.net/~ken/kima/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: subversion-devel -Requires: %{name}-tdeio-plugins = %{version}-%{release} - -Obsoletes: trinity-kdesvn < %{version}-%{release} -Provides: trinity-kdesvn = %{version}-%{release} - -%description -TDESvn is a graphical client for the subversion revision control -system (svn). - -Besides offering common and advanced svn operations, it features -a tight integration into TDE and can be embedded into other TDE -applications like konqueror via the TDE component technology KParts. - - -%package -n trinity-libsvnqt -Group: Development/Libraries -Summary: Qt wrapper library for subversion [Trinity] - -%description -n trinity-libsvnqt -This package provides svnqt, a Qt wrapper library around the -subversion library. - -It is based on the RapidSvn SvnCpp library, a subversion client API -written in C++. - -%package -n trinity-libsvnqt-devel -Group: Development/Libraries -Requires: trinity-libsvnqt = %{version}-%{release} -Requires: qt-devel -Requires: subversion-devel -Summary: Qt wrapper library for subversion (development files) [Trinity] - -%description -n trinity-libsvnqt-devel -This package contains the header files and symbolic links that developers -using svnqt will need. - - -%package tdeio-plugins -Group: Development/Libraries -Conflicts: trinity-kdesdk-tdeio-plugins -Summary: subversion I/O slaves for Trinity - -Obsoletes: trinity-kdesvn-kio-plugins < %{version}-%{release} -Provides: trinity-kdesvn-kio-plugins = %{version}-%{release} -Obsoletes: trinity-tdesvn-kio-plugins < %{version}-%{release} -Provides: trinity-tdesvn-kio-plugins = %{version}-%{release} - -%description tdeio-plugins -This packages includes KIO slaves for svn, svn+file, svn+http, -svn+https, svn+ssh. This allows you to access subversion repositories -inside any KIO enabled TDE application. - -This package is part of tdesvn-trinity. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -# Moves HTML files to the correect location -find . -name "*.cmake" -exec %__sed -i {} \ - -e "s,/doc/HTML,/doc/tde/HTML,g" \ - \; - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" -export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_includedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DMAN_INSTALL_DIR=%{tde_mandir}/man1 \ - -DDATA_INSTALL_DIR=%{tde_datadir} \ - -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=ON \ - .. - -# SMP safe ! -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -# Installs SVN protocols as alternatives -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn -%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn - -# Locales -%find_lang kdesvn - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%post -n trinity-libsvnqt -/sbin/ldconfig || : - -%post tdeio-plugins -for proto in svn+file svn+http svn+https svn+ssh svn; do - update-alternatives --install \ - %{tde_datadir}/services/${proto}.protocol \ - ${proto}.protocol \ - %{tde_datadir}/services/${proto}.protocol_tdesvn \ - 20 -done - -%preun tdeio-plugins -if [ $1 -eq 0 ]; then - for proto in svn+file svn+http svn+https svn+ssh svn; do - update-alternatives --remove \ - ${proto}.protocol \ - %{tde_datadir}/services/${proto}.protocol_tdesvn - done -fi - - - -%postun -n trinity-libsvnqt -/sbin/ldconfig || : - - -%files -f kdesvn.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kdesvn -%{tde_bindir}/kdesvnaskpass -%{tde_tdelibdir}/libkdesvnpart.la -%{tde_tdelibdir}/libkdesvnpart.so -%{tde_datadir}/applications/kde/kdesvn.desktop -%{tde_datadir}/apps/kconf_update/kdesvn-use-external-update.sh -%{tde_datadir}/apps/kconf_update/kdesvnpartrc-use-external.upd -%{tde_datadir}/apps/kdesvn/kdesvnui.rc -%{tde_datadir}/apps/kdesvnpart/kdesvn_part.rc -%{tde_datadir}/apps/konqueror/servicemenus/kdesvn_subversion.desktop -%{tde_datadir}/config.kcfg/kdesvn_part.kcfg -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_datadir}/icons/hicolor/*/*/*.svgz -%{tde_mandir}/man1/kdesvn.1 -%{tde_mandir}/man1/kdesvnaskpass.1 -%{tde_tdedocdir}/HTML/*/ - -%files -n trinity-libsvnqt -%defattr(-,root,root,-) -%{tde_libdir}/libsvnqt.so.4 -%{tde_libdir}/libsvnqt.so.4.2.2 - -%files -n trinity-libsvnqt-devel -%defattr(-,root,root,-) -%{tde_includedir}/svnqt -%{tde_libdir}/libsvnqt.so - -%files tdeio-plugins -%defattr(-,root,root,-) -%{tde_datadir}/services/kded/kdesvnd.desktop -%{tde_datadir}/services/ksvn+file.protocol -%{tde_datadir}/services/ksvn+http.protocol -%{tde_datadir}/services/ksvn+https.protocol -%{tde_datadir}/services/ksvn+ssh.protocol -%{tde_datadir}/services/ksvn.protocol -%{tde_datadir}/services/svn+file.protocol_tdesvn -%{tde_datadir}/services/svn+http.protocol_tdesvn -%{tde_datadir}/services/svn+https.protocol_tdesvn -%{tde_datadir}/services/svn+ssh.protocol_tdesvn -%{tde_datadir}/services/svn.protocol_tdesvn -%{tde_tdelibdir}/kio_ksvn.la -%{tde_tdelibdir}/kio_ksvn.so -%{tde_tdelibdir}/kded_kdesvnd.la -%{tde_tdelibdir}/kded_kdesvnd.so - - -%changelog diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn.spec index 675f25b7f..5b418701a 100644 --- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec +++ b/redhat/applications/tdesvn/tdesvn.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdesvn %define tde_prefix /opt/trinity @@ -55,7 +55,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} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -247,10 +246,9 @@ fi %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 rm -f src/svnqt/CMakeLists.txt.orig -rm -fr src/svnqt/cache/sqlite3/ +#rm -fr src/svnqt/cache/sqlite3/ %build diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec deleted file mode 100644 index 8691353fc..000000000 --- a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec +++ /dev/null @@ -1,119 +0,0 @@ -# Default version for this component -%define tde_pkg tdmtheme -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: theme manager for TDM [Trinity] -Version: 1.2.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://beta.smileaf.org/projects - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Obsoletes: trinity-kdmtheme < %{version}-%{release} -Provides: trinity-kdmtheme = %{version}-%{release} - - -%description -kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM) -that allows you to easily install, remove and change your KDM themes. - - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcm_kdmtheme.la -%{tde_tdelibdir}/kcm_kdmtheme.so -%{tde_tdeappdir}/kdmtheme.desktop -%{tde_tdedocdir}/HTML/en/kdmtheme/ - - -%post -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -update-desktop-database %{tde_appdir} &> /dev/null - - -%changelog diff --git a/redhat/applications/tdmtheme/tdmtheme.spec b/redhat/applications/tdmtheme/tdmtheme.spec index 5d44a1bbd..fac2e95c6 100644 --- a/redhat/applications/tdmtheme/tdmtheme.spec +++ b/redhat/applications/tdmtheme/tdmtheme.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdmtheme %define tde_prefix /opt/trinity @@ -144,12 +144,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %{tde_tdelibdir}/kcm_tdmtheme.la %{tde_tdelibdir}/kcm_tdmtheme.so diff --git a/redhat/applications/tellico/tellico-3.5.13.2.spec b/redhat/applications/tellico/tellico-3.5.13.2.spec deleted file mode 100644 index ce72709c0..000000000 --- a/redhat/applications/tellico/tellico-3.5.13.2.spec +++ /dev/null @@ -1,232 +0,0 @@ -# Default version for this component -%define tde_pkg tellico -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: Icollection manager for books, videos, music [Trinity] -Version: 1.3.2.1 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://periapsis.org/tellico/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -Patch1: tellico-3.5.13.2-videodev.patch -Patch2: tellico-3.5.13.2-ftbfs.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: yaz -BuildRequires: %{_lib}yaz-devel -%endif - -# V4L support -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version} -BuildRequires: libv4l-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}v4l-devel -%endif - -Requires: %{name}-data = %{version}-%{release} -Requires: %{name}-scripts = %{version}-%{release} - -%description -Tellico is a collection manager for TDE. It includes default collections for -books, bibliographies, comic books, videos, music, coins, stamps, trading -cards, and wines, and also allows custom collections; with unlimited -user-defined fields allowed. Automatically formatted names, sorting by any -property, filters, automatic ISBN validation and full customization for -printing or display through XSLT files are some of the features present. It -can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX, -BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB, -or any US-MARC compliant z39.50 server. - -The files are stored in XML format, avoiding the need for database server. -It also makes it easy for other softwares to use the Tellico data. - - -%package data -Group: Applications/Utilities -Summary: collection manager for books, videos, music [data] [Trinity] - -%description data -Tellico is a collection manager for TDE. It includes default collections for -books, bibliographies, comic books, videos, music, coins, stamps, trading -cards, and wines, and also allows custom collections; with unlimited -user-defined fields allowed. Automatically formatted names, sorting by any -property, filters, automatic ISBN validation and full customization for -printing or display through XSLT files are some of the features present. It -can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX, -BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB, -or any US-MARC compliant z39.50 server. - -The files are stored in XML format, avoiding the need for database server. -It also makes it easy for other softwares to use the Tellico data. - -This package contains the architecture independent files, such data files and -documentation. - -%package scripts -Group: Applications/Utilities -Summary: collection manager for books, videos, music [scripts] [Trinity] - -%description scripts -Tellico is a collection manager for TDE. It includes default collections for -books, bibliographies, comic books, videos, music, coins, stamps, trading -cards, and wines, and also allows custom collections; with unlimited -user-defined fields allowed. Automatically formatted names, sorting by any -property, filters, automatic ISBN validation and full customization for -printing or display through XSLT files are some of the features present. It -can import CSV, RIS, BibTeX, and BibTeXML files; and export CSV, HTML, BibTeX, -BibTeXML, and PilotDB. Tellico can also import data from Amazon, IMDb, CDDB, -or any US-MARC compliant z39.50 server. - -The files are stored in XML format, avoiding the need for database server. -It also makes it easy for other softwares to use the Tellico data. - -This package contains the scripts to import data from external sources, such -as websites. As the format of the data may change, these scripts are provided -as a separate package which can be updated through debian-volatile. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -if [ -r /usr/include/libv4l1-videodev.h ]; then -%patch1 -p1 -b .videodev -fi -%patch2 -p1 -b .ftbfs - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -# Warning, --enable-final causes FTBFS § -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --disable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - \ - --enable-webcam - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Add svg icons to xdg directories -%__install -D -c -p -m 644 icons/tellico.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/apps/tellico.svg -%__install -D -c -p -m 644 icons/tellico_mime.svg %{?buildroot}%{tde_datadir}/icons/hicolor/scalable/mimetypes/application-x-tellico.svg - - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_bindir}/tellico -#%{tde_datadir}/pixmaps -%{tde_datadir}/applications -%{tde_datadir}/config/tellicorc - -%files data -%defattr(-,root,root,-) -%{tde_datadir}/apps/tellico/*.xsl -%{tde_datadir}/apps/tellico/*.xml -%{tde_datadir}/apps/tellico/*.png -%{tde_datadir}/apps/tellico/entry-templates -%{tde_datadir}/apps/tellico/*.py* -%{tde_datadir}/apps/tellico/pics -%{tde_datadir}/apps/tellico/report-templates -%{tde_datadir}/apps/tellico/tellico.dtd -%{tde_datadir}/apps/tellico/tellico.tips -%{tde_datadir}/apps/tellico/tellico2html.js -%{tde_datadir}/apps/tellico/tellicoui.rc -%{tde_datadir}/apps/tellico/welcome.html -%{tde_datadir}/config.kcfg -%{tde_tdedocdir}/HTML/*/tellico/ -%{tde_datadir}/icons -%{tde_datadir}/apps/mime -%{tde_datadir}/mimelnk -%{tde_datadir}/apps/kconf_update/tellico-1-3-update.pl -%{tde_datadir}/apps/kconf_update/tellico-rename.upd -%{tde_datadir}/apps/kconf_update/tellico.upd - -%files scripts -%defattr(-,root,root,-) -%{tde_datadir}/apps/tellico/data-sources -%{tde_datadir}/apps/tellico/z3950-servers.cfg - - -%changelog diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico.spec index 8cb0aae90..c2a7d58fc 100644 --- a/redhat/applications/tellico/tellico-14.0.0.spec +++ b/redhat/applications/tellico/tellico.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tellico %define tde_prefix /opt/trinity @@ -176,7 +176,7 @@ It also makes it easy for other softwares to use the Tellico data. %defattr(-,root,root,-) %{tde_bindir}/tellico %{tde_datadir}/applications -%{tde_confdir}/tellicorc +%config(noreplace) %{tde_confdir}/tellicorc ########## @@ -272,6 +272,14 @@ if [ -r /usr/include/libv4l1-videodev.h ]; then %__sed -i "src/barcode/barcode_v4l.h" -e "s|linux/videodev.h|libv4l1.h|" fi +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%__sed -i "src/fetch/scripts/dark_horse_comics.py" \ + "src/fetch/scripts/ministerio_de_cultura.py" \ + "src/fetch/scripts/fr.allocine.py" \ + "src/translators/griffith2tellico.py" \ + -e "s|/usr/bin/env python|/usr/bin/env python2|" +%endif + %build unset QTDIR QTINC QTLIB diff --git a/redhat/applications/tork/tork-14.0.0.spec b/redhat/applications/tork/tork.spec index 4682ab764..5d4ed718d 100644 --- a/redhat/applications/tork/tork-14.0.0.spec +++ b/redhat/applications/tork/tork.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tork %define tde_prefix /opt/trinity @@ -117,6 +117,7 @@ export PATH="%{tde_bindir}:${PATH}" --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ --mandir=%{tde_mandir} \ + --program-prefix="" \ \ --disable-dependency-tracking \ --disable-debug \ diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec b/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec deleted file mode 100644 index 328988582..000000000 --- a/redhat/applications/twin-style-crystal/twin-style-crystal-3.5.13.2.spec +++ /dev/null @@ -1,117 +0,0 @@ -# Default version for this component -%define tde_pkg twin-style-crystal -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: Semi transparant window decoration for Trinity. -Version: 1.0.5 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -Obsoletes: trinity-kwin-style-crystal < %{version}-%{release} -Provides: trinity-kwin-style-crystal = %{version}-%{release} - -%description -Crystal offers you pseudo transparent titlebar, buttons and borders -transparent, so you can see more of your lovely background image -Transparancy and buttons can be costumized to match your wishes. -Offers rounded corners as well - -And it is of course nice to look at. Upstream says: -"- Don't forget to breathe, while drooling." - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_tdelibdir}/kwin3_crystal.la -%{tde_tdelibdir}/kwin3_crystal.so -%{tde_tdelibdir}/kwin_crystal_config.la -%{tde_tdelibdir}/kwin_crystal_config.so -%{tde_datadir}/apps/kwin/crystal.desktop - - -%changelog diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec b/redhat/applications/twin-style-crystal/twin-style-crystal.spec index 9f22e2596..2f5611335 100644 --- a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec +++ b/redhat/applications/twin-style-crystal/twin-style-crystal.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg twin-style-crystal %define tde_prefix /opt/trinity diff --git a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec b/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec deleted file mode 100644 index 264a650c2..000000000 --- a/redhat/applications/wlassistant/wlassistant-3.5.13.2.spec +++ /dev/null @@ -1,140 +0,0 @@ -# Default version for this component -%define tde_pkg wlassistant -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: User friendly TDE frontend for wireless network connection [Trinity] -Version: 0.5.7 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://wlassistant.sourceforge.net/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gettext - -BuildRequires: python -BuildRequires: cmake >= 2.8 - -%description -Wireless Assistant scans for wireless access points and displays link quality, -encryption and other useful information. When user wants to connect to a -network, Wireless Assistant opens up its wizards and guides the user through -Wi-Fi settings. After a successful connection is made the settings are -remembered so next time the user won't have to enter them again. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Shitty hack for RHEL4 ... -if [ -d "/usr/X11R6" ]; then - export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DBUILD_ALL=on \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc ChangeLog VERSION -%{tde_bindir}/wlassistant -%{tde_tdeappdir}/wlassistant.desktop -%{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png -%{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png -%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo -%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo -%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo -%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo -%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo -%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo -%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo -%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo -%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo -%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo - - -%changelog diff --git a/redhat/applications/wlassistant/wlassistant-14.0.0.spec b/redhat/applications/wlassistant/wlassistant.spec index fdd4e9b31..8fdb8da81 100644 --- a/redhat/applications/wlassistant/wlassistant-14.0.0.spec +++ b/redhat/applications/wlassistant/wlassistant.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg wlassistant %define tde_prefix /opt/trinity @@ -99,8 +99,18 @@ BuildRequires: libidn-devel %define with_gamin 1 BuildRequires: gamin-devel %endif + # PYTHON support -BuildRequires: python +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel # OPENSSL support BuildRequires: openssl-devel @@ -171,28 +181,17 @@ export PATH="%{tde_bindir}:${PATH}" %suse_update_desktop_file -i -r "%{?buildroot}%{tde_tdeappdir}/wlassistant.desktop" System Network %endif +%find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} -%files +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc ChangeLog VERSION %{tde_bindir}/wlassistant %{tde_tdeappdir}/wlassistant.desktop %{tde_datadir}/icons/hicolor/16x16/apps/wlassistant.png %{tde_datadir}/icons/hicolor/32x32/apps/wlassistant.png -%lang(ar) %{tde_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo -%lang(ca) %{tde_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo -%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/wlassistant.mo -%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo -%lang(nb) %{tde_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo -%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo -%lang(pt) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo -%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo -%lang(zh_CN) %{tde_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo -%lang(zh_TW) %{tde_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo - - -%changelog diff --git a/redhat/applications/yakuake/yakuake-3.5.13.2.spec b/redhat/applications/yakuake/yakuake-3.5.13.2.spec deleted file mode 100644 index 2cca734ce..000000000 --- a/redhat/applications/yakuake/yakuake-3.5.13.2.spec +++ /dev/null @@ -1,114 +0,0 @@ -# Default version for this component -%define tde_pkg yakuake -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Summary: Yakuake is a Quake-style terminal emulator based on TDE Konsole technology. -Version: 2.8.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - - -%description -Yakuake is a Quake-style terminal emulator based on TDE Konsole technology. - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/* -%{tde_datadir}/applications/*/*.desktop -%{tde_datadir}/apps/*/ -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_datadir}/locale/*/*/*.mo -%{tde_datadir}/config.kcfg/*.kcfg - -%changelog diff --git a/redhat/applications/yakuake/yakuake.spec b/redhat/applications/yakuake/yakuake.spec index 165aedac1..c8ace3af0 100644 --- a/redhat/applications/yakuake/yakuake.spec +++ b/redhat/applications/yakuake/yakuake.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg yakuake %define tde_prefix /opt/trinity diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index 5eb757699..5f4d659a2 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -1,12 +1,12 @@ #!/bin/bash -ex # Usage: build_rpm_package.sh <TDE_PACKAGE> [TDE_VERSION] -# Example: build_rpm_package.sh tdebase 14.0.0 +# Example: build_rpm_package.sh tdebase 14.0.7 PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" PATH="$(cd $(dirname $0); pwd):${PATH}" SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh index 5691cfc13..7723a1651 100755 --- a/redhat/build/configure_repository.sh +++ b/redhat/build/configure_repository.sh @@ -1,6 +1,6 @@ #!/bin/bash -x -TDE_VERSION="${1:-${TDE_VERSION:-14.0.5}}" +TDE_VERSION="${1:-${TDE_VERSION:-14.0.7}}" ARCH=$(rpm -E %_target_cpu) RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION}) diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh index 82c4b6804..6159a2bf0 100755 --- a/redhat/build/gather_rpm_sources.sh +++ b/redhat/build/gather_rpm_sources.sh @@ -1,11 +1,11 @@ #!/bin/bash # Usage: gather_rpm_sources.sh <TDE_PACKAGE> <TDE_VERSION> <DESTINATION> -# Example: gather_rpm_sources.sh tdebase 14.0.0 /tmp/tdebase +# Example: gather_rpm_sources.sh tdebase 14.0.7 /tmp/tdebase PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}" DIST="$4" diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh index 4df81b12b..83db3ab12 100755 --- a/redhat/build/get_installed_package_version.sh +++ b/redhat/build/get_installed_package_version.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Sample package name: trinity-tdelibs-14.0.0-0_pre727+6be06b3d.mga3.opt +# Sample package name: trinity-tdelibs-14.0.7-0_pre727+6be06b3d.mga3.opt PKGNAME="${1##*/}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh index 048493bf2..c25897907 100755 --- a/redhat/build/get_latest_built_package_filename.sh +++ b/redhat/build/get_latest_built_package_filename.sh @@ -2,7 +2,7 @@ PKGNAME="$1" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 -TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})" RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)" diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh index 990ca873f..869efc93b 100755 --- a/redhat/build/get_latest_built_package_version.sh +++ b/redhat/build/get_latest_built_package_version.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="$1" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 @@ -9,9 +9,18 @@ RPM=$(get_latest_built_package_filename.sh "${PKGNAME}" ${TDE_VERSION}) [ ! -r "${RPM}" ] && echo "No package found for '${PKGNAME}' !" && exit 2 -VERSION=$(rpm -qp --qf "%{version}-%{release}" "${RPM}") -VERSION=${VERSION%.opt} # Remove '.opt' suffix -VERSION=${VERSION%.[a-z]*} # Remove distro suffix (e.g. '.el6') -VERSION=${VERSION/-*_0_/\~} +pkg_version="$(rpm -qp --qf "%{version}" "${RPM}")" +pkg_release="$(rpm -qp --qf "%{release}" "${RPM}")" -echo $VERSION +# Application packages: version does not match TDE version +if [[ "${pkg_release}" =~ _0_ ]] || [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then + eval VERSION="${pkg_release/_0_/\~}" +else + # Base package (tdelibs ...) + eval VERSION="${pkg_version}_${pkg_release/0_/\~}" +fi + +VERSION="${VERSION%.opt}" # Remove '.opt' suffix +VERSION="${VERSION%.[a-z]*}" # Remove distro suffix (e.g. '.el6') + +echo "${VERSION}" diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh index d7e1ce37d..0cfd80047 100755 --- a/redhat/build/get_latest_tarball_filename.sh +++ b/redhat/build/get_latest_tarball_filename.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tarballs/${TDE_VERSION}/ @@ -10,33 +10,13 @@ TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" EXTRA_DIR="$(cd ${TARBALLS_DIR}/../extras/; pwd)" -RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - -RET=$(find "${TARBALLS_DIR}" "${EXTRA_DIR}" -follow -name "${PKGNAME}-${TDE_VERSION}*.tar.gz" -o -name "trinity-${PKGNAME}-${TDE_VERSION}*.tar.gz" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - -RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-[0-9]*.tar.gz" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - -RET=$(find "${EXTRA_DIR}" -follow -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - -# Now look in the 'tde-packaging' directory -RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - -# Retry without 'trinity-*', and allow any TAR extension. -RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - -# Retry without 'trinity-*', and allow any TAR extension. -RET=$(find "${DIST_PACKAGING_DIR}" -name "${PKGNAME}-[0-9]*.tar*" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - -# Retry by removing numbers in package name, e.g "imlib1" => "imlib" -RET=$(find "${DIST_PACKAGING_DIR}" -name "$(tr -d "[0-9]" <<< ${PKGNAME})-[0-9]*.tar*" | sort -V | tail -n 1) -[ -r "${RET}" ] && echo "${RET}" && exit 0 - +RET="" +for dir in "${TARBALLS_DIR}" "${EXTRA_DIR}" "${DIST_PACKAGING_DIR}"; do + for v in "${PKGNAME}-${TDE_VERSION}*.tar.*" "trinity-${PKGNAME}-${TDE_VERSION}*.tar.*" "${PKGNAME}[-_][0-9]*.tar.*"; do + RET=$(find "${dir}" -follow -type f -name ${v} | sort -V | tail -n 1) + [ -r "${RET}" ] && break + done + [ -r "${RET}" ] && echo "${RET}" && break +done exit 0 diff --git a/redhat/build/get_latest_tarball_version.sh b/redhat/build/get_latest_tarball_version.sh index 00a468d49..dd3448765 100755 --- a/redhat/build/get_latest_tarball_version.sh +++ b/redhat/build/get_latest_tarball_version.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 2989aebef..d0945f13b 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -22,9 +22,9 @@ case "${PKGNAME}" in # Most TDE dependencies have no prefix "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";; # 3rd party dependencies - "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";; + "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"libbeagle"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";; # Extra build stuff - "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";; + "autoconf"|"automake"|"brp-check-trinity"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2"|"yaz") PREFIX="";; # Other "curl") PREFIX="trinity-lib";; # Default case: add prefix @@ -45,11 +45,13 @@ case "${PKGNAME}" in "dbus-1-tqt") PKGRUNTIME="${lib}dbus-1-tqt0";; "digikam") PKGRUNTIME="digikam-i18n";; "esound") PKGRUNTIME="${lib}esd0";; + "exiv2") PKGRUNTIME="${lib}exiv2_26";; "imlib1") PKGRUNTIME="${lib}Imlib1";; "knetworkmanager8") PKGRUNTIME="knetworkmanager";; "koffice") PKGRUNTIME="koffice-suite";; "lcms") PKGRUNTIME="${lib}lcms1";; "libart-lgpl") PKGRUNTIME="${lib}art_lgpl_2-2";; + "libbeagle") PKGRUNTIME="${lib}beagle1";; "libcaldav") PKGRUNTIME="${lib}caldav0";; "libcarddav") PKGRUNTIME="${lib}carddav0";; "libkdcraw") PKGRUNTIME="${lib}kdcraw4";; @@ -62,6 +64,7 @@ case "${PKGNAME}" in "tqca-tls") PKGRUNTIME="${lib}tqt3-mt-tqca-tls";; "tqt3") PKGRUNTIME="${lib}tqt3-mt";; "tqtinterface") PKGRUNTIME="${lib}tqt4";; + "yaz") PKGRUNTIME="${lib}yaz";; # Language package: install only French language package "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGRUNTIME="${PKGNAME}-French";; @@ -93,11 +96,13 @@ if [ -n "${DEVEL}" ]; then "avahi-tqt") PKGDEVEL="libavahi-tqt-devel";; "dbus-tqt") PKGDEVEL="libdbus-tqt-1-devel";; "dbus-1-tqt") PKGDEVEL="libdbus-1-tqt-devel";; - "esound") PKGDEVEL="libesd-devel";; + "esound") PKGDEVEL="libesd0-devel";; + "exiv2") PKGDEVEL="${lib}exiv2-devel-0.26";; "imlib1") PKGDEVEL="${lib}Imlib-devel";; "koffice") PKGDEVEL="koffice-devel";; - "lcms") PKGDEVEL="liblcms-devel";; + "lcms") PKGDEVEL="${lib}lcms-devel";; "libart-lgpl") PKGDEVEL="libart_lgpl-devel";; + "libbeagle") PKGDEVEL="${lib}beagle-devel";; "libcaldav") PKGDEVEL="${lib}caldav-devel";; "libcarddav") PKGDEVEL="${lib}carddav-devel";; "libkdcraw") PKGDEVEL="${lib}kdcraw-devel";; @@ -109,6 +114,7 @@ if [ -n "${DEVEL}" ]; then "tqca") PKGDEVEL="${lib}tqca-devel";; "tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";; "tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers ${lib}tqt3-mt-sqlite3";; + "yaz") PKGDEVEL="${lib}yaz-devel";; # Default case: development package has same name as runtime package, plus '-devel' suffix. *) PKGDEVEL="${PKGRUNTIME}-devel";; esac diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh index aaac175da..8b2a74c1a 100755 --- a/redhat/build/get_source_files.sh +++ b/redhat/build/get_source_files.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" DIST="$3" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_spec_version.sh b/redhat/build/get_spec_version.sh index fcc0fb5d7..d92060c5c 100755 --- a/redhat/build/get_spec_version.sh +++ b/redhat/build/get_spec_version.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh index 81c20b183..62eb01144 100755 --- a/redhat/build/get_specfile.sh +++ b/redhat/build/get_specfile.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 diff --git a/redhat/build/install_rpm_package.sh b/redhat/build/install_rpm_package.sh index 5deece1bd..156d02aec 100755 --- a/redhat/build/install_rpm_package.sh +++ b/redhat/build/install_rpm_package.sh @@ -11,7 +11,7 @@ PKGNAME="${1}" if [ -x /usr/sbin/urpmi ]; then PKGINST='sudo urpmi --auto --no-verify-rpm' elif [ -x /usr/bin/dnf ]; then - PKGINST="sudo dnf install -y --refresh --nogpgcheck" + PKGINST="sudo dnf install -y --nogpgcheck" elif [ -x /usr/bin/zypper ]; then PKGINST="sudo zypper install -y" elif [ -x /usr/bin/yum ]; then diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh index 5ce0c83a9..2acb98a6a 100755 --- a/redhat/build/is_latest_package_built.sh +++ b/redhat/build/is_latest_package_built.sh @@ -1,21 +1,23 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" -BUILT=$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION}) -TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION}) +BUILT="$(get_latest_built_package_version.sh ${PKGNAME} ${TDE_VERSION})" +TARBALL="$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})" RPM_PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})" +[ -z "${TARBALL}" ] && exit 1 + # If package version contains a "~": it's a pre-release -if [ "${BUILT/\~/}" != "${BUILT}" ]; then - if [ "${BUILT#*\~}" = "${TARBALL#*\~}" ]; then +if [ "${BUILT/~/}" != "${BUILT}" ]; then + if [ "${BUILT#*_pre}" = "${TARBALL#*~pre}" ]; then echo "Latest development package '${PKGNAME}' version '${BUILT}' is already built." exit 0 fi # Nominal case: no "~" caracter else - if [ "${TARBALL%-*}" = "${BUILT%-*}" ] || [[ "${BUILT}" =~ [0-9\.]*-${TARBALL}_[0-9]* ]]; then + if [ "${TARBALL%-*}" = "${BUILT%-*}" ] || [[ "${BUILT}" =~ ${TARBALL}_[0-9]* ]]; then echo "Latest stable package '${PKGNAME}' version '${BUILT}' is already built." exit 0 fi diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh index 1f600862f..811cbafa0 100755 --- a/redhat/build/is_latest_package_installed.sh +++ b/redhat/build/is_latest_package_installed.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION}) TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION}) @@ -20,7 +20,7 @@ else echo "Latest package '${PKGNAME}' version '${INSTALLED}' is already built and installed." exit 0 fi - + # Other package (e.g. QT3) if [ "${INSTALLED}" = "${SPEC}" ] || [ "${INSTALLED}$(rpm -E %dist)" = "${SPEC}" ]; then echo "Latest package '${PKGNAME}' version '${INSTALLED}' is already built and installed." diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh index 5db461319..d6b711656 100755 --- a/redhat/build/update_repository.sh +++ b/redhat/build/update_repository.sh @@ -1,7 +1,7 @@ #!/bin/bash WORKERS=$(getconf _NPROCESSORS_ONLN) -TDE_VERSION="${2:-${TDE_VERSION:-14.0.5}}" +TDE_VERSION="${2:-${TDE_VERSION:-14.0.7}}" LOCKFILE="/tmp/lock.${0##*/}" while [ -e "${LOCKFILE}" ]; do diff --git a/redhat/dependencies/akode/akode-3.5.13.2.spec b/redhat/dependencies/akode/akode-3.5.13.2.spec deleted file mode 100644 index 3a3ef35df..000000000 --- a/redhat/dependencies/akode/akode-3.5.13.2.spec +++ /dev/null @@ -1,350 +0,0 @@ -# -# spec file for package akode (version 3.5.13-SRU) -# -# 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/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%if "%{?tde_version}" == "" -%define tde_version 3.5.13.2 -%endif -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -Name: trinity-akode -Summary: Audio-decoding framework -Group: System Environment/Libraries -Epoch: %{tde_epoch} -Version: 2.0.2 -Release: 1%{?dist} -URL: http://www.kde-apps.org/content/show.php?content=30375 -#URL: http://carewolf.com/akode/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -Source0: akode-%{tde_version}.tar.gz - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gcc-c++ -BuildRequires: libtool - -# TQT support -BuildRequires: libtqt4-devel -BuildRequires: trinity-filesystem >= %{tde_version} - -# FLAC support -%define _with_flac --with-flac -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libflac-devel -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: flac-devel -%endif - -# JACK support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define _with_jack --with-jack -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libjack-devel -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: jack-audio-connection-kit-devel -%endif -%endif - -# SAMPLERATE support -%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define _with_libsamplerate --with-libsamplerate -BuildRequires: libsamplerate-devel -%endif - -# PULSEAUDIO support -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define _with_pulseaudio --with-pulseaudio -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libpulseaudio-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: pulseaudio-libs-devel -%endif -%if 0%{?suse_version} -BuildRequires: pulseaudio-devel -%endif -%endif - -# MAD support -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -%define _with_libmad --with-libmad -BuildRequires: libmad-devel -%endif - -BuildRequires: alsa-lib-devel -BuildRequires: libvorbis-devel -BuildRequires: speex-devel - - -%description -aKode is a simple audio-decoding frame-work that provides a uniform -interface to decode the most common audio-formats. It also has a direct -playback option for a number of audio-outputs. - -aKode currently has the following decoder plugins: -* mpc: Decodes musepack aka mpc audio. -* xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio. - -aKode also has the following audio outputs: -* alsa: Outputs to ALSA (dmix is recommended). -* jack -* pulseaudio - -%files -%defattr(-,root,root,-) -%doc rpmdocs/* -%{tde_bindir}/akodeplay -%{tde_libdir}/libakode.so.* -%{tde_libdir}/libakode_alsa_sink.la -%{tde_libdir}/libakode_alsa_sink.so -%{tde_libdir}/libakode_mpc_decoder.la -%{tde_libdir}/libakode_mpc_decoder.so -%{tde_libdir}/libakode_oss_sink.la -%{tde_libdir}/libakode_oss_sink.so -%{tde_libdir}/libakode_xiph_decoder.la -%{tde_libdir}/libakode_xiph_decoder.so - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -########## - -%package devel -Summary: Headers for developing programs that will use %{name} -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%{?_with_jack:Requires: %{name}-jack = %{?epoch:%{epoch}:}%{version}-%{release}} -%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{?epoch:%{epoch}:}%{version}-%{release}} -%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{?epoch:%{epoch}:}%{version}-%{release}} -%{?_with_libmad:Requires: %{name}-libmad = %{?epoch:%{epoch}:}%{version}-%{release}} -Requires: pkgconfig - -%description devel -This package contains the development files for Akode. -It is needed if you intend to build an application linked against Akode. - -%files devel -%defattr(-,root,root,-) -%{tde_bindir}/akode-config -%{tde_includedir}/* -%{tde_libdir}/libakode.la -%{tde_libdir}/libakode.so -%{tde_libdir}/pkgconfig/*.pc - -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig - -########## - -%if "%{?_with_jack}" != "" - -%package jack -Summary: Jack audio output backend for %{name} -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description jack -This package contains the Jack audio output backend for Akode. - -%files jack -%defattr(-,root,root,-) -%{tde_libdir}/libakode_jack_sink.la -%{tde_libdir}/libakode_jack_sink.so - -%post jack -/sbin/ldconfig - -%postun jack -/sbin/ldconfig - -%endif - -########## - -%if "%{?_with_pulseaudio}" != "" - -%package pulseaudio -Summary: Pulseaudio output backend for %{name} -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description pulseaudio -This package contains the pulseaudio backend for Akode. -Recommended for network transparent audio. - -%files pulseaudio -%defattr(-,root,root,-) -%{tde_libdir}/libakode_polyp_sink.la -%{tde_libdir}/libakode_polyp_sink.so - -%post pulseaudio -/sbin/ldconfig - -%postun pulseaudio -/sbin/ldconfig - -%endif - -########## - -# Packaged separately to keep main/core %{akode} package LGPL-clean. -%if "%{?_with_libsamplerate:1}" == "1" - -%package libsamplerate -Summary: Resampler based on libsamplerate for %{name} -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description libsamplerate -This package contains the samplerate decoder for Akode. - -%files libsamplerate -%defattr(-,root,root,-) -%{tde_libdir}/libakode_src_resampler.la -%{tde_libdir}/libakode_src_resampler.so - -%post libsamplerate -/sbin/ldconfig - -%postun libsamplerate -/sbin/ldconfig - -%endif - -########## - -%if "%{?_with_libmad}" != "" - -%package libmad -Summary: Decoder based on libmad for %{name} -Group: Development/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description libmad -This package contains the mad decoder for Akode. - -%files libmad -%defattr(-,root,root,-) -%{tde_libdir}/libakode_mpeg_decoder.la -%{tde_libdir}/libakode_mpeg_decoder.so - -%post libmad -/sbin/ldconfig - -%postun libmad -/sbin/ldconfig - -%endif - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n akode-2.0.2 - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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 CXXFLAGS="${RPM_OPT_FLAGS} -DHAVE_STDINT_H" - -%configure \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_includedir} \ - --datadir=%{tde_datadir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --without-libltdl \ - --with-alsa \ - --with-oss \ - %{?_with_flac} %{!?_with_flac:--without-flac} \ - %{?_with_jack} %{!?_with_jack:--without-jack} \ - %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \ - %{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \ - --with-speex \ - --with-vorbis \ - --without-ffmpeg \ - %{?_with_libmad} %{!?_with_libmad:--without-libmad} - -%__make %{?_smp_mflags} || %__make - - -%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" -done - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/dependencies/akode/akode-14.0.0.spec b/redhat/dependencies/akode/akode.spec index f4b24e33a..1cf07061d 100644 --- a/redhat/dependencies/akode/akode-14.0.0.spec +++ b/redhat/dependencies/akode/akode.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin diff --git a/redhat/dependencies/arts/arts-3.5.13.2.spec b/redhat/dependencies/arts/arts-3.5.13.2.spec deleted file mode 100644 index 02e031f9e..000000000 --- a/redhat/dependencies/arts/arts-3.5.13.2.spec +++ /dev/null @@ -1,312 +0,0 @@ -# -# spec file for package arts (version 3.5.13-SRU) -# -# 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/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg arts -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%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_sbindir %{tde_prefix}/sbin -%define tde_tdeappdir %{tde_datadir}/applications/kde -%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: 1.5.10 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} -Summary: ARTS (analog realtime synthesizer) - the TDE sound system -Group: System Environment/Daemons -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#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 - -%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch} - -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 -BuildRequires: trinity-filesystem >= %{tde_version} -Requires: trinity-filesystem >= %{tde_version} - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig - -BuildRequires: audiofile-devel -BuildRequires: alsa-lib-devel -BuildRequires: glib2-devel -BuildRequires: gsl-devel -BuildRequires: libvorbis-devel - -# ESOUND support -%define with_esound 1 -BuildRequires: esound-devel - -# JACK support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack} -%define with_jack 1 -%if 0%{?rhel} >= 5 || 0%{?fedora} -%define jack_devel jack-audio-connection-kit-devel -%endif -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} -%define jack_devel libjack-devel -%endif -BuildRequires: %{jack_devel} -%endif - -# LIBTOOL -%if 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: libtool-ltdl-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libltdl-devel -%endif -%if 0%{?suse_version} -%if 0%{?suse_version} >= 1220 -BuildRequires: libltdl-devel -%else -BuildRequires: libtool -%endif -%endif - -# UUID support -BuildRequires: libuuid-devel - -# MAD support -%ifarch %{ix86} x86_64 -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} -%define with_libmad 1 -%define mad_devel libmad-devel -BuildRequires: %{mad_devel} -%endif -%endif - -# Pulseaudio config file -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} -%define with_pulseaudio 1 -%endif - -Requires: libtqt4 >= %{tde_epoch}:4.2.0 -Requires: audiofile - -%if "%{?tde_prefix}" == "/usr" -Obsoletes: arts -%endif - -%description -arts (analog real-time synthesizer) is the sound system of TDE. - -The principle of arts is to create/process sound using small modules which do -certain tasks. These may be create a waveform (oscillators), play samples, -filter data, add signals, perform effects like delay/flanger/chorus, or -output the data to the soundcard. - -By connecting all those small modules together, you can perform complex -tasks like simulating a mixer, generating an instrument or things like -playing a wave file with some effects. - -%files -%defattr(-,root,root,-) -%doc COPYING.LIB -%dir %{tde_libdir}/mcop -%dir %{tde_libdir}/mcop/Arts -%dir %{tde_libdir}/mcop/Arts/Environment -%{tde_libdir}/mcop/Arts/* -%{tde_libdir}/mcop/*.mcopclass -%{tde_libdir}/mcop/*.mcoptype -%{tde_libdir}/lib*.so.* -%{tde_bindir}/artscat -%{tde_bindir}/artsd -%{tde_bindir}/artsdsp -%{tde_bindir}/artsplay -%{tde_bindir}/artsrec -%{tde_bindir}/artsshell -%{tde_bindir}/artswrapper -# The '.la' files are needed for runtime, not devel ! -%{tde_libdir}/lib*.la - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -########## - -%package devel -Group: Development/Libraries -Summary: ARTS (analog realtime synthesizer) - the TDE sound system (Development files) -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%if "%{?tde_prefix}" == "/usr" -Obsoletes: arts-devel -%endif - -Requires: alsa-lib-devel -Requires: audiofile-devel -Requires: libvorbis-devel -Requires: esound-devel -%{?with_libmad:Requires: %{mad_devel}} -%{?with_jack:Requires: %{jack_devel}} - -%description devel -arts (analog real-time synthesizer) is the sound system of TDE. - -The principle of arts is to create/process sound using small modules which do -certain tasks. These may be create a waveform (oscillators), play samples, -filter data, add signals, perform effects like delay/flanger/chorus, or -output the data to the soundcard. - -By connecting all those small modules together, you can perform complex -tasks like simulating a mixer, generating an instrument or things like -playing a wave file with some effects. - -%files devel -%defattr(-,root,root,-) -%{tde_bindir}/mcopidl -# Arts includes are under 'tde' - this is on purpose ! -%{tde_tdeincludedir}/arts/ -# Artsc includes are not under 'tde'. -%{tde_includedir}/artsc/ -%{tde_bindir}/artsc-config -%{tde_libdir}/lib*.so -%{tde_libdir}/pkgconfig/*.pc -%{tde_libdir}/*.a - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -########## - -%if 0%{?with_pulseaudio} - -%package config-pulseaudio -Group: System Environment/Daemons -Summary: ARTS - Default configuration file for Pulseaudio -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description config-pulseaudio -This package contains a default ARTS configuration file, that is -intended for systems running the Pulseaudio server. - -%files config-pulseaudio -%defattr(-,root,root,-) -%{tde_datadir}/config/kcmartsrc - -%endif - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%{?tde_patch:%patch1 -p1} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_NO_BUILTIN_CHRPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ - -DBIN_INSTALL_DIR="%{tde_bindir}" \ - -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}/arts" \ - -DLIB_INSTALL_DIR="%{tde_libdir}" \ - -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ - \ - -DWITH_ALSA=ON \ - -DWITH_AUDIOFILE=ON \ - -DWITH_VORBIS=ON \ - %{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \ - %{?with_esound:-DWITH_ESOUND=ON} \ - %{?with_jack:-DWITH_JACK=ON} \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf %{?buildroot} -%__make install -C build DESTDIR=%{?buildroot} - -%__install -d -m 755 %{?buildroot}%{tde_datadir}/config -%__install -d -m 755 %{?buildroot}%{tde_datadir}/doc - -# Installs the Pulseaudio configuration file -%if 0%{?with_pulseaudio} -cat <<EOF >"%{?buildroot}%{tde_datadir}/config/kcmartsrc" -[Arts] -Arguments=\s-F 10 -S 4096 -a esd -n -s 1 -m artsmessage -c drkonqi -l 3 -f -NetworkTransparent=true -SuspendTime=1 -EOF -chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc" -%endif - -# Add supplementary folders -%__install -d -m 755 "%{?buildroot}%{tde_libdir}/mcop/Arts/Environment" - - -%clean -%__rm -rf %{?buildroot} - - -%changelog diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts.spec index 765d14efa..60f559bd9 100644 --- a/redhat/dependencies/arts/arts-14.0.0.spec +++ b/redhat/dependencies/arts/arts.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg arts %define tde_prefix /opt/trinity @@ -83,7 +83,7 @@ BuildRequires: esound-devel %endif # JACK support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +%if 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define with_jack 1 %if 0%{?rhel} >= 5 || 0%{?fedora} %define jack_devel jack-audio-connection-kit-devel @@ -149,7 +149,6 @@ playing a wave file with some effects. %doc COPYING.LIB %dir %{tde_libdir}/mcop %dir %{tde_libdir}/mcop/Arts -%dir %{tde_libdir}/mcop/Arts/Environment %{tde_libdir}/mcop/Arts/* %{tde_libdir}/mcop/*.mcopclass %{tde_libdir}/mcop/*.mcoptype @@ -220,7 +219,7 @@ intended for systems running the Pulseaudio server. %files config-pulseaudio %defattr(-,root,root,-) -%{tde_confdir}/kcmartsrc +%config %{tde_confdir}/kcmartsrc %endif diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec deleted file mode 100644 index c9e7121e6..000000000 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec +++ /dev/null @@ -1,245 +0,0 @@ -# -# spec file for package avahi-tqt (version 3.5.13-SRU) -# -# 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 1 -%define tde_version 3.5.13.2 - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libavahi %{_lib}avahi -%else -%define libavahi libavahi -%endif - - -Name: trinity-avahi-tqt -Epoch: %{tde_epoch} -Version: 0.6.30 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} -Summary: Avahi TQt integration library -Group: System/Libraries -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: LGPL-2.0+ -%else -License: LGPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 - -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: libtool - -# GLIB2 support -BuildRequires: glib2-devel - -# GETTEXT support -BuildRequires: gettext-devel - -# Xi support -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libxi-devel -%endif -%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: libXi-devel -%endif -%if 0%{?suse_version} == 1140 -BuildRequires: libXi6-devel -%endif - -# DBUS support -%if 0%{?suse_version} -BuildRequires: dbus-1-devel -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: dbus-devel -%endif - -# PCAP support -BuildRequires: libcap-devel - -# AVAHI support -%if 0%{?mgaversion} || 0%{?mdkversion} -%define avahi_devel libavahi-client-devel -%endif -%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora} -%define avahi_devel avahi-devel -%endif -%{?avahi_devel:BuildRequires: %{avahi_devel}} - -# EXPAT support -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: expat-devel -%endif -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libexpat-devel -%endif - -# NAS support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_nas 1 -BuildRequires: nas-devel -%endif - -# XT support -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: libXt-devel -%endif - -%description -Avahi is a fully LGPL framework for Multicast DNS Service Discovery. -It allows programs to publish and discover services and hosts -running on a local network with no specific configuration. For -example you can plug into a network and instantly find printers to -print to, files to look at and people to talk to. - . -This library contains the interface to integrate the Avahi libraries -into a TQt main loop application. - -########## - -%package -n %{libavahi}-tqt1 -Summary: Avahi TQt integration library -Group: System/Libraries -Provides: libavahi-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: trinity-avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libavahi}-tqt1 -Avahi is a fully LGPL framework for Multicast DNS Service Discovery. -It allows programs to publish and discover services and hosts -running on a local network with no specific configuration. For -example you can plug into a network and instantly find printers to -print to, files to look at and people to talk to. - . -This library contains the interface to integrate the Avahi libraries -into a TQt main loop application. - -%post -n %{libavahi}-tqt1 -/sbin/ldconfig || : - -%postun -n %{libavahi}-tqt1 -/sbin/ldconfig || : - -%files -n %{libavahi}-tqt1 -%defattr(-,root,root,-) -%{_libdir}/libavahi-tqt.so.1 -%{_libdir}/libavahi-tqt.so.1.0.0 - -########## - -%package -n %{libavahi}-tqt-devel -Summary: Avahi TQt integration library (Development Files) -Group: Development/Libraries/C and C++ -Provides: libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -Requires: %{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libtqt4-devel >= %{tde_epoch}:4.2.0 -%{?avahi_devel:Requires: %{avahi_devel}} - -Obsoletes: trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libavahi}-tqt-devel -Avahi is a fully LGPL framework for Multicast DNS Service Discovery. -It allows programs to publish and discover services and hosts -running on a local network with no specific configuration. For -example you can plug into a network and instantly find printers to -print to, files to look at and people to talk to. - . -This library contains the interface to integrate the Avahi libraries -into a TQt main loop application. - -%post -n %{libavahi}-tqt-devel -/sbin/ldconfig || : - -%postun -n %{libavahi}-tqt-devel -/sbin/ldconfig || : - -%files -n %{libavahi}-tqt-devel -%defattr(-,root,root,-) -%{_includedir}/avahi-tqt/ -%{_libdir}/libavahi-tqt.so -%{_libdir}/libavahi-tqt.la -%{_libdir}/pkgconfig/avahi-tqt.pc - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -export NOCONFIGURE=1 -./autogen.sh - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --exec-prefix=%{_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ - \ - --disable-static \ - --disable-dependency-tracking \ - \ - --enable-compat-libdns_sd \ - --with-systemdsystemunitdir=/lib/systemd/system \ -%if 0%{?suse_version} - --with-distro=suse \ -%endif -%if 0%{?fedora} || 0%{?rhel} - --with-distro=fedora \ -%endif -%if 0%{?mdkversion} || 0%{?mgaversion} - --with-distro=mandriva \ -%endif - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} - - -%clean -%__rm -rf %{?buildroot} - - -%changelog diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt.spec index 1989ceb7b..a1cb6e7bd 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec deleted file mode 100644 index 8e4771767..000000000 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec +++ /dev/null @@ -1,183 +0,0 @@ -# -# spec file for package dbus-1-tqt (version 3.5.13-SRU) -# -# 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 1 -%define tde_version 3.5.13.2 - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libdbus %{_lib}dbus -%else -%define libdbus libdbus -%endif - - -Name: trinity-dbus-1-tqt -Epoch: %{tde_epoch} -Version: 0.9 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} -Summary: Dbus bindings for the Trinity Qt [TQt] interface -Group: System/Libraries -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: qt3-devel >= 3.3.8d -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig - -# DBUS support -%if 0%{?suse_version} -BuildRequires: dbus-1-devel -%else -BuildRequires: dbus-devel -%endif - -%description -D-BUS is a message bus, used for sending messages between applications. -Conceptually, it fits somewhere in between raw sockets and CORBA in -terms of complexity. - -This package provides bindings for the Trinity Qt TQt interface. - -See the dbus description for more information about D-BUS in general. - -########### - -%package -n %{libdbus}-1-tqt0 -Summary: Dbus bindings for the Trinity Qt [TQt] interface -Group: System/Libraries -Provides: libdbus-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: trinity-dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libdbus}-1-tqt0 -D-BUS is a message bus, used for sending messages between applications. -Conceptually, it fits somewhere in between raw sockets and CORBA in -terms of complexity. - -This package provides bindings for the Trinity Qt TQt interface. - -See the dbus description for more information about D-BUS in general. - -%post -n %{libdbus}-1-tqt0 -/sbin/ldconfig || : - -%postun -n %{libdbus}-1-tqt0 -/sbin/ldconfig || : - -%files -n %{libdbus}-1-tqt0 -%defattr(-,root,root,-) -%{_libdir}/libdbus-1-tqt.so.0 -%{_libdir}/libdbus-1-tqt.so.0.0.0 - -########## - -%package -n %{libdbus}-1-tqt-devel -Summary: Dbus bindings for the Trinity Qt [TQt] interface (Development Files) -Group: Development/Libraries/C and C++ -Provides: libdbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{libdbus}-1-tqt0 = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: trinity-dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libdbus}-1-tqt-devel -D-BUS is a message bus, used for sending messages between applications. -Conceptually, it fits somewhere in between raw sockets and CORBA in -terms of complexity. - -This package provides bindings for the Trinity Qt TQt interface. - -See the dbus description for more information about D-BUS in general. - -%post -n %{libdbus}-1-tqt-devel -/sbin/ldconfig || : - -%postun -n %{libdbus}-1-tqt-devel -/sbin/ldconfig || : - -%files -n %{libdbus}-1-tqt-devel -%defattr(-,root,root,-) -%{_bindir}/dbusxml2qt3 -%{_includedir}/*.h -%{_libdir}/libdbus-1-tqt.so -%{_libdir}/libdbus-1-tqt.la -%{_libdir}/pkgconfig/*.pc - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DBIN_INSTALL_DIR=%{_bindir} \ - -DINCLUDE_INSTALL_DIR=%{_includedir} \ - -DLIB_INSTALL_DIR=%{_libdir} \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} -C build - - -%clean -%__rm -rf %{?buildroot} - - -%changelog diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec index 7f8d9f3cb..1fdc0d328 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch deleted file mode 100644 index e9e873d63..000000000 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13-fix_old_dbus_types.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- dbus-tqt/message.cpp.dbustypes 2011-08-24 20:23:14.000000000 +0200 -+++ dbus-tqt/message.cpp 2012-09-06 19:54:47.037175413 +0200 -@@ -187,28 +210,28 @@ - case DBUS_TYPE_INT32: - { - dbus_int32_t v; -- dbus_message_iter_get_basic (i, &v); -+ dbus_message_iter_get_int32 (i); - ret = TQVariant( v ); - } - break; - case DBUS_TYPE_UINT32: - { - dbus_uint32_t v; -- dbus_message_iter_get_basic (i, &v); -+ dbus_message_iter_get_uint32 (i); - ret = TQVariant( v ); - } - break; - case DBUS_TYPE_DOUBLE: - { - double v; -- dbus_message_iter_get_basic (i, &v); -+ dbus_message_iter_get_double (i); - ret = TQVariant( v ); - } - break; - case DBUS_TYPE_STRING: - { - const char *v; -- dbus_message_iter_get_basic (i, &v); -+ dbus_message_iter_get_string (i); - ret = TQVariant( v ); - } - break; -@@ -241,7 +264,7 @@ - while (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID) - { - const char *v; -- dbus_message_iter_get_basic (&sub, &v); -+ dbus_message_iter_get_string (&sub); - tempList.append( TQString( v ) ); - dbus_message_iter_next (&sub); - } diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec deleted file mode 100644 index 81ec5d368..000000000 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec +++ /dev/null @@ -1,194 +0,0 @@ -# -# spec file for package dbus-tqt (version 3.5.13-SRU) -# -# 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 1 -%define tde_version 3.5.13.2 - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libdbus %{_lib}dbus -%else -%define libdbus libdbus -%endif - - -Name: trinity-dbus-tqt -Epoch: %{tde_epoch} -Version: 0.63 -Release: %{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist} -Summary: Simple inter-process messaging system -Group: System/Libraries -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -# [dbus-tqt] Fix build on RHEL 4 -Patch1: dbus-tqt-3.5.13-fix_old_dbus_types.patch - -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig - -# DBUS support -%if 0%{?suse_version} -BuildRequires: dbus-1-devel -%else -BuildRequires: dbus-devel -%endif - -%description -D-BUS is a message bus, used for sending messages between applications. -Conceptually, it fits somewhere in between raw sockets and CORBA in -terms of complexity. - -This package provides the TQt-based shared library for applications using the -Qt interface to D-BUS. - -See the dbus description for more information about D-BUS in general. - -########## - -%package -n %{libdbus}-tqt-1-0 -Summary: Simple inter-process messaging system (TQt-based shared library) -Group: System/Libraries -Provides: libdbus-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: trinity-dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libdbus}-tqt-1-0 -D-BUS is a message bus, used for sending messages between applications. -Conceptually, it fits somewhere in between raw sockets and CORBA in -terms of complexity. - -This package provides the TQt-based shared library for applications using the -Qt interface to D-BUS. - -See the dbus description for more information about D-BUS in general. - -%post -n %{libdbus}-tqt-1-0 -/sbin/ldconfig || : - -%postun -n %{libdbus}-tqt-1-0 -/sbin/ldconfig || : - -%files -n %{libdbus}-tqt-1-0 -%defattr(-,root,root,-) -%{_libdir}/libdbus-tqt-1.so.0 -%{_libdir}/libdbus-tqt-1.so.0.0.0 - -########## - -%package -n %{libdbus}-tqt-1-devel -Summary: Simple inter-process messaging system (TQt interface) -Group: Development/Libraries/C and C++ -Provides: libdbus-tqt-1-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{libdbus}-tqt-1-0 = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: trinity-dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libdbus}-tqt-1-devel -D-BUS is a message bus, used for sending messages between applications. -Conceptually, it fits somewhere in between raw sockets and CORBA in -terms of complexity. - -This package provides the TQt-based shared library for applications using the -Qt interface to D-BUS. - -See the dbus description for more information about D-BUS in general. - -%post -n %{libdbus}-tqt-1-devel -/sbin/ldconfig || : - -%postun -n %{libdbus}-tqt-1-devel -/sbin/ldconfig || : - -%files -n %{libdbus}-tqt-1-devel -%defattr(-,root,root,-) -%{_includedir}/dbus-1.0/* -%{_libdir}/libdbus-tqt-1.so -%{_libdir}/libdbus-tqt-1.la -%{_libdir}/pkgconfig/dbus-tqt.pc - -########## - -%if 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%if 0%{?rhel} == 4 -%patch1 -p1 -b .dbustypes -%endif - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh - -%if 0%{?rhel} == 4 -export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}" -%endif - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DINCLUDE_INSTALL_DIR=%{_includedir} \ - -DLIB_INSTALL_DIR=%{_libdir} \ - .. - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} -C build - - -%clean -%__rm -rf %{?buildroot} - - -%changelog diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt.spec index 75ec11785..efc2c3e4d 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec index cd8a9ebc2..2f072719f 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec @@ -19,7 +19,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -51,6 +51,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -165,6 +166,7 @@ especially suitable for embedded applications. %{_includedir}/libart-2.0/libart_lgpl/libart-features.h %{_includedir}/libart-2.0/libart_lgpl/libart.h %{_libdir}/pkgconfig/libart-2.0.pc +%{_mandir}/man1/libart2-config.* ########## @@ -177,30 +179,42 @@ especially suitable for embedded applications. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh" -autoreconf -fiv - %build unset QTDIR QTINC QTLIB - -%configure \ - --prefix=%{_prefix} \ - --exec-prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --datadir=%{_datadir} \ - --includedir=%{_includedir} \ +export PATH="%{tde_bindir}:${PATH}" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{_datadir}" \ \ - --disable-dependency-tracking - -%__make %{?_smp_mflags} + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. + +%__make %{?_smp_mflags} || %__make %install %__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=$RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT -C build %clean diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch b/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch deleted file mode 100644 index 0cf9f056b..000000000 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.1-rhel5.patch +++ /dev/null @@ -1,193 +0,0 @@ -diff --git a/src/add-caldav-object.c b/src/add-caldav-object.c -index 68a4377..35aef48 100644 ---- a/src/add-caldav-object.c -+++ b/src/add-caldav-object.c -@@ -103,7 +103,6 @@ gboolean caldav_add(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/delete-caldav-object.c b/src/delete-caldav-object.c -index 9a85168..ea5733f 100644 ---- a/src/delete-caldav-object.c -+++ b/src/delete-caldav-object.c -@@ -150,7 +150,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - g_free(search); - curl_slist_free_all(http_header); -@@ -249,7 +248,6 @@ gboolean caldav_delete(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { - caldav_unlock_object( -@@ -380,7 +378,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - g_free(search); - curl_slist_free_all(http_header); -@@ -479,7 +476,6 @@ gboolean caldav_tasks_delete(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { - caldav_unlock_object( -diff --git a/src/get-caldav-report.c b/src/get-caldav-report.c -index d916259..0021cb8 100644 ---- a/src/get-caldav-report.c -+++ b/src/get-caldav-report.c -@@ -169,7 +169,6 @@ gboolean caldav_getall(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -266,7 +265,6 @@ gboolean caldav_getrange(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -349,7 +347,6 @@ gboolean caldav_tasks_getall(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -446,7 +443,6 @@ gboolean caldav_tasks_getrange(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/get-display-name.c b/src/get-display-name.c -index 8fc0ff8..c205efd 100644 ---- a/src/get-display-name.c -+++ b/src/get-display-name.c -@@ -99,7 +99,6 @@ gboolean caldav_getname(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/get-freebusy-report.c b/src/get-freebusy-report.c -index f75ab92..40a5a3c 100644 ---- a/src/get-freebusy-report.c -+++ b/src/get-freebusy-report.c -@@ -104,7 +104,6 @@ gboolean caldav_freebusy(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/lock-caldav-object.c b/src/lock-caldav-object.c -index 30f2d20..6845551 100644 ---- a/src/lock-caldav-object.c -+++ b/src/lock-caldav-object.c -@@ -107,7 +107,6 @@ gchar* caldav_lock_object( - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - if (res != 0) { -@@ -211,7 +210,6 @@ gboolean caldav_unlock_object(gchar* lock_token, gchar* URI, - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - if (res != 0) { -diff --git a/src/modify-caldav-object.c b/src/modify-caldav-object.c -index fb3a4d0..f3563d8 100644 ---- a/src/modify-caldav-object.c -+++ b/src/modify-caldav-object.c -@@ -151,7 +151,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - http_header = NULL; -@@ -249,7 +248,6 @@ gboolean caldav_modify(caldav_settings* settings, caldav_error* error) { - strlen(settings->file)); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { -@@ -391,7 +389,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - http_header = NULL; -@@ -489,7 +486,6 @@ gboolean caldav_tasks_modify(caldav_settings* settings, caldav_error* error) { - strlen(settings->file)); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { -diff --git a/src/options-caldav-server.c b/src/options-caldav-server.c -index 1d97d04..0045afe 100644 ---- a/src/options-caldav-server.c -+++ b/src/options-caldav-server.c -@@ -74,7 +74,6 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res == 0) { - gchar* head; -@@ -102,15 +101,12 @@ gboolean caldav_getoptions(CURL* curl, caldav_settings* settings, response* resu - } - else if ( - (res == CURLE_SSL_CONNECT_ERROR || -- CURLE_PEER_FAILED_VERIFICATION || - CURLE_SSL_ENGINE_NOTFOUND || - CURLE_SSL_ENGINE_SETFAILED || - CURLE_SSL_CERTPROBLEM || - CURLE_SSL_CIPHER || - CURLE_SSL_CACERT || -- CURLE_SSL_CACERT_BADFILE || -- CURLE_SSL_CRL_BADFILE || -- CURLE_SSL_ISSUER_ERROR) && settings->usehttps) { -+ CURLE_SSL_CRL_BADFILE ) && settings->usehttps) { - error->code = -2; - error->str = g_strdup(error_buf); - } diff --git a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec deleted file mode 100644 index 419ff8ff9..000000000 --- a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec +++ /dev/null @@ -1,195 +0,0 @@ -# -# spec file for package libcaldav (version 3.5.13-SRU) -# -# 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 1 -%define tde_version 3.5.13.2 -%define tde_pkg libcaldav -%define tde_prefix /opt/trinity -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libcaldav %{_lib}caldav -%else -%define libcaldav libcaldav -%endif - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 0.6.5 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} -Summary: A client library that adds support for the CalDAV protocol (rfc4791) -Group: System/Libraries -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: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: libcaldav_0.6.5-2debian2.tar.gz - -BuildRequires: make -BuildRequires: libtool -BuildRequires: fdupes - -# GTK2 support -%if 0%{?rhel} == 4 -BuildRequires: evolution28-gtk2-devel -%else -BuildRequires: glib2-devel -BuildRequires: gtk2-devel -%endif - -# CURL support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} -%define libcurl_devel libcurl-devel -%else -# Specific CURL version for TDE on RHEL 5 (and older) -%define libcurl_devel trinity-libcurl-devel -%endif -%{?libcurl_devel:BuildRequires: %{libcurl_devel}} - -%description -libcaldev is a client library that adds support for the CalDAV protocol (rfc4791). -The object is to have a library which fully implements the protocol so that it is -easy to integrate CalDAV support into any PIM application. - -########## - -%package -n %{libcaldav}0 -Summary: A client library that adds support for the CalDAV protocol (rfc4791) -Group: System/Libraries - -Obsoletes: trinity-libcaldav < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-libcaldav = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libcaldav = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libcaldav}0 -libcaldev is a client library that adds support for the CalDAV protocol (rfc4791). -The object is to have a library which fully implements the protocol so that it is -easy to integrate CalDAV support into any PIM application. - -%files -n %{libcaldav}0 -%defattr(-,root,root,-) -%{_libdir}/libcaldav.so.0 -%{_libdir}/libcaldav.so.0.0.6 -%{_docdir}/libcaldav-%{version}/ - -%post -n %{libcaldav}0 -/sbin/ldconfig - -%postun -n %{libcaldav}0 -/sbin/ldconfig - -########## - -%package -n %{libcaldav}-devel -Summary: A client library that adds support for the CalDAV protocol (Development Files) -Group: Development/Libraries/Other -Requires: %{libcaldav}0 = %{?epoch:%{epoch}:}%{version}-%{release} -%{?libcurl_devel:Requires: %{libcurl_devel}} -Requires: glib2-devel - -Obsoletes: trinity-libcaldav-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-libcaldav-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libcaldav-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libcaldav}-devel -libcaldev is a client library that adds support for the CalDAV protocol (rfc4791). -The object is to have a library which fully implements the protocol so that it is -easy to integrate CalDAV support into any PIM application. - -This package includes the development files. - -%files -n %{libcaldav}-devel -%defattr(-,root,root,-) -%{_includedir}/libcaldav/ -%{_libdir}/libcaldav.la -%{_libdir}/libcaldav.so -%{_libdir}/pkgconfig/libcaldav.pc - -%post -n %{libcaldav}-devel -/sbin/ldconfig - -%postun -n %{libcaldav}-devel -/sbin/ldconfig - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n libcaldav-%{version} -autoreconf --force --install --symlink - - -%build -# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 -export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# RHEL4 stuff -if [ -d /usr/evolution28 ]; then - export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" -fi - -%configure \ - --docdir=%{_docdir}/libcaldav \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ - \ - --disable-dependency-tracking - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -%__rm -f %{buildroot}%{_libdir}/*.a - -# Fix doc dir -mv -f %{?buildroot}%{_docdir}/libcaldav/ %{?buildroot}%{_docdir}/libcaldav-%{version}/ - -# Fix include dir -mv -f %{?buildroot}%{_includedir}/libcaldav-0.6.2/ %{?buildroot}%{_includedir}/libcaldav/ - -# Fix duplicate files -%fdupes %{?buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav.spec index a4bf7ebb2..88c6f7abf 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg libcaldav %define tde_prefix /opt/trinity @@ -54,8 +54,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: libcaldav-14.0.1-rhel5.patch - +BuildRequires: cmake >= 2.8 BuildRequires: make BuildRequires: libtool BuildRequires: fdupes @@ -100,7 +99,7 @@ easy to integrate CalDAV support into any PIM application. %defattr(-,root,root,-) %{_libdir}/libcaldav.so.0 %{_libdir}/libcaldav.so.0.0.6 -%{_docdir}/libcaldav-%{version}/ +%{_docdir}/libcaldav/ %post -n %{libcaldav}0 /sbin/ldconfig @@ -151,45 +150,53 @@ This package includes the development files. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?rhel} == 5 -%patch1 -p1 -b .ftbfs -%endif -autoreconf -fiv %build -# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 -export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" -# RHEL4 stuff -if [ -d /usr/evolution28 ]; then - export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --docdir=%{_docdir}/libcaldav \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{_datadir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ \ - --disable-dependency-tracking + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -%__rm -f %{buildroot}%{_libdir}/*.a - -# Fix doc dir -mv -f %{?buildroot}%{_docdir}/libcaldav/ %{?buildroot}%{_docdir}/libcaldav-%{version}/ +%__make install DESTDIR=%{buildroot} -C build # Fix duplicate files %fdupes %{?buildroot} +# Fix doc directory +%if "%{_docdir}" != "%{_datadir}/doc" +%__mkdir_p "%{?buildroot}/%{_docdir}" +%__mv -f "%{?buildroot}/%{_datadir}/doc/libcaldav" "%{?buildroot}/%{_docdir}/libcaldav" +%endif + %clean %__rm -rf %{buildroot} diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch b/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch deleted file mode 100644 index a6bf4e6e0..000000000 --- a/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch +++ /dev/null @@ -1,164 +0,0 @@ -diff --git a/src/add-carddav-object.c b/src/add-carddav-object.c -index 5574991..a1586d8 100644 ---- a/src/add-carddav-object.c -+++ b/src/add-carddav-object.c -@@ -104,7 +104,6 @@ gboolean carddav_add(carddav_settings* settings, carddav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/delete-carddav-object.c b/src/delete-carddav-object.c -index 96b9033..6984a82 100644 ---- a/src/delete-carddav-object.c -+++ b/src/delete-carddav-object.c -@@ -132,7 +132,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - g_free(search); - curl_slist_free_all(http_header); -@@ -231,7 +230,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { - carddav_unlock_object( -@@ -417,7 +415,6 @@ gboolean carddav_delete_by_uri(carddav_settings* settings, carddav_error* error) - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { - carddav_unlock_object( -diff --git a/src/get-carddav-report.c b/src/get-carddav-report.c -index b44fd2c..7655b29 100644 ---- a/src/get-carddav-report.c -+++ b/src/get-carddav-report.c -@@ -117,7 +117,6 @@ static gchar* carddav_dirlist(carddav_settings* settings, carddav_error* error) - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -243,7 +242,6 @@ gboolean carddav_getall(carddav_settings* settings, carddav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -345,7 +343,6 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error) - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -@@ -378,4 +375,4 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error) - curl_easy_cleanup(curl); - g_free(dav_file_listing); - return result; --} -\ No newline at end of file -+} -diff --git a/src/get-display-name.c b/src/get-display-name.c -index 9e782e0..16c3e4b 100644 ---- a/src/get-display-name.c -+++ b/src/get-display-name.c -@@ -100,7 +100,6 @@ gboolean carddav_getname(carddav_settings* settings, carddav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - if (res != 0) { - error->code = -1; -diff --git a/src/lock-carddav-object.c b/src/lock-carddav-object.c -index 163264c..2292cad 100644 ---- a/src/lock-carddav-object.c -+++ b/src/lock-carddav-object.c -@@ -109,7 +109,6 @@ gchar* carddav_lock_object( - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - if (res != 0) { -@@ -214,7 +213,6 @@ gboolean carddav_unlock_object(gchar* lock_token, gchar* URI, - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - if (res != 0) { -diff --git a/src/modify-carddav-object.c b/src/modify-carddav-object.c -index 1822068..a8b6de2 100644 ---- a/src/modify-carddav-object.c -+++ b/src/modify-carddav-object.c -@@ -133,7 +133,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) { - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - res = curl_easy_perform(curl); - curl_slist_free_all(http_header); - http_header = NULL; -@@ -231,7 +230,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) { - strlen(settings->file)); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { -@@ -430,7 +428,6 @@ gboolean carddav_modify_by_uri(carddav_settings* settings, carddav_error* error) - strlen(settings->file)); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); - res = curl_easy_perform(curl); - if (LOCKSUPPORT && lock_token) { -diff --git a/src/options-carddav-server.c b/src/options-carddav-server.c -index b774401..b44aae2 100644 ---- a/src/options-carddav-server.c -+++ b/src/options-carddav-server.c -@@ -75,7 +75,6 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS"); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1); -- curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); - if (settings->debug) { - curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); - } -@@ -106,15 +105,12 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re - } - else if ( - (res == CURLE_SSL_CONNECT_ERROR || -- CURLE_PEER_FAILED_VERIFICATION || - CURLE_SSL_ENGINE_NOTFOUND || - CURLE_SSL_ENGINE_SETFAILED || - CURLE_SSL_CERTPROBLEM || - CURLE_SSL_CIPHER || - CURLE_SSL_CACERT || -- CURLE_SSL_CACERT_BADFILE || -- CURLE_SSL_CRL_BADFILE || -- CURLE_SSL_ISSUER_ERROR) && settings->usehttps) { -+ CURLE_SSL_CRL_BADFILE ) && settings->usehttps) { - error->code = -2; - error->str = g_strdup(error_buf); - } diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec deleted file mode 100644 index 152f1cf90..000000000 --- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec +++ /dev/null @@ -1,195 +0,0 @@ -# -# spec file for package libcarddav (version 3.5.13-SRU) -# -# 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 1 -%define tde_version 3.5.13.2 -%define tde_pkg libcarddav -%define tde_prefix /opt/trinity -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libcarddav %{_lib}carddav -%else -%define libcarddav libcarddav -%endif - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 0.6.2 -Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist} -Summary: A portable CardDAV client implementation -Group: System/Libraries -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Deskio -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: libcarddav_0.6.2-2debian2.tar.gz - -BuildRequires: make -BuildRequires: libtool - -# CURL support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} -%define libcurl_devel libcurl-devel -%else -# Specific CURL version for TDE on RHEL 5 (and older) -%define libcurl_devel trinity-libcurl-devel -%endif -%{?libcurl_devel:BuildRequires: %{libcurl_devel}} - -# GTK2 support -%if 0%{?rhel} == 4 -BuildRequires: evolution28-gtk2-devel -%else -BuildRequires: glib2-devel -BuildRequires: gtk2-devel -%endif - -%description -Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. -It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. -Build dependencies are minimal, requiring only libcurl. - -########## - -%package -n %{libcarddav}0 -Summary: A portable CardDAV client implementation -Group: System/Libraries - -Obsoletes: trinity-libcarddav < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-libcarddav = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libcarddav = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libcarddav}0 -Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. -It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. -Build dependencies are minimal, requiring only libcurl. - -%files -n %{libcarddav}0 -%defattr(-,root,root,-) -%{_libdir}/libcarddav.so.0 -%{_libdir}/libcarddav.so.0.0.6 - -%post -n %{libcarddav}0 -/sbin/ldconfig - -%postun -n %{libcarddav}0 -/sbin/ldconfig - - -########## - -%package -n %{libcarddav}-devel -Summary: A portable CardDAV client implementation (Development Files) -Group: Development/Libraries/Other -Requires: %{libcarddav}0 = %{?epoch:%{epoch}:}%{version}-%{release} -%{?libcurl_devel:Requires: %{libcurl_devel}} -Requires: glib2-devel - -Obsoletes: trinity-libcarddav-devel < %{version}-%{release} -Provides: trinity-libcarddav-devel = %{version}-%{release} -Provides: libcarddav-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libcarddav}-devel -Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. -It incorporates full list, get, add, modify, and delete functionality per the latest CardDAV standards. -Build dependencies are minimal, requiring only libcurl. - -This package contains the development files. - -%files -n %{libcarddav}-devel -%defattr(-,root,root,-) -%{_includedir}/libcarddav/ -%{_libdir}/libcarddav.la -%{_libdir}/libcarddav.so -%{_libdir}/pkgconfig/libcarddav.pc - -%post -n %{libcarddav}-devel -/sbin/ldconfig - -%postun -n %{libcarddav}-devel -/sbin/ldconfig - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n libcarddav-%{version} -%__sed -i "src/get-carddav-report.c" -e "89s/return TRUE/return NULL/" -autoreconf --force --install --symlink - - -%build -unset QTDIR QTINC QTLIB - -# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 -export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# RHEL4 stuff -if [ -d /usr/evolution28 ]; then - export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" -fi - -%configure \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ - \ - --disable-dependency-tracking - -# FIXME: bad libtool ?? -%if 0%{?rhel} == 4 || 0%{?rhel} == 5 -%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool -%else -%__make %{?_smp_mflags} -%endif - - -%install -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} LIBTOOL=/usr/bin/libtool - -# Unwanted files -%__rm -f %{buildroot}%{_libdir}/libcarddav.a - -# Fix include location -%__mv -f "%{?buildroot}%{_includedir}/libcarddav-0.6.1" "%{?buildroot}%{_includedir}/libcarddav" - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav.spec index 27e23795e..aa6a9735c 100644 --- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg libcarddav %define tde_prefix /opt/trinity @@ -54,8 +54,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: libcarddav-14.0.1-rhel5.patch - +BuildRequires: cmake >= 2.8 +BuildRequires: gcc-c++ BuildRequires: make BuildRequires: libtool @@ -100,6 +100,7 @@ Build dependencies are minimal, requiring only libcurl. %defattr(-,root,root,-) %{_libdir}/libcarddav.so.0 %{_libdir}/libcarddav.so.0.0.6 +%{_docdir}/libcarddav/ %post -n %{libcarddav}0 /sbin/ldconfig @@ -151,43 +152,49 @@ This package contains the development files. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%if 0%{?rhel} == 5 -%patch1 -p1 -b .ftbfs -%endif - -# Fix empty ChangeLog cause invalid macro in 'configure.ac' -echo "%{name} (%{version})" >ChangeLog - -autoreconf -fiv %build unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" -# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 -export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# RHEL4 stuff -if [ -d /usr/evolution28 ]; then - export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking + -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{_datadir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build -# Unwanted files -%__rm -f %{buildroot}%{_libdir}/libcarddav.a +# Fix doc directory +%if "%{_docdir}" != "%{_datadir}/doc" +%__mkdir_p "%{?buildroot}/%{_docdir}" +%__mv -f "%{?buildroot}/%{_datadir}/doc/libcarddav" "%{?buildroot}/%{_docdir}/libcarddav" +%endif %clean diff --git a/redhat/dependencies/libr/libr.spec b/redhat/dependencies/libr/libr.spec deleted file mode 100644 index ba6ed625a..000000000 --- a/redhat/dependencies/libr/libr.spec +++ /dev/null @@ -1,180 +0,0 @@ -# -# spec file for package libr (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 -%if "%{?tde_version}" == "" -%define tde_version 14.1.0 -%endif - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libr %{_lib}r -%else -%define libr libr -%endif - - -Name: trinity-libr -Version: 0.6.0 -Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: ELF binary resource library -Group: System/Libraries -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig - -BuildRequires: binutils-devel - -# GLADE2 -%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} -BuildRequires: %{_lib}glade2.0_0-devel -%else -BuildRequires: libglade2-devel -%endif - - -%description -Store and retrieve resources from ELF binaries. - -########## - -%package -n %{libr} -Summary: Simple inter-process messaging system (TQt-based shared library) -Group: System/Libraries - -%description -n %{libr} -Store and retrieve resources from ELF binaries. - -%post -n %{libr} -/sbin/ldconfig || : - -%postun -n %{libr} -/sbin/ldconfig || : - -%files -n %{libr} -%defattr(-,root,root,-) -%{_libdir}/libr.so.0 -%{_libdir}/libr.so.0.0.0 - - -########## - -%package -n %{libr}-devel -Summary: Simple inter-process messaging system (TQt interface) -Group: Development/Libraries/C and C++ -Requires: %{libr} == %{version}-%{release} -Provides: libr-devel == %{version}-%{release} - -%description -n %{libr}-devel -Store and retrieve resources from ELF binaries. - -%post -n %{libr}-devel -/sbin/ldconfig || : - -%postun -n %{libr}-devel -/sbin/ldconfig || : - -%files -n %{libr}-devel -%defattr(-,root,root,-) -%{_includedir}/libr/ -%{_libdir}/libr.a -%{_libdir}/libr.la -%{_libdir}/libr.so -%{_libdir}/pkgconfig/libr.pc -%{_mandir}/man3/IconSVG.3* -%{_mandir}/man3/OneCanvasIconInfo.3* -%{_mandir}/man3/libr_clear.3* -%{_mandir}/man3/libr_close.3* -%{_mandir}/man3/libr_errmsg.3* -%{_mandir}/man3/libr_errno.3* -%{_mandir}/man3/libr_icon_close.3* -%{_mandir}/man3/libr_icon_geticon_byname.3* -%{_mandir}/man3/libr_icon_geticon_bysize.3* -%{_mandir}/man3/libr_icon_getuuid.3* -%{_mandir}/man3/libr_icon_setuuid.3* -%{_mandir}/man3/libr_list.3* -%{_mandir}/man3/libr_malloc.3* -%{_mandir}/man3/libr_open.3* -%{_mandir}/man3/libr_read.3* -%{_mandir}/man3/libr_resources.3* -%{_mandir}/man3/libr_size.3* -%{_mandir}/man3/libr_status.3* -%{_mandir}/man3/libr_write.3* - - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DWITH_GCC_VISIBILITY=OFF \ - \ - -DINCLUDE_INSTALL_DIR=%{_includedir} \ - -DLIB_INSTALL_DIR=%{_libdir} \ - .. - -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} -C build - - -%clean -%__rm -rf %{?buildroot} - - -%changelog diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt.spec index 3b8b54d68..9c6472049 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec +++ b/redhat/dependencies/python-tqt/python-tqt.spec @@ -19,12 +19,10 @@ # Remove qt-devel and qt3-devel and any kde*-devel on your system ! # Having KDE libraries may cause FTBFS here ! -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg python-tqt %define tde_prefix /opt/trinity @@ -71,8 +69,18 @@ BuildRequires: sip4-tqt-devel >= %{?epoch:%{epoch}:}4.10.5 BuildRequires: libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1 BuildRequires: gcc-c++ -BuildRequires: python -BuildRequires: python-devel + +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel # MESA support %if 0%{?rhel} || 0%{?fedora} @@ -237,6 +245,7 @@ cp -rf ../pyuic3 ../pylupdate3 echo yes | %__python ../configure.py \ -c -n %{_includedir}/tqscintilla \ + -g %{_includedir}/tqt3 \ -q %{_datadir}/tqt3 \ -y tqt-mt \ -o %{_libdir} -u -j 10 \ diff --git a/redhat/dependencies/qt3/assistant3.desktop b/redhat/dependencies/qt3/assistant3.desktop deleted file mode 100644 index 49e718c5d..000000000 --- a/redhat/dependencies/qt3/assistant3.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt3 Assistant -Comment=Add translations to Qt3 applications -Exec=assistant -Icon=assistant3 -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/dependencies/qt3/designer3.desktop b/redhat/dependencies/qt3/designer3.desktop deleted file mode 100644 index 23f1f549a..000000000 --- a/redhat/dependencies/qt3/designer3.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Qt3 Designer -GenericName=Interface Designer -Comment=Design GUIs for Qt3 applications -Exec=designer -Icon=designer3 -MimeType=application/x-designer; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/dependencies/qt3/linguist3.desktop b/redhat/dependencies/qt3/linguist3.desktop deleted file mode 100644 index c6fce02c8..000000000 --- a/redhat/dependencies/qt3/linguist3.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Qt3 Linguist -Comment=Add translations to Qt3 applications -Exec=linguist -Icon=linguist3 -MimeType=application/x-linguist; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; diff --git a/redhat/dependencies/qt3/qt.csh b/redhat/dependencies/qt3/qt.csh deleted file mode 100755 index 93fd941ed..000000000 --- a/redhat/dependencies/qt3/qt.csh +++ /dev/null @@ -1,33 +0,0 @@ -# Qt initialization script (csh) - -# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, -# 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding -# with different arches, the installed file is the one from the preferred arch. This is -# very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found -# in an x86_64 package and in an i386 package, the executable from x86_64 will be installe - -if ( $?QTDIR ) then - exit -endif - -switch (`uname -m`) - case x86_64: - case ia64: - case s390x: - set QTPREFIXES = "/usr/lib64/qt-3.3 /usr/lib/qt-3.3" - breaksw - case *: - set QTPREFIXES = "/usr/lib/qt-3.3 /usr/lib64/qt-3.3" -endsw - -foreach QTPREFIX ( $QTPREFIXES ) - test -d "$QTPREFIX" && setenv QTDIR $QTPREFIX && break -end -unset QTPREFIX QTPREFIXES - -if ( "${path}" !~ *$QTDIR/bin* ) then - set path = ( $QTDIR/bin $path ) -endif - -setenv QTINC $QTDIR/include -setenv QTLIB $QTDIR/lib diff --git a/redhat/dependencies/qt3/qt.sh b/redhat/dependencies/qt3/qt.sh deleted file mode 100755 index f9ca654c1..000000000 --- a/redhat/dependencies/qt3/qt.sh +++ /dev/null @@ -1,32 +0,0 @@ -# Qt initialization script (sh) - -# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, -# 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding -# with different arches, the installed file is the one from the preferred arch. This is -# very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found -# in an x86_64 package and in an i386 package, the executable from x86_64 will be installe - -if [ -z "${QTDIR}" ]; then - -case `uname -m` in - x86_64 | ia64 | s390x ) - QT_PREFIXES="/usr/lib64/qt-3.3 /usr/lib/qt-3.3" ;; - * ) - QT_PREFIXES="/usr/lib/qt-3.3 /usr/lib64/qt-3.3" ;; -esac - -for QTDIR in ${QT_PREFIXES} ; do - test -d "${QTDIR}" && break -done -unset QT_PREFIXES - -if ! echo ${PATH} | /bin/grep -q $QTDIR/bin ; then - PATH=$QTDIR/bin:${PATH} -fi - -QTINC="$QTDIR/include" -QTLIB="$QTDIR/lib" - -export QTDIR QTINC QTLIB PATH - -fi diff --git a/redhat/dependencies/qt3/qt3-3.5.13.2.patch b/redhat/dependencies/qt3/qt3-3.5.13.2.patch deleted file mode 100644 index 6c9a6f8f0..000000000 --- a/redhat/dependencies/qt3/qt3-3.5.13.2.patch +++ /dev/null @@ -1,516 +0,0 @@ -commit 1ee1ffbae69dc78721af139f0794628571fd35ef -Author: Slávek Banko <slavek.banko@axis.cz> -Date: 1386900429 +0100 - - Fix FTBFS with libfreetype6 >= 2.5.x - This resolves Bug 1765 - -diff --git a/config.tests/x11/xfreetype.test b/config.tests/x11/xfreetype.test -index 5cabc32..d4cb4ba 100755 ---- a/config.tests/x11/xfreetype.test -+++ b/config.tests/x11/xfreetype.test -@@ -116,12 +116,15 @@ fi - # check for freetype2 headers - FREETYPE2_INCDIR= - if [ "$XFT" = "yes" ]; then -- INC="freetype2/freetype/freetype.h" - XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` - LDIRS=`sed -n -e '/^QMAKE_INCDIR[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` - INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include" - F= - for INCDIR in $INCDIRS; do -+ INC="freetype2/freetype/freetype.h" # libfreetype <= 2.4.9-1.1 -+ if ! [ -f $INCDIR/$INC ]; then -+ INC="freetype2/freetype.h" # libfreetype >= 2.5.1-1 -+ fi - if [ -f $INCDIR/$INC ]; then - # detect major version of freetype2 - FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'` ---- qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp.bero 2002-08-21 15:16:19.000000000 +0200 -+++ qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp 2002-08-21 15:16:41.000000000 +0200 -@@ -501,10 +501,10 @@ - (*f).latin1(), - (const char*) QFile::encodeName( old->library() ) ); - } else { -- qWarning("%s: Feature %s already defined in %s!", -+/* qWarning("%s: Feature %s already defined in %s!", - (const char*) QFile::encodeName( old->library() ), - (*f).latin1(), -- (const char*) QFile::encodeName( plugin->library() ) ); -+ (const char*) QFile::encodeName( plugin->library() ) ); */ - } - } - } ---- qt-x11-free-3.1.0/Makefile.orig 2002-11-14 15:44:17.000000000 +0100 -+++ qt-x11-free-3.1.0/Makefile 2002-11-14 15:49:33.000000000 +0100 -@@ -11,7 +11,7 @@ - install: FORCE - @$(MAKE) qt.install - --all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples -+all: symlinks src-qmake src-moc sub-src sub-tools - @echo - @echo "The Qt library is now built in ./lib" - @echo "The Qt examples are built in the directories in ./examples" ---- qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp.cjk 2005-01-21 18:16:11.000000000 +0100 -+++ qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp 2005-01-26 15:09:20.911239907 +0100 -@@ -4748,10 +4748,11 @@ - - // GB18030 fonts on Turbolinux - static const psfont SongGBK2K [] = { -- { "MSung-Light-GBK2K-H", 0, 100. }, -- { "MSung-Italic-GBK2K-H", 0, 100. }, -- { "MSung-Bold-GBK2K-H", 0, 100. }, -- { "MSung-BoldItalic-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ - }; - static const psfont KaiGBK2K [] = { - { "MKai-Medium-GBK2K-H", 0, 100. }, -diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp ---- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530 -@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy - toPos += 2; - if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) { - if (matra_position == Post || matra_position == Split) { -- toPos = matra+1; -+ if (matra_position == Post ) -+ toPos = matra; -+ else -+ toPos = matra+1; - matra -= 2; - } - } else if (script == QFont::Kannada) { ---- qt3/src/kernel/qscriptengine_x11.cpp.fontrendering-gu-228452 2012-09-29 11:30:23.821539127 +0200 -+++ qt3/src/kernel/qscriptengine_x11.cpp 2012-09-29 11:31:59.679413873 +0200 -@@ -261,7 +261,7 @@ - Other, Other, Other, Other, - Other, Other, Other, Other, - -- Other, Other, Other, Other, -+ Other, Other, VowelMark, VowelMark, - Other, Other, Other, Other, - Other, Other, Other, Other, - Other, Other, Other, Other, ---- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-13 13:21:37.000000000 +0800 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-13 13:57:36.000000000 +0800 -@@ -868,7 +868,7 @@ - None, None, None, None, - None, None, None, Post, - -- Post, None, Below, None, -+ None, None, None, None, - None, Post, None, None, - None, None, None, None, - None, None, Post, Post, -@@ -1271,6 +1271,16 @@ - int base = 0; - int reph = -1; - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ bool is_special_conjuction_malayalam = false; -+ -+ if ((len == 3) && -+ ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) && -+ (reordered[1] == 0x0d4d) && -+ ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) { -+ is_special_conjuction_malayalam = true; -+ } -+ - #ifdef INDIC_DEBUG - IDEBUG("original:"); - for (i = 0; i < len; i++) { -@@ -1547,6 +1557,15 @@ - reph = i; - } - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ if (is_special_conjuction_malayalam) { -+ unsigned short temp; -+ -+ temp = reordered[0]; -+ reordered[0] = reordered[2]; -+ reordered[2] = temp; -+ } -+ - if (item->font->stringToCMap((const QChar *)reordered.data(), len, item->glyphs, item->advances, - &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError) - return FALSE; -@@ -1658,6 +1677,15 @@ - - // halant always applies - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ if (is_special_conjuction_malayalam) { -+ unsigned int temp; -+ -+ temp = properties[0]; -+ properties[0] = ~PreSubstProperty; -+ properties[2] = temp; -+ } -+ - #ifdef INDIC_DEBUG - { - IDEBUG("OT properties:"); ---- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.orig 2006-11-29 17:17:26.000000000 +0100 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-11-29 17:22:34.000000000 +0100 -@@ -864,7 +864,7 @@ - None, None, None, Post, - - None, None, None, None, -- None, Post, None, None, -+ None, None, None, None, - None, None, None, None, - None, None, Post, Post, - -diff -pruN qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp ---- qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp 2006-03-08 00:00:00.000000000 +0530 -+++ qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp 2006-12-04 18:49:09.000000000 +0530 -@@ -709,7 +709,7 @@ int QFontMetrics::charWidth( const QStri - if ( script >= QFont::Arabic && script <= QFont::Khmer ) { - // complex script shaping. Have to do some hard work - int from = QMAX( 0, pos - 8 ); -- int to = QMIN( (int)str.length(), pos + 8 ); -+ int to = str.length(); - QConstString cstr( str.unicode()+from, to-from); - QTextEngine layout( cstr.string(), d ); - layout.itemize( QTextEngine::WidthOnly ); ---- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-18 17:55:23.000000000 +0800 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-19 16:42:31.641160984 +0800 -@@ -786,7 +786,7 @@ - Below, None, Below, Below, - Below, Below, Below, Below, - -- Below, None, Below, Below, -+ Below, Below, Below, Below, - None, Below, Below, Below, - Below, Below, None, None, - None, None, Post, Above, ---- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 -+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 -@@ -1240,7 +1240,7 @@ - int script = item->script; - Q_ASSERT(script >= QFont::Devanagari && script <= QFont::Sinhala); - const unsigned short script_base = 0x0900 + 0x80*(script-QFont::Devanagari); -- const unsigned short ra = script_base + 0x30; -+ unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification - const unsigned short halant = script_base + 0x4d; - const unsigned short nukta = script_base + 0x3c; - -@@ -1278,6 +1278,11 @@ - } - #endif - -+ unsigned short *chkAssamese=reordered.data(); -+ if((script == QFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra -+ { -+ ra = script_base + 0x70; -+ } - if (len != 1) { - unsigned short *uc = reordered.data(); - bool beginsWithRa = FALSE; ---- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 -+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 -@@ -601,7 +601,7 @@ - None, None, None, None, - None, None, None, None, - -- None, None, None, None, -+ Below, None, None, None, - None, None, None, None, - None, None, None, None, - None, None, None, None, ---- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400 -+++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400 -@@ -149,6 +149,9 @@ - } else { - trmacro = &opt[1]; - } -+ } else if ( opt == "nostdlib") { -+ QStringList x; -+ QApplication::setLibraryPaths(x); - } else if ( opt == "L" ) { - if ( !(n < argc-1) ) { - error = "Missing plugin path."; ---- qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp.orig 2004-05-10 13:54:03.592289052 +0200 -+++ qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp 2004-05-10 13:56:10.165560473 +0200 -@@ -288,8 +288,9 @@ - { - #if defined(QT_CHECK_STATE) - if ( qApp->type() == QApplication::Tty ) { -- qWarning( "QPixmap: Cannot create a QPixmap when no GUI " -- "is being used" ); -+// qWarning( "QPixmap: Cannot create a QPixmap when no GUI " -+// "is being used" ); -+ ; - } - #endif - ---- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp.orig 2004-11-09 18:57:15.012843629 +0100 -+++ qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp 2004-11-09 19:02:31.351637807 +0100 -@@ -1412,7 +1412,7 @@ - False, XA_ATOM, &type, &format, &nitems, &after, &data); - - if (type == XA_ATOM && format == 32) { -- ts.writeBlock((const char *) data, nitems * 4); -+ ts.writeBlock((const char *) data, nitems * sizeof(long)); - offset += nitems; - } else - after = 0; ---- qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp.fonts 2004-08-05 16:42:06.000000000 +0200 -+++ qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp 2004-09-28 16:11:54.955374161 +0200 -@@ -975,7 +981,7 @@ - }; - const XftDefaultFont defaults[] = { - { "Serif", "serif", FALSE }, -- { "Sans Serif", "sans-serif", FALSE }, -+ { "Sans", "sans-serif", FALSE }, - { "Monospace", "monospace", TRUE }, - { 0, 0, FALSE } - }; ---- ./src/widgets/qtextedit.cpp.resetinputcontext 2012-08-04 14:53:34.000000000 +0200 -+++ ./src/widgets/qtextedit.cpp 2012-09-29 11:36:19.410163805 +0200 -@@ -1904,9 +1904,6 @@ - - void QTextEdit::removeSelectedText( int selNum ) - { -- if(selNum != 0) -- resetInputContext(); -- - QTextCursor c1 = doc->selectionStartCursor( selNum ); - c1.restoreState(); - QTextCursor c2 = doc->selectionEndCursor( selNum ); -@@ -3169,7 +3166,6 @@ - return; - } - #endif -- resetInputContext(); - QTextParagraph *p = doc->paragAt( para ); - if ( !p ) - return; -@@ -3196,7 +3192,6 @@ - return; - } - #endif -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3238,7 +3233,6 @@ - if ( d->optimMode ) - return; - #endif -- resetInputContext(); - QTextParagraph *p = doc->paragAt( para ); - if ( !p ) - return; -@@ -3283,7 +3277,6 @@ - if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled ) - return; - -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3334,7 +3327,6 @@ - if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled ) - return; - -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3448,7 +3440,6 @@ - { - if ( isReadOnly() ) - return; -- resetInputContext(); - normalCopy(); - removeSelectedText(); - updateMicroFocusHint(); -@@ -3936,7 +3927,6 @@ - return; - } - #endif -- resetInputContext(); - if ( !isModified() && isReadOnly() && - this->context() == context && this->text() == text ) - return; -@@ -4110,7 +4100,6 @@ - if ( !p ) - return; - -- resetInputContext(); - if ( index > p->length() - 1 ) - index = p->length() - 1; - -@@ -4167,7 +4156,6 @@ - return; - } - #endif -- resetInputContext(); - if ( doc->hasSelection( selNum ) ) { - doc->removeSelection( selNum ); - repaintChanged(); -@@ -5074,7 +5062,6 @@ - } - if ( dc == doc ) - return; -- resetInputContext(); - doc = dc; - delete cursor; - cursor = new QTextCursor( doc ); ---- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.orig 2006-06-21 15:37:53.000000000 +0200 -+++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-06-21 15:38:02.000000000 +0200 -@@ -84,7 +84,7 @@ - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = --QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_STRIP = -+QMAKE_STRIPFLAGS_LIB += - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p ---- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.orig 2006-06-21 15:37:09.000000000 +0200 -+++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-06-21 15:37:19.000000000 +0200 -@@ -84,7 +84,7 @@ - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip --QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_STRIP = -+QMAKE_STRIPFLAGS_LIB += - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p ---- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.orig 2006-06-21 15:36:23.000000000 +0200 -+++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-06-21 15:36:56.000000000 +0200 -@@ -87,7 +87,7 @@ - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip --QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_STRIP = -+QMAKE_STRIPFLAGS_LIB += - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p ---- qt-x11-free-3.3.7/src/tools/qsettings.cpp.tn 2006-11-09 20:53:25.000000000 +0100 -+++ qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-11-09 20:59:53.000000000 +0100 -@@ -994,7 +994,10 @@ - #endif - - QFile file( filename + ".tmp" ); -- if (! file.open(IO_WriteOnly)) { -+ mode_t old_umask = umask(0022); -+ bool f = file.open(IO_WriteOnly); -+ umask(old_umask); -+ if (! f) { - - #ifdef QT_CHECK_STATE - qWarning("QSettings::sync: failed to open '%s' for writing", ---- qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml.orig 2010-06-30 01:00:36.000000000 +0200 -+++ qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml 2010-06-30 01:00:56.000000000 +0200 -@@ -817,7 +817,7 @@ - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - </GROUP> -- <GROUP><Name>QtGenerated</NAME> -+ <GROUP><NAME>QtGenerated</NAME> - $$CODEWARRIOR_QPREPROCESS_GROUP - $$CODEWARRIOR_QPREPROCESSOUT_GROUP - </GROUP> -diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp ---- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig 2008-01-24 13:25:29.000000000 +0100 -+++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp 2008-01-24 13:28:17.000000000 +0100 -@@ -320,7 +320,7 @@ int main( int argc, char * argv[] ) - out << "/****************************************************************************" << endl; - out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl; - out << "**" << endl; -- out << "** Created: " << QDateTime::currentDateTime().toString() << endl; -+ out << "** Created by User Interface Compiler" << endl; - out << "**" << endl; - out << "** WARNING! All changes made in this file will be lost!" << endl; - out << "****************************************************************************/" << endl << endl; -diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp ---- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig 2008-01-24 13:28:30.000000000 +0100 -+++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp 2008-01-24 13:29:10.000000000 +0100 -@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const - for ( it = images.begin(); it != images.end(); ++it ) - out << "** " << *it << "\n"; - out << "**\n"; -- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; -+ out << "** Created by The User Interface Compiler" << "\n"; - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost!\n"; - out << "****************************************************************************/\n"; ---- a/qmake/project.cpp.orig 2015-04-10 17:15:10.731091347 +0200 -+++ b/qmake/project.cpp 2013-12-30 17:58:15.471703644 +0100 -@@ -685,7 +685,7 @@ - // fprintf(stderr,"Current QT version number: " + ver + "\n"); - if (ver != "" && ver != test_version) { - ver = test_version; -- fprintf(stderr,"Changed QT version number to " + test_version + "!\n"); -+ fprintf(stderr,"Changed QT version number to %s!\n", test_version.ascii()); - } - } - } ---- qt3/src/tools/qgdict.cpp 2015-04-10 17:15:11.057092017 +0200 -+++ qt3/src/tools/qgdict.cpp 2013-12-30 17:58:15.516704273 +0100 -@@ -846,11 +846,11 @@ - QString line; - line.fill( '-', 60 ); - double real, ideal; -- qDebug( line.ascii() ); -+ qDebug( "%s", line.ascii() ); - qDebug( "DICTIONARY STATISTICS:" ); - if ( count() == 0 ) { - qDebug( "Empty!" ); -- qDebug( line.ascii() ); -+ qDebug( "%s", line.ascii() ); - return; - } - real = 0.0; -@@ -871,7 +871,7 @@ - while ( b-- ) - *pbuf++ = '*'; - *pbuf = '\0'; -- qDebug( buf ); -+ qDebug( "%s", buf ); - i++; - } - qDebug( "Array size = %d", size() ); -@@ -879,7 +879,7 @@ - qDebug( "Real dist = %g", real ); - qDebug( "Rand dist = %g", ideal ); - qDebug( "Real/Rand = %g", real/ideal ); -- qDebug( line.ascii() ); -+ qDebug( "%s", line.ascii() ); - #endif // QT_DEBUG - } - ---- a/src/tools/qgcache.cpp 2015-04-10 17:15:11.053092009 +0200 -+++ b/src/tools/qgcache.cpp 2013-12-30 17:58:15.515704259 +0100 -@@ -641,7 +641,7 @@ - #if defined(QT_DEBUG) - QString line; - line.fill( '*', 80 ); -- qDebug( line.ascii() ); -+ qDebug( "%s", line.ascii() ); - qDebug( "CACHE STATISTICS:" ); - qDebug( "cache contains %d item%s, with a total cost of %d", - count(), count() != 1 ? "s" : "", tCost ); -@@ -662,7 +662,7 @@ - lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts ); - qDebug( "Statistics from internal dictionary class:" ); - dict->statistics(); -- qDebug( line.ascii() ); -+ qDebug( "%s", line.ascii() ); - #endif - } - diff --git a/redhat/dependencies/qt3/qt3-3.5.13.2.spec b/redhat/dependencies/qt3/qt3-3.5.13.2.spec deleted file mode 100644 index b997dd9ec..000000000 --- a/redhat/dependencies/qt3/qt3-3.5.13.2.spec +++ /dev/null @@ -1,561 +0,0 @@ -# Always install under standard prefix -%define _prefix /usr - -# The following QT4 packages should NOT be installed to -# allow QT3 compilation (please uninstall them prior to compile) -# qt -# qt-sqlite -# qt-mysql -# qt-x11 -# qt-devel -# ...maybe others !!!! - -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Name: qt -%else -Name: qt3 -%endif - -Epoch: 1 -Version: 3.3.8.d%{?preversion:_%{preversion}} -Release: 10%{?dist} -Summary: The shared library for the Qt 3 GUI toolkit - -License: QPL or GPLv2 or GPLv3 -Group: System Environment/Libraries -URL: http://www.trinitydesktop.org/ - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Provides: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} - -Source0: trinity-qt3-3.5.13.2%{?preversion:~%{preversion}}.tar.gz -Source2: qt.sh -Source3: qt.csh -Source4: designer3.desktop -Source5: assistant3.desktop -Source6: linguist3.desktop -Source7: qtconfig3.desktop - -# Monolithic patch for QT3 for TDE 3.5.13.2 -Patch1: qt3-3.5.13.2.patch - -%define qt_dirname qt-3.3 -%define qtdir %{_libdir}/%{qt_dirname} -%define qt_docdir %{_docdir}/qt-devel-%{version} - -%define smp 1 -%define immodule 1 -%define debug 0 - -# MySQL plugins -%define plugin_mysql -plugin-sql-mysql -%define mysql_include_dir %{_includedir}/mysql -%define mysql_lib_dir %{_libdir}/mysql - -# Postgres plugins -%define plugin_psql -plugin-sql-psql - -# ODBC plugins -%define plugin_odbc -plugin-sql-odbc - -# sqlite plugins -%define plugin_sqlite -plugin-sql-sqlite - -%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng -%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style} - -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Requires: coreutils -Requires: fontconfig >= 2.0 -Requires: /etc/ld.so.conf.d - -BuildRequires: desktop-file-utils -BuildRequires: libmng-devel -BuildRequires: glibc-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: zlib-devel -BuildRequires: perl -BuildRequires: sed -BuildRequires: findutils -BuildRequires: cups-devel -BuildRequires: tar -BuildRequires: freetype-devel -BuildRequires: fontconfig-devel -BuildRequires: desktop-file-utils -BuildRequires: mysql-devel -BuildRequires: postgresql-devel -BuildRequires: unixODBC-devel -BuildRequires: sqlite-devel -BuildRequires: gcc-c++ -BuildRequires: make - -%if 0%{?rhel} == 4 -BuildRequires: libungif-devel -BuildRequires: xorg-x11-devel -%else -BuildRequires: giflib-devel -BuildRequires: libXrender-devel -BuildRequires: libXrandr-devel -BuildRequires: libXcursor-devel -BuildRequires: libXinerama-devel -BuildRequires: libXft-devel -BuildRequires: libXext-devel -BuildRequires: libX11-devel -BuildRequires: libSM-devel -BuildRequires: libICE-devel -BuildRequires: libXt-devel -BuildRequires: libXmu-devel -BuildRequires: libXi-devel -BuildRequires: xorg-x11-proto-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -%endif - -%description -Qt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -Qt is written in C++ and is fully object-oriented. - -This package contains the shared library needed to run Qt 3 -applications, as well as the README files for Qt 3. - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc FAQ LICENSE* README* changes* -%dir %{qtdir} -%dir %{qtdir}/bin -%dir %{qtdir}/lib -%dir %{qtdir}/plugins -%dir %{qtdir}/plugins/sqldrivers -%dir %{qtdir}/plugins/styles -%{qtdir}/translations -%{qtdir}/plugins/designer/ -%if %{immodule} -%{qtdir}/plugins/inputmethods -%endif -%config /etc/profile.d/* -/etc/ld.so.conf.d/* -%{qtdir}/lib/libqui.so.* -%{qtdir}/lib/libqt*.so.* - -########## - -%package config -Summary: Graphical configuration tool for programs using Qt 3 -Group: User Interface/Desktops -Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt3-config = %{?epoch:%{epoch}:}%{version}-%{release} - -%description config -Qt is a GUI software toolkit which simplifies the task of writing and -maintaining GUI (Graphical User Interface) applications -for the X Window System. - -Qt is written in C++ and is fully object-oriented. - -This package contains a graphical configuration tool for programs using Qt 3. - -%files config -%defattr(-,root,root,-) -%{qtdir}/bin/qtconfig -%{_datadir}/applications/*qtconfig*.desktop -%{_datadir}/pixmaps/qtconfig3.png - -########## - -%package devel -Summary: Development files for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt3-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: freetype-devel -Requires: fontconfig-devel -Requires: libpng-devel -Requires: libjpeg-devel -Requires: libmng-devel -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%else -Requires: libXrender-devel -Requires: libXrandr-devel -Requires: libXcursor-devel -Requires: libXinerama-devel -Requires: libXft-devel -Requires: libXext-devel -Requires: libX11-devel -Requires: libSM-devel -Requires: libICE-devel -Requires: libXt-devel -Requires: xorg-x11-proto-devel -Requires: mesa-libGL-devel -Requires: mesa-libGLU-devel -%endif - -%description devel -The %{name}-devel package contains the files necessary to develop -applications using the Qt GUI toolkit: the header files, the Qt meta -object compiler. - -Install %{name}-devel if you want to develop GUI applications using the Qt 3 -toolkit. - -%files devel -%defattr(-,root,root,-) -%{qt_docdir}/ -%{qtdir}/bin/moc -%{qtdir}/bin/uic -%{qtdir}/bin/findtr -%{qtdir}/bin/qt20fix -%{qtdir}/bin/qtrename140 -%{qtdir}/bin/assistant -%{qtdir}/bin/qm2ts -%{qtdir}/bin/qmake -%{qtdir}/bin/qembed -%{qtdir}/bin/linguist -%{qtdir}/bin/lupdate -%{qtdir}/bin/lrelease -%{qtdir}/include -%{qtdir}/mkspecs -%{qtdir}/lib/libqt*.so -%{qtdir}/lib/libqui.so -%{qtdir}/lib/libeditor.a -%{qtdir}/lib/libdesigner*.a -%{qtdir}/lib/libqassistantclient.a -%{qtdir}/lib/*.prl -%{qtdir}/phrasebooks -%{_libdir}/pkgconfig/* -%{_datadir}/applications/*linguist*.desktop -%{_datadir}/applications/*assistant*.desktop -%{_datadir}/pixmaps/linguist3.png -%{_datadir}/pixmaps/assistant3.png - -# QT 3.3.8.D (TDE): 4 binaries have appeared -%{qtdir}/bin/createcw -%{qtdir}/bin/makeqpf -%{qtdir}/bin/mergetr -%{qtdir}/bin/msg2qm - -########## - -%package devel-docs -Summary: Documentation for the Qt 3 GUI toolkit -Group: Development/Libraries -Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7 -Obsoletes: qt-devel-docs < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt-devel-docs = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - -%description devel-docs -The %{name}-devel-docs package contains the man pages, the HTML documentation and -example programs for Qt 3. - -%files devel-docs -%defattr(-,root,root,-) -%doc examples -%doc tutorial -%{_mandir}/*/* - -########## - -%package ODBC -Summary: ODBC drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt3-ODBC = %{?epoch:%{epoch}:}%{version}-%{release} - -%description ODBC -ODBC driver for Qt 3's SQL classes (QSQL) - -%files ODBC -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlodbc.so - -########## - -%package MySQL -Summary: MySQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt3-MySQL = %{?epoch:%{epoch}:}%{version}-%{release} - -%description MySQL -MySQL driver for Qt 3's SQL classes (QSQL) - -%files MySQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlmysql.so - -########## - -%package PostgreSQL -Summary: PostgreSQL drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt3-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release} - -%description PostgreSQL -PostgreSQL driver for Qt 3's SQL classes (QSQL) - -%files PostgreSQL -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlpsql.so - -########## - -%package sqlite -Summary: sqlite drivers for Qt 3's SQL classes -Group: System Environment/Libraries -Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt3-sqlite = %{?epoch:%{epoch}:}%{version}-%{release} - -%description sqlite -sqlite driver for Qt 3's SQL classes (QSQL) - -%files sqlite -%defattr(-,root,root,-) -%{qtdir}/plugins/sqldrivers/libqsqlite.so - -########## - -%package designer -Summary: Interface designer (IDE) for the Qt 3 toolkit -Group: Development/Tools -Requires: qt3 = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: qt3-designer = %{?epoch:%{epoch}:}%{version}-%{release} - -%description designer -The %{name}-designer package contains an User Interface designer tool -for the Qt 3 toolkit. - -%files designer -%defattr(-,root,root,-) -%{qtdir}/templates -%{qtdir}/bin/designer -%{_datadir}/applications/*designer*.desktop -%{_datadir}/pixmaps/designer3.png - -########## - -%prep -%setup -q -n trinity-qt3-3.5.13.2%{?preversion:~%{preversion}} - -%patch1 -p1 - - -# convert to UTF-8 -iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_ -mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt - -%build -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" -export QTDEST=%{qtdir} - -# Huho ... it looks like we are not detecting some libraries correctly under RHEL4 ... -%if 0%{?rhel} == 4 -%__sed -i plugins/src/inputmethods/xim/xim.pro \ - -e "/INCLUDEPATH/ s|$| /usr/include/freetype2|" -%endif - -%if %{smp} - export SMP_MFLAGS="%{?_smp_mflags}" -%endif - -%if %{immodule} - sh ./make-symlinks.sh -%endif - -# set correct X11 prefix -if [ -d /usr/X11R6 ]; then - perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=/usr/X11R6/%{_lib}," mkspecs/*/qmake.conf - perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=/usr/X11R6/include," mkspecs/*/qmake.conf -else - perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf - perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf -fi -perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf -perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf - -# don't use rpath -perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf - -perl -pi -e "s|-O2|$INCLUDES %{optflags} -fno-strict-aliasing|g" mkspecs/*/qmake.conf - -# set correct lib path -if [ "%{_lib}" == "lib64" ] ; then - perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test - perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test -fi - -# Fix QTLIB is under 'lib' instead of 'lib64' under RHEL/Fedora -sed -i "mkspecs/linux-g++-64/qmake.conf" -e "s|\$(QTDIR)/lib64|\$(QTDIR)/lib|" - -# build shared, threaded (default) libraries -echo yes | ./configure \ - -prefix $QTDEST \ - -docdir %{qt_docdir} \ -%if %{_lib} == lib64 - -platform linux-g++-64 \ -%else - -platform linux-g++ \ -%endif -%if %{debug} - -debug \ -%else - -release \ -%endif - -shared \ - -largefile \ - -qt-gif \ - -system-zlib \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ - -no-exceptions \ - -enable-styles \ - -enable-tools \ - -enable-kernel \ - -enable-widgets \ - -enable-dialogs \ - -enable-iconview \ - -enable-workspace \ - -enable-network \ - -enable-canvas \ - -enable-table \ - -enable-xml \ - -enable-opengl \ - -enable-sql \ - -qt-style-motif \ - %{plugins} \ - -stl \ - -thread \ - -cups \ - -sm \ -%if 0%{?rhel} == 4 - -no-xinerama \ - -no-xrandr \ -%else - -xinerama \ - -xrandr \ -%endif - -xrender \ - -xkb \ - -ipv6 \ - -dlopen-opengl \ - -xft \ - -tablet -v - -make $SMP_MFLAGS src-qmake - -# build sqlite plugin -pushd plugins/src/sqldrivers/sqlite -qmake -o Makefile sqlite.pro -popd - -# build psql plugin -pushd plugins/src/sqldrivers/psql -qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro -popd - -# build mysql plugin -pushd plugins/src/sqldrivers/mysql -qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro -popd - -# build odbc plugin -pushd plugins/src/sqldrivers/odbc -qmake -o Makefile "LIBS+=-lodbc" odbc.pro -popd - -make $SMP_MFLAGS src-moc -make $SMP_MFLAGS sub-src -make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins" - -%install -rm -rf %{buildroot} - -export QTDIR=`/bin/pwd` -export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" -export PATH="$QTDIR/bin:$PATH" -export QTDEST=%{qtdir} - -make install INSTALL_ROOT=%{buildroot} - -for i in findtr qt20fix qtrename140 lrelease lupdate ; do - install bin/$i %{buildroot}%{qtdir}/bin/ -done - -mkdir -p %{buildroot}%{_libdir}/pkgconfig/ -mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/ - -# install man pages -mkdir -p %{buildroot}%{_mandir} -cp -fR doc/man/* %{buildroot}%{_mandir}/ - -# clean up -make -C tutorial clean -make -C examples clean - -# Make sure the examples can be built outside the source tree. -# Our binaries fulfill all requirements, so... -perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"` - -# don't include Makefiles of qt examples/tutorials -find examples -name "Makefile" | xargs rm -f -find examples -name "*.obj" | xargs rm -rf -find examples -name "*.moc" | xargs rm -rf -find tutorial -name "Makefile" | xargs rm -f - -for a in */*/Makefile ; do - sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{qtdir}/bin/moc|' < $a > ${a}.2 - mv -v ${a}.2 $a -done - -install -D -m 644 "%{SOURCE2}" %{buildroot}/etc/profile.d/qt3.sh -install -D -m 644 "%{SOURCE3}" %{buildroot}/etc/profile.d/qt3.csh - -# Add desktop files -mkdir -p "%{buildroot}%{_datadir}/applications" -desktop-file-install \ - --dir "%{buildroot}%{_datadir}/applications" \ - --vendor="qt" \ - %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} - -# Patch qmake to use qt-mt unconditionally -perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf - -# remove broken links -rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++* -rm -f %{buildroot}%{qtdir}/lib/*.la - -mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf - -# install icons -install -D -m 644 "tools/assistant/images/qt.png" "%{buildroot}%{_datadir}/pixmaps/qtconfig3.png" -install -D -m 644 "tools/assistant/images/designer.png" "%{buildroot}%{_datadir}/pixmaps/designer3.png" -install -D -m 644 "tools/assistant/images/assistant.png" "%{buildroot}%{_datadir}/pixmaps/assistant3.png" -install -D -m 644 "tools/assistant/images/linguist.png" "%{buildroot}%{_datadir}/pixmaps/linguist3.png" - -# own style directory -mkdir -p "%{buildroot}%{qtdir}/plugins/styles" - - -%clean -rm -rf %{buildroot} - - -%changelog diff --git a/redhat/dependencies/qt3/qtconfig3.desktop b/redhat/dependencies/qt3/qtconfig3.desktop deleted file mode 100644 index 11df0abab..000000000 --- a/redhat/dependencies/qt3/qtconfig3.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Qt3 Config -Comment=Configure Qt3 behavior, styles, fonts -Exec=qtconfig -Icon=qtconfig3 -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Settings; diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec index 6432e8099..3f5a23803 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec @@ -28,7 +28,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg sip4-tqt %define tde_prefix /opt/trinity @@ -42,8 +42,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} @@ -71,8 +69,18 @@ BuildRequires: libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0 BuildRequires: trinity-filesystem >= %{tde_version} BuildRequires: gcc-c++ -BuildRequires: python -BuildRequires: python-devel + +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel %description SIP is a tool for generating bindings for C++ classes with some ideas @@ -85,7 +93,7 @@ specificity towards C++ and Python. Summary: Python/C++ bindings generator (Runtime Library) Group: Development/Tools/Building Requires: trinity-filesystem >= %{tde_version} -Requires: python +Requires: %{python} %description -n sip4-tqt SIP is a tool for generating bindings for C++ classes with some ideas @@ -94,11 +102,7 @@ specificity towards C++ and Python. %files -n sip4-tqt %defattr(-,root,root,-) -%dir %{python_sitearch}/sip4_tqt -%{python_sitearch}/sip4_tqt/sip.so -%{python_sitearch}/sip4_tqt/sipconfig.py* -%{python_sitearch}/sip4_tqt/sipdistutils.py* -%{python_sitearch}/sip4_tqt/__init__.py* +%{python_sitearch}/sip4_tqt/ ########## @@ -106,7 +110,7 @@ specificity towards C++ and Python. Summary: Python/C++ bindings generator (Development Files) Group: Development/Libraries/Python Requires: sip4-tqt = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: python-devel +Requires: %{python}-devel %description -n sip4-tqt-devel SIP is a tool for generating bindings for C++ classes with some ideas diff --git a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec b/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec deleted file mode 100644 index 8892b1ec2..000000000 --- a/redhat/dependencies/tqca-tls/tqca-tls-3.5.13.2.spec +++ /dev/null @@ -1,122 +0,0 @@ -# -# spec file for package tqca-tls (version 3.5.13-SRU) -# -# 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 1 -%define tde_version 3.5.13.2 -%define tde_pkg tqca-tls -%define tde_prefix /opt/trinity -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libtqt3 %{_lib}qt3 -%else -%define libtqt3 libqt3 -%endif - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 1.0 -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} -Summary: TLS plugin for the TQt Cryptographic Architecture -Group: Applications/Internet -URL: http://delta.affinix.com/qca/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Desktop -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: tqca-tls-3.5.13.2.tar.gz - -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 -BuildRequires: libtqca-devel >= %{tde_epoch}:1.0 - -BuildRequires: gcc-c++ -BuildRequires: openssl-devel >= 0.9.8 - - -%description -This is a plugin to provide SSL/TLS capability to programs that use the TQt -Cryptographic Architecture (TQCA). TQCA is a library providing an easy API -for several cryptographic algorithms to TQt programs. This package only -contains the TLS plugin. - -########## - -%package -n %{libtqt3}-mt-tqca-tls -Summary: TLS plugin for the TQt Cryptographic Architecture -Group: Applications/Internet - -%description -n %{libtqt3}-mt-tqca-tls -This is a plugin to provide SSL/TLS capability to programs that use the TQt -Cryptographic Architecture (TQCA). TQCA is a library providing an easy API -for several cryptographic algorithms to TQt programs. This package only -contains the TLS plugin. - -%files -n %{libtqt3}-mt-tqca-tls -%defattr(0644,root,root,0755) -%doc README COPYING -%if 0%{?mgaversion} || 0%{?mdkversion} -%{_libdir}/qt3/plugins/crypto/libqca-tls.so -%endif -%if 0%{?suse_version} -%{_usr}/lib/qt3/plugins/crypto/libqca-tls.so -%endif -%if 0%{?rhel} || 0%{?fedora} -%{_libdir}/qt-3.3/plugins/crypto/libqca-tls.so -%endif - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n tqca-tls-3.5.13.2 - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh - -./configure -%__make %{?_smp_mflags} - - -%install -%__rm -rf %{?buildroot} -%__make install INSTALL_ROOT=%{?buildroot} - - -%clean -%__rm -rf %{?buildroot} - - -%changelog diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec index 0323731dc..3f5d9d109 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tqca-tls %define tde_prefix /opt/trinity @@ -100,15 +100,29 @@ contains the TLS plugin. %build unset QTDIR QTINC QTLIB -./configure \ - --qtdir=%{_prefix} +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi -%__make %{?_smp_mflags} +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DWITH_ALL_OPTIONS="ON" \ + \ + .. + +%__make %{?_smp_mflags} || %__make %install %__rm -rf %{?buildroot} -%__make install INSTALL_ROOT=%{?buildroot} +%__make install DESTDIR="%{?buildroot}" -C build %clean diff --git a/redhat/dependencies/tqca/tqca-3.5.13.2.spec b/redhat/dependencies/tqca/tqca-3.5.13.2.spec deleted file mode 100644 index 629131436..000000000 --- a/redhat/dependencies/tqca/tqca-3.5.13.2.spec +++ /dev/null @@ -1,164 +0,0 @@ -# -# spec file for package tqca (version 3.5.13-SRU) -# -# 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 1 -%define tde_version 3.5.13.2 -%define tde_pkg tqca -%define tde_prefix /opt/trinity -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libtqca %{_lib}tqca -%else -%define libtqca libtqca -%endif - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 1.0 -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} -Summary: TQt Cryptographic Architecture -Group: Development/Libraries/C and C++ -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: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: tqca-3.5.13.2.tar.gz -Source1: trinity-tqca-rpmlintrc - -BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 -BuildRequires: gcc-c++ - -%description -Taking a hint from the similarly-named Java Cryptography Architecture, -TQCA aims to provide a straightforward and cross-platform crypto API, -using TQt datatypes and conventions. TQCA separates the API from the -implementation, using plugins known as Providers. The advantage of this -model is to allow applications to avoid linking to or explicitly depending -on any particular cryptographic library. This allows one to easily change -or upgrade crypto implementations without even needing to recompile the -application! - -########## - -%package -n %{libtqca}1 -Summary: TQt Cryptographic Architecture -Group: Development/Libraries/C and C++ - -Obsoletes: trinity-libtqca < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-libtqca = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libtqca = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libtqca1 = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libtqca}1 -Taking a hint from the similarly-named Java Cryptography Architecture, -TQCA aims to provide a straightforward and cross-platform crypto API, -using TQt datatypes and conventions. TQCA separates the API from the -implementation, using plugins known as Providers. The advantage of this -model is to allow applications to avoid linking to or explicitly depending -on any particular cryptographic library. This allows one to easily change -or upgrade crypto implementations without even needing to recompile the -application! - -%post -n %{libtqca}1 -/sbin/ldconfig - -%postun -n %{libtqca}1 -/sbin/ldconfig - -%files -n %{libtqca}1 -%defattr(-,root,root,-) -%doc COPYING README TODO -%{_libdir}/libqca.so.1 -%{_libdir}/libqca.so.1.0 -%{_libdir}/libqca.so.1.0.0 - -########## - -%package -n %{libtqca}-devel -Summary: TQt Cryptographic Architecture development files -Group: Development/Libraries/C and C++ -Requires: %{libtqca}1 = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: trinity-libtqca-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-libtqca-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libtqca-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libtqca}-devel -This packages contains the development files for TQCA - -%post -n %{libtqca}-devel -/sbin/ldconfig - -%postun -n %{libtqca}-devel -/sbin/ldconfig - -%files -n %{libtqca}-devel -%defattr(-,root,root,-) -%{_includedir}/qca.h -%{_libdir}/libqca.so - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n tqca-3.5.13.2 - -# Fix 'lib64' library directory -perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh - -./configure \ - --prefix=%{_prefix} \ - --qtdir=${QTDIR} \ - --debug - -%__make %{?_smp_mflags} - - -%install -%__rm -rf $RPM_BUILD_ROOT -%__make install INSTALL_ROOT=$RPM_BUILD_ROOT - - -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%changelog diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca.spec index a6e59e772..efb32c3c6 100644 --- a/redhat/dependencies/tqca/tqca-14.0.0.spec +++ b/redhat/dependencies/tqca/tqca.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tqca %define tde_prefix /opt/trinity @@ -56,6 +56,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: trinity-tqca-rpmlintrc BuildRequires: libtqt4-devel >= %{tde_epoch}:4.2.0 +BuildRequires: cmake BuildRequires: gcc-c++ %description @@ -98,9 +99,8 @@ application! %files -n %{libtqca}1 %defattr(-,root,root,-) %doc COPYING README TODO -%{_libdir}/libqca.so.1 -%{_libdir}/libqca.so.1.0 -%{_libdir}/libqca.so.1.0.0 +%{_libdir}/libtqca.so.1 +%{_libdir}/libtqca.so.1.0.0 ########## @@ -124,8 +124,11 @@ This packages contains the development files for TQCA %files -n %{libtqca}-devel %defattr(-,root,root,-) -%{_includedir}/qca.h -%{_libdir}/libqca.so +%{_includedir}/tqt3/tqca.h +%{_includedir}/tqt3/tqcaprovider.h +%{_libdir}/libtqca.la +%{_libdir}/libtqca.so +%{_libdir}/pkgconfig/tqca.pc ########## @@ -145,23 +148,31 @@ perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra %build unset QTDIR QTINC QTLIB -./configure \ - --prefix=%{_prefix} \ - --qtdir=/usr \ - --debug +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + \ + -DWITH_ALL_OPTIONS="ON" \ + .. -# Workaround strange tqmake behaviour in RHEL5 -%if 0%{?rhel} == 5 -%__sed -i "Makefile" -e "s|..\/..\/..\/..|%{_prefix}|g" -%endif - -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install %__rm -rf $RPM_BUILD_ROOT -%__make install INSTALL_ROOT="${RPM_BUILD_ROOT}/" +%__make install DESTDIR=%{?buildroot} -C build %clean diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla.spec index 272b099d5..46f6cb1e5 100644 --- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec +++ b/redhat/dependencies/tqscintilla/tqscintilla.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tqscintilla %define tde_prefix /opt/trinity @@ -151,18 +151,14 @@ This package contains the documentation for tqscintilla. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# Fix perms -chmod -x doc/Scintilla/* -chmod -x example/* - # Fix path in project files %__sed -i "qt/qscintilla.pro" \ -e "s|^INCLUDEPATH = .*|INCLUDEPATH = . ../include ../src /usr/include/tqt /usr/include/tqt3|" \ -e "s|^header.path = .*|header.path = %{_includedir}/tqt3|" \ -e "s|^trans.path = .*|trans.path = %{_datadir}/tqt3/translations|" -# -e "s|\$(QTDIR)|%{_libdir}/tqt3|" \ %__sed -i "designer/designer.pro" \ + -e "s|\$(TQTDIR)|%{_libdir}/tqt3|" \ -e "s|# DESTDIR|DESTDIR|" export QTDIR=%{_libdir}/tqt3 diff --git a/redhat/dependencies/tqt3/tqassistant.desktop b/redhat/dependencies/tqt3/tqassistant.desktop deleted file mode 100644 index c178007d8..000000000 --- a/redhat/dependencies/tqt3/tqassistant.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=tqassistant -Name=TQt3 Assistant -Name[de]=TQt3 Assistent -GenericName=Document Browser -Comment=TQt3 Helpcenter -Comment[de]= TQt3 Hilfezentrum -MimeType=application/x-assistant; -Icon=tqassistant -Terminal=false -Type=Application -Categories=Qt;Development; diff --git a/redhat/dependencies/tqt3/tqdesigner.desktop b/redhat/dependencies/tqt3/tqdesigner.desktop deleted file mode 100644 index 2152b777b..000000000 --- a/redhat/dependencies/tqt3/tqdesigner.desktop +++ /dev/null @@ -1,78 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=tqdesigner -Name=TQt3 Designer -Name[bg]=TQt3 Дизайнер -Name[br]=Ergrafer TQt3 -Name[ca]=Dissenyador TQt3 -Name[cs]=TQt3 designer -Name[de]=TQt3-Designer -Name[eo]=TQt3-Desegnilo -Name[es]=Diseñador TQt3 -Name[et]=TQt3 disainer -Name[eu]=TQt3 Diseinatzailea -Name[gl]=Deseñador de TQt3 -Name[he]=TQt3 בצעמ -Name[it]=Designer TQt3 -Name[ja]=TQt3デザイナー -Name[ko]=TQt3 디자이너 -Name[lv]=TQt3 Dizainers -Name[mk]=TQt3 дизајнер -Name[no]=TQt3-designer -Name[oc]=Dessinador TQt3 -Name[pl]=Projektant TQt3 -Name[sk]=TQt3 Dizajnér -Name[sl]=Snovalnik TQt3 -Name[ta]=TQt3 À¨¼ôÀ¡Ç÷ -Name[uk]=Дизайнер TQt3 -Name[zh_CN.GB2312]=TQt3 设计者 -Name[zh_TW.Big5]=TQt3 設計器 -GenericName=Interface Designer -Comment=TQt3 interface designer -Comment[az]=TQt3 axtar üz dizayn proqramı -Comment[bg]=TQt3 interface дизайнер -Comment[br]=Ergrafer etrefas TQt3 -Comment[ca]=Dissenyador d'interfícies TQt3 -Comment[cs]=Editor UI pro TQt3 -Comment[da]=TQt3 grænseflade designer -Comment[de]=Schnittstellen-Designer für TQt3 -Comment[el]=Σχεδιασμός περιβάλλοντων TQt3 -Comment[eo]=TQt3-Interfacdesegnilo -Comment[es]=Diseñador de interfaces de TQt3 -Comment[et]=TQt3 dialoogide redaktor -Comment[eu]=TQt3 interfaze diseinatzailea -Comment[fi]=TQt3:n käyttöliittymäsuunnittelija -Comment[fr]=Conception d'interfaces avec TQt3 -Comment[gl]=Editor de interfaces de TQt3 -Comment[he]=TQt3-ל םיקשממ בצעמ -Comment[hu]=TQt3 felülettervező -Comment[is]=Viðmótshönnunartól fyrir TQt3 -Comment[it]=Editor per le interfaccie TQt3 -Comment[ja]=TQt3インターフェースデザイナー -Comment[ko]=TQt3 인터페이스 디자이너 -Comment[lt]=TQt3 sąsajos redaktorius -Comment[lv]=TQt3 starsejas dizainers -Comment[mk]=Дизајнер на TQt3 дијалози -Comment[nl]=TQt3 interface-ontwerper -Comment[no]=TQt3-grensesnittdesigner -Comment[no_NY]=Redigering av TQt3-miljø -Comment[oc]=Dessinador d'interfacies TQt3 -Comment[pl]=Projektant interfejsu TQt3 -Comment[pt]=Editor de interfaces do TQt3 -Comment[pt_BR]=Designer de interface TQt3 -Comment[ro]=Dezvoltator de interfeţe TQt3 -Comment[ru]=редактор интерфейсов приложений TQt3 -Comment[sk]=TQt3 dizajnér rozhrania -Comment[sl]=Snovalnik vmesnikov za TQt3 -Comment[sr]=Dizajner TQt3 interfejsa -Comment[sv]=Editor för gränssnitt till TQt3 -Comment[ta]=TQt3 À¨¼ôÀ¡Ç÷ -Comment[tr]=TQt3 arayüz tasarım programı -Comment[uk]=Редактор інтерфейсу для TQt3 -Comment[zh_CN.GB2312]=TQt3 界面设计程序 -Comment[zh_TW.Big5]=TQt3 介面編輯器 -MimeType=application/x-designer; -Icon=tqdesigner -Terminal=false -Type=Application -Categories=Qt;Development; diff --git a/redhat/dependencies/tqt3/tqlinguist.desktop b/redhat/dependencies/tqt3/tqlinguist.desktop deleted file mode 100644 index 6cbbe713d..000000000 --- a/redhat/dependencies/tqt3/tqlinguist.desktop +++ /dev/null @@ -1,26 +0,0 @@ -[Desktop Entry] -Exec=tqlinguist -Name=TQt3 Linguist -Name[de]=TQt3-Linguist -Name[eo]=TQt3-Lingvisto -Name[es]=Lingüista TQt3 -Name[ko]=TQt3 언어학자 -Name[lv]=TQt3 Lingvists -GenericName=Translation Tool -Comment=Tool for translating message catalogues of TQt3 based programs -Comment[da]=Redskab til at oversætte TQt3 baserede programmer -Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf TQt3 basieren -Comment[eo]=Ilo por tradukado de mesaĝaroj de TQt3-bazitaj programoj -Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en TQt3 -Comment[he]=TQt3 תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ -Comment[hu]=Segédprogram a TQt3-alapú programok üzenetfájljainak lefordításához -Comment[ko]=TQt3를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구 -Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz TQt3 bāzētās programmās -Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3 -Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3 -Comment[sv]=Verktyg för att översätta meddelandekataloger från TQt3-baserade program -MimeType=application/x-linguist; -Terminal=false -Icon=tqlinguist -Type=Application -Categories=Qt;Development diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec index 4dae6cea7..daa0c8f29 100644 --- a/redhat/dependencies/tqt3/tqt3.spec +++ b/redhat/dependencies/tqt3/tqt3.spec @@ -17,7 +17,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} @@ -49,12 +49,6 @@ BuildRoot: %{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: build-examples.sh -Source11: tqassistant.desktop -Source12: tqdesigner.desktop -Source13: tqlinguist.desktop -Source14: tqtconfig.desktop - - BuildRequires: glibc-devel BuildRequires: gcc-c++ BuildRequires: make @@ -273,8 +267,17 @@ BuildRequires: sqlite3-devel %endif # POSTGRESQL support +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 +BuildRequires: postgresql10 +BuildRequires: postgresql10-devel +%else BuildRequires: postgresql +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +BuildRequires: postgresql-server-devel +%else BuildRequires: postgresql-devel +%endif +%endif # Firebird support %if 0%{?mdkversion} || 0%{?mgaversion} @@ -291,12 +294,12 @@ BuildRequires: %{_lib}fbclient-devel %define with_nis 1 # RPC support -%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500 -%if 0%{?fedora} +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 28 BuildRequires: libnsl2-devel -%else -BuildRequires: libnsl-devel +BuildRequires: libtirpc-devel %endif +%if 0%{?suse_version} >= 1500 +BuildRequires: libnsl-devel BuildRequires: libtirpc-devel %endif @@ -342,9 +345,6 @@ applications. %files -n %{libtqt3}-mt %defattr(-,root,root,-) %doc FAQ LICENSE* README* changes* -%dir %{_datadir}/icons/hicolor -%dir %{_datadir}/icons/hicolor/32x32 -%dir %{_datadir}/icons/hicolor/32x32/apps %dir %{_datadir}/tqt3/ %dir %{_datadir}/tqt3/doc/ %dir %{_datadir}/tqt3/doc/html/ @@ -912,7 +912,6 @@ libtqt3-headers. %{_includedir}/tqt3/ntqrangect.h %{_includedir}/tqt3/ntqscrbar.h %{_includedir}/tqt3/ntqsocknot.h -%{_includedir}/tqt3/ntqstack.h %{_includedir}/tqt3/ntqtabdlg.h %{_includedir}/tqt3/ntqtstream.h %{_includedir}/tqt3/ntqwidcoll.h @@ -943,10 +942,7 @@ For TQt3 development, you most likely want to install this package. %{_bindir}/tquic %{_bindir}/tqmoc %{_bindir}/tqembed -%{_mandir}/man1/lupdate-tqt3.1* -%{_mandir}/man1/lrelease-tqt3.1* -%{_mandir}/man1/moc-tqt3.1* -%{_mandir}/man1/uic-tqt3.1* +%{_mandir}/man1/*.1* ########## @@ -1005,7 +1001,7 @@ or automake. %{_datadir}/tqt3/tools/tqtcreatecw/main.cpp %{_datadir}/tqt3/tools/tqtcreatecw/tqtcreatecw.pro %{_datadir}/applications/tqdesigner.desktop -%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png +%{_datadir}/pixmaps/tqdesigner.png ########### @@ -1072,7 +1068,7 @@ development files by the translator. %dir %{_docdir}/tqt3-linguist %{_docdir}/tqt3-linguist/qt_untranslated.ts %{_datadir}/applications/tqlinguist.desktop -%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png +%{_datadir}/pixmaps/tqlinguist.png ########## @@ -1097,11 +1093,10 @@ the package tqt3-apps-devel. %files -n tqt3-assistant %defattr(-,root,root,-) %{_bindir}/tqassistant -%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png %{_datadir}/tqt3/doc/html/assistant*html %{_datadir}/tqt3/doc/html/assistant*dcf %{_datadir}/applications/tqassistant.desktop -%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png +%{_datadir}/pixmaps/tqassistant.png ########## @@ -1124,7 +1119,7 @@ install this package. %defattr(-,root,root,-) %{_bindir}/tqtconfig %{_datadir}/applications/tqtconfig.desktop -%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png +%{_datadir}/pixmaps/tqtconfig.png ########### @@ -1264,18 +1259,14 @@ things that are possible with TQt3. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -# 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|" -%endif - %if 0%{?suse_version} echo "suse_version = %{?suse_version}" echo "sle_version = %{?sle_version}" %endif -# Add missing sqlite3 header -%__ln_s ../src/sql/drivers/sqlite3/qsql_sqlite3.h include/qsql_sqlite3.h +%if 0%{?rhel} == 5 +%__sed -i "src/sql/drivers/mysql/qsql_mysql.cpp" -e "s|bool reconnect = 0;|my_bool reconnect = 0;|g" +%endif # fix variables in 'qmake.conf' %__sed -i mkspecs/*/qmake.conf \ @@ -1344,6 +1335,7 @@ echo yes | ./configure \ -docdir "%{_datadir}/tqt3/doc" \ -plugindir "%{_libdir}/tqt3/plugins" \ -translationdir "%{_datadir}/tqt3/translations" \ + -sysshare "%{_datadir}" \ \ -thread \ -shared \ @@ -1400,7 +1392,9 @@ echo yes | ./configure \ -v # proceed -%__make %{?_smp_mflags} sub-src sub-plugins sub-tools +%__make %{?_smp_mflags} sub-src || %__make sub-src +%__make %{?_smp_mflags} sub-plugins || %__make sub-plugins +%__make %{?_smp_mflags} sub-tools # build tqtconv2ui %__make -C tools/designer/tools/tqtconv2ui @@ -1457,12 +1451,6 @@ for i in designer/designer assistant linguist/linguist; do popd done -# desktop lnk files -%__install -m644 -D "%{SOURCE11}" "%{?buildroot}%{_datadir}/applications/tqassistant.desktop" -%__install -m644 -D "%{SOURCE12}" "%{?buildroot}%{_datadir}/applications/tqdesigner.desktop" -%__install -m644 -D "%{SOURCE13}" "%{?buildroot}%{_datadir}/applications/tqlinguist.desktop" -%__install -m644 -D "%{SOURCE14}" "%{?buildroot}%{_datadir}/applications/tqtconfig.desktop" - %if 0%{?suse_version} %suse_update_desktop_file tqassistant Documentation %suse_update_desktop_file tqdesigner GUIDesigner @@ -1471,10 +1459,10 @@ done %endif # Install applications icons -%__install -m644 -D "tools/assistant/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png" -%__install -m644 -D "tools/designer/designer/images/designer_appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png" -%__install -m644 -D "tools/linguist/linguist/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png" -%__install -m644 -D "tools/qtconfig/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png" +#__install -m644 -D "tools/assistant/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqassistant.png" +#__install -m644 -D "tools/designer/designer/images/designer_appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqdesigner.png" +#__install -m644 -D "tools/linguist/linguist/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqlinguist.png" +#__install -m644 -D "tools/qtconfig/images/appicon.png" "%{?buildroot}%{_datadir}/icons/hicolor/32x32/apps/tqtconfig.png" # build attic package and copy it to tqt3-compat-headers pushd src @@ -1483,10 +1471,12 @@ install -D -m644 "attic.tar.gz" "%{?buildroot}%{_docdir}/tqt3-compat-headers/att popd # install the man pages -install -D -m644 "doc/man/man1/moc.1" "%{?buildroot}%{_mandir}/man1/moc-tqt3.1" -install -D -m644 "doc/man/man1/uic.1" "%{?buildroot}%{_mandir}/man1/uic-tqt3.1" -install -D -m644 "doc/man/man1/lrelease.1" "%{?buildroot}%{_mandir}/man1/lrelease-tqt3.1" -install -D -m644 "doc/man/man1/lupdate.1" "%{?buildroot}%{_mandir}/man1/lupdate-tqt3.1" +%__install -d "%{?buildroot}%{_mandir}/man1" +%__install -m644 "doc/man/man1/"*"embed.1" "%{?buildroot}%{_mandir}/man1/" +%__install -m644 "doc/man/man1/"*"lrelease.1" "%{?buildroot}%{_mandir}/man1/" +%__install -m644 "doc/man/man1/"*"lupdate.1" "%{?buildroot}%{_mandir}/man1/" +%__install -m644 "doc/man/man1/"*"moc.1" "%{?buildroot}%{_mandir}/man1/" +%__install -m644 "doc/man/man1/"*"uic.1" "%{?buildroot}%{_mandir}/man1/" # Install source for the designer tools, such as tqtcreatecw. cp -ra tools/designer/tools %{?buildroot}%{_datadir}/tqt3/tools diff --git a/redhat/dependencies/tqt3/tqtconfig.desktop b/redhat/dependencies/tqt3/tqtconfig.desktop deleted file mode 100644 index d20d2191d..000000000 --- a/redhat/dependencies/tqt3/tqtconfig.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=tqtconfig -Name=TQt3 Configuration -Name[de]=TQt3 Konfiguration -GenericName=Configuration Utility -Comment=A graphical configuration tool for programs using TQt 3 -Comment[de]=Ein grafisches Konfigurationstool für TQt3-Programme -MimeType=application/x-qtconfig; -Terminal=false -Icon=tqtconfig -Type=Application -Categories=Qt;Settings; diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec deleted file mode 100644 index 127e0b908..000000000 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec +++ /dev/null @@ -1,270 +0,0 @@ -# -# spec file for package tqtinterface (version 3.5.13-SRU) -# -# 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/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg tqtinterface -%define cmake_modules_dir %{_datadir}/cmake/Modules - -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} -%define libtqt4 %{_lib}tqt4 -%else -%define libtqt4 libtqt4 -%endif - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 4.2.0 -Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist} -Summary: The Trinity Qt Interface Libraries -Group: System/GUI/Other -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: /usr -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: qt3 >= 3.3.8d -BuildRequires: qt3-devel >= 3.3.8d - -%if 0%{?suse_version} && 0%{?suse_version} < 1300 -BuildRequires: trinity-cmake-macros -%endif - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig - -# UUID support -BuildRequires: libuuid-devel - -# PTHREAD support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -BuildRequires: pth-devel -%endif - -# MESA support -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -%endif -%if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: mesaglu-devel -%endif -%if 0%{?suse_version} -BuildRequires: Mesa-libGL-devel -BuildRequires: Mesa-libGLU-devel -%endif - -# X11 libraries -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libxi-devel -%endif -%if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: libXi-devel -%endif -%if 0%{?suse_version} == 1140 -BuildRequires: libXi6-devel -%endif - -%description -The Trinity Qt Interface is a library that abstracts Qt from Trinity. -This allows the Trinity code to rapidly port from one version of Qt to another. -This is primarily accomplished by defining old functions in terms of new functions, -although some code has been added for useful functions that are no longer part of Qt. - - -########## - -%package -n %{libtqt4} -Group: System/GUI/Other -Summary: The Trinity Qt Interface Libraries -Provides: libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release} - -Requires: qt3 >= 3.3.8d - -%if 0%{?suse_version} && 0%{?suse_version} < 1300 -Requires: trinity-cmake-macros -%endif - -Obsoletes: trinity-tqtinterface < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-tqtinterface = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libtqt4} -The Trinity Qt Interface is a library that abstracts Qt from Trinity. -This allows the Trinity code to rapidly port from one version of Qt to another. -This is primarily accomplished by defining old functions in terms of new functions, -although some code has been added for useful functions that are no longer part of Qt. - -%files -n %{libtqt4} -%defattr(-,root,root,-) -%{_libdir}/libtqassistantclient.so.4 -%{_libdir}/libtqassistantclient.so.4.2.0 -%{_libdir}/libtqt.so.4 -%{_libdir}/libtqt.so.4.2.0 - -%post -n %{libtqt4} -/sbin/ldconfig || : - -%postun -n %{libtqt4} -/sbin/ldconfig || : - -########## - -%package -n %{libtqt4}-devel -Group: Development/Libraries/X11 -Summary: The Trinity Qt Interface Libraries (Development Files) -Provides: libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -Requires: %{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: qt3-devel >= 3.3.8d -Requires: libuuid-devel - -%if 0%{?suse_version} && 0%{?suse_version} < 1300 -Requires: trinity-cmake-macros -%endif - -Obsoletes: trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release} - -%description -n %{libtqt4}-devel -The Trinity Qt Interface is a library that abstracts Qt from Trinity. -This allows the Trinity code to rapidly port from one version of Qt to another. -This is primarily accomplished by defining old functions in terms of new functions, -although some code has been added for useful functions that are no longer part of Qt. - -%post -n %{libtqt4}-devel -/sbin/ldconfig || : - -%postun -n %{libtqt4}-devel -/sbin/ldconfig || : - -%files -n %{libtqt4}-devel -%defattr(-,root,root,-) -%{_bindir}/convert_qt_tqt1 -%{_bindir}/convert_qt_tqt2 -%{_bindir}/convert_qt_tqt3 -%{_bindir}/dcopidl-tqt -%{_bindir}/dcopidl2cpp-tqt -%{_bindir}/dcopidlng-tqt -%{_bindir}/mcopidl-tqt -%{_bindir}/moc-tqt -%{_bindir}/tmoc -%{_bindir}/tqt-replace -%{_bindir}/tqt-replace-stream -%{_bindir}/uic-tqt -%{_includedir}/tqt/ -%{_libdir}/libtqassistantclient.la -%{_libdir}/libtqassistantclient.so -%{_libdir}/libtqt.la -%{_libdir}/libtqt.so -%{_libdir}/pkgconfig/tqt.pc -%{cmake_modules_dir}/*.cmake - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -# Note: specifying 'QT_LIBRARY_DIR' allow using QT3 libraries under -# another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...) -# Otherwise, it defaults to ${QTDIR}/lib ! -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DQT_PREFIX_DIR=${QTDIR} \ - -DQT_VERSION=3 \ - -DQT_LIBRARY_DIR="${QTLIB:-${QTDIR}/%{_lib}}" \ - \ - -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ - -DPKGCONFIG_INSTALL_DIR="%{_libdir}/pkgconfig" \ - -DINCLUDE_INSTALL_DIR=%{_includedir}/tqt \ - -DLIB_INSTALL_DIR=%{_libdir} \ - -DBIN_INSTALL_DIR=%{_bindir} \ - \ - -DCMAKE_LIBRARY_PATH="%{_libdir}" \ - -DCMAKE_INCLUDE_PATH="%{_includedir}" \ - \ - -DWITH_QT3="ON" \ - -DBUILD_ALL="ON" \ - -DUSE_QT3="ON" \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf "%{?buildroot}" -%__make install DESTDIR="%{?buildroot}" -C build - -# RHEL 5: add newline at end of include files to avoid warnings -%if 0%{?rhel} && 0%{?rhel} <= 5 -for i in %{?buildroot}%{_includedir}/tqt/*.h; do - echo "" >>${i} -done -%endif - -# Install 'cmake' modules for development use -%__mkdir_p "%{?buildroot}%{cmake_modules_dir}" -for i in cmake/modules/*.cmake; do - %__install -m 644 "$i" "%{?buildroot}%{cmake_modules_dir}" -done - - -%clean -%__rm -rf "%{?buildroot}" - - -%changelog diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface.spec index 09c1cab1d..5d873b86a 100644 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface.spec @@ -18,11 +18,12 @@ # BUILD WARNING: # Remove qt-devel and qt3-devel and any kde*-devel on your system ! # Having KDE libraries may cause FTBFS here ! +%global # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tqtinterface %define cmake_modules_dir %{_datadir}/cmake/Modules @@ -77,12 +78,19 @@ BuildRequires: pkgconfig # PTHREAD support -%if 0%{?rhel} >= 5 || 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mgaversion} >= 7 +BuildRequires: %{_lib}npth-devel +%else BuildRequires: pth-devel %endif +%endif %if 0%{?fedora} && 0%{?fedora} <= 26 BuildRequires: pth-devel %endif +%if 0%{?rhel} >= 5 && 0%{?rhel} <= 7 +BuildRequires: pth-devel +%endif %if 0%{?suse_version} && 0%{?suse_version} < 1500 BuildRequires: libpth-devel %endif diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index 88adfbe38..21f1385e5 100755 --- a/redhat/docker/build.sh +++ b/redhat/docker/build.sh @@ -1,23 +1,24 @@ -#!/bin/bash -ex +#!/bin/bash -e DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7" [ -z "${ARCH}" ] && ARCH="x86_64" +[ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" FILE="${HOME}/tde/docker/${IMAGE}.tar.gz" -if [ $(docker images -q "${IMAGE}") ]; then +if [ $(${DOCKER} images -q "${IMAGE}") ]; then echo "Docker image '${IMAGE}' already exists." elif [ -r "${FILE}" ]; then - echo "Importing existing docker image '${FILE}'." - zcat "${FILE}" | docker import - "${IMAGE}" + echo "Importing existing image '${FILE}'." + zcat "${FILE}" | ${DOCKER} image load else echo "Building new Docker image '${IMAGE}'." - docker build -t "${IMAGE}" -f "${DISTRIB}/Dockerfile.${ARCH}" --build-arg TDE_VERSION="${TDE_VERSION}" --build-arg ARCH="${ARCH}" "${DISTRIB}" + ${DOCKER} build -t "${IMAGE}" -f "${DISTRIB}/Dockerfile.${ARCH}" --build-arg TDE_VERSION="${TDE_VERSION}" --build-arg ARCH="${ARCH}" "${DISTRIB}" echo "Saving image to '${FILE}'" - docker save "${IMAGE}" | pigz >"${FILE}" + ${DOCKER} image save "${IMAGE}" | pigz >"${FILE}" fi diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686 index 8b6cbf724..39400e044 100644 --- a/redhat/docker/el5/Dockerfile.i686 +++ b/redhat/docker/el5/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM centos32:5 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.7 ARG ARCH=i686 # Add local repositories diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64 index 84a626539..fc184f677 100644 --- a/redhat/docker/el5/Dockerfile.x86_64 +++ b/redhat/docker/el5/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM centos:5 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 # Add local repositories diff --git a/redhat/docker/el5/packages.trinity b/redhat/docker/el5/packages.trinity index da882fb5c..3e21635b2 100644 --- a/redhat/docker/el5/packages.trinity +++ b/redhat/docker/el5/packages.trinity @@ -63,7 +63,6 @@ gtk+-devel gtk-doc guile-devel hal-devel -heimdal-devel hspell-devel htdig html2ps diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index e8e4dbb8d..8844adabc 100644 --- a/redhat/docker/el6/Dockerfile.i686 +++ b/redhat/docker/el6/Dockerfile.i686 @@ -1,30 +1,64 @@ FROM centos32:6 -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.8 ARG ARCH=i686 -RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf +# Enable proxy +RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" # Add EPEL repository -RUN yum -y install epel-release - -# Add NUX repository -RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm +# Add RPMFUSION repository +RUN rpm -Uvh \ + https://fr2.rpmfind.net/linux/epel/6/x86_64/Packages/e/epel-release-6-8.noarch.rpm \ + https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm # Install Trinity build dependencies -ADD packages.trinity /packages -RUN setarch ${ARCH} yum -y update -RUN setarch ${ARCH} yum -y install $(</packages) +ADD packages /packages +RUN yum -y clean all \ + && setarch ${ARCH} yum -y update \ + && setarch ${ARCH} yum -y install $(</packages) # Add YUM repository for locally built packages WORKDIR /etc/yum.repos.d ADD rpmbuild.repo rpmbuild.repo RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" +# Fix utempter detection +# Distro-specific patches +RUN chmod a+r /usr/libexec/utempter/utempter \ + && sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" \ + && ln -sf libmp4v2.so /usr/lib/libmp4.so + # Add non-root user to build packages -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" + +USER trinity ADD rpmmacros /home/trinity/.rpmmacros -# Distro-specific patches -RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" +# Build supplementary development tools + +RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm + +RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm + +RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-Install-1.06-4.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-Install-*.rpm + +RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm + +RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" \ + && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +RUN setarch i686 rpmbuild --rebuild https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-Getopt-ArgvFile-1.11-24.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-*.rpm + +RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" \ + && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index 9b845631f..3836529c2 100644 --- a/redhat/docker/el6/Dockerfile.x86_64 +++ b/redhat/docker/el6/Dockerfile.x86_64 @@ -1,30 +1,60 @@ FROM centos:6 -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 -RUN echo "proxy=http://proxy:3128" >>/etc/yum.conf - +# Enable proxy # Add EPEL repository -RUN yum -y install epel-release - -# Add NUX repository -RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el6/x86_64/nux-dextop-release-0-2.el6.nux.noarch.rpm - +# Add RPMFUSION repository # Install Trinity build dependencies -ADD packages.trinity /packages -RUN yum -y update -RUN yum -y install $(</packages) +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ + && yum -y clean all \ + && yum -y update \ + && yum -y install epel-release \ + && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \ + && yum -y install $(</packages) # Add YUM repository for locally built packages WORKDIR /etc/yum.repos.d -ADD rpmbuild.repo rpmbuild.repo +COPY rpmbuild.repo rpmbuild.repo RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" +# Fix utempter detection +# Distro-specific patches +RUN chmod a+r /usr/libexec/utempter/utempter \ + && sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" \ + && ln -sf libmp4v2.so /usr/lib64/libmp4.so + # Add non-root user to build packages -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers -ADD rpmmacros /home/trinity/.rpmmacros +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" -# Distro-specific patches -RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +# Build supplementary development tools + +RUN sudo rpm -Uvh http://repo/repo/build-tools/el6/RPMS/x86_64/m4-1.4.16-10.el6.x86_64.rpm + +RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm + +RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-Install-1.06-4.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-Install-*.rpm + +RUN rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm + +RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +RUN rpmbuild --rebuild https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-Getopt-ArgvFile-1.11-24.el7.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-*.rpm + +RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps diff --git a/redhat/docker/el6/centos-6.repo b/redhat/docker/el6/centos-6.repo deleted file mode 100644 index a00a85ad5..000000000 --- a/redhat/docker/el6/centos-6.repo +++ /dev/null @@ -1,30 +0,0 @@ -[centos-6-base] -name=CentOS-6 - Base -baseurl=http://repo/repo/centos/6/os/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 -enabled=1 - -#released updates -[centos-6-updates] -name=CentOS-6 - Updates -baseurl=http://repo/repo/centos/6/updates/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 -enabled=1 - -#additional packages that may be useful -[centos-6-extras] -name=CentOS-6 - Extras -baseurl=http://repo/repo/centos/6/extras/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 -enabled=1 - -#additional packages that extend functionality of existing packages -[centos-6-centosplus] -name=CentOS-6 - Plus -baseurl=http://repo/repo/centos/6/centosplus/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 -enabled=1 diff --git a/redhat/docker/el6/epel-6.repo b/redhat/docker/el6/epel-6.repo deleted file mode 100644 index 24134a301..000000000 --- a/redhat/docker/el6/epel-6.repo +++ /dev/null @@ -1,5 +0,0 @@ -[epel] -name=epel -baseurl=http://repo/repo/epel/6/$basearch/ -enabled=1 -gpgcheck=0 diff --git a/redhat/docker/el6/packages.trinity b/redhat/docker/el6/packages index 4ee743b2a..beeba9fff 100644 --- a/redhat/docker/el6/packages.trinity +++ b/redhat/docker/el6/packages @@ -29,6 +29,7 @@ db4-devel dbus-glib-devel djvulibre djvulibre-devel +docbook2X doxygen e2fsprogs-devel emacs @@ -50,12 +51,12 @@ gcc-gfortran gcc-java gettext-devel glib-devel -gmime-devel gmp-devel gnokii-devel gperf gpgme-devel gphoto2-devel +gpsim-devel GraphicsMagick-devel gsl-devel gstreamer-devel @@ -65,7 +66,6 @@ gtk+-devel gtk-doc guile-devel hal-devel -heimdal-devel hspell-devel htdig html2ps @@ -132,13 +132,14 @@ libXcomposite-devel libXdamage-devel libXdmcp-devel libxkbfile-devel -libXScrnSa +libXScrnSaver libXScrnSaver-devel libxslt-devel libXtst-devel libXv-devel libXxf86dga-devel libXxf86vm-devel +libyaz-devel libzrtpcpp-devel lirc-devel lm_sensors-devel @@ -161,11 +162,30 @@ pam-devel pciutils-devel pcre-devel pcsc-lite-devel +pcsc-perl perl perl-devel +perl(Archive::Zip) +perl(CPAN) +perl(CPANPLUS::Backend) perl(ExtUtils::MakeMaker) +perl(ExtUtils::Embed) +perl(Getopt::ArgvFile) +perl(inc::Module::Install) +perl(IPC::Run3) +perl(JSON) +perl(Module::ScanDeps) +perl(Module::Signature) +perl(prefork) +perl(Test::CPAN::Meta) +perl(Test::MinimumVersion) +perl(Test::More) +perl(Test::Pod) +perl(Test::Pod::Coverage) perl(XML::Parser) +pigz pilot-link-devel +pkgconfig(pygtk-2.0) pkcs11-helper-devel poppler-devel postgresql-devel @@ -179,11 +199,13 @@ ruby-devel sane-backends-devel scons SDL-devel +selinux-policy-devel sip-devel speex-devel sqlite-devel subversion-devel sudo +swig sword-devel t1lib-devel t1utils @@ -202,6 +224,7 @@ wireless-tools-devel xine-lib-devel xmlto xorg-x11-font-utils +xorg-x11-server-utils xscreensaver xscreensaver-extras xulrunner-devel diff --git a/redhat/docker/el6/packages.base b/redhat/docker/el6/packages.base deleted file mode 100644 index 21345a31b..000000000 --- a/redhat/docker/el6/packages.base +++ /dev/null @@ -1,7 +0,0 @@ -bash -perl -setarch -tar -vim-enhanced -yum -yum-plugin-ovl diff --git a/redhat/docker/el6/repoforge-6.repo b/redhat/docker/el6/repoforge-6.repo deleted file mode 100644 index 8747bf2df..000000000 --- a/redhat/docker/el6/repoforge-6.repo +++ /dev/null @@ -1,5 +0,0 @@ -[dag] -name=dag -baseurl=http://repo/repo/repoforge/redhat/el6/en/$basearch/dag/ -enabled=1 -gpgcheck=0 diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index 23b191982..5d1a2e4cd 100644 --- a/redhat/docker/el7/Dockerfile.x86_64 +++ b/redhat/docker/el7/Dockerfile.x86_64 @@ -1,27 +1,48 @@ FROM centos:7 -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 +# Enable proxy # Add EPEL repository -RUN rpm -Uvh https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/epel-release-7-11.noarch.rpm - -# Add NUX repository -RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm - +# Add RPMFUSION repository # Install Trinity build dependencies -ADD packages /packages -RUN yum update -y -RUN yum install -y $(</packages) +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ + && yum -y install epel-release \ + && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm \ + && yum -y clean all \ + && yum -y update \ + && yum -y install $(</packages) # Add YUM repository for locally built packages -ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo -RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" +WORKDIR /etc/yum.repos.d +COPY rpmbuild.repo rpmbuild.repo +RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +# Distro-specific patches +RUN chmod a+r /usr/libexec/utempter/utempter \ + && sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" \ + && ln -sf libmp4v2.so /usr/lib64/libmp4.so # Add non-root user to build packages -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers -ADD rpmmacros /home/trinity/.rpmmacros +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" -# Distro-specific patches -RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +# Build supplementary development tools + +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Everything/source/SRPMS/d/dirmngr-1.1.1-5.fc21.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/dirmngr-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/y/yaz-5.14.11-17.fc30.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/r/rdesktop-1.9.0-2.fc32.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index 60229d64f..7368877e2 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -7,6 +7,7 @@ avahi-devel bind-devel binutils-devel bison +bluez-libs-devel boost-devel bzip2-devel ccache @@ -27,6 +28,7 @@ db4-devel dbus-glib-devel djvulibre djvulibre-devel +docbook2X doxygen emacs esound-devel @@ -61,7 +63,7 @@ gtk2-devel gtk+-devel gtk-doc guile-devel -heimdal-devel +hiredis-devel hspell-devel html2ps icu @@ -97,6 +99,7 @@ libical-devel libidn-devel libksba-devel libmad-devel +libmemcached-devel libmng-devel libmp4v2-devel libmpcdec-devel @@ -106,6 +109,7 @@ libofx-devel libogg-devel libotr-devel libpaper-devel +libpcap-devel libqalculate-devel libraw1394-devel librsvg2-tools @@ -138,6 +142,7 @@ libXxf86vm-devel libusb-devel lirc-devel lm_sensors-devel +logrotate meanwhile-devel mysql-devel neon-devel @@ -156,14 +161,20 @@ pam-devel pciutils-devel pcre-devel pcsc-lite-devel +pcsc-perl perl perl-devel +perl-generators perl(ExtUtils::MakeMaker) +perl(PAR::Packer) perl(XML::Parser) +pigz pilot-link-devel pkcs11-helper-devel +pkgconfig(pygtk-2.0) poppler-devel postgresql-devel +ppp pth-devel pulseaudio-libs-devel qt-devel @@ -176,6 +187,7 @@ ruby-devel sane-backends-devel scons SDL-devel +selinux-policy-devel sip-devel speex-devel sqlite-devel @@ -188,6 +200,7 @@ t1lib-devel t1utils taglib-devel tar +tcl texinfo torsocks transfig diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 new file mode 100644 index 000000000..43f6b7191 --- /dev/null +++ b/redhat/docker/el8/Dockerfile.x86_64 @@ -0,0 +1,97 @@ +FROM centos:8 + +ARG TDE_VERSION=14.0.8 +ARG ARCH=x86_64 + +# Enable custom repository +COPY centos-devel.repo /etc/yum.repos.d/centos-devel.repo + +# Enable proxy +# Install OVL plugin for DNF +# Update distribution packages +# Add EPEL repository +# Add RPMFUSION repository +# Enable supplementary repositories +# Install Trinity build dependencies +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ + && curl -o /usr/lib/python3.6/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \ + && dnf -y update \ + && dnf -y install epel-release \ + && dnf -y install https://download1.rpmfusion.org/free/el/updates/8/x86_64/r/rpmfusion-free-release-8-0.1.noarch.rpm \ + && dnf -y install dnf-plugins-core \ + && dnf config-manager --enable PowerTools \ + && dnf -y --enableplugin=ovl install $(</packages) + +# Add YUM repository for locally built packages +WORKDIR /etc/yum.repos.d +COPY rpmbuild.repo rpmbuild.repo +RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +# Build supplementary development tools + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libofx-0.9.13-2.fc30.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/g/gnuchess-6.2.5-8.fc30.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pilot-link-0.12.5-41.fc30.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pylibacl-0.5.2-11.fc30.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pylibacl-0*.rpm --nodeps + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pyxattr-0.5.6-3.fc30.src.rpm --nocheck \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/python2-pyxattr-0*.rpm --nodeps + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/r/rdiff-backup-1.2.8-31.fc30.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-1*.rpm --nodeps + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-10.fc30.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/s/sword-1.8.1-11.fc30.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/psutils-1.23-15.fc30.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/psutils-1*.rpm + +#RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/j/jasper-2.0.14-8.fc30.src.rpm +#RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/jasper-2*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/w/wireless-tools-29-22.fc30.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm + +RUN rpmbuild --rebuild https://li.nux.ro/download/nux/dextop/el7/SRPMS/libgssglue-0.4-2.el7.nux.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libgssglue{,-devel}-0*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/l/libao-1.2.0-14.fc30.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libao{,-devel}-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/r/rdesktop-1.8.4-3.fc30.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm + +RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-1.015-8.fc30.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Dist-0.49-17.fc30.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Dist-0*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-28.fc30.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Packer-1.047-4.fc30.src.rpm --nocheck \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm diff --git a/redhat/docker/el8/centos-devel.repo b/redhat/docker/el8/centos-devel.repo new file mode 100644 index 000000000..9f2fc0051 --- /dev/null +++ b/redhat/docker/el8/centos-devel.repo @@ -0,0 +1,12 @@ +[centos-devel] +name=centos-devel +baseurl=http://repo/repo/centos-devel/8/$basearch/ +enabled=1 +gpgcheck=0 + +[centos-devel.noarch] +name=centos-devel.noarch +baseurl=http://repo/repo/centos-devel/8/noarch/ +enabled=1 +gpgcheck=0 + diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages new file mode 100644 index 000000000..a9018237e --- /dev/null +++ b/redhat/docker/el8/packages @@ -0,0 +1,205 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bind-devel +binutils-devel +bison +bluez-libs-devel +boost-devel +boost-python3-devel +bzip2-devel +cdparanoia +cdparanoia-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +cpp +cppunit-devel +createrepo +cryptsetup-devel +cups-devel +dbus-glib-devel +docbook2X +doxygen +emacs +exempi-devel +exiv2-devel +fdupes +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-devel +fontforge +fontpackages-devel +fribidi-devel +gamin-devel +gcc +gcc-c++ +gcc-gfortran +gettext-devel +giflib-devel +glibmm24-devel +gmp-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk-doc +guile-devel +hspell-devel +icu +ImageMagick-devel +imake +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.8.0-openjdk-devel +java-devel +java-openjdk +kernel +lame-devel +libacl-devel +libarchive-devel +libassuan-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-devel +libdb-cxx-devel +libdvdread-devel +libfontenc-devel +libgpod-devel +libgsf-devel +libical-devel +libidn-devel +libksba-devel +libmad-devel +libmemcached-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libnsl2-devel +libogg-devel +libotr-devel +libpaper-devel +libpcap-devel +libraw1394-devel +librsvg2-tools +librsync-devel +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libutempter-devel +libv4l-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXcomposite-devel +libXdamage-devel +libXdmcp-devel +libxkbfile-devel +libxml++-devel +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libudisks2-devel +libusb-devel +lirc-devel +lm_sensors-devel +mysql-devel +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +OpenEXR-devel +openldap-devel +opensc +opensp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +perl +perl-devel +perl-generators +perl(ExtUtils::MakeMaker) +perl(inc::Module::Install) +perl(IPC::Run3) +perl(Module::Signature) +perl(Test::Pod) +perl(Test::Pod::Coverage) +perl(XML::Parser) +pigz +pkcs11-helper-devel +pkgconfig(pygtk-2.0) +poppler-devel +postgresql +postgresql-devel +postgresql-server-devel +ppp +pulseaudio-libs-devel +python2 +python2-devel +python3 +python3-devel +readline-devel +recode +redhat-rpm-config +redis +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +SDL-devel +selinux-policy-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +systemd-devel +taglib-devel +tcl +texinfo +torsocks +transfig +unixODBC-devel +usbutils +valgrind +wget +wireless-tools-devel +xine-lib-devel +xmlto +xorg-x11-font-utils +xz-devel diff --git a/redhat/docker/el8/rpmbuild.repo b/redhat/docker/el8/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/el8/rpmbuild.repo @@ -0,0 +1,11 @@ +[rpmbuild.${ARCH}] +name=rpmbuild.${ARCH} +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} +enabled=1 +gpgcheck=0 + +[rpmbuild.noarch] +name=rpmbuild.noarch +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/el8/rpmmacros b/redhat/docker/el8/rpmmacros new file mode 100644 index 000000000..c6a7ce03a --- /dev/null +++ b/redhat/docker/el8/rpmmacros @@ -0,0 +1,3 @@ +%dist .el8 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/f25/Dockerfile.x86_64 b/redhat/docker/f25/Dockerfile.x86_64 index c5338a77d..d171bac1b 100644 --- a/redhat/docker/f25/Dockerfile.x86_64 +++ b/redhat/docker/f25/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:25 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f25/packages b/redhat/docker/f25/packages index e7a74d19f..7578b0a9c 100644 --- a/redhat/docker/f25/packages +++ b/redhat/docker/f25/packages @@ -62,7 +62,6 @@ gtk3-devel gtk+-devel gtk-doc guile-devel -heimdal-devel hspell-devel htdig html2ps diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686 index ea78581fa..199c90224 100644 --- a/redhat/docker/f26/Dockerfile.i686 +++ b/redhat/docker/f26/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:26 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.7 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f26/Dockerfile.x86_64 b/redhat/docker/f26/Dockerfile.x86_64 index 3899d1220..5b2b15f6b 100644 --- a/redhat/docker/f26/Dockerfile.x86_64 +++ b/redhat/docker/f26/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:26 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f26/packages b/redhat/docker/f26/packages index 28da2c8db..fd881d1fb 100644 --- a/redhat/docker/f26/packages +++ b/redhat/docker/f26/packages @@ -62,7 +62,6 @@ gtk3-devel gtk+-devel gtk-doc guile-devel -heimdal-devel hspell-devel htdig html2ps diff --git a/redhat/docker/f27/Dockerfile.i686 b/redhat/docker/f27/Dockerfile.i686 index 01f6f764f..cd4e731bd 100644 --- a/redhat/docker/f27/Dockerfile.i686 +++ b/redhat/docker/f27/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:27 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.7 ARG ARCH=i686 # Add RPMFUSION repository diff --git a/redhat/docker/f27/Dockerfile.x86_64 b/redhat/docker/f27/Dockerfile.x86_64 index e2ecadf4d..63adbe269 100644 --- a/redhat/docker/f27/Dockerfile.x86_64 +++ b/redhat/docker/f27/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:27 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 # Add RPMFUSION repository diff --git a/redhat/docker/f27/packages b/redhat/docker/f27/packages index 658696a81..4ed40b178 100644 --- a/redhat/docker/f27/packages +++ b/redhat/docker/f27/packages @@ -62,7 +62,6 @@ gtk3-devel gtk+-devel gtk-doc guile-devel -heimdal-devel hspell-devel htdig html2ps diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686 index 1927d264b..0c717477d 100644 --- a/redhat/docker/f28/Dockerfile.i686 +++ b/redhat/docker/f28/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:28 -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.7 ARG ARCH=i686 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f28/Dockerfile.x86_64 b/redhat/docker/f28/Dockerfile.x86_64 index 6c26addda..e5875e069 100644 --- a/redhat/docker/f28/Dockerfile.x86_64 +++ b/redhat/docker/f28/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:28 -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f28/packages b/redhat/docker/f28/packages index 6ada73c34..39096bfee 100644 --- a/redhat/docker/f28/packages +++ b/redhat/docker/f28/packages @@ -63,7 +63,6 @@ gtk3-devel gtk+-devel gtk-doc guile-devel -heimdal-devel hspell-devel htdig html2ps diff --git a/redhat/docker/f29/Dockerfile.i686 b/redhat/docker/f29/Dockerfile.i686 index 914c600f5..20ea16210 100644 --- a/redhat/docker/f29/Dockerfile.i686 +++ b/redhat/docker/f29/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:29 -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.7 ARG ARCH=i686 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f29/Dockerfile.x86_64 b/redhat/docker/f29/Dockerfile.x86_64 index a4b19cebb..b95e32f0a 100644 --- a/redhat/docker/f29/Dockerfile.x86_64 +++ b/redhat/docker/f29/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:29 -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" diff --git a/redhat/docker/f29/packages b/redhat/docker/f29/packages index ddaabadc8..d15aab174 100644 --- a/redhat/docker/f29/packages +++ b/redhat/docker/f29/packages @@ -63,7 +63,6 @@ gtk3-devel gtk+-devel gtk-doc guile-devel -heimdal-devel hspell-devel htdig html2ps diff --git a/redhat/docker/f30/Dockerfile.i686 b/redhat/docker/f30/Dockerfile.i686 new file mode 100644 index 000000000..9be8fdbfc --- /dev/null +++ b/redhat/docker/f30/Dockerfile.i686 @@ -0,0 +1,29 @@ +FROM fedora32:30 + +ARG TDE_VERSION=14.0.7 +ARG ARCH=i686 + +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" + +# Fix DNF database corruption +RUN setarch i686 dnf -y install dnf-plugin-ovl findutils + +# Add RPMFUSION repository +RUN setarch i686 dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-30.noarch.rpm + +# Install Trinity build dependencies +RUN setarch i686 dnf -y --enableplugin=ovl update +ADD packages /packages +RUN setarch i686 dnf -y --enableplugin=ovl install $(</packages) + +# Add YUM repository for locally built packages +ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo +RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity +RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +ADD rpmmacros /home/trinity/.rpmmacros diff --git a/redhat/docker/f30/Dockerfile.x86_64 b/redhat/docker/f30/Dockerfile.x86_64 new file mode 100644 index 000000000..31b7fb112 --- /dev/null +++ b/redhat/docker/f30/Dockerfile.x86_64 @@ -0,0 +1,29 @@ +FROM fedora:30 + +ARG TDE_VERSION=14.0.7 +ARG ARCH=x86_64 + +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" + +# Fix DNF database corruption +RUN dnf -y install dnf-plugin-ovl findutils + +# Add RPMFUSION repository +RUN dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-30.noarch.rpm + +# Install Trinity build dependencies +RUN dnf -y --enableplugin=ovl update +ADD packages /packages +RUN dnf -y --enableplugin=ovl install $(</packages) + +# Add YUM repository for locally built packages +ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo +RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity +RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +ADD rpmmacros /home/trinity/.rpmmacros diff --git a/redhat/packages.f24 b/redhat/docker/f30/packages index c659b7389..8b9d76b4c 100644 --- a/redhat/packages.f24 +++ b/redhat/docker/f30/packages @@ -29,12 +29,15 @@ db4-devel dbus-glib-devel djvulibre djvulibre-devel +dnf-plugin-ovl +docbook2X doxygen dssi-devel esound-devel exempi-devel exiv2-devel fdupes +fedora-rpm-macros ffmpeg-devel fftw-devel file-devel @@ -54,6 +57,7 @@ gperf gpgme-devel gphoto2-devel GraphicsMagick-devel +graphviz gsl-devel gstreamer1-devel gstreamer1-plugins-base-devel @@ -62,7 +66,7 @@ gtk3-devel gtk+-devel gtk-doc guile-devel -heimdal-devel +harfbuzz-devel hspell-devel htdig html2ps @@ -105,6 +109,7 @@ libmpcdec-devel libmtp-devel libmusicbrainz5-devel libnjb-devel +libnsl2-devel libofx-devel libogg-devel libotr-devel @@ -117,14 +122,17 @@ librsvg2-tools libsamplerate-devel libsmbclient-devel libsndfile-devel +libssh-devel libssh2-devel libtheora-devel libtiff-devel +libtirpc-devel libtool libtool-ltdl-devel libudev-devel libudisks2-devel libutempter-devel +libuuid-devel libv4l-devel libvisual-devel libvncserver-devel @@ -142,6 +150,7 @@ libXtst-devel libXv-devel libXxf86dga-devel libXxf86vm-devel +libyaz-devel libzrtpcpp-devel lirc-devel lm_sensors-devel @@ -151,11 +160,13 @@ mysql-devel nas-devel neon-devel netpbm-progs +NetworkManager-libnm-devel net-snmp-devel net-tools -NetworkManager-glib-devel +nspr-devel ocaml ocaml(compiler) +ocaml-facile-devel OpenEXR-devel openldap-devel opensc @@ -166,36 +177,46 @@ pam-devel pciutils-devel pcre-devel pcsc-lite-devel +pcsc-perl perl perl-devel perl(ExtUtils::MakeMaker) +perl(PAR::Packer) perl(XML::Parser) pilot-link-devel pkcs11-helper-devel +pkgconfig(pygtk-2.0) poppler-devel postgresql postgresql-devel -pth-devel +postgresql-server-devel pulseaudio-libs-devel +python +python3-devel qt4-devel recode redhat-rpm-config +rpcgen rpm-build ruby ruby-devel sane-backends-devel scons SDL-devel +selinux-policy-devel sip-devel speex-devel sqlite-devel subversion-devel +sudo +swig sword-devel t1lib-devel t1utils taglib-devel -tar texinfo +texlive-newunicodechar +torsocks transfig udisks-devel unixODBC-devel @@ -210,5 +231,5 @@ xmlto xorg-x11-font-utils xscreensaver xscreensaver-extras -xulrunner-devel xz-devel +yum-plugin-ovl diff --git a/redhat/docker/f30/rpmbuild.repo b/redhat/docker/f30/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f30/rpmbuild.repo @@ -0,0 +1,11 @@ +[rpmbuild.${ARCH}] +name=rpmbuild.${ARCH} +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} +enabled=1 +gpgcheck=0 + +[rpmbuild.noarch] +name=rpmbuild.noarch +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/f30/rpmmacros b/redhat/docker/f30/rpmmacros new file mode 100644 index 000000000..55a9b7b5a --- /dev/null +++ b/redhat/docker/f30/rpmmacros @@ -0,0 +1,3 @@ +%dist .fc30 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/f31/Dockerfile.x86_64 b/redhat/docker/f31/Dockerfile.x86_64 new file mode 100644 index 000000000..4efdd8769 --- /dev/null +++ b/redhat/docker/f31/Dockerfile.x86_64 @@ -0,0 +1,29 @@ +FROM fedora:31 + +ARG TDE_VERSION=14.0.8 +ARG ARCH=x86_64 + +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" + +# Fix DNF database corruption +RUN dnf -y install dnf-plugin-ovl findutils + +# Add RPMFUSION repository +RUN dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-31.noarch.rpm + +# Install Trinity build dependencies +RUN dnf -y --enableplugin=ovl update +ADD packages /packages +RUN dnf -y --enableplugin=ovl install $(</packages) + +# Add YUM repository for locally built packages +ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo +RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity +RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +ADD rpmmacros /home/trinity/.rpmmacros diff --git a/redhat/packages.f23 b/redhat/docker/f31/packages index c24fc38cb..552cc3df5 100644 --- a/redhat/packages.f23 +++ b/redhat/docker/f31/packages @@ -8,9 +8,9 @@ bind-devel binutils-devel bison boost-devel +boost-python3-devel bzip2-devel ccache -ccrtp-devel cdparanoia cdparanoia-devel chmlib-devel @@ -19,7 +19,6 @@ clamav clamav-devel clucene-core-devel cmake -commoncpp2-devel cpp cppunit-devel createrepo @@ -29,12 +28,15 @@ db4-devel dbus-glib-devel djvulibre djvulibre-devel +dnf-plugin-ovl +docbook2X doxygen dssi-devel esound-devel exempi-devel exiv2-devel fdupes +fedora-rpm-macros ffmpeg-devel fftw-devel file-devel @@ -54,6 +56,7 @@ gperf gpgme-devel gphoto2-devel GraphicsMagick-devel +graphviz gsl-devel gstreamer1-devel gstreamer1-plugins-base-devel @@ -62,7 +65,7 @@ gtk3-devel gtk+-devel gtk-doc guile-devel -heimdal-devel +harfbuzz-devel hspell-devel htdig html2ps @@ -103,8 +106,9 @@ libmng-devel libmp4v2-devel libmpcdec-devel libmtp-devel -libmusicbrainz-devel +libmusicbrainz5-devel libnjb-devel +libnsl2-devel libofx-devel libogg-devel libotr-devel @@ -117,15 +121,17 @@ librsvg2-tools libsamplerate-devel libsmbclient-devel libsndfile-devel +libssh-devel libssh2-devel libtheora-devel libtiff-devel +libtirpc-devel libtool libtool-ltdl-devel -libtunepimp-devel libudev-devel libudisks2-devel libutempter-devel +libuuid-devel libv4l-devel libvisual-devel libvncserver-devel @@ -143,6 +149,7 @@ libXtst-devel libXv-devel libXxf86dga-devel libXxf86vm-devel +libyaz-devel libzrtpcpp-devel lirc-devel lm_sensors-devel @@ -152,11 +159,13 @@ mysql-devel nas-devel neon-devel netpbm-progs +NetworkManager-libnm-devel net-snmp-devel net-tools -NetworkManager-glib-devel +nspr-devel ocaml ocaml(compiler) +ocaml-facile-devel OpenEXR-devel openldap-devel opensc @@ -167,35 +176,46 @@ pam-devel pciutils-devel pcre-devel pcsc-lite-devel +pcsc-perl perl perl-devel perl(ExtUtils::MakeMaker) +perl(PAR::Packer) perl(XML::Parser) pilot-link-devel pkcs11-helper-devel +pkgconfig(pygtk-2.0) poppler-devel +postgresql postgresql-devel -pth-devel +postgresql-server-devel pulseaudio-libs-devel +python +python3-devel qt4-devel recode redhat-rpm-config +rpcgen rpm-build ruby ruby-devel sane-backends-devel scons SDL-devel +selinux-policy-devel sip-devel speex-devel sqlite-devel subversion-devel +sudo +swig sword-devel t1lib-devel t1utils taglib-devel -tar texinfo +texlive-newunicodechar +torsocks transfig udisks-devel unixODBC-devel @@ -210,5 +230,4 @@ xmlto xorg-x11-font-utils xscreensaver xscreensaver-extras -xulrunner-devel xz-devel diff --git a/redhat/docker/f31/rpmbuild.repo b/redhat/docker/f31/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f31/rpmbuild.repo @@ -0,0 +1,11 @@ +[rpmbuild.${ARCH}] +name=rpmbuild.${ARCH} +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} +enabled=1 +gpgcheck=0 + +[rpmbuild.noarch] +name=rpmbuild.noarch +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/f31/rpmmacros b/redhat/docker/f31/rpmmacros new file mode 100644 index 000000000..d9f3af80c --- /dev/null +++ b/redhat/docker/f31/rpmmacros @@ -0,0 +1,3 @@ +%dist .fc31 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/f32/Dockerfile.x86_64 b/redhat/docker/f32/Dockerfile.x86_64 new file mode 100644 index 000000000..38326e028 --- /dev/null +++ b/redhat/docker/f32/Dockerfile.x86_64 @@ -0,0 +1,28 @@ +FROM fedora:32 + +ARG TDE_VERSION=14.0.8 +ARG ARCH=x86_64 + +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" + +# Fix DNF database corruption +RUN dnf -y install dnf-plugin-ovl findutils + +# Add RPMFUSION repository +RUN dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-32.noarch.rpm + +# Install Trinity build dependencies +RUN dnf -y --enableplugin=ovl update +ADD packages /packages +RUN dnf -y --enableplugin=ovl install $(</packages) + +# Add YUM repository for locally built packages +ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo +RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +COPY rpmmacros /home/trinity/.rpmmacros diff --git a/redhat/packages.f21 b/redhat/docker/f32/packages index 263098527..67b320151 100644 --- a/redhat/packages.f21 +++ b/redhat/docker/f32/packages @@ -8,58 +8,73 @@ bind-devel binutils-devel bison boost-devel +boost-python3-devel bzip2-devel ccache -ccrtp-devel cdparanoia cdparanoia-devel +chmlib-devel chrpath +clamav +clamav-devel clucene-core-devel cmake -commoncpp2-devel cpp cppunit-devel createrepo +cryptsetup-devel cups-devel db4-devel dbus-glib-devel djvulibre djvulibre-devel +dnf-plugin-ovl +docbook2X doxygen dssi-devel esound-devel +exempi-devel exiv2-devel fdupes +fedora-rpm-macros ffmpeg-devel fftw-devel file-devel flac-devel flex-static +fontpackages-devel fribidi-devel gamin-devel gcc gcc-c++ gettext-devel +giflib-devel glib-devel +gmime-devel gmp-devel gnokii-devel gperf gpgme-devel gphoto2-devel GraphicsMagick-devel +graphviz gsl-devel -gstreamer-devel -gstreamer-plugins-base-devel +gstreamer1-devel +gstreamer1-plugins-base-devel gtk2-devel +gtk3-devel gtk+-devel gtk-doc guile-devel +harfbuzz-devel hspell-devel +htdig html2ps icu ImageMagick-devel imake -imlib-devel +imlib2-devel +intltool jack-audio-connection-kit-devel jasper-devel java-1.8.0-openjdk-devel @@ -68,11 +83,11 @@ java-openjdk lame-devel lcms-devel libacl-devel -libart_lgpl-devel libblkid-devel libcap-devel libcdio-devel libcdio-paranoia-devel +libconfig-devel libcurl-devel libdb-cxx-devel libdb-devel @@ -91,29 +106,35 @@ libmng-devel libmp4v2-devel libmpcdec-devel libmtp-devel -libmusicbrainz-devel +libmusicbrainz5-devel libnjb-devel +libnsl2-devel libofx-devel libogg-devel libotr-devel libpaper-devel libpqxx-devel +libqalculate-devel libraw1394-devel librsvg2 librsvg2-tools libsamplerate-devel libsmbclient-devel libsndfile-devel +libssh-devel libssh2-devel libtheora-devel libtiff-devel +libtirpc-devel libtool libtool-ltdl-devel -libtunepimp-devel libudev-devel +libudisks2-devel libutempter-devel +libuuid-devel libv4l-devel libvisual-devel +libvncserver-devel libvorbis-devel libwmf-devel libwpd-devel @@ -128,6 +149,7 @@ libXtst-devel libXv-devel libXxf86dga-devel libXxf86vm-devel +libyaz-devel libzrtpcpp-devel lirc-devel lm_sensors-devel @@ -137,13 +159,16 @@ mysql-devel nas-devel neon-devel netpbm-progs +NetworkManager-libnm-devel net-snmp-devel net-tools -NetworkManager-glib-devel +nspr-devel ocaml ocaml(compiler) +ocaml-facile-devel OpenEXR-devel openldap-devel +opensc openslp-devel opensp-devel ortp-devel @@ -151,37 +176,52 @@ pam-devel pciutils-devel pcre-devel pcsc-lite-devel +pcsc-perl perl perl-devel perl(ExtUtils::MakeMaker) +perl(PAR::Packer) perl(XML::Parser) pilot-link-devel +pkcs11-helper-devel +pkgconfig(pygtk-2.0) poppler-devel +postgresql postgresql-devel -pth-devel +postgresql-server-devel pulseaudio-libs-devel +python +python3-devel +qt4-devel recode redhat-rpm-config +rpcgen rpm-build ruby ruby-devel sane-backends-devel scons SDL-devel -sip-devel +selinux-policy-devel speex-devel sqlite-devel subversion-devel +sudo +swig sword-devel t1lib-devel t1utils taglib-devel -tar +texinfo +texlive-newunicodechar +torsocks transfig udisks-devel unixODBC-devel +usbutils valgrind wireless-tools-devel +xbase-devel xine-lib-devel xmedcon xmedcon-devel @@ -189,19 +229,4 @@ xmlto xorg-x11-font-utils xscreensaver xscreensaver-extras -xulrunner-devel xz-devel -texinfo -fontpackages-devel -libudisks2-devel -htdig -libconfig-devel -gtk3-devel -usbutils -gmime-devel -intltool -clamav -clamav-devel -xbase-devel -sqlite2-devel -imlib2-devel diff --git a/redhat/docker/f32/rpmbuild.repo b/redhat/docker/f32/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f32/rpmbuild.repo @@ -0,0 +1,11 @@ +[rpmbuild.${ARCH}] +name=rpmbuild.${ARCH} +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} +enabled=1 +gpgcheck=0 + +[rpmbuild.noarch] +name=rpmbuild.noarch +baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +enabled=1 +gpgcheck=0 diff --git a/redhat/docker/f32/rpmmacros b/redhat/docker/f32/rpmmacros new file mode 100644 index 000000000..fe41a3f29 --- /dev/null +++ b/redhat/docker/f32/rpmmacros @@ -0,0 +1,3 @@ +%dist .fc32 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/mga5/Dockerfile.x86_64 b/redhat/docker/mga5/Dockerfile.x86_64 index 693b30b4f..a9df3587f 100644 --- a/redhat/docker/mga5/Dockerfile.x86_64 +++ b/redhat/docker/mga5/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM mageia:5.1 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 # Reset URPMI repositories to default diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686 index 956755001..3b98ac460 100644 --- a/redhat/docker/mga6/Dockerfile.i686 +++ b/redhat/docker/mga6/Dockerfile.i686 @@ -1,35 +1,47 @@ FROM mageia32:6 -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.8 ARG ARCH=i686 # Reset URPMI repositories to default -RUN urpmi.removemedia -a -RUN urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST' - # Enable more URPMI repositories -RUN sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" +RUN urpmi.removemedia -a \ + && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6/i586/ \ + && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" # Update distribution -RUN urpmi.update -a -RUN urpmi --auto-select --auto - # Install Trinity build dependencies -ADD packages.${ARCH} /etc/urpmi/packages -RUN while ! urpmi --auto $(</etc/urpmi/packages); do urpmi.update -a; done +ADD packages.${ARCH} /packages +RUN urpmi.update -a \ + && urpmi --auto-select --auto \ + && urpmi --auto $(</packages) -# Add rpmbuild repositories -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch -RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN urpmi.addmedia rpmbuild.${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch -RUN urpmi.addmedia rpmbuild.noarch /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +# Enable ccache +RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" + +# Fix poppler include causing FTBFS +RUN sed -i "/usr/include/poppler/PDFDoc.h" -e "/^#define PDFDOC_H/ s|$|\n#define nullptr NULL|" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter # Add non-root user to build packages -RUN rm -rf /home/trinity -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +RUN rm -rf /home/trinity \ + && useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" + +# Configure user trinity +USER trinity ADD rpmmacros /home/trinity/.rpmmacros -# Enable ccache -RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" +# Add rpmbuild repositories +RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch + +# Build development packages that are missing +RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6.1/SRPMS/core/release/perl-PAR-Packer-1.32.0-1.mga6.src.rpm \ + && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" diff --git a/redhat/docker/mga6/Dockerfile.x86_64 b/redhat/docker/mga6/Dockerfile.x86_64 index 8a1048fe8..d8d826d48 100644 --- a/redhat/docker/mga6/Dockerfile.x86_64 +++ b/redhat/docker/mga6/Dockerfile.x86_64 @@ -1,35 +1,47 @@ FROM mageia:6 -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 # Reset URPMI repositories to default -RUN urpmi.removemedia -a -RUN urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST' - # Enable more URPMI repositories -RUN sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" +RUN urpmi.removemedia -a \ + && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6/x86_64/ \ + && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" # Update distribution -RUN urpmi.update -a -RUN urpmi --auto-select --auto - # Install Trinity build dependencies -ADD packages.${ARCH} /etc/urpmi/packages -RUN while ! urpmi --auto $(</etc/urpmi/packages); do urpmi.update -a; done +ADD packages.${ARCH} /packages +RUN urpmi.update -a \ + && urpmi --auto-select --auto \ + && urpmi --auto $(</packages) -# Add rpmbuild repositories -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch -RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN urpmi.addmedia rpmbuild.${ARCH} /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -RUN genhdlist2 --allow-empty-media /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch -RUN urpmi.addmedia rpmbuild.noarch /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch +# Enable ccache +RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" + +# Fix poppler include causing FTBFS +RUN sed -i "/usr/include/poppler/PDFDoc.h" -e "/^#define PDFDOC_H/ s|$|\n#define nullptr NULL|" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter # Add non-root user to build packages -RUN rm -rf /home/trinity -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +RUN rm -rf /home/trinity \ + && useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" + +# Configure user trinity +USER trinity ADD rpmmacros /home/trinity/.rpmmacros -# Enable ccache -RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" +# Add rpmbuild repositories +RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch + +# Build development packages that are missing +RUN rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/6.1/SRPMS/core/release/perl-PAR-Packer-1.32.0-1.mga6.src.rpm \ + && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686 index 973e8b7b4..24079d712 100644 --- a/redhat/docker/mga6/packages.i686 +++ b/redhat/docker/mga6/packages.i686 @@ -17,12 +17,14 @@ clamav-devel cmake ctags cups-devel +curl curl-devel db5-devel dbus-devel dbus-glib dbus-glib-devel djvulibre +docbook2x docbook-dtd412-xml docbook-style-xsl docbook-utils @@ -54,6 +56,7 @@ gtk+3.0-devel gtk-doc hspell-devel hunspell-en +iceauth ImageMagick-devel imake imlib2-devel @@ -84,9 +87,9 @@ libgstreamer-plugins-base1.0-devel libinotifytools-devel libjasper-devel libjpeg-devel -libmp3lame-devel liblua-devel libmad-devel +libmp3lame-devel libpaper-devel libpkcs11-helper-devel libpoppler-devel @@ -95,9 +98,9 @@ libsane1-devel libt1lib-devel libtiff-devel libtwolame-devel -libutempter libudev-devel libusb1.0-devel +libutempter0 libutempter-devel libv4l-devel libxaw-devel @@ -119,13 +122,13 @@ libdvdread-devel libffmpeg-devel libflac-devel libflac++-devel -libidn-devel libgadu-devel libgpod-devel libgsf-devel libhd-devel libical-devel libice-devel +libidn-devel libifp-devel libinotifytools-devel libiodbc-devel @@ -155,6 +158,7 @@ libsndfile-devel libt1lib-devel libtheora-devel libungif-devel +libutempter libvisual-devel libvorbis-devel libwmf-devel @@ -191,18 +195,26 @@ openldap-servers-devel opensc openslp-devel opensp-devel +openssh-clients optipng pam-devel pciutils-devel perl-devel +perl(Archive::Zip) +perl(Getopt::ArgvFile) +perl(Module::ScanDeps) +perl(PAR) +perl(PAR::Dist) perl(XML::Parser) pilot-link-devel pinentry-gtk2 pkgconfig(audiofile) pkgconfig(libpng16) +pkgconfig(pygtk-2.0) polkit-agent-none postgresql9.4 postgresql9.4-devel +ppp pth-devel python-devel python-sip @@ -217,8 +229,9 @@ SDL-devel speex-devel sqlite3-devel sqlite-devel -sudo +sshfs-fuse subversion-devel +sudo sword-devel taglib-devel torsocks diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64 index 996963cf2..edf18316c 100644 --- a/redhat/docker/mga6/packages.x86_64 +++ b/redhat/docker/mga6/packages.x86_64 @@ -17,12 +17,14 @@ clamav-devel cmake ctags cups-devel +curl curl-devel db5-devel dbus-devel dbus-glib dbus-glib-devel djvulibre +docbook2x docbook-dtd412-xml docbook-style-xsl docbook-utils @@ -54,6 +56,7 @@ gtk+3.0-devel gtk-doc hspell-devel hunspell-en +iceauth ImageMagick-devel imake imlib2-devel @@ -84,9 +87,9 @@ lib64gstreamer-plugins-base1.0-devel lib64inotifytools-devel lib64jasper-devel lib64jpeg-devel -lib64mp3lame-devel lib64lua-devel lib64mad-devel +lib64mp3lame-devel lib64paper-devel lib64pkcs11-helper-devel lib64poppler-devel @@ -97,6 +100,7 @@ lib64tiff-devel lib64twolame-devel lib64udev-devel lib64usb1.0-devel +lib64utempter0 lib64utempter-devel lib64v4l-devel lib64xaw-devel @@ -118,13 +122,13 @@ libdvdread-devel libffmpeg-devel libflac-devel libflac++-devel -libidn-devel libgadu-devel libgpod-devel libgsf-devel libhd-devel libical-devel libice-devel +libidn-devel libifp-devel libinotifytools-devel libiodbc-devel @@ -154,6 +158,7 @@ libsndfile-devel libt1lib-devel libtheora-devel libungif-devel +libutempter libvisual-devel libvorbis-devel libwmf-devel @@ -190,18 +195,26 @@ openldap-servers-devel opensc openslp-devel opensp-devel +openssh-clients optipng pam-devel pciutils-devel perl-devel +perl(Archive::Zip) +perl(Getopt::ArgvFile) +perl(Module::ScanDeps) +perl(PAR) +perl(PAR::Dist) perl(XML::Parser) pilot-link-devel pinentry-gtk2 pkgconfig(audiofile) pkgconfig(libpng16) +pkgconfig(pygtk-2.0) polkit-agent-none postgresql9.4 postgresql9.4-devel +ppp pth-devel python-devel python-sip @@ -216,8 +229,9 @@ SDL-devel speex-devel sqlite3-devel sqlite-devel -sudo +sshfs-fuse subversion-devel +sudo sword-devel taglib-devel torsocks diff --git a/redhat/docker/mga6/rpmmacros b/redhat/docker/mga6/rpmmacros index 87fb3a9b9..427abf5c4 100644 --- a/redhat/docker/mga6/rpmmacros +++ b/redhat/docker/mga6/rpmmacros @@ -1,3 +1,4 @@ %dist .mga6 %_smp_mflags -j8 %jobs 8 +%_program_prefix "" diff --git a/redhat/docker/mga7/Dockerfile.i686 b/redhat/docker/mga7/Dockerfile.i686 new file mode 100644 index 000000000..991ee2320 --- /dev/null +++ b/redhat/docker/mga7/Dockerfile.i686 @@ -0,0 +1,44 @@ +FROM mageia32:7 + +ARG TDE_VERSION=14.0.8 +ARG ARCH=i686 + +# Reset URPMI repositories to default +# Enable more URPMI repositories +RUN urpmi.removemedia -a \ + && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7/i586/ \ + && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" + +# Update distribution +# Install Trinity build dependencies +ADD packages.${ARCH} /packages +RUN urpmi.update -a \ + && urpmi --auto-select --auto \ + && urpmi --auto $(</packages) + +# Enable ccache +RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + +# Add non-root user to build packages +RUN rm -rf /home/trinity \ + && useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" + +# Configure user trinity +USER trinity +ADD rpmmacros /home/trinity/.rpmmacros + +# Add rpmbuild repositories +RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch + +# Build development packages that are missing +RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/perl-PAR-Packer-1.47.0-2.mga7.src.rpm \ + && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" diff --git a/redhat/docker/mga7/Dockerfile.x86_64 b/redhat/docker/mga7/Dockerfile.x86_64 new file mode 100644 index 000000000..026549071 --- /dev/null +++ b/redhat/docker/mga7/Dockerfile.x86_64 @@ -0,0 +1,44 @@ +FROM mageia:7 + +ARG TDE_VERSION=14.0.8 +ARG ARCH=x86_64 + +# Reset URPMI repositories to default +# Enable more URPMI repositories +RUN urpmi.removemedia -a \ + && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7/x86_64/ \ + && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" + +# Update distribution +# Install Trinity build dependencies +ADD packages.${ARCH} /packages +RUN urpmi.update -a \ + && urpmi --auto-select --auto \ + && urpmi --auto $(</packages) + +# Enable ccache +RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + +# Add non-root user to build packages +RUN rm -rf /home/trinity \ + && useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" + +# Configure user trinity +USER trinity +ADD rpmmacros /home/trinity/.rpmmacros + +# Add rpmbuild repositories +RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && sudo urpmi.addmedia rpmbuild.${ARCH} ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && genhdlist2 --allow-empty-media --clean ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch + +# Build development packages that are missing +RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/perl-PAR-Packer-1.47.0-2.mga7.src.rpm \ + && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm" diff --git a/redhat/packages.mga b/redhat/docker/mga7/packages.i686 index bc3ae9dbe..cc695fb73 100644 --- a/redhat/packages.mga +++ b/redhat/docker/mga7/packages.i686 @@ -1,23 +1,21 @@ -GraphicsMagick-devel -ImageMagick-devel -NetworkManager-glib-devel -OpenEXR-devel -SDL-devel -X11-devel +advancecomp alsa-lib-devel aspell aspell-devel +aspell-en audiofile-devel bind-devel bison boost-devel bzip2-devel ccache -ccrtp-devel cdparanoia +chmlib-devel chrpath +clamav +clamav-devel cmake -cmake +ctags cups-devel curl-devel db5-devel @@ -25,128 +23,132 @@ dbus-devel dbus-glib dbus-glib-devel djvulibre +docbook2x docbook-dtd412-xml docbook-style-xsl docbook-utils doxygen drakconf dssi-devel -esound-devel +exempi-devel expat-devel +fdupes fftw-devel +firebird-devel flex fontconfig-devel -freetype-devel freetype2-devel +freetype-devel fribidi-devel gamin-devel gettext-devel glib2-devel +gmime-devel gnokii-devel gperf gpgme-devel gphoto2-devel +GraphicsMagick-devel gsl-devel -gtk-doc gtk2-devel -hal-devel +gtk+3.0-devel +gtk-doc hspell-devel +hunspell-en +iceauth +ImageMagick-devel imake -imlib1-devel -java-1.6.0-openjdk-devel -java-1.7.0-openjdk-devel -java-devel -java-openjdk +imlib2-devel +intltool +java-1.8.0-openjdk +java-1.8.0-openjdk-devel karma-sharp -lib64OpenSP5-devel -lib64binutils-devel -lib64clucene-devel -lib64commoncpp-devel -lib64curl-devel -lib64dvdread-devel -lib64exiv2-devel -lib64expat1-devel -lib64ffmpeg-devel -lib64flac++-devel -lib64flac-devel -lib64gstreamer0.10-devel -lib64inotifytools-devel -lib64iw29-devel -lib64jasper-devel -lib64lame-devel -lib64mad-devel -lib64paper-devel -lib64poppler-devel -lib64pulseaudio-devel -lib64sane1-devel -lib64t1lib-devel -lib64twolame-devel -lib64v4l-devel -lib64xaw-devel -lib64xi-devel -lib64xine1.2-devel -lib64xscrnsaver1-devel -lib64xtst6-devel -lib64xxf86dga-devel -lib64yaz-devel -libOpenSP5-devel +kde-dev-scripts +libapr-devel +libapr-util-devel libart_lgpl-devel +libattr-devel +libavformat58 +libbinutils-devel libblkid-devel libcdda-devel +libcln-devel libclucene-devel +libclucene-devel +libcommoncpp-devel libcommoncpp-devel +libconfig-devel +libcryptsetup-devel libcurl-devel +libcurl-devel +libdvdread-devel libdvdread-devel +libecpg9.6_6 libexiv2-devel +libfbclient-devel libffmpeg-devel libflac++-devel libflac-devel +libflac-devel libfontenc-devel libgadu-devel +libgeoip-devel +libgmime2.6-devel libgpod-devel libgsf-devel -libgstreamer-plugins-base-devel -libgstreamer0.10-devel +libgstreamer1.0-devel +libgstreamer-plugins-base1.0-devel libhd-devel libical-devel libice-devel +libidn-devel libifp-devel libinotifytools-devel libiodbc-devel libiw-devel libjack-devel libjasper-devel +libjasper-devel libjpeg-devel libkarma-devel -liblame-devel liblo-devel liblrdf-devel +liblua-devel +libmad-devel libmad-devel libmng-devel +libmp3lame-devel libmp4v2-devel libmpcdec-devel libmtp-devel libmusicbrainz-devel libnjb-devel +libnpth-devel libofx-devel libotr-devel -libotr3-devel libpaper-devel +libpaper-devel +libpkcs11-helper-devel libpoppler-devel -libpq-devel +libpulseaudio-devel +libpx-devel +libqalculate-devel libraw1394-devel librsvg libsane1-devel -libsm-devel libsmbclient-devel +libsm-devel libsndfile-devel libt1lib-devel +libt1lib-devel libtheora-devel libtiff-devel -libtunepimp-devel +libtwolame-devel libudev-devel libungif-devel -libusb-devel +libusb1.0-devel +libutempter +libutempter0 libutempter-devel libv4l-devel libvisual-devel @@ -154,24 +156,27 @@ libvorbis-devel libwmf-devel libwpd-devel libx11-devel +libxaw-devel libxcursor-devel +libxdg-basedir-devel libxext-devel libxft-devel libxi-devel +libxi-devel libxine1.2-devel libxinerama-devel libxkbfile-devel libxmu-devel libxrandr-devel libxrender-devel -libxscrnsaver1-devel +libxscrnsaver-devel libxslt-devel libxtst-devel -libxtst6-devel libxv-devel libxxf86dga-devel +libxxf86dga-devel +libyaz-devel libyaz-devel -libzrtpcpp-devel lilo lirc-devel lm_sensors-devel @@ -179,47 +184,69 @@ mesaglu-devel mysql-devel nas-devel neon-devel -net-snmp-devel netpbm +net-snmp-devel +NetworkManager-glib-devel +notification-daemon ocaml +ocaml-facile-devel +OpenEXR-devel openldap-devel +openldap-servers-devel +opensc openslp-devel opensp-devel +openssh-clients +optipng pam-devel pciutils-devel -perl(XML::Parser) perl-devel +perl(IPC::Run3) +perl(PAR::Packer) +perl-pcsc-perl +perl(XML::Parser) pilot-link-devel +pinentry-gtk2 pkgconfig(audiofile) -pkgconfig(libpng15) pkgconfig(libpng16) -postgresql9.2-devel -pth-devel +pkgconfig(pygtk-2.0) +polkit-agent-none +postgresql9.6 +postgresql9.6-devel +ppp python-devel -python-qt python-sip +qt4-devel readline-devel recode rpm-build rpm-devel ruby-devel scons +SDL-devel speex-devel -sqlite-devel sqlite3-devel +sqlite-devel +sshfs-fuse subversion-devel +sudo +swig sword-devel taglib-devel +torsocks transfig +udisks2-devel +udisks-devel unixODBC-devel +usbutils valgrind wv2-devel x11-font-util +xbase-devel xmlto xscreensaver xscreensaver-base xscreensaver-extrusion xscreensaver-gl -xulrunner-devel yaz zlib-devel diff --git a/redhat/packages.mga4 b/redhat/docker/mga7/packages.x86_64 index 500e3f758..9c8f92ea0 100644 --- a/redhat/packages.mga4 +++ b/redhat/docker/mga7/packages.x86_64 @@ -1,13 +1,8 @@ -GraphicsMagick-devel -libotr-devel -ImageMagick-devel -NetworkManager-glib-devel -OpenEXR-devel -SDL-devel advancecomp alsa-lib-devel aspell aspell-devel +aspell-en audiofile-devel bind-devel bison @@ -15,8 +10,12 @@ boost-devel bzip2-devel ccache cdparanoia +chmlib-devel chrpath +clamav +clamav-devel cmake +ctags cups-devel curl-devel db5-devel @@ -24,55 +23,78 @@ dbus-devel dbus-glib dbus-glib-devel djvulibre +docbook2x docbook-dtd412-xml docbook-style-xsl docbook-utils doxygen drakconf dssi-devel +exempi-devel expat-devel +fdupes fftw-devel +firebird-devel flex fontconfig-devel -freetype-devel freetype2-devel +freetype-devel fribidi-devel gamin-devel gettext-devel glib2-devel +gmime-devel gnokii-devel gperf gpgme-devel gphoto2-devel +GraphicsMagick-devel gsl-devel -gtk-doc gtk2-devel gtk+3.0-devel +gtk-doc hspell-devel +hunspell-en +iceauth +ImageMagick-devel imake -java-1.7.0-openjdk -java-1.7.0-openjdk-devel +imlib2-devel +intltool +java-1.8.0-openjdk +java-1.8.0-openjdk-devel karma-sharp kde-dev-scripts -lcms-devel +lib64apr-devel +lib64apr-util-devel +lib64avformat58 lib64binutils-devel +lib64boost_python3-devel +lib64cln-devel lib64clucene-devel lib64commoncpp-devel +lib64cryptsetup-devel lib64curl-devel lib64dvdread-devel -lib64ecpg9.3_6 +lib64ecpg9.6_6 lib64exiv2-devel +lib64fbclient-devel lib64ffmpeg-devel lib64flac++-devel lib64flac-devel lib64fontenc-devel -lib64gstreamer0.10-devel +lib64geoip-devel +lib64gmime2.6-devel +lib64gstreamer1.0-devel +lib64gstreamer-plugins-base1.0-devel lib64inotifytools-devel lib64jasper-devel lib64jpeg-devel -lib64lame-devel +lib64lua-devel lib64mad-devel +lib64mp3lame-devel +lib64npth-devel lib64paper-devel +lib64pkcs11-helper-devel lib64poppler-devel lib64pulseaudio-devel lib64sane1-devel @@ -80,9 +102,12 @@ lib64t1lib-devel lib64tiff-devel lib64twolame-devel lib64udev-devel -lib64usb-devel +lib64usb1.0-devel +lib64utempter0 +lib64utempter-devel lib64v4l-devel lib64xaw-devel +lib64xdg-basedir-devel lib64xi-devel lib64xine1.2-devel lib64xscrnsaver-devel @@ -90,6 +115,7 @@ lib64xtst-devel lib64xxf86dga-devel lib64yaz-devel libart_lgpl-devel +libattr-devel libblkid-devel libcdda-devel libclucene-devel @@ -103,18 +129,16 @@ libflac-devel libgadu-devel libgpod-devel libgsf-devel -libgstreamer-plugins-base-devel libhd-devel libical-devel libice-devel +libidn-devel libifp-devel -libinotifytools-devel libiodbc-devel libiw-devel libjack-devel libjasper-devel libkarma-devel -liblame-devel liblo-devel liblrdf-devel libmad-devel @@ -125,16 +149,19 @@ libmtp-devel libmusicbrainz-devel libnjb-devel libofx-devel +libotr-devel libpaper-devel +libpx-devel +libqalculate-devel libraw1394-devel librsvg -libsm-devel libsmbclient-devel +libsm-devel libsndfile-devel libt1lib-devel libtheora-devel libungif-devel -libutempter-devel +libutempter libvisual-devel libvorbis-devel libwmf-devel @@ -160,23 +187,36 @@ mesaglu-devel mysql-devel nas-devel neon-devel -net-snmp-devel netpbm +net-snmp-devel +NetworkManager-glib-devel +notification-daemon ocaml +ocaml-facile-devel +OpenEXR-devel openldap-devel +openldap-servers-devel +opensc openslp-devel opensp-devel +openssh-clients optipng pam-devel pciutils-devel -perl(XML::Parser) perl-devel +perl(IPC::Run3) +perl(PAR::Packer) +perl-pcsc-perl +perl(XML::Parser) pilot-link-devel +pinentry-gtk2 pkgconfig(audiofile) pkgconfig(libpng16) -postgresql9.3 -postgresql9.3-devel -pth-devel +pkgconfig(pygtk-2.0) +polkit-agent-none +postgresql9.6 +postgresql9.6-devel +ppp python-devel python-sip qt4-devel @@ -186,19 +226,26 @@ rpm-build rpm-devel ruby-devel scons +SDL-devel speex-devel -sqlite-devel sqlite3-devel +sqlite-devel +sshfs-fuse subversion-devel +sudo +swig sword-devel taglib-devel +torsocks transfig -udisks-devel udisks2-devel +udisks-devel unixODBC-devel +usbutils valgrind wv2-devel x11-font-util +xbase-devel xmlto xscreensaver xscreensaver-base @@ -206,14 +253,3 @@ xscreensaver-extrusion xscreensaver-gl yaz zlib-devel -fdupes -firebird-devel -GraphicsMagick-devel -dssi-devel -clamav -clamav-devel -gmime-devel -intltool -libpx-devel -xbase-devel -imlib2-devel diff --git a/redhat/docker/mga7/rpmmacros b/redhat/docker/mga7/rpmmacros new file mode 100644 index 000000000..8d3b31456 --- /dev/null +++ b/redhat/docker/mga7/rpmmacros @@ -0,0 +1,4 @@ +%dist .mga7 +%_smp_mflags -j8 +%jobs 8 +%_program_prefix "" diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh index a3b888c75..f2d686df5 100755 --- a/redhat/docker/opensuse32.sh +++ b/redhat/docker/opensuse32.sh @@ -1,19 +1,21 @@ -#!/bin/bash +#!/bin/bash -e -NAME="opensuse32" VERSION="$1" # E.g: '42.3' -IMAGE="${NAME}:${VERSION}" -INSTALLROOT="/dev/shm/${IMAGE}" - -sudo rm -rf "${INSTALLROOT}" -sudo mkdir -p "${INSTALLROOT}" if [ "${VERSION}" = "tumbleweed" ]; then URL="http://download.opensuse.org/tumbleweed" + NAME="opensuse32/tumbleweed" else URL="http://download.opensuse.org/distribution/leap/${VERSION}" + NAME="opensuse32/leap" fi +IMAGE="${NAME}:latest" +INSTALLROOT="/dev/shm/${IMAGE}" + +sudo rm -rf "${INSTALLROOT}" +sudo mkdir -p "${INSTALLROOT}" + sudo zypper --root "${INSTALLROOT}" \ ar "${URL}/repo/oss/" "oss" sudo zypper --root "${INSTALLROOT}" \ @@ -25,13 +27,30 @@ if [ "${VERSION}" != "tumbleweed" ]; then sudo zypper --root "${INSTALLROOT}" \ ar "http://download.opensuse.org/update/leap/${VERSION}/non-oss/" "update-non-oss" fi -setarch i686 sudo zypper --root "${INSTALLROOT}" \ +sudo zypper --root "${INSTALLROOT}" \ --gpg-auto-import-keys ref -setarch i686 sudo zypper --root "${INSTALLROOT}" \ - install -y bash vim zypper openSUSE-release +sudo setarch i686 zypper --root "${INSTALLROOT}" \ + install --download-only -y \ + bash \ + filesystem \ + glibc \ + glibc-extra \ + libpcre1 \ + libselinux1 \ + openSUSE-release \ + system-user-root \ + util-linux vim \ + zypper +sudo rpm -Uvh --root "${INSTALLROOT}" "${INSTALLROOT}/var/cache/zypp/packages/oss/"*"/"*".rpm" + +sudo chroot "${INSTALLROOT}" rpmdb --rebuilddb -sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" +FILE="${IMAGE//\//_}.tar" +sudo tar -C "${INSTALLROOT}" -c . >"${FILE}" sudo rm -rf "${INSTALLROOT}" docker rmi -f "${IMAGE}" -docker import "${IMAGE}.tar" "${IMAGE}" +docker import "${FILE}" "${IMAGE}" + +pigz "${FILE}" +mv -fv "${FILE}.gz" "${HOME}/tde/docker" diff --git a/redhat/docker/oss131/Dockerfile.x86_64 b/redhat/docker/oss131/Dockerfile.x86_64 index 67928e55a..b98d63d4e 100644 --- a/redhat/docker/oss131/Dockerfile.x86_64 +++ b/redhat/docker/oss131/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:13.1 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss132/Dockerfile.x86_64 b/redhat/docker/oss132/Dockerfile.x86_64 index b6a8ef713..74d1a75bd 100644 --- a/redhat/docker/oss132/Dockerfile.x86_64 +++ b/redhat/docker/oss132/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:13.2 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss150/Dockerfile.x86_64 b/redhat/docker/oss150/Dockerfile.x86_64 index 78ad5b63b..d1a385fc2 100644 --- a/redhat/docker/oss150/Dockerfile.x86_64 +++ b/redhat/docker/oss150/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/leap:15.0 -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss151/Dockerfile.x86_64 b/redhat/docker/oss151/Dockerfile.x86_64 new file mode 100644 index 000000000..3879c1d8e --- /dev/null +++ b/redhat/docker/oss151/Dockerfile.x86_64 @@ -0,0 +1,23 @@ +FROM opensuse/leap:15.1 + +ARG TDE_VERSION=14.0.8 +ARG ARCH=x86_64 + +# Add PACKMAN repository +RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.1/ packman +RUN zypper refresh + +# Install Trinity build dependencies +ADD packages /packages +RUN zypper install -l -y $(</packages) + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity +RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +ADD rpmmacros /home/trinity/.rpmmacros + +# Add YUM repository for locally built packages +RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} +RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} +RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch +RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch diff --git a/redhat/packages.oss123 b/redhat/docker/oss151/packages index 9126b044a..0af27eadc 100644 --- a/redhat/packages.oss123 +++ b/redhat/docker/oss151/packages @@ -1,130 +1,154 @@ +alsa-devel aspell aspell-devel audiofile-devel automake -avahi-devel +bdftopcf bind-devel binutils-devel bison boost-devel ccache -c++_compiler cdparanoia cdparanoia-devel +chmlib-devel chrpath +clamav +cln-devel clucene-core-devel cmake -commoncpp2-devel createrepo cups-devel cyrus-sasl-devel dbus-1-devel dbus-1-glib-devel -dbus-devel djvulibre +docbook-utils docbook-xsl-stylesheets +docbook2x doxygen GraphicsMagick dssi-devel -esound-devel fdupes -ffmpeg1-devel ffmpeg-devel fftw3-devel -fftw-devel file-devel flac-devel flex +freetype-devel fribidi-devel -gettext-devel +gamin-devel +gcc-c++ giflib-devel +git +glu-devel +gmime-devel +gmime2_6-devel gmp-devel gnokii-devel -gnutls-devel gperf xmlto -gpgme-devel GraphicsMagick-devel gsl-devel -gstreamer-0_10-devel -gstreamer-0_10-plugins-base-devel +gstreamer-devel +gstreamer-plugins-base-devel gstreamer-devel gtk2-devel +gtk3-devel gtk-doc -hal-devel +htdig html2ps hunspell-devel ImageMagick-devel -imlib1-devel -java-1.6.0-openjdk-devel -java-1.7.0-openjdk-devel -java-devel +imlib2-devel +intltool +java-1_8_0-openjdk-devel +less libacl-devel +libao-devel libart_lgpl-devel +libavahi-devel +libavcodec-devel libblkid-devel +libboost_python3-devel libbz2-devel libcap-devel -libccrtp-devel libcdio-devel libcdio-paranoia-devel libconfig-devel +libcryptsetup-devel libcurl-devel libdb-4_8-devel libdvdread-devel +libexempi-devel libexiv2-devel libgadu-devel +libgpgme-devel libgphoto2-devel libgpod-devel -libhd-devel +libgssglue-devel libical-devel libidn-devel libiw-devel +libjack-devel libjasper-devel +liblcms2-devel liblo-devel liblrdf-devel libmad-devel libmng-devel libmp3lame-devel -libmp4v2-devel libmpcdec-devel libmtp-devel libmusicbrainz-devel +libmysqld-devel +libneon-devel libnjb-devel +libnsl-devel libofx-devel -libotr2-devel libotr-devel -libpng15-compat-devel -libpng-devel +libpaper-devel +libpisock-devel +libpng16-devel +libpoppler-devel libpqxx-devel +libpulse-devel +libqalculate-devel +libraw1394-devel librsvg-devel libsamplerate-devel +libSDL-devel libsmbclient-devel libsndfile-devel +libtag-devel libtheora-devel libtiff-devel +libtirpc-devel libtool -libtunepimp-devel libtwolame-devel libudev-devel -libungif-devel libv4l-devel libvisual-devel +libvorbis-devel libwmf-devel libwpd-devel libxine-devel libxslt-devel +libyaz-devel libzrtpcpp-devel lilo lirc-devel make +makeinfo meanwhile-devel Mesa-devel -mesa-libGL-devel -mesa-libGLU-devel -mozilla-xulrunner20-devel +Mesa-libGL-devel +mozilla-nspr-devel mysql-devel -neon-devel +net-tools +net-tools-deprecated NetworkManager-devel ocaml -OpenEXR-devel +openexr-devel +opensc openslp-devel opensp-devel pam-devel @@ -132,42 +156,43 @@ patch pciutils-devel pcre-devel pcsc-lite-devel -pilot-link-devel -poppler-devel +perl-PAR-Packer +perl-pcsc +pkcs11-helper-devel +pkgconfig(pygtk-2.0) postgresql postgresql-devel -pth-devel -pulseaudio-devel python-devel +python3-devel python-sip-devel -recode +qt-devel +rpcgen +rpm-build rsvg-view ruby ruby-devel sane-backends-devel scons -SDL-devel -sqlite-devel +speex-devel +sqlite3-devel subversion-devel +sudo +swig sword-devel -t1lib-devel -taglib-devel +torsocks transfig -trinity-PyQt-devel -udev-devel +udisks2-devel unixODBC-devel update-desktop-files +usbutils utempter-devel valgrind +vim +wireless-tools wv2-devel +xbase-devel +xcb-proto-devel xscreensaver xscreensaver-data xscreensaver-data-extra -xulrunner-devel xz-devel -libaudio-devel -fdupes -NetworkManager-devel -udisks-devel -udisks2-devel -libconfig-devel diff --git a/redhat/docker/oss151/rpmmacros b/redhat/docker/oss151/rpmmacros new file mode 100644 index 000000000..d7dfb7aeb --- /dev/null +++ b/redhat/docker/oss151/rpmmacros @@ -0,0 +1,3 @@ +%dist .oss151 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/oss152/Dockerfile.x86_64 b/redhat/docker/oss152/Dockerfile.x86_64 new file mode 100644 index 000000000..88f2c3224 --- /dev/null +++ b/redhat/docker/oss152/Dockerfile.x86_64 @@ -0,0 +1,25 @@ +FROM opensuse/leap:15.2 + +ARG TDE_VERSION=14.0.8 +ARG ARCH=x86_64 + +# Add PACKMAN repository +# Install Trinity build dependencies +COPY packages /packages +RUN echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \ + && echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \ + && zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.2/ packman \ + && zypper refresh \ + && zypper update -y \ + && zypper install -l -y $(</packages) + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +COPY rpmmacros /home/trinity/.rpmmacros + +# Add YUM repository for locally built packages +RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \ + && zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \ + && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch \ + && zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch diff --git a/redhat/packages.oss b/redhat/docker/oss152/packages index 407db9c7f..e3359a007 100644 --- a/redhat/packages.oss +++ b/redhat/docker/oss152/packages @@ -1,130 +1,155 @@ +alsa-devel aspell aspell-devel audiofile-devel automake -avahi-devel +bdftopcf bind-devel binutils-devel bison boost-devel +brp-check-suse +brp-extract-appdata ccache -c++_compiler cdparanoia cdparanoia-devel +chmlib-devel chrpath +clamav +cln-devel clucene-core-devel cmake -commoncpp2-devel createrepo cups-devel cyrus-sasl-devel dbus-1-devel dbus-1-glib-devel -dbus-devel djvulibre +docbook-utils docbook-xsl-stylesheets +docbook2x doxygen GraphicsMagick dssi-devel -esound-devel fdupes -ffmpeg1-devel ffmpeg-devel fftw3-devel -fftw-devel file-devel flac-devel flex +freetype-devel fribidi-devel -gettext-devel +gamin-devel +gcc-c++ giflib-devel +git +glu-devel +gmime-devel +gmime2_6-devel gmp-devel -gnokii-devel -gnutls-devel gperf xmlto -gpgme-devel GraphicsMagick-devel gsl-devel -gstreamer-0_10-devel -gstreamer-0_10-plugins-base-devel +gstreamer-devel +gstreamer-plugins-base-devel gstreamer-devel gtk2-devel +gtk3-devel gtk-doc -hal-devel +htdig html2ps hunspell-devel +iceauth ImageMagick-devel -imlib1-devel -java-1.6.0-openjdk-devel -java-1.7.0-openjdk-devel -java-devel +imlib2-devel +intltool +java-1_8_0-openjdk-devel +less libacl-devel +libao-devel libart_lgpl-devel +libavahi-devel +libavcodec-devel libblkid-devel +libboost_python3-devel libbz2-devel libcap-devel -libccrtp-devel libcdio-devel libcdio-paranoia-devel libconfig-devel +libcryptsetup-devel libcurl-devel libdb-4_8-devel libdvdread-devel +libexempi-devel libexiv2-devel libgadu-devel +libgpgme-devel libgphoto2-devel libgpod-devel -libhd-devel +libgssglue-devel libical-devel libidn-devel libiw-devel +libjack-devel libjasper-devel +liblcms2-devel liblo-devel liblrdf-devel libmad-devel libmng-devel libmp3lame-devel -libmp4v2-devel libmpcdec-devel libmtp-devel libmusicbrainz-devel +libmysqld-devel +libneon-devel libnjb-devel +libnsl-devel libofx-devel -libotr2-devel libotr-devel -libpng15-compat-devel -libpng-devel +libpaper-devel +libpisock-devel +libpng16-devel +libpoppler-devel libpqxx-devel +libpulse-devel +libqalculate-devel +libraw1394-devel librsvg-devel libsamplerate-devel +libSDL-devel libsmbclient-devel libsndfile-devel +libtag-devel libtheora-devel libtiff-devel +libtirpc-devel libtool -libtunepimp-devel libtwolame-devel libudev-devel -libungif-devel libv4l-devel libvisual-devel +libvorbis-devel libwmf-devel libwpd-devel libxine-devel libxslt-devel +libyaz-devel libzrtpcpp-devel -lilo lirc-devel make +makeinfo meanwhile-devel Mesa-devel -mesa-libGL-devel -mesa-libGLU-devel -mozilla-xulrunner20-devel +Mesa-libGL-devel +mozilla-nspr-devel mysql-devel -neon-devel +net-tools +net-tools-deprecated NetworkManager-devel ocaml -OpenEXR-devel +openexr-devel +opensc openslp-devel opensp-devel pam-devel @@ -132,36 +157,45 @@ patch pciutils-devel pcre-devel pcsc-lite-devel -pilot-link-devel -poppler-devel -postgresql -postgresql-devel -pth-devel -pulseaudio-devel +perl-PAR-Packer +perl-pcsc +pkcs11-helper-devel +pkgconfig(pygtk-2.0) +postgresql10 +postgresql10-devel python-devel +python3-devel python-sip-devel +qt-devel recode -rsvg-view +rpcgen +rpm-build +rsvg-convert ruby ruby-devel sane-backends-devel scons -SDL-devel -sqlite-devel +speex-devel +sqlite3-devel subversion-devel +sudo +swig sword-devel -t1lib-devel -taglib-devel +torsocks transfig -trinity-PyQt-devel -udev-devel +udisks2-devel unixODBC-devel update-desktop-files +usbutils utempter-devel valgrind +vim +wireless-tools wv2-devel +xbase-devel +xcb-proto-devel +xorg-x11 xscreensaver xscreensaver-data xscreensaver-data-extra -xulrunner-devel xz-devel diff --git a/redhat/docker/oss152/rpmmacros b/redhat/docker/oss152/rpmmacros new file mode 100644 index 000000000..a8ecf175a --- /dev/null +++ b/redhat/docker/oss152/rpmmacros @@ -0,0 +1,3 @@ +%dist .oss152 +%_smp_mflags -j8 +%jobs 8 diff --git a/redhat/docker/oss421/Dockerfile.x86_64 b/redhat/docker/oss421/Dockerfile.x86_64 index 94c0742eb..3921f3baf 100644 --- a/redhat/docker/oss421/Dockerfile.x86_64 +++ b/redhat/docker/oss421/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:42.1 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss422/Dockerfile.x86_64 b/redhat/docker/oss422/Dockerfile.x86_64 index ecb34f1ef..b38871455 100644 --- a/redhat/docker/oss422/Dockerfile.x86_64 +++ b/redhat/docker/oss422/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:42.2 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/oss423/Dockerfile.x86_64 b/redhat/docker/oss423/Dockerfile.x86_64 index ff70474da..c168ea321 100644 --- a/redhat/docker/oss423/Dockerfile.x86_64 +++ b/redhat/docker/oss423/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse:42.3 -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 02f84bb8c..7df793232 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -1,25 +1,25 @@ -FROM opensuse32:tumbleweed +FROM opensuse32/tumbleweed:latest -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.8 ARG ARCH=i686 # Add PACKMAN repository RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman -RUN setarch ${ARCH} zypper refresh -RUN setarch ${ARCH} zypper --non-interactive dup -RUN setarch ${ARCH} zypper --non-interactive update - -# Install Trinity build dependencies ADD packages /packages -RUN setarch ${ARCH} zypper install -l -y $(</packages) +RUN setarch ${ARCH} zypper refresh \ + && setarch ${ARCH} zypper -n dup \ + && setarch ${ARCH} zypper -n update \ + && setarch ${ARCH} zypper -n install $(</packages) # Add non-root user to build packages -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers + +USER trinity ADD rpmmacros /home/trinity/.rpmmacros # Add YUM repository for locally built packages -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} -RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch -RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch +RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \ + && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index 156a3a1b8..248b38f76 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -1,25 +1,25 @@ -FROM opensuse:tumbleweed +FROM opensuse/tumbleweed:latest -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 # Add PACKMAN repository RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman -RUN zypper refresh -RUN zypper --non-interactive dup -RUN zypper --non-interactive update - -# Install Trinity build dependencies ADD packages /packages -RUN zypper install -l -y $(</packages) +RUN zypper refresh \ + && zypper -n dup \ + && zypper -n update \ + && zypper -n install $(</packages) # Add non-root user to build packages -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers + +USER trinity ADD rpmmacros /home/trinity/.rpmmacros # Add YUM repository for locally built packages -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} -RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch -RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch +RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ + && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \ + && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ + && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index cf03ada2e..9d2f2cdbd 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -7,6 +7,7 @@ bdftopcf bind-devel binutils-devel bison +bluez-devel boost-devel ccache cdparanoia @@ -17,8 +18,9 @@ clamav cln-devel clucene-core-devel cmake -createrepo +createrepo_c cups-devel +curl cyrus-sasl-devel dbus-1-devel dbus-1-glib-devel @@ -26,14 +28,17 @@ djvulibre docbook-utils docbook-xsl-stylesheets doxygen GraphicsMagick +docbook2x dssi-devel fdupes -ffmpeg-devel +ffmpeg-4-libavcodec-devel +ffmpeg-4-libavdevice-devel fftw3-devel file-devel flac-devel flex font-util +freeglut-devel freetype-devel fribidi-devel gamin-devel @@ -42,7 +47,6 @@ giflib-devel glu-devel gmime-devel gmp-devel -gnokii-devel gperf xmlto GraphicsMagick-devel gsl-devel @@ -64,8 +68,8 @@ libacl-devel libart_lgpl-devel libattr-devel libavahi-devel -libavcodec-devel libblkid-devel +libboost_python3-devel libbz2-devel libcap-devel libcdio-devel @@ -86,7 +90,6 @@ libical-devel libidn-devel libiw-devel libjack-devel -libjasper-devel liblcms2-devel liblo-devel liblrdf-devel @@ -114,6 +117,7 @@ libraw1394-devel librsvg-devel libsamplerate-devel libSDL-devel +libsensors4-devel libsmbclient-devel libsndfile-devel libtag-devel @@ -140,6 +144,8 @@ libXt-devel libXtst-devel libXv-devel libXxf86dga-devel +libXxf86vm-devel +libyaz-devel lilo lirc-devel make @@ -148,10 +154,12 @@ meanwhile-devel Mesa-devel Mesa-libGL-devel mozilla-nspr-devel +net-snmp-devel net-tools net-tools-deprecated NetworkManager-devel ocaml +openexr openexr-devel opensc openslp-devel @@ -162,14 +170,19 @@ patch pciutils-devel pcre-devel pcsc-lite-devel +perl-PAR-Packer +perl-pcsc pkcs11-helper-devel postgresql postgresql-devel python-devel -qt-devel +python-gtk-devel +python3-devel +recode rpcgen rpm-build -rsvg-view +rpm-devel +rsvg-convert ruby ruby-devel sane-backends-devel @@ -180,6 +193,17 @@ subversion-devel sudo swig sword-devel +texlive-adjustbox +texlive-etoc +texlive-hanging +texlive-metafont-bin +texlive-multirow +texlive-natbib +texlive-newunicodechar +texlive-refman +texlive-sectsty +texlive-stackengine +texlive-tocloft torsocks transfig unixODBC-devel @@ -187,6 +211,7 @@ update-desktop-files usbutils utempter-devel valgrind +vim wireless-tools wv2-devel xcb-proto-devel diff --git a/redhat/docker/osstw/rpmmacros b/redhat/docker/osstw/rpmmacros index 0f4902670..cb1ceaa06 100644 --- a/redhat/docker/osstw/rpmmacros +++ b/redhat/docker/osstw/rpmmacros @@ -1,3 +1,4 @@ %dist .osstw %_smp_mflags -j8 %jobs 8 +%__python %__python2 diff --git a/redhat/docker/pclinuxos.pkg b/redhat/docker/pclinuxos.pkg index d1ad003ed..cdfd0cf21 100644 --- a/redhat/docker/pclinuxos.pkg +++ b/redhat/docker/pclinuxos.pkg @@ -17,7 +17,9 @@ file filesystem findutils fuse +fuse-common gawk +gcrypt gdk-pixbuf2.0 glibc glibc-devel @@ -25,7 +27,8 @@ gnupg gnutls grep gzip -icu56-data +icu +icu65-data info-install kernel-userspace-headers krb5 @@ -33,10 +36,13 @@ ldetect-lst less lib64acl1 lib64apt-pkg0 +lib64assuan0 lib64attr1 lib64audit1 lib64audit-devel lib64blkid1 +lib64brotlicommon1 +lib64brotlidec1 lib64bsd0 lib64bzip2_1 lib64cap2 @@ -46,26 +52,32 @@ lib64curl4 lib64db4.8 lib64dbnss4.8 lib64elfutils1 +lib64expat1 lib64ext2fs2 lib64fdisk1 lib64ffi6 lib64fuse2 +lib64fuse3_3 +lib64gcrypt20 lib64gdbm3 lib64gdk_pixbuf2.0_0 lib64gio2.0_0 lib64glib2.0_0 lib64gmp10 lib64gnutls30 -lib64icu56 +lib64gpg-error0 +lib64gudev1.0_0 +lib64icu65 lib64idn2_0 lib64intl8 lib64iso9660_7 -lib64jasper1 +lib64jasper4 lib64jbig1 lib64jpeg62 lib64jpeg8 lib64keyutils1 lib64krb53 +lib64ksba8 lib64ldap2.4_2 lib64libcap-ng0 lib64lua5.1 @@ -76,12 +88,12 @@ lib64mpfr4 lib64ncurses5 lib64ncurses6 lib64ncursesw6 -lib64nettle6 +lib64nettle7 lib64notify4 +lib64npth0 lib64nspr4 lib64nss3 -lib64openssl1.0.0 -lib64openssl1.1 +lib64openssl1.1.0 lib64opts25 lib64pam0 lib64pam-devel @@ -93,10 +105,12 @@ lib64png16_16 lib64png3 lib64popt0 lib64psl5 +lib64python3.6 lib64readline7 lib64rpm1 lib64rtmp1 lib64sasl2 +lib64secret1_0 lib64sigsegv2 lib64smartcols1 lib64sqlite3_0 @@ -105,23 +119,30 @@ lib64tasn1_6 lib64tcb0 lib64tiff3 lib64tiff5 +lib64tirpc3 lib64udev0 lib64unistring2 lib64usb1.0_0 lib64usb-compat0.1_4 lib64uuid1 lib64verto1 +lib64webp7 lib64x11_6 lib64xau6 +lib64xcrypt1 +lib64xcrypt-devel lib64xdmcp6 lib64xml2_2 +lib64zstd1 libgcc1 libidn2-i18n libnotify libstdc++6 +libtirpc libxcb makedev mktemp +multiarch-utils ncurses nss nss_tcb @@ -134,10 +155,13 @@ perl perl-base perl-File-Sync perl-MDK-Common +perl-Module-ScanDeps +pinentry pkgconfig popt-data procps publicsuffix-list-dafsa +python3 rmt rootcerts rpm @@ -145,6 +169,7 @@ rpm-helper rpm-pclinuxos-setup rpm-rambo-setup run-parts +sd sed setup shadow-utils diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh index e4ed68567..837e4c86f 100755 --- a/redhat/docker/pclinuxos.sh +++ b/redhat/docker/pclinuxos.sh @@ -1,7 +1,7 @@ #!/bin/bash -ex NAME="pclinuxos" -VERSION="$1" # E.g: '26' +VERSION="${1:-2020}" # E.g: '26' IMAGE="${NAME}:${VERSION}" INSTALLROOT="/dev/shm/${IMAGE}" @@ -17,7 +17,7 @@ curl "${MIRROR}/RPMS.x86_64/" | sed -n "/a href/ s|.*href=\"\(.*\)\.rpm\".*|\1.r mkdir -p "/dev/shm/packages" while read pkg; do - file="$(grep "^$pkg-[0-9]" /dev/shm/pkg.list)" + file="$(grep "^${pkg}[0-9]*-[0-9]" /dev/shm/pkg.list | sort | tail -n 1)" [ -z "${file}" ] && exit 1 wget -nv -c "${MIRROR}/RPMS.x86_64/${file}" -O "/dev/shm/packages/${file}" || exit 2 done < "pclinuxos.pkg" @@ -46,7 +46,7 @@ sudo umount "${INSTALLROOT}/dev/shm" sudo umount "${INSTALLROOT}/dev" sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" -sudo rm -rf "${INSTALLROOT}" +#sudo rm -rf "${INSTALLROOT}" docker rmi -f "${IMAGE}" docker import "${IMAGE}.tar" "${IMAGE}" diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index 6ace1d446..2cd400aba 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,32 +1,48 @@ -FROM pclinuxos:2018 +FROM pclinuxos:2020 -ARG TDE_VERSION=14.0.6 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 # Update distribution -RUN apt-get -y update -RUN apt-get -y dist-upgrade +RUN apt-get -y update && apt-get -y install glibc && apt-get -y dist-upgrade # Install Trinity build dependencies ADD packages.${ARCH} /packages -RUN apt-get -y install $(</packages) +RUN apt-get -y update && apt-get -y install $(</packages) # Add rpmbuild repositories ADD rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list RUN sed -i "/etc/apt/sources.list.d/rpmbuild.list" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" -# Add non-root user to build packages -RUN rm -rf /home/trinity -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers -ADD rpmmacros /home/trinity/.rpmmacros - # Fix SUDO configuration -RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|" +#RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter # Fix missing '.la' files ADD genla.sh /usr/bin/genla.sh -RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 -RUN genla.sh libjpeg -RUN genla.sh liblcms -RUN genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la +RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \ + && genla.sh libjpeg \ + && genla.sh liblcms \ + && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la + +# Add non-root user to build packages +RUN rm -rf /home/trinity && useradd -m -s /bin/bash -u 1000 trinity && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" + +USER trinity +ADD rpmmacros /home/trinity/.rpmmacros + +# Build supplementary development tools +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec + +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec + +USER root +RUN rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm + +USER trinity diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64 index e6d7358f0..800b9989a 100644 --- a/redhat/docker/pclinuxos/packages.x86_64 +++ b/redhat/docker/pclinuxos/packages.x86_64 @@ -14,6 +14,7 @@ cups-devel desktop-file-utils djvulibre docbook-style-xsl +docbook2x doxygen drakconf dssi-devel @@ -30,7 +31,6 @@ gamin-devel gcc-c++ gettext-devel glib2-devel -gnokii-devel gnutls-devel gpgme-devel gphoto2-devel @@ -40,31 +40,42 @@ gtk2-devel gtk+3.0-devel hspell-devel htdig +iceauth ImageMagick-devel imake imlib2-devel +intltool java-devel +java-sun lcms-devel +lib64clucene-devel lib64cryptsetup-devel +lib64db4.8-devel lib64dvdread-devel lib64exiv2-devel +lib64fbclient-devel +lib64geoip-devel lib64gif-devel lib64gpod4 +lib64gpod-devel lib64idn-devel lib64inotifytools-devel lib64iw29-devel lib64nm-devel lib64mpcdec-devel lib64OpenSP5-devel +lib64pcsclite-devel lib64pkcs11-helper-devel lib64poppler-devel lib64readline-devel lib64sane1-devel +lib64sndfile-devel lib64usb1.0-devel lib64usb-compat0.1-devel lib64wv2-devel lib64xaw-devel lib64xine1.2-devel +lib64xtst-devel lib64yaz-devel libcap-devel libcdda-devel @@ -76,10 +87,8 @@ libflac++-devel libfontenc-devel libgadu-devel libgstreamer0.10-devel -libical-devel libice-devel -libjack-devel -libjasper-devel +lib64jasper-devel libjpeg-devel liblame-devel liblo-devel @@ -102,6 +111,7 @@ libqalculate-devel libraw1394-devel librsvg librsync-devel +libsamplerate-devel libsmbclient-devel libsm-devel libt1lib-devel @@ -142,13 +152,17 @@ opensc openslp-devel pam-devel perl-devel +perl-PAR-Packer +perl-pcsc-perl pilot-link-devel +pkgconfig(pygtk-2.0) postgresql postgresql-devel pth-devel python3 python-devel python-rpm +qt4-devel recode rpm-build rpm-devel @@ -162,6 +176,7 @@ subversion-devel sudo sword-devel taglib-devel +texinfo transfig udisks2-devel unixODBC-devel diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros index 59b0e9d95..6b1a9016a 100644 --- a/redhat/docker/pclinuxos/rpmmacros +++ b/redhat/docker/pclinuxos/rpmmacros @@ -1,4 +1,4 @@ -%dist .pclos2018 +%dist .pclos %_smp_mflags -j8 %jobs 8 -%pclinuxos 2018 +%pclinuxos 2019 diff --git a/redhat/docker/pull.sh b/redhat/docker/pull.sh index a8d404ed8..62639c40e 100755 --- a/redhat/docker/pull.sh +++ b/redhat/docker/pull.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/push.sh b/redhat/docker/push.sh index 3c7ca1a7b..3f2da2fcd 100755 --- a/redhat/docker/push.sh +++ b/redhat/docker/push.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/remove.sh b/redhat/docker/remove.sh index 04f1fcc86..192f34385 100755 --- a/redhat/docker/remove.sh +++ b/redhat/docker/remove.sh @@ -4,7 +4,7 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7" [ -z "${ARCH}" ] && ARCH="x86_64" IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" diff --git a/redhat/docker/run.sh b/redhat/docker/run.sh index d366c39dc..186ff1b22 100755 --- a/redhat/docker/run.sh +++ b/redhat/docker/run.sh @@ -4,15 +4,17 @@ DISTRIB="$1" TDE_VERSION="$2" ARCH="$3" -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.5" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.7" [ -z "${ARCH}" ] && ARCH="x86_64" +[ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" DIST="$(sed -n ${DISTRIB}/rpmmacros -e "/%dist/ s|.* ||p")" mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" mkdir -p "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}" -mkdir -p "/dev/shm/docker" +mkdir -p "/dev/shm/${DOCKER}" +chmod 777 "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}" case "${TDE_VERSION}" in "14.0."*) TDE_BRANCH="r14.0.x";; @@ -21,10 +23,10 @@ esac mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}" "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}" -docker run -ti --rm --privileged \ +${DOCKER} run -ti --rm --privileged \ -h "${IMAGE}" \ --name "${IMAGE//:/-}" \ - -v /dev/shm/docker:/tmp:z \ + -v /dev/shm/${DOCKER}:/tmp:z \ -u trinity \ -e TMPPATH=/tmp \ -e TDE_VERSION=${TDE_VERSION} \ diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec index 6f953fb06..66d8f9eac 100644 --- a/redhat/libraries/kipi-plugins/kipi-plugins.spec +++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg kipi-plugins %define tde_prefix /opt/trinity diff --git a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec deleted file mode 100644 index 93e82bd9b..000000000 --- a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec +++ /dev/null @@ -1,165 +0,0 @@ -# Default version for this component -%define tde_pkg libkdcraw -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Raw picture decoding C++ library (runtime) [Trinity] - -Epoch: 1 -Version: 0.1.9 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Environment/Libraries - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: desktop-file-utils -%if 0%{?suse_version} -BuildRequires: liblcms-devel -%else -BuildRequires: lcms-devel -%endif -BuildRequires: libjpeg-devel -BuildRequires: pkgconfig -BuildRequires: gettext - -# AUTOTOOLS -BuildRequires: automake autoconf libtool -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}ltdl-devel -%endif -%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220 -BuildRequires: libtool-ltdl-devel -%endif - -%description -C++ interface around dcraw binary program used to decode RAW -picture files. -This library is used by kipi-plugins, digiKam and others kipi host programs. -libkdcraw contains the library of libkdcraw. - -%package devel -Group: Development/Libraries -Summary: RAW picture decoding C++ library (development) [Trinity] -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description devel -Libkdcraw is a C++ interface around dcraw binary program used to -decode Raw picture files. -libkdcraw-devel contains development files and documentation. The -library documentation is available on kdcraw.h header file. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -# RHEL4: pkgconfig files do not support 'URL' keyword . -%if 0%{?rhel} == 4 -%__sed -i %{?buildroot}%{tde_libdir}/pkgconfig/*.pc -e "s/^URL: /#URL: /" -%endif - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -%postun -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_libdir}/libkdcraw.so.4 -%{tde_libdir}/libkdcraw.so.4.0.3 -%{tde_datadir}/icons/hicolor/*/apps/kdcraw.png - -%files devel -%defattr(-,root,root,-) -%{tde_libdir}/libkdcraw.so -%{tde_libdir}/libkdcraw.la -%{tde_tdeincludedir}/libkdcraw/ -%{tde_libdir}/pkgconfig/libkdcraw.pc - -%changelog diff --git a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec b/redhat/libraries/libkdcraw/libkdcraw.spec index d3ad7ed60..06857a93b 100644 --- a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec +++ b/redhat/libraries/libkdcraw/libkdcraw.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg libkdcraw %define tde_prefix /opt/trinity diff --git a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec deleted file mode 100644 index 38f08646a..000000000 --- a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec +++ /dev/null @@ -1,155 +0,0 @@ -# Default version for this component -%define tde_pkg libkexiv2 -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Qt like interface for the libexiv2 library (runtime) [Trinity] - -Epoch: 1 -Version: 0.1.7 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Environment/Libraries - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: desktop-file-utils -BuildRequires: gettext - -# AUTOTOOLS -BuildRequires: automake autoconf libtool -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}ltdl-devel -%endif -%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220 -BuildRequires: libtool-ltdl-devel -%endif - -# EXIV2 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}exiv2-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: exiv2-devel -%endif -%if 0%{?suse_version} -BuildRequires: libexiv2-devel -%endif - -%description -libkexif2 contains the library of libkexiv2. -Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. - -%package devel -Group: Development/Libraries -Summary: Qt like interface for the libexiv2 library (development) [Trinity] -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description devel -libkexif2-devel contains development files and documentation for libkexiv2 -library. The library documentation is available on kexiv2.h header file. -Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# RHEL4: pkgconfig files do not support 'URL' keyword . -%if 0%{?rhel} == 4 -%__sed -i %{?buildroot}%{tde_libdir}/pkgconfig/*.pc -e "s/^URL: /#URL: /" -%endif - - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%{tde_libdir}/libkexiv2.so.* - -%files devel -%defattr(-,root,root,-) -%{tde_libdir}/libkexiv2.so -%{tde_libdir}/libkexiv2.la -%{tde_tdeincludedir}/libkexiv2/ -%{tde_libdir}/pkgconfig/libkexiv2.pc - - -%changelog diff --git a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec b/redhat/libraries/libkexiv2/libkexiv2.spec index 26a35fb11..a463ecab3 100644 --- a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec +++ b/redhat/libraries/libkexiv2/libkexiv2.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg libkexiv2 %define tde_prefix /opt/trinity @@ -67,18 +67,10 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils +BuildRequires: cmake >= 2.8 BuildRequires: gettext BuildRequires: gcc-c++ -# AUTOTOOLS -BuildRequires: automake autoconf libtool -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}ltdl-devel -%endif -%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220 -BuildRequires: libtool-ltdl-devel -%endif - # EXIV2 %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}exiv2-devel @@ -90,6 +82,13 @@ BuildRequires: exiv2-devel BuildRequires: libexiv2-devel %endif +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + + %description libkexif2 contains the library of libkexiv2. Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. @@ -145,41 +144,44 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata. %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/"*"/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}" -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# RHEL4: pkgconfig files do not support 'URL' keyword . -%if 0%{?rhel} == 4 -%__sed -i %{?buildroot}%{tde_libdir}/pkgconfig/*.pc -e "s/^URL: /#URL: /" -%endif +%__make install DESTDIR=%{buildroot} -C build %clean diff --git a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec deleted file mode 100644 index 740aea3b1..000000000 --- a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec +++ /dev/null @@ -1,167 +0,0 @@ -# Default version for this component -%define tde_pkg libkipi -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: library for apps that want to use kipi-plugins (runtime version) [Trinity] - -Epoch: 1 -Version: 0.1.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Environment/Libraries - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: desktop-file-utils -%if 0%{?suse_version} -BuildRequires: liblcms-devel -%else -BuildRequires: lcms-devel -%endif -BuildRequires: libjpeg-devel -BuildRequires: pkgconfig -BuildRequires: gettext - -# AUTOTOOLS -BuildRequires: automake autoconf libtool -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}ltdl-devel -%endif -%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220 -BuildRequires: libtool-ltdl-devel -%endif - -%description -Libkipi is a library - o that contains common routines and widget used by kipi-plugins - o to ease implementation of the kipi-plugins interface in an application - that wants to use kipi-plugins - -Homepage: http://www.kipi-plugins.org/ - - -%package devel -Group: Development/Libraries -Summary: library for apps that want to use kipi-plugins (development version) [Trinity] -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description devel -Libkipi is a library - o that contains common routines and widget used by kipi-plugins - o to ease implementation of the kipi-plugins interface in an application - that wants to use kipi-plugins - -This package contains development files and documentation for libkipi library. -Homepage: http://www.kipi-plugins.org/ - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -%postun -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%{tde_libdir}/libkipi.so.0 -%{tde_libdir}/libkipi.so.0.1.1 -%{tde_datadir}/apps/kipi/ -%{tde_datadir}/icons/hicolor/*/apps/kipi.png -%{tde_datadir}/servicetypes/kipiplugin.desktop - -%files devel -%defattr(-,root,root,-) -%{tde_libdir}/libkipi.so -%{tde_libdir}/libkipi.la -%{tde_tdeincludedir}/libkipi/ -%{tde_libdir}/pkgconfig/libkipi.pc - -%changelog diff --git a/redhat/libraries/libkipi/libkipi-14.0.0.spec b/redhat/libraries/libkipi/libkipi.spec index 010aafa52..b4be8c16e 100644 --- a/redhat/libraries/libkipi/libkipi-14.0.0.spec +++ b/redhat/libraries/libkipi/libkipi.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg libkipi %define tde_prefix /opt/trinity @@ -82,14 +82,17 @@ BuildRequires: lcms-devel # JPEG support BuildRequires: libjpeg-devel -# AUTOTOOLS -BuildRequires: automake autoconf libtool -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}ltdl-devel -%endif -%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220 -BuildRequires: libtool-ltdl-devel -%endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + +# CMAKE +BuildRequires: cmake >= 2.8 %description Libkipi is a library @@ -161,37 +164,46 @@ Homepage: http://www.kipi-plugins.org/ %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -%__make %{?_smp_mflags} + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DDATA_INSTALL_DIR="%{tde_datadir}/apps" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DSERVICETYPES_INSTALL_DIR="%{tde_datadir}/servicetypes" \ + -DICON_INSTALL_DIR="%{tde_datadir}/icons" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ + \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ + \ + .. %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -200,7 +212,4 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} - - - %changelog diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec deleted file mode 100644 index 9945da33c..000000000 --- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec +++ /dev/null @@ -1,514 +0,0 @@ -# Default version for this component -%define tde_pkg libksquirrel -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Trinity image viewer -Epoch: 1 -Version: 0.8.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Environment/Libraries - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: libksquirrel-3.5.13-detect_netpbm.patch -Patch1: libksquirrel-3.5.13.2-fix_giflib5_support.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: desktop-file-utils -BuildRequires: gettext - -BuildRequires: gettext-devel -BuildRequires: transfig -BuildRequires: OpenEXR-devel -BuildRequires: libtiff-devel - -%if 0%{?suse_version} -BuildRequires: giflib-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} -BuildRequires: libungif-devel -%endif - -# DJVU support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_djvu 1 -BuildRequires: djvulibre -%endif - -# XMEDCON support -%if 0%{?fedora} -%define with_xmedcon 1 -BuildRequires: xmedcon -BuildRequires: xmedcon-devel -%endif - -# RSVG support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_svg 1 -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: librsvg2 -%endif -%if 0%{?fedora} || 0%{?rhel} >= 7 -BuildRequires: librsvg2-tools -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: librsvg -%endif -%if 0%{?suse_version} -BuildRequires: rsvg-view -BuildRequires: librsvg-devel -%endif -%endif - -# JASPER support -%if 0%{?rhel} >=4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_jasper 1 -%if 0%{?suse_version} -BuildRequires: libjasper-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}jasper-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: jasper-devel -%endif -%endif - -# FREETYPE support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_freetype 1 -%if 0%{?suse_version} == 1140 -BuildRequires: freetype2-devel -%else -BuildRequires: freetype-devel -%endif -%endif - -# WMF support -BuildRequires: libwmf-devel - -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -BuildRequires: netpbm -%else -BuildRequires: netpbm-progs -%endif - - -%description -Runtime libraries for KSquirrel. - - -%package devel -Group: Development/Libraries -Summary: Trinity image viewer -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description devel -Development libraries for KSquirrel. - - -%package tools -Summary: Trinity image viewer -Group: Environment/Libraries -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description tools -Tools for KSquirrel. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .netpbm -%patch1 -p1 -b .giflib5 - -# FIXME: under PCLinuxOS, headers are under 'freetype2' not 'freetype' -if [ -r /usr/include/freetype2/ftbitmap.h ]; then - %__sed -i "configure.ac" -e "s|freetype/ftbitmap.h|freetype2/ftbitmap.h|" - %__sed -i "kernel/kls_ttf/ttf2pnm.cpp" -e "s|freetype/config/|freetype2/config/|" -fi - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --includedir=%{tde_includedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - %{?with_djvu:--enable-djvu} - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING LICENSE README -%{tde_libdir}/ksquirrel-libs/libkls_avs.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_avs.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_bmp.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_bmp.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_camera.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_camera.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_cut.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_cut.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_dds.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_dds.so.0.8.0 -%if 0%{?with_xmedcon} -%{tde_libdir}/ksquirrel-libs/libkls_dicom.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_dicom.so.0.8.0 -%endif -%if 0%{?with_djvu} -%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_djvu.so.0.8.0 -%endif -%{tde_libdir}/ksquirrel-libs/libkls_eps.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_eps.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_fig.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_fig.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_fli.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_fli.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_gif.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_gif.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_hdr.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_hdr.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_ico.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_ico.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_iff.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_iff.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_jbig.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_jbig.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_koala.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_koala.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_leaf.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_leaf.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_lif.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_lif.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_mac.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_mac.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_mdl.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_mdl.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_mng.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_mng.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_mtv.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_neo.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_neo.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_openexr.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_openexr.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_pcx.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_pcx.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_pi1.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_pi1.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_pi3.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_pi3.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_pix.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_pix.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_png.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_png.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_pnm.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_pnm.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_psd.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_psd.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_psp.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_psp.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_pxr.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_pxr.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_ras.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_ras.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_sct.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_sct.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_sgi.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_sgi.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_sun.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_sun.so.0.8.0 -%if 0%{?with_svg} -%{tde_libdir}/ksquirrel-libs/libkls_svg.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_svg.so.0.8.0 -%endif -%{tde_libdir}/ksquirrel-libs/libkls_tga.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_tga.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_tiff.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_tiff.so.0.8.0 -%if 0%{?with_freetype} -%{tde_libdir}/ksquirrel-libs/libkls_ttf.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_ttf.so.0.8.0 -%endif -%{tde_libdir}/ksquirrel-libs/libkls_utah.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_utah.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_wal.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_wal.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_wmf.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_wmf.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_xbm.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_xbm.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_xcf.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_xcf.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_xcur.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_xcur.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_xim.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_xim.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_xpm.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_xpm.so.0.8.0 -%{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0 -%{tde_libdir}/ksquirrel-libs/libkls_xwd.so.0.8.0 -%{tde_libdir}/libksquirrel-libs-png.so.0 -%{tde_libdir}/libksquirrel-libs-png.so.0.0.0 -%{tde_libdir}/libksquirrel-libs.so.0 -%{tde_libdir}/libksquirrel-libs.so.0.8.0 -%{tde_datadir}/ksquirrel-libs/libkls_camera.so.ui -%if 0%{?with_djvu} -%{tde_datadir}/ksquirrel-libs/libkls_djvu.so.ui -%endif -%if 0%{?with_svg} -%{tde_datadir}/ksquirrel-libs/libkls_svg.so.ui -%endif -%{tde_datadir}/ksquirrel-libs/libkls_tiff.so.ui -%{tde_datadir}/ksquirrel-libs/libkls_xcf.so.ui -%{tde_datadir}/ksquirrel-libs/rgbmap - -%files devel -%defattr(-,root,root,-) -%{tde_includedir}/ksquirrel-libs/error.h -%{tde_includedir}/ksquirrel-libs/fileio.h -%{tde_includedir}/ksquirrel-libs/fmt_codec_base.h -%{tde_includedir}/ksquirrel-libs/fmt_defs.h -%{tde_includedir}/ksquirrel-libs/fmt_types.h -%{tde_includedir}/ksquirrel-libs/fmt_utils.h -%{tde_includedir}/ksquirrel-libs/settings.h -%{tde_libdir}/ksquirrel-libs/libkls_avs.la -%{tde_libdir}/ksquirrel-libs/libkls_avs.so -%{tde_libdir}/ksquirrel-libs/libkls_bmp.la -%{tde_libdir}/ksquirrel-libs/libkls_bmp.so -%{tde_libdir}/ksquirrel-libs/libkls_camera.la -%{tde_libdir}/ksquirrel-libs/libkls_camera.so -%{tde_libdir}/ksquirrel-libs/libkls_cut.la -%{tde_libdir}/ksquirrel-libs/libkls_cut.so -%{tde_libdir}/ksquirrel-libs/libkls_dds.la -%{tde_libdir}/ksquirrel-libs/libkls_dds.so -%if 0%{?with_xmedcon} -%{tde_libdir}/ksquirrel-libs/libkls_dicom.la -%{tde_libdir}/ksquirrel-libs/libkls_dicom.so -%endif -%if 0%{?with_djvu} -%{tde_libdir}/ksquirrel-libs/libkls_djvu.la -%{tde_libdir}/ksquirrel-libs/libkls_djvu.so -%endif -%{tde_libdir}/ksquirrel-libs/libkls_eps.la -%{tde_libdir}/ksquirrel-libs/libkls_eps.so -%{tde_libdir}/ksquirrel-libs/libkls_fig.la -%{tde_libdir}/ksquirrel-libs/libkls_fig.so -%{tde_libdir}/ksquirrel-libs/libkls_fli.la -%{tde_libdir}/ksquirrel-libs/libkls_fli.so -%{tde_libdir}/ksquirrel-libs/libkls_gif.la -%{tde_libdir}/ksquirrel-libs/libkls_gif.so -%{tde_libdir}/ksquirrel-libs/libkls_hdr.la -%{tde_libdir}/ksquirrel-libs/libkls_hdr.so -%{tde_libdir}/ksquirrel-libs/libkls_ico.la -%{tde_libdir}/ksquirrel-libs/libkls_ico.so -%{tde_libdir}/ksquirrel-libs/libkls_iff.la -%{tde_libdir}/ksquirrel-libs/libkls_iff.so -%{tde_libdir}/ksquirrel-libs/libkls_jbig.la -%{tde_libdir}/ksquirrel-libs/libkls_jbig.so -%{tde_libdir}/ksquirrel-libs/libkls_jpeg.la -%{tde_libdir}/ksquirrel-libs/libkls_jpeg.so -%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.la -%{tde_libdir}/ksquirrel-libs/libkls_jpeg2000.so -%{tde_libdir}/ksquirrel-libs/libkls_koala.la -%{tde_libdir}/ksquirrel-libs/libkls_koala.so -%{tde_libdir}/ksquirrel-libs/libkls_leaf.la -%{tde_libdir}/ksquirrel-libs/libkls_leaf.so -%{tde_libdir}/ksquirrel-libs/libkls_lif.la -%{tde_libdir}/ksquirrel-libs/libkls_lif.so -%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.la -%{tde_libdir}/ksquirrel-libs/libkls_ljpeg.so -%{tde_libdir}/ksquirrel-libs/libkls_mac.la -%{tde_libdir}/ksquirrel-libs/libkls_mac.so -%{tde_libdir}/ksquirrel-libs/libkls_mdl.la -%{tde_libdir}/ksquirrel-libs/libkls_mdl.so -%{tde_libdir}/ksquirrel-libs/libkls_mng.la -%{tde_libdir}/ksquirrel-libs/libkls_mng.so -%{tde_libdir}/ksquirrel-libs/libkls_mtv.la -%{tde_libdir}/ksquirrel-libs/libkls_mtv.so -%{tde_libdir}/ksquirrel-libs/libkls_neo.la -%{tde_libdir}/ksquirrel-libs/libkls_neo.so -%{tde_libdir}/ksquirrel-libs/libkls_openexr.la -%{tde_libdir}/ksquirrel-libs/libkls_openexr.so -%{tde_libdir}/ksquirrel-libs/libkls_pcx.la -%{tde_libdir}/ksquirrel-libs/libkls_pcx.so -%{tde_libdir}/ksquirrel-libs/libkls_pi1.la -%{tde_libdir}/ksquirrel-libs/libkls_pi1.so -%{tde_libdir}/ksquirrel-libs/libkls_pi3.la -%{tde_libdir}/ksquirrel-libs/libkls_pi3.so -%{tde_libdir}/ksquirrel-libs/libkls_pix.la -%{tde_libdir}/ksquirrel-libs/libkls_pix.so -%{tde_libdir}/ksquirrel-libs/libkls_png.la -%{tde_libdir}/ksquirrel-libs/libkls_png.so -%{tde_libdir}/ksquirrel-libs/libkls_pnm.la -%{tde_libdir}/ksquirrel-libs/libkls_pnm.so -%{tde_libdir}/ksquirrel-libs/libkls_psd.la -%{tde_libdir}/ksquirrel-libs/libkls_psd.so -%{tde_libdir}/ksquirrel-libs/libkls_psp.la -%{tde_libdir}/ksquirrel-libs/libkls_psp.so -%{tde_libdir}/ksquirrel-libs/libkls_pxr.la -%{tde_libdir}/ksquirrel-libs/libkls_pxr.so -%{tde_libdir}/ksquirrel-libs/libkls_ras.la -%{tde_libdir}/ksquirrel-libs/libkls_ras.so -%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.la -%{tde_libdir}/ksquirrel-libs/libkls_rawrgb.so -%{tde_libdir}/ksquirrel-libs/libkls_sct.la -%{tde_libdir}/ksquirrel-libs/libkls_sct.so -%{tde_libdir}/ksquirrel-libs/libkls_sgi.la -%{tde_libdir}/ksquirrel-libs/libkls_sgi.so -%{tde_libdir}/ksquirrel-libs/libkls_sun.la -%{tde_libdir}/ksquirrel-libs/libkls_sun.so -%if 0%{?with_svg} -%{tde_libdir}/ksquirrel-libs/libkls_svg.la -%{tde_libdir}/ksquirrel-libs/libkls_svg.so -%endif -%{tde_libdir}/ksquirrel-libs/libkls_tga.la -%{tde_libdir}/ksquirrel-libs/libkls_tga.so -%{tde_libdir}/ksquirrel-libs/libkls_tiff.la -%{tde_libdir}/ksquirrel-libs/libkls_tiff.so -%if 0%{?with_freetype} -%{tde_libdir}/ksquirrel-libs/libkls_ttf.la -%{tde_libdir}/ksquirrel-libs/libkls_ttf.so -%endif -%{tde_libdir}/ksquirrel-libs/libkls_utah.la -%{tde_libdir}/ksquirrel-libs/libkls_utah.so -%{tde_libdir}/ksquirrel-libs/libkls_wal.la -%{tde_libdir}/ksquirrel-libs/libkls_wal.so -%{tde_libdir}/ksquirrel-libs/libkls_wbmp.la -%{tde_libdir}/ksquirrel-libs/libkls_wbmp.so -%{tde_libdir}/ksquirrel-libs/libkls_wmf.la -%{tde_libdir}/ksquirrel-libs/libkls_wmf.so -%{tde_libdir}/ksquirrel-libs/libkls_xbm.la -%{tde_libdir}/ksquirrel-libs/libkls_xbm.so -%{tde_libdir}/ksquirrel-libs/libkls_xcf.la -%{tde_libdir}/ksquirrel-libs/libkls_xcf.so -%{tde_libdir}/ksquirrel-libs/libkls_xcur.la -%{tde_libdir}/ksquirrel-libs/libkls_xcur.so -%{tde_libdir}/ksquirrel-libs/libkls_xim.la -%{tde_libdir}/ksquirrel-libs/libkls_xim.so -%{tde_libdir}/ksquirrel-libs/libkls_xpm.la -%{tde_libdir}/ksquirrel-libs/libkls_xpm.so -%{tde_libdir}/ksquirrel-libs/libkls_xwd.la -%{tde_libdir}/ksquirrel-libs/libkls_xwd.so -%{tde_libdir}/libksquirrel-libs-png.la -%{tde_libdir}/libksquirrel-libs-png.so -%{tde_libdir}/libksquirrel-libs.la -%{tde_libdir}/libksquirrel-libs.so -%{tde_libdir}/pkgconfig/ksquirrellibs.pc -%{tde_docdir}/ksquirrel-libs/ - -%files tools -%defattr(-,root,root,-) -%{tde_bindir}/ksquirrel-libs-camera2ppm -%{tde_bindir}/ksquirrel-libs-dcraw -%if 0%{?with_xmedcon} -%{tde_bindir}/ksquirrel-libs-dicom2png -%endif -%{tde_bindir}/ksquirrel-libs-fig2ppm -%{tde_bindir}/ksquirrel-libs-iff2ppm -%{tde_bindir}/ksquirrel-libs-leaf2ppm -%{tde_bindir}/ksquirrel-libs-ljpeg2ppm -%{tde_bindir}/ksquirrel-libs-ljpeg2ppm-s -%{tde_bindir}/ksquirrel-libs-mac2ppm -%{tde_bindir}/ksquirrel-libs-neo2ppm -%{tde_bindir}/ksquirrel-libs-pi12ppm -%{tde_bindir}/ksquirrel-libs-pi32ppm -%if 0%{?with_svg} -%{tde_bindir}/ksquirrel-libs-svg2png -%endif -%if 0%{?with_freetype} -%{tde_bindir}/ksquirrel-libs-ttf2pnm -%endif -%{tde_bindir}/ksquirrel-libs-utah2ppm -%{tde_bindir}/ksquirrel-libs-xcf2pnm -%{tde_bindir}/ksquirrel-libs-xim2ppm - - -%changelog diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel.spec index 9254f1700..d2485f0ed 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec +++ b/redhat/libraries/libksquirrel/libksquirrel.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} >= 23 +%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8 %define _hardened_ldflags %nil %endif @@ -26,7 +26,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg libksquirrel %define tde_prefix /opt/trinity @@ -97,7 +97,7 @@ BuildRequires: OpenEXR-devel BuildRequires: libtiff-devel # GIF support -%if 0%{?suse_version} || 0%{?fedora} >= 28 +%if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8 BuildRequires: giflib-devel %else BuildRequires: libungif-devel @@ -107,7 +107,7 @@ BuildRequires: libungif-devel BuildRequires: libmng-devel # DJVU support -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_djvu 1 BuildRequires: djvulibre %endif @@ -135,7 +135,11 @@ BuildRequires: librsvg2-tools BuildRequires: librsvg %endif %if 0%{?suse_version} +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200 +BuildRequires: rsvg-convert +%else BuildRequires: rsvg-view +%endif BuildRequires: librsvg-devel %endif %endif @@ -530,6 +534,10 @@ fi unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +%if 0%{?suse_version} >= 1550 +CXXFLAGS="${CXXFLAGS} -std=c++11" +%endif + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec b/redhat/libraries/libtdeldap/libtdeldap.spec index c13dbe2ae..297740616 100644 --- a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec +++ b/redhat/libraries/libtdeldap/libtdeldap.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg libtdeldap %define tde_prefix /opt/trinity @@ -64,9 +64,11 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gcc-c++ +BuildRequires: cmake >= 2.8 +BuildRequires: pkgconfig -# AUTOTOOLS -BuildRequires: automake autoconf libtool +# LIBTOOL +BuildRequires: automake %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}ltdl-devel %endif @@ -94,12 +96,12 @@ BuildRequires: openldap24-libs-devel %endif # HEIMDAL support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: heimdal-devel -%endif -%if 0%{?suse_version} -BuildRequires: libheimdal-devel -%endif +#%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} +#BuildRequires: heimdal-devel +#%endif +#%if 0%{?suse_version} +#BuildRequires: libheimdal-devel +#%endif # UDEV support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 @@ -115,6 +117,15 @@ BuildRequires: libcom_err-devel BuildRequires: %{_lib}ext2fs-devel %endif +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + %description LDAP interface library for TDE management modules. @@ -154,54 +165,48 @@ libtdeldap-trinity-dev contains development files and documentation. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -extra_includes="%{_includedir}" -extra_libs="%{_libdir}" - -if [ -d "%{_includedir}/openldap24" ]; then - extra_includes="%{_includedir}/openldap24:${extra_includes}" - extra_libs="%{_libdir}/openldap24:${extra_libs}" -fi - -if [ -d "%{_includedir}/heimdal" ]; then - extra_includes="%{_includedir}/heimdal:${extra_includes}" - extra_libs="%{_libdir}/heimdal:${extra_libs}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \ + \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DBUILD_ALL=ON \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=ON \ \ - --with-extra-includes=${extra_includes} \ - --with-extra-libs=${extra_libs} \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %clean diff --git a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec index ab21298c0..738884fe6 100644 --- a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec +++ b/redhat/libraries/libtqt-perl/libtqt-perl.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg libtqt-perl %define tde_prefix /opt/trinity @@ -166,7 +166,7 @@ export PATH="%{tde_bindir}:${PATH}" # Unwanted files %__rm -f %{buildroot}%{perl_archlib}/perllocal.pod %__rm -f %{buildroot}%{perl_vendorarch}/auto/TQt/.packlist - +chmod u+w %{buildroot}%{perl_archlib}/vendor_perl/auto/TQt/TQt.so %clean %__rm -rf %{buildroot} diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch deleted file mode 100644 index e02d15f98..000000000 --- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_extra_module_dir.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- pykdeextensions-3.5.13.1/src/kdedistutils.py.extramodule 2012-09-08 17:33:05.000000000 +0000 -+++ pykdeextensions-3.5.13.1/src/kdedistutils.py 2012-10-02 19:19:40.185384207 +0000 -@@ -712,6 +712,8 @@ - - # Build the 'stub' code. - cppcode = self.cpptemplate % {"moduledir": self.data_dir, -+ "extramodule": os.getenv("EXTRA_MODULE_DIR"), -+ "pyqt_dir": self.pyqt_dir, - "modulename": modulename, - "factoryfunction": factoryfunction, - "python_version": python_version} -@@ -854,6 +856,8 @@ - #include <sip.h> - - #define MODULE_DIR "%(moduledir)s" -+#define EXTRA_MODULE_DIR "%(extramodule)s" -+#define PYQT_DIR "%(pyqt_dir)s" - #define MODULE_NAME "%(modulename)s" - #define FACTORY "%(factoryfunction)s" - #define CPP_FACTORY %(factoryfunction)s ---- pykdeextensions-3.5.13.1/src/kdedistutils.py.ORI 2013-04-07 17:54:28.531813437 +0200 -+++ pykdeextensions-3.5.13.1/src/kdedistutils.py 2013-04-07 17:56:15.510529614 +0200 -@@ -903,6 +906,18 @@ - if(!pyize->appendToSysPath (path.latin1 ())) { - return report_error ("***Failed to set sys.path\n"); - } -+ -+ // Add the extra path to the python script to the interpreter search path. -+ TQString extrapath = TQString(EXTRA_MODULE_DIR); -+ if(!pyize->appendToSysPath (extrapath.latin1 ())) { -+ return report_error ("***Failed to set extra sys.path\n"); -+ } -+ -+ // Add the PYQT path to the python script to the interpreter search path. -+ TQString pyqt_dir = TQString(PYQT_DIR); -+ if(!pyize->appendToSysPath (pyqt_dir.latin1 ())) { -+ return report_error ("***Failed to set PYQT sys.path\n"); -+ } - - // Load the Python script. - PyObject *pyModule = pyize->importModule ((char *)script.latin1 ()); diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch deleted file mode 100644 index 2d6863f65..000000000 --- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.2-fix_include_dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pykdeextensions/src/kdedistutils.py.ORI 2012-08-27 22:10:18.873738368 +0200 -+++ pykdeextensions/src/kdedistutils.py 2012-08-27 22:10:50.234094262 +0200 -@@ -539,7 +539,7 @@ - canidatepaths.append(os.path.join(kdedir,"include")) - canidatepaths.append(os.path.join(install.prefix,"include")) - canidatepaths.append('/opt/trinity/include') -- canidatepaths.append('/opt/kde/include') -+ canidatepaths.append('/opt/trinity/include/tde') - self.kde_inc_dir = FindFileInPaths('kapplication.h',canidatepaths) - if self.kde_inc_dir is None: - raise SystemExit, "Failed to find the KDE header file directory." diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec deleted file mode 100644 index 069af8cec..000000000 --- a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec +++ /dev/null @@ -1,225 +0,0 @@ -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-pytdeextensions -Summary: Python packages to support TDE applications (scripts) [Trinity] -Version: 0.4.0 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.simonzone.com/software/pykdeextensions - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - - -# [pykdeextensions] Fix hardcoded path to Guidance python libraries [Bug #999] -Patch2: pykdeextensions-3.5.13.2-fix_extra_module_dir.patch -# [pykdeextensions] Fix include directory search location -Patch5: pykdeextensions-3.5.13.2-fix_include_dir.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: desktop-file-utils -BuildRequires: gettext - -# Python stuff -BuildRequires: python-qt3-devel -BuildRequires: trinity-python-trinity-devel - -Requires: trinity-libpythonize0 = %{version}-%{release} - -Obsoletes: trinity-pykdeextensions < %{version}-%{release} -Provides: trinity-pykdeextensions = %{version}-%{release} - - -%description -PyTDE Extensions is a collection of software and Python packages -to support the creation and installation of TDE applications. - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_datadir}/apps/pykdeextensions/ -%{tde_tdedocdir}/HTML/en/pykdeextensions/ -%{python_sitearch}/* - -########## - -%package -n trinity-libpythonize0 -Summary: Python packages to support KDE applications (library) [Trinity] -Group: Environment/Libraries - -%description -n trinity-libpythonize0 -PyTDE Extensions is a collection of software and Python packages -to support the creation and installation of KDE applications. - -This package contains the libpythonize library files. - -%post -n trinity-libpythonize0 -/sbin/ldconfig - -%postun -n trinity-libpythonize0 -/sbin/ldconfig - -%files -n trinity-libpythonize0 -%defattr(-,root,root,-) -%{tde_libdir}/libpythonize.so.* - -########## - -%package -n trinity-libpythonize0-devel -Summary: Python packages to support KDE applications (development) [Trinity] -Group: Development/Libraries -Requires: trinity-libpythonize0 = %{version}-%{release} - -%description -n trinity-libpythonize0-devel -PyTDE Extensions is a collection of software and Python packages -to support the creation and installation of TDE applications. - -This package contains the libpythonize development files. - -%post -n trinity-libpythonize0-devel -/sbin/ldconfig - -%postun -n trinity-libpythonize0-devel -/sbin/ldconfig - -%files -n trinity-libpythonize0-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/*.h -%{tde_libdir}/libpythonize.la -%{tde_libdir}/libpythonize.so - -########## - -%package devel -Summary: Meta-package to install all pytdeextensions development files -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: trinity-libpythonize0-devel = %{version}-%{release} - -%description devel -%{summary} - -%files devel - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch2 -p1 -b .extramodule -%patch5 -p1 -b .incdir - -# Changes library directory to 'lib64' -# Also other fixes for distributions ... -for f in src/*.py; do - %__sed -i "${f}" \ - -e "s|%{tde_prefix}/lib/|%{tde_libdir}/|g" \ - -e "s|/usr/lib/pyshared/python\*|%{python_sitearch}|g" \ - -e "s|'pykde-dir=',None,|'pykde-dir=','%{python_sitearch}',|g" \ - -e "s|self.pykde_dir = None|self.pykde_dir = \"%{python_sitearch}\"|g" \ - -e "s|%{tde_includedir}/kde|%{tde_tdeincludedir}|g" \ - -e 's|"/kde"|"/tde"|' -done - -# Do not look for 'libpython2.x.so' (from -devel) package. -# Instead look for versioned runtime library. -LIBPYTHON="$(readlink %{_libdir}/libpython2.*.so)" -if [ -f "%{_libdir}/${LIBPYTHON}" ]; then - %__sed -i "src/kdedistutils.py" \ - -e "s|#define LIB_PYTHON \".*\"|#define LIB_PYTHON \"%{_libdir}/${LIBPYTHON}\"|" -fi - -# Set PyQt directory to actual directory -%__sed -i "src/kdedistutils.py" \ - -e "s|'pyqt-dir=','%{python_sitearch}'|'pyqt-dir=','%{python_sitearch}/python-qt3'|g" \ - -e "s|self.pyqt_dir = \"%{python_sitearch}\"|self.pyqt_dir = \"%{python_sitearch}/python-qt3\"|g" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 - -%__mkdir_p build -./setup.py build_libpythonize - -%install -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 - -# Avoids 'error: byte-compiling is disabled.' on Mandriva/Mageia -export PYTHONDONTWRITEBYTECODE= - -%__rm -rf %{buildroot} - -./setup.py install \ - --root=%{buildroot} \ - --prefix=%{tde_prefix} \ - --install-clib=%{tde_libdir} \ - --install-cheaders=%{tde_tdeincludedir} \ - -v - -# Removes BUILDROOT directory reference in installed files -for f in \ - %{buildroot}%{tde_libdir}/libpythonize.la \ - %{buildroot}%{tde_datadir}/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py \ - %{buildroot}%{tde_datadir}/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py \ -; do - %__sed -i "${f}" -e "s|%{buildroot}||g" -: -done - -# Moves PYTHON libraries to distribution directory -%__mkdir_p %{buildroot}%{python_sitearch} -%__mv -f %{buildroot}%{tde_prefix}/lib/python*/site-packages/* %{buildroot}%{python_sitearch} -%__rm -rf %{buildroot}%{tde_prefix}/lib/python*/site-packages - -# Removes useless files -%__rm -rf %{?buildroot}%{tde_libdir}/*.a - -# Fix permissions on include files -%__chmod 644 %{?buildroot}%{tde_tdeincludedir}/*.h - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions.spec index 88888da02..e6c806fac 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions.spec @@ -15,12 +15,10 @@ # Please submit bugfixes or comments via http://www.trinitydesktop.org/ # -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg pytdeextensions %define tde_prefix /opt/trinity @@ -76,6 +74,18 @@ Requires: trinity-libpythonize0 = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: sip4-tqt-devel >= 4.10.5 Requires: sip4-tqt >= 4.10.5 +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel + Obsoletes: trinity-pykdeextensions < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-pykdeextensions = %{?epoch:%{epoch}:}%{version}-%{release} @@ -185,13 +195,25 @@ fi %__sed -i "src/pythonize."* -e "s|const char \*object|char \*object|g" %endif +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%__sed -i "app_templates/kcontrol_module/setup.py" \ + "app_templates/kcontrol_module/src/kcontrol_module.py" \ + "app_templates/kdeapp/setup.py" \ + "app_templates/kdeapp/src/kdeapp.py" \ + "app_templates/kdeutility/setup.py" \ + "app_templates/kdeutility/src/kdeutility.py" \ + "app_templates/tdeioslave/setup.py" \ + "app_templates/tdeioslave/src/tdeioslave.py" \ + -e "s|/usr/bin/python|/usr/bin/env python2|" +%endif + %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" %__mkdir_p build -./setup.py build_libpythonize +%__python ./setup.py build_libpythonize %install @@ -203,7 +225,7 @@ export PYTHONDONTWRITEBYTECODE= %__rm -rf %{buildroot} -./setup.py install \ +%__python ./setup.py install \ --root=%{buildroot} \ --prefix=%{tde_prefix} \ --install-clib=%{tde_libdir} \ diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch deleted file mode 100644 index fb41680f1..000000000 --- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- trinity-python-trinity-3.5.13.2/sip/kdecore/kconfigbase.sip.ORI 2014-03-22 23:47:29.217935267 +0100 -+++ trinity-python-trinity-3.5.13.2/sip/kdecore/kconfigbase.sip 2014-03-22 23:47:53.355370778 +0100 -@@ -153,10 +153,8 @@ - bool deleteGroup (const QString&, bool = 1, bool = 0); - void setDollarExpansion (bool = 1); - bool isDollarExpansion () const; -- virtual void rollback (bool = 1); - virtual void sync (); - bool isDirty () const; -- virtual void setReadOnly (bool); - bool isReadOnly () const; - bool hasKey (const QString&) const; - virtual QMap<QString,QString> entryMap (const QString&) const = 0; -@@ -182,6 +180,9 @@ - bool hasDefault (const QString&) const; - %End - -+private: -+ virtual void rollback (bool = 1); -+ virtual void setReadOnly (bool); - - protected: - void setLocale (); ---- trinity-python-trinity-3.5.13.2/sip/kdeui/kactivelabel.sip.ORI 2014-03-22 23:56:28.448338190 +0100 -+++ trinity-python-trinity-3.5.13.2/sip/kdeui/kactivelabel.sip 2014-03-22 23:58:44.540121011 +0100 -@@ -53,6 +53,8 @@ - virtual void keyPressEvent (QKeyEvent*); - %End - -+private: -+ virtual void setSource(const QString&); - - }; // class KActiveLabel - ---- trinity-python-trinity-3.5.13.2/sip/kdeui/kpixmapregionselectorwidget.sip.ORI 2014-03-23 00:02:17.343077605 +0100 -+++ trinity-python-trinity-3.5.13.2/sip/kdeui/kpixmapregionselectorwidget.sip 2014-03-23 00:03:42.151069824 +0100 -@@ -54,6 +54,8 @@ - protected: - virtual KPopupMenu* createPopupMenu (); - -+private: -+ virtual bool eventFilter(QObject*, QEvent*); - }; // class KPixmapRegionSelectorWidget - - %End ---- trinity-python-trinity-3.5.13.2/sip/kfile/knotifydialog.sip.ORI 2014-03-23 00:13:21.583382771 +0100 -+++ trinity-python-trinity-3.5.13.2/sip/kfile/knotifydialog.sip 2014-03-23 00:17:02.715146838 +0100 -@@ -77,6 +77,8 @@ - virtual void addApplicationEvents (const QString&); - virtual void clearApplicationEvents (); - -+private slots: -+ virtual void slotDefault(); - }; // class KNotifyDialog - - %End diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch deleted file mode 100644 index 5921695e8..000000000 --- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_tde_includedir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trinity-python-trinity-3.5.13.2/configure.py.ORI 2013-01-20 14:28:38.844683333 +0100 -+++ trinity-python-trinity-3.5.13.2/configure.py 2013-01-20 14:29:05.179062079 +0100 -@@ -410,7 +410,7 @@ - - if not opt_kdeincdir: - incSearchPaths = [os.path.join (opt_kdebasedir, "include")] -- incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "kde")) # Red Hat -+ incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "tde")) # Red Hat - opt_kdeincdir = search ("kapplication.h", incSearchPaths) - - def check_kde_installation(): diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec deleted file mode 100644 index 279346a1f..000000000 --- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec +++ /dev/null @@ -1,186 +0,0 @@ -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -%define __arch_install_post %{nil} - - -Name: trinity-python-trinity -Summary: Trinity bindings for Python [Trinity] -Version: 3.16.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -#URL: http://www.simonzone.com/software/pykdeextensions -URL: http://www.trinitydesktop.org/ - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -# Fix include subdirectory 'tde' instead of 'kde' -Patch1: python-trinity-3.5.13.2-fix_tde_includedir.patch -# Fix "is private" FTBFS using SIP >= 4.15 -Patch2: python-trinity-3.5.13.2-fix_is_private.patch - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: desktop-file-utils -BuildRequires: gettext - -# PYTHON support -BuildRequires: python -BuildRequires: python-qt3-devel - -# SIP support -%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 -# RHEL 4/5 comes with old version, so we brought ours ... -BuildRequires: trinity-sip-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: python-sip -%endif -%if 0%{?rhel} >= 6 || 0%{?fedora} -BuildRequires: sip-devel -%endif -%if 0%{?suse_version} -BuildRequires: python-sip-devel -%endif - -Obsoletes: python-trinity < %{version}-%{release} -Provides: python-trinity = %{version}-%{release} - -%description -Python binding module that provides wide access to the Trinity API, -also known as PyTDE. Using this, you'll get (for example) classes -from kio, kjs, khtml and kprint. - - -%package devel -Summary: Trinity bindings for Python - Development files and scripts [Trinity] -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -Obsoletes: python-trinity-devel < %{version}-%{release} -Provides: python-trinity-devel = %{version}-%{release} - -%description devel -Development .sip files with definitions of PyTDE classes. They -are needed to build PyTDE, but also as building blocks of other -packages based on them. -The package also contains kdepyuic, a wrapper script around python-qt3's -user interface compiler. - - -%package doc -Summary: Documentation and examples for PyTDE [Trinity] -Group: Development/Libraries - -Obsoletes: python-trinity-doc < %{version}-%{release} -Provides: python-trinity-doc = %{version}-%{release} - -%description doc -General documentation and examples for PyTDE providing programming -tips and working code you can use to learn from. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .inc -%patch2 -p1 -b .private - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LD_RUN_PATH="%{tde_libdir}" -export KDEDIR=%{tde_prefix} - -export DH_OPTIONS - -export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 - -%__python configure.py \ - -k %{tde_prefix} \ - -L %{_lib} \ - -v %{_datadir}/sip/trinity - -# Shitty hack to add LDFLAGS -%if 0%{?mgaversion} || 0%{?mdkversion} -%__sed -i */Makefile \ - -e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|" -%endif - -# Shitty hack to fix issue with SIP >= 4.15 -%__sed -i "kfile/sipkfilepart0.cpp" \ - -e "s| KFileIconView::selectionMode(| KFileView::selectionMode(|g" \ - -e "s| KFileIconView::clear()| KFileView::clear()|g" \ - -e "s| KFileDetailView::selectionMode(| KFileView::selectionMode(|g" \ - -e "s| KFileDetailView::clear()| KFileView::clear()|g" - - -%__make %{_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Install documentation -%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/ -%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/ - - -%clean -%__rm -rf %{buildroot} - - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README -%{python_sitearch}/*.so -%{python_sitearch}/dcop*.py* -%{python_sitearch}/pykde*.py* - -%files devel -%defattr(-,root,root,-) -%{tde_bindir}/kdepyuic -# The SIP files are outside TDE's prefix -%{_datadir}/sip/trinity/ - -%files doc -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/en/python-trinity/ - - -%changelog diff --git a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec b/redhat/libraries/python-trinity/python-trinity.spec index f969038f9..c70454f2b 100644 --- a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec +++ b/redhat/libraries/python-trinity/python-trinity.spec @@ -15,12 +15,10 @@ # Please submit bugfixes or comments via http://www.trinitydesktop.org/ # -%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg python-trinity %define tde_prefix /opt/trinity @@ -65,7 +63,17 @@ BuildRequires: autoconf automake libtool m4 BuildRequires: gcc-c++ # PYTHON support -BuildRequires: python +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel + BuildRequires: python-tqt-devel Requires: python-tqt @@ -139,6 +147,10 @@ tips and working code you can use to learn from. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +%__sed -i "contrib/tdepyuic" -e "s|/usr/bin/env python|/usr/bin/env python2|" +%endif + %build unset QTDIR QTINC QTLIB diff --git a/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec b/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec deleted file mode 100644 index 2d7946091..000000000 --- a/redhat/main/tde-i18n/tde-i18n-3.5.13.2.spec +++ /dev/null @@ -1,1492 +0,0 @@ -# -# spec file for package tde-i18n (version 3.5.13-SRU) -# -# 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 3.5.13.2 -%endif -%define tde_pkg tde-i18n -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -# Builds all supported languages (not unsupported ones) -%if "%{?TDE_LANGS}" == "" -%define TDE_LANGS af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW -%endif - - -Name: trinity-%{tde_pkg} -Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} -Summary: Internationalization support for Trinity -Group: User Interface/Desktops -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) -BuildArch: noarch - -# Speed build options -%define debug_package %{nil} -%define __spec_install_post %{nil} -AutoReq: no - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tdelibs-devel >= %{tde_version} - -BuildRequires: findutils -BuildRequires: gettext -BuildRequires: gcc-c++ - -%description -This package contains %{summary}. - -########## - -%package Afrikaans -Summary: Afrikaans(af) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-af = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Afrikaans < %{version}-%{release} -Provides: trinity-kde-i18n-Afrikaans = %{version}-%{release} - -%description Afrikaans -This package contains %{summary}. - -%files Afrikaans -%defattr(-,root,root,-) -%{tde_datadir}/locale/af/ - -########## - -%package Arabic -Summary: Arabic(ar) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ar = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release} -Provides: trinity-kde-i18n-Arabic = %{version}-%{release} - -%description Arabic -This package contains %{summary}. - -%files Arabic -%defattr(-,root,root,-) -%{tde_datadir}/locale/ar/ - -########## - -%package Azerbaijani -Summary: Azerbaijani(az) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-az = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release} -Provides: trinity-kde-i18n-Arabic = %{version}-%{release} - -%description Azerbaijani -This package contains %{summary}. - -%files Azerbaijani -%defattr(-,root,root,-) -%{tde_datadir}/locale/az/ - -########## - -%package Belarusian -Summary: Belarusian(be) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-be = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Belarusian < %{version}-%{release} -Provides: trinity-kde-i18n-Belarusian = %{version}-%{release} - -%description Belarusian -This package contains %{summary}. - -%files Belarusian -%defattr(-,root,root,-) -%{tde_datadir}/locale/be/ - -########## - -%package Bulgarian -Summary: Bulgarian(bg) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-bg = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Bulgarian < %{version}-%{release} -Provides: trinity-kde-i18n-Bulgarian = %{version}-%{release} - -%description Bulgarian -This package contains %{summary}. - -%files Bulgarian -%defattr(-,root,root,-) -%{tde_datadir}/locale/bg/ - -########## - -%package Bengali -Summary: Bengali(bn) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-bn = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Bengali < %{version}-%{release} -Provides: trinity-kde-i18n-Bengali = %{version}-%{release} - -%description Bengali -This package contains %{summary}. - -%files Bengali -%defattr(-,root,root,-) -%{tde_datadir}/locale/bn/ - -########## - -%package Tibetan -Summary: Tibetan(bo) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-bo = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Tibetan < %{version}-%{release} -Provides: trinity-kde-i18n-Tibetan = %{version}-%{release} - -%description Tibetan -This package contains %{summary}. - -#%files Tibetan -#%defattr(-,root,root,-) -#%{tde_datadir}/locale/bo/ - -########## - -%package Breton -Summary: Breton(br) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-br = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Breton < %{version}-%{release} -Provides: trinity-kde-i18n-Breton = %{version}-%{release} - -%description Breton -This package contains %{summary}. - -%files Breton -%defattr(-,root,root,-) -%{tde_datadir}/locale/br/ - -########## - -%package Bosnian -Summary: Bosnian(bs) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-bs = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Bosnian < %{version}-%{release} -Provides: trinity-kde-i18n-Bosnian = %{version}-%{release} - -%description Bosnian -This package contains %{summary}. - -%files Bosnian -%defattr(-,root,root,-) -%{tde_datadir}/locale/bs/ - -########## - -%package Catalan -Summary: Catalan(ca) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ca = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Catalan < %{version}-%{release} -Provides: trinity-kde-i18n-Catalan = %{version}-%{release} - -%description Catalan -This package contains %{summary}. - -%files Catalan -%defattr(-,root,root,-) -%{tde_datadir}/locale/ca/ -%{tde_tdedocdir}/HTML/ca/ - -########## - -%package Czech -Summary: Czech(cs) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-cs = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Czech < %{version}-%{release} -Provides: trinity-kde-i18n-Czech = %{version}-%{release} - -%description Czech -This package contains %{summary}. - -%files Czech -%defattr(-,root,root,-) -%{tde_datadir}/locale/cs/ -%{tde_tdedocdir}/HTML/cs/ - -########## - -%package Kashubian -Summary: Kashubian(csb) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-csb = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Kashubian < %{version}-%{release} -Provides: trinity-kde-i18n-Kashubian = %{version}-%{release} - -%description Kashubian -This package contains %{summary}. - -%files Kashubian -%defattr(-,root,root,-) -%{tde_datadir}/locale/csb/ - -########## - -%package Cymraeg -Summary: Cymraeg language support for TDE -Group: User Interface/Desktops -Obsoletes: trinity-kde-i18n-Cymraeg < %{version}-%{release} -Provides: trinity-kde-i18n-Cymraeg = %{version}-%{release} - -%description Cymraeg -This package contains %{summary}. - -########## - -%package Welsh -Summary: Welsh(cy) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-cy = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Welsh < %{version}-%{release} -Provides: trinity-kde-i18n-Welsh = %{version}-%{release} - -%description Welsh -This package contains %{summary}. - -%files Welsh -%defattr(-,root,root,-) -%{tde_datadir}/locale/cy/ - -########## - -%package Danish -Summary: Danish(da) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-da = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Danish < %{version}-%{release} -Provides: trinity-kde-i18n-Danish = %{version}-%{release} - -%description Danish -This package contains %{summary}. - -%files Danish -%defattr(-,root,root,-) -%{tde_datadir}/locale/da/ -%{tde_tdedocdir}/HTML/da/ - -########## - -%package German -Summary: German(de) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-de = %{version}-%{release} -Obsoletes: trinity-kde-i18n-German < %{version}-%{release} -Provides: trinity-kde-i18n-German = %{version}-%{release} - -%description German -This package contains %{summary}. - -%files German -%defattr(-,root,root,-) -%{tde_datadir}/locale/de/ -%{tde_tdedocdir}/HTML/de/ - -########## - -%package Greek -Summary: Greek(el) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-el = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Greek < %{version}-%{release} -Provides: trinity-kde-i18n-Greek = %{version}-%{release} - -%description Greek -This package contains %{summary}. - -%files Greek -%defattr(-,root,root,-) -%{tde_datadir}/locale/el/ - -########## - -%package British -Summary: British(en_GB) English support for TDE -Group: User Interface/Desktops -Provides: %{name}-en_GB = %{version}-%{release} -Obsoletes: trinity-kde-i18n-British < %{version}-%{release} -Provides: trinity-kde-i18n-British = %{version}-%{release} - -%description British -This package contains %{summary}. - -%files British -%defattr(-,root,root,-) -%{tde_datadir}/locale/en_GB/ -%{tde_tdedocdir}/HTML/en_GB/ - -########## - -%package Esperanto -Summary: Esperanto(eo) support for TDE -Group: User Interface/Desktops -Provides: %{name}-eo = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Esperanto < %{version}-%{release} -Provides: trinity-kde-i18n-Esperanto = %{version}-%{release} - -%description Esperanto -This package contains %{summary}. - -%files Esperanto -%defattr(-,root,root,-) -%{tde_datadir}/locale/eo/ - -########## - -%package Spanish -Summary: Spanish(es) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-es = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Spanish < %{version}-%{release} -Provides: trinity-kde-i18n-Spanish = %{version}-%{release} - -%description Spanish -This package contains %{summary}. - -%files Spanish -%defattr(-,root,root,-) -%{tde_datadir}/locale/es/ -%{tde_tdedocdir}/HTML/es/ - -########## - -%package Estonian -Summary: Estonian(et) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-et = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Estonian < %{version}-%{release} -Provides: trinity-kde-i18n-Estonian = %{version}-%{release} - -%description Estonian -This package contains %{summary}. - -%files Estonian -%defattr(-,root,root,-) -%{tde_datadir}/locale/et/ -%{tde_tdedocdir}/HTML/et/ - -########## - -%package Basque -Summary: Basque(eu) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-eu = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Basque < %{version}-%{release} -Provides: trinity-kde-i18n-Basque = %{version}-%{release} - -%description Basque -This package contains %{summary}. - -%files Basque -%defattr(-,root,root,-) -%{tde_datadir}/locale/eu/ -%{tde_tdedocdir}/HTML/eu/ - -########## - -%package Farsi -Summary: Farsi(fa) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-fa = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Farsi < %{version}-%{release} -Provides: trinity-kde-i18n-Farsi = %{version}-%{release} - -%description Farsi -This package contains %{summary}. - -%files Farsi -%defattr(-,root,root,-) -%{tde_datadir}/locale/fa/ - -########## - -%package Finnish -Summary: Finnish(fi) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-fi = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Finnish < %{version}-%{release} -Provides: trinity-kde-i18n-Finnish = %{version}-%{release} - -%description Finnish -This package contains %{summary}. - -%files Finnish -%defattr(-,root,root,-) -%{tde_datadir}/locale/fi/ -%{tde_tdedocdir}/HTML/fi/ - -########## - -%package Faroese -Summary: Faroese(fo) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-fo = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Faroese < %{version}-%{release} -Provides: trinity-kde-i18n-Faroese = %{version}-%{release} - -%description Faroese -This package contains %{summary}. - -#%files Faroese -#%defattr(-,root,root,-) -#%{tde_datadir}/locale/fo/ - -########## - -%package French -Summary: French(fr) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-fr = %{version}-%{release} -Obsoletes: trinity-kde-i18n-French < %{version}-%{release} -Provides: trinity-kde-i18n-French = %{version}-%{release} - -%description French -This package contains %{summary}. - -%files French -%defattr(-,root,root,-) -%{tde_datadir}/locale/fr/ -%{tde_tdedocdir}/HTML/fr/ - -########## - -%package Frisian -Summary: Frisian(fy) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-fy = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Frisian < %{version}-%{release} -Provides: trinity-kde-i18n-Frisian = %{version}-%{release} - -%description Frisian -This package contains %{summary}. - -%files Frisian -%defattr(-,root,root,-) -%{tde_datadir}/locale/fy/ - -########## - -%package Irish -Summary: Irish(ga) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ga = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Irish < %{version}-%{release} -Provides: trinity-kde-i18n-Irish = %{version}-%{release} - -%description Irish -This package contains %{summary}. - -%files Irish -%defattr(-,root,root,-) -%{tde_datadir}/locale/ga/ - -########## - -%package Galician -Summary: Galician(gl) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-gl = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Galician < %{version}-%{release} -Provides: trinity-kde-i18n-Galician = %{version}-%{release} - -%description Galician -This package contains %{summary}. - -%files Galician -%defattr(-,root,root,-) -%{tde_datadir}/locale/gl/ - -########## - -%package Hebrew -Summary: Hebrew(he) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-he = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Hebrew < %{version}-%{release} -Provides: trinity-kde-i18n-Hebrew = %{version}-%{release} - -%description Hebrew -This package contains %{summary}. - -%files Hebrew -%defattr(-,root,root,-) -%{tde_datadir}/locale/he/ -%{tde_tdedocdir}/HTML/he/ - -########## - -%package Hindi -Summary: Hindi(hi) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-hi = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Hindi < %{version}-%{release} -Provides: trinity-kde-i18n-Hindi = %{version}-%{release} - -%description Hindi -This package contains %{summary}. - -%files Hindi -%defattr(-,root,root,-) -%{tde_datadir}/locale/hi/ - -########## - -%package Croatian -Summary: Croatian(hr) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-hr = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Croatian < %{version}-%{release} -Provides: trinity-kde-i18n-Croatian = %{version}-%{release} - -%description Croatian -This package contains %{summary}. - -%files Croatian -%defattr(-,root,root,-) -%{tde_datadir}/locale/hr/ -%{tde_tdedocdir}/HTML/hr/ - -########## - -%package Hungarian -Summary: Hungarian(hu) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-hu = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Hungarian < %{version}-%{release} -Provides: trinity-kde-i18n-Hungarian = %{version}-%{release} - -%description Hungarian -This package contains %{summary}. - -%files Hungarian -%defattr(-,root,root,-) -%{tde_datadir}/locale/hu/ -%{tde_tdedocdir}/HTML/hu/ - -########## - -%package Indonesian -Summary: Indonesian(id) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-id = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Indonesian < %{version}-%{release} -Provides: trinity-kde-i18n-Indonesian = %{version}-%{release} - -%description Indonesian -This package contains %{summary}. - -#%files Indonesian -#%defattr(-,root,root,-) -#%{tde_datadir}/locale/id/ - -########## - -%package Icelandic -Summary: Icelandic(is) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-is = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Icelandic < %{version}-%{release} -Provides: trinity-kde-i18n-Icelandic = %{version}-%{release} - -%description Icelandic -This package contains %{summary}. - -%files Icelandic -%defattr(-,root,root,-) -%{tde_datadir}/locale/is/ - -########## - -%package Italian -Summary: Italian(it) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-it = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Italian < %{version}-%{release} -Provides: trinity-kde-i18n-Italian = %{version}-%{release} - -%description Italian -This package contains %{summary}. - -%files Italian -%defattr(-,root,root,-) -%{tde_datadir}/locale/it/ -%{tde_tdedocdir}/HTML/it/ - -########## - -%package Japanese -Summary: Japanese(ja) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ja = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Japanese < %{version}-%{release} -Provides: trinity-kde-i18n-Japanese = %{version}-%{release} - -%description Japanese -This package contains %{summary}. - -%files Japanese -%defattr(-,root,root,-) -%{tde_datadir}/locale/ja/ -%{tde_tdedocdir}/HTML/ja/ - -########## - -%package Kazakh -Summary: Kazakh(kk) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-kk = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Kazakh < %{version}-%{release} -Provides: trinity-kde-i18n-Kazakh = %{version}-%{release} - -%description Kazakh -This package contains %{summary}. - -%files Kazakh -%defattr(-,root,root,-) -%{tde_datadir}/locale/kk/ - -########## - -%package Khmer -Summary: Khmer(km) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ko = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Khmer < %{version}-%{release} -Provides: trinity-kde-i18n-Khmer = %{version}-%{release} - -%description Khmer -This package contains %{summary}. - -%files Khmer -%defattr(-,root,root,-) -%{tde_datadir}/locale/km/ - -########## - -%package Korean -Summary: Korean(ko) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ko = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Korean < %{version}-%{release} -Provides: trinity-kde-i18n-Korean = %{version}-%{release} - -%description Korean -This package contains %{summary}. - -%files Korean -%defattr(-,root,root,-) -%{tde_datadir}/locale/ko/ -%{tde_tdedocdir}/HTML/ko/ - -########## - -%package Kurdish -Summary: Kurdish(ku) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ku = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Kurdish < %{version}-%{release} -Provides: trinity-kde-i18n-Kurdish = %{version}-%{release} - -%description Kurdish -This package contains %{summary}. - -#%files Kurdish -#%defattr(-,root,root,-) -#%{tde_datadir}/locale/ku/ - -########## - -%package Lao -Summary: Lao(lo) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-lo = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Lao < %{version}-%{release} -Provides: trinity-kde-i18n-Lao = %{version}-%{release} - -%description Lao -This package contains %{summary}. - -#%files Lao -#%defattr(-,root,root,-) -#%{tde_datadir}/locale/lo/ - -########## - -%package Lithuanian -Summary: Lithuanian(lt) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-lt = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Lithuanian < %{version}-%{release} -Provides: trinity-kde-i18n-Lithuanian = %{version}-%{release} - -%description Lithuanian -This package contains %{summary}. - -%files Lithuanian -%defattr(-,root,root,-) -%{tde_datadir}/locale/lt/ - -########## - -%package Latvian -Summary: Latvian(lv) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-lv = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Latvian < %{version}-%{release} -Provides: trinity-kde-i18n-Latvian = %{version}-%{release} - -%description Latvian -This package contains %{summary}. - -%files Latvian -%defattr(-,root,root,-) -%{tde_datadir}/locale/lv/ - -########## - -%package Maori -Summary: Maori(mi) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-mi = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Maori < %{version}-%{release} -Provides: trinity-kde-i18n-Maori = %{version}-%{release} - -%description Maori -This package contains %{summary}. - -#%files Maori -#%defattr(-,root,root,-) -#%{tde_datadir}/locale/mi/ - -########## - -%package Macedonian -Summary: Macedonian(mk) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-mk = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Macedonian < %{version}-%{release} -Provides: trinity-kde-i18n-Macedonian = %{version}-%{release} - -%description Macedonian -This package contains %{summary}. - -%files Macedonian -%defattr(-,root,root,-) -%{tde_datadir}/locale/mk/ - -########## - -%package Mongolian -Summary: Mongolian(mn) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-mn = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Mongolian < %{version}-%{release} -Provides: trinity-kde-i18n-Mongolian = %{version}-%{release} - -%description Mongolian -This package contains %{summary}. - -%files Mongolian -%defattr(-,root,root,-) -%{tde_datadir}/locale/mn/ - -########## - -%package Malay -Summary: Malay(ms) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ms = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Malay < %{version}-%{release} -Provides: trinity-kde-i18n-Malay = %{version}-%{release} - -%description Malay -This package contains %{summary}. - -%files Malay -%defattr(-,root,root,-) -%{tde_datadir}/locale/ms/ - -########## - -%package Maltese -Summary: Maltese(mt) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-mt = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Maltese < %{version}-%{release} -Provides: trinity-kde-i18n-Maltese = %{version}-%{release} - -%description Maltese -This package contains %{summary}. - -#%files Maltese -#%defattr(-,root,root,-) -#%{tde_datadir}/locale/mt/ - -########## - -%package Low-Saxon -Summary: Low Saxon(nds) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-nds = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Low-Saxon < %{version}-%{release} -Provides: trinity-kde-i18n-Low-Saxon = %{version}-%{release} - -%description Low-Saxon -This package contains %{summary}. - -%files Low-Saxon -%defattr(-,root,root,-) -%{tde_datadir}/locale/nds/ - -########## - -%package Dutch -Summary: Dutch(nl) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-nl = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Dutch < %{version}-%{release} -Provides: trinity-kde-i18n-Dutch = %{version}-%{release} - -%description Dutch -This package contains %{summary}. - -%files Dutch -%defattr(-,root,root,-) -%{tde_datadir}/locale/nl/ -%{tde_tdedocdir}/HTML/nl/ - -########## - -%package Norwegian -Summary: Norwegian(no) (Bokmaal) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-no = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Norwegian < %{version}-%{release} -Provides: trinity-kde-i18n-Norwegian = %{version}-%{release} - -%description Norwegian -This package contains %{summary}. - -%files Norwegian -%defattr(-,root,root,-) -%{tde_datadir}/locale/nb/ - -########## - -%package Norwegian-Nynorsk -Summary: Norwegian(nn) (Nynorsk) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-nn = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Norwegian-Nynorsk < %{version}-%{release} -Provides: trinity-kde-i18n-Norwegian-Nynorsk = %{version}-%{release} - -%description Norwegian-Nynorsk -This package contains %{summary}. - -%files Norwegian-Nynorsk -%defattr(-,root,root,-) -%{tde_datadir}/locale/nn/ - -########## - -%package Occitan -Summary: Occitan(oc) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-oc = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Occitan < %{version}-%{release} -Provides: trinity-kde-i18n-Occitan = %{version}-%{release} - -%description Occitan -This package contains %{summary}. - -#%files Occitan -#%defattr(-,root,root,-) -#%{tde_datadir}/locale/oc/ - -########## - -%package Polish -Summary: Polish(pl) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-pl = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Polish < %{version}-%{release} -Provides: trinity-kde-i18n-Polish = %{version}-%{release} - -%description Polish -This package contains %{summary}. - -%files Polish -%defattr(-,root,root,-) -%{tde_datadir}/locale/pl/ -%{tde_tdedocdir}/HTML/pl/ - -########## - -%package Portuguese -Summary: Portuguese(pt) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-pt = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Portuguese < %{version}-%{release} -Provides: trinity-kde-i18n-Portuguese = %{version}-%{release} - -%description Portuguese -This package contains %{summary}. - -%files Portuguese -%defattr(-,root,root,-) -%{tde_datadir}/locale/pt/ -%{tde_tdedocdir}/HTML/pt/ - -########## - -%package Punjabi -Summary: Punjabi(pa) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-pa = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Punjabi < %{version}-%{release} -Provides: trinity-kde-i18n-Punjabi = %{version}-%{release} - -%description Punjabi -This package contains %{summary}. - -%files Punjabi -%defattr(-,root,root,-) -%{tde_datadir}/locale/pa/ - -########## - -%package Brazil -Summary: Brazil(pt_BR) Portuguese language support for TDE -Group: User Interface/Desktops -Provides: %{name}-pt_BR = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Brazil < %{version}-%{release} -Provides: trinity-kde-i18n-Brazil = %{version}-%{release} - -%description Brazil -This package contains %{summary}. - -%files Brazil -%defattr(-,root,root,-) -%{tde_datadir}/locale/pt_BR/ -%{tde_tdedocdir}/HTML/pt_BR/ - -########## - -%package Romanian -Summary: Romanian(ro) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ro = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Romanian < %{version}-%{release} -Provides: trinity-kde-i18n-Romanian = %{version}-%{release} - -%description Romanian -This package contains %{summary}. - -%files Romanian -%defattr(-,root,root,-) -%{tde_datadir}/locale/ro/ -%{tde_tdedocdir}/HTML/ro/ - -########## - -%package Russian -Summary: Russian(ru) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ru = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Russian < %{version}-%{release} -Provides: trinity-kde-i18n-Russian = %{version}-%{release} - -%description Russian -This package contains %{summary}. - -%files Russian -%defattr(-,root,root,-) -%{tde_datadir}/locale/ru/ -%{tde_tdedocdir}/HTML/ru/ - -########## - -%package Kinyarwanda -Summary: Kinyarwanda(rw) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-rw = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Kinyarwanda < %{version}-%{release} -Provides: trinity-kde-i18n-Kinyarwanda = %{version}-%{release} - -%description Kinyarwanda -This package contains %{summary}. - -%files Kinyarwanda -%defattr(-,root,root,-) -%{tde_datadir}/locale/rw/ - -########## - -%package Northern-Sami -Summary: Northern-Sami(se) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-se = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Northern-Sami < %{version}-%{release} -Provides: trinity-kde-i18n-Northern-Sami = %{version}-%{release} - -%description Northern-Sami -This package contains %{summary}. - -%files Northern-Sami -%defattr(-,root,root,-) -%{tde_datadir}/locale/se/ - -########## - -%package Slovak -Summary: Slovak(sk) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-sk = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Slovak < %{version}-%{release} -Provides: trinity-kde-i18n-Slovak = %{version}-%{release} - -%description Slovak -This package contains %{summary}. - -%files Slovak -%defattr(-,root,root,-) -%{tde_datadir}/locale/sk/ -%{tde_tdedocdir}/HTML/sk/ - -########## - -%package Slovenian -Summary: Slovenian(sl) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-sl = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Slovenian < %{version}-%{release} -Provides: trinity-kde-i18n-Slovenian = %{version}-%{release} - -%description Slovenian -This package contains %{summary}. - -%files Slovenian -%defattr(-,root,root,-) -%{tde_datadir}/locale/sl/ -%{tde_tdedocdir}/HTML/sl/ - -########## - -%package Serbian -Summary: Serbian(sr) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-sr = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Serbian < %{version}-%{release} -Provides: trinity-kde-i18n-Serbian = %{version}-%{release} - -%description Serbian -This package contains %{summary}. - -%files Serbian -%defattr(-,root,root,-) -%{tde_datadir}/locale/sr/ -%{tde_tdedocdir}/HTML/sr/ - -########## - -%package Serbian-Latin -Summary: Serbian-Latin(sr@Latn) language support for TDE -Group: User Interface/Desktops -Obsoletes: trinity-kde-i18n-Serbian-Latin < %{version}-%{release} -Provides: trinity-kde-i18n-Serbian-Latin = %{version}-%{release} - -%description Serbian-Latin -This package contains %{summary}. - -%files Serbian-Latin -%defattr(-,root,root,-) -%{tde_datadir}/locale/sr@Latn/ - -########## - -%package South-Sudan -Summary: South-Sudan(ss) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ss = %{version}-%{release} -Obsoletes: trinity-kde-i18n-South-Sudan < %{version}-%{release} -Provides: trinity-kde-i18n-South-Sudan = %{version}-%{release} - -%description South-Sudan -This package contains %{summary}. - -%files South-Sudan -%defattr(-,root,root,-) -%{tde_datadir}/locale/ss/ - -########## - -%package Swedish -Summary: Swedish(sv) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-sv = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Swedish < %{version}-%{release} -Provides: trinity-kde-i18n-Swedish = %{version}-%{release} - -%description Swedish -This package contains %{summary}. - -%files Swedish -%defattr(-,root,root,-) -%{tde_datadir}/locale/sv/ -%{tde_tdedocdir}/HTML/sv/ - -########## - -%package Tamil -Summary: Tamil(ta) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ta = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Tamil < %{version}-%{release} -Provides: trinity-kde-i18n-Tamil = %{version}-%{release} - -%description Tamil -This package contains %{summary}. - -%files Tamil -%defattr(-,root,root,-) -%{tde_datadir}/locale/ta/ - -########## - -%package Telugu -Summary: Telugu(te) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-te = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Telugu < %{version}-%{release} -Provides: trinity-kde-i18n-Telugu = %{version}-%{release} - -%description Telugu -This package contains %{summary}. - -%files Telugu -%defattr(-,root,root,-) -%{tde_datadir}/locale/te/ - -########## - -%package Tajik -Summary: Tajik(tg) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-tg = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Tajik < %{version}-%{release} -Provides: trinity-kde-i18n-Tajik = %{version}-%{release} - -%description Tajik -This package contains %{summary}. - -%files Tajik -%defattr(-,root,root,-) -%{tde_datadir}/locale/tg/ - -########## - -%package Thai -Summary: Thai(th) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-th = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Thai < %{version}-%{release} -Provides: trinity-kde-i18n-Thai = %{version}-%{release} - -%description Thai -This package contains %{summary}. - -%files Thai -%defattr(-,root,root,-) -%{tde_datadir}/locale/th/ - -########## - -%package Turkish -Summary: Turkish(tr) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-tr = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Turkish < %{version}-%{release} -Provides: trinity-kde-i18n-Turkish = %{version}-%{release} - -%description Turkish -This package contains %{summary}. - -%files Turkish -%defattr(-,root,root,-) -%{tde_datadir}/locale/tr/ -%{tde_tdedocdir}/HTML/tr/ - -########## - -%package Ukrainian -Summary: Ukrainian(uk) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-uk = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Ukrainian < %{version}-%{release} -Provides: trinity-kde-i18n-Ukrainian = %{version}-%{release} - -%description Ukrainian -This package contains %{summary}. - -%files Ukrainian -%defattr(-,root,root,-) -%{tde_tdedocdir}/HTML/uk/ -%{tde_datadir}/locale/uk/ - -########## - -%package Uzbek -Summary: Uzbek(uz) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-uz = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Uzbek < %{version}-%{release} -Provides: trinity-kde-i18n-Uzbek = %{version}-%{release} - -%description Uzbek -This package contains %{summary}. - -%files Uzbek -%defattr(-,root,root,-) -%{tde_datadir}/locale/uz/ - -########## - -%package Uzbek-Cyrillic -Summary: Uzbek(uz@cyrillic) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-uz@cyrillic = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Uzbek-Cyrillic < %{version}-%{release} -Provides: trinity-kde-i18n-Uzbek-Cyrillic = %{version}-%{release} - -%description Uzbek-Cyrillic -This package contains %{summary}. - -%files Uzbek-Cyrillic -%defattr(-,root,root,-) -%{tde_datadir}/locale/uz@cyrillic/ - -########## - -%package Venda -Summary: Venda(ven) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-ven = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Venda < %{version}-%{release} -Provides: trinity-kde-i18n-Venda = %{version}-%{release} - -%description Venda -This package contains %{summary}. - -#%files Venda -#%defattr(-,root,root,-) -#%{tde_datadir}/locale/ven/ - -########## - -%package Vietnamese -Summary: Vietnamese(vi) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-vi = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Vietnamese < %{version}-%{release} -Provides: trinity-kde-i18n-Vietnamese = %{version}-%{release} - -%description Vietnamese -This package contains %{summary}. - -%files Vietnamese -%defattr(-,root,root,-) -%{tde_datadir}/locale/vi/ - -########## - -%package Walloon -Summary: Walloon(wa) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-wa = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Walloon < %{version}-%{release} -Provides: trinity-kde-i18n-Walloon = %{version}-%{release} - -%description Walloon -This package contains %{summary}. - -%files Walloon -%defattr(-,root,root,-) -%{tde_datadir}/locale/wa/ - -########## - -%package Xhosa -Summary: Xhosa(xh) (a Bantu language) support for TDE -Group: User Interface/Desktops -Provides: %{name}-xh = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Xhosa < %{version}-%{release} -Provides: trinity-kde-i18n-Xhosa = %{version}-%{release} - -%description Xhosa -This package contains %{summary}. - -#%files Xhosa -#%defattr(-,root,root,-) -#%{tde_datadir}/locale/xh/ - -########## - -%package Chinese -Summary: Chinese(zh_CN) (Simplified Chinese) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-zh_CN = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Chinese < %{version}-%{release} -Provides: trinity-kde-i18n-Chinese = %{version}-%{release} - -%description Chinese -This package contains %{summary}. - -%files Chinese -%defattr(-,root,root,-) -%{tde_datadir}/locale/zh_CN/ -%{tde_tdedocdir}/HTML/zh_CN/ - -########## - -%package Chinese-Big5 -Summary: Chinese(zh_TW) (Big5) language support for TDE -Group: User Interface/Desktops -Provides: %{name}-tz_TW = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Chinese-Big5 < %{version}-%{release} -Provides: trinity-kde-i18n-Chinese-Big5 = %{version}-%{release} - -%description Chinese-Big5 -This package contains %{summary}. - -%files Chinese-Big5 -%defattr(-,root,root,-) -%{tde_datadir}/locale/zh_TW/ -%{tde_tdedocdir}/HTML/zh_TW/ - -########## - -%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" - - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" -. /etc/profile.d/qt3.sh -export KDEDIR=%{tde_prefix} -export kde_htmldir="%{tde_tdedocdir}/HTML" - -( -for l in %{TDE_LANGS}; do - for f in tde-i18n-${l}/; do - if [ -d "${f}" ]; then - pushd ${f} - ( - %__sed -i "configure.in" -e "s|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g" - %__make -f "admin/Makefile.common" - %configure \ - --prefix=%{tde_prefix} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_tdedocdir} - %__make %{?_smp_mflags} - ) & - sleep 3 - popd - fi - done -done -) 2>&1 | tee /tmp/rpmbuild.$$ - -if grep -q Error /tmp/rpmbuild.$$; then - echo Error while building. See '/tmp/rpmbuild.$$' - exit 1 -fi - -wait -rm -f /tmp/rpmbuild.$$ - - -%install -%__rm -rf %{?buildroot} -export PATH="%{tde_bindir}:${PATH}" - -for l in %{TDE_LANGS}; do - for f in tde-i18n-${l}/; do - if [ -d "${f}" ] && [ -r "${f}/Makefile" ] ; then - %__make install DESTDIR="%{?buildroot}" -C "${f}" - fi - done -done - - -# remove zero-length file -find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \; - -# See http://fedoraproject.org/wiki/Languages (???) -%__rm -f %{buildroot}%{tde_datadir}/locale/*/flag.png - -# Removes conflict with KDE4 -%if "%{?tde_prefix}" == "/usr" -%__rm -f %{buildroot}%{tde_datadir}/locale/*/entry.desktop -%endif - -# remove obsolete KDE 3 application data translations -%__rm -rf "%{buildroot}%{tde_datadir}/apps" - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/main/tde-i18n/tde-i18n-14.0.0.spec b/redhat/main/tde-i18n/tde-i18n.spec index bad847a91..ac595b096 100644 --- a/redhat/main/tde-i18n/tde-i18n-14.0.0.spec +++ b/redhat/main/tde-i18n/tde-i18n.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tde-i18n %define tde_prefix /opt/trinity @@ -1451,7 +1451,7 @@ for l in %{TDE_LANGS}; do # Run the build process in background ( %__make -j4 || %__make || echo TDE_Error ) & - + # Do not build more than 4 languages at the same time while [ $(jobs | wc -l) -ge 4 ]; do sleep 3; done popd diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec b/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec deleted file mode 100644 index 37aa24acf..000000000 --- a/redhat/main/tdeaccessibility/tdeaccessibility-3.5.13.2.spec +++ /dev/null @@ -1,583 +0,0 @@ -# -# spec file for package tdeaccessibility (version R14.0.0) -# -# 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/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg tdeaccessibility -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%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_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - - -Name: trinity-tdeaccessibility -Summary: Trinity Desktop Environment - Accessibility -Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist} -Group: System/GUI/Other -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: trinity-tdemultimedia-devel >= %{tde_version} - -BuildRequires: autoconf automake libtool m4 -BuildRequires: gcc-c++ -BuildRequires: desktop-file-utils -BuildRequires: fdupes - -# 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 - -# AUDIOFILE support -BuildRequires: audiofile-devel - -# AKODE support -%if 0%{?with_akode} -BuildRequires: trinity-akode-devel -%{?with_libmad:BuildRequires: trinity-akode-libmad} -%endif - -# ALSA support -BuildRequires: alsa-lib-devel - -# XCB support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos} -BuildRequires: libxcb-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} == 0 -BuildRequires: %{_lib}xcb-devel -%endif -%endif - -# XAU support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xau-devel -%else -BuildRequires: %{_lib}xau%{?mgaversion:6}-devel -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXau-devel -%endif - -Obsoletes: trinity-kdeaccessibility < %{version}-%{release} -Provides: trinity-kdeaccessibility = %{version}-%{release} -Obsoletes: trinity-kdeaccessibility-libs < %{version}-%{release} -Provides: trinity-kdeaccessibility-libs = %{version}-%{release} - -Requires: trinity-tde-icons-mono = %{version}-%{release} -Requires: trinity-kbstate = %{version}-%{release} -Requires: trinity-kmag = %{version}-%{release} -Requires: trinity-kmousetool = %{version}-%{release} -Requires: trinity-kmouth = %{version}-%{release} -Requires: trinity-ksayit = %{version}-%{release} -Requires: trinity-kttsd = %{version}-%{release} -Requires: trinity-kttsd-contrib-plugins = %{version}-%{release} - -%description -Included with this package are: -* kmag, a screen magnifier, -* kmousetool, a program for people whom it hurts to click the mouse, -* kmouth, program that allows people who have lost their voice - to let their computer speak for them. - -%files - -########## - -%package -n trinity-tde-icons-mono -Summary: A monochromatic icons theme for TDE -Group: System/GUI/Other - -Obsoletes: trinity-kde-icons-mono < %{version}-%{release} -Provides: trinity-kde-icons-mono = %{version}-%{release} - -%description -n trinity-tde-icons-mono -A monochromatic icon theme for TDE, designed for accessibility purposes. - -This package is part of Trinity, as a component of the TDE accessibility module. - -%files -n trinity-tde-icons-mono -%defattr(-,root,root,-) -%dir %{tde_datadir}/icons/mono -%dir %{tde_datadir}/icons/mono/scalable -%dir %{tde_datadir}/icons/mono/scalable/actions -%dir %{tde_datadir}/icons/mono/scalable/apps -%dir %{tde_datadir}/icons/mono/scalable/devices -%dir %{tde_datadir}/icons/mono/scalable/filesystems -%dir %{tde_datadir}/icons/mono/scalable/mimetypes -%{tde_datadir}/icons/mono/index.theme -%{tde_datadir}/icons/mono/scalable/*/*.svgz - -########## - -%package -n trinity-kbstate -Summary: A keyboard status applet for TDE -Group: System/GUI/Other - -%description -n trinity-kbstate -A panel applet that displays the keyboard status. - -This package is part of Trinity, as a component of the TDE accessibility module. - -%files -n trinity-kbstate -%defattr(-,root,root,-) -%{tde_tdelibdir}/kbstate_panelapplet.la -%{tde_tdelibdir}/kbstate_panelapplet.so -%{tde_datadir}/apps/kbstateapplet/ -%{tde_datadir}/apps/kicker/applets/kbstateapplet.desktop - -########## - -%package -n trinity-kmag -Summary: A screen magnifier for TDE -Group: System/GUI/Other - -%description -n trinity-kmag -TDE's screen magnifier tool. - -You can use KMagnifier to magnify a part of the screen just as you would use -a lens to magnify a newspaper fine-print or a photograph. This application is -useful for a variety of people: from researchers to artists to web-designers to -people with low vision. - -This package is part of Trinity, as a component of the TDE accessibility module. - -%files -n trinity-kmag -%defattr(-,root,root,-) -%{tde_bindir}/kmag -%{tde_tdeappdir}/kmag.desktop -%{tde_datadir}/apps/kmag/ -%{tde_datadir}/icons/hicolor/*/apps/kmag.png -%{tde_datadir}/icons/locolor/*/apps/kmag.png -%{tde_tdedocdir}/HTML/en/kmag/ - -%post -n trinity-kmag -/sbin/ldconfig ||: -for icon_theme in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done - -%postun -n trinity-kmag -/sbin/ldconfig ||: -for icon_theme in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done - -########## - -%package -n trinity-kmousetool -Summary: TDE mouse manipulation tool for the disabled -Group: System/GUI/Other - -%description -n trinity-kmousetool -KMouseTool clicks the mouse whenever the mouse cursor pauses briefly. It was -designed to help those with repetitive strain injuries, for whom pressing -buttons hurts. - -This package is part of Trinity, as a component of the TDE accessibility module. - -%files -n trinity-kmousetool -%defattr(-,root,root,-) -%{tde_bindir}/kmousetool -%{tde_tdeappdir}/kmousetool.desktop -%{tde_datadir}/apps/kmousetool/ -%{tde_datadir}/icons/hicolor/*/apps/kmousetool.png -%{tde_tdedocdir}/HTML/en/kmousetool/ - -%post -n trinity-kmousetool -for icon_theme in hicolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done - -%postun -n trinity-kmousetool -for icon_theme in hicolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done - -########## - -%package -n trinity-kmouth -Summary: A type-and-say KDE frontend for speech synthesizers -Group: System/GUI/Other - -%description -n trinity-kmouth -KDE's type-and-say frontend for speech synthesizers. - -It includes a history of spoken sentences from which the user can select -sentences to be re-spoken. - -This package is part of Trinity, as a component of the TDE accessibility module. - -%files -n trinity-kmouth -%defattr(-,root,root,-) -%{tde_datadir}/config/kmouthrc -%{tde_bindir}/kmouth -%{tde_tdeappdir}/kmouth.desktop -%{tde_datadir}/apps/kmouth/ -%{tde_datadir}/icons/hicolor/*/actions/speak.png -%{tde_datadir}/icons/hicolor/*/actions/nospeak.png -%{tde_datadir}/icons/hicolor/*/apps/kmouth.png -%{tde_datadir}/icons/locolor/*/actions/speak.png -%{tde_datadir}/icons/locolor/*/apps/kmouth.png -%{tde_tdedocdir}/HTML/en/kmouth/ - -%post -n trinity-kmouth -for icon_theme in hicolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done - -%postun -n trinity-kmouth -for icon_theme in hicolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done - -########## - -%package -n trinity-ksayit -Summary: A frontend for the TDE Text-to-Speech system -Group: System/GUI/Other - -%description -n trinity-ksayit -Text-to-speech front-end to kttsd. - -This package is part of Trinity, as a component of the TDE accessibility module. - -%files -n trinity-ksayit -%defattr(-,root,root,-) -%{tde_bindir}/ksayit -%{tde_tdelibdir}/libFreeverb_plugin.la -%{tde_tdelibdir}/libFreeverb_plugin.so -%{tde_libdir}/libKTTSD_Lib.so.* -%{tde_tdeappdir}/ksayit.desktop -%{tde_datadir}/apps/ksayit/ -%{tde_datadir}/icons/hicolor/*/apps/ksayit.png -%{tde_datadir}/icons/hicolor/32x32/apps/ksayit_clipempty.png -%{tde_datadir}/icons/hicolor/32x32/apps/ksayit_talking.png -%{tde_datadir}/services/ksayit_libFreeverb.desktop -%{tde_datadir}/servicetypes/ksayit_libFreeverb_service.desktop - -%post -n trinity-ksayit -/sbin/ldconfig ||: -for icon_theme in mono hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ksayit -/sbin/ldconfig ||: -for icon_theme in mono hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kttsd -Summary: A Text-to-Speech system for TDE -Group: System/GUI/Other - -%description -n trinity-kttsd -The KDE Text-to-Speech system is a plugin based service that allows any KDE -(or non-KDE) application to speak using the DCOP interface. - -ksayit and kmouth are useful front-ends for this capability, while one of -festival, flite, and epos are essential back-ends. - -This package is part of Trinity, as a component of the TDE accessibility module. - -Homepage: http://accessibility.kde.org/developer/kttsd - -%files -n trinity-kttsd -%defattr(-,root,root,-) -%{tde_bindir}/kttsd -%{tde_bindir}/kttsmgr -%{tde_tdelibdir}/kcm_kttsd.la -%{tde_tdelibdir}/kcm_kttsd.so -%{tde_tdelibdir}/ktexteditor_kttsd.la -%{tde_tdelibdir}/ktexteditor_kttsd.so -%if 0%{?with_akode} -%{tde_tdelibdir}/libkttsd_akodeplugin.la -%{tde_tdelibdir}/libkttsd_akodeplugin.so -%endif -%{tde_tdelibdir}/libkttsd_alsaplugin.la -%{tde_tdelibdir}/libkttsd_alsaplugin.so -%{tde_tdelibdir}/libkttsd_artsplugin.la -%{tde_tdelibdir}/libkttsd_artsplugin.so -%{tde_tdelibdir}/libkttsd_commandplugin.la -%{tde_tdelibdir}/libkttsd_commandplugin.so -%{tde_tdelibdir}/libkttsd_eposplugin.la -%{tde_tdelibdir}/libkttsd_eposplugin.so -%{tde_tdelibdir}/libkttsd_festivalintplugin.la -%{tde_tdelibdir}/libkttsd_festivalintplugin.so -%{tde_tdelibdir}/libkttsd_fliteplugin.la -%{tde_tdelibdir}/libkttsd_fliteplugin.so -%{tde_tdelibdir}/libkttsd_sbdplugin.la -%{tde_tdelibdir}/libkttsd_sbdplugin.so -%{tde_tdelibdir}/libkttsd_stringreplacerplugin.la -%{tde_tdelibdir}/libkttsd_stringreplacerplugin.so -%{tde_tdelibdir}/libkttsd_talkerchooserplugin.la -%{tde_tdelibdir}/libkttsd_talkerchooserplugin.so -%{tde_tdelibdir}/libkttsd_xmltransformerplugin.la -%{tde_tdelibdir}/libkttsd_xmltransformerplugin.so -%{tde_tdelibdir}/libkttsjobmgrpart.la -%{tde_tdelibdir}/libkttsjobmgrpart.so -%{tde_libdir}/libkttsd.so.* -%{tde_tdeappdir}/kcmkttsd.desktop -%{tde_tdeappdir}/kttsmgr.desktop -%{tde_datadir}/apps/ktexteditor_kttsd/ -%exclude %{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl -%{tde_datadir}/apps/kttsd/ -%{tde_datadir}/icons/hicolor/16x16/actions/female.png -%{tde_datadir}/icons/hicolor/16x16/actions/male.png -%{tde_datadir}/icons/hicolor/*/apps/kttsd.png -%{tde_datadir}/icons/hicolor/*/apps/kcmkttsd.png -%{tde_datadir}/services/ktexteditor_kttsd.desktop -%{tde_datadir}/services/kttsd.desktop -%if 0%{?with_akode} -%{tde_datadir}/services/kttsd_akodeplugin.desktop -%endif -%{tde_datadir}/services/kttsd_alsaplugin.desktop -%{tde_datadir}/services/kttsd_artsplugin.desktop -%{tde_datadir}/services/kttsd_commandplugin.desktop -%{tde_datadir}/services/kttsd_eposplugin.desktop -%{tde_datadir}/services/kttsd_festivalintplugin.desktop -%{tde_datadir}/services/kttsd_fliteplugin.desktop -%{tde_datadir}/services/kttsd_sbdplugin.desktop -%{tde_datadir}/services/kttsd_stringreplacerplugin.desktop -%{tde_datadir}/services/kttsd_talkerchooserplugin.desktop -%{tde_datadir}/services/kttsd_xmltransformerplugin.desktop -%{tde_datadir}/services/kttsjobmgr.desktop -%{tde_datadir}/servicetypes/kttsd_audioplugin.desktop -%{tde_datadir}/servicetypes/kttsd_filterplugin.desktop -%{tde_datadir}/servicetypes/kttsd_synthplugin.desktop -%{tde_tdedocdir}/HTML/en/kttsd/ - -%post -n trinity-kttsd -/sbin/ldconfig ||: -for icon_theme in crystalsvg hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kttsd -/sbin/ldconfig ||: -for icon_theme in crystalsvg hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kttsd-contrib-plugins -Summary: The TDE Text-to-Speech system -Group: System/GUI/Other -Requires: trinity-kttsd = %{version}-%{release} - -%description -n trinity-kttsd-contrib-plugins -kttsd synthetizer plugins that depends on non-free software : -* FreeTTS plugin. -* Hadifix (mbrola/txt2pho) plugin. -Those plugins will require manual installation of third party, -non free software to work. - -This package is part of Trinity, as a component of the TDE accessibility module. - -%files -n trinity-kttsd-contrib-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/libkttsd_freettsplugin.la -%{tde_tdelibdir}/libkttsd_freettsplugin.so -%{tde_tdelibdir}/libkttsd_hadifixplugin.la -%{tde_tdelibdir}/libkttsd_hadifixplugin.so -%{tde_datadir}/apps/kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl -%{tde_datadir}/services/kttsd_freettsplugin.desktop -%{tde_datadir}/services/kttsd_hadifixplugin.desktop - -########## - -%package devel -Summary: Development files for tdeaccessibility -Group: Development/Libraries/X11 -Requires: %{name} = %{version}-%{release} -Requires: trinity-tdelibs-devel >= %{version} -Requires: libjpeg-devel -Requires: libpng-devel - -Obsoletes: trinity-kdeaccessibility-devel < %{version}-%{release} -Provides: trinity-kdeaccessibility-devel = %{version}-%{release} - -%description devel -This package contains the development file for TDE accessibility -programs. - -%files devel -%defattr(-,root,root,-) -%{tde_libdir}/libkttsd.la -%{tde_libdir}/libkttsd.so -%{tde_libdir}/libKTTSD_Lib.la -%{tde_libdir}/libKTTSD_Lib.so -%{tde_tdeincludedir}/ksayit_fxplugin.h - -%post devel -/sbin/ldconfig ||: - -%postun devel -/sbin/ldconfig ||: - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - -# Update icons for some control center modules -%__sed -i "kttsd/kcmkttsmgr/kcmkttsd.desktop" -e "s|^Icon=.*|Icon=kcmkttsd|" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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 -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Avoids conflict with KDE4, if installed -# see file: '/etc/profile.d/kde.sh' from package 'kde-settings' -export KDEDIRS=%{tde_prefix} -export KDEDIR=%{tde_prefix} - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --enable-ksayit-audio-plugins \ - %{?with_akode:--with-akode} %{?!with_akode:--without-akode} - -%__make %{?_smp_mflags} - - -%install -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/" -pushd "%{?buildroot}%{tde_datadir}/icons" -for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png hicolor/"$i"x"$i"/apps/kttsd.png ;done -for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kttsd.png hicolor/"$i"x"$i"/apps/kcmkttsd.png ;done -popd - -# Avoid conflict with tdelibs -%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png -%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz - -# Updates applications categories for openSUSE -%if 0%{?suse_version} -%suse_update_desktop_file -r kmag Utility Accessibility -%suse_update_desktop_file kmousetool Utility Accessibility -%suse_update_desktop_file kmouth Utility Accessibility -%suse_update_desktop_file kttsmgr Utility Accessibility -%suse_update_desktop_file ksayit Utility Accessibility -%suse_update_desktop_file kcmkttsd Utility Accessibility -%endif - -# Links duplicate files -%fdupes "%{?buildroot}%{tde_datadir}" - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/main/tdeaccessibility/tdeaccessibility.spec index 3e8d02cf6..a2faba458 100644 --- a/redhat/main/tdeaccessibility/tdeaccessibility-14.0.0.spec +++ b/redhat/main/tdeaccessibility/tdeaccessibility.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeaccessibility %define tde_prefix /opt/trinity @@ -250,7 +250,7 @@ This package is part of Trinity, as a component of the TDE accessibility module. %files -n trinity-kmouth %defattr(-,root,root,-) -%{tde_confdir}/kmouthrc +%config(noreplace) %{tde_confdir}/kmouthrc %{tde_bindir}/kmouth %{tde_tdeappdir}/kmouth.desktop %{tde_datadir}/apps/kmouth/ diff --git a/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec b/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec deleted file mode 100644 index ea4c3ccfa..000000000 --- a/redhat/main/tdeaddons/tdeaddons-3.5.13.2.spec +++ /dev/null @@ -1,735 +0,0 @@ -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -Name: trinity-tdeaddons -Summary: Trinity Desktop Environment - Plugins -Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} - -License: GPLv2 -Group: User Interface/Desktops - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Obsoletes: trinity-kdeaddons < %{version}-%{release} -Provides: trinity-kdeaddons = %{version}-%{release} -Obsoletes: trinity-kdeaddons-extras < %{version}-%{release} -Provides: trinity-kdeaddons-extras = %{version}-%{release} - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: autoconf automake libtool m4 -BuildRequires: qt3-devel >= 3.3.8d -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: trinity-tdegames-devel >= %{tde_version} -BuildRequires: trinity-tdemultimedia-devel >= %{tde_version} -BuildRequires: trinity-tdepim-devel >= %{tde_version} - -BuildRequires: SDL-devel -BuildRequires: alsa-lib-devel -BuildRequires: openssl-devel - -# DB4/DB5 support -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion} -%define with_db 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: db4-devel -%else -BuildRequires: db5-devel -%endif -%endif -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -BuildRequires: libdb-devel -BuildRequires: libdb-cxx-devel -%endif -%if 0%{?suse_version} -BuildRequires: libdb-4_8-devel -%endif -%if 0%{?rhel} && 0%{?rhel} <= 6 -BuildRequires: db4-devel -%endif -%endif - -# XMMS support: no, always disabled, even on Fedora -#%if 0%{?fedora} -#define with_xmms 1 -#BuildRequires: xmms-devel -#%endif - -Requires: trinity-atlantikdesigner = %{version}-%{release} -Requires: trinity-kaddressbook-plugins = %{version}-%{release} -Requires: trinity-kate-plugins = %{version}-%{release} -Requires: trinity-tdeaddons-tdefile-plugins = %{version}-%{release} -Requires: trinity-kicker-applets = %{version}-%{release} -Requires: trinity-knewsticker-scripts = %{version}-%{release} -Requires: trinity-konq-plugins = %{version}-%{release} -Requires: trinity-ksig = %{version}-%{release} -Requires: trinity-noatun-plugins = %{version}-%{release} - - -%description -A collection of TDE Addons/Plugins, including: -* atlantikdesigner: game board designer -* konq-plugins: akregator, babelfish, domtreeviewer, imagerotation, validators, webarchiver -* kate (plugins) -* kicker-applets: kbinaryclock, kolourpicker, ktimemon, mediacontrol -* knewsticker-scripts -* noatun-plugins - -%files -%defattr(-,root,root,-) - -########## - -%package -n trinity-atlantikdesigner -Summary: Game board designer for Atlantik -Group: Applications/Games -#Requires: trinity-atlantik -Requires: trinity-tdegames - -%description -n trinity-atlantikdesigner -Atlantik Designer is a game board designer for the game Atlantik. - -Atlantik is a TDE client for playing Monopoly-like board games on the -monopd network. It can play any board supported by the network -server, including the classic Monopoly game as well as the Atlantik -game in which the properties include several major cities in North -America and Europe. - -%files -n trinity-atlantikdesigner -%defattr(-,root,root,-) -%doc README atlantikdesigner/TODO -%{tde_bindir}/atlantikdesigner -%{tde_datadir}/apps/atlantikdesigner -%{tde_tdeappdir}/atlantikdesigner.desktop -%{tde_datadir}/icons/hicolor/*/apps/atlantikdesigner.png - -%post -n trinity-atlantikdesigner -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-atlantikdesigner -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kaddressbook-plugins -Summary: Plugins for KAddressBook, the Trinity address book -Group: Applications/Utilities -Requires: trinity-kaddressbook - -%description -n trinity-kaddressbook-plugins -This package contains a variety of useful plugins for the KDE address -book. These plugins can be loaded through the TDE address book settings. - -Highlights include exporting postal addresses as flags in KWorldClock, -as well as importing and exporting contacts in the native format used -by the German freemail provider GMX. - -%files -n trinity-kaddressbook-plugins -%defattr(-,root,root,-) -%doc README -%{tde_tdelibdir}/libkaddrbk_geo_xxport.la -%{tde_tdelibdir}/libkaddrbk_geo_xxport.so -%{tde_tdelibdir}/libkaddrbk_gmx_xxport.la -%{tde_tdelibdir}/libkaddrbk_gmx_xxport.so -%{tde_datadir}/apps/kaddressbook -%{tde_datadir}/services/kaddressbook - -########## - -%package -n trinity-kate-plugins -Summary: Plugins for Kate, the TDE Advanced Text Editor -Group: Applications/Utilities -Requires: trinity-kate -Requires: tidy - -%description -n trinity-kate-plugins -This package contains a variety of useful plugins for Kate, the KDE -Advanced Text Editor. These plugins can be loaded through the plugin -manager in Kate settings. - -Highlights include spell checking, text filtering, HTML/XML construction -and validation, vim/emacs modeline handling, templates for new files -and text snippets, opening of C/C++ headers, extraction of C/C++ symbols, -a tab bar, a Python browser and even more. - -%files -n trinity-kate-plugins -%defattr(-,root,root,-) -%doc kate/xmltools/ChangeLog kate/xmltools/README -%{tde_tdelibdir}/katecppsymbolviewerplugin.la -%{tde_tdelibdir}/katecppsymbolviewerplugin.so -%{tde_tdelibdir}/katefiletemplates.la -%{tde_tdelibdir}/katefiletemplates.so -%{tde_tdelibdir}/katefll_plugin.la -%{tde_tdelibdir}/katefll_plugin.so -%{tde_tdelibdir}/katehelloworldplugin.la -%{tde_tdelibdir}/katehelloworldplugin.so -%{tde_tdelibdir}/katehtmltoolsplugin.la -%{tde_tdelibdir}/katehtmltoolsplugin.so -%{tde_tdelibdir}/kateinsertcommandplugin.la -%{tde_tdelibdir}/kateinsertcommandplugin.so -%{tde_tdelibdir}/katemakeplugin.la -%{tde_tdelibdir}/katemakeplugin.so -%{tde_tdelibdir}/katemodelineplugin.la -%{tde_tdelibdir}/katemodelineplugin.so -%{tde_tdelibdir}/kateopenheaderplugin.la -%{tde_tdelibdir}/kateopenheaderplugin.so -%{tde_tdelibdir}/katepybrowseplugin.la -%{tde_tdelibdir}/katepybrowseplugin.so -%{tde_tdelibdir}/katesnippetsplugin.la -%{tde_tdelibdir}/katesnippetsplugin.so -%{tde_tdelibdir}/katetextfilterplugin.la -%{tde_tdelibdir}/katetextfilterplugin.so -%{tde_tdelibdir}/katexmlcheckplugin.la -%{tde_tdelibdir}/katexmlcheckplugin.so -%{tde_tdelibdir}/katexmltoolsplugin.la -%{tde_tdelibdir}/katexmltoolsplugin.so -%{tde_tdelibdir}/libkatetabbarextensionplugin.la -%{tde_tdelibdir}/libkatetabbarextensionplugin.so -%{tde_datadir}/applnk/.hidden/katefll.desktop -%{tde_datadir}/apps/kate -%{tde_datadir}/apps/katepart -%{tde_datadir}/apps/katexmltools -%{tde_datadir}/services/katecppsymbolviewer.desktop -%{tde_datadir}/services/katefiletemplates.desktop -%{tde_datadir}/services/katefll_plugin.desktop -%{tde_datadir}/services/katehelloworld.desktop -%{tde_datadir}/services/katehtmltools.desktop -%{tde_datadir}/services/kateinsertcommand.desktop -%{tde_datadir}/services/katemake.desktop -%{tde_datadir}/services/katemodeline.desktop -%{tde_datadir}/services/kateopenheader.desktop -%{tde_datadir}/services/katepybrowse.desktop -%{tde_datadir}/services/katesnippets.desktop -%{tde_datadir}/services/katetabbarextension.desktop -%{tde_datadir}/services/katetextfilter.desktop -%{tde_datadir}/services/katexmlcheck.desktop -%{tde_datadir}/services/katexmltools.desktop -%{tde_tdedocdir}/HTML/en/kate-plugins/ - -########## - -%package tdefile-plugins -Summary: Trinity file dialog plugins for text files and folders -Group: Applications/Utilities - -Obsoletes: trinity-tdeaddons-kfile-plugins < %{version}-%{release} -Provides: trinity-tdeaddons-kfile-plugins = %{version}-%{release} - -%description tdefile-plugins -This is a collection of plugins for the TDE file dialog. These plugins -extend the file dialog to offer advanced meta-information for text, -HTML and desktop files, as well as for folders, Windows .lnk files, -MIME archives and X.509 certificates. - -This package also includes plugins for the KDE file rename dialog, -allowing a user to more easily decide what to do when faced with a -decision regarding conflicting filenames. Rename dialog plugins are -provided for audio and image files. - -%files tdefile-plugins -%defattr(-,root,root,-) -%doc kfile-plugins/lnk/README -%{tde_bindir}/lnkforward -%{tde_tdelibdir}/kfile_cert.la -%{tde_tdelibdir}/kfile_cert.so -%{tde_tdelibdir}/kfile_desktop.la -%{tde_tdelibdir}/kfile_desktop.so -%{tde_tdelibdir}/kfile_folder.la -%{tde_tdelibdir}/kfile_folder.so -%{tde_tdelibdir}/kfile_html.la -%{tde_tdelibdir}/kfile_html.so -%{tde_tdelibdir}/kfile_lnk.la -%{tde_tdelibdir}/kfile_lnk.so -%{tde_tdelibdir}/kfile_mhtml.la -%{tde_tdelibdir}/kfile_mhtml.so -%{tde_tdelibdir}/kfile_txt.la -%{tde_tdelibdir}/kfile_txt.so -%{tde_tdelibdir}/librenaudioplugin.la -%{tde_tdelibdir}/librenaudioplugin.so -%{tde_tdelibdir}/librenimageplugin.la -%{tde_tdelibdir}/librenimageplugin.so -%{tde_datadir}/applnk/.hidden/lnkforward.desktop -%{tde_datadir}/mimelnk/application/x-win-lnk.desktop -%{tde_datadir}/services/kfile_cert.desktop -%{tde_datadir}/services/kfile_desktop.desktop -%{tde_datadir}/services/kfile_folder.desktop -%{tde_datadir}/services/kfile_html.desktop -%{tde_datadir}/services/kfile_lnk.desktop -%{tde_datadir}/services/kfile_mhtml.desktop -%{tde_datadir}/services/kfile_txt.desktop -%{tde_datadir}/services/renaudiodlg.desktop -%{tde_datadir}/services/renimagedlg.desktop - -########## - -%package -n trinity-kicker-applets -Summary: Applets for Kicker, the Trinity panel -Group: Applications/Utilities -Requires: trinity-kicker - -%description -n trinity-kicker-applets -This package contains a variety of applets for Kicker, the KDE panel. -These applets will appear in the panel's Add--Applet menu. - -Included are a system monitor, a colour picker, a media player controller, -a mathematical evaluator and a binary clock. - -The media control applet does not support XMMS, as this would force all -kicker-applets users to install XMMS. If you want a kicker applet that -controls XMMS, install the xmms-kde-trinity package. - -%files -n trinity-kicker-applets -%defattr(-,root,root,-) -%doc README -%{tde_tdelibdir}/kolourpicker_panelapplet.la -%{tde_tdelibdir}/kolourpicker_panelapplet.so -%{tde_tdelibdir}/ktimemon_panelapplet.la -%{tde_tdelibdir}/ktimemon_panelapplet.so -%{tde_tdelibdir}/math_panelapplet.la -%{tde_tdelibdir}/math_panelapplet.so -%{tde_tdelibdir}/mediacontrol_panelapplet.la -%{tde_tdelibdir}/mediacontrol_panelapplet.so -%{tde_tdelibdir}/kbinaryclock_panelapplet.la -%{tde_tdelibdir}/kbinaryclock_panelapplet.so -%{tde_datadir}/apps/kicker/applets -%{tde_datadir}/apps/mediacontrol -%{tde_datadir}/config.kcfg/kbinaryclock.kcfg -%{tde_datadir}/icons/locolor/*/apps/ktimemon.png -%{tde_datadir}/icons/crystalsvg/*/apps/ktimemon.png -%{tde_tdedocdir}/HTML/en/kicker-applets/ - -%post -n trinity-kicker-applets -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done - -%postun -n trinity-kicker-applets -for f in crystalsvg locolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done - -########## - -%package -n trinity-knewsticker-scripts -Summary: scripts for KNewsTicker, the Trinity news ticker -Group: Applications/Utilities -Requires: perl -Requires: python -#Requires: libfinance-quote-perl -#Requires: libmime-perl -#Requires: libnews-nntpclient-perl -Requires: perl-libwww-perl -Requires: trinity-knewsticker - -%description -n trinity-knewsticker-scripts -This package contains a variety of scripts that provide additional news -sources for KNewsTicker, the news ticker applet for the TDE panel. - -Highlights include newsgroup handling, stock data retrieval, sports scores -and various local news sources. - -%files -n trinity-knewsticker-scripts -%defattr(-,root,root,-) -%doc README -%{tde_datadir}/apps/knewsticker/ - -########## - -%package -n trinity-konq-plugins -Summary: plugins for Konqueror, the Trinity file/web/doc browser -Group: Applications/Utilities -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} == 0 -Requires: %{_lib}jpeg8 -%endif -%endif -%if 0%{?rhel} || 0%{?fedora} -Requires: libjpeg -%endif -%if 0%{?suse_version} == 1220 -Requires: libjpeg62 -%endif -%if 0%{?pclinuxos} -Requires: %{_lib}jpeg62 -%endif -%if 0%{?suse_version} == 1230 -Requires: libjpeg8 -%endif -Requires: python -Requires: rsync -#Requires: unison -Requires: trinity-konqueror -%if 0%{?fedora} -Requires: python-exif -%endif - -%description -n trinity-konq-plugins -This package contains a variety of useful plugins for Konqueror, the -file manager, web browser and document viewer for TDE. Many of these -plugins will appear in Konqueror's Tools menu. - -Highlights for web browsing include web page translation, web page archiving, -auto-refreshing, HTML and CSS structural analysis, a search toolbar, a -sidebar news ticker, fast access to common options, bookmarklets, a crash -monitor, a microformat availability indicator, a del.icio.us bookmarks -sidebar, and integration with the aKregator RSS feed reader. - -Highlights for directory browsing include directory filters, image gallery -creation, archive compression and extraction, quick copy/move, a sidebar -media player, a file information metabar/sidebar, a media folder helper, a -graphical disk usage viewer and image conversions and transformations. - -%files -n trinity-konq-plugins -%defattr(-,root,root,-) -%doc konq-plugins/README -%{tde_datadir}/config/translaterc -%{tde_bindir}/fsview -%{tde_bindir}/jpegorient -%{tde_bindir}/kio_media_realfolder -%{tde_tdelibdir}/konq_sidebarnews.la -%{tde_tdelibdir}/konq_sidebarnews.so -%{tde_tdelibdir}/konqsidebar_delicious.la -%{tde_tdelibdir}/konqsidebar_delicious.so -%{tde_tdelibdir}/konqsidebar_mediaplayer.la -%{tde_tdelibdir}/konqsidebar_mediaplayer.so -%{tde_tdelibdir}/konqsidebar_metabar.la -%{tde_tdelibdir}/konqsidebar_metabar.so -%{tde_tdelibdir}/libakregatorkonqfeedicon.la -%{tde_tdelibdir}/libakregatorkonqfeedicon.so -%{tde_tdelibdir}/libakregatorkonqplugin.la -%{tde_tdelibdir}/libakregatorkonqplugin.so -%{tde_tdelibdir}/libarkplugin.la -%{tde_tdelibdir}/libarkplugin.so -%{tde_tdelibdir}/libautorefresh.la -%{tde_tdelibdir}/libautorefresh.so -%{tde_tdelibdir}/libbabelfishplugin.la -%{tde_tdelibdir}/libbabelfishplugin.so -%{tde_tdelibdir}/libcrashesplugin.la -%{tde_tdelibdir}/libcrashesplugin.so -%{tde_tdelibdir}/libdirfilterplugin.la -%{tde_tdelibdir}/libdirfilterplugin.so -%{tde_tdelibdir}/librsyncplugin.la -%{tde_tdelibdir}/librsyncplugin.so -%{tde_tdelibdir}/libdomtreeviewerplugin.la -%{tde_tdelibdir}/libdomtreeviewerplugin.so -%{tde_tdelibdir}/libfsviewpart.la -%{tde_tdelibdir}/libfsviewpart.so -%{tde_tdelibdir}/libkhtmlsettingsplugin.la -%{tde_tdelibdir}/libkhtmlsettingsplugin.so -%{tde_tdelibdir}/kcm_kuick.la -%{tde_tdelibdir}/kcm_kuick.so -%{tde_tdelibdir}/libkimgallery.la -%{tde_tdelibdir}/libkimgallery.so -%{tde_tdelibdir}/libkuickplugin.la -%{tde_tdelibdir}/libkuickplugin.so -%{tde_tdelibdir}/libmfkonqmficon.la -%{tde_tdelibdir}/libmfkonqmficon.so -%{tde_tdelibdir}/libminitoolsplugin.la -%{tde_tdelibdir}/libminitoolsplugin.so -%{tde_tdelibdir}/librellinksplugin.la -%{tde_tdelibdir}/librellinksplugin.so -%{tde_tdelibdir}/libsearchbarplugin.la -%{tde_tdelibdir}/libsearchbarplugin.so -%{tde_tdelibdir}/libuachangerplugin.la -%{tde_tdelibdir}/libuachangerplugin.so -%{tde_tdelibdir}/libvalidatorsplugin.la -%{tde_tdelibdir}/libvalidatorsplugin.so -%{tde_tdelibdir}/libwebarchiverplugin.la -%{tde_tdelibdir}/libwebarchiverplugin.so -%{tde_tdelibdir}/webarchivethumbnail.la -%{tde_tdelibdir}/webarchivethumbnail.so -%{tde_datadir}/applnk/.hidden/arkplugin.desktop -%{tde_datadir}/applnk/.hidden/kcmkuick.desktop -%{tde_datadir}/applnk/.hidden/kuickplugin.desktop -%{tde_datadir}/applnk/.hidden/mediaplayerplugin.desktop -%{tde_datadir}/applnk/.hidden/crashesplugin.desktop -%{tde_datadir}/applnk/.hidden/dirfilterplugin.desktop -%{tde_datadir}/applnk/.hidden/rsyncplugin.desktop -%{tde_datadir}/applnk/.hidden/fsview.desktop -%{tde_datadir}/applnk/.hidden/khtmlsettingsplugin.desktop -%{tde_datadir}/applnk/.hidden/kimgalleryplugin.desktop -%{tde_datadir}/applnk/.hidden/plugin_babelfish.desktop -%{tde_datadir}/applnk/.hidden/plugin_domtreeviewer.desktop -%{tde_datadir}/applnk/.hidden/plugin_validators.desktop -%{tde_datadir}/applnk/.hidden/plugin_webarchiver.desktop -%{tde_datadir}/applnk/.hidden/uachangerplugin.desktop -%{tde_datadir}/apps/akregator -%{tde_datadir}/apps/domtreeviewer -%{tde_datadir}/apps/fsview -%{tde_datadir}/apps/imagerotation/orient.py* -%{tde_datadir}/apps/imagerotation/exif.py* -%{tde_datadir}/apps/khtml/kpartplugins -%{tde_datadir}/apps/konqiconview -%{tde_datadir}/apps/konqlistview -%{tde_datadir}/apps/konqsidebartng -%{tde_datadir}/apps/konqueror/icons -%{tde_datadir}/apps/konqueror/kpartplugins -%{tde_datadir}/apps/konqueror/servicemenus -%{tde_datadir}/apps/metabar/iconsrc -%{tde_datadir}/apps/metabar/themes/default/default.css -%{tde_datadir}/apps/metabar/themes/default/layout.html -%{tde_datadir}/apps/microformat/pics/microformat.png -%{tde_datadir}/config.kcfg/konq_sidebarnews.kcfg -%{tde_datadir}/icons/locolor/16x16/apps/autorefresh.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/babelfish.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/cssvalidator.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/domtreeviewer.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/htmlvalidator.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/imagegallery.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/remotesync.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/remotesyncconfig.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/minitools.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/validators.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/webarchiver.png -%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_delicious.png -%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png -%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_news.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/babelfish.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/cssvalidator.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/domtreeviewer.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/htmlvalidator.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/imagegallery.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/remotesync.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/remotesyncconfig.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/minitools.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/validators.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/webarchiver.png -%{tde_datadir}/icons/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png -%{tde_datadir}/icons/crystalsvg/32x32/actions/minitools.png -%{tde_datadir}/icons/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png -%{tde_datadir}/icons/crystalsvg/48x48/actions/minitools.png -%{tde_datadir}/icons/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png -%{tde_datadir}/icons/hicolor/16x16/apps/metabar.png -%{tde_datadir}/icons/hicolor/22x22/apps/fsview.png -%{tde_datadir}/icons/hicolor/32x32/apps/fsview.png -%{tde_datadir}/icons/hicolor/32x32/apps/metabar.png -%{tde_datadir}/icons/hicolor/48x48/apps/metabar.png -%{tde_datadir}/icons/hicolor/64x64/apps/metabar.png -%{tde_datadir}/icons/hicolor/scalable/apps/metabar.svgz -%{tde_datadir}/icons/hicolor/128x128/apps/metabar.png -%{tde_datadir}/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png -%{tde_datadir}/services/akregator_konqplugin.desktop -%{tde_datadir}/services/ark_plugin.desktop -%{tde_datadir}/services/fsview_part.desktop -%{tde_datadir}/services/kuick_plugin.desktop -%{tde_datadir}/services/webarchivethumbnail.desktop -%{tde_tdelibdir}/libadblock.la -%{tde_tdelibdir}/libadblock.so -%{tde_tdedocdir}/HTML/en/konq-plugins/ - -%post -n trinity-konq-plugins -for f in crystalsvg hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done - -%postun -n trinity-konq-plugins -for f in crystalsvg hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done - -########## - -%package -n trinity-ksig -Summary: Graphical tool for managing multiple email signatures -Group: Applications/Utilities -Requires: trinity-kmail - -%description -n trinity-ksig -KSig is a graphical tool for keeping track of many different email -signatures. The signatures themselves can be edited through KSig's -graphical user interface. A command-line interface is then available -for generating random or daily signatures from this list. - -The command-line interface makes a suitable plugin for generating -signatures in external mail clients such as KMail. - -%files -n trinity-ksig -%defattr(-,root,root,-) -%doc README -%{tde_bindir}/ksig -%{tde_tdeappdir}/ksig.desktop -%{tde_datadir}/apps/ksig/ksigui.rc -%{tde_datadir}/icons/hicolor/*/apps/ksig.png -%{tde_tdedocdir}/HTML/en/ksig/ - -%post -n trinity-ksig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ksig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-noatun-plugins -Summary: plugins for Noatun, the Trinity media player -Group: Applications/Utilities -Requires: trinity-noatun - -%description -n trinity-noatun-plugins -This package contains a variety of useful plugins for Noatun, the audio and -video media player for TDE. These plugins can be loaded through the plugin -manager in Noatun settings. - -Highlights include an alarm clock, guessing tags from filenames, adjustable -playback speed, capture to wave file and displaying lyrics, plus a variety -of user interfaces, playlists and visualisation plugins. - -%files -n trinity-noatun-plugins -%defattr(-,root,root,-) -%doc README -%{tde_bindir}/noatunsynaescope.bin -%{tde_bindir}/noatuntippecanoe.bin -%{tde_bindir}/noatuntyler.bin -%{tde_tdelibdir}/noatunalsaplayer.la -%{tde_tdelibdir}/noatunalsaplayer.so -%{tde_tdelibdir}/noatunblurscope.la -%{tde_tdelibdir}/noatunblurscope.so -%{tde_tdelibdir}/noatuncharlatan.la -%{tde_tdelibdir}/noatuncharlatan.so -%{tde_tdelibdir}/noatundub.la -%{tde_tdelibdir}/noatundub.so -%{tde_tdelibdir}/noatun_ffrs.la -%{tde_tdelibdir}/noatun_ffrs.so -%{tde_tdelibdir}/noatunluckytag.la -%{tde_tdelibdir}/noatunluckytag.so -%{tde_tdelibdir}/noatunlyrics.la -%{tde_tdelibdir}/noatunlyrics.so -%{tde_tdelibdir}/noatunmadness.la -%{tde_tdelibdir}/noatunmadness.so -%if 0%{?with_db} -%{tde_tdelibdir}/noatun_oblique.la -%{tde_tdelibdir}/noatun_oblique.so -%endif -%{tde_tdelibdir}/noatunpitchablespeed.la -%{tde_tdelibdir}/noatunpitchablespeed.so -%{tde_tdelibdir}/noatunsynaescope.la -%{tde_tdelibdir}/noatunsynaescope.so -%{tde_tdelibdir}/noatuntippecanoe.la -%{tde_tdelibdir}/noatuntippecanoe.so -%{tde_tdelibdir}/noatuntyler.la -%{tde_tdelibdir}/noatuntyler.so -%{tde_tdelibdir}/noatunwakeup.la -%{tde_tdelibdir}/noatunwakeup.so -%{tde_tdelibdir}/noatunwavecapture.la -%{tde_tdelibdir}/noatunwavecapture.so -%{tde_datadir}/apps/noatun/* -%{tde_datadir}/icons/crystalsvg/16x16/apps/synaescope.png - -%post -n trinity-noatun-plugins -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done - -%postun -n trinity-noatun-plugins -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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 -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -# Note about DB4: -# Fedora 18: /usr/include/libdb4/db_cxx.h , /usr/lib64/libdb_cxx-4.so - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-extra-includes=%{_includedir}/db4:%{_includedir}/db51:%{_includedir}/db53:%{_includedir}/libdb4:%{tde_includedir}/arts \ - \ - %{?with_xmms:--with-xmms} %{?!with_xmms:--without-xmms} \ - --with-sdl \ -%if 0%{?with_db} - --with-berkeley-db \ -%endif - - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec b/redhat/main/tdeaddons/tdeaddons.spec index 5d546fb8e..accb5bca5 100644 --- a/redhat/main/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/main/tdeaddons/tdeaddons.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeaddons %define tde_prefix /opt/trinity @@ -116,13 +116,9 @@ BuildRequires: libacl-devel # DB4/DB5 support %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion} %define with_db 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: db4-devel -%else +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} BuildRequires: db5-devel %endif -%endif %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: libdb-devel BuildRequires: libdb-cxx-devel @@ -141,6 +137,13 @@ BuildRequires: db4-devel #BuildRequires: xmms-devel #%endif +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 +%define python python3 +%else +%define python python +%endif + Requires: trinity-atlantikdesigner = %{version}-%{release} Requires: trinity-kaddressbook-plugins = %{version}-%{release} Requires: trinity-kate-plugins = %{version}-%{release} @@ -391,7 +394,7 @@ controls XMMS, install the xmms-kde-trinity package. Summary: scripts for KNewsTicker, the Trinity news ticker Group: Applications/Utilities Requires: perl -Requires: python +Requires: %{python} #Requires: libfinance-quote-perl #Requires: libmime-perl #Requires: libnews-nntpclient-perl @@ -432,12 +435,12 @@ Requires: %{_lib}jpeg62 %if 0%{?suse_version} == 1230 Requires: libjpeg8 %endif -Requires: python +Requires: %{python} Requires: rsync #Requires: unison Requires: trinity-konqueror %if 0%{?fedora} -Requires: python-exif +Requires: %{python}-exif %endif %description -n trinity-konq-plugins @@ -664,6 +667,14 @@ of user interfaces, playlists and visualisation plugins. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +# Fix shebangs +sed -i "knewsticker-scripts/sportscores.py" \ + "konq-plugins/imagerotation/orient.py" \ + "konq-plugins/imagerotation/exif.py" \ + -e "s|env python|env %{python}|" +%endif + %build unset QTDIR QTINC QTLIB diff --git a/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec b/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec deleted file mode 100644 index c6377059d..000000000 --- a/redhat/main/tdeadmin/tdeadmin-3.5.13.2.spec +++ /dev/null @@ -1,538 +0,0 @@ -# -# spec file for package tdeadmin (version 3.5.13-SRU) -# -# 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/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg tdeadmin -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%define tde_sbindir %{tde_prefix}/sbin -%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_sbindir %{tde_prefix}/sbin -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - - -Name: trinity-%{tde_pkg} -Summary: Administrative tools for TDE -Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist} -Group: System/GUI/Other -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Source1: kuser.pam -Source2: kuser.pamd -Source5: kpackagerc -Source6: ksysvrc -Source7: kuserrc - -Obsoletes: trinity-kdeadmin < %{version}-%{release} -Provides: trinity-kdeadmin = %{version}-%{release} - -BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} - -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool -BuildRequires: m4 -BuildRequires: fdupes -BuildRequires: gcc-c++ - -# 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 - -# RPM support -BuildRequires: rpm-devel - -# PAM support -BuildRequires: pam-devel - -# LILO support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -#define with_lilo 1 -%endif -%if 0%{?with_lilo} -BuildRequires: lilo -%endif - -Requires: trinity-kcron = %{version}-%{release} -Requires: trinity-kdat = %{version}-%{release} -Requires: %{name}-kfile-plugins = %{version}-%{release} -Requires: trinity-knetworkconf = %{version}-%{release} -Requires: trinity-kpackage = %{version}-%{release} -Requires: trinity-ksysv = %{version}-%{release} -Requires: trinity-kuser = %{version}-%{release} -%if 0%{?with_lilo} -Requires: trinity-lilo-config = %{version}-%{release} -%else -Obsoletes: trinity-lilo-config -%endif - -# CONSOLEHELPER (usermode) support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_consolehelper 1 - -# Avoids relinking, which breaks consolehelper -%define dont_relink 1 -%endif - -%description -The tdeadmin package includes administrative tools for the Trinity Desktop -Environment (TDE) including: -kcron, kdat, knetworkconf, kpackage, ksysv, kuser. - -%files -%defattr(-,root,root,-) -# LILO is not provided in RHEL or Fedora -%if 0%{?with_lilo} == 0 -%exclude %{tde_tdedocdir}/HTML/en/lilo-config/ -%endif - -########## - -%package -n trinity-kcron -Summary: The Trinity crontab editor -Group: System/GUI/Other - -%description -n trinity-kcron -KCron is an application for scheduling programs to run in the background. -It is a graphical user interface to cron, the UNIX system scheduler. - -%files -n trinity-kcron -%defattr(-,root,root,-) -%{tde_bindir}/kcron -%{tde_tdeappdir}/kcron.desktop -%{tde_datadir}/apps/kcron/ -%{tde_datadir}/icons/hicolor/*/apps/kcron.png -%{tde_tdedocdir}/HTML/en/kcron/ - -%post -n trinity-kcron -for icon_theme in hicolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kcron -for icon_theme in hicolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kdat -Summary: A Trinity tape backup tool -Group: System/GUI/Other - -%description -n trinity-kdat -KDat is a tar-based tape archiver. It is designed to work with multiple -archives on a single tape. - -Main features are: -* Simple graphical interface to local filesystem and tape contents. -* Multiple archives on the same physical tape. -* Complete index of archives and files is stored on local hard disk. -* Selective restore of files from an archive. -* Backup profiles for frequently used backups. - -%files -n trinity-kdat -%defattr(-,root,root,-) -%doc rpmdocs/kdat/* -%{tde_bindir}/kdat -%{tde_tdeappdir}/kdat.desktop -%{tde_datadir}/apps/kdat/ -%{tde_datadir}/icons/hicolor/*/apps/kdat.png -%{tde_datadir}/icons/locolor/*/apps/kdat.png -%{tde_tdedocdir}/HTML/en/kdat/ - -%post -n trinity-kdat -for icon_theme in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kdat -for icon_theme in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package kfile-plugins -Summary: Trinity file metainfo plugins for deb and rpm files -Group: System/GUI/Other - -%description kfile-plugins -This package contains the Trinity File metainfo plugins for deb and rpm -package files. - -%files kfile-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/kfile_deb.la -%{tde_tdelibdir}/kfile_deb.so -%{tde_tdelibdir}/kfile_rpm.la -%{tde_tdelibdir}/kfile_rpm.so -%{tde_datadir}/services/kfile_deb.desktop -%{tde_datadir}/services/kfile_rpm.desktop - -########## - -%package -n trinity-knetworkconf -Summary: Trinity network configuration tool -Group: System/GUI/Other - -%description -n trinity-knetworkconf -This is a TDE control center module to configure TCP/IP settings. It -can be used to manage network devices and settings for each device. - -%files -n trinity-knetworkconf -%defattr(-,root,root,-) -%doc rpmdocs/knetworkconf/* -%{tde_datadir}/icons/hicolor/*/apps/knetworkconf.png -%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_wlan.png -%{tde_datadir}/icons/hicolor/22x22/actions/network_connected_lan_knc.png -%{tde_datadir}/icons/hicolor/22x22/actions/network_disconnected_lan.png -%{tde_datadir}/icons/hicolor/22x22/actions/network_traffic_wlan.png -%{tde_datadir}/apps/knetworkconf/ -%{tde_tdeappdir}/kcm_knetworkconfmodule.desktop -%{tde_tdelibdir}/kcm_knetworkconfmodule.so -%{tde_tdelibdir}/kcm_knetworkconfmodule.la -%{tde_tdedocdir}/HTML/en/knetworkconf/ - -%post -n trinity-knetworkconf -for icon_theme in hicolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done - -%postun -n trinity-knetworkconf -for icon_theme in hicolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done - -########## - -%package -n trinity-kpackage -Summary: Trinity package management tool -Group: System/GUI/Other - -%description -n trinity-kpackage -This is a frontend to both .rpm and .deb package formats. It allows you -to view currently installed packages, browse available packages, and -install/remove them. - -%files -n trinity-kpackage -%defattr(-,root,root,-) -%doc rpmdocs/kpackage/* -%{tde_bindir}/kpackage -%{tde_tdeappdir}/kpackage.desktop -%{tde_datadir}/apps/kpackage/ -%{tde_datadir}/config/kpackagerc -%{tde_datadir}/icons/hicolor/*/apps/kpackage.png -%{tde_tdedocdir}/HTML/en/kpackage/ - -%post -n trinity-kpackage -for icon_theme in hicolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kpackage -for icon_theme in hicolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-ksysv -Summary: Trinity SysV-style init configuration editor -Group: System/GUI/Other - -%description -n trinity-ksysv -This program allows you to edit your start and stop scripts using a -drag and drop GUI. - -%files -n trinity-ksysv -%defattr(-,root,root,-) -%doc rpmdocs/ksysv/* -%{tde_bindir}/ksysv -%{tde_tdeappdir}/ksysv.desktop -%{tde_datadir}/apps/ksysv/ -%{tde_datadir}/config/ksysvrc -%{tde_datadir}/icons/crystalsvg/16x16/actions/toggle_log.png -%{tde_datadir}/icons/hicolor/*/apps/ksysv.png -%{tde_datadir}/mimelnk/application/x-ksysv.desktop -%{tde_datadir}/mimelnk/text/x-ksysv-log.desktop -%{tde_tdedocdir}/HTML/en/ksysv/ - -%post -n trinity-ksysv -for icon_theme in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ksysv -for icon_theme in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kuser -Summary: Trinity user/group administration tool -Group: System/GUI/Other - -%if 0%{?with_consolehelper} -# package 'usermode' provides '/usr/bin/consolehelper-gtk' -%if 0%{?rhel} || 0%{?fedora} -Requires: usermode-gtk -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -Requires: usermode -%endif -%endif - -%description -n trinity-kuser -A user/group administration tool for TDE. - -%files -n trinity-kuser -%defattr(-,root,root,-) -%doc rpmdocs/kuser/* -%{tde_bindir}/kuser -%{tde_tdeappdir}/kuser.desktop -%{tde_datadir}/apps/kuser/ -%{tde_datadir}/config/kuserrc -%{tde_datadir}/config.kcfg/kuser.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kuser.png -%{tde_tdedocdir}/HTML/en/kuser/ - -%if 0%{?with_consolehelper} -%{tde_sbindir}/kuser -%{_sbindir}/kuser -%config(noreplace) /etc/pam.d/kuser -%config(noreplace) /etc/security/console.apps/kuser -%endif - -%post -n trinity-kuser -for icon_theme in hicolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kuser -for icon_theme in hicolor ; do - touch --no-create %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${icon_theme} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%if 0%{?with_lilo} -%package -n trinity-lilo-config -Summary: Trinity frontend for lilo configuration -Group: System/GUI/Other -Requires: trinity-kcontrol -Requires: trinity-tdebase-bin -#Requires: lilo - -%description -n trinity-lilo-config -lilo-config is a TDE based frontend to the lilo boot manager configuration. -It runs out of the Trinity Control Center. - -If you want to use the menu entry to launch lilo-config, you need to install -tdebase-bin since it uses the tdesu command to gain root privileges. - -%files -n trinity-lilo-config -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcm_lilo.la -%{tde_tdelibdir}/kcm_lilo.so -%{tde_tdeappdir}/lilo.desktop -%{tde_tdedocdir}/HTML/en/lilo-config/ - -%post -n trinity-lilo-config -touch /etc/lilo.conf -%endif - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTLIB QTINC -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Do not build against any "/usr" installed KDE -export KDEDIR=%{tde_prefix} - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --sbindir=%{tde_sbindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-rpm \ - --with-pam=kde \ - --with-shadow \ - --with-private-groups - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -comps="kcron kdat knetworkconf kpackage ksysv kuser" -%__mkdir_p %{buildroot}%{tde_datadir}/config \ - %{buildroot}%{_sysconfdir}/security/console.apps \ - %{buildroot}%{_sysconfdir}/pam.d \ - %{buildroot}%{tde_sbindir} \ - %{buildroot}%{_sbindir} - -%__install -p -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{tde_datadir}/config/ - -%if 0%{?with_consolehelper} -# Run kuser through consolehelper -%__install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/security/console.apps/kuser -%__install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/kuser -%__mv %{buildroot}%{tde_bindir}/kuser %{buildroot}%{tde_sbindir} -%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kuser -%if "%{tde_prefix}" != "/usr" -%__ln_s %{tde_sbindir}/kuser %{?buildroot}%{_sbindir}/kuser -%endif -%endif - -# rpmdocs -for dir in $comps ; do - for file in AUTHORS ChangeLog README TODO ; do - test -s "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file" - done -done - -# The following files are not installed in any binary package. -# This is deliberate. - -# - This file serves no purpose that we can see, and conflicts -# with GNOME system tools, so be sure to leave it out. -%__rm -f %{?buildroot}%{tde_libdir}/pkgconfig/*.pc - -# Extract from changelog: -# tdeadmin (4:3.5.5-2) unstable; urgency=low -# +++ Changes by Ana Beatriz Guerrero Lopez: -# * Removed useless program secpolicy. (Closes: #399426) -%__rm -f %{?buildroot}%{tde_bindir}/secpolicy - -# Remove lilo related files, if unwanted. -%if 0%{?with_lilo} == 0 -%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/en/lilo-config/ -%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.la -%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.so -%__rm -f %{?buildroot}%{tde_tdeappdir}/lilo.desktop -%endif - -# Updates applications categories for openSUSE -%if 0%{?suse_version} -%suse_update_desktop_file kdat System Backup -%suse_update_desktop_file kpackage System PackageManager -%suse_update_desktop_file kcron System ServiceConfiguration -%suse_update_desktop_file ksysv System ServiceConfiguration -%suse_update_desktop_file kuser System SystemSetup -%endif - -# Links duplicate files -%fdupes "%{?buildroot}%{tde_datadir}" - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/main/tdeadmin/tdeadmin.spec b/redhat/main/tdeadmin/tdeadmin.spec index 3e7a33ef6..9c2dcd673 100644 --- a/redhat/main/tdeadmin/tdeadmin.spec +++ b/redhat/main/tdeadmin/tdeadmin.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeadmin %define tde_prefix /opt/trinity @@ -244,7 +244,7 @@ install/remove them. %{tde_bindir}/kpackage %{tde_tdeappdir}/kpackage.desktop %{tde_datadir}/apps/kpackage/ -%{tde_confdir}/kpackagerc +%config(noreplace) %{tde_confdir}/kpackagerc %{tde_datadir}/icons/hicolor/*/apps/kpackage.png %{tde_tdedocdir}/HTML/en/kpackage/ @@ -264,7 +264,7 @@ drag and drop GUI. %{tde_bindir}/ksysv %{tde_tdeappdir}/ksysv.desktop %{tde_datadir}/apps/ksysv/ -%{tde_confdir}/ksysvrc +%config(noreplace) %{tde_confdir}/ksysvrc %{tde_datadir}/icons/hicolor/*/apps/ksysv.png %{tde_datadir}/mimelnk/application/x-ksysv.desktop %{tde_datadir}/mimelnk/text/x-ksysv-log.desktop @@ -295,7 +295,7 @@ A user/group administration tool for TDE. %{tde_bindir}/kuser %{tde_tdeappdir}/kuser.desktop %{tde_datadir}/apps/kuser/ -%{tde_confdir}/kuserrc +%config(noreplace) %{tde_confdir}/kuserrc %{tde_datadir}/config.kcfg/kuser.kcfg %{tde_datadir}/icons/hicolor/*/apps/kuser.png %{tde_tdedocdir}/HTML/en/kuser/ diff --git a/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec b/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec deleted file mode 100644 index e1d12b94c..000000000 --- a/redhat/main/tdeartwork/tdeartwork-3.5.13.2.spec +++ /dev/null @@ -1,744 +0,0 @@ -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-tdeartwork -Summary: Additional artwork (themes, sound themes, ...) for TDE -Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} - -License: GPLv2 -Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -Url: http://www.trinitydesktop.org/ - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: cmake >= 2.8 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} - -BuildRequires: gettext -BuildRequires: esound-devel - -# kdeartwork specific settings - -# OpenGL support -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-Mesa-libGLU -%endif - -# NAS support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: nas-devel -%endif - -# LIBART support -# On RHEL, libart is too old ! -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_libart 1 -BuildRequires: libart_lgpl-devel -%endif - -# XSCREENSAVER support -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} -%if 0%{?rhel} == 0 || 0%{?rhel} <= 6 -%define with_xscreensaver 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xscrnsaver-devel -%else -BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel -%endif -BuildRequires: xscreensaver -BuildRequires: xscreensaver-base -BuildRequires: xscreensaver-extrusion -BuildRequires: xscreensaver-gl -%endif -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220 -BuildRequires: libXScrnSaver-devel -%endif - -%if 0%{?fedora} || 0%{?rhel} >= 6 -# Provides '/usr/share/xscreensaver/config/deco.xml' -BuildRequires: xscreensaver -BuildRequires: xscreensaver-extras -%endif -%if 0%{?suse_version} -BuildRequires: xscreensaver -BuildRequires: xscreensaver-data -BuildRequires: xscreensaver-data-extra -%endif - -# Opensuse does not provide 'webcollage' screensaver -%if 0%{?suse_version} == 0 -%define with_webcollage 1 -%endif - -%endif -%endif - -# JACK support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}jack-devel -%endif -%if 0%{?fedora} || 0%{?rhel} >= 5 -BuildRequires: jack-audio-connection-kit-devel -%endif - - -Obsoletes: trinity-kdeartwork < %{version}-%{release} -Provides: trinity-kdeartwork = %{version}-%{release} - -# Metapackage -Requires: %{name}-emoticons = %{version}-%{release} -Requires: %{name}-misc = %{version}-%{release} -Requires: %{name}-style = %{version}-%{release} -Requires: %{name}-theme-icon = %{version}-%{release} -Requires: %{name}-theme-window = %{version}-%{release} -Requires: trinity-tdewallpapers = %{version}-%{release} -Requires: trinity-tdescreensaver = %{version}-%{release} - -%if 0%{?with_xscreensaver} -Requires: trinity-tdescreensaver-xsavers = %{version}-%{release} -Requires: trinity-tdescreensaver-xsavers-extra = %{version}-%{release} -%if 0%{?with_webcollage} -Requires: trinity-tdescreensaver-xsavers-webcollage = %{version}-%{release} -%endif -%endif - - -%description -TDE (the Trinity Desktop Environment) is a powerful Open Source graphical -desktop environment for Unix workstations. It combines ease of use, -contemporary functionality, and outstanding graphical design with the -technological superiority of the Unix operating system. - -This metapackage includes a collection of artistic extras (themes, widget -styles, screen savers, wallpaper, icons, emoticons and so on) provided -with the official release of TDE. - -Homepage: http://artist.kde.org - -%files - -########## - -%package emoticons -Summary: emoticon collections for tDE chat clients -Group: User Interface/Desktops - -%description emoticons -This package contains several collections of emoticons used by official -and unofficial TDE chat clients, such as Kopete and Konversation. - -This package is part of TDE, and a component of the TDE artwork module. - -%files emoticons -%defattr(-,root,root,-) -%{tde_datadir}/emoticons/ - -########## - -%package misc -Summary: various multimedia goodies released with TDE -Group: User Interface/Desktops - -%description misc -This package contains miscellaneous multimedia goodies for TDE. -Included are additional TDE sounds and kworldclock themes. - -This package is part of Trinity, and a component of the TDE artwork module. - -%files misc -%defattr(-,root,root,-) -%{tde_datadir}/apps/kworldclock/ -%{tde_datadir}/sounds/KDE_Logout_new.wav -%{tde_datadir}/sounds/KDE_Startup_new.wav - -########## - -%package style -Summary: widget styles released with Trinity -Group: User Interface/Desktops - -%description style -This package contains additional widget styles for Trinity. Widget styles -can be used to customise the look and feel of interface components such -as buttons, scrollbars and so on. They can be applied using the style -manager in the Trinity Control Center. - -This package is part of Trinity, and a component of the TDE artwork module. - -%files style -%defattr(-,root,root,-) -%{tde_tdelibdir}/plugins/styles/ -%{tde_tdelibdir}/kstyle_phase_config.la -%{tde_tdelibdir}/kstyle_phase_config.so -%{tde_datadir}/apps/kstyle/ - -########## - -%package theme-icon -Summary: icon themes released with Trinity -Group: User Interface/Desktops - -Obsoletes: trinity-kdeartwork-icons < %{version}-%{release} -Provides: trinity-kdeartwork-icons = %{version}-%{release} - -%description theme-icon -This package contains additional icon themes for Trinity. Icon themes can be -used to customise the appearance of standard icons throughout TDE. They -can be applied using the icon manager in the Trinity Control Centre. - -This package is part of Trinity, and a component of the TDE artwork module. - -%files theme-icon -%defattr(-,root,root,-) -%{tde_datadir}/icons/*/* - -%post theme-icon -for i in locolor ikons kdeclassic kids slick ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done - -%postun theme-icon -for i in locolor ikons kdeclassic kids slick ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done - -########## - -%package theme-window -Summary: window decoration themes released with Trinity -Group: User Interface/Desktops - -%description theme-window -This package contains additional window decoration themes for Trinity. Window -decoration themes can be used to customise the look of window borders and -buttons, and can be applied using the window decoration manager in the Trinity -Control Center. - -This package is part of Trinity, and a component of the TDE artwork module. - -%files theme-window -%defattr(-,root,root,-) -%{tde_tdelibdir}/kwin* -%{tde_datadir}/apps/kwin/ - -########## - -%package -n trinity-tdewallpapers -Summary: wallpapers released with Trinity -Group: User Interface/Desktops -Obsoletes: trinity-kdewallpapers < %{version}-%{release} -Provides: trinity-kdewallpapers = %{version}-%{release} - -%description -n trinity-tdewallpapers -This package contains additional wallpapers for Trinity. Wallpapers can be -applied using the background manager in the Trinity Control Center. - -This package is part of Trinity, and a component of the TDE artwork module. - -%files -n trinity-tdewallpapers -%defattr(-,root,root,-) -%{tde_datadir}/wallpapers/* - -########## - -%package -n trinity-tdescreensaver -Summary: additional screen savers released with Trinity -Group: User Interface/Desktops - -Obsoletes: trinity-kscreensaver < %{version}-%{release} -Provides: trinity-kscreensaver = %{version}-%{release} - -%description -n trinity-tdescreensaver -This package contains the screen savers for Trinity. They can be tested and -selected within the Appearance and Themes section of the Trinity Control -Center. - -The hooks for the standard xscreensavers are no longer part of this -package. To select and/or configure the standard xscreensavers through -the Trinity Control Center, install the separate package tdescreensaver-xsavers. - -This package is part of Trinity, and a component of the TDE artwork module. - -%files -n trinity-tdescreensaver -%defattr(-,root,root,-) -%{tde_bindir}/kslideshow.kss -%{tde_bindir}/kpolygon.kss -%{tde_bindir}/krotation.kss -%{tde_bindir}/ksolarwinds.kss -%{tde_bindir}/klorenz.kss -%{tde_bindir}/kvm.kss -%{tde_bindir}/kflux.kss -%{tde_bindir}/kscience.kss -%{tde_bindir}/kbanner.kss -%{tde_bindir}/kclock.kss -%{tde_bindir}/kfiresaver.kss -%{tde_bindir}/keuphoria.kss -%{tde_bindir}/kfountain.kss -%{tde_bindir}/kgravity.kss -%{tde_bindir}/kpartsaver.kss -%{tde_bindir}/kpendulum.kss -%{tde_bindir}/kblob.kss -%{tde_bindir}/klines.kss -%{tde_bindir}/kwave.kss -%{tde_datadir}/applnk/System/ScreenSavers/KBanner.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KBlob.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KClock.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KEuphoria.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KFiresaver.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KFlux.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KFountain.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KGravity.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KLines-saver.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KLorenz.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KPendulum.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KPolygon.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KRotation.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KScience.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KSlideshow.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KSolarWinds.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KVm.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KWave.desktop -%{tde_datadir}/applnk/System/ScreenSavers/kpartsaver.desktop -%{tde_datadir}/apps/kfiresaver/ -%{tde_datadir}/apps/kscreensaver/ - -%if 0%{?with_xscreensaver} -%{tde_bindir}/kspace.kss -%{tde_bindir}/kswarm.kss -%{tde_datadir}/applnk/System/ScreenSavers/KSpace.desktop -%{tde_datadir}/applnk/System/ScreenSavers/KSwarm.desktop -%endif - -########## - -%if 0%{?with_xscreensaver} - -%package -n trinity-tdescreensaver-xsavers -Summary: Trinity hooks for standard xscreensavers -Group: User Interface/Desktops -Requires: trinity-tdebase-bin >= %{tde_version} -Requires: xscreensaver - -Obsoletes: trinity-kscreensaver-xsavers < %{version}-%{release} -Provides: trinity-kscreensaver-xsavers = %{version}-%{release} - -%description -n trinity-tdescreensaver-xsavers -This package allows a smooth integration of the standard xscreensavers -into Trinity. With this package installed you can select and/or configure -the standard xscreensavers through the Appearances and Themes section of -the Trinity Control Centre. - -Note that this package does not actually contain any screensavers itself. -For the additional screensavers shipped with Trinity, see the separate package -tdescreensaver-trinity. This package does depend on the xscreensaver package, and -recommend the xscreensaver-gl package, as well as contain the necessary -files to integrate these packages into Trinity. - -This package is part of Trinity, and a component of the TDE artwork module. - -%files -n trinity-tdescreensaver-xsavers -%defattr(-,root,root,-) -%{tde_bindir}/xscreensaver-getimage-file -%{tde_bindir}/xscreensaver-getimage -%{tde_bindir}/kxsconfig -%{tde_bindir}/kxsrun -%{tde_datadir}/applnk/System/ScreenSavers/antinspect.desktop -%{tde_datadir}/applnk/System/ScreenSavers/antspotlight.desktop -%{tde_datadir}/applnk/System/ScreenSavers/atunnel.desktop -%{tde_datadir}/applnk/System/ScreenSavers/blinkbox.desktop -%{tde_datadir}/applnk/System/ScreenSavers/braid.desktop -%{tde_datadir}/applnk/System/ScreenSavers/bubble3d.desktop -%{tde_datadir}/applnk/System/ScreenSavers/circuit.desktop -%{tde_datadir}/applnk/System/ScreenSavers/cubestorm.desktop -%{tde_datadir}/applnk/System/ScreenSavers/deco.desktop -%{tde_datadir}/applnk/System/ScreenSavers/distort.desktop -%{tde_datadir}/applnk/System/ScreenSavers/endgame.desktop -%{tde_datadir}/applnk/System/ScreenSavers/engine.desktop -%{tde_datadir}/applnk/System/ScreenSavers/fiberlamp.desktop -%{tde_datadir}/applnk/System/ScreenSavers/flipflop.desktop -%{tde_datadir}/applnk/System/ScreenSavers/flipscreen3d.desktop -%{tde_datadir}/applnk/System/ScreenSavers/flyingtoasters.desktop -%{tde_datadir}/applnk/System/ScreenSavers/fuzzyflakes.desktop -%{tde_datadir}/applnk/System/ScreenSavers/galaxy.desktop -%{tde_datadir}/applnk/System/ScreenSavers/gears.desktop -%{tde_datadir}/applnk/System/ScreenSavers/gflux.desktop -%{tde_datadir}/applnk/System/ScreenSavers/glblur.desktop -%{tde_datadir}/applnk/System/ScreenSavers/gleidescope.desktop -%{tde_datadir}/applnk/System/ScreenSavers/glknots.desktop -%{tde_datadir}/applnk/System/ScreenSavers/glslideshow.desktop -%{tde_datadir}/applnk/System/ScreenSavers/glsnake.desktop -%{tde_datadir}/applnk/System/ScreenSavers/gltext.desktop -%{tde_datadir}/applnk/System/ScreenSavers/hypertorus.desktop -%{tde_datadir}/applnk/System/ScreenSavers/jigglypuff.desktop -%{tde_datadir}/applnk/System/ScreenSavers/lavalite.desktop -%{tde_datadir}/applnk/System/ScreenSavers/metaballs.desktop -%{tde_datadir}/applnk/System/ScreenSavers/mirrorblob.desktop -%{tde_datadir}/applnk/System/ScreenSavers/moebius.desktop -%{tde_datadir}/applnk/System/ScreenSavers/molecule.desktop -%{tde_datadir}/applnk/System/ScreenSavers/morph3d.desktop -%{tde_datadir}/applnk/System/ScreenSavers/penrose.desktop -%{tde_datadir}/applnk/System/ScreenSavers/pipes.desktop -%{tde_datadir}/applnk/System/ScreenSavers/polyhedra.desktop -%{tde_datadir}/applnk/System/ScreenSavers/polytopes.desktop -%{tde_datadir}/applnk/System/ScreenSavers/popsquares.desktop -%{tde_datadir}/applnk/System/ScreenSavers/pulsar.desktop -%{tde_datadir}/applnk/System/ScreenSavers/queens.desktop -%{tde_datadir}/applnk/System/ScreenSavers/ripples.desktop -%{tde_datadir}/applnk/System/ScreenSavers/shadebobs.desktop -%{tde_datadir}/applnk/System/ScreenSavers/sierpinski3d.desktop -%{tde_datadir}/applnk/System/ScreenSavers/slidescreen.desktop -%{tde_datadir}/applnk/System/ScreenSavers/sonar.desktop -%{tde_datadir}/applnk/System/ScreenSavers/spheremonics.desktop -%{tde_datadir}/applnk/System/ScreenSavers/stonerview.desktop -%{tde_datadir}/applnk/System/ScreenSavers/superquadrics.desktop -%{tde_datadir}/applnk/System/ScreenSavers/swirl.desktop -%{tde_datadir}/applnk/System/ScreenSavers/xlyap.desktop -%{tde_datadir}/applnk/System/ScreenSavers/m6502.desktop -%{tde_datadir}/applnk/System/ScreenSavers/glschool.desktop -%{tde_datadir}/applnk/System/ScreenSavers/moebiusgears.desktop -%{tde_datadir}/applnk/System/ScreenSavers/glcells.desktop -%{tde_datadir}/applnk/System/ScreenSavers/abstractile.desktop -%{tde_datadir}/applnk/System/ScreenSavers/lockward.desktop -%{tde_datadir}/applnk/System/ScreenSavers/cwaves.desktop -%{tde_datadir}/applnk/System/ScreenSavers/topblock.desktop -%{tde_datadir}/applnk/System/ScreenSavers/voronoi.desktop -%{tde_datadir}/applnk/System/ScreenSavers/cubicgrid.desktop -%{tde_datadir}/applnk/System/ScreenSavers/hypnowheel.desktop -%{tde_datadir}/applnk/System/ScreenSavers/lcdscrub.desktop -%{tde_datadir}/applnk/System/ScreenSavers/photopile.desktop -%{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop - -# These screensavers do not exist on Mageia 2 -%if 0%{?mgaversion} == 0 && 0%{?mdkversion} == 0 -%{tde_datadir}/applnk/System/ScreenSavers/glmatrix.desktop -%endif - -########## - -%if 0%{?with_webcollage} - -%package -n trinity-tdescreensaver-xsavers-webcollage -Summary: webcollage screensaver Trinity hook -Group: User Interface/Desktops -Requires: trinity-tdescreensaver-xsavers-extra = %{version}-%{release} -Requires: netpbm - -Obsoletes: trinity-kscreensaver-xsavers-webcollage < %{version}-%{release} -Provides: trinity-kscreensaver-xsavers-webcollage = %{version}-%{release} - -%description -n trinity-tdescreensaver-xsavers-webcollage -This package give access to the webcollage screensaver through the Trinity -screensaver configuration. - -This screensaver downloads random pictures from the internet and creates -a collage as screensaver. - -IMPORTANT NOTICE: The internet contains all kinds of pictures, some of which -you might find inappropriate and offensive. -You are specially discouraged to install this package if you are using -your computer in a working environment or in an environment with children. - -This package is part of Trinity, and a component of the TDE artwork module. - -%files -n trinity-tdescreensaver-xsavers-webcollage -%defattr(-,root,root,-) -%{tde_datadir}/applnk/System/ScreenSavers/webcollage.desktop - -%endif - -########## - -%package -n trinity-tdescreensaver-xsavers-extra -Summary: Trinity hooks for standard xscreensavers -Group: User Interface/Desktops -Requires: trinity-tdescreensaver-xsavers = %{version}-%{release} - -Obsoletes: trinity-kscreensaver-xsavers-extra < %{version}-%{release} -Provides: trinity-kscreensaver-xsavers-extra = %{version}-%{release} - -%description -n trinity-tdescreensaver-xsavers-extra -This package allows a smooth integration of the universe xscreensavers -into Trinity. With this package installed you can select and/or configure -the universe xscreensavers through the Appearances and Themes section of -the Trinity Control Centre. - -Note that this package does not actually contain any screensavers itself. -For the additional screensavers shipped with TDE, see the separate package -tdescreensaver. - -This package is part of Trinity, and a component of the TDE artwork module. - -%files -n trinity-tdescreensaver-xsavers-extra -%defattr(-,root,root,-) -%{tde_datadir}/applnk/System/ScreenSavers/anemone.desktop -%{tde_datadir}/applnk/System/ScreenSavers/anemotaxis.desktop -%{tde_datadir}/applnk/System/ScreenSavers/antmaze.desktop -%{tde_datadir}/applnk/System/ScreenSavers/apollonian.desktop -%{tde_datadir}/applnk/System/ScreenSavers/apple2.desktop -%{tde_datadir}/applnk/System/ScreenSavers/atlantis.desktop -%{tde_datadir}/applnk/System/ScreenSavers/attraction.desktop -%{tde_datadir}/applnk/System/ScreenSavers/barcode.desktop -%{tde_datadir}/applnk/System/ScreenSavers/blaster.desktop -%{tde_datadir}/applnk/System/ScreenSavers/blitspin.desktop -%{tde_datadir}/applnk/System/ScreenSavers/blocktube.desktop -%{tde_datadir}/applnk/System/ScreenSavers/boing.desktop -%{tde_datadir}/applnk/System/ScreenSavers/bouboule.desktop -%{tde_datadir}/applnk/System/ScreenSavers/bouncingcow.desktop -%{tde_datadir}/applnk/System/ScreenSavers/boxed.desktop -%{tde_datadir}/applnk/System/ScreenSavers/boxfit.desktop -%{tde_datadir}/applnk/System/ScreenSavers/bsod.desktop -%{tde_datadir}/applnk/System/ScreenSavers/bumps.desktop -%{tde_datadir}/applnk/System/ScreenSavers/cage.desktop -%{tde_datadir}/applnk/System/ScreenSavers/carousel.desktop -%{tde_datadir}/applnk/System/ScreenSavers/ccurve.desktop -%{tde_datadir}/applnk/System/ScreenSavers/celtic.desktop -%{tde_datadir}/applnk/System/ScreenSavers/cloudlife.desktop -%{tde_datadir}/applnk/System/ScreenSavers/compass.desktop -%{tde_datadir}/applnk/System/ScreenSavers/coral.desktop -%{tde_datadir}/applnk/System/ScreenSavers/crackberg.desktop -%{tde_datadir}/applnk/System/ScreenSavers/crystal.desktop -%{tde_datadir}/applnk/System/ScreenSavers/cube21.desktop -%{tde_datadir}/applnk/System/ScreenSavers/cubenetic.desktop -%{tde_datadir}/applnk/System/ScreenSavers/cynosure.desktop -%{tde_datadir}/applnk/System/ScreenSavers/dangerball.desktop -%{tde_datadir}/applnk/System/ScreenSavers/decayscreen.desktop -%{tde_datadir}/applnk/System/ScreenSavers/deluxe.desktop -%{tde_datadir}/applnk/System/ScreenSavers/demon.desktop -%{tde_datadir}/applnk/System/ScreenSavers/discrete.desktop -%{tde_datadir}/applnk/System/ScreenSavers/drift.desktop -%{tde_datadir}/applnk/System/ScreenSavers/epicycle.desktop -%{tde_datadir}/applnk/System/ScreenSavers/eruption.desktop -%{tde_datadir}/applnk/System/ScreenSavers/euler2d.desktop -%{tde_datadir}/applnk/System/ScreenSavers/extrusion.desktop -%{tde_datadir}/applnk/System/ScreenSavers/fadeplot.desktop -%{tde_datadir}/applnk/System/ScreenSavers/fireworkx.desktop -%{tde_datadir}/applnk/System/ScreenSavers/flame.desktop -%{tde_datadir}/applnk/System/ScreenSavers/fliptext.desktop -%{tde_datadir}/applnk/System/ScreenSavers/flow.desktop -%{tde_datadir}/applnk/System/ScreenSavers/fluidballs.desktop -%{tde_datadir}/applnk/System/ScreenSavers/flurry.desktop -%{tde_datadir}/applnk/System/ScreenSavers/fontglide.desktop -%{tde_datadir}/applnk/System/ScreenSavers/glhanoi.desktop -%{tde_datadir}/applnk/System/ScreenSavers/glplanet.desktop -%{tde_datadir}/applnk/System/ScreenSavers/goop.desktop -%{tde_datadir}/applnk/System/ScreenSavers/grav.desktop -%{tde_datadir}/applnk/System/ScreenSavers/greynetic.desktop -%{tde_datadir}/applnk/System/ScreenSavers/halftone.desktop -%{tde_datadir}/applnk/System/ScreenSavers/halo.desktop -%{tde_datadir}/applnk/System/ScreenSavers/helix.desktop -%{tde_datadir}/applnk/System/ScreenSavers/hopalong.desktop -%{tde_datadir}/applnk/System/ScreenSavers/ifs.desktop -%{tde_datadir}/applnk/System/ScreenSavers/imsmap.desktop -%{tde_datadir}/applnk/System/ScreenSavers/interaggregate.desktop -%{tde_datadir}/applnk/System/ScreenSavers/interference.desktop -%{tde_datadir}/applnk/System/ScreenSavers/intermomentary.desktop -%{tde_datadir}/applnk/System/ScreenSavers/jigsaw.desktop -%{tde_datadir}/applnk/System/ScreenSavers/juggler3d.desktop -%{tde_datadir}/applnk/System/ScreenSavers/julia.desktop -%{tde_datadir}/applnk/System/ScreenSavers/kaleidescope.desktop -%{tde_datadir}/applnk/System/ScreenSavers/klein.desktop -%{tde_datadir}/applnk/System/ScreenSavers/kumppa.desktop -%{tde_datadir}/applnk/System/ScreenSavers/lament.desktop -%{tde_datadir}/applnk/System/ScreenSavers/loop.desktop -%{tde_datadir}/applnk/System/ScreenSavers/maze.desktop -%{tde_datadir}/applnk/System/ScreenSavers/memscroller.desktop -%{tde_datadir}/applnk/System/ScreenSavers/menger.desktop -%{tde_datadir}/applnk/System/ScreenSavers/moire.desktop -%{tde_datadir}/applnk/System/ScreenSavers/moire2.desktop -%{tde_datadir}/applnk/System/ScreenSavers/mountain.desktop -%{tde_datadir}/applnk/System/ScreenSavers/munch.desktop -%{tde_datadir}/applnk/System/ScreenSavers/nerverot.desktop -%{tde_datadir}/applnk/System/ScreenSavers/noof.desktop -%{tde_datadir}/applnk/System/ScreenSavers/noseguy.desktop -%{tde_datadir}/applnk/System/ScreenSavers/pacman.desktop -%{tde_datadir}/applnk/System/ScreenSavers/pedal.desktop -%{tde_datadir}/applnk/System/ScreenSavers/penetrate.desktop -%{tde_datadir}/applnk/System/ScreenSavers/petri.desktop -%{tde_datadir}/applnk/System/ScreenSavers/phosphor.desktop -%{tde_datadir}/applnk/System/ScreenSavers/piecewise.desktop -%{tde_datadir}/applnk/System/ScreenSavers/pinion.desktop -%{tde_datadir}/applnk/System/ScreenSavers/polyominoes.desktop -%{tde_datadir}/applnk/System/ScreenSavers/pong.desktop -%{tde_datadir}/applnk/System/ScreenSavers/providence.desktop -%{tde_datadir}/applnk/System/ScreenSavers/pyro.desktop -%{tde_datadir}/applnk/System/ScreenSavers/qix.desktop -%{tde_datadir}/applnk/System/ScreenSavers/rd-bomb.desktop -%{tde_datadir}/applnk/System/ScreenSavers/rocks.desktop -%{tde_datadir}/applnk/System/ScreenSavers/rorschach.desktop -%{tde_datadir}/applnk/System/ScreenSavers/rotzoomer.desktop -%{tde_datadir}/applnk/System/ScreenSavers/rubik.desktop -%{tde_datadir}/applnk/System/ScreenSavers/sballs.desktop -%{tde_datadir}/applnk/System/ScreenSavers/sierpinski.desktop -%{tde_datadir}/applnk/System/ScreenSavers/slip.desktop -%{tde_datadir}/applnk/System/ScreenSavers/speedmine.desktop -%{tde_datadir}/applnk/System/ScreenSavers/spotlight.desktop -%{tde_datadir}/applnk/System/ScreenSavers/sproingies.desktop -%{tde_datadir}/applnk/System/ScreenSavers/squiral.desktop -%{tde_datadir}/applnk/System/ScreenSavers/stairs.desktop -%{tde_datadir}/applnk/System/ScreenSavers/starfish.desktop -%{tde_datadir}/applnk/System/ScreenSavers/starwars.desktop -%{tde_datadir}/applnk/System/ScreenSavers/strange.desktop -%{tde_datadir}/applnk/System/ScreenSavers/substrate.desktop -%{tde_datadir}/applnk/System/ScreenSavers/tangram.desktop -%{tde_datadir}/applnk/System/ScreenSavers/thornbird.desktop -%{tde_datadir}/applnk/System/ScreenSavers/timetunnel.desktop -%{tde_datadir}/applnk/System/ScreenSavers/triangle.desktop -%{tde_datadir}/applnk/System/ScreenSavers/truchet.desktop -%{tde_datadir}/applnk/System/ScreenSavers/twang.desktop -%{tde_datadir}/applnk/System/ScreenSavers/vermiculate.desktop -%{tde_datadir}/applnk/System/ScreenSavers/wander.desktop -%{tde_datadir}/applnk/System/ScreenSavers/whirlwindwarp.desktop -%{tde_datadir}/applnk/System/ScreenSavers/wormhole.desktop -%{tde_datadir}/applnk/System/ScreenSavers/xanalogtv.desktop -%{tde_datadir}/applnk/System/ScreenSavers/xflame.desktop -%{tde_datadir}/applnk/System/ScreenSavers/xrayswarm.desktop -%{tde_datadir}/applnk/System/ScreenSavers/xspirograph.desktop -%{tde_datadir}/applnk/System/ScreenSavers/zoom.desktop - -# These screensavers do not exist on OpenSuse -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%{tde_datadir}/applnk/System/ScreenSavers/vidwhacker.desktop -%endif - -# These screensavers do not exist on Mageia / Mandriva -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%{tde_datadir}/applnk/System/ScreenSavers/glmatrix.desktop -%{tde_datadir}/applnk/System/ScreenSavers/xjack.desktop -%{tde_datadir}/applnk/System/ScreenSavers/xmatrix.desktop -%endif - -%if 0%{?rhel} >= 6 -%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop -%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop -%endif - -%if 0%{?mgaversion} -%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop -%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop -%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop -%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop -%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop -%endif - -%if 0%{?fedora} >= 15 || 0%{?pclinuxos} -%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop -%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop -%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop -%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop -%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop -%endif - -%if 0%{?fedora} >= 18 || 0%{?pclinuxos} || 0%{?mgaversion} >= 4 -%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop -%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop -%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop -%{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop -%endif - -%if 0%{?fedora} >= 20 || 0%{?mgaversion} >= 4 -%{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop -%endif - -%endif - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - -# http://www.trinitydesktop.org/wiki/bin/view/Developers/HowToBuild -# NOTE: Before building tdeartwork, install any and all xhack screensavers that might be uses, then: -cd kscreensaver/kxsconfig/ -./update_hacks.sh - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - %{!?with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \ - %{!?with_libart}:-DWITH_LIBART=OFF} \ - -DWITH_OPENGL=ON \ - -DWITH_ARTS=ON \ - -DBUILD_ALL=ON \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install -C build DESTDIR=%{buildroot} - -# Should not be here if xscreensaver is disabled -%if 0%{?with_xscreensaver} == 0 -%__rm -f %{?buildroot}%{tde_bindir}/xscreensaver-getimage -%__rm -f %{?buildroot}%{tde_bindir}/xscreensaver-getimage-file -%endif - -# Duplicate with trinity-kbabel (from tdesdk) -%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/16x16/apps/kbabel.png -%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/32x32/apps/kbabel.png - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec b/redhat/main/tdeartwork/tdeartwork.spec index 3d31f7233..e13a191b7 100644 --- a/redhat/main/tdeartwork/tdeartwork-14.0.0.spec +++ b/redhat/main/tdeartwork/tdeartwork.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeartwork %define tde_prefix /opt/trinity @@ -103,7 +103,7 @@ BuildRequires: libart_lgpl-devel # RHEL 4: disabled # RHEL 6: available in EPEL # RHEL 7: available in NUX -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.el8 b/redhat/main/tdebase/pamd.kcheckpass-trinity.el8 new file mode 120000 index 000000000..dab729b22 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.el8 @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.el7
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc29 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc29 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc29 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc15 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc15 +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc30 diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc16 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc16 +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc31 diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc17 b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc32 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc17 +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.fc32 diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga2 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga2 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga2 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga3 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga3 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga3 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga4 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga4 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.mga4 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc18 b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga7 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc18 +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.mga7 diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos new file mode 120000 index 000000000..ad0fc6da6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos @@ -0,0 +1 @@ +pamd.kcheckpass-trinity.pclos2018
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc19 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc19 +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2012 diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc20 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2013 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc20 +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2013 diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc21 b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc21 +++ b/redhat/main/tdebase/pamd.kcheckpass-trinity.pclos2014 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.el8 b/redhat/main/tdebase/pamd.kdm-trinity-np.el8 new file mode 120000 index 000000000..3415e7d55 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.el8 @@ -0,0 +1 @@ +pamd.kdm-trinity-np.el7
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc15 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc15 deleted file mode 100644 index 96fcfe378..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc15 +++ /dev/null @@ -1,15 +0,0 @@ - #%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 required pam_selinux.so open -session optional pam_keyinit.so force revoke -session required pam_namespace.so -session include system-auth -session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc16 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc16 deleted file mode 100644 index 96fcfe378..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc16 +++ /dev/null @@ -1,15 +0,0 @@ - #%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 required pam_selinux.so open -session optional pam_keyinit.so force revoke -session required pam_namespace.so -session include system-auth -session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc17 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc17 deleted file mode 100644 index 96fcfe378..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc17 +++ /dev/null @@ -1,15 +0,0 @@ - #%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 required pam_selinux.so open -session optional pam_keyinit.so force revoke -session required pam_namespace.so -session include system-auth -session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc21 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc21 deleted file mode 100644 index 0616e66f6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc21 +++ /dev/null @@ -1,16 +0,0 @@ - #%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 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc22 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc22 deleted file mode 100644 index 0616e66f6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc22 +++ /dev/null @@ -1,16 +0,0 @@ - #%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 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc23 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc23 deleted file mode 100644 index 0616e66f6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc23 +++ /dev/null @@ -1,16 +0,0 @@ - #%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 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc24 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc24 deleted file mode 100644 index 0616e66f6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc24 +++ /dev/null @@ -1,16 +0,0 @@ - #%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 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc25 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc25 deleted file mode 100644 index 0616e66f6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc25 +++ /dev/null @@ -1,16 +0,0 @@ - #%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 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc26 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc26 deleted file mode 100644 index 0616e66f6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc26 +++ /dev/null @@ -1,16 +0,0 @@ - #%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 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc27 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc27 deleted file mode 100644 index 0616e66f6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc27 +++ /dev/null @@ -1,16 +0,0 @@ - #%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 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc28 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc28 deleted file mode 100644 index 0616e66f6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc28 +++ /dev/null @@ -1,16 +0,0 @@ - #%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 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc29 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc29 deleted file mode 100644 index 0616e66f6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc29 +++ /dev/null @@ -1,16 +0,0 @@ - #%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 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc18 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc30 index 0616e66f6..0616e66f6 100644 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc18 +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc30 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc19 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc31 index 0616e66f6..0616e66f6 100644 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc19 +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc31 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.fc20 b/redhat/main/tdebase/pamd.kdm-trinity-np.fc32 index 0616e66f6..0616e66f6 100644 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.fc20 +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.fc32 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga2 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga2 deleted file mode 100644 index c4e598afe..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga2 +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth required pam_env.so -auth required pam_permit.so -account required pam_nologin.so -account include system-auth -password include system-auth -session optional pam_keyinit.so force revoke -session include system-auth -session required pam_loginuid.so -session optional pam_console.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga4 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga4 deleted file mode 100644 index f884c1de6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga4 +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -auth required pam_env.so -auth required pam_permit.so -account required pam_nologin.so -account include system-auth -password include system-auth -session required pam_loginuid.so -session optional pam_console.so -session optional pam_keyinit.so force revoke -session required pam_namespace.so -session include system-auth diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.mga3 b/redhat/main/tdebase/pamd.kdm-trinity-np.mga7 index f884c1de6..f884c1de6 100644 --- a/redhat/main/tdebase/pamd.kdm-trinity-np.mga3 +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.mga7 diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos new file mode 120000 index 000000000..5cde6e2c5 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos @@ -0,0 +1 @@ +pamd.kdm-trinity-np.pclos2018
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2012 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2012 new file mode 100644 index 000000000..690b4df08 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2012 @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +account include system-auth +password include system-auth +session include system-auth +session optional pam_console.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2013 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2013 new file mode 100644 index 000000000..690b4df08 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2013 @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +account include system-auth +password include system-auth +session include system-auth +session optional pam_console.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2014 b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2014 new file mode 100644 index 000000000..690b4df08 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity-np.pclos2014 @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +account include system-auth +password include system-auth +session include system-auth +session optional pam_console.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity.el8 b/redhat/main/tdebase/pamd.kdm-trinity.el8 new file mode 120000 index 000000000..f85413ec6 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.el8 @@ -0,0 +1 @@ +pamd.kdm-trinity.el7
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc15 b/redhat/main/tdebase/pamd.kdm-trinity.fc15 deleted file mode 100644 index f1d90f7f3..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc15 +++ /dev/null @@ -1,18 +0,0 @@ -#%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 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 required pam_selinux.so open -session optional pam_keyinit.so force revoke -session required pam_namespace.so -session optional pam_gnome_keyring.so auto_start -session include system-auth -session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc16 b/redhat/main/tdebase/pamd.kdm-trinity.fc16 deleted file mode 100644 index ff7b155c6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc16 +++ /dev/null @@ -1,18 +0,0 @@ -#%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 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 required pam_selinux.so open -session optional pam_keyinit.so force revoke -session required pam_namespace.so --session optional pam_gnome_keyring.so auto_start -session include system-auth -session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc17 b/redhat/main/tdebase/pamd.kdm-trinity.fc17 deleted file mode 100644 index ff7b155c6..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc17 +++ /dev/null @@ -1,18 +0,0 @@ -#%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 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 required pam_selinux.so open -session optional pam_keyinit.so force revoke -session required pam_namespace.so --session optional pam_gnome_keyring.so auto_start -session include system-auth -session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc18 b/redhat/main/tdebase/pamd.kdm-trinity.fc18 deleted file mode 100644 index 686433fce..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc18 +++ /dev/null @@ -1,19 +0,0 @@ -#%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 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 include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc19 b/redhat/main/tdebase/pamd.kdm-trinity.fc19 deleted file mode 100644 index 686433fce..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc19 +++ /dev/null @@ -1,19 +0,0 @@ -#%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 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 include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc20 b/redhat/main/tdebase/pamd.kdm-trinity.fc20 deleted file mode 100644 index 686433fce..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc20 +++ /dev/null @@ -1,19 +0,0 @@ -#%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 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 include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc21 b/redhat/main/tdebase/pamd.kdm-trinity.fc21 deleted file mode 100644 index 686433fce..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc21 +++ /dev/null @@ -1,19 +0,0 @@ -#%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 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 include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc22 b/redhat/main/tdebase/pamd.kdm-trinity.fc22 deleted file mode 100644 index e72140962..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc22 +++ /dev/null @@ -1,21 +0,0 @@ -#%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 diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc23 b/redhat/main/tdebase/pamd.kdm-trinity.fc23 deleted file mode 100644 index e72140962..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc23 +++ /dev/null @@ -1,21 +0,0 @@ -#%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 diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc27 b/redhat/main/tdebase/pamd.kdm-trinity.fc27 deleted file mode 100644 index 4e760760f..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc27 +++ /dev/null @@ -1,23 +0,0 @@ -#%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 optional pam_kwallet5.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 optional pam_kwallet5.so -session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc28 b/redhat/main/tdebase/pamd.kdm-trinity.fc28 deleted file mode 100644 index 4e760760f..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc28 +++ /dev/null @@ -1,23 +0,0 @@ -#%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 optional pam_kwallet5.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 optional pam_kwallet5.so -session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc29 b/redhat/main/tdebase/pamd.kdm-trinity.fc29 deleted file mode 100644 index 4e760760f..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc29 +++ /dev/null @@ -1,23 +0,0 @@ -#%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 optional pam_kwallet5.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 optional pam_kwallet5.so -session include postlogin diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc24 b/redhat/main/tdebase/pamd.kdm-trinity.fc30 index 4e760760f..4e760760f 100644 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc24 +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc30 diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc25 b/redhat/main/tdebase/pamd.kdm-trinity.fc31 index 4e760760f..4e760760f 100644 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc25 +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc31 diff --git a/redhat/main/tdebase/pamd.kdm-trinity.fc26 b/redhat/main/tdebase/pamd.kdm-trinity.fc32 index 4e760760f..4e760760f 100644 --- a/redhat/main/tdebase/pamd.kdm-trinity.fc26 +++ b/redhat/main/tdebase/pamd.kdm-trinity.fc32 diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga2 b/redhat/main/tdebase/pamd.kdm-trinity.mga2 deleted file mode 100644 index 3263a6891..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.mga2 +++ /dev/null @@ -1,13 +0,0 @@ -#%PAM-1.0 -auth required pam_env.so -auth required pam_succeed_if.so -auth sufficient pam_succeed_if.so user ingroup nopasswdlogin -auth substack system-auth -account required pam_nologin.so -account include system-auth -password include system-auth -session optional pam_keyinit.so force revoke -session required pam_loginuid.so -session include system-auth -session optional pam_console.so -session required pam_namespace.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga3 b/redhat/main/tdebase/pamd.kdm-trinity.mga3 deleted file mode 100644 index 3a1115b0c..000000000 --- a/redhat/main/tdebase/pamd.kdm-trinity.mga3 +++ /dev/null @@ -1,13 +0,0 @@ -#%PAM-1.0 -auth required pam_env.so -auth required pam_succeed_if.so -auth sufficient pam_succeed_if.so user ingroup nopasswdlogin -auth substack system-auth -account required pam_nologin.so -account include system-auth -password include system-auth -session required pam_loginuid.so -session optional pam_console.so -session optional pam_keyinit.so force revoke -session required pam_namespace.so -session include system-auth diff --git a/redhat/main/tdebase/pamd.kdm-trinity.mga4 b/redhat/main/tdebase/pamd.kdm-trinity.mga7 index 3a1115b0c..cb0982c9a 100644 --- a/redhat/main/tdebase/pamd.kdm-trinity.mga4 +++ b/redhat/main/tdebase/pamd.kdm-trinity.mga7 @@ -3,6 +3,7 @@ auth required pam_env.so auth required pam_succeed_if.so auth sufficient pam_succeed_if.so user ingroup nopasswdlogin auth substack system-auth +-auth optional pam_kwallet.so account required pam_nologin.so account include system-auth password include system-auth @@ -11,3 +12,4 @@ session optional pam_console.so session optional pam_keyinit.so force revoke session required pam_namespace.so session include system-auth +-session optional pam_kwallet.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos b/redhat/main/tdebase/pamd.kdm-trinity.pclos new file mode 120000 index 000000000..fcc6957f7 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos @@ -0,0 +1 @@ +pamd.kdm-trinity.pclos2018
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2012 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2012 new file mode 100644 index 000000000..87d080f58 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2012 @@ -0,0 +1,8 @@ +#%PAM-1.0 +auth include system-auth +auth required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session optional pam_console.so +session required pam_namespace.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2013 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2013 new file mode 100644 index 000000000..87d080f58 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2013 @@ -0,0 +1,8 @@ +#%PAM-1.0 +auth include system-auth +auth required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session optional pam_console.so +session required pam_namespace.so diff --git a/redhat/main/tdebase/pamd.kdm-trinity.pclos2014 b/redhat/main/tdebase/pamd.kdm-trinity.pclos2014 new file mode 100644 index 000000000..87d080f58 --- /dev/null +++ b/redhat/main/tdebase/pamd.kdm-trinity.pclos2014 @@ -0,0 +1,8 @@ +#%PAM-1.0 +auth include system-auth +auth required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session optional pam_console.so +session required pam_namespace.so diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.el8 b/redhat/main/tdebase/pamd.kscreensaver-trinity.el8 new file mode 120000 index 000000000..a5fab9e3e --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.el8 @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.el7
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc15 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc15 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc15 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc16 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc16 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc16 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc17 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc17 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc17 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc18 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc18 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc18 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc19 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc19 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc19 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc20 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc20 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc20 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc21 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc21 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc21 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc22 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc22 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc22 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc23 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc23 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc23 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc24 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc24 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc24 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc25 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc25 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc25 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc26 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc26 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc26 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc27 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc27 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc27 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc28 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc28 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc28 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc29 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc29 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.fc29 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc22 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc22 +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc30 diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc23 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc23 +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc31 diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc24 b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc32 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc24 +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.fc32 diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga2 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga2 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga2 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga3 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga3 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga3 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga4 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga4 deleted file mode 100644 index 0a37e6e13..000000000 --- a/redhat/main/tdebase/pamd.kscreensaver-trinity.mga4 +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-auth -account include system-auth -password include system-auth -session include system-auth diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc25 b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga7 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc25 +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.mga7 diff --git a/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos new file mode 120000 index 000000000..31d43e302 --- /dev/null +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos @@ -0,0 +1 @@ +pamd.kscreensaver-trinity.pclos2018
\ No newline at end of file diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc26 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc26 +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2012 diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc27 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc27 +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2013 diff --git a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc28 b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2014 index 0a37e6e13..0a37e6e13 100644 --- a/redhat/main/tdebase/pamd.kcheckpass-trinity.fc28 +++ b/redhat/main/tdebase/pamd.kscreensaver-trinity.pclos2014 diff --git a/redhat/main/tdebase/tdebase-3.5.13.2.spec b/redhat/main/tdebase/tdebase-3.5.13.2.spec deleted file mode 100644 index 6c4318f8d..000000000 --- a/redhat/main/tdebase/tdebase-3.5.13.2.spec +++ /dev/null @@ -1,3886 +0,0 @@ -# -# spec file for package tdebase (version 3.5.13-SRU) -# -# 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 1 -%define tde_version 3.5.13.2 -%define tde_pkg tdebase -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%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_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define tdm kdm -%define tdm_datadir %{tde_datadir}/apps/%{tdm} -%define starttde startkde - - -Name: trinity-%{tde_pkg} -Version: %{tde_version} -Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist} -Summary: Trinity Base Programs -Group: System/GUI/Other -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}-%{version}%{?preversion:~%{preversion}}.tar.gz -Source1: trinity-tdebase-rpmlintrc - -# Pam configuration files for RHEL / Fedora -%if 0%{?suse_version} == 0 -Source2: pamd.kdm-trinity%{?dist} -Source3: pamd.kdm-trinity-np%{?dist} -Source4: pamd.kcheckpass-trinity%{?dist} -Source5: pamd.kscreensaver-trinity%{?dist} -%endif - -# openSUSE: configuration file for TDM -Source6: suse-displaymanagers-tdm - -# Fedora 18: use SYSTEMD for TDM startup -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -Source7: tdm.service%{?dist} -%endif - -# openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!! -%if 0%{?suse_version} == 1140 -Source7: xdm.oss114 -%endif - -# Fedora >= 17: special selinux policy required for TDM -# If login through TDM takes ages, then look at '/var/log/audit/audit.log'. -# Locate the line containing 'USER_AVC' and dbus stuff. -# Put this line into a temporary file, then (e.g for Fedora 17): -# audit2allow -i /tmp/file -m tdm.fc17 >tdm.fc17.te -# audit2allow -i /tmp/file -M tdm.fc17 - -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 -%define with_selinux_policy 1 -Source8: tdm%{?dist}.pp -%endif - -%if 0%{?mgaversion} >= 3 -Source9: mgabutton.svg -%endif - -%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch} - -Obsoletes: trinity-kdebase < %{version}-%{release} -Provides: trinity-kdebase = %{version}-%{release} -Obsoletes: trinity-kdebase-libs < %{version}-%{release} -Provides: trinity-kdebase-libs = %{version}-%{release} -Obsoletes: trinity-kdebase-extras < %{version}-%{release} -Provides: trinity-kdebase-extras = %{version}-%{release} -Obsoletes: tdebase < %{version}-%{release} -Provides: tdebase = %{version}-%{release} - -# for set_permissions macro -%if 0%{?suse_version} -PreReq: permissions -%endif - -# 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 - -### Distribution-specific settings ### - -# Fedora 15 Theme: "Lovelock" -%if 0%{?fedora} == 15 -Requires: lovelock-backgrounds-single -%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png - -Requires: fedora-release-notes -%define tde_aboutlabel Fedora 15 -%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html -%endif - -# Fedora 16 Theme: "Verne" -%if 0%{?fedora} == 16 -Requires: verne-backgrounds-single -%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png - -Requires: fedora-release-notes -%define tde_aboutlabel Fedora 16 -%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html -%endif - -# Fedora 17 Theme: "Beefy Miracle" -%if 0%{?fedora} == 17 -Requires: beefy-miracle-backgrounds-single -%define tde_bg /usr/share/backgrounds/beefy-miracle/default/standard/beefy-miracle.png -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png - -Requires: fedora-release-notes -%define tde_aboutlabel Fedora 17 -%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html -%endif - -# Fedora 18 Theme: "Spherical Cow" -%if 0%{?fedora} == 18 -Requires: spherical-cow-backgrounds-single -%define tde_bg /usr/share/backgrounds/spherical-cow/default/standard/spherical-cow.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png - -Requires: fedora-release-notes -%define tde_aboutlabel Fedora 18 -%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html -%endif - -# Fedora 19 Theme: "Schroedinger's cat" -%if 0%{?fedora} == 19 -Requires: schroedinger-cat-backgrounds-base -%define tde_bg /usr/share/backgrounds/schroedinger-cat/default/standard/schroedinger-cat.jpg -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png - -Requires: fedora-release-notes -%define tde_aboutlabel Fedora 19 -%define tde_aboutpage /usr/share/doc/fedora-release-notes-19/index.html -%endif - -# Fedora 20 Theme: "Heisenbug" -%if 0%{?fedora} == 20 -Requires: heisenbug-backgrounds-base -%define tde_bg /usr/share/backgrounds/heisenbug/default/standard/heisenbug.png -Requires: fedora-logos -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png - -Requires: fedora-release-notes -%define tde_aboutlabel Fedora 20 -%define tde_aboutpage /usr/share/doc/fedora-release-notes/index.html -%endif - -# RHEL 4 Theme -%if 0%{?rhel} == 4 -Requires: desktop-backgrounds-basic -%define tde_bg /usr/share/backgrounds/images/default.png -Requires: redhat-logos -%define tde_starticon /usr/share/pixmaps/redhat/rpmlogo-64.xpm - -Requires: indexhtml -%define tde_aboutlabel Enterprise Linux 4 -%define tde_aboutpage /usr/share/doc/HTML/index.html -%endif - -# RHEL 5 Theme -%if 0%{?rhel} == 5 -Requires: desktop-backgrounds-basic -%define tde_bg /usr/share/backgrounds/images/default.jpg -%define tde_starticon /usr/share/pixmaps/redhat-starthere.png - -Requires: indexhtml -%define tde_aboutlabel Enterprise Linux 5 -%define tde_aboutpage /usr/share/doc/HTML/index.html -%endif - -# RHEL 6 Theme -%if 0%{?rhel} == 6 -Requires: redhat-logos -%define tde_bg /usr/share/backgrounds/default.png -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png - -Requires: redhat-indexhtml -%define tde_aboutlabel Enterprise Linux 6 -%define tde_aboutpage /usr/share/doc/HTML/index.html -%endif - -# RHEL 7 Theme -%if 0%{?rhel} == 7 -Requires: redhat-logos -%define tde_bg /usr/share/backgrounds/day.jpg -%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png - -Requires: redhat-indexhtml -%define tde_aboutlabel Enterprise Linux 7 -%define tde_aboutpage /usr/share/doc/HTML/index.html -%endif - -# Mageia 2 Theme -%if 0%{?mgaversion} == 2 -Requires: mageia-theme-Default -%define tde_bg /usr/share/mga/backgrounds/default.jpg -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/mageia-menu.svg - -Requires: indexhtml -%define tde_aboutlabel Mageia 2 -%define tde_aboutpage /usr/share/mga/about/index.html -%endif - -# Mageia 3 Theme -%if 0%{?mgaversion} == 3 -Requires: mageia-theme-Default -%define tde_bg /usr/share/mga/backgrounds/default.jpg -%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg - -Requires: indexhtml -%define tde_aboutlabel Mageia 3 -%define tde_aboutpage /usr/share/mga/about/index.html -%endif - -# Mageia 4 Theme -%if 0%{?mgaversion} == 4 -Requires: mageia-theme-Default -%define tde_bg /usr/share/mga/backgrounds/default.jpg -%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg - -Requires: indexhtml -%define tde_aboutlabel Mageia 4 -%define tde_aboutpage /usr/share/mga/about/index.html -%endif - -# Mandriva 2011 Theme: "rosa" -%if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100" -Requires: mandriva-theme -%define tde_bg /usr/share/mdk/backgrounds/default.jpg -%define tde_starticon /usr/share/icons/mandriva.png - -Requires: indexhtml -%define tde_aboutlabel Mandriva 2011 -%define tde_aboutpage /usr/share/mdk/about/index.html -%endif - -# PCLINUXOS -%if 0%{?pclinuxos} -Requires: desktop-common-data -%define tde_starticon /usr/share/icons/pclinuxos.png - -Requires: indexhtml -%define tde_aboutlabel PCLinuxOS -%define tde_aboutpage /usr/share/mdk/about/index.html -%endif - -# OpenSuse 11.4 Theme -%if "%{?suse_version}" == "1140" -Requires: hicolor-icon-theme-branding = 11.4 -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg - -Requires: opensuse-manuals_en -%define tde_aboutlabel OpenSuse 11.4 -%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/manual/book.opensuse.startup.html -%endif - -# OpenSuse 12.2 Theme -%if "%{?suse_version}" == "1220" -Requires: wallpaper-branding = 12.2 -%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding = 12.2 -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg - -Requires: opensuse-manuals_en -%define tde_aboutlabel OpenSuse 12.2 -%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html -%endif - -# OpenSuse 12.3 Theme -%if "%{?suse_version}" == "1230" -Requires: wallpaper-branding = 12.3 -%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg - -Requires: opensuse-manuals_en -%define tde_aboutlabel OpenSuse 12.3 -%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html -%endif - -# OpenSuse 13.1 Theme -%if "%{?suse_version}" == "1310" -Requires: wallpaper-branding = 13.1 -%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding = 13.1 -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg - -Requires: opensuse-manuals_en -%define tde_aboutlabel OpenSuse 13.1 -%define tde_aboutpage /usr/share/do%endif -%endif - -# OpenSuse 13.2 Theme -%if "%{?suse_version}" == "1320" -Requires: wallpaper-branding = 13.2 -%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg -Requires: hicolor-icon-theme-branding -%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg - -Requires: release-notes-openSUSE -%define tde_aboutlabel OpenSuse 13.2 -%define tde_aboutpage /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.html -%endif - -BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: make -BuildRequires: fdupes - -# HTDIG support -BuildRequires: htdig - -# OPENSSL support -BuildRequires: openssl-devel - -# AUDIOFILE support -BuildRequires: audiofile-devel - -# ALSA supportl -BuildRequires: alsa-lib-devel - -# RAW1394 support -BuildRequires: libraw1394-devel - -# VORBIS support -BuildRequires: libvorbis-devel - -# GLIB2 support -BuildRequires: glib2-devel - -# PCRE support -BuildRequires: pcre-devel - -# SASL support -%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} -BuildRequires: %{_lib}sasl2-devel -%endif -%if 0%{?suse_version} -BuildRequires: cyrus-sasl-devel -%endif - -# LIBUSB support -BuildRequires: pam-devel -%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos} -BuildRequires: %{_lib}usb1.0-devel -BuildRequires: %{_lib}usb-compat0.1-devel -%else -BuildRequires: libusb-devel -%endif - -# ESOUND support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_esound 1 -BuildRequires: esound-devel -%endif - -# IDN support -BuildRequires: libidn-devel - -# GAMIN support -# Not on openSUSE. -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_gamin 1 -BuildRequires: gamin-devel -%endif - -# OPENLDAP support -%if 0%{?suse_version} -BuildRequires: openldap2-devel -%else -BuildRequires: openldap-devel -%endif - -# SENSORS support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} -BuildRequires: lm_sensors-devel -%endif -%if 0%{?suse_version} -BuildRequires: libsensors4-devel -%endif - -# TSAK support (requires libudev-devel) -# On RHEL5, udev is built statically, so TSAK cannot build. -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} -BuildRequires: libudev-devel -%define with_tsak 1 -%endif - -# XRANDR support -# On RHEL5, xrandr library is too old. -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} -%define with_xrandr 1 -%endif - -# XTEST support -# On RHEL4, xtest library is too old. -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} -%define with_xtest 1 -%endif - -# HAL support -# On RHEL4, we do not use HAL (too old) -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} -%define with_hal 1 -BuildRequires: hal-devel >= 0.5 -%endif - -# OPENEXR support -# Disabled on RHEL4 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} -%define with_exr 1 -BuildRequires: OpenEXR-devel -%endif - -# XSCREENSAVER support -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?with_xscreensaver} -%define with_xscreensaver 1 -%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} -BuildRequires: libXScrnSaver-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xscrnsaver-devel -%else -BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel -%endif -%endif -%endif - -# AVAHI support -# Disabled on RHEL4 and RHEL5 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} -BuildRequires: libavahi-tqt-devel -%endif - -# MESA support -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -%endif -%if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: mesaglu-devel -%endif -%if 0%{?suse_version} -BuildRequires: Mesa-libGL-devel -BuildRequires: Mesa-libGLU-devel -%endif - -# NAS support -# (what is nas btw ?) -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: nas-devel -%endif - -# DBUS support -# TQT bindings not available for RHEL4 -%if 0%{?rhel} == 4 -# Dbus bindings were rebuilt with Qt support -BuildRequires: dbus-devel >= 0.22-12.EL.9p1 -Requires: dbus-qt >= 0.22-12.EL.9p1 -%else -BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63 -BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9 -Requires: libdbus-tqt-1-0 >= %{tde_epoch}:0.63 -%endif - -%if 0%{?fedora} >= 17 -BuildRequires: perl-Digest-MD5 -%endif - -# LIBART_LGPL support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} >= 5 -%define with_libart 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}art_lgpl-devel -%endif -%if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel} -BuildRequires: libart_lgpl-devel -%endif -%endif - -# SAMBA support -%if 0%{?rhel} == 4 -BuildRequires: samba-common -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -BuildRequires: libsmbclient-devel -%endif - -# IMAKE -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220 -BuildRequires: imake -%endif - -# XKB support -%if 0%{?suse_version} == 1140 -BuildRequires: xorg-x11-libxkbfile-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210 -BuildRequires: libxkbfile-devel -%endif - -# XDMCP support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xdmcp-devel -%else -BuildRequires: %{_lib}xdmcp%{?mgaversion:6}-devel -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXdmcp-devel -%endif - -# XTST support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -%define xtst_devel %{_lib}xtst-devel -%else -%define xtst_devel %{_lib}xtst%{?mgaversion:6}-devel -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -%define xtst_devel libXtst-devel -%endif -%{?xtst_devel:BuildRequires: %{xtst_devel}} - -# XDAMAGE support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xdamage-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXdamage-devel -%endif - -# Requires 'usb.ids' -BuildRequires: usbutils - -# LIBFONTENC support -%if 0%{?suse_version} == 1140 -BuildRequires: xorg-x11-libfontenc-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220 -BuildRequires: libfontenc-devel -%endif - -# Other X11 stuff ... -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: x11-font-util -BuildRequires: x11-proto-devel -%endif - -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: xorg-x11-proto-devel -%endif - -%if 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: xorg-x11-font-utils -%endif - -%if 0%{?suse_version} >= 1220 -BuildRequires: font-util -BuildRequires: bdftopcf -%endif - -%if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: drakconf -%endif - -# tdebase is a metapackage that installs all sub-packages -Requires: %{name}-runtime-data-common = %{version}-%{release} -Requires: %{name}-data = %{version}-%{release} -Requires: %{name}-bin = %{version}-%{release} -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: %{name}-tdeio-pim-plugins = %{version}-%{release} -Requires: trinity-kappfinder = %{version}-%{release} -Requires: trinity-kate = %{version}-%{release} -Requires: trinity-kwrite = %{version}-%{release} -Requires: trinity-kcontrol = %{version}-%{release} -Requires: trinity-kdepasswd = %{version}-%{release} -Requires: trinity-tdeprint = %{version}-%{release} -Requires: trinity-kdesktop = %{version}-%{release} -Requires: trinity-tdm = %{version}-%{release} -Requires: trinity-kfind = %{version}-%{release} -Requires: trinity-khelpcenter = %{version}-%{release} -Requires: trinity-kicker = %{version}-%{release} -Requires: trinity-klipper = %{version}-%{release} -Requires: trinity-kmenuedit = %{version}-%{release} -Requires: trinity-konqueror = %{version}-%{release} -Requires: trinity-konqueror-nsplugins = %{version}-%{release} -Requires: trinity-konsole = %{version}-%{release} -Requires: trinity-kpager = %{version}-%{release} -Requires: trinity-kpersonalizer = %{version}-%{release} -Requires: trinity-ksmserver = %{version}-%{release} -Requires: trinity-ksplash = %{version}-%{release} -Requires: trinity-ksysguard = %{version}-%{release} -Requires: trinity-ksysguardd = %{version}-%{release} -Requires: trinity-ktip = %{version}-%{release} -Requires: trinity-twin = %{version}-%{release} -Requires: trinity-libkonq = %{version}-%{release} -Requires: %{name}-libtqt3-integration = %{version}-%{release} -Requires: %{name}-tdeio-smb-plugin = %{version}-%{release} - -Requires: trinity-arts >= %{tde_epoch}:1.5.10 -Requires: trinity-tdelibs >= %{tde_version} -Requires: openssl - - -# RHEL 6 Configuration files are provided in separate packages -%if 0%{?rhel} || 0%{?fedora} -Requires: redhat-menus -%endif - -%if 0%{?suse_version} -Requires: desktop-data-openSUSE -%endif - -%description -TDE (the Trinity Desktop Environment) is a powerful Open Source graphical -desktop environment for Unix workstations. It combines ease of use, -contemporary functionality, and outstanding graphical design with the -technological superiority of the Unix operating system. - -This metapackage includes the nucleus of TDE, namely the minimal package -set necessary to run TDE as a desktop environment. This includes the -window manager, taskbar, control center, a text editor, file manager, -web browser, X terminal emulator, and many other programs and components. - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING COPYING-DOCS README README.pam - -########## - -%package devel -Summary: %{summary} - Development files -Group: Development/Libraries/Other -Requires: %{name} = %{version}-%{release} -Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -Requires: trinity-tdelibs-devel >= %{tde_version} - -Requires: %{name}-bin-devel = %{version}-%{release} -Requires: trinity-kate-devel = %{version}-%{release} -Requires: trinity-kcontrol-devel = %{version}-%{release} -Requires: trinity-kdesktop-devel = %{version}-%{release} -Requires: trinity-kicker-devel = %{version}-%{release} -Requires: trinity-konqueror-devel = %{version}-%{release} -Requires: trinity-ksplash-devel = %{version}-%{release} -Requires: trinity-ksysguard-devel = %{version}-%{release} -Requires: trinity-libkonq-devel = %{version}-%{release} -Requires: trinity-tdm-devel = %{version}-%{release} -Requires: trinity-twin-devel = %{version}-%{release} - -Provides: trinity-kdebase-devel = %{version}-%{release} -Obsoletes: trinity-kdebase-devel < %{version}-%{release} -Provides: tdebase-devel = %{version}-%{release} -Obsoletes: tdebase-devel < %{version}-%{release} - -Obsoletes: trinity-kdebase-cmake < %{version}-%{release} -Obsoletes: tdebase-cmake < %{version}-%{release} - -%description devel -This is a meta-package that installs all tdebase development packages. - -Header files for developing applications using %{name}. -Install tdebase-devel if you want to develop or compile Konqueror, -Kate plugins or TWin styles. - -%files devel -%defattr(-,root,root,-) -%{tde_datadir}/cmake/*.cmake - -########## - -%package tdeio-pim-plugins -Summary: PIM TDEIOslaves from %{name} -Group: System/GUI/Other - -Provides: trinity-kdebase-pim-ioslaves = %{version}-%{release} -Obsoletes: trinity-kdebase-pim-ioslaves < %{version}-%{release} -Provides: tdebase-kio-pim-plugins = %{version}-%{release} -Obsoletes: tdebase-kio-pim-plugins < %{version}-%{release} -Provides: trinity-tdebase-kio-pim-plugins = %{version}-%{release} -Obsoletes: trinity-tdebase-kio-pim-plugins < %{version}-%{release} - -%description tdeio-pim-plugins -Protocol handlers (TDEIOslaves) for personal information management, including: - * tdeio_ldap - * tdeio_nntp - * tdeio_pop3 - * tdeio_smtp - -%files tdeio-pim-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/kio_ldap.la -%{tde_tdelibdir}/kio_ldap.so -%{tde_tdelibdir}/kio_nntp.la -%{tde_tdelibdir}/kio_nntp.so -%{tde_tdelibdir}/kio_pop3.la -%{tde_tdelibdir}/kio_pop3.so -%{tde_tdelibdir}/kio_smtp.la -%{tde_tdelibdir}/kio_smtp.so -%{tde_datadir}/services/ldap.protocol -%{tde_datadir}/services/ldaps.protocol -%{tde_datadir}/services/nntp.protocol -%{tde_datadir}/services/nntps.protocol -%{tde_datadir}/services/pop3.protocol -%{tde_datadir}/services/pop3s.protocol -%{tde_datadir}/services/smtp.protocol -%{tde_datadir}/services/smtps.protocol - -########## - -%package runtime-data-common -Summary: Shared common files for Trinity and KDE4 -Group: System/GUI/Other - -Provides: tdebase-runtime-data-common = %{version}-%{release} -Obsoletes: tdebase-runtime-data-common < %{version}-%{release} - -%description runtime-data-common -Shared common files for both Trinity and KDE4 -Such as the desktop right-click-"Create New" list - -%files runtime-data-common -%defattr(-,root,root,-) -%{tde_datadir}/autostart/khotkeys.desktop -%{tde_datadir}/desktop-directories/ -%{tde_datadir}/icons/hicolor/*/apps/kxkb.png -%{tde_datadir}/icons/hicolor/*/apps/knetattach.* -%{tde_datadir}/icons/hicolor/*/apps/khotkeys.png -%{tde_datadir}/icons/hicolor/*/apps/kmenuedit.png -%{tde_datadir}/icons/hicolor/*/apps/ksplash.png -%{tde_datadir}/locale/en_US/entry.desktop -%{tde_datadir}/locale/l10n/*.desktop -%{tde_datadir}/locale/l10n/*/entry.desktop -%{tde_datadir}/locale/l10n/*/flag.png -%{tde_datadir}/sounds/pop.wav -%{tde_datadir}/templates/ - -%post runtime-data-common -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%postun runtime-data-common -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -########## - -%package -n trinity-kappfinder -Summary: Non-TDE application finder for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} - -%description -n trinity-kappfinder -kappfinder searches your workstation for many common applications and -creates menu entries for them. - -%files -n trinity-kappfinder -%defattr(-,root,root,-) -%{tde_bindir}/kappfinder -%{tde_tdeappdir}/kappfinder.desktop -%{tde_datadir}/applnk/System/kappfinder.desktop -%{tde_datadir}/apps/kappfinder -%{tde_datadir}/icons/hicolor/*/apps/kappfinder.png - -%post -n trinity-kappfinder -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%postun -n trinity-kappfinder -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database %{tde_appdir} 2> /dev/null || : - -########## - -%package -n trinity-libkateinterfaces -Summary: Common libraries used by kwrite and kate -Group: System/GUI/Other - -%description -n trinity-libkateinterfaces -This package contains the kateinterface library. - -%files -n trinity-libkateinterfaces -%defattr(-,root,root,-) -%{tde_libdir}/libkateinterfaces.so.* - -%post -n trinity-libkateinterfaces -/sbin/ldconfig || : - -%postun -n trinity-libkateinterfaces -/sbin/ldconfig || : - -########## - -%package -n trinity-kate -Summary: Advanced text editor for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} -Requires: trinity-kwrite = %{version}-%{release} -Requires: trinity-libkateinterfaces = %{version}-%{release} - -%description -n trinity-kate -Kate is a multi document editor, based on a rewritten version of the kwrite -editing widget of TDE. - -It is a multi-view editor that lets you view several instances of the same -document with all instances being synced, or view more files at the same -time for easy reference or simultaneous editing. The terminal emulation -and sidebar are docked windows that can be plugged out of the main window, -or replaced therein according to your preference. - -Some random features: -* Editing of big files -* Extensible syntax highlighting -* Folding -* Dynamic word wrap -* Selectable encoding -* Filter command -* Global grep dialog - -%files -n trinity-kate -%defattr(-,root,root,-) -%{tde_bindir}/kate -%{tde_tdelibdir}/kate.la -%{tde_tdelibdir}/kate.so -%{tde_libdir}/libkateutils.so.* -%{tde_libdir}/libkdeinit_kate.la -%{tde_libdir}/libkdeinit_kate.so -%{tde_tdeappdir}/kate.desktop -%{tde_datadir}/apps/kate/ -%{tde_datadir}/apps/kconf_update/kate-2.4.upd -%config(noreplace) %{_sysconfdir}/trinity/katerc -%{tde_datadir}/icons/hicolor/*/apps/kate.png -%{tde_datadir}/icons/hicolor/*/apps/kate2.svgz -%{tde_datadir}/servicetypes/kateplugin.desktop -%{tde_tdedocdir}/HTML/en/kate/ - -%post -n trinity-kate -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database %{tde_appdir} 2> /dev/null || : -/sbin/ldconfig || : - -%postun -n trinity-kate -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database %{tde_appdir} 2> /dev/null || : -/sbin/ldconfig || : - -########## - -%package -n trinity-kate-devel -Summary: Development files for kate -Group: Development/Libraries/Other -Requires: trinity-kate = %{version}-%{release} - -%description -n trinity-kate-devel -This package contains the development files fare Kate. - -%files -n trinity-kate-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kate/ -%{tde_libdir}/libkateutils.so -%{tde_libdir}/libkateutils.la -%{tde_libdir}/libkateinterfaces.so -%{tde_libdir}/libkateinterfaces.la - -%post -n trinity-kate-devel -/sbin/ldconfig || : - -%postun -n trinity-kate-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-kwrite -Summary: Advanced text editor for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} -Requires: trinity-libkateinterfaces = %{version}-%{release} - -%description -n trinity-kwrite -Kwrite is an advanced text editor for TDE. - -%files -n trinity-kwrite -%defattr(-,root,root,-) -%{tde_bindir}/kwrite -%{tde_tdelibdir}/kwrite.la -%{tde_tdelibdir}/kwrite.so -%{tde_libdir}/libkdeinit_kwrite.la -%{tde_libdir}/libkdeinit_kwrite.so -%{tde_tdeappdir}/kwrite.desktop -%{tde_datadir}/apps/kwrite/ -%{tde_datadir}/icons/hicolor/*/apps/kwrite.png -%{tde_datadir}/icons/hicolor/*/apps/kwrite2.svgz -%{tde_tdedocdir}/HTML/en/kwrite/ - - -%post -n trinity-kwrite -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%postun -n trinity-kwrite -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database %{tde_appdir} 2> /dev/null || : - -########## - -%package -n trinity-kcontrol -Summary: Control center for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} - -# Requires 'usb.ids' -Requires: usbutils -%if 0%{?suse_version} == 0 -Requires: hwdata -%endif - -%description -n trinity-kcontrol -The Trinity Control Center provides you with a centralized and convenient -way to configure all of your TDE settings. - -It is made up of multiple modules. Each module is a separate application, -but the control center organizes all of these programs into a convenient -location. - -In combination with udev KControl supports the advanced -configuration of Logitech mice, though the user must be a member of the -plugdev group. - -%files -n trinity-kcontrol -%defattr(-,root,root,-) -%{tde_bindir}/kaccess -%{tde_bindir}/kcontrol -%{tde_bindir}/kdeinstallktheme -%{tde_bindir}/keditfiletype -%{tde_bindir}/kfontinst -%{tde_bindir}/kfontview -%{tde_bindir}/kinfocenter -%{tde_bindir}/klocaldomainurifilterhelper -%{tde_bindir}/krdb -%{tde_tdelibdir}/fontthumbnail.la -%{tde_tdelibdir}/fontthumbnail.so -%{tde_tdelibdir}/kaccess.la -%{tde_tdelibdir}/kaccess.so -%{tde_tdelibdir}/kcm_access.la -%{tde_tdelibdir}/kcm_access.so -%{tde_tdelibdir}/kcm_arts.la -%{tde_tdelibdir}/kcm_arts.so -%{tde_tdelibdir}/kcm_background.la -%{tde_tdelibdir}/kcm_background.so -%{tde_tdelibdir}/kcm_bell.la -%{tde_tdelibdir}/kcm_bell.so -%{tde_tdelibdir}/kcm_clock.la -%{tde_tdelibdir}/kcm_clock.so -%{tde_tdelibdir}/kcm_colors.la -%{tde_tdelibdir}/kcm_colors.so -%{tde_tdelibdir}/kcm_componentchooser.la -%{tde_tdelibdir}/kcm_componentchooser.so -%{tde_tdelibdir}/kcm_crypto.la -%{tde_tdelibdir}/kcm_crypto.so -%{tde_tdelibdir}/kcm_css.la -%{tde_tdelibdir}/kcm_css.so -%{tde_tdelibdir}/kcm_display.la -%{tde_tdelibdir}/kcm_display.so -%{tde_tdelibdir}/kcm_energy.la -%{tde_tdelibdir}/kcm_energy.so -%{tde_tdelibdir}/kcm_filetypes.la -%{tde_tdelibdir}/kcm_filetypes.so -%{tde_tdelibdir}/kcm_fontinst.la -%{tde_tdelibdir}/kcm_fontinst.so -%{tde_tdelibdir}/kcm_fonts.la -%{tde_tdelibdir}/kcm_fonts.so -%{tde_tdelibdir}/kcm_icons.la -%{tde_tdelibdir}/kcm_icons.so -%{tde_tdelibdir}/kcm_info.la -%{tde_tdelibdir}/kcm_info.so -%{tde_tdelibdir}/kcm_input.la -%{tde_tdelibdir}/kcm_input.so -%{tde_tdelibdir}/kcm_ioslaveinfo.la -%{tde_tdelibdir}/kcm_ioslaveinfo.so -%{tde_tdelibdir}/kcm_joystick.la -%{tde_tdelibdir}/kcm_joystick.so -%{tde_tdelibdir}/kcm_kded.la -%{tde_tdelibdir}/kcm_kded.so -%{tde_tdelibdir}/kcm_%{tdm}.la -%{tde_tdelibdir}/kcm_%{tdm}.so -%{tde_tdelibdir}/kcm_kdnssd.so -%{tde_tdelibdir}/kcm_kdnssd.la -%{tde_tdelibdir}/kcm_keys.la -%{tde_tdelibdir}/kcm_keys.so -%{tde_tdelibdir}/kcm_kicker.la -%{tde_tdelibdir}/kcm_kicker.so -%{tde_tdelibdir}/kcm_kio.la -%{tde_tdelibdir}/kcm_kio.so -%{tde_tdelibdir}/kcm_knotify.la -%{tde_tdelibdir}/kcm_knotify.so -%{tde_tdelibdir}/kcm_konqhtml.la -%{tde_tdelibdir}/kcm_konqhtml.so -%{tde_tdelibdir}/kcm_konq.la -%{tde_tdelibdir}/kcm_konq.so -%{tde_tdelibdir}/kcm_kthememanager.la -%{tde_tdelibdir}/kcm_kthememanager.so -%{tde_tdelibdir}/kcm_kurifilt.la -%{tde_tdelibdir}/kcm_kurifilt.so -%{tde_tdelibdir}/kcm_launch.la -%{tde_tdelibdir}/kcm_launch.so -%{tde_tdelibdir}/kcm_locale.la -%{tde_tdelibdir}/kcm_locale.so -%{tde_tdelibdir}/kcm_nic.la -%{tde_tdelibdir}/kcm_nic.so -%{tde_tdelibdir}/kcm_performance.la -%{tde_tdelibdir}/kcm_performance.so -%{tde_tdelibdir}/kcm_privacy.la -%{tde_tdelibdir}/kcm_privacy.so -%{tde_tdelibdir}/kcm_screensaver.la -%{tde_tdelibdir}/kcm_screensaver.so -%{tde_tdelibdir}/kcm_smserver.la -%{tde_tdelibdir}/kcm_smserver.so -%{tde_tdelibdir}/kcm_spellchecking.la -%{tde_tdelibdir}/kcm_spellchecking.so -%{tde_tdelibdir}/kcm_style.la -%{tde_tdelibdir}/kcm_style.so -%{tde_tdelibdir}/kcm_taskbar.la -%{tde_tdelibdir}/kcm_taskbar.so -%{tde_tdelibdir}/kcm_usb.la -%{tde_tdelibdir}/kcm_usb.so -%{tde_tdelibdir}/kcm_view1394.la -%{tde_tdelibdir}/kcm_view1394.so -%{tde_tdelibdir}/kcm_xinerama.la -%{tde_tdelibdir}/kcm_xinerama.so -%{tde_tdelibdir}/kcontrol.la -%{tde_tdelibdir}/kcontrol.so -%{tde_tdelibdir}/kfile_font.la -%{tde_tdelibdir}/kfile_font.so -%{tde_tdelibdir}/kio_fonts.la -%{tde_tdelibdir}/kio_fonts.so -%{tde_tdelibdir}/kstyle_keramik_config.la -%{tde_tdelibdir}/kstyle_keramik_config.so -%{tde_tdelibdir}/libkfontviewpart.la -%{tde_tdelibdir}/libkfontviewpart.so -%{tde_tdelibdir}/libkshorturifilter.la -%{tde_tdelibdir}/libkshorturifilter.so -%{tde_tdelibdir}/libkuriikwsfilter.la -%{tde_tdelibdir}/libkuriikwsfilter.so -%{tde_tdelibdir}/libkurisearchfilter.la -%{tde_tdelibdir}/libkurisearchfilter.so -%{tde_tdelibdir}/liblocaldomainurifilter.la -%{tde_tdelibdir}/liblocaldomainurifilter.so -%{tde_libdir}/libkdeinit_kaccess.la -%{tde_libdir}/libkdeinit_kaccess.so -%{tde_libdir}/libkdeinit_kcontrol.la -%{tde_libdir}/libkdeinit_kcontrol.so -%{tde_libdir}/libkfontinst.so.* -%{tde_tdeappdir}/arts.desktop -%{tde_tdeappdir}/background.desktop -%{tde_tdeappdir}/bell.desktop -%{tde_tdeappdir}/cache.desktop -%{tde_tdeappdir}/cdinfo.desktop -%{tde_tdeappdir}/clock.desktop -%{tde_tdeappdir}/colors.desktop -%{tde_tdeappdir}/componentchooser.desktop -%{tde_tdeappdir}/cookies.desktop -%{tde_tdeappdir}/crypto.desktop -%{tde_tdeappdir}/desktopbehavior.desktop -%{tde_tdeappdir}/desktop.desktop -%{tde_tdeappdir}/desktoppath.desktop -%{tde_tdeappdir}/devices.desktop -%{tde_tdeappdir}/display.desktop -%{tde_tdeappdir}/dma.desktop -%{tde_tdeappdir}/ebrowsing.desktop -%{tde_tdeappdir}/filebrowser.desktop -%{tde_tdeappdir}/filetypes.desktop -%{tde_tdeappdir}/fonts.desktop -%{tde_tdeappdir}/icons.desktop -%{tde_tdeappdir}/installktheme.desktop -%{tde_tdeappdir}/interrupts.desktop -%{tde_tdeappdir}/ioports.desktop -%{tde_tdeappdir}/ioslaveinfo.desktop -%{tde_tdeappdir}/joystick.desktop -%{tde_tdeappdir}/kcm_kdnssd.desktop -%{tde_tdeappdir}/kcmaccess.desktop -%{tde_tdeappdir}/kcmcss.desktop -%{tde_tdeappdir}/kcmfontinst.desktop -%{tde_tdeappdir}/kcmkded.desktop -%{tde_tdeappdir}/kcmlaunch.desktop -%{tde_tdeappdir}/kcmnotify.desktop -%{tde_tdeappdir}/kcmperformance.desktop -%{tde_tdeappdir}/kcmsmserver.desktop -%{tde_tdeappdir}/kcmtaskbar.desktop -%{tde_tdeappdir}/kcmusb.desktop -%{tde_tdeappdir}/kcmview1394.desktop -%{tde_tdeappdir}/KControl.desktop -%{tde_tdeappdir}/%{tdm}.desktop -%{tde_tdeappdir}/keys.desktop -%{tde_tdeappdir}/kfontview.desktop -%{tde_tdeappdir}/khtml_behavior.desktop -%{tde_tdeappdir}/khtml_fonts.desktop -%{tde_tdeappdir}/khtml_java_js.desktop -%{tde_tdeappdir}/kinfocenter.desktop -%{tde_tdeappdir}/kthememanager.desktop -%{tde_tdeappdir}/lanbrowser.desktop -%{tde_tdeappdir}/language.desktop -%{tde_tdeappdir}/media.desktop -%{tde_tdeappdir}/memory.desktop -%{tde_tdeappdir}/mouse.desktop -%{tde_tdeappdir}/netpref.desktop -%{tde_tdeappdir}/nic.desktop -%{tde_tdeappdir}/opengl.desktop -%{tde_tdeappdir}/panel_appearance.desktop -%{tde_tdeappdir}/panel.desktop -%{tde_tdeappdir}/partitions.desktop -%{tde_tdeappdir}/pci.desktop -%{tde_tdeappdir}/privacy.desktop -%{tde_tdeappdir}/processor.desktop -%{tde_tdeappdir}/proxy.desktop -%{tde_tdeappdir}/screensaver.desktop -%{tde_tdeappdir}/scsi.desktop -%{tde_tdeappdir}/smbstatus.desktop -%{tde_tdeappdir}/sound.desktop -%{tde_tdeappdir}/spellchecking.desktop -%{tde_tdeappdir}/style.desktop -%{tde_tdeappdir}/useragent.desktop -%{tde_tdeappdir}/xserver.desktop -%{tde_datadir}/applnk/.hidden/energy.desktop -%{tde_datadir}/applnk/.hidden/fileappearance.desktop -%{tde_datadir}/applnk/.hidden/filebehavior.desktop -%{tde_datadir}/applnk/.hidden/filepreviews.desktop -%{tde_datadir}/applnk/.hidden/kcmkonqyperformance.desktop -%{tde_datadir}/applnk/.hidden/kicker_config_appearance.desktop -%{tde_datadir}/applnk/.hidden/kicker_config.desktop -%{tde_datadir}/applnk/.hidden/smb.desktop -%{tde_datadir}/applnk/.hidden/xinerama.desktop -%{tde_datadir}/applnk/Settings/LookNFeel/ -%{tde_datadir}/applnk/Settings/WebBrowsing/khtml_appearance.desktop -%{tde_datadir}/applnk/Settings/WebBrowsing/nsplugin.desktop -%{tde_datadir}/applnk/Settings/WebBrowsing/smb.desktop -%{tde_datadir}/apps/kcm_componentchooser/kcm_browser.desktop -%{tde_datadir}/apps/kcm_componentchooser/kcm_kemail.desktop -%{tde_datadir}/apps/kcm_componentchooser/kcm_terminal.desktop -%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop -%{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop -%{tde_datadir}/mimelnk/application/x-ktheme.desktop -%{tde_datadir}/mimelnk/fonts/folder.desktop -%{tde_datadir}/mimelnk/fonts/package.desktop -%{tde_datadir}/mimelnk/fonts/system-folder.desktop -%{tde_datadir}/services/fonts.protocol -%{tde_datadir}/services/fontthumbnail.desktop -%{tde_datadir}/services/kaccess.desktop -%{tde_datadir}/services/kfile_font.desktop -%{tde_datadir}/services/kfontviewpart.desktop -%{tde_datadir}/services/kshorturifilter.desktop -%{tde_datadir}/services/kuriikwsfilter.desktop -%{tde_datadir}/services/kurisearchfilter.desktop -%{tde_datadir}/services/localdomainurifilter.desktop -%{tde_datadir}/icons/hicolor/*/apps/kcmcolors.png -%{tde_datadir}/icons/hicolor/*/apps/kcmcomponentchooser.png -%{tde_datadir}/icons/hicolor/*/apps/kcmdesktop.png -%{tde_datadir}/icons/hicolor/*/apps/kcmdesktopbehavior.png -%{tde_datadir}/icons/hicolor/*/apps/kcmkdnssd.png -%{tde_datadir}/icons/hicolor/*/apps/kcmlaunch.png -%{tde_datadir}/icons/hicolor/*/apps/kcmmedia.png -%{tde_datadir}/icons/hicolor/*/apps/kcmmouse.png -%{tde_datadir}/icons/hicolor/*/apps/kcmnetpref.png -%{tde_datadir}/icons/hicolor/*/apps/kcmnic.png -%{tde_datadir}/icons/hicolor/*/apps/kcmperformance.png -%{tde_datadir}/icons/hicolor/*/apps/kcmprivacy.png -%{tde_datadir}/icons/hicolor/*/apps/kcmtaskbar.png -%{tde_datadir}/icons/hicolor/*/apps/kcmcgi.png -%{tde_datadir}/icons/hicolor/*/apps/kcmcrypto.png -%{tde_datadir}/icons/hicolor/*/apps/kcmhistory.png -%{tde_datadir}/icons/hicolor/*/apps/kcmjoystick.png -%{tde_datadir}/icons/hicolor/*/apps/kcmkded.png -%{tde_datadir}/icons/hicolor/*/apps/kcmkhtml_filter.png -%{tde_datadir}/icons/hicolor/*/apps/kcmsmserver.png -%{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png - -%{tde_datadir}/apps/usb.ids -%{tde_datadir}/apps/kcmview1394/ - -# The following features are not compiled under RHEL 5 and older -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%{tde_bindir}/krandrtray -%{tde_tdelibdir}/kcm_displayconfig.la -%{tde_tdelibdir}/kcm_displayconfig.so -%{tde_tdelibdir}/kcm_iccconfig.la -%{tde_tdelibdir}/kcm_iccconfig.so -%{tde_tdelibdir}/kcm_randr.la -%{tde_tdelibdir}/kcm_randr.so -%{tde_tdeappdir}/displayconfig.desktop -%{tde_tdeappdir}/iccconfig.desktop -%{tde_tdeappdir}/krandrtray.desktop -%{tde_datadir}/applnk/.hidden/randr.desktop -%{tde_datadir}/autostart/krandrtray-autostart.desktop -%endif - -%post -n trinity-kcontrol -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%postun -n trinity-kcontrol -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} 2> /dev/null || : - -########## - -%package -n trinity-kcontrol-devel -Summary: Development files for kcontrol -Group: Development/Languages/Other -Requires: trinity-kcontrol = %{version}-%{release} - -%description -n trinity-kcontrol-devel -This package contains the development files for Kcontrol. - -%files -n trinity-kcontrol-devel -%defattr(-,root,root,-) -%{tde_libdir}/libkfontinst.la -%{tde_libdir}/libkfontinst.so - -%post -n trinity-kcontrol-devel -/sbin/ldconfig || : - -%postun -n trinity-kcontrol-devel -/sbin/ldconfig || : - -########## - -%package bin -Summary: Core binaries for the TDE base module -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} -Requires: pam -%if 0%{?rhel} >= 7 -Requires: xorg-x11-server-Xorg -Requires: xorg-x11-drv-evdev -Requires: dejavu-sans-fonts -%endif - -Provides: tdebase-bin = %{version}-%{release} -Obsoletes: tdebase-bin < %{version}-%{release} - -%description bin -This package contains miscellaneous programs needed by other -TDE applications, particularly those in the TDE base module. - -%files bin -%defattr(-,root,root,-) -%{tde_bindir}/krootbacking -%if 0%{?with_tsak} -%{tde_bindir}/tsak -%endif -%{tde_bindir}/kdebugdialog -%{tde_bindir}/kreadconfig -%{tde_bindir}/kwriteconfig -%{tde_bindir}/kstart -%config(noreplace) %{_sysconfdir}/trinity/kxkb_groups -%{tde_bindir}/drkonqi -%{tde_bindir}/crashtest -%{tde_bindir}/kapplymousetheme -%{tde_bindir}/kblankscrn.kss -%{tde_bindir}/kcminit -%{tde_bindir}/kcminit_startup -%{tde_bindir}/kdcop -%{tde_bindir}/kdesu -%attr(0755,root,root) %{tde_bindir}/kdesud -%{tde_bindir}/kdialog -%{tde_bindir}/khotkeys -%{tde_bindir}/knetattach -%{tde_bindir}/krandom.kss -%{tde_bindir}/ksystraycmd -%{tde_bindir}/kxkb -%dir %{tde_libdir}/kconf_update_bin -%{tde_libdir}/kconf_update_bin/khotkeys_update -%{tde_tdelibdir}/kcminit.la -%{tde_tdelibdir}/kcminit.so -%{tde_tdelibdir}/kcminit_startup.la -%{tde_tdelibdir}/kcminit_startup.so -%{tde_tdelibdir}/kcm_keyboard.la -%{tde_tdelibdir}/kcm_keyboard.so -%{tde_tdelibdir}/kcm_khotkeys_init.la -%{tde_tdelibdir}/kcm_khotkeys_init.so -%{tde_tdelibdir}/kcm_khotkeys.la -%{tde_tdelibdir}/kcm_khotkeys.so -%{tde_tdelibdir}/kded_khotkeys.la -%{tde_tdelibdir}/kded_khotkeys.so -%{tde_tdelibdir}/kgreet_classic.la -%{tde_tdelibdir}/kgreet_classic.so -%{tde_tdelibdir}/kgreet_winbind.la -%{tde_tdelibdir}/kgreet_winbind.so -%{tde_tdelibdir}/khotkeys.la -%{tde_tdelibdir}/khotkeys.so -%{tde_tdelibdir}/khotkeys_arts.la -%{tde_tdelibdir}/khotkeys_arts.so -%{tde_tdelibdir}/kxkb.la -%{tde_tdelibdir}/kxkb.so -%{tde_libdir}/libkdeinit_kcminit.la -%{tde_libdir}/libkdeinit_kcminit.so -%{tde_libdir}/libkdeinit_kcminit_startup.la -%{tde_libdir}/libkdeinit_kcminit_startup.so -%{tde_libdir}/libkdeinit_khotkeys.la -%{tde_libdir}/libkdeinit_khotkeys.so -%{tde_libdir}/libkdeinit_kxkb.la -%{tde_libdir}/libkdeinit_kxkb.so -%{tde_libdir}/libkhotkeys_shared.so.* -%{tde_tdeappdir}/keyboard.desktop -%{tde_tdeappdir}/keyboard_layout.desktop -%{tde_tdeappdir}/khotkeys.desktop -%{tde_tdeappdir}/knetattach.desktop -%{tde_datadir}/applnk/System/ScreenSavers/ -%{tde_datadir}/apps/drkonqi/ -%{tde_datadir}/apps/kconf_update/khotkeys_32b1_update.upd -%{tde_datadir}/apps/kconf_update/khotkeys_printscreen.upd -%{tde_datadir}/apps/kconf_update/konqueror_gestures_trinity21_update.upd -%{tde_datadir}/apps/kdcop/ -%{tde_datadir}/apps/khotkeys/ -%{tde_datadir}/services/kded/khotkeys.desktop -%{tde_datadir}/services/kxkb.desktop -%if 0%{?suse_version} == 0 -%config(noreplace) %{_sysconfdir}/pam.d/kcheckpass-trinity -%config(noreplace) %{_sysconfdir}/pam.d/tdescreensaver-trinity -%endif -%{tde_tdedocdir}/HTML/en/kdcop/ -%{tde_tdedocdir}/HTML/en/kdebugdialog// -%{tde_tdedocdir}/HTML/en/kdesu/ -%{tde_tdedocdir}/HTML/en/knetattach/ -%{tde_tdedocdir}/HTML/en/kxkb/ - -# SETUID binaries -# Some setuid binaries need special care -%if 0%{?suse_version} -%if 0%{?with_tsak} -%verify(not mode) %{tde_bindir}/%{tdm}tsak -%endif -%verify(not mode) %{tde_bindir}/kcheckpass -%else -%if 0%{?with_tsak} -%attr(4511,root,root) %{tde_bindir}/%{tdm}tsak -%endif -%attr(4755,root,root) %{tde_bindir}/kcheckpass -%endif - -%post bin -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} 2> /dev/null || : -# Sets permissions on setuid files (openSUSE specific) -%if 0%{?suse_version} -%if 0%{?with_tsak} -%set_permissions %{tde_bindir}/%{tdm}tsak -%endif -%set_permissions %{tde_bindir}/kcheckpass -%endif - -%postun bin -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} 2> /dev/null || : - -########## - -%package bin-devel -Summary: Development files for core binaries for the TDE base module -Group: Development/Libraries/Other -Requires: %{name}-bin = %{version}-%{release} -%{?xtst_devel:Requires: %{xtst_devel}} - -Obsoletes: tdebase-bin-devel < %{version}-%{release} -Provides: tdebase-bin-devel = %{version}-%{release} - -%description bin-devel -This package contains the development files for core binaries for -the TDE base module - -%files bin-devel -%defattr(-,root,root,-) -%{tde_libdir}/libkhotkeys_shared.la -%{tde_libdir}/libkhotkeys_shared.so - -%post bin-devel -/sbin/ldconfig || : - -%postun bin-devel -/sbin/ldconfig || : - -########## - -%package data -Summary: Shared data files for the TDE base module -Group: System/GUI/Other -Requires: %{name}-runtime-data-common = %{version}-%{release} - -Obsoletes: tdebase-data < %{version}-%{release} -Provides: tdebase-data = %{version}-%{release} - -%description data -This package contains the architecture-independent shared data files -needed for a basic TDE desktop installation. - -%files data -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/trinity/kshorturifilterrc -%{tde_datadir}/applnk/.hidden/battery.desktop -%{tde_datadir}/applnk/.hidden/bwarning.desktop -%{tde_datadir}/applnk/.hidden/cwarning.desktop -%{tde_datadir}/applnk/.hidden/.directory -%{tde_datadir}/applnk/.hidden/email.desktop -%{tde_datadir}/applnk/.hidden/kcmkonq.desktop -%{tde_datadir}/applnk/.hidden/kcmkxmlrpcd.desktop -%{tde_datadir}/applnk/.hidden/konqhtml.desktop -%{tde_datadir}/applnk/.hidden/passwords.desktop -%{tde_datadir}/applnk/.hidden/power.desktop -%{tde_datadir}/applnk/.hidden/socks.desktop -%{tde_datadir}/applnk/.hidden/userinfo.desktop -%{tde_datadir}/applnk/.hidden/virtualdesktops.desktop -%{tde_datadir}/apps/kaccess/ -%{tde_datadir}/apps/kcmcss/ -%{tde_datadir}/apps/kcminput/ -%{tde_datadir}/apps/kcmkeys/ -%{tde_datadir}/apps/kcmlocale/ -%{tde_datadir}/apps/kconf_update/convertShortcuts.pl -%{tde_datadir}/apps/kconf_update/kaccel.upd -%{tde_datadir}/apps/kconf_update/kcmdisplayrc.upd -%{tde_datadir}/apps/kconf_update/kuriikwsfilter.upd -%{tde_datadir}/apps/kconf_update/mouse_cursor_theme.upd -%{tde_datadir}/apps/kconf_update/socks.upd -%{tde_datadir}/apps/kcontrol/ -%{tde_datadir}/apps/kdisplay/ -%{tde_datadir}/apps/kfontview/ -%{tde_datadir}/apps/kinfocenter/ -%{tde_datadir}/apps/kthememanager/ -%{tde_datadir}/icons/crystalsvg/*/apps/access.png -%{tde_datadir}/icons/crystalsvg/*/apps/acroread.png -%{tde_datadir}/icons/crystalsvg/*/apps/applixware.png -%{tde_datadir}/icons/crystalsvg/*/apps/arts.png -%{tde_datadir}/icons/crystalsvg/*/apps/background.png -%{tde_datadir}/icons/crystalsvg/*/apps/bell.png -%{tde_datadir}/icons/crystalsvg/*/apps/cache.png -%{tde_datadir}/icons/crystalsvg/*/apps/clanbomber.png -%{tde_datadir}/icons/crystalsvg/*/apps/clock.png -%{tde_datadir}/icons/crystalsvg/*/apps/colors.png -%{tde_datadir}/icons/crystalsvg/*/apps/date.png -%{tde_datadir}/icons/crystalsvg/*/apps/email.png -%{tde_datadir}/icons/crystalsvg/*/apps/energy.png -%{tde_datadir}/icons/crystalsvg/*/apps/energy_star.png -%{tde_datadir}/icons/crystalsvg/*/apps/filetypes.png -%{tde_datadir}/icons/crystalsvg/*/apps/fonts.png -%{tde_datadir}/icons/crystalsvg/*/apps/gimp.png -%{tde_datadir}/icons/crystalsvg/*/apps/help_index.png -%{tde_datadir}/icons/crystalsvg/*/apps/hwinfo.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmdevices.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmdf.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmkwm.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmmemory.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png -%{tde_datadir}/icons/crystalsvg/*/apps/%{tdm}config.png -%{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png -%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png -%{tde_datadir}/icons/crystalsvg/*/apps/kscreensaver.png -%{tde_datadir}/icons/crystalsvg/*/apps/kthememgr.png -%{tde_datadir}/icons/crystalsvg/*/apps/licq.png -%{tde_datadir}/icons/crystalsvg/*/apps/linuxconf.png -%{tde_datadir}/icons/crystalsvg/*/apps/locale.png -%{tde_datadir}/icons/crystalsvg/*/apps/looknfeel.png -%{tde_datadir}/icons/crystalsvg/*/apps/multimedia.png -%{tde_datadir}/icons/crystalsvg/*/apps/netscape.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_applications.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_development.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_favourite.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_games.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_games_kids.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_multimedia.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_network.png -%{tde_datadir}/icons/crystalsvg/*/apps/package.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_settings.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_toys.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_utilities.png -%{tde_datadir}/icons/crystalsvg/*/apps/penguin.png -%{tde_datadir}/icons/crystalsvg/*/apps/personal.png -%{tde_datadir}/icons/crystalsvg/*/apps/phppg.png -%{tde_datadir}/icons/crystalsvg/*/apps/proxy.png -%{tde_datadir}/icons/crystalsvg/*/apps/pysol.png -%{tde_datadir}/icons/crystalsvg/*/apps/randr.png -%{tde_datadir}/icons/crystalsvg/*/apps/samba.png -%{tde_datadir}/icons/crystalsvg/*/apps/staroffice.png -%{tde_datadir}/icons/crystalsvg/*/apps/stylesheet.png -%{tde_datadir}/icons/crystalsvg/*/apps/terminal.png -%{tde_datadir}/icons/crystalsvg/*/apps/tux.png -%{tde_datadir}/icons/crystalsvg/*/apps/wp.png -%{tde_datadir}/icons/crystalsvg/*/apps/xclock.png -%{tde_datadir}/icons/crystalsvg/*/apps/xfmail.png -%{tde_datadir}/icons/crystalsvg/*/apps/xmag.png -%{tde_datadir}/icons/crystalsvg/*/apps/xpaint.png -%{tde_datadir}/icons/crystalsvg/scalable/apps/access.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/acroread.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/aim.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/aktion.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/antivirus.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/applixware.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/arts.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/background.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/bell.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/browser.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/cache.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/camera.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/clanbomber.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/clock.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/colors.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/core.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/date.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/display.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/download_manager.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/email.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/energy.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/error.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/fifteenpieces.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/filetypes.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/fonts.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/galeon.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/gnome_apps.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/hardware.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/hwinfo.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/ieee1394.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmdevices.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmkwm.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/kcmx.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/locale.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/my_mac.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/netscape.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/openoffice.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/package_development.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/package_games_kids.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/package_toys.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/penguin.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/personal.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/quicktime.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/realplayer.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/samba.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/shell.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/staroffice.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/stylesheet.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/terminal.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/tux.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/wine.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/x.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/xapp.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/xcalc.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/xchat.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/xclock.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/xeyes.svgz -%{tde_datadir}/icons/crystalsvg/scalable/apps/xpaint.svgz -%{tde_datadir}/icons/crystalsvg/*/devices/laptop.png -%{tde_datadir}/icons/crystalsvg/*/devices/laptop.svgz -%{tde_datadir}/icons/crystalsvg/*/actions/newfont.png -%{tde_datadir}/icons/crystalsvg/*/apps/abiword.png -%{tde_datadir}/icons/crystalsvg/*/apps/agent.png -%{tde_datadir}/icons/crystalsvg/*/apps/alevt.png -%{tde_datadir}/icons/crystalsvg/*/apps/assistant.png -%{tde_datadir}/icons/crystalsvg/*/apps/blender.png -%{tde_datadir}/icons/crystalsvg/*/apps/bluefish.png -%{tde_datadir}/icons/crystalsvg/*/apps/cookie.png -%{tde_datadir}/icons/crystalsvg/*/apps/designer.png -%{tde_datadir}/icons/crystalsvg/*/apps/dia.png -%{tde_datadir}/icons/crystalsvg/*/apps/dlgedit.png -%{tde_datadir}/icons/crystalsvg/*/apps/eclipse.png -%{tde_datadir}/icons/crystalsvg/*/apps/edu_languages.png -%{tde_datadir}/icons/crystalsvg/*/apps/edu_mathematics.png -%{tde_datadir}/icons/crystalsvg/*/apps/edu_miscellaneous.png -%{tde_datadir}/icons/crystalsvg/*/apps/edu_science.png -%{tde_datadir}/icons/crystalsvg/*/apps/emacs.png -%{tde_datadir}/icons/crystalsvg/*/apps/enhanced_browsing.png -%{tde_datadir}/icons/crystalsvg/*/apps/evolution.png -%{tde_datadir}/icons/crystalsvg/*/apps/fifteenpieces.png -%{tde_datadir}/icons/crystalsvg/*/apps/gabber.png -%{tde_datadir}/icons/crystalsvg/*/apps/gaim.png -%{tde_datadir}/icons/crystalsvg/*/apps/gnome_apps.png -%{tde_datadir}/icons/crystalsvg/*/apps/gnomemeeting.png -%{tde_datadir}/icons/crystalsvg/*/apps/gnucash.png -%{tde_datadir}/icons/crystalsvg/*/apps/gnumeric.png -%{tde_datadir}/icons/crystalsvg/*/apps/gv.png -%{tde_datadir}/icons/crystalsvg/*/apps/gvim.png -%{tde_datadir}/icons/crystalsvg/*/apps/icons.png -%{tde_datadir}/icons/crystalsvg/*/apps/iconthemes.png -%{tde_datadir}/icons/crystalsvg/*/apps/ieee1394.png -%{tde_datadir}/icons/crystalsvg/*/apps/input_devices_settings.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmkicker.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmmidi.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmprocessor.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmscsi.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmsound.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmsystem.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmx.png -%{tde_datadir}/icons/crystalsvg/*/apps/keyboard.png -%{tde_datadir}/icons/crystalsvg/*/apps/keyboard_layout.png -%{tde_datadir}/icons/crystalsvg/*/apps/knotify.png -%{tde_datadir}/icons/crystalsvg/*/apps/kvirc.png -%{tde_datadir}/icons/crystalsvg/*/apps/linguist.png -%{tde_datadir}/icons/crystalsvg/*/apps/lyx.png -%{tde_datadir}/icons/crystalsvg/*/apps/mac.png -%{tde_datadir}/icons/crystalsvg/*/apps/mathematica.png -%{tde_datadir}/icons/crystalsvg/*/apps/nedit.png -%{tde_datadir}/icons/crystalsvg/*/apps/opera.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_application.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_editors.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_edutainment.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_games_arcade.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_games_board.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_games_card.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_games_strategy.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_graphics.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_system.png -%{tde_datadir}/icons/crystalsvg/*/apps/package_wordprocessing.png -%{tde_datadir}/icons/crystalsvg/*/apps/pan.png -%{tde_datadir}/icons/crystalsvg/*/apps/panel_settings.png -%{tde_datadir}/icons/crystalsvg/*/apps/plan.png -%{tde_datadir}/icons/crystalsvg/*/apps/planner.png -%{tde_datadir}/icons/crystalsvg/*/apps/pybliographic.png -%{tde_datadir}/icons/crystalsvg/*/apps/realplayer.png -%{tde_datadir}/icons/crystalsvg/*/apps/remote.png -%{tde_datadir}/icons/crystalsvg/*/apps/scribus.png -%{tde_datadir}/icons/crystalsvg/*/apps/sodipodi.png -%{tde_datadir}/icons/crystalsvg/*/apps/style.png -%{tde_datadir}/icons/crystalsvg/*/apps/usb.png -%{tde_datadir}/icons/crystalsvg/*/apps/vnc.png -%{tde_datadir}/icons/crystalsvg/*/apps/wabi.png -%{tde_datadir}/icons/crystalsvg/*/apps/wine.png -%{tde_datadir}/icons/crystalsvg/*/apps/xcalc.png -%{tde_datadir}/icons/crystalsvg/*/apps/xchat.png -%{tde_datadir}/icons/crystalsvg/*/apps/xclipboard.png -%{tde_datadir}/icons/crystalsvg/*/apps/xconsole.png -%{tde_datadir}/icons/crystalsvg/*/apps/xedit.png -%{tde_datadir}/icons/crystalsvg/*/apps/xemacs.png -%{tde_datadir}/icons/crystalsvg/*/apps/xeyes.png -%{tde_datadir}/icons/crystalsvg/*/apps/xfig.png -%{tde_datadir}/icons/crystalsvg/*/apps/xload.png -%{tde_datadir}/icons/crystalsvg/*/apps/xmms.png -%{tde_datadir}/icons/crystalsvg/*/apps/xosview.png -%{tde_datadir}/icons/crystalsvg/*/apps/xv.png -%{tde_datadir}/icons/crystalsvg/*/apps/galeon.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmdrkonqi.png -%{tde_datadir}/icons/crystalsvg/*/apps/pinguin.png -%{tde_datadir}/icons/crystalsvg/*/apps/x.png -%{tde_datadir}/icons/crystalsvg/*/apps/xapp.png -%{tde_datadir}/icons/crystalsvg/*/apps/xawtv.png -%{tde_datadir}/icons/crystalsvg/*/apps/kcmopengl.png -%{tde_datadir}/icons/crystalsvg/*/apps/wmaker_apps.png -%{tde_datadir}/icons/crystalsvg/*/apps/qtella.png -%{tde_datadir}/services/searchproviders -%{tde_datadir}/services/useragentstrings/ -%{tde_datadir}/servicetypes/searchprovider.desktop -%{tde_datadir}/servicetypes/uasprovider.desktop -%exclude %{tde_datadir}/sounds/pop.wav -%{tde_datadir}/sounds/ -%{tde_datadir}/wallpapers/* - -# XDG directories information -%dir %{_sysconfdir}/xdg/menus/applications-merged -%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu -%config(noreplace) %{_sysconfdir}/xdg/menus/tde-information.menu -%config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu -%config(noreplace) %{_sysconfdir}/xdg/menus/tde-settings.menu - -%{tde_tdedocdir}/HTML/en/kcontrol/ -%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/ -%{tde_tdedocdir}/HTML/en/kinfocenter/ - -%post data -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%if "%{distribution}" == "Mandriva Linux" -# Mandriva-specific: we have to choose a background for current distribution variant (Free, One, Powerpack, ...) -# First, we read the "product" key in /etc/product.id -eval $(tr "," ";" </etc/product.id) 2>/dev/null -# Then, we create a symbolic link to the corresponding background -if [ -r "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}" ]; then - ln -sf "%{_datadir}/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}" -fi -%endif - -%if "%{distribution}" == "Mageia" -if [ ! -r "%{tde_bg}" ] && [ -r "%{_datadir}/mga/backgrounds/Mageia-Default-1920x1440.png" ]; then - ln -sf "%{_datadir}/mga/backgrounds/Mageia-Default-1920x1440.png" "%{tde_bg}" -fi -%endif - -%postun data -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -########## - -%package tdeio-plugins -Summary: Core I/O slaves for TDE -Group: System/GUI/Other -Requires: trinity-kdesktop = %{version}-%{release} -Requires: cyrus-sasl -Requires: psmisc -%if 0%{?with_hal} -Requires: hal >= 0.4.8 -%endif -%if 0%{?rhel} == 4 || 0%{?suse_version} -Requires: cryptsetup -%else -Requires: cryptsetup-luks -%endif - -Obsoletes: tdebase-kio-plugins < %{version}-%{release} -Provides: tdebase-kio-plugins = %{version}-%{release} -Obsoletes: trinity-tdebase-kio-plugins < %{version}-%{release} -Provides: trinity-tdebase-kio-plugins = %{version}-%{release} - -%description tdeio-plugins -This package includes the base tdeioslaves. They include, amongst many -others, file, http, and ftp. - -It also includes the media tdeioslave, which handles removable devices, -and which works best with hal (and therefore udev) and pmount. Media -also extends the functionality of many other tdeioslaves. To use this -service, please make sure that your user is a member of the plugdev -group. - -%files tdeio-plugins -%defattr(-,root,root,-) -%{tde_bindir}/kio_media_mounthelper -%{tde_bindir}/ktrash -%{tde_tdelibdir}/cursorthumbnail.la -%{tde_tdelibdir}/cursorthumbnail.so -%{tde_tdelibdir}/djvuthumbnail.la -%{tde_tdelibdir}/djvuthumbnail.so -%{tde_tdelibdir}/htmlthumbnail.la -%{tde_tdelibdir}/htmlthumbnail.so -%{tde_tdelibdir}/imagethumbnail.la -%{tde_tdelibdir}/imagethumbnail.so -%{tde_tdelibdir}/kcm_cgi.la -%{tde_tdelibdir}/kcm_cgi.so -%{tde_tdelibdir}/kcm_media.la -%{tde_tdelibdir}/kcm_media.so -%{tde_tdelibdir}/kded_homedirnotify.la -%{tde_tdelibdir}/kded_homedirnotify.so -%{tde_tdelibdir}/kded_mediamanager.la -%{tde_tdelibdir}/kded_mediamanager.so -%{tde_tdelibdir}/kded_medianotifier.la -%{tde_tdelibdir}/kded_medianotifier.so -%{tde_tdelibdir}/kded_remotedirnotify.la -%{tde_tdelibdir}/kded_remotedirnotify.so -%{tde_tdelibdir}/kded_systemdirnotify.la -%{tde_tdelibdir}/kded_systemdirnotify.so -%{tde_tdelibdir}/kfile_media.la -%{tde_tdelibdir}/kfile_media.so -%{tde_tdelibdir}/kfile_trash.la -%{tde_tdelibdir}/kfile_trash.so -%{tde_tdelibdir}/kio_about.la -%{tde_tdelibdir}/kio_about.so -%{tde_tdelibdir}/kio_cgi.la -%{tde_tdelibdir}/kio_cgi.so -%{tde_tdelibdir}/kio_filter.la -%{tde_tdelibdir}/kio_filter.so -%{tde_tdelibdir}/kio_finger.la -%{tde_tdelibdir}/kio_finger.so -%{tde_tdelibdir}/kio_fish.la -%{tde_tdelibdir}/kio_fish.so -%{tde_tdelibdir}/kio_floppy.la -%{tde_tdelibdir}/kio_floppy.so -%{tde_tdelibdir}/kio_home.la -%{tde_tdelibdir}/kio_home.so -%{tde_tdelibdir}/kio_info.la -%{tde_tdelibdir}/kio_info.so -%{tde_tdelibdir}/kio_mac.la -%{tde_tdelibdir}/kio_mac.so -%{tde_tdelibdir}/kio_man.la -%{tde_tdelibdir}/kio_man.so -%{tde_tdelibdir}/kio_media.la -%{tde_tdelibdir}/kio_media.so -%{tde_tdelibdir}/kio_nfs.la -%{tde_tdelibdir}/kio_nfs.so -%{tde_tdelibdir}/kio_remote.la -%{tde_tdelibdir}/kio_remote.so -%{tde_tdelibdir}/kio_settings.la -%{tde_tdelibdir}/kio_settings.so -%{tde_tdelibdir}/kio_sftp.la -%{tde_tdelibdir}/kio_sftp.so -%{tde_tdelibdir}/kio_system.la -%{tde_tdelibdir}/kio_system.so -%{tde_tdelibdir}/kio_tar.la -%{tde_tdelibdir}/kio_tar.so -%{tde_tdelibdir}/kio_thumbnail.la -%{tde_tdelibdir}/kio_thumbnail.so -%{tde_tdelibdir}/kio_trash.la -%{tde_tdelibdir}/kio_trash.so -%{tde_tdelibdir}/libkmanpart.la -%{tde_tdelibdir}/libkmanpart.so -%{tde_tdelibdir}/textthumbnail.la -%{tde_tdelibdir}/textthumbnail.so -%{tde_tdeappdir}/kcmcgi.desktop -%{tde_datadir}/apps/kio_finger/ -%{tde_datadir}/apps/kio_info/ -%{tde_datadir}/apps/kio_man/ -%{tde_datadir}/apps/systemview/ -%{tde_datadir}/config.kcfg/mediamanagersettings.kcfg -%{tde_datadir}/mimelnk/application/x-smb-server.desktop -%{tde_datadir}/mimelnk/inode/system_directory.desktop -%{tde_datadir}/mimelnk/media/*.desktop -%{tde_datadir}/services/about.protocol -%{tde_datadir}/services/applications.protocol -%{tde_datadir}/services/ar.protocol -%{tde_datadir}/services/bzip.protocol -%{tde_datadir}/services/bzip2.protocol -%{tde_datadir}/services/cgi.protocol -%{tde_datadir}/services/cursorthumbnail.desktop -%{tde_datadir}/services/djvuthumbnail.desktop -%{tde_datadir}/services/finger.protocol -%{tde_datadir}/services/fish.protocol -%{tde_datadir}/services/floppy.protocol -%{tde_datadir}/services/gzip.protocol -%{tde_datadir}/services/home.protocol -%{tde_datadir}/services/htmlthumbnail.desktop -%{tde_datadir}/services/imagethumbnail.desktop -%{tde_datadir}/services/info.protocol -%{tde_datadir}/services/kded/homedirnotify.desktop -%{tde_datadir}/services/kded/mediamanager.desktop -%{tde_datadir}/services/kded/medianotifier.desktop -%{tde_datadir}/services/kded/remotedirnotify.desktop -%{tde_datadir}/services/kded/systemdirnotify.desktop -%{tde_datadir}/services/kfile_media.desktop -%{tde_datadir}/services/kfile_trash_system.desktop -%{tde_datadir}/services/lzma.protocol -%{tde_datadir}/services/kmanpart.desktop -%{tde_datadir}/services/mac.protocol -%{tde_datadir}/services/man.protocol -%{tde_datadir}/services/media.protocol -%{tde_datadir}/services/nfs.protocol -%{tde_datadir}/services/nxfish.protocol -%{tde_datadir}/services/programs.protocol -%{tde_datadir}/services/remote.protocol -%{tde_datadir}/services/settings.protocol -%{tde_datadir}/services/sftp.protocol -%{tde_datadir}/services/system.protocol -%{tde_datadir}/services/tar.protocol -%{tde_datadir}/services/textthumbnail.desktop -%{tde_datadir}/services/thumbnail.protocol -%{tde_datadir}/services/trash.protocol -%{tde_datadir}/services/xz.protocol -%{tde_datadir}/services/zip.protocol -%{tde_datadir}/servicetypes/thumbcreator.desktop -%{tde_datadir}/services/kfile_trash.desktop -%{tde_tdedocdir}/HTML/en/kioslave/ -%if 0%{?with_exr} -%{tde_tdelibdir}/exrthumbnail.la -%{tde_tdelibdir}/exrthumbnail.so -%{tde_datadir}/services/exrthumbnail.desktop -%endif -%if 0%{?with_hal} -%{tde_tdelibdir}/media_propsdlgplugin.la -%{tde_tdelibdir}/media_propsdlgplugin.so -%{tde_datadir}/services/media_propsdlgplugin.desktop -%endif - -%post tdeio-plugins -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%postun tdeio-plugins -update-desktop-database %{tde_appdir} 2> /dev/null || : - -########## - -%package -n trinity-tdepasswd -Summary: Password changer for TDE -Group: System/GUI/Other - -Obsoletes: trinity-kdepasswd < %{version}-%{release} -Provides: trinity-kdepasswd = %{version}-%{release} - -%description -n trinity-tdepasswd -This is a simple application which allows users to change their -system passwords. - -%files -n trinity-tdepasswd -%defattr(-,root,root,-) -%{tde_bindir}/kdepasswd -%{tde_tdelibdir}/kcm_useraccount.la -%{tde_tdelibdir}/kcm_useraccount.so -%{tde_tdeappdir}/kcm_useraccount.desktop -%{tde_tdeappdir}/kdepasswd.desktop -%{tde_datadir}/config.kcfg/kcm_useraccount.kcfg -%{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg -%{_datadir}/faces/Apple.png -%{_datadir}/faces/BeachBall.png -%{_datadir}/faces/Blowfish.png -%{_datadir}/faces/Bug.png -%{_datadir}/faces/Butterfly.png -%{_datadir}/faces/Car.png -%{_datadir}/faces/Cow.png -%{_datadir}/faces/Daemon.png -%{_datadir}/faces/Dog.png -%{_datadir}/faces/Elephant.png -%{_datadir}/faces/Flower.png -%{_datadir}/faces/Frog.png -%{_datadir}/faces/Ghost.png -%{_datadir}/faces/Guitar.png -%{_datadir}/faces/Heart.png -%{_datadir}/faces/Konqui.png -%{_datadir}/faces/Lion.png -%{_datadir}/faces/Monkey.png -%{_datadir}/faces/Penguin.png -%{_datadir}/faces/Pig.png -%{_datadir}/faces/Rabbit.png -%{_datadir}/faces/Ring.png -%{_datadir}/faces/Scream.png -%{_datadir}/faces/Shark.png -%{_datadir}/faces/Splash.png -%{_datadir}/faces/Star.png -%{_datadir}/faces/Teddybear.png -%{_datadir}/faces/Turtle.png - -%post -n trinity-tdepasswd -update-desktop-database %{tde_tdeappdir} 2> /dev/null || : - -%postun -n trinity-tdepasswd -update-desktop-database %{tde_tdeappdir} 2> /dev/null || : - -########## - -%package -n trinity-tdeprint -Summary: Print system for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} -Requires: psutils - -%description -n trinity-tdeprint -This package contains the TDE printing subsystem. It can use CUPS, -lpd-ng or the traditional lpd. It also includes support for fax and -pdf printing. - -Installation of smbclient will make you able to use smb shared printers. - -%files -n trinity-tdeprint -%defattr(-,root,root,-) -%{tde_bindir}/kdeprintfax -%{tde_bindir}/kjobviewer -%{tde_bindir}/kprinter -%{tde_tdelibdir}/kcm_printmgr.la -%{tde_tdelibdir}/kcm_printmgr.so -%{tde_tdelibdir}/kio_print.la -%{tde_tdelibdir}/kio_print.so -%{tde_tdelibdir}/kjobviewer.la -%{tde_tdelibdir}/kjobviewer.so -%{tde_tdelibdir}/kprinter.la -%{tde_tdelibdir}/kprinter.so -%{tde_tdelibdir}/libkdeprint_part.la -%{tde_tdelibdir}/libkdeprint_part.so -%{tde_libdir}/libkdeinit_kjobviewer.la -%{tde_libdir}/libkdeinit_kjobviewer.so -%{tde_libdir}/libkdeinit_kprinter.la -%{tde_libdir}/libkdeinit_kprinter.so -%{tde_tdeappdir}/kdeprintfax.desktop -%{tde_tdeappdir}/kjobviewer.desktop -%{tde_tdeappdir}/printers.desktop -%{tde_datadir}/apps/kdeprint/ -%{tde_datadir}/apps/kdeprintfax/ -%{tde_datadir}/apps/kjobviewer/ -%{tde_datadir}/apps/kdeprint_part/ -%{tde_datadir}/icons/hicolor/*/apps/kdeprintfax.png -%{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png -%{tde_datadir}/icons/hicolor/*/apps/printmgr.png -%{tde_datadir}/icons/hicolor/scalable/apps/kdeprintfax.svgz -%{tde_datadir}/icons/hicolor/scalable/apps/kjobviewer.svgz -%{tde_datadir}/icons/hicolor/scalable/apps/printmgr.svgz -%{tde_datadir}/mimelnk/print/class.desktop -%{tde_datadir}/mimelnk/print/driver.desktop -%{tde_datadir}/mimelnk/print/folder.desktop -%{tde_datadir}/mimelnk/print/jobs.desktop -%{tde_datadir}/mimelnk/print/manager.desktop -%{tde_datadir}/mimelnk/print/printer.desktop -%{tde_datadir}/mimelnk/print/printermodel.desktop -%{tde_datadir}/services/kdeprint_part.desktop -%{tde_datadir}/services/print.protocol -%{tde_datadir}/services/printdb.protocol -%{tde_tdedocdir}/HTML/en/kdeprint/ - -%post -n trinity-tdeprint -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%postun -n trinity-tdeprint -/sbin/ldconfig || : -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -########## - -%package -n trinity-kdesktop -Summary: Miscellaneous binaries and files for the TDE desktop -Group: System/GUI/Other -Requires: %{name}-bin = %{version}-%{release} -Requires: %{name}-data = %{version}-%{release} -Requires: trinity-libkonq = %{version}-%{release} -Requires: eject -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -Requires: xdg-utils -%endif - -%description -n trinity-kdesktop -This package contains miscellaneous binaries and files integral to -the TDE desktop. - -%files -n trinity-kdesktop -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu1 -%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu2 -%{tde_bindir}/kcheckrunning -%{tde_bindir}/kxdglauncher -%{tde_bindir}/kdeeject -%{tde_bindir}/kdesktop -%{tde_bindir}/kdesktop_lock -%{tde_bindir}/kwebdesktop -%{tde_tdelibdir}/kdesktop.la -%{tde_tdelibdir}/kdesktop.so -%{tde_libdir}/libkdeinit_kdesktop.la -%{tde_libdir}/libkdeinit_kdesktop.so -%{tde_datadir}/apps/kdesktop/ -%{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop -%{tde_datadir}/autostart/kdesktop.desktop -%{tde_datadir}/config.kcfg/kdesktop.kcfg -%{tde_datadir}/config.kcfg/klaunch.kcfg -%{tde_datadir}/config.kcfg/kwebdesktop.kcfg -%{tde_datadir}/icons/crystalsvg/*/apps/error.png - -%post -n trinity-kdesktop -/sbin/ldconfig || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%postun -n trinity-kdesktop -/sbin/ldconfig || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -########## - -%package -n trinity-kdesktop-devel -Summary: Development files for kdesktop -Group: Development/Libraries/Other -Requires: trinity-kdesktop = %{version}-%{release} - -%description -n trinity-kdesktop-devel -This package contains the development files for kdesktop. - -%files -n trinity-kdesktop-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/KBackgroundIface.h -%{tde_tdeincludedir}/KDesktopIface.h -%{tde_tdeincludedir}/KScreensaverIface.h - -########## - -%package -n trinity-tdm -Summary: X Display manager for TDE -Group: System/GUI/Other -Requires: %{name}-bin = %{version}-%{release} -Requires: %{name}-data = %{version}-%{release} -Requires: pam -Requires: logrotate - -# Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession) -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4 -Requires: xinitrc -%endif -%if 0%{?suse_version} == 1140 -Requires: xorg-x11 -%endif -%if 0%{?suse_version} >= 1220 -Requires: xdm -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} -Requires: xorg-x11-xinit -%endif - -# Required for Fedora LiveCD -%if 0%{?rhel} || 0%{?fedora} -Provides: service(graphical-login) -%endif -# Required for Mandriva's installer -%if 0%{?mgaversion} || 0%{?mdkversion} -Provides: dm -Provides: %{tdm} -%endif - -%description -n trinity-tdm -TDM manages a collection of X servers, which may be on the local host or -remote machines. It provides services similar to those provided by init, -getty, and login on character-based terminals: prompting for login name and -password, authenticating the user, and running a session. tdm supports XDMCP -(X Display Manager Control Protocol) and can also be used to run a chooser -process which presents the user with a menu of possible hosts that offer -XDMCP display management. - -A collection of icons to associate with individual users is included with -TDE, but as part of the tdepasswd package. - -The menu package will help to provide TDM with a list of window managers -that can be launched, if the window manager does not register with TDM -already. Most users won't need this. - -%files -n trinity-tdm -%defattr(-,root,root,-) -%{tde_tdelibdir}/kgreet_pam.la -%{tde_tdelibdir}/kgreet_pam.so -%{tde_bindir}/gen%{tdm}conf -%{tde_bindir}/%{tdm} -%{tde_bindir}/%{tdm}_config -%{tde_bindir}/%{tdm}ctl -%{tde_bindir}/%{tdm}_greet -%{tde_bindir}/krootimage -%dir %{tdm_datadir} -%dir %{tdm_datadir}/pics -%{tdm_datadir}/pics/kdelogo.png -%{tdm_datadir}/pics/kdelogo-crystal.png -%{tdm_datadir}/pics/shutdown.jpg -%{tdm_datadir}/pics/users -%dir %{tdm_datadir}/sessions -%{tdm_datadir}/sessions/*.desktop -%{tdm_datadir}/themes/ -%{tde_datadir}/config/%{tdm} -%dir %{_sysconfdir}/trinity/%{tdm} -%if 0%{?with_selinux_policy} -%exclude %{?_sysconfdir}/trinity/%{tdm}/tdm.pp -%endif -%config(noreplace) %{_sysconfdir}/trinity/%{tdm}/* -%{tde_tdedocdir}/HTML/en/%{tdm}/ -%if 0%{?suse_version} == 0 -%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity -%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np -%endif - -# XDG user faces -%dir %{_datadir}/faces -%{_datadir}/faces/default1.png -%{_datadir}/faces/default2.png -%{_datadir}/faces/default3.png -%{_datadir}/faces/root1.png - -# Distribution specific stuff -%if 0%{?suse_version} == 1140 -%{_sysconfdir}/init.d/xdm.tde -%endif -%if 0%{?suse_version} >= 1210 -/usr/lib/X11/displaymanagers/tdm -%endif -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -/usr/lib/systemd/system/tdm.service -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%{_datadir}/xsessions/tde.desktop -%endif - -# https://wiki.mageia.org/en/How_to_add_a_new_Window_Manager_or_Display_Manager -%if 0%{?mgaversion} || 0%{?mdkversion} -%{_sysconfdir}/X11/wmsession.d/45TDE -%{_datadir}/X11/dm.d/45TDE.conf -%endif - -# SELINUX policy -%if 0%{?with_selinux_policy} -%{?_sysconfdir}/trinity/%{tdm}/tdm.pp -%endif - -# Logrotate configuration -%config %{_sysconfdir}/logrotate.d/trinity-tdm - -%pre -n trinity-tdm -# Make sure that TDM configuration files are now under '/etc/trinity/tdm' -if [ -d "%{tde_datadir}/config/%{tdm}" ] && [ ! -L "%{tde_datadir}/config/%{tdm}" ]; then - if [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then - # If there is already something under '/etc/trinity/tdm', simply delete old configuration - echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'" - rm -rf "%{tde_datadir}/config/%{tdm}" - else - # Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm' - if [ ! -d "%{_sysconfdir}/trinity" ]; then - mkdir -p "%{_sysconfdir}/trinity" - fi - echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{_sysconfdir}/trinity/%{tdm}'" - mv -f "%{tde_datadir}/config/%{tdm}" "%{_sysconfdir}/trinity/%{tdm}.migr" - fi -fi - -# Remove actual directory before creating a symlink -if [ ! -L "%{tdm_datadir}/pics/users" ]; then - [ -d "%{_datadir}/faces" ] || mkdir -p "%{_datadir}/faces" - cp -f "%{tdm_datadir}/pics/users/"* "%{_datadir}/faces" - rm -rf "%{tdm_datadir}/pics/users" -fi - -%post -n trinity-tdm -%if 0%{?mgaversion} || 0%{?mdkversion} -%make_session -%endif -%if 0%{?with_selinux_policy} -/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp" -%endif - -# Sets default user icon in TDM -if [ ! -r "%{tdm_datadir}/faces/.default.face.icon" ]; then - [ -d "%{tdm_datadir}/faces" ] || mkdir -p "%{tdm_datadir}/faces" - cp -f "%{tdm_datadir}/pics/users/default2.png" "%{tdm_datadir}/faces/.default.face.icon" -fi - -# Sets default language for TDM -if [ "$1" = "1" ]; then - if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then - sed -i "%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|" - fi -fi - -# openSUSE 11.4 tdm's startup script -if [ -r "%{_sysconfdir}/init.d/xdm.tde" ]; then - cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm" -fi - - -%posttrans -n trinity-tdm -# Make sure that TDM configuration files are now under '/etc/trinity/tdm' -if [ -d "%{_sysconfdir}/trinity/%{tdm}.migr" ] && [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then - mv -f "%{_sysconfdir}/trinity/%{tdm}.migr/"* "%{_sysconfdir}/trinity/%{tdm}/" - rmdir "%{_sysconfdir}/trinity/%{tdm}.migr/" -fi - -%postun -n trinity-tdm -%if 0%{?mgaversion} || 0%{?mdkversion} -%make_session -%endif - -########## - -%package -n trinity-tdm-devel -Summary: Development files for tdm -Group: Development/Libraries/Other -Requires: trinity-tdm = %{version}-%{release} -%{?xtst_devel:Requires: %{xtst_devel}} - -%description -n trinity-tdm-devel -This package contains the development files for TDM. - -%files -n trinity-tdm-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kgreeterplugin.h - -########## - -%package -n trinity-kfind -Summary: File-find utility for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} - -%description -n trinity-kfind -kfind can be used to find files and directories on your -workstations. - -%files -n trinity-kfind -%defattr(-,root,root,-) -%{tde_bindir}/kfind -%{tde_tdelibdir}/libkfindpart.la -%{tde_tdelibdir}/libkfindpart.so -%{tde_tdeappdir}/Kfind.desktop -%{tde_datadir}/apps/kfindpart/ -%{tde_datadir}/icons/hicolor/*/apps/kfind.png -%{tde_datadir}/services/kfindpart.desktop -%{tde_datadir}/servicetypes/findpart.desktop -%{tde_tdedocdir}/HTML/en/kfind/ - -%post -n trinity-kfind -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%postun -n trinity-kfind -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -########## - -%package -n trinity-khelpcenter -Summary: Help center for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} -Requires: htdig - -%description -n trinity-khelpcenter -The TDE Help Center provides documentation on how to use the TDE desktop. - -The htdig package is needed to build a searchable archive of TDE -documentation. - -%files -n trinity-khelpcenter -%defattr(-,root,root,-) -%{tde_bindir}/khc_docbookdig.pl -%{tde_bindir}/khc_htdig.pl -%{tde_bindir}/khc_htsearch.pl -%{tde_bindir}/khc_indexbuilder -%{tde_bindir}/khc_mansearch.pl -%{tde_bindir}/khelpcenter -%{tde_tdelibdir}/khelpcenter.la -%{tde_tdelibdir}/khelpcenter.so -%{tde_libdir}/libkdeinit_khelpcenter.la -%{tde_libdir}/libkdeinit_khelpcenter.so -%{tde_tdeappdir}/Help.desktop -%{tde_datadir}/apps/khelpcenter/ -%{tde_datadir}/config.kcfg/khelpcenter.kcfg -%{tde_datadir}/icons/hicolor/*/apps/khelpcenter.* -%{tde_datadir}/services/khelpcenter.desktop -%{tde_tdedocdir}/HTML/en/khelpcenter/ - -%post -n trinity-khelpcenter -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -%postun -n trinity-khelpcenter -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -########## - -%package -n trinity-kicker -Summary: Desktop panel for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} - -%description -n trinity-kicker -Kicker provides the TDE panel on you desktop. It can be used as a -program launcher and can load plugins to provide additional -functionality. - -%files -n trinity-kicker -%defattr(-,root,root,-) -%{tde_bindir}/appletproxy -%{tde_bindir}/extensionproxy -%{tde_bindir}/kasbar -%{tde_bindir}/kicker -%{tde_libdir}/kconf_update_bin/kicker-3.4-reverseLayout -%{tde_tdelibdir}/appletproxy.la -%{tde_tdelibdir}/appletproxy.so -%{tde_tdelibdir}/clock_panelapplet.la -%{tde_tdelibdir}/clock_panelapplet.so -%{tde_tdelibdir}/dockbar_panelextension.la -%{tde_tdelibdir}/dockbar_panelextension.so -%{tde_tdelibdir}/extensionproxy.la -%{tde_tdelibdir}/extensionproxy.so -%{tde_tdelibdir}/kasbar_panelextension.la -%{tde_tdelibdir}/kasbar_panelextension.so -%{tde_tdelibdir}/kicker.la -%{tde_tdelibdir}/kickermenu_find.la -%{tde_tdelibdir}/kickermenu_find.so -%{tde_tdelibdir}/kickermenu_kate.so -%{tde_tdelibdir}/kickermenu_kate.la -%{tde_tdelibdir}/kickermenu_kdeprint.la -%{tde_tdelibdir}/kickermenu_kdeprint.so -%{tde_tdelibdir}/kickermenu_konqueror.la -%{tde_tdelibdir}/kickermenu_konqueror.so -%{tde_tdelibdir}/kickermenu_konsole.la -%{tde_tdelibdir}/kickermenu_konsole.so -%{tde_tdelibdir}/kickermenu_prefmenu.la -%{tde_tdelibdir}/kickermenu_prefmenu.so -%{tde_tdelibdir}/kickermenu_recentdocs.la -%{tde_tdelibdir}/kickermenu_recentdocs.so -%{tde_tdelibdir}/kickermenu_remotemenu.la -%{tde_tdelibdir}/kickermenu_remotemenu.so -%{tde_tdelibdir}/kickermenu_systemmenu.la -%{tde_tdelibdir}/kickermenu_systemmenu.so -%{tde_tdelibdir}/kicker.so -%{tde_tdelibdir}/launcher_panelapplet.la -%{tde_tdelibdir}/launcher_panelapplet.so -%{tde_tdelibdir}/lockout_panelapplet.la -%{tde_tdelibdir}/lockout_panelapplet.so -%{tde_tdelibdir}/media_panelapplet.la -%{tde_tdelibdir}/media_panelapplet.so -%{tde_tdelibdir}/menu_panelapplet.la -%{tde_tdelibdir}/menu_panelapplet.so -%{tde_tdelibdir}/minipager_panelapplet.la -%{tde_tdelibdir}/minipager_panelapplet.so -%{tde_tdelibdir}/naughty_panelapplet.la -%{tde_tdelibdir}/naughty_panelapplet.so -%{tde_tdelibdir}/run_panelapplet.la -%{tde_tdelibdir}/run_panelapplet.so -%{tde_tdelibdir}/sidebar_panelextension.la -%{tde_tdelibdir}/sidebar_panelextension.so -%{tde_tdelibdir}/systemtray_panelapplet.la -%{tde_tdelibdir}/systemtray_panelapplet.so -%{tde_tdelibdir}/taskbar_panelapplet.la -%{tde_tdelibdir}/taskbar_panelapplet.so -%{tde_tdelibdir}/taskbar_panelextension.la -%{tde_tdelibdir}/taskbar_panelextension.so -%{tde_tdelibdir}/trash_panelapplet.la -%{tde_tdelibdir}/trash_panelapplet.so -%{tde_libdir}/libkasbar.so.* -%{tde_libdir}/libkdeinit_appletproxy.la -%{tde_libdir}/libkdeinit_appletproxy.so -%{tde_libdir}/libkdeinit_extensionproxy.la -%{tde_libdir}/libkdeinit_extensionproxy.so -%{tde_libdir}/libkdeinit_kicker.la -%{tde_libdir}/libkdeinit_kicker.so -%{tde_libdir}/libkickermain.so.* -%{tde_libdir}/libtaskbar.so.* -%{tde_libdir}/libtaskmanager.so.* -%{tde_libdir}/libkickoffsearch_interfaces.so.* -%{tde_tdeappdir}/kcmkicker.desktop -%{tde_datadir}/applnk/.hidden/kicker_config_arrangement.desktop -%{tde_datadir}/applnk/.hidden/kicker_config_hiding.desktop -%{tde_datadir}/applnk/.hidden/kicker_config_menus.desktop -%{tde_datadir}/apps/clockapplet/ -%{tde_datadir}/apps/kconf_update/kicker-3.1-properSizeSetting.pl -%{tde_datadir}/apps/kconf_update/kicker-3.5-kconfigXTize.pl -%{tde_datadir}/apps/kconf_update/kicker-3.5-taskbarEnums.pl -%{tde_datadir}/apps/kconf_update/kickerrc.upd -%{tde_datadir}/apps/kicker/ -%exclude %{tde_datadir}/apps/kicker/applets/klipper.desktop -%exclude %{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop -%{tde_datadir}/apps/naughtyapplet/ -%{tde_datadir}/autostart/panel.desktop -%{tde_datadir}/config.kcfg/kickerSettings.kcfg -%{tde_datadir}/config.kcfg/launcherapplet.kcfg -%{tde_datadir}/config.kcfg/pagersettings.kcfg -%{tde_datadir}/config.kcfg/taskbar.kcfg -%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.png -%{tde_datadir}/icons/crystalsvg/*/apps/taskbar.png -%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.png -%{tde_datadir}/icons/crystalsvg/*/apps/kdisknav.png -%{tde_datadir}/icons/crystalsvg/*/apps/kicker.png -%{tde_datadir}/icons/crystalsvg/*/apps/panel.png -%{tde_datadir}/icons/crystalsvg/*/apps/runprocesscatcher.png -%{tde_datadir}/icons/crystalsvg/*/apps/window_list.png -%{tde_datadir}/icons/crystalsvg/*/apps/kbinaryclock.svgz -%{tde_datadir}/icons/crystalsvg/*/apps/systemtray.svgz -%{tde_datadir}/servicetypes/kickoffsearchplugin.desktop -%{tde_tdedocdir}/HTML/en/kicker/ -%if 0%{?mgaversion} >= 3 -%{tde_datadir}/oxygen/scalable/mgabutton.svg -%endif - -%post -n trinity-kicker -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -%postun -n trinity-kicker -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -########## - -%package -n trinity-kicker-devel -Summary: Development files for kicker -Group: Development/Libraries/Other -Requires: trinity-kicker = %{version}-%{release} -%{?xtst_devel:Requires: %{xtst_devel}} - -%description -n trinity-kicker-devel -This package contains the development files for kicker. - -%files -n trinity-kicker-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kickoff-search-plugin.h -%{tde_tdeincludedir}/kickoffsearchinterface.h -%{tde_libdir}/libkasbar.la -%{tde_libdir}/libkasbar.so -%{tde_libdir}/libkickermain.la -%{tde_libdir}/libkickermain.so -%{tde_libdir}/libkickoffsearch_interfaces.la -%{tde_libdir}/libkickoffsearch_interfaces.so -%{tde_libdir}/libtaskbar.la -%{tde_libdir}/libtaskbar.so -%{tde_libdir}/libtaskmanager.la -%{tde_libdir}/libtaskmanager.so - -%post -n trinity-kicker-devel -/sbin/ldconfig || : - -%postun -n trinity-kicker-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-klipper -Summary: Clipboard utility for Trinity -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} - -%description -n trinity-klipper -klipper provides standard clipboard functions (cut and paste, history -saving) plus additional features, like the ability to offer actions to -take dependent on the clipboard contents. For example, it can launch a -web browser if the clipboard contains a URL. - -%files -n trinity-klipper -%defattr(-,root,root,-) -%{tde_bindir}/klipper -%config(noreplace) %{_sysconfdir}/trinity/klipperrc -%{tde_tdelibdir}/klipper.la -%{tde_tdelibdir}/klipper.so -%{tde_tdelibdir}/klipper_panelapplet.la -%{tde_tdelibdir}/klipper_panelapplet.so -%{tde_libdir}/libkdeinit_klipper.la -%{tde_libdir}/libkdeinit_klipper.so -%{tde_tdeappdir}/klipper.desktop -%{tde_datadir}/apps/kconf_update/klipper-1-2.pl -%{tde_datadir}/apps/kconf_update/klipper-trinity1.sh -%{tde_datadir}/apps/kconf_update/klipperrc.upd -%{tde_datadir}/apps/kconf_update/klippershortcuts.upd -%{tde_datadir}/apps/kicker/applets/klipper.desktop -%{tde_datadir}/autostart/klipper.desktop -%{tde_datadir}/icons/hicolor/*/apps/klipper.* -%{tde_tdedocdir}/HTML/en/klipper/ - -%post -n trinity-klipper -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -%postun -n trinity-klipper -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -########## - -%package -n trinity-kmenuedit -Summary: Menu editor for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} - -%description -n trinity-kmenuedit -The TDE menu editor allows you to make customisations to the TDE menu -structure. - -%files -n trinity-kmenuedit -%defattr(-,root,root,-) -%{tde_bindir}/kcontroledit -%{tde_bindir}/kmenuedit -%{tde_tdelibdir}/kcontroledit.la -%{tde_tdelibdir}/kcontroledit.so -%{tde_tdelibdir}/kmenuedit.la -%{tde_tdelibdir}/kmenuedit.so -%{tde_libdir}/libkdeinit_kcontroledit.la -%{tde_libdir}/libkdeinit_kcontroledit.so -%{tde_libdir}/libkdeinit_kmenuedit.la -%{tde_libdir}/libkdeinit_kmenuedit.so -%{tde_tdeappdir}/kmenuedit.desktop -%{tde_datadir}/applnk/System/kmenuedit.desktop -%{tde_datadir}/apps/kcontroledit/ -%{tde_datadir}/apps/kmenuedit/ -%{tde_tdedocdir}/HTML/en/kmenuedit/ - -%post -n trinity-kmenuedit -update-desktop-database %{tde_appdir} 2> /dev/null || : -/sbin/ldconfig || : - -%postun -n trinity-kmenuedit -update-desktop-database %{tde_appdir} 2> /dev/null || : -/sbin/ldconfig || : - -########## - -%package -n trinity-konqueror -Summary: TDE's advanced file manager, web browser and document viewer -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} -Requires: trinity-kcontrol = %{version}-%{release} -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: trinity-kdesktop = %{version}-%{release} -Requires: trinity-kfind = %{version}-%{release} -Requires: trinity-libkonq = %{version}-%{release} - -%description -n trinity-konqueror -Konqueror is the file manager for the Trinity Desktop Environment. -It supports basic file management on local UNIX filesystems, -from simple cut/copy and paste operations to advanced remote -and local network file browsing. - -It is also the canvas for all the latest TDE technology, -from KIO slaves (which provide mechanisms for file access) to -component embedding via the KParts object interface, and it -is one of the most customizable applications available. - -Konqueror is an Open Source web browser with HTML4.0 compliance, -supporting Java applets, JavaScript, CSS1 and (partially) CSS2, -as well as Netscape plugins (for example, Flash or RealVideo plugins). - -It is a universal viewing application, capable of embedding -read-only viewing components in itself to view documents without -ever launching another application. - -%files -n trinity-konqueror -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/trinity/konqsidebartng.rc -%{tde_bindir}/kbookmarkmerger -%{tde_bindir}/keditbookmarks -%{tde_bindir}/kfmclient -%{tde_bindir}/konqueror -%{tde_tdelibdir}/kcm_history.la -%{tde_tdelibdir}/kcm_history.so -%{tde_tdelibdir}/kded_konqy_preloader.la -%{tde_tdelibdir}/kded_konqy_preloader.so -%{tde_tdelibdir}/keditbookmarks.la -%{tde_tdelibdir}/keditbookmarks.so -%{tde_tdelibdir}/kfmclient.la -%{tde_tdelibdir}/kfmclient.so -%{tde_tdelibdir}/konq_aboutpage.la -%{tde_tdelibdir}/konq_aboutpage.so -%{tde_tdelibdir}/konq_iconview.la -%{tde_tdelibdir}/konq_iconview.so -%{tde_tdelibdir}/konq_listview.la -%{tde_tdelibdir}/konq_listview.so -%{tde_tdelibdir}/konq_remoteencoding.la -%{tde_tdelibdir}/konq_remoteencoding.so -%{tde_tdelibdir}/konq_shellcmdplugin.la -%{tde_tdelibdir}/konq_shellcmdplugin.so -%{tde_tdelibdir}/konq_sidebar.la -%{tde_tdelibdir}/konq_sidebar.so -%{tde_tdelibdir}/konq_sidebartree_bookmarks.la -%{tde_tdelibdir}/konq_sidebartree_bookmarks.so -%{tde_tdelibdir}/konq_sidebartree_dirtree.la -%{tde_tdelibdir}/konq_sidebartree_dirtree.so -%{tde_tdelibdir}/konq_sidebartree_history.la -%{tde_tdelibdir}/konq_sidebartree_history.so -%{tde_tdelibdir}/konqsidebar_tree.la -%{tde_tdelibdir}/konqsidebar_tree.so -%{tde_tdelibdir}/konqsidebar_web.la -%{tde_tdelibdir}/konqsidebar_web.so -%{tde_tdelibdir}/konqueror.la -%{tde_tdelibdir}/konqueror.so -%{tde_tdelibdir}/libkhtmlkttsdplugin.la -%{tde_tdelibdir}/libkhtmlkttsdplugin.so -%{tde_libdir}/libkdeinit_keditbookmarks.la -%{tde_libdir}/libkdeinit_keditbookmarks.so -%{tde_libdir}/libkdeinit_kfmclient.la -%{tde_libdir}/libkdeinit_kfmclient.so -%{tde_libdir}/libkdeinit_konqueror.la -%{tde_libdir}/libkdeinit_konqueror.so -%{tde_libdir}/libkonqsidebarplugin.so.* -%{tde_tdeappdir}/Home.desktop -%{tde_tdeappdir}/kcmhistory.desktop -%{tde_tdeappdir}/kfmclient.desktop -%{tde_tdeappdir}/kfmclient_dir.desktop -%{tde_tdeappdir}/kfmclient_html.desktop -%{tde_tdeappdir}/kfmclient_war.desktop -%{tde_tdeappdir}/khtml_filter.desktop -%{tde_tdeappdir}/konqbrowser.desktop -%{tde_tdeappdir}/konquerorsu.desktop -%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop -%{tde_datadir}/applnk/Internet/keditbookmarks.desktop -%{tde_datadir}/applnk/konqueror.desktop -%{tde_datadir}/apps/kconf_update/kfmclient_3_2.upd -%{tde_datadir}/apps/kconf_update/kfmclient_3_2_update.sh -%{tde_datadir}/apps/kconf_update/konqsidebartng.upd -%{tde_datadir}/apps/kconf_update/move_konqsidebartng_entries.sh -%{tde_datadir}/apps/keditbookmarks/ -%{tde_datadir}/apps/khtml/kpartplugins/ -%{tde_datadir}/apps/konqiconview/ -%{tde_datadir}/apps/konqlistview/ -%exclude %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop -%{tde_datadir}/apps/konqsidebartng/ -%{tde_datadir}/apps/konqueror/about/ -%dir %{tde_datadir}/apps/konqueror/dirtree -%dir %{tde_datadir}/apps/konqueror/dirtree/remote -%{tde_datadir}/apps/konqueror/icons/ -%{tde_datadir}/apps/konqueror/konq-simplebrowser.rc -%{tde_datadir}/apps/konqueror/konqueror.rc -%{tde_datadir}/apps/konqueror/pics/indicator_connect.png -%{tde_datadir}/apps/konqueror/pics/indicator_empty.png -%{tde_datadir}/apps/konqueror/pics/indicator_noconnect.png -%{tde_datadir}/apps/konqueror/pics/indicator_viewactive.png -%{tde_datadir}/apps/konqueror/profiles/ -%exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop -%exclude %{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop -%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop -%{tde_datadir}/apps/konqueror/servicemenus/*.desktop -%ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop -%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase -%{tde_datadir}/apps/konqueror/tiles/ -%{tde_datadir}/autostart/konqy_preload.desktop -%{tde_datadir}/config.kcfg/keditbookmarks.kcfg -%{tde_datadir}/config.kcfg/konq_listview.kcfg -%{tde_datadir}/config.kcfg/konqueror.kcfg -%{tde_datadir}/icons/crystalsvg/*/apps/keditbookmarks.png -%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.svgz -%{tde_datadir}/icons/hicolor/*/apps/kfm.png -%{tde_datadir}/icons/hicolor/*/apps/konqueror.* -%{tde_datadir}/services/kded/konqy_preloader.desktop -%{tde_datadir}/services/konq_*.desktop -%{tde_datadir}/servicetypes/konqaboutpage.desktop -%{tde_tdedocdir}/HTML/en/konqueror/ - -%post -n trinity-konqueror -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : -if [ $1 -eq 1 ]; then - update-alternatives --install \ - %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop \ - media_safelyremove.desktop_konqueror \ - %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase \ - 10 || : -fi - -%postun -n trinity-konqueror -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -%preun -n trinity-konqueror -if [ $1 -eq 0 ]; then - update-alternatives --remove \ - media_safelyremove.desktop_konqueror \ - %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || : -fi - -########## - -%package -n trinity-konqueror-devel -Summary: Development files for konqueror -Group: Development/Libraries/Other -Requires: trinity-konqueror = %{version}-%{release} - -%description -n trinity-konqueror-devel -This package contains the development files for konqueror. - -%files -n trinity-konqueror-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/konqsidebarplugin.h -%{tde_tdeincludedir}/KonquerorIface.h -%{tde_libdir}/libkonqsidebarplugin.la -%{tde_libdir}/libkonqsidebarplugin.so - -%post -n trinity-konqueror-devel -/sbin/ldconfig || : - -%postun -n trinity-konqueror-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-konqueror-nsplugins -Summary: Netscape plugin support for Konqueror -Group: System/GUI/Other -Requires: trinity-konqueror = %{version}-%{release} - -%description -n trinity-konqueror-nsplugins -This package includes support for Netscape plugins in Konqueror. - -%files -n trinity-konqueror-nsplugins -%defattr(-,root,root,-) -%{tde_bindir}/nspluginscan -%{tde_bindir}/nspluginviewer -%{tde_tdelibdir}/kcm_nsplugins.la -%{tde_tdelibdir}/kcm_nsplugins.so -%{tde_tdelibdir}/libnsplugin.la -%{tde_tdelibdir}/libnsplugin.so -%{tde_tdeappdir}/khtml_plugins.desktop -%{tde_datadir}/apps/plugin/nspluginpart.rc - -%post -n trinity-konqueror-nsplugins -update-desktop-database %{tde_appdir} 2> /dev/null || : - -%postun -n trinity-konqueror-nsplugins -update-desktop-database %{tde_appdir} 2> /dev/null || : - -########## - -%package -n trinity-konsole -Summary: X terminal emulator for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} - -%description -n trinity-konsole -Konsole is an X terminal emulation which provides a command-line interface -(CLI) while using the graphical Trinity Desktop Environment. Konsole helps to -better organize user's desktop by containing multiple sessions in a single -window (a less cluttered desktop). - -Its advanced features include a simple configuration and the ability to use -multiple terminal shells in a single window - -Using Konsole, a user can open: -* Linux console sessions -* Midnight Commander file manager sessions -* Shell sessions -* Root consoles sessions - -%files -n trinity-konsole -%defattr(-,root,root,-) -%{tde_bindir}/konsole -%{tde_tdelibdir}/kcm_konsole.la -%{tde_tdelibdir}/kcm_konsole.so -%{tde_tdelibdir}/kded_kwrited.la -%{tde_tdelibdir}/kded_kwrited.so -%{tde_tdelibdir}/konsole.la -%{tde_tdelibdir}/konsole.so -%{tde_tdelibdir}/libkonsolepart.la -%{tde_tdelibdir}/libkonsolepart.so -%{tde_libdir}/libkdeinit_konsole.la -%{tde_libdir}/libkdeinit_konsole.so -%{tde_tdeappdir}/konsole.desktop -%{tde_tdeappdir}/konsolesu.desktop -%{tde_datadir}/applnk/.hidden/kcmkonsole.desktop -%{tde_datadir}/apps/kconf_update/konsole.upd -%{tde_datadir}/apps/kconf_update/schemaStrip.pl -%{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop -%{tde_datadir}/apps/konsole/ -%{tde_datadir}/icons/hicolor/*/apps/konsole.* -%{tde_datadir}/mimelnk/application/x-konsole.desktop -%{tde_datadir}/services/kded/kwrited.desktop -%{tde_datadir}/services/konsolepart.desktop -%{tde_datadir}/services/konsole-script.desktop -%{tde_datadir}/services/kwrited.desktop -%{tde_datadir}/servicetypes/terminalemulator.desktop -%{tde_tdedocdir}/HTML/en/konsole/ -%{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/ -%config %{_sysconfdir}/fonts/conf.d/99-konsole.conf - -%post -n trinity-konsole -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -%postun -n trinity-konsole -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -########## - -%package -n trinity-kpager -Summary: Desktop pager for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} - -%description -n trinity-kpager -This package contains TDE's desktop pager, which displays your virtual -desktops iconically in a window, along with icons of any running -applications. It is used to switch between applications or desktops. - -%files -n trinity-kpager -%defattr(-,root,root,-) -%{tde_bindir}/kpager -%{tde_tdeappdir}/kpager.desktop -%{tde_datadir}/applnk/Utilities/kpager.desktop -%{tde_datadir}/icons/hicolor/*/apps/kpager.png -%{tde_tdedocdir}/HTML/en/kpager/ - -%post -n trinity-kpager -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%postun -n trinity-kpager -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -########## - -%package -n trinity-kpersonalizer -Summary: Installation personalizer for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} - -%description -n trinity-kpersonalizer -TDE Personalizer is the application that configures the TDE desktop for you. -It's a very useful wizard that allows you to quickly change the TDE desktop to -suit your own needs. When you run TDE for the first time, KPersonalizer is -automatically started. KPersonalizer can also be called later. - -%files -n trinity-kpersonalizer -%defattr(-,root,root,-) -%{tde_bindir}/kpersonalizer -%{tde_tdeappdir}/kpersonalizer.desktop -%{tde_datadir}/applnk/System/kpersonalizer.desktop -%{tde_datadir}/apps/kpersonalizer/ -%{tde_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png - -%post -n trinity-kpersonalizer -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%postun -n trinity-kpersonalizer -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -########## - -%package -n trinity-ksmserver -Summary: Session manager for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} -Requires: trinity-twin = %{version}-%{release} - -%description -n trinity-ksmserver -This package contains the TDE session manager. It is responsible for -restoring your TDE session on login. It is also needed to properly -start a TDE session. It registers TDE with X display managers, and -provides the 'starttde' command, for starting an X session with TDE -from the console. - -If you are running TDE for the first time for a certain user, -kpersonalizer is used to help with setup. If it is not present, -TDE will start, but many good defaults will not be set. - -%files -n trinity-ksmserver -%defattr(-,root,root,-) -%{tde_bindir}/ksmserver -%{tde_bindir}/%{starttde} -%{tde_bindir}/migratekde3 -%{tde_tdelibdir}/ksmserver.la -%{tde_tdelibdir}/ksmserver.so -%{tde_libdir}/libkdeinit_ksmserver.la -%{tde_libdir}/libkdeinit_ksmserver.so -%{tde_datadir}/apps/kconf_update/ksmserver.upd -%{tde_datadir}/apps/kconf_update/move_session_config.sh -%{tde_datadir}/apps/ksmserver/ - -# Workaround conflict with KDE4 -%if "%{?tde_prefix}" != "/usr" -%{tde_bindir}/plasma-desktop -%endif - -%post -n trinity-ksmserver -/sbin/ldconfig || : -%if 0%{?mdkversion} || 0%{?mgaversion} -fndSession -%endif - -%postun -n trinity-ksmserver -/sbin/ldconfig || : -%if 0%{?mdkversion} || 0%{?mgaversion} -fndSession -%endif - -########## - -%package -n trinity-ksplash -Summary: The TDE splash screen -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} - -%description -n trinity-ksplash -This package includes the TDE Splash screen, which is seen when -a TDE session is launched. - -%files -n trinity-ksplash -%defattr(-,root,root,-) -%{tde_bindir}/ksplash -%{tde_bindir}/ksplashsimple -%{tde_tdelibdir}/kcm_ksplashthemes.la -%{tde_tdelibdir}/kcm_ksplashthemes.so -%{tde_tdelibdir}/ksplashdefault.la -%{tde_tdelibdir}/ksplashdefault.so -%{tde_tdelibdir}/ksplashunified.la -%{tde_tdelibdir}/ksplashunified.so -%{tde_tdelibdir}/ksplashredmond.la -%{tde_tdelibdir}/ksplashredmond.so -%{tde_tdelibdir}/ksplashstandard.la -%{tde_tdelibdir}/ksplashstandard.so -%{tde_libdir}/libksplashthemes.so.* -%{tde_tdeappdir}/ksplashthememgr.desktop -%{tde_datadir}/apps/ksplash -%{tde_datadir}/services/ksplashdefault.desktop -%{tde_datadir}/services/ksplash.desktop -%{tde_datadir}/services/ksplashunified.desktop -%{tde_datadir}/services/ksplashredmond.desktop -%{tde_datadir}/services/ksplashstandard.desktop -%{tde_datadir}/servicetypes/ksplashplugins.desktop -%{tde_tdedocdir}/HTML/en/ksplashml/ - -%post -n trinity-ksplash -update-desktop-database %{tde_appdir} 2> /dev/null || : -/sbin/ldconfig || : - -%postun -n trinity-ksplash -update-desktop-database %{tde_appdir} 2> /dev/null || : -/sbin/ldconfig || : - -########## - -%package -n trinity-ksplash-devel -Summary: Development files for ksplash -Group: Development/Libraries/Other -Requires: trinity-ksplash = %{version}-%{release} - -%description -n trinity-ksplash-devel -This package contains the development files for ksplash. - -%files -n trinity-ksplash-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/ksplash/ -%{tde_libdir}/libksplashthemes.la -%{tde_libdir}/libksplashthemes.so - -%post -n trinity-ksplash-devel -/sbin/ldconfig || : - -%postun -n trinity-ksplash-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-ksysguard -Summary: System guard for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} -Requires: trinity-ksysguardd = %{version}-%{release} - -%description -n trinity-ksysguard -TDE System Guard allows you to monitor various statistics about your -computer. - -%files -n trinity-ksysguard -%defattr(-,root,root,-) -%{tde_bindir}/kpm -%{tde_bindir}/ksysguard -%{tde_tdelibdir}/sysguard_panelapplet.la -%{tde_tdelibdir}/sysguard_panelapplet.so -%{tde_libdir}/libksgrd.so.* -%{tde_tdeappdir}/ksysguard.desktop -%{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop -%{tde_datadir}/apps/ksysguard/ -%{tde_datadir}/icons/crystalsvg/*/apps/ksysguard.png -%{tde_datadir}/mimelnk/application/x-ksysguard.desktop -%{tde_tdedocdir}/HTML/en/ksysguard/ - -%post -n trinity-ksysguard -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -%postun -n trinity-ksysguard -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -########## - -%package -n trinity-ksysguard-devel -Summary: Development files for ksysguard -Group: Development/Libraries/Other -Requires: trinity-ksysguard = %{version}-%{release} - -%description -n trinity-ksysguard-devel -This package contains the development files for ksysguard. - -%files -n trinity-ksysguard-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/ksgrd/ -%{tde_libdir}/libksgrd.la -%{tde_libdir}/libksgrd.so - -%post -n trinity-ksysguard-devel -/sbin/ldconfig || : - -%postun -n trinity-ksysguard-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-ksysguardd -Summary: System guard daemon for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} - -%description -n trinity-ksysguardd -TDE System Guard Daemon is the daemon part of ksysguard. The daemon can -be installed on a remote machine to enable ksysguard on another machine -to monitor it through the daemon running there. - -%files -n trinity-ksysguardd -%defattr(-,root,root,-) -%{tde_bindir}/ksysguardd -%config(noreplace) %{_sysconfdir}/trinity/ksysguarddrc - -########## - -%package -n trinity-ktip -Summary: Useful tips for TDE -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} - -%description -n trinity-ktip -ktip provides many useful tips on using TDE when you log in. - -%files -n trinity-ktip -%defattr(-,root,root,-) -%{tde_bindir}/ktip -%{tde_tdeappdir}/ktip.desktop -%{tde_datadir}/applnk/Toys/ktip.desktop -%{tde_datadir}/apps/kdewizard/ -%{tde_datadir}/autostart/ktip.desktop -%{tde_datadir}/icons/hicolor/*/apps/ktip.* - -%post -n trinity-ktip -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -%postun -n trinity-ktip -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done - -########## - -%package -n trinity-twin -Summary: The TDE window manager -Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} - -%description -n trinity-twin -This package contains the default X window manager for TDE. - -%files -n trinity-twin -%defattr(-,root,root,-) -%{tde_bindir}/kompmgr -%{tde_bindir}/kwin -%{tde_bindir}/kwin_killer_helper -%{tde_bindir}/kwin_rules_dialog -%{tde_libdir}/kconf_update_bin/kwin_update_default_rules -%{tde_libdir}/kconf_update_bin/kwin_update_window_settings -%{tde_tdelibdir}/kcm_kwin*.la -%{tde_tdelibdir}/kcm_kwin*.so -%{tde_tdelibdir}/kwin*.la -%{tde_tdelibdir}/kwin*.so -%{tde_libdir}/libkdecorations.so.* -%{tde_libdir}/libkdeinit_kwin_rules_dialog.la -%{tde_libdir}/libkdeinit_kwin_rules_dialog.so -%{tde_libdir}/libkdeinit_kwin.la -%{tde_libdir}/libkdeinit_kwin.so -%{tde_tdeappdir}/showdesktop.desktop -%{tde_tdeappdir}/kwindecoration.desktop -%{tde_tdeappdir}/kwinoptions.desktop -%{tde_tdeappdir}/kwinrules.desktop -%{tde_datadir}/applnk/.hidden/kwinactions.desktop -%{tde_datadir}/applnk/.hidden/kwinadvanced.desktop -%{tde_datadir}/applnk/.hidden/kwinfocus.desktop -%{tde_datadir}/applnk/.hidden/kwinmoving.desktop -%{tde_datadir}/applnk/.hidden/kwintranslucency.desktop -%{tde_datadir}/apps/kconf_update/kwin3_plugin.pl -%{tde_datadir}/apps/kconf_update/kwin3_plugin.upd -%{tde_datadir}/apps/kconf_update/kwin_focus1.sh -%{tde_datadir}/apps/kconf_update/kwin_focus1.upd -%{tde_datadir}/apps/kconf_update/kwin_focus2.sh -%{tde_datadir}/apps/kconf_update/kwin_focus2.upd -%{tde_datadir}/apps/kconf_update/kwin_fsp_workarounds_1.upd -%{tde_datadir}/apps/kconf_update/kwiniconify.upd -%{tde_datadir}/apps/kconf_update/kwinsticky.upd -%{tde_datadir}/apps/kconf_update/kwin.upd -%{tde_datadir}/apps/kconf_update/kwinupdatewindowsettings.upd -%{tde_datadir}/apps/kconf_update/pluginlibFix.pl -%{tde_datadir}/apps/kwin/ -%{tde_datadir}/config.kcfg/kwin.kcfg -%{tde_datadir}/icons/crystalsvg/*/apps/kwin.png -%{tde_tdedocdir}/HTML/en/kompmgr/ - -%post -n trinity-twin -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -%postun -n trinity-twin -update-desktop-database %{tde_appdir} 2> /dev/null || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -/sbin/ldconfig || : - -########## - -%package -n trinity-twin-devel -Summary: Development files for twin -Group: Development/Libraries/Other -Requires: trinity-twin = %{version}-%{release} - -%description -n trinity-twin-devel -This package contains the development files for twin. - -%files -n trinity-twin-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kwin/ -%{tde_tdeincludedir}/kcommondecoration.h -%{tde_tdeincludedir}/kdecoration.h -%{tde_tdeincludedir}/kdecoration_p.h -%{tde_tdeincludedir}/kdecoration_plugins_p.h -%{tde_tdeincludedir}/kdecorationfactory.h -%{tde_tdeincludedir}/KWinInterface.h -%{tde_libdir}/libkdecorations.la -%{tde_libdir}/libkdecorations.so - -%post -n trinity-twin-devel -/sbin/ldconfig || : - -%postun -n trinity-twin-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-libkonq -Summary: Core libraries for Konqueror -Group: System/GUI/Other - -%description -n trinity-libkonq -These libraries are used by several TDE applications, most notably -Konqueror and the kdesktop package. - -%files -n trinity-libkonq -%defattr(-,root,root,-) -%{tde_tdelibdir}/kded_favicons.la -%{tde_tdelibdir}/kded_favicons.so -%{tde_tdelibdir}/konq_sound.la -%{tde_tdelibdir}/konq_sound.so -%{tde_libdir}/libkonq.so.* -%{tde_datadir}/apps/kbookmark/ -%{tde_datadir}/apps/kconf_update/favicons.upd -%{tde_datadir}/apps/kconf_update/move_favicons.sh -%dir %{tde_datadir}/apps/konqueror/pics -%{tde_datadir}/apps/konqueror/pics/arrow_bottomleft.png -%{tde_datadir}/apps/konqueror/pics/arrow_bottomright.png -%{tde_datadir}/apps/konqueror/pics/arrow_topleft.png -%{tde_datadir}/apps/konqueror/pics/arrow_topright.png -%{tde_datadir}/apps/konqueror/pics/thumbnailfont_7x4.png -%{tde_datadir}/services/kded/favicons.desktop -%{tde_datadir}/servicetypes/konqpopupmenuplugin.desktop - -%post -n trinity-libkonq -/sbin/ldconfig || : - -%postun -n trinity-libkonq -/sbin/ldconfig || : - -########## - -%package libtqt3-integration -Summary: Integration library between TQt3 and TDE -Group: System/GUI/Other - -Obsoletes: tdebase-libtqt3-integration < %{version}-%{release} -Provides: tdebase-libtqt3-integration = %{version}-%{release} - -%description libtqt3-integration -These libraries allow you to use TDE dialogs in native TQt3 applications. - -%files libtqt3-integration -%defattr(-,root,root,-) -%dir %{tde_tdelibdir}/plugins/integration -%{tde_tdelibdir}/plugins/integration/libqtkde.la -%{tde_tdelibdir}/plugins/integration/libqtkde.so -%{tde_tdelibdir}/plugins/integration/libqtkde.so.* -%{tde_tdelibdir}/kded_kdeintegration.la -%{tde_tdelibdir}/kded_kdeintegration.so -%{tde_datadir}/services/kded/kdeintegration.desktop - -########## - -%package -n trinity-libkonq-devel -Summary: Development files for Konqueror's core libraries -Group: Development/Libraries/Other -Requires: trinity-libkonq = %{version}-%{release} -%{?xtst_devel:Requires: %{xtst_devel}} - -%description -n trinity-libkonq-devel -This package contains headers and other development files for the core -Konqueror libraries. - -%files -n trinity-libkonq-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kfileivi.h -%{tde_tdeincludedir}/kivdirectoryoverlay.h -%{tde_tdeincludedir}/knewmenu.h -%{tde_tdeincludedir}/konqbookmarkmanager.h -%{tde_tdeincludedir}/konq_*.h -%{tde_tdeincludedir}/libkonq_export.h -%{tde_libdir}/libkonq.la -%{tde_libdir}/libkonq.so - -%post -n trinity-libkonq-devel -/sbin/ldconfig || : - -%postun -n trinity-libkonq-devel -/sbin/ldconfig || : - -########## - -%package tdeio-smb-plugin -Summary: Windows Connection Module for TDE -Group: System/GUI/Other - -%description tdeio-smb-plugin -This package provides the "smb://" protocol, to connect to and from -Windows and Samba shares. - -%files tdeio-smb-plugin -%defattr(-,root,root) -%{tde_tdelibdir}/kcm_samba.la -%{tde_tdelibdir}/kcm_samba.so -%{tde_tdelibdir}/kio_smb.la -%{tde_tdelibdir}/kio_smb.so -%{tde_datadir}/services/smb.protocol -%{tde_datadir}/apps/konqueror/dirtree/remote/smb-network.desktop -%dir %{tde_datadir}/apps/remoteview -%{tde_datadir}/apps/remoteview/smb-network.desktop -%{tde_datadir}/mimelnk/application/x-smb-workgroup.desktop - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%{?tde_patch:%patch1 -p1} - -# Applies an optional distro-specific graphical theme -%if "%{?tde_bg}" != "" -# TDM Background -%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" \ - -e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|' - -# TDE user default background -%__sed -i "kpersonalizer/keyecandypage.cpp" \ - -e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|' -%__sed -i "%{starttde}" \ - -e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \ - -e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|' -%endif - -# TDE branding: removes KUbuntu references [Bug #617] -%__sed -i "kcontrol/kdm/kdm-appear.cpp" \ - -e "s|Welcome to Kubuntu |Welcome to %{tde_aboutlabel} |" -%__sed -i "konqueror/about/konq_aboutpage.cc" \ - -e "s|About Kubuntu|About %{tde_aboutlabel}|" \ - -e "s|help:/kubuntu/|%{tde_aboutpage}|" \ - -e "s|Kubuntu Documentation|%{tde_aboutlabel} Documentation|" -%__sed -i "konqueror/about/launch.html" \ - -e "s|help:/kubuntu/about-kubuntu/index.html|%{tde_aboutpage}|" -%__sed -i "kdm/config.def" \ - -e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |" - -# TDE default directory and icon in startup script -%__sed -i "%{starttde}" \ - -e "s|/opt/trinity|%{tde_prefix}|g" - -# Sets default TDE menu icon -%if "%{tde_starticon}" != "" -%__sed -i "kicker/libkicker/kickerSettings.kcfg" \ - -e "s|QString(\"kmenu\")|QString(\"%{tde_starticon}\")|" -%endif - -# Xsession script location may vary on some distro -%if 0%{?rhel} || 0%{?fedora} -%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xinit/Xsession|" -%endif -%if 0%{?suse_version} -%__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|" -%endif - -# Reboot command location may vary on some distributions -if [ -x "/usr/bin/reboot" ]; then - POWEROFF="/usr/bin/poweroff" - REBOOT="/usr/bin/reboot" -fi -if [ -n "${REBOOT}" ]; then - %__sed -i \ - "doc/%{tdm}/%{tdm}rc-ref.docbook" \ - "kcontrol/%{tdm}/%{tdm}-shut.cpp" \ - "%{tdm}/config.def" \ - -e "s|/sbin/poweroff|${POWEROFF}|g" \ - -e "s|/sbin/reboot|${REBOOT}|g" -fi - -# Update icons for some control center modules -%__sed -i "kcontrol/componentchooser/componentchooser.desktop" -e "s|^Icon=.*|Icon=kcmcomponentchooser|" -%__sed -i "kcontrol/taskbar/kcmtaskbar.desktop" -e "s|^Icon=.*|Icon=kcmtaskbar|" -%__sed -i "kcontrol/nics/nic.desktop" -e "s|^Icon=.*|Icon=kcmnic|" -%__sed -i "kcontrol/input/mouse.desktop" -e "s|^Icon=.*|Icon=kcmmouse|" -%__sed -i "kcontrol/smserver/kcmsmserver.desktop" -e "s|^Icon=.*|Icon=kcmsmserver|" -%__sed -i "kcontrol/kded/kcmkded.desktop" -e "s|^Icon=.*|Icon=kcmkded|" -%__sed -i "kcontrol/konq/desktop.desktop" -e "s|^Icon=.*|Icon=kcmdesktop|" -%__sed -i "kcontrol/konq/desktopbehavior.desktop" -e "s|^Icon=.*|Icon=kcmdesktopbehavior|" -%__sed -i "kcontrol/privacy/privacy.desktop" -e "s|^Icon=.*|Icon=kcmprivacy|" -%__sed -i "kcontrol/crypto/crypto.desktop" -e "s|^Icon=.*|Icon=kcmcrypto|" -%__sed -i "kcontrol/kio/netpref.desktop" -e "s|^Icon=.*|Icon=kcmnetpref|" -%__sed -i "kcontrol/konqhtml/khtml_filter.desktop" -e "s|^Icon=.*|Icon=kcmkhtml_filter|" -%__sed -i "kcontrol/joystick/joystick.desktop" -e "s|^Icon=.*|Icon=kcmjoystick|" -%__sed -i "kcontrol/colors/colors.desktop" -e "s|^Icon=.*|Icon=kcmcolors|" -%__sed -i "kcontrol/performance/kcmperformance.desktop" -e "s|^Icon=.*|Icon=kcmperformance|" -%__sed -i "kcontrol/launch/kcmlaunch.desktop" -e "s|^Icon=.*|Icon=kcmlaunch|" -%__sed -i "kcontrol/dnssd/kcm_kdnssd.desktop" -e "s|^Icon=.*|Icon=kcmkdnssd|" -%__sed -i "kcontrol/spellchecking/spellchecking.desktop" -e "s|^Icon=.*|Icon=kcmspellchecking|" -%__sed -i "konqueror/sidebar/trees/history_module/kcmhistory.desktop" -e "s|^Icon=.*|Icon=kcmhistory|" -%__sed -i "kioslave/cgi/kcmcgi/kcmcgi.desktop" -e "s|^Icon=.*|Icon=kcmcgi|" -%__sed -i "kioslave/media/kcmodule/media.desktop" -e "s|^Icon=.*|Icon=kcmmedia|" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -export KDEDIR=%{tde_prefix} - -# Shitty hack for RHEL4 ... -if [ -d "/usr/X11R6" ]; then - export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -# Samba 4.0 includes (Fedora 18) -if [ -d "/usr/include/samba-4.0" ]; then - export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/include/samba-4.0" -fi - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_NO_BUILTIN_CHRPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DBIN_INSTALL_DIR="%{tde_bindir}" \ - -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ - -DLIB_INSTALL_DIR="%{tde_libdir}" \ - -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ - -DCONFIG_INSTALL_DIR="%{_sysconfdir}/trinity" \ - -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \ - -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \ - \ - -DWITH_SASL=ON \ - -DWITH_LDAP=ON \ - -DWITH_SAMBA=ON \ - %{?with_exr:-DWITH_OPENEXR=ON} \ - -DWITH_XCOMPOSITE=ON \ - -DWITH_XCURSOR=ON \ - -DWITH_XFIXES=ON \ - %{?with_xrandr:-DWITH_XRANDR=ON} \ - -DWITH_XRENDER=ON \ - -DWITH_XDAMAGE=ON \ - -DWITH_XEXT=ON \ - %{?with_xtest:-DWITH_XTEST=ON} \ - %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \ - %{?with_libart:-DWITH_LIBART=ON} \ - -DWITH_LIBUSB=ON \ - -DWITH_LIBRAW1394=ON \ - -DWITH_SUDO_KDESU_BACKEND=OFF \ - -DWITH_PAM=ON \ - -DWITH_SHADOW=ON \ - -DWITH_XDMCP=ON \ - -DWITH_XINERAMA=ON \ - -DWITH_ARTS=ON \ - -DWITH_I8K=ON \ - %{?with_hal:-DWITH_HAL=ON} \ - -DWITH_KDESKTOP_LOCK_BACKTRACE=OFF \ - -DBUILD_ALL=ON \ -%if 0%{?suse_version} - -DKCHECKPASS_PAM_SERVICE="xdm" \ - -DKDM_PAM_SERVICE="xdm" \ - -DKSCREENSAVER_PAM_SERVICE="xdm" \ -%else - -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \ - -DKDM_PAM_SERVICE="tdm-trinity" \ - -DKSCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \ -%endif - %{!?with_tsak:-DBUILD_TSAK=OFF} \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} -C build - -# Removes obsolete Beagle-related files -%__rm -f %{?buildroot}%{tde_bindir}/khc_beagle_index.pl -%__rm -f %{?buildroot}%{tde_bindir}/khc_beagle_search.pl - -# Adds a GDM/KDM/XDM session called 'TDE' - -# Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'. -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__install -D -m 644 \ - "%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \ - "%{?buildroot}%{_datadir}/xsessions/tde.desktop" - -# Force session name to be 'TDE' -%__sed -i "%{?buildroot}%{_datadir}/xsessions/tde.desktop" \ - -e "s,^Name=.*,Name=TDE," -%endif - -# Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora -# Generated files for TDM/KDM4 go to '/usr/share/apps/kdm/sessions' -%if 0%{?mgaversion} || 0%{?mdkversion} -%__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d -cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE" -NAME=TDE -ICON=kde-wmsession.xpm -DESC=The Trinity Desktop Environment -EXEC=%{tde_bindir}/%{starttde} -SCRIPT: -exec %{tde_bindir}/%{starttde} -EOF - -%__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d -cat <<EOF >"%{?buildroot}%{_datadir}/X11/dm.d/45TDE.conf" -NAME=TDM -DESCRIPTION=TDM (Trinity Display Manager) -PACKAGE=trinity-tdm -EXEC=%{tde_bindir}/%{tdm} -%if 0%{?pclinuxos} -FNDSESSION_EXEC="/usr/sbin/chksession -k" -%else -FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions" -%endif -EOF -%endif - -# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4 -%if "%{?tde_prefix}" != "/usr" -cat <<EOF >"%{?buildroot}%{tde_bindir}/plasma-desktop" -#!/bin/sh - -# This stupid scripts prevent the launch of 'plasma-desktop' -# (from KDE4) alongside with TDE. - -case "\${DESKTOP_SESSION}" in - "kde3"|"trinity"|"TDE") exit 0;; - *) exec /usr/bin/plasma-desktop;; -esac -EOF -chmod 755 "%{?buildroot}%{tde_bindir}/plasma-desktop" -%endif - -# PAM configuration files (except openSUSE) -%if 0%{?suse_version} == 0 -%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity" -%__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np" -%__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity" -%__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity" -%endif - -# TDM configuration -%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \ -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 - -e "s/^#*MinShowUID=.*/MinShowUID=1000/" -%else - -e "s/^#*MinShowUID=.*/MinShowUID=500/" -%endif - -# Symlinks 'usb.ids' (Use system-provided version, not TDE provided version) -%__rm -f "%{?buildroot}%{tde_datadir}/apps/usb.ids" -%if 0%{?suse_version} || 0%{?mgaversion} >= 4 -%__ln_s -f "/usr/share/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" -%else -%__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids" -%endif - -# Makes 'media_safelyremove.desktop' an alternative. -# This allows the use of 'tdeio-umountwrapper' package. -%__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" -%__mkdir_p "%{buildroot}%{_sysconfdir}/alternatives" -%__ln_s "media_safelyremove.desktop_tdebase" "%{buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop" - -# SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm' -# You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager' -%if 0%{?suse_version} >= 1210 -%__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -%__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g" -%endif - -# Fedora 18 / RHEL 7: no more SYSV init script, we have to use systemd to launch TDM. -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -%__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service" -%endif - -# Symlink TDM configuration -%__mkdir_p "%{?buildroot}%{tde_datadir}/config" -%__ln_s "%{_sysconfdir}/trinity/%{tdm}" "%{?buildroot}%{tde_datadir}/config/%{tdm}" - -# SELINUX policy for RHEL / Fedora -%if 0%{?with_selinux_policy} -%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp" -%endif - -# Mageia icon for TDE menu -%if 0%{?mgaversion} >= 3 -%__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/oxygen/scalable/mgabutton.svg" -%endif - -# openSUSE 11.4: tdm startup script -%if 0%{?suse_version} == 1140 -%__install -D -m 755 "%{SOURCE7}" "%{?buildroot}%{?_sysconfdir}/init.d/xdm.tde" -%endif - -# Console font to fontconfig -%__mkdir_p "%{buildroot}%{_sysconfdir}/fonts/conf.d" -cat <<EOF >"%{buildroot}%{_sysconfdir}/fonts/conf.d/99-konsole.conf" -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - <!-- Font directory list --> - <dir>%{tde_datadir}/apps/konsole/fonts</dir> -</fontconfig> -EOF - -# logrotate configuration -mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d -cat << EOF > "%{buildroot}%{_sysconfdir}/logrotate.d/trinity-tdm" -/var/log/tdm.log { - weekly - notifempty - missingok - nocompress -} -EOF - -# Move faces icon to XDG directory '/usr/share/faces' -if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then - %__mkdir_p "%{?buildroot}%{_datadir}/faces" - %__mv -f "%{?buildroot}%{tdm_datadir}/pics/users/"* "%{?buildroot}%{_datadir}/faces" - rmdir "%{?buildroot}%{tdm_datadir}/pics/users" -fi -%__ln_s "%{_datadir}/faces" "%{?buildroot}%{tdm_datadir}/pics/users" - -# 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/" -pushd "%{?buildroot}%{tde_datadir}/icons" -for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/misc.png hicolor/"$i"x"$i"/apps/kcmcomponentchooser.png ;done -for i in {16,22,32,48,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png hicolor/"$i"x"$i"/apps/kcmperformance.png ;done -for i in 16; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/services.png hicolor/"$i"x"$i"/apps/kcmkded.png ;done -for i in {16,22,32,48}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/exit.png hicolor/"$i"x"$i"/apps/kcmsmserver.png ;done -for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/spellcheck.png hicolor/"$i"x"$i"/apps/kcmspellchecking.png ;done -for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png hicolor/"$i"x"$i"/apps/kcmdesktopbehavior.png ;done -for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png hicolor/"$i"x"$i"/apps/kcmdesktop.png ;done -for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kmenu.png hicolor/"$i"x"$i"/apps/kcmtaskbar.png ;done -for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/mimetypes/colorscm.png hicolor/"$i"x"$i"/apps/kcmcolors.png ;done -for i in {16,22,32,48,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/launch.png hicolor/"$i"x"$i"/apps/kcmlaunch.png ;done -for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/filter.png hicolor/"$i"x"$i"/apps/kcmkhtml_filter.png ;done -for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/run.png hicolor/"$i"x"$i"/apps/kcmcgi.png ;done -for i in {16,22}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/history.png hicolor/"$i"x"$i"/apps/kcmhistory.png ;done -for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png hicolor/"$i"x"$i"/apps/kcmnetpref.png ;done -for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png hicolor/"$i"x"$i"/apps/kcmkdnssd.png ;done -for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/joystick.png hicolor/"$i"x"$i"/apps/kcmjoystick.png ;done -for i in {16,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/mouse.png hicolor/"$i"x"$i"/apps/kcmmouse.png ;done -for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/system.png hicolor/"$i"x"$i"/apps/kcmmedia.png ;done -for i in {16,22,32}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png hicolor/"$i"x"$i"/apps/kcmcrypto.png ;done -for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/trashcan_empty.png hicolor/"$i"x"$i"/apps/kcmprivacy.png ;done -for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png hicolor/"$i"x"$i"/apps/kcmnic.png ;done -popd - -# Updates applications categories for openSUSE -%if 0%{?suse_version} -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Help.desktop Documentation Viewer -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Home.desktop System FileManager core -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kate.desktop TextEditor -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/KControl.desktop X-SuSE-core -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/Kfind.desktop System Filesystem core -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kjobviewer.desktop PrintingUtility -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/klipper.desktop System TrayIcon -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kmenuedit.desktop Core-Configuration -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/knetattach.desktop System Network -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konqbrowser.desktop WebBrowser -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konquerorsu.desktop System FileManager -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konsole.desktop TerminalEmulator -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/konsolesu.desktop TerminalEmulator -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kpager.desktop Utility DesktopUtility -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kpersonalizer.desktop DesktopUtility -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/ksysguard.desktop System Monitor -%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/ktip.desktop System Utility -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kwrite.desktop TextEditor -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kdeprintfax.desktop PrintingUtility -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kfontview.desktop Graphics Viewer -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/krandrtray.desktop Applet X-KDE-settings-desktop -%suse_update_desktop_file %{?buildroot}%{tde_datadir}/applnk/.hidden/konqfilemgr.desktop System FileManager -%endif - -# Icons from TDE Control Center should only be displayed in TDE -for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do - if grep -q "^Categories=.*X-KDE-settings" "${i}"; then - if ! grep -q "OnlyShowIn=KDE" "${i}" ; then - echo "OnlyShowIn=KDE;" >>"${i}" - fi - fi -done - -# Other apps that should stay in TDE -for i in ksysguard kfontview showdesktop; do - echo "OnlyShowIn=KDE;" >>"%{?buildroot}%{tde_tdeappdir}/${i}.desktop" -done - -# Remove setuid bit on some binaries. -%if 0%{?with_tsak} -chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak" -%endif -chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass" - -# Fix permissions on shell scripts -chmod 0755 "%{?buildroot}%{tde_datadir}/apps/kconf_update/move_session_config.sh" -chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs" - -# Links duplicate files -%fdupes "%{?buildroot}%{tde_datadir}" - - -%clean -%__rm -rf %{?buildroot} - - -%if 0%{?suse_version} -# Check permissions on setuid files (openSUSE specific) -%verifyscript -%if 0%{?with_tsak} -%verify_permissions -e %{tde_bindir}/%{tdm}tsak -%endif -%verify_permissions -e %{tde_bindir}/kcheckpass -%endif - - -%changelog diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index e6a4cb4d6..cf33058c7 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdebase %define tde_prefix /opt/trinity @@ -73,11 +73,6 @@ Source5: pamd.kscreensaver-trinity%{?dist} Source6: suse-displaymanagers-tdm %endif -# Fedora 18: use SYSTEMD for TDM startup -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -Source7: tdm.service%{?dist} -%endif - # openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!! %if 0%{?suse_version} == 1140 Source7: xdm%{?dist} @@ -92,7 +87,7 @@ Source7: xdm%{?dist} %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 %define with_selinux_policy 1 -Source8: tdm%{?dist}.pp +Source8: tdm%{?dist}.te %endif %if 0%{?mgaversion} >= 3 @@ -229,7 +224,39 @@ Requires: fedora-logos # Fedora 28 Theme %if 0%{?fedora} == 28 Requires: f28-backgrounds-base -%define tde_bg /usr/share/backgrounds/f27/default/standard/f28.png +%define tde_bg /usr/share/backgrounds/f28/default/standard/f28.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 29 Theme +%if 0%{?fedora} == 29 +Requires: f29-backgrounds-base +%define tde_bg /usr/share/backgrounds/f29/default/standard/f29.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 30 Theme +%if 0%{?fedora} == 30 +Requires: f30-backgrounds-base +%define tde_bg /usr/share/backgrounds/f30/default/standard/f30.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 31 Theme +%if 0%{?fedora} == 31 +Requires: f31-backgrounds-base +%define tde_bg /usr/share/backgrounds/f31/default/standard/f31.png +Requires: fedora-logos +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png +%endif + +# Fedora 32 Theme +%if 0%{?fedora} == 32 +Requires: f32-backgrounds-base +%define tde_bg /usr/share/backgrounds/f32/default/standard/f32.png Requires: fedora-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png %endif @@ -263,6 +290,13 @@ Requires: redhat-logos %define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png %endif +# RHEL 8 Theme +%if 0%{?rhel} == 8 +Requires: redhat-logos +%define tde_bg /usr/share/backgrounds/c8/default/normalish/c8.png +%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png +%endif + # Mageia 2 Theme %if 0%{?mgaversion} == 2 Requires: mageia-theme-Default @@ -298,6 +332,13 @@ Requires: mageia-theme-Default %define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg %endif +# Mageia 7 Theme +%if 0%{?mgaversion} == 7 +Requires: mageia-theme-Default +%define tde_bg /usr/share/mga/backgrounds/default.jpg +%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg +%endif + # Mandriva 2011 Theme: "rosa" %if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100" Requires: mandriva-theme @@ -381,6 +422,22 @@ Requires: hicolor-icon-theme-branding %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg %endif +# OpenSuse 15.1 Theme +%if "%{?suse_version}" == "1510" +Requires: wallpaper-branding +%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg +Requires: hicolor-icon-theme-branding +%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg +%endif + +# OpenSuse TW Theme +%if "%{?suse_version}" == "1550" +Requires: wallpaper-branding +%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg +Requires: hicolor-icon-theme-branding +%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg +%endif + BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -512,7 +569,7 @@ BuildRequires: OpenEXR-devel # RHEL 5: available in centos-extras # RHEL 6: available in EPEL # RHEL 7: available in NUX -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -715,6 +772,12 @@ BuildRequires: libnsl-devel # ATTR support BuildRequires: libattr-devel +# SELINUX support +%if 0%{?rhel} >= 6 || 0%{?fedora} +BuildRequires: checkpolicy +BuildRequires: selinux-policy-devel +%endif + # tdebase is a metapackage that installs all sub-packages Requires: %{name}-runtime-data-common = %{version}-%{release} Requires: %{name}-data = %{version}-%{release} @@ -956,7 +1019,7 @@ Some random features: %{tde_tdeappdir}/kate.desktop %{tde_datadir}/apps/kate/ %{tde_datadir}/apps/tdeconf_update/kate-2.4.upd -%config(noreplace) %{_sysconfdir}/trinity/katerc +%config(noreplace) %{tde_confdir}/katerc %{tde_datadir}/icons/hicolor/*/apps/kate.png %{tde_datadir}/icons/hicolor/*/apps/kate2.svgz %{tde_datadir}/servicetypes/kateplugin.desktop @@ -1244,6 +1307,7 @@ plugdev group. %{tde_datadir}/applnk/Settings/WebBrowsing/smb.desktop %{tde_datadir}/apps/kcm_componentchooser/kcm_browser.desktop %{tde_datadir}/apps/kcm_componentchooser/kcm_kemail.desktop +%{tde_datadir}/apps/kcm_componentchooser/kcm_filemanager.desktop %{tde_datadir}/apps/kcm_componentchooser/kcm_terminal.desktop %{tde_datadir}/apps/kcmview1394/ %{tde_datadir}/apps/konqsidebartng/virtual_folders/services/fonts.desktop @@ -1357,7 +1421,7 @@ TDE applications, particularly those in the TDE base module. %{tde_bindir}/kreadconfig %{tde_bindir}/kwriteconfig %{tde_bindir}/kstart -%config(noreplace) %{_sysconfdir}/trinity/kxkb_groups +%config(noreplace) %{tde_confdir}/kxkb_groups %{tde_bindir}/drkonqi %{tde_bindir}/crashtest %{tde_bindir}/kapplymousetheme @@ -1497,7 +1561,7 @@ needed for a basic TDE desktop installation. %files data %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/trinity/tdeshorturifilterrc +%config(noreplace) %{tde_confdir}/tdeshorturifilterrc %{tde_datadir}/applnk/.hidden/battery.desktop %{tde_datadir}/applnk/.hidden/bwarning.desktop %{tde_datadir}/applnk/.hidden/cwarning.desktop @@ -1577,6 +1641,7 @@ needed for a basic TDE desktop installation. %{tde_datadir}/icons/crystalsvg/*/apps/penguin.png %{tde_datadir}/icons/crystalsvg/*/categories/preferences-desktop-personal.png %{tde_datadir}/icons/crystalsvg/*/apps/phppg.png +%{tde_datadir}/icons/crystalsvg/*/apps/package_games_logic.png %{tde_datadir}/icons/crystalsvg/*/apps/proxy.png %{tde_datadir}/icons/crystalsvg/*/apps/pysol.png %{tde_datadir}/icons/crystalsvg/*/apps/randr.png @@ -1755,7 +1820,6 @@ needed for a basic TDE desktop installation. # XDG directories information %dir %{_sysconfdir}/xdg/menus/applications-merged %config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/tde-essential.menu -%config(noreplace) %{_sysconfdir}/xdg/menus/tde-information.menu %config(noreplace) %{_sysconfdir}/xdg/menus/tde-screensavers.menu %config(noreplace) %{_sysconfdir}/xdg/menus/tde-settings.menu @@ -1827,6 +1891,8 @@ group. %{tde_tdelibdir}/kcm_cgi.so %{tde_tdelibdir}/kcm_media.la %{tde_tdelibdir}/kcm_media.so +%{tde_tdelibdir}/kcm_trash.la +%{tde_tdelibdir}/kcm_trash.so %{tde_tdelibdir}/kded_homedirnotify.la %{tde_tdelibdir}/kded_homedirnotify.so %{tde_tdelibdir}/kded_mediamanager.la @@ -1884,6 +1950,7 @@ group. %{tde_tdelibdir}/textthumbnail.la %{tde_tdelibdir}/textthumbnail.so %{tde_tdeappdir}/kcmcgi.desktop +%{tde_datadir}/applications/tde/kcmtrash.desktop %{tde_datadir}/apps/tdeio_finger/ %{tde_datadir}/apps/tdeio_info/ %{tde_datadir}/apps/tdeio_man/ @@ -2048,6 +2115,7 @@ Installation of smbclient will make you able to use smb shared printers. %{tde_datadir}/apps/tdeprintfax/ %{tde_datadir}/apps/kjobviewer/ %{tde_datadir}/apps/tdeprint_part/ +%{tde_datadir}/autostart/kjobviewer-autostart.desktop %{tde_datadir}/icons/hicolor/*/apps/tdeprintfax.png %{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png %{tde_datadir}/icons/hicolor/*/apps/printmgr.png @@ -2087,10 +2155,9 @@ the TDE desktop. %files -n trinity-kdesktop %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu1 -%config(noreplace) %{_sysconfdir}/trinity/kdesktop_custom_menu2 +%config(noreplace) %{tde_confdir}/kdesktop_custom_menu1 +%config(noreplace) %{tde_confdir}/kdesktop_custom_menu2 %{tde_bindir}/kcheckrunning -%{tde_bindir}/kxdglauncher %{tde_bindir}/tdeeject %{tde_bindir}/kdesktop %{tde_bindir}/kdesktop_lock @@ -2191,7 +2258,10 @@ already. Most users won't need this. %dir %{tdm_datadir}/sessions %{tdm_datadir}/sessions/*.desktop %{tdm_datadir}/themes/ -%{tde_confdir}/%{tdm} +%config(noreplace) %{tde_confdir}/%{tdm} +%if 0%{?with_selinux_policy} +%exclude %{tde_confdir}/%{tdm}/tdm.pp +%endif %{tde_tdedocdir}/HTML/en/%{tdm}/ %if 0%{?suse_version} == 0 %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity @@ -2217,8 +2287,8 @@ already. Most users won't need this. %if 0%{?suse_version} >= 1210 /usr/lib/X11/displaymanagers/tdm %endif -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -/usr/lib/systemd/system/tdm.service +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 +#/usr/lib/systemd/system/tdm.service %endif %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6 %{_datadir}/xsessions/tde.desktop @@ -2232,7 +2302,7 @@ already. Most users won't need this. # SELINUX policy %if 0%{?with_selinux_policy} -%{?_sysconfdir}/trinity/%{tdm}/tdm.pp +%config %{tde_confdir}/%{tdm}/tdm.pp %endif # Logrotate configuration @@ -2241,22 +2311,22 @@ already. Most users won't need this. %pre -n trinity-tdm # Make sure that TDM configuration files are now under '/etc/trinity/tdm' if [ -d "%{tde_datadir}/config/%{tdm}" ] && [ ! -L "%{tde_datadir}/config/%{tdm}" ]; then - if [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then + if [ -d "%{tde_confdir}/%{tdm}" ]; then # If there is already something under '/etc/trinity/tdm', simply delete old configuration echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'" rm -rf "%{tde_datadir}/config/%{tdm}" else # Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm' - if [ ! -d "%{_sysconfdir}/trinity" ]; then - mkdir -p "%{_sysconfdir}/trinity" + if [ ! -d "%{tde_confdir}" ]; then + mkdir -p "%{tde_confdir}" fi - echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{_sysconfdir}/trinity/%{tdm}'" - mv -f "%{tde_datadir}/config/%{tdm}" "%{_sysconfdir}/trinity/%{tdm}.migr" + echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{tde_confdir}/%{tdm}'" + mv -f "%{tde_datadir}/config/%{tdm}" "%{tde_confdir}/%{tdm}.migr" fi fi # Remove actual directory before creating a symlink -if [ ! -L "%{tdm_datadir}/pics/users" ]; then +if [ ! -L "%{tdm_datadir}/pics/users" ] && [ -d "%{tdm_datadir}/pics/users" ] ; then [ -d "%{_datadir}/faces" ] || mkdir -p "%{_datadir}/faces" cp -f "%{tdm_datadir}/pics/users/"* "%{_datadir}/faces" rm -rf "%{tdm_datadir}/pics/users" @@ -2269,7 +2339,7 @@ fi # SELINUX context for tdm %if 0%{?with_selinux_policy} -/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp" +/usr/sbin/semodule -i "%{tde_confdir}/%{tdm}/tdm.pp" %endif %if 0%{?fedora} == 21 || 0%{?rhel} >= 7 @@ -2288,7 +2358,7 @@ fi # Sets default language for TDM if [ "$1" = "1" ]; then if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then - sed -i "%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|" + sed -i "%{tde_confdir}/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|" fi fi @@ -2304,9 +2374,9 @@ update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanage %posttrans -n trinity-tdm # Make sure that TDM configuration files are now under '/etc/trinity/tdm' -if [ -d "%{_sysconfdir}/trinity/%{tdm}.migr" ] && [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then - mv -f "%{_sysconfdir}/trinity/%{tdm}.migr/"* "%{_sysconfdir}/trinity/%{tdm}/" - rmdir "%{_sysconfdir}/trinity/%{tdm}.migr/" +if [ -d "%{tde_confdir}/%{tdm}.migr" ] && [ -d "%{tde_confdir}/%{tdm}" ]; then + mv -f "%{tde_confdir}/%{tdm}.migr/"* "%{tde_confdir}/%{tdm}/" + rmdir "%{tde_confdir}/%{tdm}.migr/" fi %postun -n trinity-tdm @@ -2549,7 +2619,7 @@ web browser if the clipboard contains a URL. %files -n trinity-klipper %defattr(-,root,root,-) %{tde_bindir}/klipper -%config(noreplace) %{_sysconfdir}/trinity/klipperrc +%config(noreplace) %{tde_confdir}/klipperrc %{tde_tdelibdir}/klipper.la %{tde_tdelibdir}/klipper.so %{tde_tdelibdir}/klipper_panelapplet.la @@ -2628,7 +2698,7 @@ ever launching another application. %files -n trinity-konqueror %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/trinity/konqsidebartng.rc +%config(noreplace) %{tde_confdir}/konqsidebartng.rc %{tde_bindir}/kbookmarkmerger %{tde_bindir}/keditbookmarks %{tde_bindir}/kfmclient @@ -2708,7 +2778,6 @@ ever launching another application. %{tde_datadir}/apps/konqueror/pics/indicator_viewactive.png %{tde_datadir}/apps/konqueror/profiles/ %exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop -%exclude %{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop %{tde_datadir}/apps/konqueror/servicemenus/*.desktop %ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop @@ -2807,6 +2876,7 @@ Using Konsole, a user can open: %files -n trinity-konsole %defattr(-,root,root,-) %{tde_bindir}/konsole +%{tde_bindir}/terminalhere %{tde_tdelibdir}/kcm_konsole.la %{tde_tdelibdir}/kcm_konsole.so %{tde_tdelibdir}/kded_kwrited.la @@ -2822,7 +2892,6 @@ Using Konsole, a user can open: %{tde_datadir}/applnk/.hidden/kcmkonsole.desktop %{tde_datadir}/apps/tdeconf_update/konsole.upd %{tde_datadir}/apps/tdeconf_update/schemaStrip.pl -%{tde_datadir}/apps/konqueror/servicemenus/konsolehere.desktop %{tde_datadir}/apps/konsole/ %{tde_datadir}/icons/hicolor/*/apps/konsole.* %{tde_datadir}/mimelnk/application/x-konsole.desktop @@ -3040,7 +3109,7 @@ to monitor it through the daemon running there. %files -n trinity-ksysguardd %defattr(-,root,root,-) %{tde_bindir}/ksysguardd -%config(noreplace) %{_sysconfdir}/trinity/ksysguarddrc +%config(noreplace) %{tde_confdir}/ksysguarddrc ########## @@ -3179,10 +3248,10 @@ These libraries allow you to use TDE dialogs in native TQt3 applications. %files libtqt3-integration %defattr(-,root,root,-) -%{tde_tdelibdir}/plugins/integration/ -%{tde_tdelibdir}/kded_kdeintegration.la -%{tde_tdelibdir}/kded_kdeintegration.so -%{tde_datadir}/services/kded/kdeintegration.desktop +%{_libdir}/tqt3/plugins/integration/ +%{tde_tdelibdir}/kded_tdeintegration.la +%{tde_tdelibdir}/kded_tdeintegration.so +%{tde_datadir}/services/kded/tdeintegration.desktop ########## @@ -3357,8 +3426,8 @@ fi -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \ -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ - -DCONFIG_INSTALL_DIR="%{_sysconfdir}/trinity" \ - -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \ -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \ \ -DWITH_ALL_OPTIONS=ON \ @@ -3408,6 +3477,9 @@ fi %if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320 -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \ %endif +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 + -DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \ +%endif .. %__make %{?_smp_mflags} || %__make @@ -3470,7 +3542,7 @@ EOF %endif # TDM configuration -%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \ +%__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \ %if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4 -e "s/^#*MinShowUID=.*/MinShowUID=1000/" %else @@ -3499,15 +3571,11 @@ fi %__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g" %endif -# Fedora 18 / RHEL 7: no more SYSV init script, we have to use systemd to launch TDM. -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -%__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service" -%__sed -i "s|kdm|tdm|g" "%{?buildroot}/usr/lib/systemd/system/tdm.service" -%endif - # SELINUX policy for RHEL / Fedora %if 0%{?with_selinux_policy} -%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp" +%__cp -f "%{SOURCE8}" "tdm.te" +%__make -f "%{_datadir}/selinux/devel/Makefile" +%__install -D -m 644 -D "tdm.pp" "%{?buildroot}%{tde_confdir}/%{tdm}/tdm.pp" %endif # Mageia icon for TDE menu diff --git a/redhat/main/tdebase/tdm.el6.pp b/redhat/main/tdebase/tdm.el6.pp Binary files differdeleted file mode 100644 index 1ecd9bcb9..000000000 --- a/redhat/main/tdebase/tdm.el6.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.el6.te b/redhat/main/tdebase/tdm.el6.te index befe10218..60508ae0d 100644 --- a/redhat/main/tdebase/tdm.el6.te +++ b/redhat/main/tdebase/tdm.el6.te @@ -1,5 +1,5 @@ -module tdm.el6 1.0; +module tdm 1.0; require { type fprintd_t; diff --git a/redhat/main/tdebase/tdm.el7.pp b/redhat/main/tdebase/tdm.el7.pp Binary files differdeleted file mode 100644 index 855c3860d..000000000 --- a/redhat/main/tdebase/tdm.el7.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.el7.te b/redhat/main/tdebase/tdm.el7.te index 1c721d90b..519ca0506 100644 --- a/redhat/main/tdebase/tdm.el7.te +++ b/redhat/main/tdebase/tdm.el7.te @@ -1,5 +1,5 @@ -module tdm.el7 1.0; +module tdm 1.0; require { type fprintd_t; diff --git a/redhat/main/tdebase/tdm.el8.te b/redhat/main/tdebase/tdm.el8.te new file mode 100644 index 000000000..519ca0506 --- /dev/null +++ b/redhat/main/tdebase/tdm.el8.te @@ -0,0 +1,11 @@ + +module tdm 1.0; + +require { + type fprintd_t; + type init_t; + class dbus send_msg; +} + +#============= fprintd_t ============== +allow fprintd_t init_t:dbus send_msg; diff --git a/redhat/main/tdebase/tdm.fc17.pp b/redhat/main/tdebase/tdm.fc17.pp Binary files differdeleted file mode 100644 index dec162d22..000000000 --- a/redhat/main/tdebase/tdm.fc17.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.fc17.te b/redhat/main/tdebase/tdm.fc17.te deleted file mode 100644 index 1b19a7116..000000000 --- a/redhat/main/tdebase/tdm.fc17.te +++ /dev/null @@ -1,13 +0,0 @@ - -module tdm.fc17 1.0; - -require { - type fprintd_t; - type initrc_t; - class dbus send_msg; -} - -#============= fprintd_t ============== -#!!!! This avc is allowed in the current policy - -allow fprintd_t initrc_t:dbus send_msg; diff --git a/redhat/main/tdebase/tdm.fc18.pp b/redhat/main/tdebase/tdm.fc18.pp Binary files differdeleted file mode 100644 index 2e79e9554..000000000 --- a/redhat/main/tdebase/tdm.fc18.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.fc18.te b/redhat/main/tdebase/tdm.fc18.te deleted file mode 100644 index b42592f11..000000000 --- a/redhat/main/tdebase/tdm.fc18.te +++ /dev/null @@ -1,11 +0,0 @@ - -module tdm.fc18 1.0; - -require { - type fprintd_t; - type initrc_t; - class dbus send_msg; -} - -#============= fprintd_t ============== -allow fprintd_t initrc_t:dbus send_msg; diff --git a/redhat/main/tdebase/tdm.fc19.pp b/redhat/main/tdebase/tdm.fc19.pp Binary files differdeleted file mode 100644 index dec162d22..000000000 --- a/redhat/main/tdebase/tdm.fc19.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.fc19.te b/redhat/main/tdebase/tdm.fc19.te deleted file mode 100644 index b42592f11..000000000 --- a/redhat/main/tdebase/tdm.fc19.te +++ /dev/null @@ -1,11 +0,0 @@ - -module tdm.fc18 1.0; - -require { - type fprintd_t; - type initrc_t; - class dbus send_msg; -} - -#============= fprintd_t ============== -allow fprintd_t initrc_t:dbus send_msg; diff --git a/redhat/main/tdebase/tdm.fc20.pp b/redhat/main/tdebase/tdm.fc20.pp Binary files differdeleted file mode 100644 index d0c0d4be8..000000000 --- a/redhat/main/tdebase/tdm.fc20.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.fc21.pp b/redhat/main/tdebase/tdm.fc21.pp Binary files differdeleted file mode 100644 index d0c0d4be8..000000000 --- a/redhat/main/tdebase/tdm.fc21.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.fc22.pp b/redhat/main/tdebase/tdm.fc22.pp Binary files differdeleted file mode 100644 index d0c0d4be8..000000000 --- a/redhat/main/tdebase/tdm.fc22.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.fc23.pp b/redhat/main/tdebase/tdm.fc23.pp Binary files differdeleted file mode 100644 index d0c0d4be8..000000000 --- a/redhat/main/tdebase/tdm.fc23.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.fc24.pp b/redhat/main/tdebase/tdm.fc24.pp Binary files differdeleted file mode 100644 index d0c0d4be8..000000000 --- a/redhat/main/tdebase/tdm.fc24.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.fc25.pp b/redhat/main/tdebase/tdm.fc25.pp Binary files differdeleted file mode 100644 index d0c0d4be8..000000000 --- a/redhat/main/tdebase/tdm.fc25.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.fc26.pp b/redhat/main/tdebase/tdm.fc26.pp Binary files differdeleted file mode 100644 index d0c0d4be8..000000000 --- a/redhat/main/tdebase/tdm.fc26.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.fc27.pp b/redhat/main/tdebase/tdm.fc27.pp Binary files differdeleted file mode 100644 index d0c0d4be8..000000000 --- a/redhat/main/tdebase/tdm.fc27.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.fc28.pp b/redhat/main/tdebase/tdm.fc28.pp Binary files differdeleted file mode 100644 index d0c0d4be8..000000000 --- a/redhat/main/tdebase/tdm.fc28.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.fc29.pp b/redhat/main/tdebase/tdm.fc29.pp Binary files differdeleted file mode 100644 index d0c0d4be8..000000000 --- a/redhat/main/tdebase/tdm.fc29.pp +++ /dev/null diff --git a/redhat/main/tdebase/tdm.fc21.te b/redhat/main/tdebase/tdm.fc30.te index 45d8a9a2c..afe6de52a 100644 --- a/redhat/main/tdebase/tdm.fc21.te +++ b/redhat/main/tdebase/tdm.fc30.te @@ -1,5 +1,5 @@ -module tdm.fc20 1.0; +module tdm 1.0; require { type fprintd_t; diff --git a/redhat/main/tdebase/tdm.fc22.te b/redhat/main/tdebase/tdm.fc31.te index 45d8a9a2c..afe6de52a 100644 --- a/redhat/main/tdebase/tdm.fc22.te +++ b/redhat/main/tdebase/tdm.fc31.te @@ -1,5 +1,5 @@ -module tdm.fc20 1.0; +module tdm 1.0; require { type fprintd_t; diff --git a/redhat/main/tdebase/tdm.fc20.te b/redhat/main/tdebase/tdm.fc32.te index 45d8a9a2c..afe6de52a 100644 --- a/redhat/main/tdebase/tdm.fc20.te +++ b/redhat/main/tdebase/tdm.fc32.te @@ -1,5 +1,5 @@ -module tdm.fc20 1.0; +module tdm 1.0; require { type fprintd_t; diff --git a/redhat/main/tdebase/tdm.service.el7 b/redhat/main/tdebase/tdm.service.el7 deleted file mode 100644 index 4c6136d94..000000000 --- a/redhat/main/tdebase/tdm.service.el7 +++ /dev/null @@ -1,12 +0,0 @@ -[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 diff --git a/redhat/main/tdebase/tdm.service.fc18 b/redhat/main/tdebase/tdm.service.fc18 deleted file mode 100644 index 71f2ce038..000000000 --- a/redhat/main/tdebase/tdm.service.fc18 +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=The Trinity login manager -Conflicts=getty@tty1.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service livesys-late.service -Conflicts=plymouth-quit.service - -[Service] -ExecStart=/opt/trinity/bin/kdm -Restart=always -IgnoreSIGPIPE=no - -[Install] -Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc19 b/redhat/main/tdebase/tdm.service.fc19 deleted file mode 100644 index eb35da9e5..000000000 --- a/redhat/main/tdebase/tdm.service.fc19 +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=The Trinity login manager -Conflicts=getty@tty1.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service -Conflicts=plymouth-quit.service - -[Service] -ExecStart=/opt/trinity/bin/kdm -Restart=always -IgnoreSIGPIPE=no - -[Install] -Alias=display-manager.service diff --git a/redhat/main/tdebase/tdm.service.fc20 b/redhat/main/tdebase/tdm.service.fc20 deleted file mode 100644 index 4c6136d94..000000000 --- a/redhat/main/tdebase/tdm.service.fc20 +++ /dev/null @@ -1,12 +0,0 @@ -[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 diff --git a/redhat/main/tdebase/tdm.service.fc21 b/redhat/main/tdebase/tdm.service.fc21 deleted file mode 100644 index 4c6136d94..000000000 --- a/redhat/main/tdebase/tdm.service.fc21 +++ /dev/null @@ -1,12 +0,0 @@ -[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 diff --git a/redhat/main/tdebase/tdm.service.fc22 b/redhat/main/tdebase/tdm.service.fc22 deleted file mode 100644 index 4c6136d94..000000000 --- a/redhat/main/tdebase/tdm.service.fc22 +++ /dev/null @@ -1,12 +0,0 @@ -[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 diff --git a/redhat/main/tdebase/tdm.service.fc23 b/redhat/main/tdebase/tdm.service.fc23 deleted file mode 100644 index 4c6136d94..000000000 --- a/redhat/main/tdebase/tdm.service.fc23 +++ /dev/null @@ -1,12 +0,0 @@ -[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 diff --git a/redhat/main/tdebase/tdm.service.fc24 b/redhat/main/tdebase/tdm.service.fc24 deleted file mode 100644 index 4c6136d94..000000000 --- a/redhat/main/tdebase/tdm.service.fc24 +++ /dev/null @@ -1,12 +0,0 @@ -[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 diff --git a/redhat/main/tdebase/tdm.service.fc25 b/redhat/main/tdebase/tdm.service.fc25 deleted file mode 100644 index 4c6136d94..000000000 --- a/redhat/main/tdebase/tdm.service.fc25 +++ /dev/null @@ -1,12 +0,0 @@ -[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 diff --git a/redhat/main/tdebase/tdm.service.fc26 b/redhat/main/tdebase/tdm.service.fc26 deleted file mode 100644 index 4c6136d94..000000000 --- a/redhat/main/tdebase/tdm.service.fc26 +++ /dev/null @@ -1,12 +0,0 @@ -[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 diff --git a/redhat/main/tdebase/tdm.service.fc27 b/redhat/main/tdebase/tdm.service.fc27 deleted file mode 100644 index 4c6136d94..000000000 --- a/redhat/main/tdebase/tdm.service.fc27 +++ /dev/null @@ -1,12 +0,0 @@ -[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 diff --git a/redhat/main/tdebase/tdm.service.fc28 b/redhat/main/tdebase/tdm.service.fc28 deleted file mode 100644 index 4c6136d94..000000000 --- a/redhat/main/tdebase/tdm.service.fc28 +++ /dev/null @@ -1,12 +0,0 @@ -[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 diff --git a/redhat/main/tdebase/tdm.service.fc29 b/redhat/main/tdebase/tdm.service.fc29 deleted file mode 100644 index 4c6136d94..000000000 --- a/redhat/main/tdebase/tdm.service.fc29 +++ /dev/null @@ -1,12 +0,0 @@ -[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 diff --git a/redhat/main/tdebindings/filter-requires.sh b/redhat/main/tdebindings/filter-requires.sh new file mode 100644 index 000000000..da6c04566 --- /dev/null +++ b/redhat/main/tdebindings/filter-requires.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ -x /usr/lib/rpm/redhat/find-requires ] ; then +FINDREQ=/usr/lib/rpm/redhat/find-requires +else +FINDREQ=/usr/lib/rpm/find-requires +fi + +$FINDREQ $* | sed -e '/libcairo.so.2/d' -e '/libpangocairo-1.0.so.0/d' diff --git a/redhat/main/tdebindings/tdebindings-3.5.13.2.spec b/redhat/main/tdebindings/tdebindings-3.5.13.2.spec deleted file mode 100644 index 1b0e5cd2f..000000000 --- a/redhat/main/tdebindings/tdebindings-3.5.13.2.spec +++ /dev/null @@ -1,1195 +0,0 @@ -# -# spec file for package tdebindings (version 3.5.13-SRU) -# -# 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/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg tdebindings -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -# Special note for RHEL4: -# You must create symlink 'libgcj.so' manually because it does not exist by default. -# E.g: -# ln -s /usr/lib/libgcj.so.5.0.0 /usr/lib/jvm/java/lib/libgcj.so -# or 64 bits: -# ln -s /usr/lib64/libgcj.so.5.0.0 /usr/lib/jvm/java/lib/libgcj.so - -Name: trinity-%{tde_pkg} -Summary: TDE bindings to non-C++ languages -Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:0_%{preversion}}%{?dist} -Group: System/GUI/Other -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}-%{version}%{?preversion:~%{preversion}}.tar.gz - -%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch} - -BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} - -BuildRequires: autoconf automake libtool m4 -BuildRequires: gcc-c++ -BuildRequires: desktop-file-utils - -# 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 - -# ZLIB support -BuildRequires: zlib-devel - -# PERL module support -BuildRequires: perl(ExtUtils::MakeMaker) - -# GTK2 support -%if 0%{?rhel} == 4 -BuildRequires: evolution28-gtk2-devel -Requires: evolution28-gtk2 -BuildRequires: evolution28-glib2-devel -Requires: evolution28-glib2 -BuildRequires: evolution28-cairo-devel -Requires: evolution28-cairo -BuildRequires: evolution28-pango-devel -Requires: evolution28-pango -BuildRequires: evolution28-atk-devel -Requires: evolution28-atk -%else -BuildRequires: gtk2-devel -%endif - -# XULRUNNER support -%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 -#BuildRequires: xulrunner-devel -%endif -%if 0%{?suse_version} == 1140 -BuildRequires: mozilla-xulrunner20-devel -%endif - -# OPENSSL support -BuildRequires: openssl-devel - -# GTK1 support -%if 0%{?fedora} -%define with_gtk1 1 -BuildRequires: glib-devel -BuildRequires: gtk+-devel -%endif -%if 0%{?rhel} == 5 -%define with_gtk1 1 -BuildRequires: glib-devel -BuildRequires: gtk+-devel -%endif -%if 0%{?mdkversion} == 201100 -%define with_gtk1 1 -BuildRequires: %{_lib}glib1.2-devel -BuildRequires: %{_lib}gtk+-devel -%endif - -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: libgdk_pixbuf2.0-devel -%else -BuildRequires: %{_lib}gdk_pixbuf2.0-devel -%endif -%endif -%if 0%{?fedora} -%if 0%{?fedora} >= 17 -BuildRequires: gdk-pixbuf2-devel -%else -BuildRequires: gdk-pixbuf-devel -%endif -%endif - -# MESA support -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -%endif -%if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: mesaglu-devel -%endif -%if 0%{?suse_version} -BuildRequires: Mesa-libGL-devel -BuildRequires: Mesa-libGLU-devel -%endif - - -## Python -BuildRequires: python-devel -%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") - -## ruby -BuildRequires: ruby-devel >= 1.8 -BuildRequires: ruby >= 1.8 -%if 0%{?fedora} >= 19 -BuildRequires: rubypick -%endif -%if "%{?ruby_libarchdir}" != "" -%define ruby_arch %{?ruby_libarchdir} -%else -%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')} -%endif - -%if "%{?ruby_libdir}" != "" -%define ruby_rubylibdir %{?ruby_libdir} -%else -%{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')} -%endif - -# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file) -%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') - -## java -%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 -BuildRequires: java-1.4.2-gcj-compat-devel -BuildRequires: libgcj-devel -BuildRequires: gcc-java -%endif - -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} - -# PCLinuxOS use SUN's Java -%if 0%{?pclinuxos} -BuildRequires: java-1.6.0-sun -BuildRequires: java-1.6.0-sun-devel -%else - -# Others use OpenJDK -BuildRequires: java-openjdk -BuildRequires: java-devel >= 1.4.2 -%if 0%{?fedora} >= 17 || 0%{?suse_version} >= 1220 || 0%{?mgaversion} >= 3 || 0%{?rhel} >= 7 -BuildRequires: java-1.7.0-openjdk-devel -%else -BuildRequires: java-1.6.0-openjdk-devel -%endif - -%endif -%endif - -%if 0%{?suse_version} -%define java_home %{_usr}/%{_lib}/jvm/java -%else -%if 0%{?rhel} == 4 -%define java_home %{_usr}/lib/jvm/java-1.4.2-gcj-1.4.2.0 -%else -%define java_home %{_usr}/lib/jvm/java -%endif -%endif -%define _with_java --with-java=%{java_home} - -## Perl -# There is no 'perl-devel' package on RHEL5 -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: perl-devel -%endif -%define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)} - - -Obsoletes: trinity-kdebindings < %{version}-%{release} -Provides: trinity-kdebindings = %{version}-%{release} - -# Metapackage requires -Requires: trinity-tdebindings-java = %{version}-%{release} -Requires: trinity-libsmokeqt1 = %{version}-%{release} -Requires: trinity-libsmoketde = %{version}-%{release} -Requires: trinity-perl-dcop = %{version}-%{release} -Requires: trinity-python-dcop = %{version}-%{release} -Requires: trinity-libkjsembed1 = %{version}-%{release} -Requires: trinity-kjscmd = %{version}-%{release} -Requires: trinity-juic = %{version}-%{release} -Requires: trinity-libkorundum0-ruby = %{version}-%{release} -Requires: trinity-libqt0-ruby = %{version}-%{release} - - -%description -TDE/DCOP bindings to non-C++ languages - -%files -%defattr(-,root,root,-) - -########## - -%package java -Summary: TDE Java bindings metapackage [Trinity] -Group: System/Libraries -Requires: trinity-libdcop3-java = %{version}-%{release} -Requires: trinity-libdcop3-jni = %{version}-%{release} -Requires: trinity-libqt3-java = %{version}-%{release} -Requires: trinity-libqt3-jni = %{version}-%{release} -Requires: trinity-libtrinity-java = %{version}-%{release} -Requires: trinity-libtrinity-jni = %{version}-%{release} - -%description java -A metapackage depending on all TDE, Qt and DCOP bindings libraries -related to the Java language. - -This package is part of the official TDE bindings module. - -%files java -%defattr(-,root,root,-) - -########## - -%package -n trinity-libdcop3-java -Summary: DCOP bindings for Java [Trinity] -Group: System/Libraries - -Requires: trinity-libdcop3-jni = %{version}-%{release} - -%description -n trinity-libdcop3-java -This package contains the Java classes necessary to run Java programs -using the Java DCOP bindings. DCOP is the TDE Desktop COmmunications -Protocol, used for communicating with running TDE applications. - -This package is part of the official TDE bindings module. - -%files -n trinity-libdcop3-java -%defattr(-,root,root,-) -%{tde_libdir}/java/org/ - -########## - -%package -n trinity-libdcop3-java-devel -Summary: DCOP bindings for Java (dcopidl2java program) [Trinity] -Group: Development/Languages/Java -Requires: trinity-libdcop3-java = %{version}-%{release} - -%description -n trinity-libdcop3-java-devel -This package contains the dcopidl2java program which generates Java -stubs from DCOP IDL files, necessary to do development with the DCOP Java -bindings. DCOP is the TDE Desktop COmmunications Protocol, used for -communicating with running TDE applications. - -This package is part of the official TDE bindings module. - -%files -n trinity-libdcop3-java-devel -%defattr(-,root,root,-) -%{tde_bindir}/dcopidl2java - -########## - -%package -n trinity-libdcop3-jni -Summary: DCOP bindings for Java ( Native libraries ) [Trinity] -Group: System/Libraries - -%description -n trinity-libdcop3-jni -This package contains the shared libraries and scripts necessary to -run programs using the Java DCOP bindings. DCOP is the TDE Desktop -COmmunications Protocol, used for communicating with running TDE -applications. - -This package is part of the official TDE bindings module. - -%files -n trinity-libdcop3-jni -%defattr(-,root,root,-) -%{tde_libdir}/libjavadcop.la -%{tde_libdir}/libjavadcop.so - -%post -n trinity-libdcop3-jni -/sbin/ldconfig || : - -%postun -n trinity-libdcop3-jni -/sbin/ldconfig || : - -########## - -%package -n trinity-libqt3-java -Summary: Java bindings for Qt [Trinity] -Group: System/Libraries -Requires: trinity-libdcop3-jni = %{version}-%{release} -Requires: trinity-libqt3-jni = %{version}-%{release} -Requires: trinity-juic = %{version}-%{release} - -%description -n trinity-libqt3-java -This package contains the Java classes necessary to run Java programs -using the Java Qt bindings. Qt is a very popular GUI toolkit, used by -the TDE desktop environment. - -It also includes many example programs that make use of these bindings, -plus many of the Qt Tutorial examples translated into Java. - -This package is part of the official TDE bindings module. - -%files -n trinity-libqt3-java -%defattr(-,root,root,-) -%{tde_libdir}/java/qtjava*.jar -%{tde_tdedocdir}/HTML/en/javalib/ - -########## - -%package -n trinity-libqt3-jni -Summary: Java bindings for Qt ( Native libraries ) [Trinity] -Group: System/Libraries - -%description -n trinity-libqt3-jni -This package contains the shared libraries necessary to run Java -programs using the Java Qt bindings. Qt is a very popular GUI -toolkit, used by the TDE desktop environment. - -This package is part of the official TDE bindings module. - -%files -n trinity-libqt3-jni -%defattr(-,root,root,-) -%{tde_libdir}/libqtjavasupport.la -%{tde_libdir}/libqtjavasupport.so.* -%{tde_libdir}/jni/libqtjava.la -%{tde_libdir}/jni/libqtjava.so.* -%doc qtjava/ChangeLog - -%post -n trinity-libqt3-jni -/sbin/ldconfig || : - -%postun -n trinity-libqt3-jni -/sbin/ldconfig || : - -########## - -%package -n trinity-libqt3-jni-devel -Summary: Development files fo Java bindings for Qt ( Native libraries ) [Trinity] -Group: Development/Languages/Java -Requires: trinity-libqt3-jni = %{version}-%{release} - -%description -n trinity-libqt3-jni-devel -This package contains the development files for trinity-libqt3-jni. - -This package is part of the official TDE bindings module. - -%files -n trinity-libqt3-jni-devel -%defattr(-,root,root,-) -%{tde_libdir}/libqtjavasupport.so -%{tde_libdir}/jni/libqtjava.so - -########## - -%package -n trinity-libtrinity-java -Summary: Tdelibs bindings for Java [Trinity] -Group: System/Libraries - -Requires: trinity-libtrinity-jni = %{version}-%{release} - -%description -n trinity-libtrinity-java -This package contains the Java classes necessary to run Java programs -using the Java tdelibs bindings. TDE is the Trinity Desktop Environment, a -very popular UNIX Desktop Environment. - -It also includes some example applications that use these Java -classes, and multiple usage samples of the most common TDE classes. - -This package is part of the official TDE bindings module. - -%files -n trinity-libtrinity-java -%defattr(-,root,root,-) -%{tde_libdir}/java/koala*.jar - -########## - -%package -n trinity-libtrinity-jni -Summary: Tdelibs bindings for java ( Native libraries ) [Trinity] -Group: System/Libraries - -%description -n trinity-libtrinity-jni -This package contains the shared libraries necessary to run Java -programs using the Java tdelibs bindings. TDE is the Trinity Desktop -Environment, a very popular UNIX Desktop Environment. - -This package is part of the official TDE bindings module. - -%files -n trinity-libtrinity-jni -%defattr(-,root,root,-) -%{tde_libdir}/jni/libkdejava.la -%{tde_libdir}/jni/libkdejava.so.* -%doc kdejava/ChangeLog - -########## - -%package -n trinity-libtrinity-jni-devel -Summary: Development files for tdelibs bindings for java ( Native libraries ) [Trinity] -Group: Development/Languages/Java -Requires: trinity-libtrinity-jni = %{version}-%{release} - -%description -n trinity-libtrinity-jni-devel -This package contains the development files for trinity-libtrinity-jni. - -This package is part of the official TDE bindings module. - -%files -n trinity-libtrinity-jni-devel -%defattr(-,root,root,-) -%{tde_libdir}/jni/libkdejava.so - -########## - -%package -n trinity-libsmokeqt1 -Summary: SMOKE Binding Library to Qt -Group: System/Libraries - -%description -n trinity-libsmokeqt1 -The "Scripting Meta Object Kompiler Engine" library is used by -various TDE language bindings packages to provide interfaces to the -Qt library. - -This package is part of the official TDE bindings module. - -%files -n trinity-libsmokeqt1 -%defattr(-,root,root,-) -%{tde_libdir}/libsmokeqt.so.* - -%post -n trinity-libsmokeqt1 -/sbin/ldconfig || : - -%postun -n trinity-libsmokeqt1 -/sbin/ldconfig || : - -########## - -%package -n trinity-libsmokeqt-devel -Summary: SMOKE Binding Library to Qt - Development Files -Group: Development/Languages/Other -Requires: trinity-libsmokeqt1 = %{version}-%{release} - -%description -n trinity-libsmokeqt-devel -The "Scripting Meta Object Kompiler Engine" library is used by -various TDE language bindings packages to provide interfaces to the -Qt library. This package contains the development files for the -library. - -If you are a normal user, you probably don't need this -package. - -This package is part of the official TDE bindings module. - -%files -n trinity-libsmokeqt-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/smoke.h -%{tde_libdir}/libsmokeqt.so -%{tde_libdir}/libsmokeqt.la - -%post -n trinity-libsmokeqt-devel -/sbin/ldconfig || : - -%postun -n trinity-libsmokeqt-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-libsmoketde -Summary: SMOKE Binding Library to TDE -Group: System/Libraries - -Obsoletes: trinity-libsmokekde1 < %{version}-%{release} -Provides: trinity-libsmokekde1 = %{version}-%{release} - -%description -n trinity-libsmoketde -The "Scripting Meta Object Kompiler Engine" library is used by -various TDE language bindings packages to provide interfaces to the -TDE libraries. - -This package is part of the official TDE bindings module. - -%files -n trinity-libsmoketde -%defattr(-,root,root,-) -%{tde_libdir}/libsmokekde.so.* - -%post -n trinity-libsmoketde -/sbin/ldconfig || : - -%postun -n trinity-libsmoketde -/sbin/ldconfig || : - -########## - -%package -n trinity-libsmoketde-devel -Summary: SMOKE Binding Library to TDE - Development Files -Group: Development/Languages/Other -Requires: trinity-libsmoketde = %{version}-%{release} - -Obsoletes: trinity-libsmokekde-devel < %{version}-%{release} -Provides: trinity-libsmokekde-devel = %{version}-%{release} - -%description -n trinity-libsmoketde-devel -The "Scripting Meta Object Kompiler Engine" library is used by -various TDE language bindings packages to provide interfaces to the -Qt and TDE libraries. This package contains the development files for -the library. - -If you are a normal user, you probably don't need this -package. - -This package is part of the official TDE bindings module. - -%files -n trinity-libsmoketde-devel -%defattr(-,root,root,-) -%{tde_libdir}/libsmokekde.so -%{tde_libdir}/libsmokekde.la - -%post -n trinity-libsmoketde-devel -/sbin/ldconfig || : - -%postun -n trinity-libsmoketde-devel -/sbin/ldconfig || : - -########## - -%package -n perl-dcop -Summary: DCOP Bindings for Perl -Group: System/Libraries -%if 0%{?suse_version} -Requires: perl-base -%else -Requires: perl -%endif - -Obsoletes: trinity-kdebindings-dcopperl < %{version}-%{release} -Provides: trinity-kdebindings-dcopperl = %{version}-%{release} - -Obsoletes: trinity-perl-dcop < %{version}-%{release} -Provides: trinity-perl-dcop = %{version}-%{release} - -%description -n perl-dcop -Perl bindings to the DCOP interprocess communication protocol used by TDE - -%files -n perl-dcop -%defattr(-,root,root,-) -%{perl_vendorarch}/auto/DCOP/ -%{perl_vendorarch}/DCOP.pm -%{perl_vendorarch}/DCOP/ -%doc dcopperl/AUTHORS dcopperl/Changes dcopperl/README dcopperl/TODO -%{tde_mandir}/man3/DCOP.3pm* - -########## - -%package -n python-dcop -Summary: DCOP bindings for Python -Group: System/Libraries -Requires: python - -Obsoletes: trinity-python-dcop < %{version}-%{release} -Provides: trinity-python-dcop = %{version}-%{release} - -%description -n python-dcop -This package contains the shared libraries necessary to run and -develop Python programs using the Python DCOP bindings -libraries. DCOP is the TDE Desktop COmmunications Protocol, used for -communicating with running TDE applications. - -This package is part of the official TDE bindings module. - -%files -n python-dcop -%defattr(-,root,root,-) -%{python_sitearch}/pcop.la -%{python_sitearch}/pcop.so -%{python_sitearch}/pydcop.py* - -########## - -%package -n trinity-libkjsembed1 -Summary: Embedded JavaScript library -Group: System/Libraries - -%description -n trinity-libkjsembed1 -This package contains the shared libraries necessary to run programs -linked with the KJSEmbed library. This library provides JavaScript -embedded scripting facilities to TDE applications. - -This package is part of the official TDE bindings module. - -%files -n trinity-libkjsembed1 -%defattr(-,root,root,-) -%{tde_libdir}/libkjsembed.so.* -%{tde_tdelibdir}/libimagefxplugin.la -%{tde_tdelibdir}/libimagefxplugin.so -%{tde_datadir}/services/imagefx_plugin.desktop -%{tde_tdelibdir}/libqprocessplugin.so -%{tde_tdelibdir}/libqprocessplugin.la -%{tde_datadir}/services/qprocess_plugin.desktop -%{tde_tdelibdir}/libfileitemplugin.la -%{tde_tdelibdir}/libfileitemplugin.so -%{tde_datadir}/services/kfileitem_plugin.desktop -%{tde_datadir}/apps/kjsembed/ -%{tde_datadir}/servicetypes/binding_type.desktop -%{tde_bindir}/embedjs -%{tde_datadir}/apps/embedjs/ -%{tde_tdeappdir}/embedjs.desktop -%{tde_datadir}/icons/hicolor/16x16/apps/embedjs.png -%{tde_datadir}/icons/hicolor/32x32/apps/embedjs.png -%{tde_tdelibdir}/libjavascript.la -%{tde_tdelibdir}/libjavascript.so -%dir %{tde_datadir}/apps/kate -%dir %{tde_datadir}/apps/kate/scripts -%{tde_datadir}/apps/kate/scripts/swaptabs.js -%{tde_datadir}/apps/kate/scripts/swaptabs.ui -%{tde_datadir}/apps/kate/scripts/swaptabs.desktop -%{tde_datadir}/services/javascript.desktop -%doc kjsembed/docs/ChangeLog - -%post -n trinity-libkjsembed1 -/sbin/ldconfig ||: -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database >& /dev/null ||: - -%postun -n trinity-libkjsembed1 -/sbin/ldconfig ||: -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database >& /dev/null ||: - -########## - -%package -n trinity-libkjsembed-devel -Summary: Embedded JavaScript library (Development files) -Group: Development/Libraries/Other -Requires: trinity-libkjsembed1 = %{version}-%{release} - -%description -n trinity-libkjsembed-devel -This package contains the header files and symbolic links necessary -to develop and compile programs using the KJSEmbed library. This -library provides JavaScript embedded scripting facilities to TDE -applications. - -It also includes lots of example programs that make use of these -bindings, plus comprehensive documentation of the bindings. - -This package is part of the official TDE bindings module. - -%files -n trinity-libkjsembed-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kjsembed/ -%{tde_libdir}/libkjsembed.so -%{tde_libdir}/libkjsembed.la -%{tde_docdir}/trinity-libkjsembed-devel/ - -%post -n trinity-libkjsembed-devel -/sbin/ldconfig || : - -%postun -n trinity-libkjsembed-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-kjscmd -Summary: A script interpreter using the TDE JavaScript library -Group: System/Libraries - -%description -n trinity-kjscmd -This package contains the kjscmd program, which is a standalone -JavaScript interpreter using the KJSEmbed library. - -This package is part of the official TDE bindings module. - -%files -n trinity-kjscmd -%defattr(-,root,root,-) -%{tde_bindir}/kjscmd -%{tde_tdeappdir}/kjscmd.desktop -%{tde_mandir}/man1/kjscmd.* -%{tde_tdelibdir}/libjsconsoleplugin.la -%{tde_tdelibdir}/libjsconsoleplugin.so - -%post -n trinity-kjscmd -update-desktop-database >& /dev/null ||: - -%postun -n trinity-kjscmd -update-desktop-database >& /dev/null ||: - -########## - -%package -n trinity-juic -Summary: The Qt Java UI Compiler -Group: Development/Languages/Java -Requires: trinity-libqt3-java = %{version}-%{release} - -%description -n trinity-juic -This package contains the juic program, which is used to convert -a UI description file generated by the Qt Designer, and converts -it into a Qt Java class. It is necessary for compiling and -developing programs using the Qt Java bindings together with Qt -Designer. - -This package is part of the official TDE bindings module. - -%files -n trinity-juic -%defattr(-,root,root,-) -%{tde_bindir}/juic -%{tde_datadir}/juic/ - -########## - -%package -n trinity-libkorundum0-ruby -Summary: TDE bindings for Ruby [Trinity] -Group: System/Libraries -Requires: trinity-libqt0-ruby = %{version}-%{release} - -%description -n trinity-libkorundum0-ruby -This package contains the files necessary for running and developing -Ruby code using the Korundum TDE Ruby bindings. - -It also includes some example programs and templates that make use of -these bindings. - -This package is part of the official TDE bindings module. - -%files -n trinity-libkorundum0-ruby -%defattr(-,root,root,-) -%{tde_bindir}/rbkdesh -%{tde_bindir}/rbkdeapi -%{tde_bindir}/krubyinit -%{tde_bindir}/rbkconfig_compiler -%{ruby_rubylibdir}/Korundum.rb -%dir %{ruby_rubylibdir}/KDE -%{ruby_rubylibdir}/KDE/korundum.rb -%{ruby_arch}/korundum.la -%{ruby_arch}/korundum.so* -%doc korundum/ChangeLog - -%post -n trinity-libkorundum0-ruby -/sbin/ldconfig || : - -%postun -n trinity-libkorundum0-ruby -/sbin/ldconfig || : - -########## - -%package -n trinity-libqt0-ruby -Summary: Qt bindings for Ruby [Trinity] -Group: System/Libraries -Requires: ruby - -%description -n trinity-libqt0-ruby -This package contains the files necessary for running and developing -Ruby code using the Qt Ruby bindings. - -It also includes some example programs that make use of these bindings, -plus many of the Qt Tutorial examples translated into Ruby. - -This package is part of the official TDE bindings module. - -%files -n trinity-libqt0-ruby -%defattr(-,root,root,-) -%{tde_bindir}/rbqtsh -%{tde_bindir}/rbqtapi -%{tde_bindir}/rbuic -%{tde_bindir}/qtrubyinit -%dir %{ruby_rubylibdir}/Qt -%{ruby_rubylibdir}/Qt/qtruby.rb -%{ruby_rubylibdir}/Qt.rb -%{ruby_arch}/qtruby.so* -%{ruby_arch}/qtruby.la -%{ruby_arch}/qui.so* -%{ruby_arch}/qui.la -%doc qtruby/ChangeLog - -%post -n trinity-libqt0-ruby -/sbin/ldconfig || : - -%postun -n trinity-libqt0-ruby -/sbin/ldconfig || : - -########## - -%if 0 -%package -n trinity-kmozilla -Summary: Kmozilla for TDE -Group: System/Libraries - -%description -n trinity-kmozilla -This package contains the kmozilla library fro TDE. - -%files -n trinity-kmozilla -%defattr(-,root,root,-) -%{tde_bindir}/kmozilla -%{tde_libdir}/libkmozillapart.so.* -%{tde_libdir}/libkmozillapart.so -%{tde_libdir}/libkmozillapart.la -%{tde_datadir}/services/kmozilla.desktop -%endif - -########## - -%package -n trinity-xpart-notepad -Summary: A small XPart editor -Group: Productivity/Scientific/Math - -%description -n trinity-xpart-notepad -xpart_notepad is a small XPart editor. Use it to understand how to use XPart. - -%files -n trinity-xpart-notepad -%defattr(-,root,root,-) -%{tde_bindir}/shell_xparthost -%{tde_bindir}/xp_notepad -%{tde_libdir}/libxp_notepadpart.la -%{tde_libdir}/libxp_notepadpart.so -%{tde_libdir}/libxp_notepadpart.so.* -%{tde_datadir}/services/xp_notepad.desktop -%doc xparts/xpart_notepad/README - -%post -n trinity-xpart-notepad -/sbin/ldconfig || : - -%postun -n trinity-xpart-notepad -/sbin/ldconfig || : - -########## - -%if 0%{?with_gtk1} -%package -n trinity-libgtkxparts1 -Summary: Xparts library for GTK -Group: Development/Languages/Other - -%description -n trinity-libgtkxparts1 -This package contains the xparts library for GTK. - -%files -n trinity-libgtkxparts1 -%defattr(-,root,root,-) -%{tde_libdir}/libgtkxparts.so.* -%{tde_libdir}/libgtkxparts.la - -%post -n trinity-libgtkxparts1 -/sbin/ldconfig || : - -%postun -n trinity-libgtkxparts1 -/sbin/ldconfig || : -%endif - -########## - -%package -n trinity-libtdexparts -Summary: Xparts library for TDE -Group: Development/Languages/Other - -Obsoletes: trinity-libkdexparts1 < %{version}-%{release} -Provides: trinity-libkdexparts1 = %{version}-%{release} - -%description -n trinity-libtdexparts -This package contains the xparts library for TDE. - -%files -n trinity-libtdexparts -%defattr(-,root,root,-) -%{tde_libdir}/libkdexparts.so.* -%{tde_libdir}/libkdexparts.la - -%post -n trinity-libtdexparts -/sbin/ldconfig || : - -%postun -n trinity-libtdexparts -/sbin/ldconfig || : - -########## - -%package -n trinity-libxparts-devel -Summary: Xparts development files -Group: Development/Languages/Other -%if 0%{?with_gtk1} -Requires: trinity-libgtkxparts1 = %{version}-%{release} -%endif -Requires: trinity-libtdexparts = %{version}-%{release} - -%description -n trinity-libxparts-devel -This package contains the development files for Xparts library. - -%files -n trinity-libxparts-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/xkparts/ -%if 0%{?with_gtk1} -%{tde_libdir}/libgtkxparts.so -%endif -%{tde_libdir}/libkdexparts.so - -%post -n trinity-libxparts-devel -/sbin/ldconfig || : - -%postun -n trinity-libxparts-devel -/sbin/ldconfig || : - -########## - -%package xparts-extras -Summary: Extra xparts for TDE [Trinity] -Group: Development/Languages/Other - -# Metapckage requires -Requires: trinity-xpart-notepad = %{version}-%{release} -%if 0%{?with_gtk1} -Requires: trinity-libgtkxparts1 = %{version}-%{release} -%endif -Requires: trinity-libtdexparts = %{version}-%{release} -Requires: trinity-libdcop-c = %{version}-%{release} - -%description xparts-extras -This package contains extra xparts-based modules for Trinity -This includes the mozilla-konqueror plugin - -This package is part of the official TDE bindings module. - -%files xparts-extras -%defattr(-,root,root,-) - -########### - -%package -n trinity-libdcop-c -Summary: DCOP bindings for C [Trinity] -Group: System/Libraries - -%description -n trinity-libdcop-c -This package contains the DCOP bindings for C. - -%files -n trinity-libdcop-c -%defattr(-,root,root,-) -%{tde_libdir}/libdcopc.so.* - -%post -n trinity-libdcop-c -/sbin/ldconfig || : - -%postun -n trinity-libdcop-c -/sbin/ldconfig || : - -########### - -%package -n trinity-libdcop-c-devel -Summary: DCOP bindings for C, development files [Trinity] -Group: Development/Languages/C and C++ -Requires: trinity-libdcop-c = %{version}-%{release} - -%description -n trinity-libdcop-c-devel -This package contains the development files for DCOP bindings for C. - -%files -n trinity-libdcop-c-devel -%defattr(-,root,root,-) -%{tde_libdir}/libdcopc.so -%{tde_libdir}/libdcopc.la -%{tde_tdeincludedir}/dcopc/ - -%post -n trinity-libdcop-c-devel -/sbin/ldconfig || : - -%postun -n trinity-libdcop-c-devel -/sbin/ldconfig || : - -########## - -%package devel -Summary: Development files for %{name} -Group: Development/Languages/Other - -Requires: trinity-tdelibs-devel >= %{tde_version} -Requires: %{name} = %{version}-%{release} - -Obsoletes: trinity-kdebindings-devel < %{version}-%{release} -Provides: trinity-kdebindings-devel = %{version}-%{release} - -# Metapackage -Requires: trinity-libsmokeqt-devel = %{version}-%{release} -Requires: trinity-libdcop3-java-devel = %{version}-%{release} -Requires: trinity-libsmoketde-devel = %{version}-%{release} -Requires: trinity-libkjsembed-devel = %{version}-%{release} -Requires: trinity-libxparts-devel = %{version}-%{release} -Requires: trinity-libdcop-c-devel = %{version}-%{release} -Requires: trinity-libqt3-jni-devel = %{version}-%{release} -Requires: trinity-libtrinity-jni-devel = %{version}-%{release} - -%description devel -This package contains the development files for the TDE bindings. - -%files devel -%defattr(-,root,root,-) - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%{?tde_patch:%patch1 -p1} - -%if "%{?perl_vendorarch}" == "" -exit 1 -%endif - -# [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL4/5 -%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 -%__sed -i "qtruby/rubylib/qtruby/Qt.cpp" -e "s|rb_frame_this_func|rb_frame_last_func|g" -%endif - -# Disable kmozilla, it does not build with recent xulrunner (missing 'libmozjs.so') -%__sed -i "xparts/Makefile.am" \ - -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|" - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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 -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -unset JAVA_HOME ||: -%{?java_home:JAVA_HOME=%{java_home}; export JAVA_HOME} - -# sip/PyQt/PyKDE built separately, not here -export DO_NOT_COMPILE="$DO_NOT_COMPILE python" - -# Ruby headers, strange location ... -if [ -d "/usr/include/%{_normalized_cpu}-linux" ]; then - export EXTRA_INCLUDES="/usr/include/%{_normalized_cpu}-linux" -fi - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi -if [ -d /usr/evolution28 ]; then - export PATH="/usr/evolution28/bin:${PATH}" - export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" -fi - -# Warning: openSUSE 13.1: /usr/include/ruby-2.0.0/ruby.h -%if 0%{?suse_version} >= 1310 -EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}" -%endif - -# Do NOT remove "%{_includedir}/tqt" from extra-includes !!! -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --docdir=%{tde_docdir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-extra-includes=%{_includedir}/tqt:${EXTRA_INCLUDES} \ - --with-extra-libs=%{tde_libdir} \ - --with-pythondir=%{_usr} \ - \ - %{?_with_java} %{!?_with_java:--without-java} \ - %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} - -# Build dcopperl with specific options -pushd dcopperl -CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor - -# [Bug #348] Ugly hack to modify the man pages directory -sed -i Makefile \ - -e "s|/usr/share/man|%{tde_mandir}|g" - -%__make OPTIMIZE="$RPM_OPT_FLAGS" ||: -popd - -# smoke (not smp-safe) -%__make -C smoke - -# The rest is smp-safe -%__make %{?_smp_mflags} PYTHON=%{__python} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf $RPM_BUILD_ROOT - -%__make install DESTDIR=%{?buildroot} \ - PYTHON=%{__python} - -# Removes some perl files -find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ - -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' - -# Installs juic -%__install -D -m 755 qtjava/designer/juic/bin/juic %{?buildroot}%{tde_bindir}/juic -%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common -%__install -m 644 qtjava/designer/juic/common/*.xml %{?buildroot}%{tde_datadir}/juic/common -%__install -m 644 qtjava/designer/juic/common/*.xsl %{?buildroot}%{tde_datadir}/juic/common -%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/java -%__install -m 644 qtjava/designer/juic/java/*.xml %{?buildroot}%{tde_datadir}/juic/java -%__install -m 644 qtjava/designer/juic/java/*.xsl %{?buildroot}%{tde_datadir}/juic/java -%__install -m 644 qtjava/designer/juic/juic.xsl %{?buildroot}%{tde_datadir}/juic - -# kjsembed sample files -%__install -d -m 755 %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ -%__install -m 644 kjsembed/plugins/customobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ -%__install -m 644 kjsembed/plugins/customobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ -%__install -m 644 kjsembed/plugins/customobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ -%__install -m 644 kjsembed/plugins/customqobject_plugin.cpp %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ -%__install -m 644 kjsembed/plugins/customqobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ -%__install -m 644 kjsembed/plugins/customqobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ - -# Man installation location is wrong on RHEL4... -if [ -d "%{buildroot}%{_mandir}/man3" ]; then - mv -f %{buildroot}%{_mandir}/man3 %{buildroot}%{tde_mandir}/man3/ - rm -rf %{buildroot}%{_mandir} -fi - -# Move 'embedjs.desktop' to correct location -%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/embedjs.desktop" "%{?buildroot}%{tde_tdeappdir}/embedjs.desktop" -%__rm -rf "%{?buildroot}%{tde_datadir}/applnk" - -# Updates applications categories for openSUSE -%if 0%{?suse_version} -%suse_update_desktop_file -u kjscmd Development -%suse_update_desktop_file -u embedjs Development -%endif - - -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%changelog diff --git a/redhat/main/tdebindings/tdebindings-14.0.0.spec b/redhat/main/tdebindings/tdebindings.spec index a70c39b3d..56fa574eb 100644 --- a/redhat/main/tdebindings/tdebindings-14.0.0.spec +++ b/redhat/main/tdebindings/tdebindings.spec @@ -27,7 +27,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdebindings %define tde_prefix /opt/trinity @@ -122,7 +122,7 @@ BuildRequires: mozilla-xulrunner20-devel BuildRequires: openssl-devel # GTK1 support -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if 0%{?fedora} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7) %define with_gtk1 1 BuildRequires: glib-devel BuildRequires: gtk+-devel @@ -168,10 +168,17 @@ BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel %endif - -## Python -BuildRequires: python-devel -%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 +%global python python2 +%global __python %__python2 +%global python_sitearch %{python2_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel ## ruby BuildRequires: ruby-devel >= 1.8 @@ -234,10 +241,10 @@ BuildRequires: java-devel >= 1.4.2 %if 0%{?suse_version} >= 1320 BuildRequires: java-1_8_0-openjdk-devel %endif -%if 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5 +%if 0%{?fedora} >= 21 || 0%{?mgaversion} >= 5 || 0%{?rhel} >= 8 BuildRequires: java-1.8.0-openjdk-devel %endif -%if 0%{?fedora} == 17 || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?fedora} == 20 || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} == 3 || 0%{?mgaversion} == 4 || 0%{?rhel} >= 7 +%if 0%{?fedora} == 17 || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?fedora} == 20 || 0%{?suse_version} == 1230 || 0%{?suse_version} == 1310 || 0%{?mgaversion} == 3 || 0%{?mgaversion} == 4 || 0%{?rhel} == 7 BuildRequires: java-1.7.0-openjdk-devel %endif %if 0%{?rhel} == 5 || 0%{?rhel} == 6 @@ -256,7 +263,9 @@ BuildRequires: java-1.6.0-openjdk-devel %define java_home %{_usr}/lib/jvm/java %endif %endif +%if 0%{?pclinuxos} == 0 %define _with_java --with-java=%{java_home} +%endif ## Perl # There is no 'perl-devel' package on RHEL5 @@ -273,14 +282,18 @@ Obsoletes: trinity-kdebindings < %{version}-%{release} Provides: trinity-kdebindings = %{version}-%{release} # Metapackage requires +%if "%{?_with_java}" != "" Requires: trinity-tdebindings-java = %{version}-%{release} +%endif Requires: trinity-libsmoketqt = %{version}-%{release} Requires: trinity-libsmoketde = %{version}-%{release} Requires: perl-dcop = %{version}-%{release} Requires: python-dcop = %{version}-%{release} Requires: trinity-libkjsembed1 = %{version}-%{release} Requires: trinity-kjscmd = %{version}-%{release} +%if "%{?_with_java}" != "" Requires: trinity-juic = %{version}-%{release} +%endif Requires: trinity-libkorundum0-ruby = %{version}-%{release} Requires: trinity-libqt0-ruby = %{version}-%{release} @@ -314,6 +327,7 @@ This package is part of the official TDE bindings module. ########## +%if "%{?_with_java}" != "" %package -n trinity-libdcop3-java Summary: DCOP bindings for Java [Trinity] Group: System/Libraries @@ -330,9 +344,11 @@ This package is part of the official TDE bindings module. %files -n trinity-libdcop3-java %defattr(-,root,root,-) %{tde_libdir}/java/org/ +%endif ########## +%if "%{?_with_java}" != "" %package -n trinity-libdcop3-java-devel Summary: DCOP bindings for Java (dcopidl2java program) [Trinity] Group: Development/Languages/Java @@ -349,9 +365,11 @@ This package is part of the official TDE bindings module. %files -n trinity-libdcop3-java-devel %defattr(-,root,root,-) %{tde_bindir}/dcopidl2java +%endif ########## +%if "%{?_with_java}" != "" %package -n trinity-libdcop3-jni Summary: DCOP bindings for Java ( Native libraries ) [Trinity] Group: System/Libraries @@ -368,9 +386,11 @@ This package is part of the official TDE bindings module. %defattr(-,root,root,-) %{tde_libdir}/libjavadcop.la %{tde_libdir}/libjavadcop.so +%endif ########## +%if "%{?_with_java}" != "" %package -n trinity-libqt3-java Summary: Java bindings for Qt [Trinity] Group: System/Libraries @@ -392,9 +412,11 @@ This package is part of the official TDE bindings module. %defattr(-,root,root,-) %{tde_libdir}/java/qtjava*.jar %{tde_tdedocdir}/HTML/en/javalib/ +%endif ########## +%if "%{?_with_java}" != "" %package -n trinity-libtqt3-jni Summary: Java bindings for TQt ( Native libraries ) [Trinity] Group: System/Libraries @@ -416,9 +438,11 @@ This package is part of the official TDE bindings module. %{tde_libdir}/jni/lib*qtjava.la %{tde_libdir}/jni/lib*qtjava.so.* %doc qtjava/ChangeLog +%endif ########## +%if "%{?_with_java}" != "" %package -n trinity-libtqt3-jni-devel Summary: Development files fo Java bindings for TQt ( Native libraries ) [Trinity] Group: Development/Languages/Java @@ -436,9 +460,11 @@ This package is part of the official TDE bindings module. %defattr(-,root,root,-) %{tde_libdir}/lib*qtjavasupport.so %{tde_libdir}/jni/lib*qtjava.so +%endif ########## +%if "%{?_with_java}" != "" %package -n trinity-libtrinity-java Summary: Tdelibs bindings for Java [Trinity] Group: System/Libraries @@ -458,9 +484,11 @@ This package is part of the official TDE bindings module. %files -n trinity-libtrinity-java %defattr(-,root,root,-) %{tde_libdir}/java/koala*.jar +%endif ########## +%if "%{?_with_java}" != "" %package -n trinity-libtrinity-jni Summary: Tdelibs bindings for java ( Native libraries ) [Trinity] Group: System/Libraries @@ -477,9 +505,11 @@ This package is part of the official TDE bindings module. %{tde_libdir}/jni/libtdejava.la %{tde_libdir}/jni/libtdejava.so.* %doc tdejava/ChangeLog +%endif ########## +%if "%{?_with_java}" != "" %package -n trinity-libtrinity-jni-devel Summary: Development files for tdelibs bindings for java ( Native libraries ) [Trinity] Group: Development/Languages/Java @@ -493,6 +523,7 @@ This package is part of the official TDE bindings module. %files -n trinity-libtrinity-jni-devel %defattr(-,root,root,-) %{tde_libdir}/jni/libtdejava.so +%endif ########## @@ -620,7 +651,7 @@ Perl bindings to the DCOP interprocess communication protocol used by TDE %package -n python-dcop Summary: DCOP bindings for Python Group: System/Libraries -Requires: python +Requires: %{python} Obsoletes: trinity-python-dcop < %{version}-%{release} Provides: trinity-python-dcop = %{version}-%{release} @@ -711,6 +742,7 @@ This package is part of the official TDE bindings module. %package -n trinity-kjscmd Summary: A script interpreter using the TDE JavaScript library Group: System/Libraries +Provides: %{tde_bindir}/kjscmd %description -n trinity-kjscmd This package contains the kjscmd program, which is a standalone @@ -728,6 +760,7 @@ This package is part of the official TDE bindings module. ########## +%if "%{?_with_java}" != "" %package -n trinity-juic Summary: The Qt Java UI Compiler Group: Development/Languages/Java @@ -746,6 +779,7 @@ This package is part of the official TDE bindings module. %defattr(-,root,root,-) %{tde_bindir}/juic %{tde_datadir}/juic/ +%endif ########## @@ -966,13 +1000,17 @@ Provides: trinity-kdebindings-devel = %{version}-%{release} # Metapackage Requires: trinity-libsmoketqt-devel = %{version}-%{release} +%if "%{?_with_java}" != "" Requires: trinity-libdcop3-java-devel = %{version}-%{release} +%endif Requires: trinity-libsmoketde-devel = %{version}-%{release} Requires: trinity-libkjsembed-devel = %{version}-%{release} Requires: trinity-libxparts-devel = %{version}-%{release} Requires: trinity-libdcop-c-devel = %{version}-%{release} +%if "%{?_with_java}" != "" Requires: trinity-libtqt3-jni-devel = %{version}-%{release} Requires: trinity-libtrinity-jni-devel = %{version}-%{release} +%endif %description devel This package contains the development files for the TDE bindings. @@ -1022,7 +1060,7 @@ exit 3 -e "s|SUBDIRS = .*|SUBDIRS = src xpart_notepad|" # Fix Fedora >= 28 automatic invalid dependency to '/usr/bin/kjscmd' -%if 0%{?fedora} >= 28 +%if 0%{?fedora} >= 28 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8 %__sed -i "kjsembed/tdescript/swaptabs.js" \ -i "kjsembed/stdlib/cmdline.js" \ -e "s|/usr/bin/env kjscmd|%{tde_bindir}/kjscmd|" @@ -1094,11 +1132,7 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_targe # Build dcopperl with specific options pushd dcopperl -CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor - -# [Bug #348] Ugly hack to modify the man pages directory -sed -i "Makefile" -e "s|/usr/share/man|%{tde_mandir}|g" - +CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=%{tde_mandir}/man3 %__make OPTIMIZE="$RPM_OPT_FLAGS" ||: popd @@ -1120,6 +1154,7 @@ export PATH="%{tde_bindir}:${PATH}" find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' +%if "%{?_with_java}" != "" # Installs juic %__install -D -m 755 qtjava/designer/juic/bin/juic %{?buildroot}%{tde_bindir}/juic %__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common @@ -1129,6 +1164,7 @@ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ %__install -m 644 qtjava/designer/juic/java/*.xml %{?buildroot}%{tde_datadir}/juic/java %__install -m 644 qtjava/designer/juic/java/*.xsl %{?buildroot}%{tde_datadir}/juic/java %__install -m 644 qtjava/designer/juic/juic.xsl %{?buildroot}%{tde_datadir}/juic +%endif # kjsembed sample files %__install -d -m 755 %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ @@ -1139,12 +1175,6 @@ find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \ %__install -m 644 kjsembed/plugins/customqobject_plugin.h %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ %__install -m 644 kjsembed/plugins/customqobject_plugin.desktop %{?buildroot}%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/ -# Man installation location is wrong on RHEL4... -if [ -d "%{buildroot}%{_mandir}/man3" ]; then - mv -f %{buildroot}%{_mandir}/man3 %{buildroot}%{tde_mandir}/man3/ - rm -rf %{buildroot}%{_mandir} -fi - # Move 'embedjs.desktop' to correct location %__mv -f "%{?buildroot}%{tde_datadir}/applnk/Utilities/embedjs.desktop" "%{?buildroot}%{tde_tdeappdir}/embedjs.desktop" %__rm -rf "%{?buildroot}%{tde_datadir}/applnk" diff --git a/redhat/main/tdeedu/tdeedu-3.5.13.2.spec b/redhat/main/tdeedu/tdeedu-3.5.13.2.spec deleted file mode 100644 index 336316c10..000000000 --- a/redhat/main/tdeedu/tdeedu-3.5.13.2.spec +++ /dev/null @@ -1,1367 +0,0 @@ -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -Name: trinity-tdeedu -Summary: Educational/Edutainment applications -Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} - -License: GPLv2 -Group: Amusements/Games - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: autoconf automake libtool m4 -BuildRequires: desktop-file-utils -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: python-devel python -BuildRequires: boost-devel -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 -BuildRequires: ocaml(compiler) -%else -BuildRequires: ocaml -%endif - -Obsoletes: trinity-kdeedu < %{version}-%{release} -Provides: trinity-kdeedu = %{version}-%{release} -Obsoletes: trinity-kdeedu-libs < %{version}-%{release} -Provides: trinity-kdeedu-libs = %{version}-%{release} - -# Meta-package -Requires: %{name}-data = %{version}-%{release} -Requires: trinity-blinken = %{version}-%{release} -Requires: trinity-kalzium = %{version}-%{release} -Requires: trinity-kalzium-data = %{version}-%{release} -Requires: trinity-kanagram = %{version}-%{release} -Requires: trinity-kbruch = %{version}-%{release} -Requires: trinity-keduca = %{version}-%{release} -Requires: trinity-kgeography = %{version}-%{release} -Requires: trinity-kgeography-data = %{version}-%{release} -Requires: trinity-khangman = %{version}-%{release} -Requires: trinity-kig = %{version}-%{release} -Requires: trinity-kiten = %{version}-%{release} -Requires: trinity-klatin = %{version}-%{release} -Requires: trinity-klettres = %{version}-%{release} -Requires: trinity-klettres-data = %{version}-%{release} -Requires: trinity-kmplot = %{version}-%{release} -Requires: trinity-kpercentage = %{version}-%{release} -Requires: trinity-kstars = %{version}-%{release} -Requires: trinity-kstars-data = %{version}-%{release} -Requires: trinity-ktouch = %{version}-%{release} -Requires: trinity-kturtle = %{version}-%{release} -Requires: trinity-kverbos = %{version}-%{release} -Requires: trinity-kvoctrain = %{version}-%{release} -Requires: trinity-kwordquiz = %{version}-%{release} -Requires: trinity-libtdeedu3 = %{version}-%{release} -Requires: trinity-libkiten1 = %{version}-%{release} -Requires: trinity-indi = %{version}-%{release} - - -%description -Educational/Edutainment applications, including: -* blinken: Simon Says Game -* kalzium: Periodic Table of Elements -* kanagram: Letter Order Game -* kbruch: Exercise Fractions -* keduca: Tests and Exams -* kgeography: Geography Trainer -* khangman: Hangman Game -* kig: Interactive Geometry -* kiten: Japanese Reference/Study Tool -* klatin: Latin Reviser -* klettres: French alphabet tutor -* kmplot: Mathematical Function Plotter -* kpercentage: Excersie Percentages -* kstars: Desktop Planetarium -* ktouch: Touch Typing Tutor -* kturtle: Logo Programming Environment -* kverbos: Study Spanish Verbforms -* kvoctrain: Vocabulary Trainer -* kwordquiz: Vocabulary Trainer - -%files -%defattr(-,root,root,-) -%doc COPYING README - -########## - -%package data -Summary: shared data for Trinity educational applications -Group: Amusements/Games - -%description data -This package contains shared data necessary for running the -educational applications provided with KDE (the K Desktop -Environment). - -This package is part of Trinity, as a component of the TDE education module. - -%files data -%defattr(-,root,root,-) -%{tde_datadir}/applnk/Edutainment/Languages/.directory -%{tde_datadir}/applnk/Edutainment/Miscellaneous/.directory -%{tde_datadir}/applnk/Edutainment/Mathematics/.directory -%{tde_datadir}/applnk/Edutainment/Science/.directory -%{tde_datadir}/applnk/Edutainment/Tools/.directory - -########## - -%package -n trinity-blinken -Summary: Trinity version of the Simon Says electronic memory game -Group: Amusements/Games -#Requires: sj-delphine-fonts -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-blinken -Blinken is based on an electronic game released in 1978, which -challenges players to remember sequences of increasing length. On -the face of the device, there are 4 different color buttons, each -with its own distinctive sound. These buttons light up randomly, -creating the sequence that the player must then recall. If the -player is successful in remembering the sequence of lights in the -correct order, they advance to the next stage, where an identical -sequence with one extra step is presented. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-blinken -%defattr(-,root,root,-) -%{tde_bindir}/blinken -%{tde_tdeappdir}/blinken.desktop -%{tde_datadir}/apps/blinken/ -%{tde_datadir}/config.kcfg/blinken.kcfg -%{tde_datadir}/icons/hicolor/*/apps/blinken.png -%{tde_datadir}/icons/hicolor/scalable/apps/blinken.svgz -%{tde_tdedocdir}/HTML/en/blinken/ - -%post -n trinity-blinken -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-blinken -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kalzium -Summary: chemistry teaching tool for Trinity -Group: Amusements/Games -Requires: trinity-kalzium-data = %{version}-%{release} -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-kalzium -Kalzium is a program which shows you the Periodic System of Elements -(PSE). You can use Kalzium to search for information about the -elements or to learn facts about the PSE. - -Kalzium provides you with all kinds of information about the PSE. -You can look up lots of information about the elements and also use -visualisations to show them. - -You can visualise the Periodic Table of the Elements by blocks, -groups, acidic behavior or different states of matter. You can also -plot data for a range of elements (weight, mean weight, density, IE1, -IE2, electronegativity), and you can go back in time to see what -elements were known at a given date. In addition, on platforms where -OCaml supports native code generation, Kalzium includes a chemical -equation solver. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kalzium -%defattr(-,root,root,-) -%{tde_bindir}/kalzium -%{tde_tdeappdir}/kalzium.desktop -%{tde_datadir}/config.kcfg/kalzium.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kalzium.png -%{tde_datadir}/icons/hicolor/scalable/apps/kalzium.svgz -%{tde_tdedocdir}/HTML/en/kalzium/ - -%post -n trinity-kalzium -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kalzium -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kalzium-data -Summary: data files for Kalzium -Group: Amusements/Games - -%description -n trinity-kalzium-data -This package contains architecture-independent data files for -Kalzium, the KDE periodic table application. This includes pictures -of various chemical equipment and of samples of several elements, in -addition to the actual chemical data. - -See the kalzium package for further information. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kalzium-data -%defattr(-,root,root,-) -%{tde_datadir}/apps/kalzium/ - -########## - -%package -n trinity-kanagram -Summary: letter order game for Trinity -Group: Amusements/Games -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-kanagram -KAnagram is a game that is based on the word/letter puzzles that the -author played as a child. A word is picked at random and displayed -with its letters in a messed order, with difficulty dependent on the -chosen level. You have an unlimited number of attempts, and scores -are kept. - -It is a very simply constructed game, with 3 difficulty levels of -play. It is fully customizable, allowing you to write in your own -words and set your own 'look and feel' of the game. It is aimed for -children aged 10+ because of the difficulty, but of course everyone -is welcome to try. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kanagram -%defattr(-,root,root,-) -%{tde_bindir}/kanagram -%{tde_tdeappdir}/kanagram.desktop -%{tde_datadir}/apps/kanagram/ -%{tde_datadir}/config.kcfg/kanagram.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kanagram.png -%{tde_datadir}/icons/hicolor/scalable/apps/kanagram.svgz -%{tde_tdedocdir}/HTML/en/kanagram/ - -%post -n trinity-kanagram -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kanagram -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kbruch -Summary: fraction calculation teaching tool for Trinity -Group: Amusements/Games -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-kbruch -KBruch is a small program to practice calculating with fractions. -Different exercises are provided for this purpose. The program -checks the user's input and gives feedback. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kbruch -%defattr(-,root,root,-) -%{tde_bindir}/kbruch -%{tde_datadir}/apps/kbruch/kbruchui.rc -%{tde_tdeappdir}/kbruch.desktop -%{tde_datadir}/config.kcfg/kbruch.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kbruch.png -%{tde_datadir}/icons/hicolor/scalable/apps/kbruch.svgz -%{tde_datadir}/icons/crystalsvg/*/actions/kbruch_*.png -%{tde_tdedocdir}/HTML/en/kbruch/ - -%post -n trinity-kbruch -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kbruch -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-keduca -Summary: interactive form-based tests for Trinity -Group: Amusements/Games -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-keduca -KEduca is a flash-card application which allows you to make -interactive form-based tests. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-keduca -%defattr(-,root,root,-) -%{tde_bindir}/keduca -%{tde_bindir}/keducabuilder -%{tde_tdelibdir}/libkeducapart.la -%{tde_tdelibdir}/libkeducapart.so -%{tde_tdeappdir}/keduca.desktop -%{tde_tdeappdir}/keducabuilder.desktop -%{tde_datadir}/apps/keduca/ -%{tde_datadir}/config.kcfg/keduca.kcfg -%{tde_datadir}/icons/hicolor/*/apps/keduca.png -%{tde_datadir}/mimelnk/application/x-edu.desktop -%{tde_datadir}/mimelnk/application/x-edugallery.desktop -%{tde_datadir}/services/keduca_part.desktop -%{tde_tdedocdir}/HTML/en/keduca/ - -%post -n trinity-keduca -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-keduca -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kgeography -Summary: Geography learning tool for Trinity -Group: Amusements/Games -Requires: trinity-kgeography-data = %{version}-%{release} -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-kgeography -KGeography contains maps allowing you to learn various countries or -the political divisions of several countries. It has several modes, -including a map browser and games involving the names, capitals, or -flags of the map divisions. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kgeography -%defattr(-,root,root,-) -%{tde_bindir}/kgeography -%{tde_tdeappdir}/kgeography.desktop -%{tde_datadir}/config.kcfg/kgeography.kcfg -%{tde_datadir}/icons/crystalsvg/*/apps/kgeography.png -%{tde_datadir}/icons/crystalsvg/scalable/apps/kgeography.svgz -%{tde_datadir}/icons/hicolor/*/apps/kgeography.png -%{tde_tdedocdir}/HTML/en/kgeography - -%post -n trinity-kgeography -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kgeography -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kgeography-data -Summary: data files for KGeography -Group: Amusements/Games - -%description -n trinity-kgeography-data -This package contains architecture-independent data files for -KGeography, the geography learning tool for KDE. This includes map -and flag images. - -See the kgeography package for further information. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kgeography-data -%defattr(-,root,root,-) -%{tde_datadir}/apps/kgeography/ - -########## - -%package -n trinity-khangman -Summary: the classical hangman game for Trinity -Group: Amusements/Games -#Requires: dustin-dustismo-sans-fonts -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-khangman -KHangMan is a game based on the well known hangman game. It is aimed -for children aged 6 and above. It has four levels of difficulty: -Animals (animals words), Easy, Medium and Hard. - -A word is picked at random and the letters are hidden. You must -guess the word by trying one letter after another. Each time you -guess a wrong letter, a picture of a hangman is drawn. You must -guess the word before getting hanged! You have 10 tries. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-khangman -%defattr(-,root,root,-) -%{tde_datadir}/config/khangmanrc -%{tde_bindir}/khangman -%{tde_tdeappdir}/khangman.desktop -%{tde_datadir}/apps/khangman/ -%{tde_datadir}/config.kcfg/khangman.kcfg -%{tde_datadir}/icons/hicolor/*/apps/khangman.png -%{tde_datadir}/icons/hicolor/scalable/apps/khangman.svgz -%{tde_tdedocdir}/HTML/en/khangman/ - -%post -n trinity-khangman -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-khangman -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kig -Summary: interactive geometry program for KDE -Group: Amusements/Games -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-kig -Kig is an application for interactive geometry. It is intended to -serve two purposes: - -- to allow students to interactively explore mathematical figures and - concepts using the computer; -- to serve as a WYSIWYG tool for drawing mathematical figures and - including them in other documents. - -With this program you can do geometry on a computer just like you -would on a blackboard in a classroom. However, the program allows -you to move and change parts of a geometrical drawing so that you can -see how the other parts change as a result. - -Kig supports loci and user-defined macros. It also supports imports -and exports to/from foreign file formats including Cabri, Dr. Geo, -KGeo, KSeg and XFig. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kig -%defattr(-,root,root,-) -%{tde_datadir}/config/magic/cabri.magic -%{tde_datadir}/config/magic/drgeo.magic -%{tde_bindir}/kig -%{tde_bindir}/pykig.py* -%{tde_tdelibdir}/kfile_drgeo.la -%{tde_tdelibdir}/kfile_drgeo.so -%{tde_tdelibdir}/kfile_kig.la -%{tde_tdelibdir}/kfile_kig.so -%{tde_tdelibdir}/libkigpart.la -%{tde_tdelibdir}/libkigpart.so -%{tde_tdeappdir}/kig.desktop -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%{tde_datadir}/apps/katepart/syntax/python-kig.xml -%endif -%{tde_datadir}/apps/kig/ -%{tde_datadir}/icons/crystalsvg/*/mimetypes/kig_doc.png -%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/kig_doc.svgz -%{tde_datadir}/icons/hicolor/*/apps/kig.png -%{tde_datadir}/icons/hicolor/scalable/apps/kig.svgz -%{tde_datadir}/mimelnk/application/x-cabri.desktop -%{tde_datadir}/mimelnk/application/x-drgeo.desktop -%{tde_datadir}/mimelnk/application/x-kig.desktop -%{tde_datadir}/mimelnk/application/x-kgeo.desktop -%{tde_datadir}/mimelnk/application/x-kseg.desktop -%{tde_datadir}/services/kfile_drgeo.desktop -%{tde_datadir}/services/kfile_kig.desktop -%{tde_datadir}/services/kig_part.desktop -%{tde_tdedocdir}/HTML/en/kig/ - -%post -n trinity-kig -for i in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kig -for i in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kiten -Summary: Japanese reference/study tool for Trinity -Group: Amusements/Games -Requires: trinity-tdeedu-data = %{version}-%{release} -#Requires: ttf-kochi-gothic | ttf-kochi-mincho - -%description -n trinity-kiten -Kiten is a Japanese reference and study tool for KDE. It is an -application with multiple functions. Firstly, it is a convenient -English to Japanese and Japanese to English dictionary. Secondly, it -is a Kanji dictionary, with multiple ways to look up specific -characters. Thirdly, it is a tool to help you learn Kanji. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kiten -%defattr(-,root,root,-) -%{tde_bindir}/kiten -%{tde_bindir}/kitengen -%{tde_tdeappdir}/kiten.desktop -%{tde_tdedocdir}/HTML/en/kiten/ -%{tde_datadir}/icons/hicolor/*/apps/kiten.png -%{tde_datadir}/icons/hicolor/scalable/apps/kiten.svgz - -%post -n trinity-kiten -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kiten -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-klatin -Summary: application to help revise/teach Latin -Group: Amusements/Games -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-klatin -KLatin is a program to help revise Latin. There are three "sections" -in which different aspects of the language can be revised. These are -the vocabulary, grammar and verb testing sections. In addition there -is a set of revision notes that can be used for self-guided revision. - -In the vocabulary section an XML file is loaded containing various -words and their local language translations. KLatin asks you what -each of these words translate into. The questions take place in a -multiple-choice environment. - -In the grammar and verb sections KLatin asks for a particular part of -a noun or a verb, such as the "ablative singular", or the "1st person -indicative passive plural", and is not multiple choice. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-klatin -%defattr(-,root,root,-) -%{tde_bindir}/klatin -%{tde_tdeappdir}/klatin.desktop -%{tde_datadir}/apps/klatin/ -%{tde_datadir}/config.kcfg/klatin.kcfg -%{tde_datadir}/icons/hicolor/*/apps/klatin.png -%{tde_datadir}/icons/hicolor/scalable/apps/klatin.svgz -%{tde_tdedocdir}/HTML/en/klatin/ - -%post -n trinity-klatin -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-klatin -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-klettres -Summary: foreign alphabet tutor for Trinity -Group: Amusements/Games -Requires: trinity-klettres-data = %{version}-%{release} -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-klettres -KLettres is an application specially designed to help the user to -learn the alphabet in a new language and then to learn to read simple -syllables. The user can be a young child aged from two and a half or -an adult that wants to learn the basics of a foreign language. - -Seven languages are currently available: Czech, Danish, Dutch, -English, French, Italian and Slovak. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-klettres -%defattr(-,root,root,-) -%{tde_datadir}/config/klettresrc -%{tde_bindir}/klettres -%{tde_tdeappdir}/klettres.desktop -%{tde_datadir}/config.kcfg/klettres.kcfg -%{tde_datadir}/icons/hicolor/*/apps/klettres.png -%{tde_datadir}/icons/hicolor/scalable/apps/klettres.svgz -%{tde_tdedocdir}/HTML/en/klettres/ - -%post -n trinity-klettres -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-klettres -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-klettres-data -Summary: data files for KLettres foreign alphabet tutor -Group: Amusements/Games - -%description -n trinity-klettres-data -This package contains architecture-independent data files for -KLettres, the foreign alphabet tutor for KDE. This includes sound -files and graphics. - -See the klettres package for further information. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-klettres-data -%defattr(-,root,root,-) -%{tde_datadir}/apps/klettres/ - -########## - -%package -n trinity-kmplot -Summary: mathematical function plotter for Trinity -Group: Amusements/Games -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-kmplot -KmPlot is a mathematical function plotter for KDE. It has a powerful -built-in parser. You can plot different functions simultaneously and -combine them to build new functions. - -KmPlot supports parametric functions and functions in polar -coordinates. Several grid modes are supported. Plots may be printed -with high precision in the correct scale. - -KmPlot also provides some numerical and visual features, like filling -and calculating the area between the plot and the first axis, finding -maximum and minimum values, changing function parameters dynamically -and plotting derivatives and integral functions. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kmplot -%defattr(-,root,root,-) -%{tde_bindir}/kmplot -%{tde_tdelibdir}/libkmplotpart.la -%{tde_tdelibdir}/libkmplotpart.so -%{tde_tdeappdir}/kmplot.desktop -%{tde_datadir}/apps/kmplot/ -%{tde_datadir}/config.kcfg/kmplot.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kmplot.png -%{tde_datadir}/icons/hicolor/scalable/apps/kmplot.svgz -%{tde_datadir}/mimelnk/application/x-kmplot.desktop -%{tde_datadir}/services/kmplot_part.desktop -%{tde_tdedocdir}/HTML/en/kmplot/ - -%post -n trinity-kmplot -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kmplot -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kpercentage -Summary: percentage calculation teaching tool for Trinity -Group: Amusements/Games -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-kpercentage -KPercentage is a small math application that will help pupils to -improve their skills in calculating percentages. - -There is a special training section for the three basic tasks. -Finally the pupil can select a random mode, in which all three tasks -are mixed randomly. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kpercentage -%defattr(-,root,root,-) -%{tde_bindir}/kpercentage -%{tde_tdeappdir}/kpercentage.desktop -%{tde_datadir}/apps/kpercentage/ -%{tde_datadir}/icons/hicolor/*/apps/kpercentage.png -%{tde_datadir}/icons/hicolor/scalable/apps/kpercentage.svgz -%{tde_tdedocdir}/HTML/en/kpercentage/ - -%post -n trinity-kpercentage -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kpercentage -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kstars -Summary: desktop planetarium for Trinity -Group: Amusements/Games -Requires: trinity-tdeedu-data = %{version}-%{release} -Requires: trinity-kstars-data = %{version}-%{release} -Requires: trinity-indi = %{version}-%{release} - -%description -n trinity-kstars -KStars is a graphical desktop planetarium for KDE. It depicts an -accurate simulation of the night sky, including stars, -constellations, star clusters, nebulae, galaxies, all planets, the -Sun, the Moon, comets and asteroids. You can see the sky as it -appears from any location on Earth, on any date. - -The user interface is highly intuitive and flexible. The display can -be panned and zoomed with the mouse, and you can easily identify -objects and track their motion across the sky. KStars includes many -powerful features, yet the interface is clean and simple and fun to -use. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kstars -%defattr(-,root,root,-) -%{tde_datadir}/config/kstarsrc -%{tde_bindir}/kstars -%{tde_tdeappdir}/kstars.desktop -%{tde_datadir}/config.kcfg/kstars.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kstars.png -%{tde_datadir}/icons/hicolor/scalable/apps/kstars.svgz -%{tde_tdedocdir}/HTML/en/kstars/ - -%post -n trinity-kstars -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kstars -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kstars-data -Summary: data files for KStars desktop planetarium -Group: Amusements/Games - -%description -n trinity-kstars-data -This package contains architecture-independent data files for KStars, -the graphical desktop planetarium for KDE. This includes star -catalogues and astronomical images. - -See the kstars package for further information. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kstars-data -%defattr(-,root,root,-) -%{tde_datadir}/apps/kstars/ - -########## - -%package -n trinity-ktouch -Summary: touch typing tutor for Trinity -Group: Amusements/Games -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-ktouch -KTouch is a program for learning touch typing - it helps you learn to -type on a keyboard quickly and correctly. Every finger has its place -on the keyboard with associated keys to press. - -KTouch helps you learn to touch type by providing you with text to -train on, and adjusts to different levels depending on how good you -are. It can display which key to press next, and the correct finger -to use. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-ktouch -%defattr(-,root,root,-) -%{tde_bindir}/ktouch -%{tde_tdeappdir}/ktouch.desktop -%{tde_datadir}/apps/ktouch/ -%{tde_datadir}/config.kcfg/ktouch.kcfg -%{tde_datadir}/icons/hicolor/*/apps/ktouch.png -%{tde_datadir}/icons/hicolor/scalable/apps/ktouch.svgz -%{tde_tdedocdir}/HTML/en/ktouch/ - -%post -n trinity-ktouch -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ktouch -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kturtle -Summary: educational Logo programming environment -Group: Amusements/Games -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-kturtle -KTurtle is an educational programming environment using the Logo -programming language. It tries to make programming as easy and -accessible as possible. This makes KTurtle suitable for teaching -kids the basics of mathematics, geometry and programming. - -The commands used to program are in the style of the Logo programming -language. The unique feature of Logo is that the commands are often -translated into the speaking language of the programmer. - -KTurtle is named after "the turtle" that plays a central role in the -programming environment. The user programs the turtle, using the -Logo commands, to draw a picture on the canvas. - -Note that this version of Logo is only focused on the educational -qualities of the programming language and will not try to suit -professional programmers' needs. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kturtle -%defattr(-,root,root,-) -%{tde_bindir}/kturtle -%{tde_tdeappdir}/kturtle.desktop -%{tde_datadir}/apps/katepart/syntax/logohighlightstyle* -%{tde_datadir}/apps/kturtle/ -%{tde_datadir}/config.kcfg/kturtle.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kturtle.png -%{tde_tdedocdir}/HTML/en/kturtle/ - -%post -n trinity-kturtle -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kturtle -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kverbos -Summary: Spanish verb form study application for Trinity -Group: Amusements/Games -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-kverbos -Kverbos allows the user to learn the forms of Spanish verbs. The -program suggests a verb and a time and the user enters the different -verb forms. The program corrects the user input and gives feedback. - -The user can edit the list of the verbs that can be studied. The -program can build regular verb forms by itself. Irregular verb forms -have to be entered by the user. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kverbos -%defattr(-,root,root,-) -%{tde_bindir}/kverbos -%{tde_tdeappdir}/kverbos.desktop -%{tde_datadir}/apps/kverbos/ -%{tde_datadir}/config.kcfg/kverbos.kcfg -%{tde_datadir}/icons/crystalsvg/16x16/actions/kverbosuser.png -%{tde_datadir}/icons/hicolor/*/apps/kverbos.png -%{tde_datadir}/icons/hicolor/scalable/apps/kverbos.svgz -%{tde_tdedocdir}/HTML/en/kverbos/ - -%post -n trinity-kverbos -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kverbos -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kvoctrain -Summary: vocabulary trainer for Trinity -Group: Amusements/Games -Requires: perl -Requires: perl-libwww-perl -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-kvoctrain -KVocTrain is a little utility to help you train your vocabulary when -you are trying to learn a foreign language. You can create your own -database with the words you need. It is intended as a replacement -for index (flash) cards. - -You probably remember flashcards from school. The teacher would -write the original expression on the front side of the card and the -translation on the back. Then look at the cards one after another. -If you knew the translation, you could put it away. If you failed, -you put it back to try again. - -KVocTrain is not intended to teach you grammar or other sophisticated -things. This is and probably will stay beyond the scope of this -application. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kvoctrain -%defattr(-,root,root,-) -%{tde_datadir}/config/kvoctrainrc -%{tde_bindir}/kvoctrain -%{tde_bindir}/spotlight2kvtml -%{tde_libdir}/libkvoctraincore.so.* -%{tde_tdeappdir}/kvoctrain.desktop -%{tde_datadir}/apps/kvoctrain/ -%{tde_datadir}/mimelnk/text/x-kvtml.desktop -%{tde_datadir}/config.kcfg/kvoctrain.kcfg -%{tde_datadir}/config.kcfg/languagesettings.kcfg -%{tde_datadir}/config.kcfg/presettings.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kvoctrain.png -%{tde_tdedocdir}/HTML/en/kvoctrain/ - -%post -n trinity-kvoctrain -/sbin/ldconfig || : -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kvoctrain -/sbin/ldconfig || : -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kwordquiz -Summary: flashcard and vocabulary learning program for Trinity -Group: Amusements/Games -Requires: trinity-tdeedu-data = %{version}-%{release} - -%description -n trinity-kwordquiz -KWordQuiz is a flashcard-based tool that helps you to master new -vocabularies. It may be a language or any other kind of terminology. - -KWordQuiz can open several types of vocabulary data. Supported are -kvtml files used by other KDE programs such as KVocTrain, wql files -used by WordQuiz for Windows, csv files with comma-separated text, -and xml.gz files created by Pauker (http://pauker.sourceforge.net). - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-kwordquiz -%defattr(-,root,root,-) -%{tde_datadir}/config/kwordquizrc -%{tde_bindir}/kwordquiz -%{tde_tdeappdir}/kwordquiz.desktop -%{tde_datadir}/apps/kwordquiz/ -%{tde_datadir}/config.kcfg/kwordquiz.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kwordquiz.png -%{tde_datadir}/icons/hicolor/scalable/apps/kwordquiz.svg -%{tde_datadir}/icons/crystalsvg/*/mimetypes/kwordquiz_doc.png -%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/kwordquiz_doc.svg -%{tde_datadir}/mimelnk/application/x-kwordquiz.desktop -%{tde_tdedocdir}/HTML/en/kwordquiz/ - -%post -n trinity-kwordquiz -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kwordquiz -for i in hicolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-libtdeedu3 -Summary: library for use with Trinity educational apps -Group: Environment/Libraries - -%description -n trinity-libtdeedu3 -The KDE-based library libtdeedu is used with educational -applications. It currently provides support for data plotting and -vocabulary items (including a parser for kvtml vocabulary files). - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-libtdeedu3 -%defattr(-,root,root,-) -%{tde_libdir}/libextdate.so.* -%{tde_libdir}/libkdeeducore.so.* -%{tde_libdir}/libkdeeduplot.so.* -%{tde_libdir}/libkdeeduui.so.* - -%post -n trinity-libtdeedu3 -/sbin/ldconfig || : - -%postun -n trinity-libtdeedu3 -/sbin/ldconfig || : - -########## - -%package -n trinity-libtdeedu-devel -Summary: development files for Trinity educational library -Group: Development/Libraries -Requires: trinity-libtdeedu3 = %{version}-%{release} - -%description -n trinity-libtdeedu-devel -The KDE-based library libtdeedu is used with educational -applications. It currently provides support for data plotting and -vocabulary items (including a parser for kvtml vocabulary files). - -Development files for libtdeedu are included in this package. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-libtdeedu-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/libkdeedu/ -%{tde_libdir}/libextdate.la -%{tde_libdir}/libextdate.so -%{tde_libdir}/libkdeeducore.la -%{tde_libdir}/libkdeeducore.so -%{tde_libdir}/libkdeeduui.la -%{tde_libdir}/libkdeeduui.so -%{tde_libdir}/libkdeeduplot.la -%{tde_libdir}/libkdeeduplot.so - -%post -n trinity-libtdeedu-devel -/sbin/ldconfig || : - -%postun -n trinity-libtdeedu-devel -/sbin/ldconfig || : - - -########## - -%package -n trinity-libkiten1 -Summary: library for Kiten Japanese reference/study tool -Group: Environment/Libraries -#Requires: kanjidic - -%description -n trinity-libkiten1 -Kiten is a Japanese reference/study tool for KDE. The library -libkiten contains portions of Kiten that may be useful for other -applications. These portions include dictionary, character lookup -and widget classes. - -This package contains the libkiten library along with supporting -data, such as Japanese language data files and GUI resource files. -For further information, see the kiten package. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-libkiten1 -%defattr(-,root,root,-) -%{tde_libdir}/libkiten.so.* -%{tde_datadir}/apps/kiten/ -%{tde_datadir}/config.kcfg/kiten.kcfg -%{tde_datadir}/icons/crystalsvg/16x16/actions/kanjidic.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/edit_add.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/edit_remove.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/kanjidic.png -%{tde_datadir}/icons/locolor/16x16/actions/edit_add.png -%{tde_datadir}/icons/locolor/16x16/actions/edit_remove.png - -%post -n trinity-libkiten1 -for i in crystalsvg locolor locolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -/sbin/ldconfig || : - -%postun -n trinity-libkiten1 -for i in crystalsvg locolor locolor ; do - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -done -/sbin/ldconfig || : - -########## - -%package -n trinity-libkiten-devel -Summary: development files for Kiten library -Group: Development/Libraries -Requires: trinity-libkiten1 = %{version}-%{release} -Requires: trinity-tdelibs-devel >= %{version} - -%description -n trinity-libkiten-devel -Kiten is a Japanese reference/study tool for KDE. The library -libkiten contains portions of Kiten that may be useful for other -applications. These portions include dictionary, character lookup -and widget classes. - -Development files for libkiten are included in this package. For -further information, see the kiten package. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-libkiten-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/libkiten/ -%{tde_libdir}/libkiten.la -%{tde_libdir}/libkiten.so - -%post -n trinity-libkiten-devel -/sbin/ldconfig || : - -%postun -n trinity-libkiten-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-indi -Summary: Instrument Neutral Distributed Interface for astronomical devices -Group: Amusements/Games - -%description -n trinity-indi -INDI is an Instrument Neutral Distributed Interface control protocol for -astronomical devices, which provides a framework that decouples low level -hardware drivers from high level front end clients. Clients that use the -device drivers are completely unaware of the device capabilities and -communicate with the device drivers and build a completely dynamic GUI -based on the services provided by the device. - -This package is part of Trinity, as a component of the TDE education module. - -%files -n trinity-indi -%defattr(-,root,root,-) -%{tde_bindir}/apmount -%{tde_bindir}/apogee_ppi -%{tde_bindir}/celestrongps -%{tde_bindir}/fliccd -%{tde_bindir}/fliwheel -%{tde_bindir}/indiserver -%{tde_bindir}/lx200_16 -%{tde_bindir}/lx200autostar -%{tde_bindir}/lx200basic -%{tde_bindir}/lx200classic -%{tde_bindir}/lx200generic -%{tde_bindir}/lx200gps -%{tde_bindir}/meade_lpi -%{tde_bindir}/sbigccd -%{tde_bindir}/skycommander -%{tde_bindir}/temma -%{tde_bindir}/v4ldriver -%{tde_bindir}/v4lphilips - -########## - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: trinity-libtdeedu-devel = %{version}-%{release} -Requires: trinity-libkiten-devel = %{version}-%{release} - -Obsoletes: trinity-kdeedu-devel < %{version}-%{release} -Provides: trinity-kdeedu-devel = %{version}-%{release} - -%description devel -%{summary}. - -%files devel -%defattr(-,root,root,-) -%doc libkdeedu/AUTHORS libkdeedu/README -# kstars -%{tde_tdeincludedir}/kstarsinterface.h -%{tde_tdeincludedir}/simclockinterface.h -# kvoctrain -%{tde_libdir}/libkvoctraincore.la -%{tde_libdir}/libkvoctraincore.so - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -# Do not build against any "/usr" installed KDE -export KDEDIR=%{tde_prefix} - -# Specific path for RHEL4 -if [ -d "/usr/X11R6" ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" - export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} - --enable-kig-python-scripting \ -%else - --disable-kig-python-scripting \ -%endif - --enable-ocamlsolver - -%__make %{_smp_mflags} \ - OCAMLLIB=$(ocamlc -where) \ - FACILELIB=$(ocamlc -where) - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu.spec index ca5d13cd8..088a16c99 100644 --- a/redhat/main/tdeedu/tdeedu-14.0.0.spec +++ b/redhat/main/tdeedu/tdeedu.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeedu %define tde_prefix /opt/trinity @@ -63,7 +63,7 @@ Source1: %{name}-rpmlintrc BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake >= 2.8 BuildRequires: desktop-file-utils # SUSE desktop files utility @@ -78,29 +78,60 @@ BuildRequires: brp-check-trinity BuildRequires: gcc-c++ BuildRequires: fdupes +BuildRequires: doxygen -# PYTHON support -BuildRequires: python-devel -BuildRequires: python +# ACL support +BuildRequires: libacl-devel + +# IDN support +BuildRequires: libidn-devel + +# OPENSSL support +BuildRequires: openssl-devel + +# LIBUSB support +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} +BuildRequires: %{_lib}usb1.0-devel +BuildRequires: %{_lib}usb-compat0.1-devel +%else +BuildRequires: libusb-devel +%endif + +# PYTHON3 support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 +%global python python3 +%global __python %__python3 +%global python_sitearch %{python3_sitearch} +%else +%global python python +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +BuildRequires: %{python} +BuildRequires: %{python}-devel # BOOST support BuildRequires: boost-devel +%if 0%{?mgaversion} >= 7 +BuildRequires: %{_lib}boost_python3-devel +%endif +%if 0%{?suse_version} +BuildRequires: libboost_%{python}-devel +%endif +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: boost-%{python}-devel +%endif # OCAML support %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 BuildRequires: ocaml(compiler) +#BuildRequires: ocaml-facile-devel %else BuildRequires: ocaml +#BuildRequires: ocaml-facile-devel %endif # KIG python scripting support -%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?fedora} >= 29 -%define with_kig 0 -%else %define with_kig 1 -%endif -%endif Obsoletes: trinity-kdeedu < %{version}-%{release} Provides: trinity-kdeedu = %{version}-%{release} @@ -212,6 +243,7 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/icons/hicolor/*/apps/blinken.png %{tde_datadir}/icons/hicolor/scalable/apps/blinken.svgz %{tde_tdedocdir}/HTML/en/blinken/ +%{tde_mandir}/man1/blinken* ########## @@ -248,6 +280,7 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/icons/hicolor/*/apps/kalzium.png %{tde_datadir}/icons/hicolor/scalable/apps/kalzium.svgz %{tde_tdedocdir}/HTML/en/kalzium/ +%{tde_mandir}/man1/kalzium* ########## @@ -300,6 +333,7 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/icons/hicolor/*/apps/kanagram.png %{tde_datadir}/icons/hicolor/scalable/apps/kanagram.svgz %{tde_tdedocdir}/HTML/en/kanagram/ +%{tde_mandir}/man1/kanagram* ########## @@ -325,6 +359,7 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/icons/hicolor/scalable/apps/kbruch.svgz %{tde_datadir}/icons/crystalsvg/*/actions/kbruch_*.png %{tde_tdedocdir}/HTML/en/kbruch/ +%{tde_mandir}/man1/kbruch* ########## @@ -343,6 +378,7 @@ This package is part of Trinity, as a component of the TDE education module. %defattr(-,root,root,-) %{tde_bindir}/keduca %{tde_bindir}/keducabuilder +%{tde_bindir}/keduca-shrinker %{tde_tdelibdir}/libkeducapart.la %{tde_tdelibdir}/libkeducapart.so %{tde_tdeappdir}/keduca.desktop @@ -354,6 +390,7 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/mimelnk/application/x-edugallery.desktop %{tde_datadir}/services/keduca_part.desktop %{tde_tdedocdir}/HTML/en/keduca/ +%{tde_mandir}/man1/keduca* ########## @@ -374,12 +411,14 @@ This package is part of Trinity, as a component of the TDE education module. %files -n trinity-kgeography %defattr(-,root,root,-) %{tde_bindir}/kgeography +%{tde_bindir}/kgeography_gen_map.pl %{tde_tdeappdir}/kgeography.desktop %{tde_datadir}/config.kcfg/kgeography.kcfg %{tde_datadir}/icons/crystalsvg/*/apps/kgeography.png %{tde_datadir}/icons/crystalsvg/scalable/apps/kgeography.svgz %{tde_datadir}/icons/hicolor/*/apps/kgeography.png %{tde_tdedocdir}/HTML/en/kgeography +%{tde_mandir}/man1/kgeography* ########## @@ -422,7 +461,7 @@ This package is part of Trinity, as a component of the TDE education module. %files -n trinity-khangman %defattr(-,root,root,-) -%{tde_confdir}/khangmanrc +%config(noreplace) %{tde_confdir}/khangmanrc %{tde_bindir}/khangman %{tde_tdeappdir}/khangman.desktop %{tde_datadir}/apps/khangman/ @@ -430,6 +469,7 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/icons/hicolor/*/apps/khangman.png %{tde_datadir}/icons/hicolor/scalable/apps/khangman.svgz %{tde_tdedocdir}/HTML/en/khangman/ +%{tde_mandir}/man1/khangman* ########## @@ -460,8 +500,8 @@ This package is part of Trinity, as a component of the TDE education module. %files -n trinity-kig %defattr(-,root,root,-) -%{tde_confdir}/magic/cabri.magic -%{tde_confdir}/magic/drgeo.magic +%config(noreplace) %{tde_confdir}/magic/cabri.magic +%config(noreplace) %{tde_confdir}/magic/drgeo.magic %{tde_bindir}/kig %{tde_bindir}/pykig.py* %{tde_tdelibdir}/tdefile_drgeo.la @@ -488,8 +528,9 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/services/tdefile_kig.desktop %{tde_datadir}/services/kig_part.desktop %{tde_tdedocdir}/HTML/en/kig/ -%{tde_confdir}/magic/cabri.magic.mgc -%{tde_confdir}/magic/drgeo.magic.mgc +%config(noreplace) %{tde_confdir}/magic/cabri.magic.mgc +%config(noreplace) %{tde_confdir}/magic/drgeo.magic.mgc +%{tde_mandir}/man1/kig* ########## @@ -516,6 +557,7 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_tdedocdir}/HTML/en/kiten/ %{tde_datadir}/icons/hicolor/*/apps/kiten.png %{tde_datadir}/icons/hicolor/scalable/apps/kiten.svgz +%{tde_mandir}/man1/kiten* ########## @@ -550,6 +592,7 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/icons/hicolor/*/apps/klatin.png %{tde_datadir}/icons/hicolor/scalable/apps/klatin.svgz %{tde_tdedocdir}/HTML/en/klatin/ +%{tde_mandir}/man1/klatin* ########## @@ -572,13 +615,14 @@ This package is part of Trinity, as a component of the TDE education module. %files -n trinity-klettres %defattr(-,root,root,-) -%{tde_confdir}/klettresrc +%config(noreplace) %{tde_confdir}/klettresrc %{tde_bindir}/klettres %{tde_tdeappdir}/klettres.desktop %{tde_datadir}/config.kcfg/klettres.kcfg %{tde_datadir}/icons/hicolor/*/apps/klettres.png %{tde_datadir}/icons/hicolor/scalable/apps/klettres.svgz %{tde_tdedocdir}/HTML/en/klettres/ +%{tde_mandir}/man1/klettres* ########## @@ -635,6 +679,7 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/mimelnk/application/x-kmplot.desktop %{tde_datadir}/services/kmplot_part.desktop %{tde_tdedocdir}/HTML/en/kmplot/ +%{tde_mandir}/man1/kmplot* ########## @@ -661,6 +706,7 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/icons/hicolor/*/apps/kpercentage.png %{tde_datadir}/icons/hicolor/scalable/apps/kpercentage.svgz %{tde_tdedocdir}/HTML/en/kpercentage/ +%{tde_mandir}/man1/kpercentage* ########## @@ -688,13 +734,14 @@ This package is part of Trinity, as a component of the TDE education module. %files -n trinity-kstars %defattr(-,root,root,-) -%{tde_confdir}/kstarsrc +%config(noreplace) %{tde_confdir}/kstarsrc %{tde_bindir}/kstars %{tde_tdeappdir}/kstars.desktop %{tde_datadir}/config.kcfg/kstars.kcfg %{tde_datadir}/icons/hicolor/*/apps/kstars.png %{tde_datadir}/icons/hicolor/scalable/apps/kstars.svgz %{tde_tdedocdir}/HTML/en/kstars/ +%{tde_mandir}/man1/kstars* ########## @@ -743,6 +790,7 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/icons/hicolor/*/apps/ktouch.png %{tde_datadir}/icons/hicolor/scalable/apps/ktouch.svgz %{tde_tdedocdir}/HTML/en/ktouch/ +%{tde_mandir}/man1/ktouch* ########## @@ -780,6 +828,7 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/config.kcfg/kturtle.kcfg %{tde_datadir}/icons/hicolor/*/apps/kturtle.png %{tde_tdedocdir}/HTML/en/kturtle/ +%{tde_mandir}/man1/kturtle* ########## @@ -809,6 +858,7 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/icons/hicolor/*/apps/kverbos.png %{tde_datadir}/icons/hicolor/scalable/apps/kverbos.svgz %{tde_tdedocdir}/HTML/en/kverbos/ +%{tde_mandir}/man1/kverbos* ########## @@ -839,7 +889,7 @@ This package is part of Trinity, as a component of the TDE education module. %files -n trinity-kvoctrain %defattr(-,root,root,-) -%{tde_confdir}/kvoctrainrc +%config(noreplace) %{tde_confdir}/kvoctrainrc %{tde_bindir}/kvoctrain %{tde_bindir}/spotlight2kvtml %{tde_libdir}/libkvoctraincore.so.* @@ -851,6 +901,8 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/config.kcfg/presettings.kcfg %{tde_datadir}/icons/hicolor/*/apps/kvoctrain.png %{tde_tdedocdir}/HTML/en/kvoctrain/ +%{tde_mandir}/man1/kvoctrain* +%{tde_mandir}/man1/spotlight2kvtml* ########## @@ -872,7 +924,7 @@ This package is part of Trinity, as a component of the TDE education module. %files -n trinity-kwordquiz %defattr(-,root,root,-) -%{tde_confdir}/kwordquizrc +%config(noreplace) %{tde_confdir}/kwordquizrc %{tde_bindir}/kwordquiz %{tde_tdeappdir}/kwordquiz.desktop %{tde_datadir}/apps/kwordquiz/ @@ -883,6 +935,8 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_datadir}/icons/crystalsvg/scalable/mimetypes/kwordquiz_doc.svg %{tde_datadir}/mimelnk/application/x-kwordquiz.desktop %{tde_tdedocdir}/HTML/en/kwordquiz/ +%{tde_mandir}/man1/kwordquiz* +%{tde_mandir}/man1/langen* ########## @@ -1024,6 +1078,12 @@ This package is part of Trinity, as a component of the TDE education module. %{tde_bindir}/temma %{tde_bindir}/v4ldriver %{tde_bindir}/v4lphilips +%{tde_mandir}/man1/celestrongps* +%{tde_mandir}/man1/fliccd* +%{tde_mandir}/man1/indi* +%{tde_mandir}/man1/lx200* +%{tde_mandir}/man1/temma* +%{tde_mandir}/man1/v4l* ########## @@ -1062,60 +1122,52 @@ This package contains the development files for tdeedu. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -# RHEL5 strange FTBFS on V4L stuff -%if 0%{?rhel} == 5 -%__sed -i "admin/acinclude.m4.in" -e "s|-ansi||" +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +# Fix shebangs +sed -i "kig/pykig/pykig.py" \ + -e "s|env python|env %{python}|" %endif -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -# Specific path for RHEL4 -if [ -d "/usr/X11R6" ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" - export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -# Warning: GCC visibility causes FTBFS [Bug #1285] -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DBIN_INSTALL_DIR="%{tde_bindir}" \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DSYSCONF_INSTALL_DIR="%{tde_confdir}" \ + -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \ \ -%if 0%{?with_kig} - --enable-kig-python-scripting \ -%else - --disable-kig-python-scripting \ -%endif - --enable-ocamlsolver + -DWITH_ALL_OPTIONS=ON \ + -DWITH_OCAML_SOLVER=OFF \ + .. -%__make %{_smp_mflags} \ - OCAMLLIB=$(ocamlc -where) \ - FACILELIB=$(ocamlc -where) +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build # Updates applications categories for openSUSE %if 0%{?suse_version} diff --git a/redhat/main/tdegames/tdegames-3.5.13.2.spec b/redhat/main/tdegames/tdegames-3.5.13.2.spec deleted file mode 100644 index 0b457e10a..000000000 --- a/redhat/main/tdegames/tdegames-3.5.13.2.spec +++ /dev/null @@ -1,1647 +0,0 @@ -# -# spec file for package tdegames (version 3.5.13-SRU) -# -# 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/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg tdegames -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%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_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - - -Name: trinity-%{tde_pkg} -Summary: Trinity Desktop Environment - Games -Version: %{tde_version} -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} -Group: System/GUI/Other -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: trinity-tdemultimedia-devel >= %{tde_version} - -BuildRequires: autoconf automake libtool m4 -BuildRequires: gcc-c++ -BuildRequires: desktop-file-utils -BuildRequires: fdupes -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 - -Obsoletes: trinity-kdegames < %{version}-%{release} -Provides: trinity-kdegames = %{version}-%{release} -Obsoletes: trinity-kdegames-libs < %{version}-%{release} -Provides: trinity-kdegames-libs = %{version}-%{release} - -Requires: trinity-libtdegames1 = %{version}-%{release} -Requires: trinity-tdegames-card-data = %{version}-%{release} -Requires: trinity-atlantik = %{version}-%{release} -Requires: trinity-kasteroids = %{version}-%{release} -Requires: trinity-katomic = %{version}-%{release} -Requires: trinity-kbackgammon = %{version}-%{release} -Requires: trinity-kbattleship = %{version}-%{release} -Requires: trinity-kblackbox = %{version}-%{release} -Requires: trinity-kbounce = %{version}-%{release} -Requires: trinity-kenolaba = %{version}-%{release} -Requires: trinity-kfouleggs = %{version}-%{release} -Requires: trinity-kgoldrunner = %{version}-%{release} -Requires: trinity-kjumpingcube = %{version}-%{release} -Requires: trinity-klickety = %{version}-%{release} -Requires: trinity-klines = %{version}-%{release} -Requires: trinity-kmahjongg = %{version}-%{release} -Requires: trinity-kmines = %{version}-%{release} -Requires: trinity-knetwalk = %{version}-%{release} -Requires: trinity-kolf = %{version}-%{release} -Requires: trinity-konquest = %{version}-%{release} -Requires: trinity-kpat = %{version}-%{release} -Requires: trinity-kpoker = %{version}-%{release} -Requires: trinity-kreversi = %{version}-%{release} -Requires: trinity-ksame = %{version}-%{release} -Requires: trinity-kshisen = %{version}-%{release} -Requires: trinity-ksirtet = %{version}-%{release} -Requires: trinity-ksmiletris = %{version}-%{release} -Requires: trinity-ksnake = %{version}-%{release} -Requires: trinity-ksokoban = %{version}-%{release} -Requires: trinity-kspaceduel = %{version}-%{release} -Requires: trinity-ktron = %{version}-%{release} -Requires: trinity-ktuberling = %{version}-%{release} -Requires: trinity-twin4 = %{version}-%{release} -Requires: trinity-lskat = %{version}-%{release} - - -%description -Games and gaming libraries for the Trinity Desktop Environment. -Included with this package are: kenolaba, kasteroids, kblackbox, kmahjongg, -kmines, konquest, kpat, kpoker, kreversi, ksame, kshisen, ksmiletris, -ksnake, ksirtet, katomic, kjumpingcube, ktuberling. - -%files - -########## - -%package devel -Summary: Development files for %{name} -Group: Amusements/Games/Other - -Requires: %{name} = %{version}-%{release} -Requires: trinity-tdelibs-devel >= %{tde_version} -Requires: trinity-libtdegames-devel = %{version}-%{release} -Requires: trinity-atlantik-devel = %{version}-%{release} -Requires: trinity-kolf-devel = %{version}-%{release} - -Obsoletes: trinity-kdegames-devel < %{version}-%{release} -Provides: trinity-kdegames-devel = %{version}-%{release} - -%description devel -Install %{name}-devel if you wish to develop or compile games for the -TDE desktop. - -%files devel -%defattr(-,root,root,-) - -########## - -%package -n trinity-libtdegames1 -Summary: Trinity games library and common files -Group: Amusements/Games/Other - -%description -n trinity-libtdegames1 -This library provides a common infrastructure for several of the -games in the TDE distribution. Features include standardized menu -items, high score handling, card display, and network connections -including chat capabilities. - -This package is part of TDE, and a component of the TDE games module. - -%files -n trinity-libtdegames1 -%defattr(-,root,root,-) -%{tde_libdir}/libkdegames.so.* -%dir %{tde_datadir}/apps/kdegames -%dir %{tde_datadir}/apps/kdegames/pics -%{tde_datadir}/apps/kdegames/pics/star.png -%{tde_datadir}/icons/crystalsvg/*/actions/roll.png -%{tde_datadir}/icons/crystalsvg/*/actions/highscore.png - -%post -n trinity-libtdegames1 -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -/sbin/ldconfig || : - -%postun -n trinity-libtdegames1 -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -/sbin/ldconfig || : - -########## - -%package -n trinity-libtdegames-devel -Summary: Trinity games library headers -Group: Development/Libraries/Other -Requires: trinity-libtdegames1 = %{version}-%{release} - -%description -n trinity-libtdegames-devel -This package is necessary if you want to develop your own games using -the TDE games library. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-libtdegames-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/*.h -%{tde_tdeincludedir}/kgame -%{tde_libdir}/libkdegames.so -%{tde_libdir}/libkdegames.la - -########## - -%package card-data -Summary: Card decks for Trinity games -Group: Amusements/Games/Other - -%description card-data -Several different collections of card images for use by TDE games. - -This package is part of Trinity, and a component of the TDE games module. - -%files card-data -%defattr(-,root,root,-) -%{tde_datadir}/apps/carddecks/ - -########## - -%package -n trinity-atlantik -Summary: TDE client for Monopoly-like network games -Group: Amusements/Games/Board/Other - -%description -n trinity-atlantik -This is a TDE client for playing Monopoly-like boardgames on the -monopd network. It can play any board supported by the network -server, including the classic Monopoly game, as well as the Atlantik -game in which the property includes several major cities in North -America and Europe. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-atlantik -%defattr(-,root,root,-) -%{tde_bindir}/atlantik -%{tde_libdir}/libatlantic.so.* -%{tde_libdir}/libatlantikclient.so.* -%{tde_libdir}/libatlantikui.so.* -%{tde_tdelibdir}/kio_atlantik.la -%{tde_tdelibdir}/kio_atlantik.so -%{tde_datadir}/services/atlantik.protocol -%{tde_tdeappdir}/atlantik.desktop -%{tde_datadir}/icons/hicolor/*/apps/atlantik.png -%{tde_datadir}/apps/atlantik/ -%{tde_tdedocdir}/HTML/en/atlantik/ - -%post -n trinity-atlantik -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-atlantik -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-atlantik-devel -Summary: Development files for Atlantik -Group: Development/Libraries/Other -Requires: trinity-atlantik = %{version}-%{release} - -%description -n trinity-atlantik-devel -This package contains header files for compiling programs against the -libraries which come with Atlantik. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-atlantik-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/atlantik -%{tde_tdeincludedir}/atlantic -%{tde_libdir}/libatlantic.so -%{tde_libdir}/libatlantic.la -%{tde_libdir}/libatlantikclient.so -%{tde_libdir}/libatlantikclient.la -%{tde_libdir}/libatlantikui.so -%{tde_libdir}/libatlantikui.la - -%post -n trinity-atlantik-devel -/sbin/ldconfig || : - -%postun -n trinity-atlantik-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-kasteroids -Summary: Asteroids for Trinity -Group: Amusements/Games/Action/Arcade - -%description -n trinity-kasteroids -You know this game. It is based on Warwick Allison's QwSpriteField -widget. - -The objective of kasteroids is to destroy all the asteroids on the -screen to advance to the next level. Your ship is destroyed if it -makes contact with an asteroid. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kasteroids -%defattr(-,root,root,-) -%{tde_bindir}/kasteroids -%{tde_datadir}/icons/hicolor/*/apps/kasteroids.png -%{tde_tdeappdir}/kasteroids.desktop -%{tde_datadir}/apps/kasteroids/ -%{tde_datadir}/config.kcfg/kasteroids.kcfg -%{tde_tdedocdir}/HTML/en/kasteroids/ - -%post -n trinity-kasteroids -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kasteroids -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-katomic -Summary: Atomic Entertainment game for Trinity -Group: Amusements/Games/Strategy/Other - -%description -n trinity-katomic -This is a puzzle game, in which the object is to assemble a molecule -from its atoms on a Sokoban-like board. On each move, an atom goes -as far as it can in a specified direction before being stopped by a -wall or another atom. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-katomic -%defattr(-,root,root,-) -%{tde_datadir}/apps/katomic/ -%{tde_datadir}/icons/hicolor/*/apps/katomic.png -%{tde_tdeappdir}/katomic.desktop -%{tde_bindir}/katomic -%{tde_tdedocdir}/HTML/en/katomic/ - -%post -n trinity-katomic -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-katomic -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kbackgammon -Summary: A Backgammon game for Trinity -Group: Amusements/Games/Board/Other - -%description -n trinity-kbackgammon -KBackgammon is a backgammon program for Trinity. It is based on the -code, ideas and concepts of KFibs (which is a FIBS client for -TDE1). For a short time, KBackgammon was called bacKgammon (if you -know somebody who is still using bacKgammon, please force them to -upgrade :-)). - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kbackgammon -%defattr(-,root,root,-) -%{tde_bindir}/kbackgammon -%{tde_tdeappdir}/kbackgammon.desktop -%{tde_datadir}/apps/kbackgammon/ -%{tde_datadir}/icons/hicolor/*/apps/kbackgammon.png -%{tde_datadir}/icons/hicolor/*/apps/kbackgammon_engine.png -%{tde_tdedocdir}/HTML/en/kbackgammon/ - -%post -n trinity-kbackgammon -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kbackgammon -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kbattleship -Summary: Battleship game for Trinity -Group: Amusements/Games/Board/Other - -%description -n trinity-kbattleship -This is an implementation of the Battleship game. Each player tries -to be the first to sink all the opponent's ships by firing "blindly" -at them. The game has options to play over a network connection or -against the computer. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kbattleship -%defattr(-,root,root,-) -%{tde_datadir}/apps/kbattleship/ -%{tde_datadir}/apps/zeroconf/_kbattleship._tcp -%{tde_datadir}/icons/hicolor/*/apps/kbattleship.png -%{tde_tdeappdir}/kbattleship.desktop -%{tde_bindir}/kbattleship -%{tde_tdedocdir}/HTML/en/kbattleship/ - -%post -n trinity-kbattleship -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kbattleship -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kblackbox -Summary: A simple logical game for the Trinity project -Group: Amusements/Games/Board/Other - -%description -n trinity-kblackbox -KBlackBox is a game of hide and seek played on an grid of boxes. Your -opponent (Random number generator, in this case) has hidden several -balls within this box. By shooting rays into the box and observing -where they emerge it is possible to deduce the positions of the -hidden balls. The fewer rays you use to find the balls, the lower -your score. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kblackbox -%defattr(-,root,root,-) -%{tde_datadir}/apps/kblackbox/ -%{tde_datadir}/icons/hicolor/*/apps/kblackbox.png -%{tde_tdeappdir}/kblackbox.desktop -%{tde_bindir}/kblackbox -%{tde_tdedocdir}/HTML/en/kblackbox/ - -%post -n trinity-kblackbox -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kblackbox -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kbounce -Summary: Jezzball clone for the K Desktop Environment -Group: Amusements/Games/Action/Arcade - -%description -n trinity-kbounce -This is a clone of the popular Jezzball game originally created by -Microsoft. Jezzball is one of the rare and simple games requiring -skill, timing, and patience in order to be successful. A ball begins -to bounce off of an area enclosed by four borders (like a -square). You must move your pointer to certain areas within the -square. Upon clicking, a new border is constructed at a relatively -quick pace. You can change the direction of the borders by 90 degrees -as well. Ultimately, you must force the ball to bounce around in a -smaller, and smaller area as time goes by without the ball ever -touching the borders as they are being constructed. If a ball touches -a certain part of the border as it is being built, the game is over. -After 75% of the original space has been blocked off from the moving -ball, you advance one level, and one more ball is added to the mix in -the following level. - -This game was previously known as kjezz. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kbounce -%defattr(-,root,root,-) -%{tde_datadir}/apps/kbounce/ -%{tde_tdeappdir}/kbounce.desktop -%{tde_datadir}/icons/hicolor/*/apps/kbounce.png -%{tde_bindir}/kbounce -%{tde_tdedocdir}/HTML/en/kbounce/ - -%post -n trinity-kbounce -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kbounce -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kenolaba -Summary: Enolaba board game for Trinity -Group: Amusements/Games/Board/Other - -%description -n trinity-kenolaba -kenolaba is a simple board strategy game that is played by two -players. There are red and yellow pieces for each player. Beginning -from a start position where each player has 14 pieces, moves are -drawn until one player has pushed 6 pieces of his opponent out of the -board. - -This game was previously known as kabalone, and was inspired by the -board game Abalone by Abalone SA, France. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kenolaba -%defattr(-,root,root,-) -%{tde_datadir}/apps/kenolaba/ -%{tde_datadir}/icons/hicolor/*/apps/kenolaba.png -%{tde_tdeappdir}/kenolaba.desktop -%{tde_bindir}/kenolaba -%{tde_tdedocdir}/HTML/en/kenolaba/ - -%post -n trinity-kenolaba -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kenolaba -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kfouleggs -Summary: A TDE clone of the Japanese PuyoPuyo game -Group: Amusements/Games/Action/Arcade - -%description -n trinity-kfouleggs -KFouleggs is a clone of the Japanese PuyoPuyo game, with advanced -features such as multiplayer games against human or AI, and network -play. If you have played Tetris or one of its many clones, you will -find KFouleggs easy to learn. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kfouleggs -%defattr(-,root,root,-) -%{tde_tdeappdir}/kfouleggs.desktop -%{tde_datadir}/apps/kfouleggs/ -%{tde_datadir}/config.kcfg/kfouleggs.kcfg -%{tde_bindir}/kfouleggs -%{tde_datadir}/icons/hicolor/*/apps/kfouleggs.png -%{tde_tdedocdir}/HTML/en/kfouleggs/ - -%post -n trinity-kfouleggs -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kfouleggs -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kgoldrunner -Summary: A Trinity clone of the Loderunner arcade game -Group: Amusements/Games/Action/Arcade - -%description -n trinity-kgoldrunner -KGoldrunner, a game of action and puzzle solving. Run through the -maze, dodge your enemies, collect all the gold and climb up to the -next level. - -You must guide the hero with the mouse or keyboard and collect all -the gold nuggets, then you can climb up into the next level. Your -enemies are also after the gold and they will kill you if they catch -you! - -The problem is you have no weapon to kill them. All you can do is -run away, dig holes in the floor to trap them or lure them into some -area where they cannot hurt you. After a short time a trapped enemy -climbs out of his hole, but if it closes before that, he will die and -reappear somewhere else. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kgoldrunner -%defattr(-,root,root,-) -%{tde_datadir}/apps/kgoldrunner/ -%{tde_datadir}/icons/hicolor/*/apps/kgoldrunner.png -%{tde_tdeappdir}/KGoldrunner.desktop -%{tde_bindir}/kgoldrunner -%{tde_tdedocdir}/HTML/en/kgoldrunner/ - -%post -n trinity-kgoldrunner -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kgoldrunner -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kjumpingcube -Summary: Tactical one or two player game -Group: Amusements/Games/Strategy/Other - -%description -n trinity-kjumpingcube -KJumpingCube is a simple tactical game. You can play it against the -computer or against a friend. The playing field consists of squares -that contains points. By clicking on the squares you can increase -the points and if the points reach a maximum the points will jump to -the squares neighbours and take them over. Winner is the one, who -owns all squares. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kjumpingcube -%defattr(-,root,root,-) -%{tde_bindir}/kjumpingcube -%{tde_datadir}/icons/hicolor/*/apps/kjumpingcube.png -%{tde_datadir}/apps/kjumpingcube/ -%{tde_tdeappdir}/kjumpingcube.desktop -%{tde_datadir}/config.kcfg/kjumpingcube.kcfg -%{tde_tdedocdir}/HTML/en/kjumpingcube/ - -%post -n trinity-kjumpingcube -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kjumpingcube -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-klickety -Summary: A Clickomania-like game for Trinity -Group: Amusements/Games/Board/Other - -%description -n trinity-klickety -Klickety is an adaptation of the (perhaps) well-known Clickomania -game; it is very similar to the "same" game. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-klickety -%defattr(-,root,root,-) -%{tde_bindir}/klickety -%{tde_tdeappdir}/klickety.desktop -%{tde_datadir}/icons/hicolor/*/apps/klickety.png -%{tde_datadir}/icons/crystalsvg/*/actions/endturn.png -%{tde_datadir}/apps/klickety/ -%{tde_tdedocdir}/HTML/en/klickety/ - -%post -n trinity-klickety -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-klickety -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-klines -Summary: Color lines for Trinity -Group: Amusements/Games/Strategy/Other - -%description -n trinity-klines -KLines is a simple game. It is played by one player, so there is only -one winner :-). You play for fun and against the high score. It was -inspired by a well known game - "Color lines", written for DOS by -Olga Demina, Igor Demina, Igor Ivkin and Gennady Denisov back in -1992. - -The main rules of the game are as simple as possible: you move (using -the mouse) marbles from cell to cell and build lines (horizontal, -vertical or diagonal). When a line contains 5 or more marbles, they -are removed and your score grows. After each turn the computer drops -three more marbles. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-klines -%defattr(-,root,root,-) -%{tde_datadir}/apps/klines/ -%{tde_tdeappdir}/klines.desktop -%{tde_bindir}/klines -%{tde_datadir}/config.kcfg/klines.kcfg -%{tde_datadir}/icons/hicolor/*/apps/klines.png -%{tde_tdedocdir}/HTML/en/klines/ - -%post -n trinity-klines -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-klines -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kmahjongg -Summary: The classic mahjongg game for Trinity project -Group: Amusements/Games/Board/Other - -%description -n trinity-kmahjongg -Your mission in this game is to remove all tiles from the game board. A -matching pair of tiles can be removed, if they are 'free', which means that -no other tiles block them on the left or right side. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kmahjongg -%defattr(-,root,root,-) -%{tde_datadir}/apps/kmahjongg/ -%{tde_datadir}/icons/hicolor/*/apps/kmahjongg.png -%{tde_tdeappdir}/kmahjongg.desktop -%{tde_bindir}/kmahjongg -%{tde_datadir}/config.kcfg/kmahjongg.kcfg -%{tde_tdedocdir}/HTML/en/kmahjongg/ - -%post -n trinity-kmahjongg -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kmahjongg -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kmines -Summary: Minesweeper for Trinity -Group: Amusements/Games/Board/Other - -%description -n trinity-kmines -KMines is the classic Minesweeper game. You must uncover all the -empty cases without blowing on a mine. - -When you uncover a case, a number appears : it indicates how many -mines surround this case. If there is no number the neighbour cases -are automatically uncovered. In your process of uncovering secure -cases, it is very useful to put a flag on the cases which contain a -mine. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kmines -%defattr(-,root,root,-) -%{tde_datadir}/icons/hicolor/*/apps/kmines.png -%{tde_tdeappdir}/kmines.desktop -%{tde_datadir}/apps/kmines/ -%{tde_bindir}/kmines -%{tde_tdedocdir}/HTML/en/kmines/ - -%post -n trinity-kmines -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kmines -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-knetwalk -Summary: A game for system administrators -Group: Amusements/Games/Board/Other - -%description -n trinity-knetwalk -This game presents the player with a rectangular field consisting of -a server, several clients, and pieces of wire. The object is to -rotate these elements until every client is connected to the server, -and no wires are left unconnected. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-knetwalk -%defattr(-,root,root,-) -%{tde_bindir}/knetwalk -%{tde_datadir}/apps/knetwalk -%{tde_datadir}/icons/hicolor/*/apps/knetwalk.png -%{tde_tdeappdir}/knetwalk.desktop - -%post -n trinity-knetwalk -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-knetwalk -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kolf -Summary: Minigolf game for TDE -Group: Amusements/Games/Action/Arcade - -%description -n trinity-kolf -This is a minigolf game for TDE that allows you to go through different -golf courses and waste an exorbitant amount of time. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kolf -%defattr(-,root,root,-) -%{tde_datadir}/config/magic/kolf.magic -%{tde_datadir}/apps/kolf/ -%{tde_bindir}/kolf -%{tde_tdeappdir}/kolf.desktop -%{tde_datadir}/icons/hicolor/*/apps/kolf.png -%{tde_datadir}/mimelnk/application/x-kolf.desktop -%{tde_datadir}/mimelnk/application/x-kourse.desktop -%{tde_libdir}/libkdeinit_kolf.so -%{tde_libdir}/libkdeinit_kolf.la -%{tde_tdelibdir}/kolf.la -%{tde_tdelibdir}/kolf.so -%{tde_libdir}/libkolf.so.1 -%{tde_libdir}/libkolf.so.1.2.0 -%{tde_tdedocdir}/HTML/en/kolf/ - -%post -n trinity-kolf -/sbin/ldconfig || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kolf -/sbin/ldconfig || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kolf-devel -Summary: Development files for Kolf -Group: Development/Libraries/Other -Requires: trinity-kolf = %{version}-%{release} - -%description -n trinity-kolf-devel -This package contains headers and development libraries for compiling -Kolf plugins. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kolf-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kolf -%{tde_libdir}/libkolf.la -%{tde_libdir}/libkolf.so - -%post -n trinity-kolf-devel -/sbin/ldconfig || : - -%postun -n trinity-kolf-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-konquest -Summary: TDE based GNU-Lactic Konquest game -Group: Amusements/Games/Strategy/Other - -%description -n trinity-konquest -This the TDE version of Gnu-Lactic Konquest, a multi-player strategy -game. The goal of the game is to expand your interstellar empire -across the galaxy and, of course, crush your rivals in the process. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-konquest -%defattr(-,root,root,-) -%{tde_datadir}/apps/konquest/ -%{tde_datadir}/icons/hicolor/*/apps/konquest.png -%{tde_tdeappdir}/konquest.desktop -%{tde_bindir}/konquest -%{tde_tdedocdir}/HTML/en/konquest/ - -%post -n trinity-konquest -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-konquest -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kpat -Summary: Trinity solitaire patience game -Group: Amusements/Games/Board/Card - -%description -n trinity-kpat -KPatience is a collection of 14 card games. All the games are single -player games. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kpat -%defattr(-,root,root,-) -%{tde_datadir}/icons/hicolor/*/apps/kpat.png -%{tde_datadir}/apps/kpat/ -%{tde_tdeappdir}/kpat.desktop -%{tde_bindir}/kpat -%{tde_tdedocdir}/HTML/en/kpat/ - -%post -n trinity-kpat -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kpat -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kpoker -Summary: Trinity based Poker clone -Group: Amusements/Games/Board/Card - -%description -n trinity-kpoker -KPoker is a TDE compliant clone of those highly addictive pocket -video poker games which are sometimes called "Videopoker" as well. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kpoker -%defattr(-,root,root,-) -%{tde_datadir}/apps/kpoker/ -%{tde_datadir}/icons/hicolor/*/apps/kpoker.png -%{tde_tdeappdir}/kpoker.desktop -%{tde_bindir}/kpoker -%{tde_tdedocdir}/HTML/en/kpoker/ - -%post -n trinity-kpoker -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kpoker -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kreversi -Summary: Reversi for Trinity -Group: Amusements/Games/Board/Other - -%description -n trinity-kreversi -Reversi is a simple strategy game that is played by two -players. There is only one type of piece - one side of it is black, -the other white. If a player captures a piece on the board, that -piece is turned and belongs to that player. The winner is the person -that has more pieces of his own color on the board and if there are -no more moves possible. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kreversi -%defattr(-,root,root,-) -%{tde_bindir}/kreversi -%{tde_tdeappdir}/kreversi.desktop -%{tde_datadir}/apps/kreversi/ -%{tde_datadir}/config.kcfg/kreversi.kcfg -%{tde_datadir}/icons/crystalsvg/*/actions/lastmoves.png -%{tde_datadir}/icons/crystalsvg/*/actions/legalmoves.png -%{tde_datadir}/icons/crystalsvg/scalable/actions/lastmoves.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/legalmoves.svgz -%{tde_datadir}/icons/hicolor/*/apps/kreversi.png -%{tde_tdedocdir}/HTML/en/kreversi/ - -%post -n trinity-kreversi -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kreversi -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-ksame -Summary: SameGame for Trinity -Group: Amusements/Games/Strategy/Other - -%description -n trinity-ksame -KSame is a simple game. It's played by one player, so there is only -one winner :-) You play for fun and against the high score. It has -been inspired by SameGame, that is only famous on the Macintosh -platform. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-ksame -%defattr(-,root,root,-) -%{tde_bindir}/ksame -%{tde_datadir}/icons/hicolor/*/apps/ksame.png -%{tde_datadir}/apps/ksame/ -%{tde_tdeappdir}/ksame.desktop -%{tde_tdedocdir}/HTML/en/ksame/ - -%post -n trinity-ksame -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ksame -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kshisen -Summary: Shisen-Sho for Trinity -Group: Amusements/Games/Board/Other - -%description -n trinity-kshisen -KShisen-Sho is a single-player-game similar to Mahjongg and uses the -same set of tiles as Mahjongg. - -The object of the game is to remove all tiles from the field. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kshisen -%defattr(-,root,root,-) -%{tde_datadir}/apps/kshisen/ -%{tde_datadir}/config.kcfg/kshisen.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kshisen.png -%{tde_tdeappdir}/kshisen.desktop -%{tde_bindir}/kshisen -%{tde_tdedocdir}/HTML/en/kshisen/ - -%post -n trinity-kshisen -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kshisen -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-ksirtet -Summary: Tetris and Puyo-Puyo games for Trinity -Group: Amusements/Games/Board/Other - -%description -n trinity-ksirtet -This program is a clone of the well known game Tetris. You must fit -the falling pieces to form full lines. You can rotate and translate -the falling piece. The game ends when no more piece can fall ie when -your incomplete lines reach the top of the board. - -Every time you have destroyed 10 lines, you gain a level and the -pieces fall quicker (exactly the piece falls from a line each -1/(1+level) second). - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-ksirtet -%defattr(-,root,root,-) -%{tde_tdeappdir}/ksirtet.desktop -%{tde_datadir}/icons/hicolor/*/apps/ksirtet.png -%{tde_datadir}/apps/ksirtet/ -%{tde_bindir}/ksirtet -%{tde_datadir}/config.kcfg/ksirtet.kcfg -%{tde_tdedocdir}/HTML/en/ksirtet/ - -%post -n trinity-ksirtet -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ksirtet -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-ksmiletris -Summary: Tetris like game for Trinity -Group: Amusements/Games/Action/Arcade - -%description -n trinity-ksmiletris -This is a game with falling blocks composed of different types of -smilies. The object of the game is to "crack a smile" by guiding -blocks so there are two or more of the same symbol vertically. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-ksmiletris -%defattr(-,root,root,-) -%{tde_datadir}/apps/ksmiletris/ -%{tde_datadir}/icons/hicolor/*/apps/ksmiletris.png -%{tde_tdeappdir}/ksmiletris.desktop -%{tde_bindir}/ksmiletris -%{tde_tdedocdir}/HTML/en/ksmiletris/ - -%post -n trinity-ksmiletris -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ksmiletris -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-ksnake -Summary: Snake Race for Trinity -Group: Amusements/Games/Action/Arcade - -%description -n trinity-ksnake -Snake Race is a game of speed and agility. You are a hungry snake and -are trying to eat all the apples in the room before getting out! - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-ksnake -%defattr(-,root,root,-) -%{tde_datadir}/apps/ksnake/ -%{tde_datadir}/config.kcfg/ksnake.kcfg -%{tde_datadir}/icons/hicolor/*/apps/ksnake.png -%{tde_tdeappdir}/ksnake.desktop -%{tde_bindir}/ksnake -%{tde_tdedocdir}/HTML/en/ksnake/ - -%post -n trinity-ksnake -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ksnake -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-ksokoban -Summary: Sokoban game for Trinity -Group: Amusements/Games/Strategy/Other - -%description -n trinity-ksokoban -The first sokoban game was created in 1982 by Hiroyuki Imabayashi at -the Japanese company Thinking Rabbit, Inc. "Sokoban" is japanese for -"warehouse keeper". The idea is that you are a warehouse keeper -trying to push crates to their proper locations in a warehouse. - -The problem is that you cannot pull the crates or step over them. If -you are not careful, some of the crates can get stuck in wrong places -and/or block your way. - -It can be rather difficult just to solve a level. But if you want to -make it even harder, you can try to minimise the number of moves -and/or pushes you use to solve the level. - -To make the game more fun for small kids (below 10 years or so), some -collections with easier levels are also included in KSokoban. These -are marked (easy) in the level collection menu. Of course, these -levels can be fun for adults too, for example if you don't want to -expose yourself to too much mental strain. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-ksokoban -%defattr(-,root,root,-) -%{tde_tdeappdir}/ksokoban.desktop -%{tde_datadir}/icons/hicolor/*/apps/ksokoban.png -%{tde_bindir}/ksokoban -%{tde_tdedocdir}/HTML/en/ksokoban/ - -%post -n trinity-ksokoban -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ksokoban -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kspaceduel -Summary: Arcade two-player space game for Trinity -Group: Amusements/Games/Action/Arcade - -%description -n trinity-kspaceduel -KSpaceduel is an space arcade game for two players. - -Each player controls a ship that flies around the sun and tries to -shoot at the other ship. You can play KSpaceduel with another person, -against the computer, or you can have the computer control both ships -and play each other. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-kspaceduel -%defattr(-,root,root,-) -%{tde_datadir}/apps/kspaceduel/ -%{tde_datadir}/icons/hicolor/*/apps/kspaceduel.png -%{tde_tdeappdir}/kspaceduel.desktop -%{tde_bindir}/kspaceduel -%{tde_datadir}/config.kcfg/kspaceduel.kcfg -%{tde_tdedocdir}/HTML/en/kspaceduel/ - -%post -n trinity-kspaceduel -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kspaceduel -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-ktron -Summary: Tron clone for the K Desktop Environment -Group: Amusements/Games/Action/Arcade - -%description -n trinity-ktron -The object of the game is to avoid running into walls, your own tail, -and that of your opponent. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-ktron -%defattr(-,root,root,-) -%{tde_bindir}/ktron -%{tde_datadir}/icons/hicolor/*/apps/ktron.png -%{tde_tdeappdir}/ktron.desktop -%{tde_datadir}/apps/ktron/ -%{tde_datadir}/config.kcfg/ktron.kcfg -%{tde_tdedocdir}/HTML/en/ktron/ - -%post -n trinity-ktron -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ktron -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-ktuberling -Summary: Potato Guy for Trinity -Group: Amusements/Games/Action/Arcade - -%description -n trinity-ktuberling -KTuberling is a game intended for small children. Of course, it may -be suitable for adults who have remained young at heart. - -It is a potato editor. That means that you can drag and drop eyes, -mouths, moustache, and other parts of face and goodies onto a -potato-like guy. Similarly, you have a penguin on which you can drop -other stuff. - -There is no winner for the game. The only purpose is to make the -funniest faces you can. - -There is a museum (like a "Madame Tusseau" gallery) where you can -find many funny examples of decorated potatoes. Of course, you can -send your own creations to the programmer, Eric Bischoff, who will -include them in the museum if he gets some spare time. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-ktuberling -%defattr(-,root,root,-) -%{tde_bindir}/ktuberling -%{tde_datadir}/icons/hicolor/*/apps/ktuberling.png -%{tde_tdeappdir}/ktuberling.desktop -%{tde_datadir}/apps/ktuberling/ -%{tde_datadir}/mimelnk/application/x-tuberling.desktop -%{tde_tdedocdir}/HTML/en/ktuberling/ - -%post -n trinity-ktuberling -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ktuberling -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-twin4 -Summary: Connect Four clone for Trinity -Group: Amusements/Games/Board/Other - -%description -n trinity-twin4 -Four wins is a game for two players. Each player is represented by a -colour (yellow and red). The goal of the game is to get four -connected pieces of your colour into a row, column or any -diagonal. This is done by placing one of your pieces into any of the -seven columns. A piece will begin to fill a column from the bottom, -i.e. it will fall down until it reaches the ground level or another -stone. After a move is done it is the turn of the other player. This -is repeated until the game is over, i.e. one of the players has four -pieces in a row, column or diagonal or no more moves are possible -because the board is filled. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-twin4 -%defattr(-,root,root,-) -%{tde_bindir}/kwin4 -%{tde_bindir}/kwin4proc -%{tde_datadir}/apps/kwin4/ -%{tde_datadir}/config.kcfg/kwin4.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kwin4.png -%{tde_tdeappdir}/kwin4.desktop -%{tde_tdedocdir}/HTML/en/kwin4/ - -%post -n trinity-twin4 -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-twin4 -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-lskat -Summary: Lieutnant Skat card game for Trinity -Group: Amusements/Games/Board/Card - -%description -n trinity-lskat -Lieutnant Skat (from German Offiziersskat) is a card game for two -players. It is roughly played according to the rules of Skat but with -only two players and simplified rules. - -Every player has a set of cards in front of him/her, half of them -covered and half of them open. Both players try to win more than 60 -of the 120 possible points. After 16 moves all cards are played and -the game ends. - -This package is part of Trinity, and a component of the TDE games module. - -%files -n trinity-lskat -%defattr(-,root,root,-) -%{tde_bindir}/lskat -%{tde_bindir}/lskatproc -%{tde_datadir}/apps/lskat/ -%{tde_datadir}/icons/hicolor/*/apps/lskat.png -%{tde_tdeappdir}/lskat.desktop -%{tde_tdedocdir}/HTML/en/lskat/ - -%post -n trinity-lskat -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-lskat -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/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 -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -# Do not build against any "/usr" installed KDE -export KDEDIR="%{tde_prefix}" - -# Specific path for RHEL4 -if [ -d "/usr/X11R6" ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --disable-setgid - -# WTF hack for RHEL4 -%if 0%{?rhel} == 4 -mkdir atlantik/libatlantic/.libs -ln -s . atlantik/libatlantic/.libs/.libs -%endif - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Updates applications categories for openSUSE -%if 0%{?suse_version} -%suse_update_desktop_file -r kasteroids Game ArcadeGame -%suse_update_desktop_file -r KGoldrunner Game ArcadeGame -%suse_update_desktop_file -r ksnake Game ArcadeGame -%suse_update_desktop_file -r kspaceduel Game ArcadeGame -%suse_update_desktop_file -r ktron Game ArcadeGame -%suse_update_desktop_file -r kfouleggs Game BlocksGame -%suse_update_desktop_file -r ksirtet Game BlocksGame -%suse_update_desktop_file -r klickety Game BoardGame -%suse_update_desktop_file -r ksmiletris Game BlocksGame -%suse_update_desktop_file -r ktuberling Game KidsGame -%suse_update_desktop_file -r atlantik Game BoardGame -%suse_update_desktop_file -r kbackgammon Game BoardGame -%suse_update_desktop_file -r kbattleship Game BoardGame -%suse_update_desktop_file -r kblackbox Game BoardGame -%suse_update_desktop_file -r kenolaba Game BoardGame -%suse_update_desktop_file -r kmahjongg Game BoardGame -%suse_update_desktop_file -r kreversi Game BoardGame -%suse_update_desktop_file -r kshisen Game BoardGame -%suse_update_desktop_file -r kwin4 Game BoardGame -%suse_update_desktop_file -r kpat Game CardGame -%suse_update_desktop_file -r kpoker Game CardGame -%suse_update_desktop_file -r lskat Game CardGame -%suse_update_desktop_file -r katomic Game LogicGame -%suse_update_desktop_file -r kjumpingcube Game LogicGame -%suse_update_desktop_file -r klines Game LogicGame -%suse_update_desktop_file -r -G "Tactical Game" knetwalk Game LogicGame -%suse_update_desktop_file -r kmines Game LogicGame -%suse_update_desktop_file -r konquest Game LogicGame -%suse_update_desktop_file -r ksame Game LogicGame -%suse_update_desktop_file -r ksokoban Game LogicGame -%suse_update_desktop_file -r kbounce Game LogicGame -%suse_update_desktop_file -r kolf Game SportsGame -%endif - -# Links duplicate files -%fdupes "%{?buildroot}" - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/main/tdegames/tdegames-14.0.0.spec b/redhat/main/tdegames/tdegames.spec index 993f41a18..fd249f8ca 100644 --- a/redhat/main/tdegames/tdegames-14.0.0.spec +++ b/redhat/main/tdegames/tdegames.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdegames %define tde_prefix /opt/trinity @@ -71,6 +71,20 @@ BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: libtool +# AVAHI support +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define with_avahi 1 +BuildRequires: libavahi-tqt-devel >= 1:0.6.30 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}avahi-client-devel +Requires: %{_lib}avahi-client3 +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +BuildRequires: avahi-devel +Requires: avahi +%endif +%endif + # IDN support BuildRequires: libidn-devel @@ -174,6 +188,7 @@ TDE desktop. %files devel %defattr(-,root,root,-) %{tde_datadir}/cmake/libtdegames.cmake +%{tde_libdir}/pkgconfig/libtdegames.pc ########## @@ -679,7 +694,7 @@ This package is part of Trinity, and a component of the TDE games module. %files -n trinity-kolf %defattr(-,root,root,-) -%{tde_confdir}/magic/kolf.magic +%config(noreplace) %{tde_confdir}/magic/kolf.magic %{tde_datadir}/apps/kolf/ %{tde_bindir}/kolf %{tde_tdeappdir}/kolf.desktop @@ -693,7 +708,7 @@ This package is part of Trinity, and a component of the TDE games module. %{tde_libdir}/libkolf.so.1 %{tde_libdir}/libkolf.so.1.2.0 %{tde_tdedocdir}/HTML/en/kolf/ -%{tde_confdir}/magic/kolf.magic.mgc +%config(noreplace) %{tde_confdir}/magic/kolf.magic.mgc ########## diff --git a/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec b/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec deleted file mode 100644 index a625a2b6a..000000000 --- a/redhat/main/tdegraphics/tdegraphics-3.5.13.2.spec +++ /dev/null @@ -1,1332 +0,0 @@ -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-tdegraphics -Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist} - -License: GPL -Summary: Trinity Desktop Environment - Graphics Applications - -Group: Applications/Multimedia -Prefix: %{tde_prefix} - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - -# TDE -## RHEL / Fedora specific patches -# [kdegraphics/kpdf/xpdf] Disable 'mkstemps' support for RHEL5 -Patch3: kdegraphics-3.5.13-xpdf_disable_mkstemps.patch - -# [tdegraphics] Fix build on RHEL4 -Patch201: kdegraphics-3.5.13.1-fix_rhel4_libraries.patch - -BuildRequires: cmake >= 2.8 -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} -BuildRequires: trinity-tdebase-devel >= %{version} -BuildRequires: gettext -BuildRequires: libmng-devel -%if 0%{?mdkversion} && 0%{?pclinuxos} == 0 -BuildRequires: %{_lib}png15-devel -%else -BuildRequires: libpng-devel -%endif -BuildRequires: libtiff-devel -BuildRequires: automake libtool -BuildRequires: libusb-devel -BuildRequires: pcre-devel - -# GIF support -%if 0%{?suse_version} -BuildRequires: giflib-devel -%else -BuildRequires: libungif-devel -%endif - -# GPHOTO2 support -%if 0%{?suse_version} -BuildRequires: libgphoto2-devel -%else -BuildRequires: gphoto2-devel -%endif - -# PAPER support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_paper 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}paper-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: libpaper-devel -%endif -%endif - -# T1LIB support -%if 0%{?suse_version} && 0%{?suse_version} <= 1230 -%define with_t1lib 1 -BuildRequires: t1lib-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} -%define with_t1lib 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}t1lib-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} -BuildRequires: t1lib-devel -%endif -%endif - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}sane1-devel -# kuickshow -#BuildRequires: %{_lib}imlib-devel -# kpovmodeler -BuildRequires: %{_lib}xi-devel -# kgamma -BuildRequires: %{_lib}xxf86vm-devel -# ksvg -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xmu-devel -%else -BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel -%endif -# kpovmodeler -BuildRequires: %{_lib}mesagl1-devel -BuildRequires: %{_lib}mesaglu1-devel -%else -BuildRequires: sane-backends-devel - -# kuickshow -#BuildRequires: imlib-devel - -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%else -BuildRequires: libdrm-devel - -# kpovmodeler -%if 0%{?suse_version} == 1140 -BuildRequires: libXi6-devel -%else -BuildRequires: libXi-devel - -# kgamma -BuildRequires: libXxf86vm-devel -%endif - -# ksvg -%if 0%{?suse_version} == 1140 -BuildRequires: xorg-x11-libXmu-devel -%else -BuildRequires: libXmu-devel -%endif -%endif - -# kpovmodeler -%if 0%{?suse_version} -%if 0%{?suse_version} >= 1220 -BuildRequires: Mesa-libGL-devel -BuildRequires: Mesa-libGLU-devel -%else -BuildRequires: Mesa-devel -%endif -%else -BuildRequires: libGL-devel -BuildRequires: libGLU-devel -%endif -%endif - -#kfile-plugin -BuildRequires: OpenEXR-devel - -# kpdf -%if 0%{?suse_version} == 1140 -BuildRequires: freetype2-devel -%else -BuildRequires: freetype-devel -%endif - -# poppler -%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version} -BuildRequires: poppler-devel >= 0.12 -#BuildRequires: poppler-qt-devel >= 0.12 -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}poppler-devel -%endif -%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 -# On RHEL 5, the distro-provided poppler is too old. We built a newer one. -BuildRequires: trinity-poppler-devel >= 0.12 -BuildRequires: trinity-poppler-qt3-devel >= 0.12 -%endif - -# ksvg -BuildRequires: fontconfig-devel -%if 0%{?suse_version} -BuildRequires: liblcms-devel -%else -BuildRequires: lcms-devel -%endif -BuildRequires: libart_lgpl-devel - -# kuickshow -#define build_kuickshow 1 -BuildRequires: fribidi-devel - -# kamera -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -%define build_kamera 1 -%endif - -# kmrml -#define build_kmrml 1 -#Requires: gift -Obsoletes: trinity-kmrml - -Obsoletes: trinity-kdegraphics < %{version}-%{release} -Provides: trinity-kdegraphics = %{version}-%{release} -Obsoletes: trinity-kdegraphics-libs < %{version}-%{release} -Provides: trinity-kdegraphics-libs = %{version}-%{release} -Obsoletes: trinity-kdegraphics-extras < %{version}-%{release} -Provides: trinity-kdegraphics-extras = %{version}-%{release} - - -%{?build_kamera:Requires: trinity-kamera = %{version}-%{release}} -Requires: trinity-kcoloredit = %{version}-%{release} -Requires: %{name}-kfile-plugins = %{version}-%{release} -Requires: trinity-kdvi = %{version}-%{release} -Requires: trinity-kfax = %{version}-%{release} -Requires: trinity-kfaxview = %{version}-%{release} -Requires: trinity-kgamma = %{version}-%{release} -Requires: trinity-kghostview = %{version}-%{release} -Requires: trinity-kiconedit = %{version}-%{release} -%{?build_kmrml:Requires: trinity-kmrml = %{version}-%{release}} -Requires: trinity-kolourpaint = %{version}-%{release} -Requires: trinity-kooka = %{version}-%{release} -Requires: trinity-kpdf = %{version}-%{release} -Requires: trinity-kpovmodeler = %{version}-%{release} -Requires: trinity-kruler = %{version}-%{release} -Requires: trinity-ksnapshot = %{version}-%{release} -Requires: trinity-ksvg = %{version}-%{release} -Requires: trinity-kview = %{version}-%{release} -Requires: trinity-kviewshell = %{version}-%{release} -Requires: trinity-libkscan = %{version}-%{release} -Requires: trinity-libpoppler-tqt = %{version}-%{release} - -%description -Graphics applications for the Trinity Desktop Environment, including -%if 0%{?build_kamera} -* kamera (digital camera support) -%endif -* kcoloredit (palette editor and color chooser) -* kdvi (displays TeX .dvi files) -* kfax -* kfaxview -* kghostview (displays postscript files) -* kiconedit (icon editor) -* kooka (scanner application) -* kpdf (displays PDF files) -* kpovmodler -* kruler (screen ruler and color measurement tool) -* ksnapshot (screen capture utility) -* kview (image viewer for GIF, JPEG, TIFF, etc.) - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog README - -########## - -%if 0%{?build_kamera} - -%package -n trinity-kamera -Summary: Digital camera io_slave for Konqueror -Group: Applications/Graphics - -%description -n trinity-kamera -This is a digital camera io_slave for TDE which uses gphoto2 and libgpio -to allow access to your camera's pictures with the URL camera:/ - -%post -n trinity-kamera -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kamera -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%files -n trinity-kamera -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcm_kamera.la -%{tde_tdelibdir}/kcm_kamera.so -%{tde_tdelibdir}/kio_kamera.la -%{tde_tdelibdir}/kio_kamera.so -%{tde_tdeappdir}/kamera.desktop -%{tde_datadir}/icons/crystalsvg/*/actions/camera_test.png -%{tde_datadir}/icons/crystalsvg/*/apps/camera.png -%{tde_datadir}/icons/crystalsvg/*/devices/camera.png -%{tde_datadir}/icons/crystalsvg/*/filesystems/camera.png -%{tde_datadir}/services/camera.protocol -%{tde_tdedocdir}/HTML/en/kamera/ - -%endif - -########## - -%package -n trinity-kcoloredit -Summary: A color palette editor and color picker for TDE -Group: Applications/Graphics - -%description -n trinity-kcoloredit -This package contains two programs, a color palette editor and also a color -picker. - -%files -n trinity-kcoloredit -%defattr(-,root,root,-) -%{tde_bindir}/kcolorchooser -%{tde_bindir}/kcoloredit -%{tde_tdeappdir}/kcolorchooser.desktop -%{tde_tdeappdir}/kcoloredit.desktop -%{tde_datadir}/apps/kcoloredit/kcoloreditui.rc -%{tde_datadir}/icons/hicolor/*/apps/kcolorchooser.png -%{tde_datadir}/icons/hicolor/*/apps/kcoloredit.png -%{tde_tdedocdir}/HTML/en/kcoloredit/ - -%post -n trinity-kcoloredit -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kcoloredit -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package kfile-plugins -Summary: TDE metainfo plugins for graphic files -Group: Environment/Libraries - -%description kfile-plugins -This packages provides meta information for graphic files (file sizes, -tags, etc. all from within the file manager). - -%files kfile-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/gsthumbnail.la -%{tde_tdelibdir}/gsthumbnail.so -%{tde_tdelibdir}/kfile_bmp.la -%{tde_tdelibdir}/kfile_bmp.so -%{tde_tdelibdir}/kfile_dds.la -%{tde_tdelibdir}/kfile_dds.so -%{tde_tdelibdir}/kfile_dvi.la -%{tde_tdelibdir}/kfile_dvi.so -%{tde_tdelibdir}/kfile_exr.la -%{tde_tdelibdir}/kfile_exr.so -%{tde_tdelibdir}/kfile_gif.la -%{tde_tdelibdir}/kfile_gif.so -%{tde_tdelibdir}/kfile_ico.la -%{tde_tdelibdir}/kfile_ico.so -%{tde_tdelibdir}/kfile_jpeg.la -%{tde_tdelibdir}/kfile_jpeg.so -%{tde_tdelibdir}/kfile_pcx.la -%{tde_tdelibdir}/kfile_pcx.so -%{tde_tdelibdir}/kfile_pdf.la -%{tde_tdelibdir}/kfile_pdf.so -%{tde_tdelibdir}/kfile_png.la -%{tde_tdelibdir}/kfile_png.so -%{tde_tdelibdir}/kfile_pnm.la -%{tde_tdelibdir}/kfile_pnm.so -%{tde_tdelibdir}/kfile_ps.la -%{tde_tdelibdir}/kfile_ps.so -%{tde_tdelibdir}/kfile_raw.la -%{tde_tdelibdir}/kfile_raw.so -%{tde_tdelibdir}/kfile_rgb.la -%{tde_tdelibdir}/kfile_rgb.so -%{tde_tdelibdir}/kfile_tga.la -%{tde_tdelibdir}/kfile_tga.so -%{tde_tdelibdir}/kfile_tiff.la -%{tde_tdelibdir}/kfile_tiff.so -%{tde_tdelibdir}/kfile_xbm.la -%{tde_tdelibdir}/kfile_xbm.so -%{tde_tdelibdir}/kfile_xpm.la -%{tde_tdelibdir}/kfile_xpm.so -%{tde_datadir}/services/gsthumbnail.desktop -%{tde_datadir}/services/kfile_bmp.desktop -%{tde_datadir}/services/kfile_dds.desktop -%{tde_datadir}/services/kfile_dvi.desktop -%{tde_datadir}/services/kfile_exr.desktop -%{tde_datadir}/services/kfile_gif.desktop -%{tde_datadir}/services/kfile_ico.desktop -%{tde_datadir}/services/kfile_jpeg.desktop -%{tde_datadir}/services/kfile_pcx.desktop -%{tde_datadir}/services/kfile_pdf.desktop -%{tde_datadir}/services/kfile_png.desktop -%{tde_datadir}/services/kfile_pnm.desktop -%{tde_datadir}/services/kfile_ps.desktop -%{tde_datadir}/services/kfile_raw.desktop -%{tde_datadir}/services/kfile_rgb.desktop -%{tde_datadir}/services/kfile_tga.desktop -%{tde_datadir}/services/kfile_tiff.desktop -%{tde_datadir}/services/kfile_xbm.desktop -%{tde_datadir}/services/kfile_xpm.desktop - -########## - -%package -n trinity-kdvi -Summary: Dvi viewer for TDE -Group: Applications/Graphics - -%description -n trinity-kdvi -This program and KPart allow the user to display *.DVI files from TeX. - -%files -n trinity-kdvi -%defattr(-,root,root,-) -%{tde_bindir}/kdvi -%{tde_tdelibdir}/kdvipart.la -%{tde_tdelibdir}/kdvipart.so -%{tde_tdeappdir}/kdvi.desktop -%{tde_datadir}/apps/kdvi/ -%{tde_datadir}/config.kcfg/kdvi.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kdvi.png -%{tde_datadir}/icons/hicolor/scalable/apps/kdvi.svgz -%{tde_datadir}/services/kdvimultipage.desktop -%{tde_tdedocdir}/HTML/en/kdvi/ - -%post -n trinity-kdvi -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kdvi -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kfax -Summary: G3/G4 fax viewer for Trinity -Group: Applications/Graphics -Requires: libtiff - -%description -n trinity-kfax -A fax viewer for Trinity, supporting the display of raw and tiffed fax images -(g3, g3-2d, g4). - -%files -n trinity-kfax -%defattr(-,root,root,-) -%{tde_bindir}/kfax -%{tde_tdeappdir}/kfax.desktop -%{tde_datadir}/apps/kfax/ -%{tde_datadir}/icons/hicolor/??x??/apps/kfax.png -%{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz - -%post -n trinity-kfax -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kfax -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kfaxview -Summary: G3/G4 fax viewer for Trinity using kviewshell -Group: Applications/Graphics - -%description -n trinity-kfaxview -A fax viewer for Trinity, supporting the display of raw and tiffed fax images -(g3, g3-2d, g4). - -This faxviewer uses kviewshell and is intended to replace the standalone -kfax application once it reproduces all of kfax's features. - -%files -n trinity-kfaxview -%defattr(-,root,root,-) -%{tde_bindir}/kfaxview -%{tde_libdir}/libkfaximage.so.* -%{tde_tdelibdir}/kfaxviewpart.* -%{tde_tdeappdir}/kfaxview.desktop -%{tde_datadir}/apps/kfaxview/ -%{tde_datadir}/icons/hicolor/??x??/apps/kfaxview.png -%{tde_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz -%{tde_datadir}/services/kfaxmultipage.desktop -%{tde_datadir}/services/kfaxmultipage_tiff.desktop - -%post -n trinity-kfaxview -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -%postun -n trinity-kfaxview -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -########## - -%package -n trinity-kgamma -Summary: Gamma correction module for the Trinity Control Center -Group: Applications/Graphics - -%description -n trinity-kgamma -KGamma is a Trinity Control Center module for gamma calibration/correction -of XFree86. With proper gamma settings, your display (websites, images, -etc.) will look the same on your monitor as on other monitors. - -Homepage: http://kgamma.berlios.de/index2.php - -%files -n trinity-kgamma -%defattr(-,root,root,-) -%{tde_bindir}/xf86gammacfg -%{tde_tdelibdir}/kcm_kgamma.la -%{tde_tdelibdir}/kcm_kgamma.so -%{tde_tdeappdir}/kgamma.desktop -%{tde_datadir}/apps/kgamma/ -%{tde_datadir}/icons/hicolor/*/apps/kgamma.png -%{tde_tdedocdir}/HTML/en/kgamma/ - -%post -n trinity-kgamma -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kgamma -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kghostview -Summary: PostScript viewer for Trinity -Group: Applications/Graphics -Requires: ghostscript - -%description -n trinity-kghostview -KGhostview is Trinity's PostScript viewer. It is a port of Tim Theisen's -Ghostview program which is used to view documents prepared in Adobe's -PostScript page description language. PostScript is the major page -description language for printing on UNIX systems, and this application is -useful to preview material intended for printing, or for reading documents -online. - -%files -n trinity-kghostview -%defattr(-,root,root,-) -%{tde_bindir}/kghostview -%{tde_tdelibdir}/libkghostviewpart.la -%{tde_tdelibdir}/libkghostviewpart.so -%{tde_libdir}/libkghostviewlib.so.* -%{tde_tdeappdir}/kghostview.desktop -%{tde_datadir}/apps/kconf_update/kghostview.upd -%{tde_datadir}/apps/kconf_update/update-to-xt-names.pl -%{tde_datadir}/apps/kghostview/ -%{tde_datadir}/config.kcfg/kghostview.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kghostview.png -%{tde_datadir}/services/kghostview_part.desktop -%{tde_tdedocdir}/HTML/en/kghostview/ - -%post -n trinity-kghostview -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -%postun -n trinity-kghostview -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -########## - -%package -n trinity-tdeiconedit -Summary: An icon editor for Trinity -Group: Applications/Graphics - -Obsoletes: trinity-kiconedit < %{version}-%{release} -Provides: trinity-kiconedit = %{version}-%{release} - -%description -n trinity-tdeiconedit -TDEIconedit allows you easily to create and edit icons. - -%files -n trinity-tdeiconedit -%defattr(-,root,root,-) -%{tde_bindir}/kiconedit -%{tde_tdeappdir}/kiconedit.desktop -%{tde_datadir}/apps/kiconedit/ -%{tde_datadir}/icons/hicolor/*/apps/kiconedit.png -%{tde_tdedocdir}/HTML/en/kiconedit/ - -%post -n trinity-tdeiconedit -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-tdeiconedit -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%if 0%{?build_kmrml} - -%package -n trinity-kmrml -Summary: A Konqueror plugin for searching pictures -Group: Applications/Graphics - -%description -n trinity-kmrml -MRML is short for Multimedia Retrieval Markup Language, which defines a -protocol for querying a server for images based on their content. See -http://www.mrml.net about MRML and the GNU Image Finding Tool (GIFT), an -MRML server. - -%files -n trinity-kmrml -%defattr(-,root,root,-) -%{tde_bindir}/mrmlsearch -%{tde_tdelibdir}/kcm_kmrml.la -%{tde_tdelibdir}/kcm_kmrml.so -%{tde_tdelibdir}/kded_daemonwatcher.la -%{tde_tdelibdir}/kded_daemonwatcher.so -%{tde_tdelibdir}/kio_mrml.la -%{tde_tdelibdir}/kio_mrml.so -%{tde_tdelibdir}/libkmrmlpart.la -%{tde_tdelibdir}/libkmrmlpart.so -%{tde_tdelibdir}/mrmlsearch.la -%{tde_tdelibdir}/mrmlsearch.so -%{tde_libdir}/libkdeinit_mrmlsearch.so -%{tde_tdeappdir}/kcmkmrml.desktop -%{tde_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop -%{tde_datadir}/mimelnk/text/mrml.desktop -%{tde_datadir}/services/kded/daemonwatcher.desktop -%{tde_datadir}/services/mrml.protocol -%{tde_datadir}/services/mrml_part.desktop - -%post -n trinity-kmrml -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -%postun -n trinity-kmrml -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -%endif - -########## - -%package -n trinity-kolourpaint -Summary: A simple paint program for Trinity -Group: Applications/Graphics - -%description -n trinity-kolourpaint -KolourPaint is a very simple paint program for Trinity. It aims to be -conceptually simple to understand; providing a level of functionality -targeted towards the average user. It's designed for daily tasks like: - -* Painting - drawing diagrams and "finger painting" -* Image Manipulation - editing screenshots and photos; applying effects -* Icon Editing - drawing clipart and logos with transparency - -It's not an unusable and monolithic program where simple tasks like -drawing lines become near impossible. Nor is it so simple that it lacks -essential features like Undo/Redo. - -Homepage: http://kolourpaint.sourceforge.net - -%files -n trinity-kolourpaint -%defattr(-,root,root,-) -%{tde_bindir}/kolourpaint -%{tde_tdeappdir}/kolourpaint.desktop -%{tde_datadir}/apps/kolourpaint/ -%{tde_datadir}/icons/hicolor/*/apps/kolourpaint.png -%{tde_datadir}/icons/hicolor/scalable/apps/kolourpaint.svgz -%{tde_tdedocdir}/HTML/en/kolourpaint/ - -%post -n trinity-kolourpaint -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kolourpaint -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kooka -Summary: Scanner program for Trinity -Group: Applications/Graphics - -%description -n trinity-kooka -Kooka is an open source GNU/Linux scan program based on SANE and -KScan library. - -Kooka helps you to handle the most important scan parameters, find the -correct image file format to save and manage your scanned images. It -offers support for different OCR modules. Libkscan, a autonomous part -of Kooka, provides a scan service for easy and consistent use to all -KDE applications. - -Install ocrad or gocr if you wish to enable optical character recognition -in kooka. - -Homepage: http://kooka.kde.org/ - -%files -n trinity-kooka -%defattr(-,root,root,-) -%{tde_datadir}/config/kookarc -%{tde_bindir}/kooka -%{tde_tdeappdir}/kooka.desktop -%{tde_datadir}/apps/kooka/ -%{tde_tdedocdir}/HTML/en/kooka/ - -%post -n trinity-kooka -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kooka -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kpdf -Summary: PDF viewer for Trinity -Group: Applications/Graphics -#Recommends: kghostview-trinity (= ${binary:Version}) - -%description -n trinity-kpdf -KPDF allows you to view PDF (Portable Document Format) files. This package -includes kpdfpart so you can embed in konqueror or run as a standalone -application. - -%files -n trinity-kpdf -%defattr(-,root,root,-) -%{tde_bindir}/kpdf -%{tde_tdelibdir}/libkpdfpart.la -%{tde_tdelibdir}/libkpdfpart.so -%{tde_tdeappdir}/kpdf.desktop -%{tde_datadir}/apps/kpdf/shell.rc -%{tde_datadir}/apps/kpdfpart/part.rc -%{tde_datadir}/config.kcfg/kpdf.kcfg -%{tde_tdedocdir}/HTML/en/kpdf/ -%{tde_datadir}/icons/hicolor/*/apps/kpdf.png -%{tde_datadir}/icons/hicolor/scalable/apps/kpdf.svgz -%{tde_datadir}/services/kpdf_part.desktop - -%post -n trinity-kpdf -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kpdf -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kpovmodeler -Summary: A graphical editor for povray scenes -Group: Applications/Graphics -#Requires: povray - -%description -n trinity-kpovmodeler -KPovmodeler is KDE's graphical editor for povray scenes. KPovModeler is a -modeling and composition program for creating POV-Ray scenes in KDE. - -For most modelers, POV-Ray is nothing but a rendering engine. This greatly -limits the innate possibilities of the POV-Ray scripted language. This -is not the case for KPovModeler, which allows you to use all the features -of POV-Ray through the translation of POV-Ray language into a graphical -tree. - -kpovmodeler uses the povray package, currently available only in Debian's -non-free, unsupported repository. - -Homepage: http://www.kpovmodeler.org - -%files -n trinity-kpovmodeler -%defattr(-,root,root,-) -%{tde_bindir}/kpovmodeler -%{tde_libdir}/libkpovmodeler.so.* -%{tde_tdelibdir}/libkpovmodelerpart.* -%{tde_tdeappdir}/kpovmodeler.desktop -%{tde_datadir}/apps/kpovmodeler/ -%{tde_datadir}/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* -%{tde_datadir}/icons/hicolor/*/apps/kpovmodeler.* -%doc %{tde_tdedocdir}/HTML/en/kpovmodeler/ - -%post -n trinity-kpovmodeler -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -%postun -n trinity-kpovmodeler -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -########## - -%package -n trinity-kruler -Summary: A screen ruler and color measurement tool for Trinity -Group: Applications/Graphics - -%description -n trinity-kruler -Kruler is a screen ruler (using pixels) and color measurement tool for KDE. - -%files -n trinity-kruler -%defattr(-,root,root,-) -%{tde_bindir}/kruler -%{tde_tdeappdir}/kruler.desktop -%{tde_datadir}/applnk/Graphics/kruler.desktop -%{tde_datadir}/apps/kruler/ -%{tde_datadir}/icons/hicolor/*/apps/kruler.png -%{tde_tdedocdir}/HTML/en/kruler/ - -%post -n trinity-kruler -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kruler -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-ksnapshot -Summary: Screenshot utility for Trinity -Group: Applications/Graphics - -%description -n trinity-ksnapshot -KSnapshot is a simple applet for taking screenshots. It is capable of -capturing images of either the whole desktop or just a single window. -The images can then be saved in a variety of formats. - -%files -n trinity-ksnapshot -%defattr(-,root,root,-) -%{tde_bindir}/ksnapshot -%{tde_tdeappdir}/ksnapshot.desktop -%{tde_datadir}/icons/hicolor/*/apps/ksnapshot.png -%{tde_datadir}/icons/hicolor/scalable/apps/ksnapshot.svgz -%{tde_tdedocdir}/HTML/en/ksnapshot/ - -%post -n trinity-ksnapshot -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ksnapshot -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-ksvg -Summary: SVG viewer for Trinity -Group: Applications/Graphics - -%description -n trinity-ksvg -KSVG allows you view SVG (scalable vector graphics) files. This package -includes kpart so you can embed it in konqueror and a standalone -application. - -%files -n trinity-ksvg -%defattr(-,root,root,-) -%{tde_bindir}/printnodetest -%{tde_bindir}/svgdisplay -%{tde_tdelibdir}/libksvgplugin.la -%{tde_tdelibdir}/libksvgplugin.so -%{tde_tdelibdir}/libksvgrendererlibart.la -%{tde_tdelibdir}/libksvgrendererlibart.so -%{tde_tdelibdir}/svgthumbnail.la -%{tde_tdelibdir}/svgthumbnail.so -%{tde_libdir}/libksvg.so.0 -%{tde_libdir}/libksvg.so.0.0.1 -%{tde_libdir}/libtext2path.so.0 -%{tde_libdir}/libtext2path.so.0.0.0 -%{tde_datadir}/apps/ksvg/ksvgplugin.rc -%{tde_datadir}/services/ksvglibartcanvas.desktop -%{tde_datadir}/services/ksvgplugin.desktop -%{tde_datadir}/services/svgthumbnail.desktop -%{tde_datadir}/servicetypes/ksvgrenderer.desktop - -%post -n trinity-ksvg -/sbin/ldconfig || : - -%postun -n trinity-ksvg -/sbin/ldconfig || : - -########## - -%package -n trinity-kview -Summary: Simple image viewer/converter for Trinity -Group: Applications/Graphics - -%description -n trinity-kview -KView is a simple image viewer and converter application. It supports -a number of plugins, which add an array of basic editing capabilities -as well. - -%files -n trinity-kview -%defattr(-,root,root,-) -%{tde_bindir}/kview -%{tde_tdelibdir}/kcm_kviewcanvasconfig.la -%{tde_tdelibdir}/kcm_kviewcanvasconfig.so -%{tde_tdelibdir}/kcm_kviewgeneralconfig.la -%{tde_tdelibdir}/kcm_kviewgeneralconfig.so -%{tde_tdelibdir}/kcm_kviewpluginsconfig.la -%{tde_tdelibdir}/kcm_kviewpluginsconfig.so -%{tde_tdelibdir}/kcm_kviewpresenterconfig.la -%{tde_tdelibdir}/kcm_kviewpresenterconfig.so -%{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.la -%{tde_tdelibdir}/kcm_kviewviewerpluginsconfig.so -%{tde_tdelibdir}/kview.la -%{tde_tdelibdir}/kview.so -%{tde_tdelibdir}/kview_browserplugin.la -%{tde_tdelibdir}/kview_browserplugin.so -%{tde_tdelibdir}/kview_effectsplugin.la -%{tde_tdelibdir}/kview_effectsplugin.so -%{tde_tdelibdir}/kview_presenterplugin.la -%{tde_tdelibdir}/kview_presenterplugin.so -%{tde_tdelibdir}/kview_scannerplugin.la -%{tde_tdelibdir}/kview_scannerplugin.so -%{tde_tdelibdir}/libkviewcanvas.la -%{tde_tdelibdir}/libkviewcanvas.so -%{tde_tdelibdir}/libkviewviewer.la -%{tde_tdelibdir}/libkviewviewer.so -%{tde_libdir}/libkdeinit_kview.so -%{tde_libdir}/libkimageviewer.so.* -%{tde_tdelibdir}/libphotobook.la -%{tde_tdelibdir}/libphotobook.so -%{tde_tdeappdir}/kview.desktop -%{tde_datadir}/apps/kview/ -%{tde_datadir}/apps/kviewviewer/ -%{tde_datadir}/apps/photobook/photobookui.rc -%{tde_datadir}/icons/crystalsvg/*/apps/photobook.png -%{tde_datadir}/icons/hicolor/*/apps/kview.png -%{tde_datadir}/services/kconfiguredialog/kviewcanvasconfig.desktop -%{tde_datadir}/services/kconfiguredialog/kviewgeneralconfig.desktop -%{tde_datadir}/services/kconfiguredialog/kviewpluginsconfig.desktop -%{tde_datadir}/services/kconfiguredialog/kviewpresenterconfig.desktop -%{tde_datadir}/services/kconfiguredialog/kviewviewerpluginsconfig.desktop -%{tde_datadir}/services/kviewcanvas.desktop -%{tde_datadir}/services/kviewviewer.desktop -%{tde_datadir}/services/photobook.desktop -%{tde_datadir}/servicetypes/kimageviewer.desktop -%{tde_datadir}/servicetypes/kimageviewercanvas.desktop -%{tde_tdedocdir}/HTML/en/kview/ - -%post -n trinity-kview -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -%postun -n trinity-kview -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -/sbin/ldconfig || : - -########## - -%package -n trinity-kviewshell -Summary: Generic framework for viewer applications in Trinity -Group: Applications/Graphics - -%description -n trinity-kviewshell -KViewShell is a generic viewing framework that allows the graphical -applications, such as the kview image viewer, to be embedded in other -KDE applications, such as Konqueror. - -KViewShell comes with a djvuviewpart plugin included, for viewing -DjVu images. - -%files -n trinity-kviewshell -%defattr(-,root,root,-) -%{tde_bindir}/kviewshell -%{tde_libdir}/libdjvu.la -%{tde_libdir}/libdjvu.so -%{tde_tdelibdir}/djvuviewpart.so -%{tde_tdelibdir}/djvuviewpart.la -%{tde_tdelibdir}/emptymultipagepart.la -%{tde_tdelibdir}/emptymultipagepart.so -%{tde_tdelibdir}/kviewerpart.la -%{tde_tdelibdir}/kviewerpart.so -%{tde_libdir}/libkmultipage.so.* -%{tde_datadir}/apps/djvumultipage.rc -%{tde_datadir}/apps/kviewerpart/ -%{tde_datadir}/apps/kviewshell/kviewshell.rc -%{tde_datadir}/config.kcfg/djvumultipage.kcfg -%{tde_datadir}/config.kcfg/kviewshell.kcfg -%{tde_datadir}/icons/crystalsvg/*/apps/kviewshell.png -%{tde_datadir}/services/emptymultipage.desktop -%{tde_datadir}/services/djvumultipage.desktop -%{tde_datadir}/servicetypes/kmultipage.desktop - -%post -n trinity-kviewshell -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -%postun -n trinity-kviewshell -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -########## - -%package -n trinity-libkscan -Summary: Scanner library for Trinity -Group: Environment/Libraries - -%description -n trinity-libkscan -KScan is TDE's scanner library. It's used by kooka and by koffice currently. -It provides an easy-to-use library, which allows you to access your scanner -(as long as it's sane compatible). - -%files -n trinity-libkscan -%defattr(-,root,root,-) -%{tde_libdir}/libkscan.so.* -%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_color.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_gray.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_halftone.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/palette_lineart.png -%{tde_datadir}/services/scanservice.desktop - -%post -n trinity-libkscan -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -%postun -n trinity-libkscan -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -########## - -%package -n trinity-libkscan-devel -Summary: Development files for the Trinity scanner library -Group: Development/Libraries - -%description -n trinity-libkscan-devel -This package contains development files for Trinity's scanner library. - -%files -n trinity-libkscan-devel -%defattr(-,root,root,-) -%{tde_libdir}/libkscan.la -%{tde_libdir}/libkscan.so - -%post -n trinity-libkscan-devel -/sbin/ldconfig || : - -%postun -n trinity-libkscan-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-libpoppler-tqt -Summary: TQt support for Poppler -Group: Environment/Libraries -Obsoletes: poppler-tqt < %{version}-%{release} -Provides: poppler-tqt = %{version}-%{release} -Obsoletes: %{name}-libpoppler-tqt < %{version}-%{release} -Provides: %{name}-libpoppler-tqt = %{version}-%{release} - -%description -n trinity-libpoppler-tqt -TQt support library for Poppler. -This library is used by the Trinity graphics file plugins for PDF support. - -%files -n trinity-libpoppler-tqt -%defattr(-,root,root,-) -%{tde_libdir}/libpoppler-tqt.so.* - -%post -n trinity-libpoppler-tqt -/sbin/ldconfig || : - -%postun -n trinity-libpoppler-tqt -/sbin/ldconfig || : - -########## - -%package -n trinity-libpoppler-tqt-devel -Summary: Development files for TQt support for Poppler -Group: Development/Libraries -Requires: trinity-libpoppler-tqt = %{version}-%{release} -Obsoletes: poppler-tqt-devel < %{version}-%{release} -Provides: poppler-tqt-devel = %{version}-%{release} -Obsoletes: %{name}-libpoppler-tqt-devel < %{version}-%{release} -Provides: %{name}-libpoppler-tqt-devel = %{version}-%{release} - -%description -n trinity-libpoppler-tqt-devel -Development files of TQt support library for Poppler. -This package contains the development files needed to compile applications against poppler-tqt. - -%files -n trinity-libpoppler-tqt-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/poppler-link-qt3.h -%{tde_tdeincludedir}/poppler-page-transition.h -%{tde_tdeincludedir}/poppler-qt.h -%{tde_libdir}/libpoppler-tqt.la -%{tde_libdir}/libpoppler-tqt.so -%{tde_libdir}/pkgconfig/poppler-tqt.pc - -%post -n trinity-libpoppler-tqt-devel -/sbin/ldconfig || : - -%postun -n trinity-libpoppler-tqt-devel -/sbin/ldconfig || : - -########## - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries - -Obsoletes: trinity-kdegraphics-devel < %{version}-%{release} -Provides: trinity-kdegraphics-devel = %{version}-%{release} - -Requires: %{name} = %{version}-%{release} -Requires: trinity-libkscan-devel = %{version}-%{release} -Requires: trinity-libpoppler-tqt-devel = %{version}-%{release} - -%description devel -%{summary}. - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/dom/ -%{tde_tdeincludedir}/kfaximage.h -%{tde_tdeincludedir}/kmultipageInterface.h -%{tde_tdeincludedir}/ksvg/ -%{tde_tdeincludedir}/kviewshell/ -%{tde_tdeincludedir}/libtext2path-0.1/BezierPath.h -%{tde_tdeincludedir}/libtext2path-0.1/Glyph.h -%{tde_tdeincludedir}/libtext2path-0.1/GlyphTracer.h -%{tde_libdir}/libkdeinit_kview.la -%if 0%{?build_kmrml} -%{tde_libdir}/libkdeinit_mrmlsearch.la -%endif -%{tde_libdir}/libkghostviewlib.la -%{tde_libdir}/libkghostviewlib.so -%{tde_libdir}/libkimageviewer.la -%{tde_libdir}/libkimageviewer.so -%{tde_libdir}/libkmultipage.la -%{tde_libdir}/libkmultipage.so -%{tde_libdir}/libkpovmodeler.la -%{tde_libdir}/libkpovmodeler.so -%{tde_libdir}/libksvg.la -%{tde_libdir}/libksvg.so -%{tde_libdir}/libtext2path.la -%{tde_libdir}/libtext2path.so -# kfaxview -%{tde_libdir}/libkfaximage.so -%{tde_libdir}/libkfaximage.la -# cmake -%{tde_datadir}/cmake/* - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -############ - -# Excludes kuickshow (built separately) -#%exclude %{tde_bindir}/kuickshow -#%exclude %{tde_tdelibdir}/kuickshow.la -#%exclude %{tde_tdelibdir}/kuickshow.so -#%exclude %{tde_libdir}/libkdeinit_kuickshow.la -#%exclude %{tde_libdir}/libkdeinit_kuickshow.so -#%exclude %{tde_tdeappdir}/kuickshow.desktop -#%exclude %{tde_datadir}/apps/kuickshow/ -#%exclude %{tde_datadir}/icons/hicolor/*/apps/kuickshow.png -#%exclude %{tde_tdedocdir}/HTML/en/kuickshow/ - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - -%if 0%{?rhel} && 0%{?rhel} <= 5 -%patch3 -p1 -b .mkstemps -%endif - -%if 0%{?rhel} == 4 -%patch201 -p1 -b .rhel4 -%endif - -%if 0%{?build_kamera} == 0 -%__rm -rf doc/kamera/ -%endif - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -# Do not build against any "/usr" installed KDE -export KDEDIR=%{tde_prefix} - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -# Note: the "-L%{tde_libdir}" is required for RHEL5, where poppler is under /opt/trinity. -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG -L%{tde_libdir} -I%{tde_includedir}" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ - \ - %{?with_t1lib:-DWITH_T1LIB=ON} \ - %{?with_paper:-DWITH_LIBPAPER=ON} \ - -DWITH_TIFF=ON \ - -DWITH_OPENEXR=ON \ - -DWITH_PDF=ON \ - -DBUILD_ALL=ON \ - -DBUILD_KUICKSHOW=OFF \ - %{!?build_kmrml:-DBUILD_KMRML=OFF} \ - %{!?build_kamera:-DBUILD_KAMERA=OFF} \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics.spec index 5206a11b8..d4776528b 100644 --- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec +++ b/redhat/main/tdegraphics/tdegraphics.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdegraphics %define tde_prefix /opt/trinity @@ -101,7 +101,7 @@ BuildRequires: pcre-devel BuildRequires: libacl-devel # GIF support -%if 0%{?suse_version} || 0%{?fedora} >= 28 +%if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8 BuildRequires: giflib-devel %else BuildRequires: libungif-devel @@ -130,7 +130,7 @@ BuildRequires: libpaper-devel %define with_t1lib 1 BuildRequires: t1lib-devel %endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} +%if 0%{?mgaversion} || 0%{?mdkversion} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7) || 0%{?fedora} %define with_t1lib 1 %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}t1lib-devel @@ -237,7 +237,7 @@ BuildRequires: openssl-devel %if 0%{?build_kmrml} #Requires: gift %else -Obsoletes: trinity-kmrml +Obsoletes: trinity-kmrml < %{version}-%{release} %endif Obsoletes: trinity-kdegraphics < %{version}-%{release} @@ -313,10 +313,6 @@ to allow access to your camera's pictures with the URL camera:/ %{tde_tdelibdir}/tdeio_kamera.la %{tde_tdelibdir}/tdeio_kamera.so %{tde_tdeappdir}/kamera.desktop -%{tde_datadir}/icons/crystalsvg/*/actions/camera_test.png -%{tde_datadir}/icons/crystalsvg/*/apps/camera-photo.png -%{tde_datadir}/icons/crystalsvg/*/devices/camera-photo.png -%{tde_datadir}/icons/crystalsvg/*/places/camera-photo.png %{tde_datadir}/services/camera.protocol %{tde_tdedocdir}/HTML/en/kamera/ %{tde_tdedocdir}/HTML/en/tdeioslave/camera/ @@ -651,7 +647,7 @@ Homepage: http://kooka.kde.org/ %{tde_bindir}/kooka %{tde_tdeappdir}/kooka.desktop %{tde_datadir}/apps/kooka/ -%{tde_confdir}/kookarc +%config(noreplace) %{tde_confdir}/kookarc %{tde_datadir}/icons/hicolor/*/apps/kooka.png %{tde_tdedocdir}/HTML/en/kooka/ diff --git a/redhat/main/tdelibs/tdelibs-14.0.1.patch b/redhat/main/tdelibs/tdelibs-14.0.1.patch deleted file mode 100644 index ab309f841..000000000 --- a/redhat/main/tdelibs/tdelibs-14.0.1.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/tdecore/tdeglobal.h b/tdecore/tdeglobal.h -index b5fddb8..1269c36 100644 ---- a/tdecore/tdeglobal.h -+++ b/tdecore/tdeglobal.h -@@ -25,8 +25,10 @@ class KCharsets; - class TDEConfig; - class TDESharedConfig; - class TDEIconLoader; -+#ifdef __TDE_HAVE_TDEHWLIB - class TDEHardwareDevices; - class TDEGlobalNetworkManager; -+#endif - class TDELocale; - class TDEStandardDirs; - class KStaticDeleterBase; -@@ -79,6 +81,7 @@ public: - */ - static TDEIconLoader *iconLoader(); - -+#ifdef __TDE_HAVE_TDEHWLIB - /** - * Returns a TDEHardwareDevices object. - * @return the global hardware devices object -@@ -90,6 +93,7 @@ public: - * @return the global network manager object - */ - static TDEGlobalNetworkManager *networkManager(); -+#endif - - /** - * Returns the global locale object. diff --git a/redhat/main/tdelibs/tdelibs-14.1.0.patch b/redhat/main/tdelibs/tdelibs-14.1.0.patch deleted file mode 100644 index c4812b447..000000000 --- a/redhat/main/tdelibs/tdelibs-14.1.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt -index 4d9c4a4..fed951b 100644 ---- a/tdecore/CMakeLists.txt -+++ b/tdecore/CMakeLists.txt -@@ -137,7 +137,7 @@ tde_add_library( ${target} SHARED AUTOMOC - EMBED tdecorenetwork-static ${TDEHW_LIB} - LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} - ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM ${GAMIN_LIBRARIES} -- ${LIBBFD_LIBRARIES} ${LIB_UTIL} -+ ${LIBBFD_LIBRARIES} ${LIB_UTIL} ${SSL_LIBRARIES} - DEPENDENCIES dcopidl dcopidl2cpp - DESTINATION ${LIB_INSTALL_DIR} - ) diff --git a/redhat/main/tdelibs/tdelibs-3.5.13.2.spec b/redhat/main/tdelibs/tdelibs-3.5.13.2.spec deleted file mode 100644 index 7775f4908..000000000 --- a/redhat/main/tdelibs/tdelibs-3.5.13.2.spec +++ /dev/null @@ -1,581 +0,0 @@ -# -# spec file for package tdelibs (version 3.5.13-SRU) -# -# 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/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg tdelibs -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%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_sbindir %{tde_prefix}/sbin -%define tde_tdeappdir %{tde_datadir}/applications/kde -%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: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: TDE Libraries -Group: System/GUI/Other -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}-%{version}%{?preversion:~%{preversion}}.tar.gz -Source1: trinity-tdelibs-rpmlintrc - -%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch} - -Obsoletes: tdelibs < %{version}-%{release} -Provides: tdelibs = %{version}-%{release} -Obsoletes: trinity-kdelibs < %{version}-%{release} -Provides: trinity-kdelibs = %{version}-%{release} -Obsoletes: trinity-kdelibs-apidocs < %{version}-%{release} -Provides: trinity-kdelibs-apidocs = %{version}-%{release} - -# for set_permissions macro -%if 0%{?suse_version} -PreReq: permissions -%endif - -# Trinity dependencies -BuildRequires: libtqt4-devel = %{tde_epoch}:4.2.0 -BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63 -BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9 -BuildRequires: trinity-filesystem >= %{tde_version} - -Requires: trinity-arts >= %{tde_epoch}:1.5.10 -Requires: trinity-filesystem >= %{tde_version} -Requires: fileshareset >= 2.0 - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: fdupes - -# 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 - -# KRB5 support -BuildRequires: krb5-devel - -# XSLT support -BuildRequires: libxslt-devel - -# ALSA support -BuildRequires: alsa-lib-devel - -# IDN support -BuildRequires: libidn-devel - -# CUPS support -BuildRequires: cups-devel - -# TIFF support -BuildRequires: libtiff-devel - -# OPENSSL support -BuildRequires: openssl-devel - -# GLIB2 support -BuildRequires: glib2-devel - -# LUA support are not ready yet -#BuildRequires: lua-devel - -# LIBART_LGPL support -BuildRequires: libart_lgpl-devel - -# ASPELL support -BuildRequires: aspell -BuildRequires: aspell-devel - -# GAMIN support -# Not on openSUSE. -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_gamin 1 -BuildRequires: gamin-devel -%endif - -# PCRE support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_pcre 1 -BuildRequires: pcre-devel -%endif - -# INOTIFY support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_inotify 1 -%endif - -# BZIP2 support -%if 0%{?suse_version} -BuildRequires: libbz2-devel -%else -BuildRequires: bzip2-devel -%endif - -# UTEMPTER support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libutempter-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: utempter -%endif -%if 0%{?suse_version} -BuildRequires: utempter-devel -%endif - -# HSPELL support -%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_hspell 1 -BuildRequires: hspell-devel -%endif - -# JASPER support -%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_jasper 1 -%if 0%{?suse_version} -BuildRequires: libjasper-devel -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: jasper-devel -%endif -%endif - -# AVAHI support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_avahi 1 -BuildRequires: libavahi-tqt-devel >= 1:0.6.30 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: avahi-client-devel -Requires: %{_lib}avahi-client3 -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -BuildRequires: avahi-devel -Requires: avahi -%endif -%endif - -# OPENEXR support -%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_openexr 1 -BuildRequires: OpenEXR-devel -%endif - -# LIBTOOL -BuildRequires: libtool -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libltdl-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libtool-ltdl-devel -%endif - -# X11 support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: x11-proto-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -BuildRequires: xorg-x11-proto-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif - -# ICEAUTH -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 -Requires: iceauth -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} -Requires: xorg-x11-server-utils -%endif -%if 0%{?rhel} == 4 || 0%{?suse_version} -Requires: xorg-x11 -%endif - -# XZ support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -%define with_lzma 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: liblzma-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} -BuildRequires: xz-devel -%endif -%endif - -# Certificates support -%if 0%{?fedora} == 18 || 0%{?fedora} == 19 -%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt -BuildRequires: ca-certificates -Requires: ca-certificates -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} >= 20 -%define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt -Requires: openssl -%endif -%if 0%{?rhel} == 5 -%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt -Requires: openssl -%endif -%if 0%{?suse_version} -%define cacert %{_sysconfdir}/ssl/ca-bundle.pem -BuildRequires: ca-certificates -Requires: ca-certificates -%endif -%if "%{cacert}" != "" -Requires: %{cacert} -%endif - -# XRANDR support -# On RHEL5, xrandr library is too old. -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version} -%define with_xrandr 1 -%endif - -# XCOMPOSITE support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -%define xcomposite_devel libxcomposite-devel -%else -%define xcomposite_devel %{_lib}xcomposite%{?mgaversion:1}-devel -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -%define xcomposite_devel libXcomposite-devel -%endif -%{?xcomposite_devel:BuildRequires: %{xcomposite_devel}} - -# XT support -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%define xt_devel libXt-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -%define xt_devel libxt-devel -%endif -%{?xt_devel:BuildRequires: %{xt_devel}} - - -%description -Libraries for the Trinity Desktop Environment: -TDE Libraries included: tdecore (TDE core library), tdeui (user interface), -kfm (file manager), tdehtmlw (HTML widget), tdeio (Input/Output, networking), -kspell (spelling checker), jscript (javascript), kab (addressbook), -kimgio (image manipulation). - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB README TODO -%{tde_bindir}/artsmessage -%{tde_bindir}/cupsdconf -%{tde_bindir}/cupsdoprint -%{tde_bindir}/dcop -%{tde_bindir}/dcopclient -%{tde_bindir}/dcopfind -%{tde_bindir}/dcopobject -%{tde_bindir}/dcopquit -%{tde_bindir}/dcopref -%{tde_bindir}/dcopserver -%{tde_bindir}/dcopserver_shutdown -%{tde_bindir}/dcopstart -%{tde_bindir}/imagetops -%{tde_bindir}/kab2kabc -%{tde_bindir}/kaddprinterwizard -%{tde_bindir}/kbuildsycoca -%{tde_bindir}/kcmshell -%{tde_bindir}/kconf_update -%{tde_bindir}/kcookiejar -%{tde_bindir}/kde-config -%{tde_bindir}/kde-menu -%{tde_bindir}/kded -%{tde_bindir}/kdeinit -%{tde_bindir}/kdeinit_shutdown -%{tde_bindir}/kdeinit_wrapper -%{tde_bindir}/kdesu_stub -%{tde_bindir}/kdetcompmgr -%{tde_bindir}/kdontchangethehostname -%{tde_bindir}/kdostartupconfig -%{tde_bindir}/kfile -%{tde_bindir}/kfmexec -%{tde_bindir}/khotnewstuff -%{tde_bindir}/kinstalltheme -%{tde_bindir}/kio_http_cache_cleaner -%{tde_bindir}/kio_uiserver -%{tde_bindir}/kioexec -%{tde_bindir}/kioslave -%{tde_bindir}/klauncher -%{tde_bindir}/kmailservice -%{tde_bindir}/kmimelist -%{tde_bindir}/ksendbugmail -%{tde_bindir}/kshell -%{tde_bindir}/kstartupconfig -%{tde_bindir}/ktelnetservice -%{tde_bindir}/ktradertest -%{tde_bindir}/kwrapper -%{tde_bindir}/lnusertemp -%{tde_bindir}/make_driver_db_cups -%{tde_bindir}/make_driver_db_lpr -%{tde_bindir}/meinproc -%{tde_bindir}/networkstatustestservice -%{tde_bindir}/start_kdeinit_wrapper -%{tde_bindir}/checkXML -%{tde_bindir}/ksvgtopng -%{tde_bindir}/kunittestmodrunner -%{tde_bindir}/preparetips -%{tde_tdelibdir}/* -%{tde_libdir}/lib*.so.* -%{tde_libdir}/libkdeinit_*.la -%{tde_libdir}/libkdeinit_*.so -%{tde_datadir}/applications/kde/*.desktop -%{tde_datadir}/autostart/kab2kabc.desktop -%{tde_datadir}/applnk/kio_iso.desktop -%{tde_datadir}/apps/* -%exclude %{tde_datadir}/apps/ksgmltools2/ -%config(noreplace) %{tde_datadir}/config/* -%{tde_datadir}/emoticons/* -%{tde_datadir}/icons/crystalsvg/ -%{tde_datadir}/icons/default.kde -%{tde_datadir}/icons/hicolor/index.theme -%{tde_datadir}/locale/all_languages -%{tde_datadir}/mimelnk/magic -%{tde_datadir}/mimelnk/*/*.desktop -%{tde_datadir}/services/* -%{tde_datadir}/servicetypes/* -%{tde_tdedocdir}/HTML/en/common/* -%{tde_tdedocdir}/HTML/en/kspell/ - -# Some setuid binaries need special care -%if 0%{?suse_version} -%verify(not mode) %{tde_bindir}/kgrantpty -%verify(not mode) %{tde_bindir}/kpac_dhcp_helper -%verify(not mode) %{tde_bindir}/start_kdeinit -%else -%attr(4755,root,root) %{tde_bindir}/kgrantpty -%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper -%attr(4711,root,root) %{tde_bindir}/start_kdeinit -%endif - -%config %{_sysconfdir}/xdg/menus/tde-applications.menu - -%pre -# TDE Bug #1074 -if [ -d "%{tde_datadir}/locale/all_languages" ]; then - rm -rf "%{tde_datadir}/locale/all_languages" -fi - -%post -/sbin/ldconfig || : - -%if 0%{?suse_version} -# Sets permissions on setuid files (openSUSE specific) -%set_permissions %{tde_bindir}/kgrantpty -%set_permissions %{tde_bindir}/kpac_dhcp_helper -%set_permissions %{tde_bindir}/start_kdeinit -%endif - -%postun -/sbin/ldconfig || : - -########## - -%package devel -Summary: TDE Libraries (Development files) -Group: Development/Libraries/X11 -Requires: %{name} = %{tde_epoch}:%{version}-%{release} - -Obsoletes: tdelibs-devel < %{tde_epoch}:%{version}-%{release} -Provides: tdelibs-devel = %{tde_epoch}:%{version}-%{release} -Obsoletes: trinity-kdelibs-devel < %{tde_epoch}:%{version}-%{release} -Provides: trinity-kdelibs-devel = %{tde_epoch}:%{version}-%{release} - -Requires: qt3-devel >= 3.3.8d -Requires: libtqt4-devel = %{tde_epoch}:4.2.0 -Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -Requires: libart_lgpl-devel -%{?xcomposite_devel:Requires: %{xcomposite_devel}} -%{?xt_devel:Requires: %{xt_devel}} - -%description devel -This package includes the header files you will need to compile -applications for TDE. - -%files devel -%defattr(-,root,root,-) -%{tde_bindir}/dcopidl* -%{tde_bindir}/kconfig_compiler -%{tde_bindir}/makekdewidgets -%{tde_datadir}/apps/ksgmltools2/ -%{tde_tdeincludedir}/* -%{tde_libdir}/*.la -%{tde_libdir}/*.so -%{tde_libdir}/*.a -%exclude %{tde_libdir}/libkdeinit_*.la -%exclude %{tde_libdir}/libkdeinit_*.so -%{tde_datadir}/cmake/kdelibs.cmake - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%{?tde_patch:%patch1 -p1} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="${QTDIR}/bin:${PATH}" -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -if [ -d "/usr/X11R6" ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include" -fi - -export KDEDIR="%{tde_prefix}" - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_NO_BUILTIN_CHRPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ - -DBIN_INSTALL_DIR="%{tde_bindir}" \ - -DDOC_INSTALL_DIR="%{tde_docdir}" \ - -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ - -DLIB_INSTALL_DIR="%{tde_libdir}" \ - -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ - -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ - \ - -DWITH_ALL_OPTIONS=ON \ - -DWITH_ARTS=ON \ - -DWITH_ALSA=ON \ - -DWITH_LIBART=ON \ - -DWITH_LIBIDN=ON \ - -DWITH_SSL=ON \ - -DWITH_CUPS=ON \ - -DWITH_LUA=OFF \ - -DWITH_TIFF=ON \ - %{?with_jasper:-DWITH_JASPER=ON} \ - %{?with_openexr:-DWITH_OPENEXR=ON} \ - -DWITH_UTEMPTER=ON \ - %{?with_avahi:-DWITH_AVAHI=ON} \ - %{?!with_pcre:-DWITH_PCRE=OFF} \ - %{?!with_inotify:-DWITH_INOTIFY=OFF} \ - %{?!with_gamin:-DWITH_GAMIN=OFF} \ - -DWITH_SUDO_KDESU_BACKEND=OFF \ - %{?!with_lzma:-DWITH_LZMA=OFF} \ - -DWITH_ASPELL=ON \ - %{?!with_hspell:-DWITH_HSPELL=OFF} \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf "%{?buildroot}" -%__make install DESTDIR="%{?buildroot}" -C build - -# Use system-wide CA certificates -%if "%{?cacert}" != "" -%__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt" -%__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt" -%endif - -# Symlinks duplicate files (mostly under 'ksgmltools2') -%fdupes -s "%{?buildroot}" - -# Fix 'tderesources.desktop' (openSUSE only) -%if 0%{?suse_version} -%suse_update_desktop_file -r kresources Qt X-TDE-settings-desktop -%endif - -# Remove setuid bit on some binaries. -chmod 0755 "%{?buildroot}%{tde_bindir}/kgrantpty" -chmod 0755 "%{?buildroot}%{tde_bindir}/kpac_dhcp_helper" -chmod 0755 "%{?buildroot}%{tde_bindir}/start_kdeinit" - -# fileshareset 2.0 is provided separately. -# Remove integrated fileshareset 1.0 . -%__rm -f "%{?buildroot}%{tde_bindir}/filesharelist" -%__rm -f "%{?buildroot}%{tde_bindir}/fileshareset" - - -%clean -%__rm -rf "%{?buildroot}" - -%if 0%{?suse_version} -# Check permissions on setuid files (openSUSE specific) -%verifyscript -%verify_permissions -e %{tde_bindir}/kgrantpty -%verify_permissions -e %{tde_bindir}/kpac_dhcp_helper -%verify_permissions -e %{tde_bindir}/start_kdeinit -%endif - - -%changelog diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec index 0afe618fe..fccb79b77 100644 --- a/redhat/main/tdelibs/tdelibs.spec +++ b/redhat/main/tdelibs/tdelibs.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdelibs %define tde_prefix /opt/trinity @@ -60,9 +60,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source1: %{name}-rpmlintrc -Patch0: tdelibs-14.0.1.patch -Patch1: tdelibs-14.1.0.patch - Obsoletes: tdelibs < %{version}-%{release} Provides: tdelibs = %{version}-%{release} Obsoletes: trinity-kdelibs < %{version}-%{release} @@ -246,12 +243,15 @@ BuildRequires: xorg-x11-devel # ICEAUTH %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 Requires: iceauth +BuildRequires: iceauth %endif %if 0%{?rhel} >= 5 || 0%{?fedora} Requires: xorg-x11-server-utils +BuildRequires: xorg-x11-server-utils %endif %if 0%{?rhel} == 4 || 0%{?suse_version} Requires: xorg-x11 +BuildRequires: xorg-x11 %endif # XZ support @@ -338,7 +338,7 @@ BuildRequires: file-devel BuildRequires: %{_lib}nm-util-devel %endif %if 0%{?rhel} >= 6 || 0%{?fedora} -%if 0%{?fedora} >= 29 +%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 BuildRequires: NetworkManager-libnm-devel %else BuildRequires: NetworkManager-glib-devel @@ -361,7 +361,7 @@ BuildRequires: libudev-devel %endif # UDISKS support -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6 +%if 0%{?rhel} == 6 %if 0%{?pclinuxos} == 0 && 0%{?suse_version} <= 1310 %define with_udisks 1 BuildRequires: udisks-devel @@ -369,9 +369,6 @@ Requires: udisks %endif %endif -# PMOUNT support -#Requires: pmount - # UDISKS2 support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7 %define with_udisks2 1 @@ -444,6 +441,9 @@ BuildRequires: libr-devel >= 0.6.0 # ATTR support BuildRequires: libattr-devel +# INTLTOOL support +BuildRequires: intltool + %description Libraries for the Trinity Desktop Environment: @@ -536,7 +536,7 @@ kimgio (image manipulation). %{tde_tdedocdir}/HTML/en/tdespell/ # Global Trinity configuration -%config %{tde_confdir} +%config(noreplace) %{tde_confdir} # Some setuid binaries need special care %if 0%{?suse_version} @@ -590,6 +590,7 @@ Requires: libtqt4-devel = %{tde_epoch}:4.2.0 Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10 Requires: libart_lgpl-devel Requires: libattr-devel +Requires: intltool %{?xcomposite_devel:Requires: %{xcomposite_devel}} %{?xt_devel:Requires: %{xt_devel}} @@ -622,8 +623,6 @@ applications for TDE. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .ftbfs -%patch1 -p1 -b .ftbfs # RHEL 5: remove tdehwlib stuff from include files, to avoid FTBFS in tdebindings %if 0%{?rhel} == 5 diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec deleted file mode 100644 index 44fd60fab..000000000 --- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-autotools.spec +++ /dev/null @@ -1,1145 +0,0 @@ -# -# spec file for package tdemultimedia (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/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 2 -%if "%{?tde_version}" == "" -%define tde_version 14.0.0 -%endif -%define tde_pkg tdemultimedia -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%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_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} -Summary: Multimedia applications for the Trinity Desktop Environment -Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Group: Productivity/Multimedia/Sound/Utilities -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - -Obsoletes: trinity-kdemultimedia < %{version}-%{release} -Provides: trinity-kdemultimedia = %{version}-%{release} -Obsoletes: trinity-kdemultimedia-libs < %{version}-%{release} -Provides: trinity-kdemultimedia-libs = %{version}-%{release} -Obsoletes: trinity-kdemultimedia-extras < %{version}-%{release} -Provides: trinity-kdemultimedia-extras = %{version}-%{release} -Obsoletes: trinity-kdemultimedia-extras-libs < %{version}-%{release} -Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release} - -BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} - -BuildRequires: autoconf automake libtool m4 -BuildRequires: gcc-c++ -BuildRequires: fdupes -BuildRequires: desktop-file-utils - -# 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 - -# TAGLIB support -%define with_taglib 1 -BuildRequires: taglib-devel - -# AKODE support -%define with_akode 1 -BuildRequires: trinity-akode-devel - -# MAD support -%ifarch %{ix86} x86_64 -%define with_libmad 1 -%{?with_libmad:BuildRequires: libakode_mpeg_decoder} -%endif - -# ZLIB support -BuildRequires: zlib-devel - -# MUSICBRAINZ support -## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4) -#define with_musicbrainz 1 -#BuildRequires: libmusicbrainz-devel libtunepimp-devel - -# Audio libraries -BuildRequires: libvorbis-devel -BuildRequires: audiofile-devel -BuildRequires: libtheora-devel -BuildRequires: alsa-lib-devel -BuildRequires: cdparanoia -#BuildRequires: libmpg123-devel - -# CDDA support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libcdda-devel -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: cdparanoia-devel -%endif - -# FLAC support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: libflac-devel -%else -BuildRequires: %{_lib}flac-devel -%endif -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: flac-devel -%endif - -# GSTREAMER support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}gstreamer1.0-devel -BuildRequires: %{_lib}gstreamer-plugins-base1.0-devel -%endif -%if 0%{?rhel} == 4 -BuildRequires: gstreamer-devel -BuildRequires: gstreamer-plugins-devel -%endif -%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version} -BuildRequires: gstreamer-devel -BuildRequires: gstreamer-plugins-base-devel -%endif -%if 0%{?rhel} >= 7 || 0%{?fedora} -BuildRequires: gstreamer1-devel >= 1.0 -BuildRequires: gstreamer1-plugins-base-devel >= 1.0 -%endif - -# X11 Libraries -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xxf86dga-devel -BuildRequires: %{_lib}xxf86vm-devel -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xtst-devel -%else -BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel -%endif -%endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXxf86dga-devel -BuildRequires: libXxf86vm-devel -%endif - -# XINE support -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 -%define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xine1.2-devel -%endif -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: xine-lib-devel -%endif -%if 0%{?suse_version} -BuildRequires: libxine-devel -%endif -%endif - -# LAME support -%define with_lame 1 - -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: liblame-devel -%else -%if 0%{?mgaversion} >= 6 -BuildRequires: %{_lib}mp3lame-devel -%else -BuildRequires: %{_lib}lame-devel -%endif -%endif -%endif - -%if 0%{?suse_version} -BuildRequires: libmp3lame-devel -%endif - -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: lame-devel -%endif - - -Requires: trinity-artsbuilder = %{version}-%{release} -Requires: trinity-juk = %{version}-%{release} -Requires: trinity-kaboodle = %{version}-%{release} -Requires: trinity-kaudiocreator = %{version}-%{release} -Requires: %{name}-kfile-plugins = %{version}-%{release} -Requires: %{name}-kappfinder-data = %{version}-%{release} -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: trinity-tdemid = %{version}-%{release} -Requires: trinity-kmix = %{version}-%{release} -Requires: trinity-krec = %{version}-%{release} -Requires: trinity-kscd = %{version}-%{release} -%{?with_akode:Requires: trinity-libarts-akode = %{version}-%{release}} -Requires: trinity-libarts-audiofile = %{version}-%{release} -%{?with_mpeg:Requires: trinity-libarts-mpeglib = %{version}-%{release}} -%{?with_xine:Requires: trinity-libarts-xine = %{version}-%{release}} -Requires: trinity-libkcddb = %{version}-%{release} -%{?with_mpeg:Requires: trinity-mpeglib = %{version}-%{release}} -Requires: trinity-noatun = %{version}-%{release} - - -%description -The Trinity Desktop Environment (TDE) is a GUI desktop for the X Window -System. The tdemultimedia package contains multimedia applications for -TDE, including: - artsbuilder, Synthesizer designer for aRts - juk, a media player - tdemid, a midi player - kmix, an audio mixer - arts, additional functionality for the aRts sound system - krec, a recording tool - kscd, an Audio-CD player - kaudiocreator, a graphical frontend for audio file creation - kaboodle, a media player - noatun, a media player - -%files - -########## - -%package -n trinity-artsbuilder -Summary: Synthesizer designer for aRts -Group: Productivity/Multimedia/Sound/Mixers -Requires: trinity-kicker >= %{tde_version} - -%description -n trinity-artsbuilder -This is the analog Realtime synthesizer's graphical design tool. - -%files -n trinity-artsbuilder -%defattr(-,root,root,-) -%{tde_bindir}/artsbuilder -%{tde_bindir}/artscontrol -%{tde_bindir}/midisend -%{tde_libdir}/libartsbuilder.la -%{tde_libdir}/libartsbuilder.so.* -%{tde_libdir}/libartscontrolapplet.la -%{tde_libdir}/libartscontrolapplet.so.* -%{tde_libdir}/libartscontrolsupport.la -%{tde_libdir}/libartscontrolsupport.so.* -%{tde_libdir}/libartsgui_idl.la -%{tde_libdir}/libartsgui_idl.so.* -%{tde_libdir}/libartsgui_kde.la -%{tde_libdir}/libartsgui_kde.so.* -%{tde_libdir}/libartsgui.la -%{tde_libdir}/libartsgui.so.* -%{tde_libdir}/libartsmidi_idl.la -%{tde_libdir}/libartsmidi_idl.so.* -%{tde_libdir}/libartsmidi.la -%{tde_libdir}/libartsmidi.so.* -%{tde_libdir}/libartsmodulescommon.la -%{tde_libdir}/libartsmodulescommon.so.* -%{tde_libdir}/libartsmoduleseffects.la -%{tde_libdir}/libartsmoduleseffects.so.* -%{tde_libdir}/libartsmodulesmixers.la -%{tde_libdir}/libartsmodulesmixers.so.* -%{tde_libdir}/libartsmodules.la -%{tde_libdir}/libartsmodules.so.* -%{tde_libdir}/libartsmodulessynth.la -%{tde_libdir}/libartsmodulessynth.so.* -%{tde_libdir}/mcop/Arts/ArtsBuilderLoader.mcopclass -%{tde_libdir}/mcop/artsbuilder.mcopclass -%{tde_libdir}/mcop/artsbuilder.mcoptype -%{tde_libdir}/mcop/Arts/Button.mcopclass -%{tde_libdir}/mcop/Arts/EffectRackGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/Effect_WAVECAPTURE.mcopclass -%{tde_libdir}/mcop/Arts/Environment/Container.mcopclass -%{tde_libdir}/mcop/Arts/Environment/EffectRackItem.mcopclass -%{tde_libdir}/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/Environment/InstrumentItem.mcopclass -%{tde_libdir}/mcop/Arts/Environment/MixerItem.mcopclass -%{tde_libdir}/mcop/Arts/Fader.mcopclass -%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQ.mcopclass -%{tde_libdir}/mcop/Arts/FreeverbGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/GenericGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/GraphLine.mcopclass -%{tde_libdir}/mcop/artsgui.mcopclass -%{tde_libdir}/mcop/artsgui.mcoptype -%{tde_libdir}/mcop/Arts/HBox.mcopclass -%{tde_libdir}/mcop/Arts/Label.mcopclass -%{tde_libdir}/mcop/Arts/LayoutBox.mcopclass -%{tde_libdir}/mcop/Arts/LevelMeter.mcopclass -%{tde_libdir}/mcop/Arts/LineEdit.mcopclass -%{tde_libdir}/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/LittleStereoMixerChannel.mcopclass -%{tde_libdir}/mcop/Arts/LocalFactory.mcopclass -%{tde_libdir}/mcop/Arts/MidiManager.mcopclass -%{tde_libdir}/mcop/artsmidi.mcopclass -%{tde_libdir}/mcop/artsmidi.mcoptype -%{tde_libdir}/mcop/Arts/MixerGuiFactory.mcopclass -%{tde_libdir}/mcop/artsmodulescommon.mcopclass -%{tde_libdir}/mcop/artsmodulescommon.mcoptype -%{tde_libdir}/mcop/artsmoduleseffects.mcopclass -%{tde_libdir}/mcop/artsmoduleseffects.mcoptype -%{tde_libdir}/mcop/artsmodules.mcopclass -%{tde_libdir}/mcop/artsmodules.mcoptype -%{tde_libdir}/mcop/artsmodulesmixers.mcopclass -%{tde_libdir}/mcop/artsmodulesmixers.mcoptype -%{tde_libdir}/mcop/artsmodulessynth.mcopclass -%{tde_libdir}/mcop/artsmodulessynth.mcoptype -%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannel.mcopclass -%{tde_libdir}/mcop/Arts/MonoToStereo.mcopclass -%{tde_libdir}/mcop/Arts/PopupBox.mcopclass -%{tde_libdir}/mcop/Arts/Poti.mcopclass -%{tde_libdir}/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/SimpleMixerChannel.mcopclass -%{tde_libdir}/mcop/Arts/SpinBox.mcopclass -%{tde_libdir}/mcop/Arts/StereoBalanceGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/StereoBalance.mcopclass -%{tde_libdir}/mcop/Arts/StereoCompressorGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/StereoToMono.mcopclass -%{tde_libdir}/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/StereoVolumeControlGui.mcopclass -%{tde_libdir}/mcop/Arts/StructureBuilder.mcopclass -%{tde_libdir}/mcop/Arts/StructureDesc.mcopclass -%{tde_libdir}/mcop/Arts/Synth_ATAN_SATURATE.mcopclass -%{tde_libdir}/mcop/Arts/Synth_AUTOPANNER.mcopclass -%{tde_libdir}/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass -%{tde_libdir}/mcop/Arts/Synth_CAPTURE_WAV.mcopclass -%{tde_libdir}/mcop/Arts/Synth_CDELAY.mcopclass -%{tde_libdir}/mcop/Arts/Synth_COMPRESSOR.mcopclass -%{tde_libdir}/mcop/Arts/Synth_DATA.mcopclass -%{tde_libdir}/mcop/Arts/Synth_DEBUG.mcopclass -%{tde_libdir}/mcop/Arts/Synth_DELAY.mcopclass -%{tde_libdir}/mcop/Arts/Synth_DIV.mcopclass -%{tde_libdir}/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass -%{tde_libdir}/mcop/Arts/Synth_FM_SOURCE.mcopclass -%{tde_libdir}/mcop/Arts/Synth_FREEVERB.mcopclass -%{tde_libdir}/mcop/Arts/Synth_FX_CFLANGER.mcopclass -%{tde_libdir}/mcop/Arts/Synth_MIDI_DEBUG.mcopclass -%{tde_libdir}/mcop/Arts/Synth_MIDI_TEST.mcopclass -%{tde_libdir}/mcop/Arts/Synth_MOOG_VCF.mcopclass -%{tde_libdir}/mcop/Arts/Synth_NIL.mcopclass -%{tde_libdir}/mcop/Arts/Synth_NOISE.mcopclass -%{tde_libdir}/mcop/Arts/Synth_OSC.mcopclass -%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass -%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT.mcopclass -%{tde_libdir}/mcop/Arts/Synth_PLAY_PAT.mcopclass -%{tde_libdir}/mcop/Arts/Synth_PSCALE.mcopclass -%{tde_libdir}/mcop/Arts/Synth_RC.mcopclass -%{tde_libdir}/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass -%{tde_libdir}/mcop/Arts/Synth_SEQUENCE.mcopclass -%{tde_libdir}/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass -%{tde_libdir}/mcop/Arts/Synth_STD_EQUALIZER.mcopclass -%{tde_libdir}/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass -%{tde_libdir}/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass -%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass -%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass -%{tde_libdir}/mcop/Arts/Synth_TREMOLO.mcopclass -%{tde_libdir}/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass -%{tde_libdir}/mcop/Arts/Synth_WAVE_PULSE.mcopclass -%{tde_libdir}/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass -%{tde_libdir}/mcop/Arts/Synth_WAVE_SQUARE.mcopclass -%{tde_libdir}/mcop/Arts/Synth_WAVE_TRI.mcopclass -%{tde_libdir}/mcop/Arts/Synth_XFADE.mcopclass -%{tde_libdir}/mcop/Arts/VBox.mcopclass -%{tde_libdir}/mcop/Arts/VoiceRemovalGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/Widget.mcopclass -%{tde_tdeappdir}/artsbuilder.desktop -%{tde_tdeappdir}/artscontrol.desktop -%{tde_datadir}/apps/artsbuilder/ -%{tde_datadir}/apps/artscontrol/ -%{tde_datadir}/apps/kicker/applets/artscontrolapplet.desktop -%{tde_datadir}/icons/crystalsvg/*/actions/artsaudiomanager.png -%{tde_datadir}/icons/crystalsvg/*/actions/artsbuilderexecute.png -%{tde_datadir}/icons/crystalsvg/*/actions/artsenvironment.png -%{tde_datadir}/icons/crystalsvg/*/actions/artsfftscope.png -%{tde_datadir}/icons/crystalsvg/*/actions/artsmediatypes.png -%{tde_datadir}/icons/crystalsvg/*/actions/artsmidimanager.png -%{tde_datadir}/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/artsenvironment.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/artsfftscope.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmediatypes.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmidimanager.svgz -%{tde_datadir}/icons/hicolor/*/apps/artsbuilder.png -%{tde_datadir}/icons/hicolor/*/apps/artscontrol.png -%{tde_datadir}/icons/hicolor/scalable/apps/artsbuilder.svgz -%{tde_datadir}/icons/hicolor/scalable/apps/artscontrol.svgz -%{tde_datadir}/mimelnk/application/x-artsbuilder.desktop -%{tde_tdedocdir}/HTML/en/artsbuilder/ - -########## - -%package -n trinity-juk -Summary: Music organizer and player for Trinity -Group: Productivity/Multimedia/Sound/Players - -%description -n trinity-juk -JuK (pronounced "jook") is a jukebox and music manager for the TDE -desktop similar to jukebox software on other platforms such as -iTunes or RealOne. - -Some of JuK's features include: -* Support for Ogg Vorbis and MP3 formats -* Tag editing support for both formats, including ID3v2 for MP3 files. - Multitagging or editing a selection of multiple files at once is also - supported -* Output to either the aRts, default KDE sound system, or GStreamer -* Management of your "collection" and multiple playlists -* Import and export to m3u playlists -* Binary caching of audio meta-data and playlist information for faster - load times (starting with the second time you run JuK) -* Integration into TDE that allows drag-and-drop and clipboard usage - with other TDE and X apps - -%files -n trinity-juk -%defattr(-,root,root,-) -%{tde_bindir}/juk -%{tde_tdeappdir}/juk.desktop -%{tde_datadir}/apps/juk/ -%{tde_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop -%{tde_datadir}/icons/crystalsvg/*/actions/juk_dock.png -%{tde_datadir}/icons/hicolor/*/apps/juk.png -%{tde_tdedocdir}/HTML/en/juk/ - -########## - -%package -n trinity-kaboodle -Summary: Light, embedded media player for Trinity -Group: System/GUI/Other - -%if 0%{?with_xine} -Requires: trinity-libarts-xine = %{version}-%{release} -%endif - -%description -n trinity-kaboodle -Kaboodle is a light, embedded media player, supporting both video and audio, -for TDE. It uses the aRts framework for playing media files. - -%files -n trinity-kaboodle -%defattr(-,root,root,-) -%{tde_bindir}/kaboodle -%{tde_tdelibdir}/libkaboodlepart.la -%{tde_tdelibdir}/libkaboodlepart.so -%{tde_tdeappdir}/kaboodle.desktop -%{tde_datadir}/apps/kaboodle/ -%{tde_datadir}/icons/hicolor/*/apps/kaboodle.png -%{tde_datadir}/services/kaboodle_component.desktop -%{tde_datadir}/services/kaboodleengine.desktop -%{tde_tdedocdir}/HTML/en/kaboodle/ - -########## - -%package -n trinity-kaudiocreator -Summary: CD ripper and audio encoder frontend for Trinity -Group: Productivity/Multimedia/CD/Grabbers - -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: vorbis-tools -Requires: flac - -%description -n trinity-kaudiocreator -KAudioCreator is a tool for audio extraction (ripping) and encoding. It can -keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also -searches CDDB to retrieve the information of the disk. - -%files -n trinity-kaudiocreator -%defattr(-,root,root,-) -%{tde_bindir}/kaudiocreator -%{tde_tdeappdir}/kaudiocreator.desktop -%{tde_datadir}/apps/kaudiocreator/ -%{tde_datadir}/apps/tdeconf_update/kaudiocreator-libkcddb.upd -%{tde_datadir}/apps/tdeconf_update/kaudiocreator-meta.upd -%{tde_datadir}/apps/tdeconf_update/upgrade-kaudiocreator-metadata.sh -%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract.desktop -%{tde_datadir}/config.kcfg/kaudiocreator.kcfg -%{tde_datadir}/config.kcfg/kaudiocreator_encoders.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kaudiocreator.png -%{tde_datadir}/icons/locolor/*/apps/kaudiocreator.png -%{tde_tdedocdir}/HTML/en/kaudiocreator/ - -########## - -%package kfile-plugins -Summary: An au/avi/m3u/mp3/ogg/wav plugins for kfile -Group: Productivity/Multimedia/Sound/Utilities - -%description kfile-plugins -au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity. - -%files kfile-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/tdefile_au.la -%{tde_tdelibdir}/tdefile_au.so -%{tde_tdelibdir}/tdefile_avi.la -%{tde_tdelibdir}/tdefile_avi.so -%{tde_tdelibdir}/tdefile_flac.la -%{tde_tdelibdir}/tdefile_flac.so -%{tde_tdelibdir}/tdefile_m3u.la -%{tde_tdelibdir}/tdefile_m3u.so -%{tde_tdelibdir}/tdefile_mp3.la -%{tde_tdelibdir}/tdefile_mp3.so -%{tde_tdelibdir}/tdefile_mpc.la -%{tde_tdelibdir}/tdefile_mpc.so -%{tde_tdelibdir}/tdefile_mpeg.la -%{tde_tdelibdir}/tdefile_mpeg.so -%{tde_tdelibdir}/tdefile_ogg.la -%{tde_tdelibdir}/tdefile_ogg.so -%{tde_tdelibdir}/tdefile_sid.la -%{tde_tdelibdir}/tdefile_sid.so -%{tde_tdelibdir}/tdefile_theora.la -%{tde_tdelibdir}/tdefile_theora.so -%{tde_tdelibdir}/tdefile_wav.la -%{tde_tdelibdir}/tdefile_wav.so -%{tde_datadir}/services/tdefile_au.desktop -%{tde_datadir}/services/tdefile_avi.desktop -%{tde_datadir}/services/tdefile_flac.desktop -%{tde_datadir}/services/tdefile_m3u.desktop -%{tde_datadir}/services/tdefile_mp3.desktop -%{tde_datadir}/services/tdefile_mpc.desktop -%{tde_datadir}/services/tdefile_mpeg.desktop -%{tde_datadir}/services/tdefile_ogg.desktop -%{tde_datadir}/services/tdefile_sid.desktop -%{tde_datadir}/services/tdefile_theora.desktop -%{tde_datadir}/services/tdefile_wav.desktop - -########## - -%package kappfinder-data -Summary: Multimedia data for kappfinder -Group: Productivity/Multimedia/Sound/Utilities - -Requires: trinity-kappfinder >= %{tde_version} -Requires: trinity-tdebase-runtime-data-common >= %{tde_version} - -%description kappfinder-data -This package provides data on multimedia applications for kappfinder. - -%files kappfinder-data -%defattr(-,root,root,-) -%{tde_datadir}/apps/kappfinder/ -%{tde_datadir}/desktop-directories/tde-multimedia-music.directory -%config %{_sysconfdir}/xdg/menus/applications-merged/tde-multimedia-music.menu - -########## - -%package tdeio-plugins -Summary: Enables the browsing of audio CDs under Konqueror -Group: Productivity/Multimedia/Sound/Utilities -Requires: trinity-tdebase-tdeio-plugins >= %{tde_version} - -Obsoletes: trinity-tdemultimedia-kio-plugins < %{version}-%{release} -Provides: trinity-tdemultimedia-kio-plugins = %{version}-%{release} - -%description tdeio-plugins -This package allow audio CDs to be browsed like a file system using -Konqueror and the audiocd:/ URL. - -%files tdeio-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcm_audiocd.la -%{tde_tdelibdir}/kcm_audiocd.so -%{tde_tdelibdir}/tdeio_audiocd.la -%{tde_tdelibdir}/tdeio_audiocd.so -%{tde_tdelibdir}/libaudiocd_encoder_flac.la -%{tde_tdelibdir}/libaudiocd_encoder_flac.so -%{tde_tdelibdir}/libaudiocd_encoder_lame.la -%{tde_tdelibdir}/libaudiocd_encoder_lame.so -%{tde_tdelibdir}/libaudiocd_encoder_vorbis.la -%{tde_tdelibdir}/libaudiocd_encoder_vorbis.so -%{tde_tdelibdir}/libaudiocd_encoder_wav.la -%{tde_tdelibdir}/libaudiocd_encoder_wav.so -%{tde_libdir}/libaudiocdplugins.so.* -%{tde_tdeappdir}/audiocd.desktop -%{tde_datadir}/apps/tdeconf_update/audiocd.upd -%{tde_datadir}/apps/tdeconf_update/upgrade-metadata.sh -%{tde_datadir}/config.kcfg/audiocd_lame_encoder.kcfg -%{tde_datadir}/config.kcfg/audiocd_vorbis_encoder.kcfg -%{tde_datadir}/services/audiocd.protocol -%{tde_tdedocdir}/HTML/en/tdeioslave/audiocd/ -%{tde_tdedocdir}/HTML/en/kcontrol/audiocd/ -%{tde_datadir}/icons/hicolor/*/apps/kcmaudiocd.png - -########## - -%package -n trinity-tdemid -Summary: MIDI/karaoke player for Trinity -Group: Productivity/Multimedia/Sound/Midi - -Obsoletes: trinity-kmid < %{version}-%{release} -Provides: trinity-kmid = %{version}-%{release} - -%description -n trinity-tdemid -This package provides a MIDI and karaoke player for TDE. - -%files -n trinity-tdemid -%defattr(-,root,root,-) -%{tde_bindir}/tdemid -%{tde_tdelibdir}/libtdemidpart.la -%{tde_tdelibdir}/libtdemidpart.so -%{tde_libdir}/libtdemidlib.so.* -%{tde_tdeappdir}/tdemid.desktop -%{tde_datadir}/apps/tdemid/ -%{tde_datadir}/icons/hicolor/*/apps/tdemid.png -%{tde_datadir}/mimelnk/audio/x-karaoke.desktop -%{tde_datadir}/servicetypes/audiomidi.desktop -%{tde_tdedocdir}/HTML/en/tdemid/ - -########## - -%package -n trinity-kmix -Summary: Sound mixer applet for Trinity -Group: Productivity/Multimedia/Sound/Mixers -Requires: trinity-kicker >= %{tde_version} - -%description -n trinity-kmix -This package includes TDE's dockable sound mixer applet. - -%files -n trinity-kmix -%defattr(-,root,root,-) -%{tde_bindir}/kmix -%{tde_bindir}/kmixctrl -%{tde_tdelibdir}/kmix.la -%{tde_tdelibdir}/kmix.so -%{tde_tdelibdir}/kmix_panelapplet.la -%{tde_tdelibdir}/kmix_panelapplet.so -%{tde_tdelibdir}/kmixctrl.la -%{tde_tdelibdir}/kmixctrl.so -%{tde_libdir}/libtdeinit_kmix.so -%{tde_libdir}/libtdeinit_kmixctrl.so -%{tde_tdeappdir}/kmix.desktop -%{tde_datadir}/apps/kicker/applets/kmixapplet.desktop -%{tde_datadir}/apps/kmix/ -%{tde_datadir}/autostart/kmix.desktop -%{tde_datadir}/autostart/restore_kmix_volumes.desktop -%{tde_datadir}/icons/hicolor/*/apps/kmix.png -%{tde_datadir}/services/kmixctrl_restore.desktop -%{tde_tdedocdir}/HTML/en/kmix/ - -########## - -%package -n trinity-krec -Summary: Sound recorder utility for Trinity -Group: Productivity/Multimedia/CD/Record - -%description -n trinity-krec -This is a sound recording utility for Trinity. - -%files -n trinity-krec -%defattr(-,root,root,-) -%{tde_bindir}/krec -%{tde_tdelibdir}/kcm_krec.la -%{tde_tdelibdir}/kcm_krec.so -%{tde_tdelibdir}/kcm_krec_files.la -%{tde_tdelibdir}/kcm_krec_files.so -%{tde_tdelibdir}/krec.la -%{tde_tdelibdir}/krec.so -%if 0%{?with_lame} -%{tde_tdelibdir}/libkrecexport_mp3.la -%{tde_tdelibdir}/libkrecexport_mp3.so -%{tde_datadir}/services/krec_exportmp3.desktop -%endif -%{tde_tdelibdir}/libkrecexport_ogg.la -%{tde_tdelibdir}/libkrecexport_ogg.so -%{tde_tdelibdir}/libkrecexport_wave.la -%{tde_tdelibdir}/libkrecexport_wave.so -%{tde_libdir}/libtdeinit_krec.so -%{tde_tdeappdir}/krec.desktop -%{tde_datadir}/apps/krec/ -%{tde_datadir}/icons/hicolor/*/apps/krec.png -%{tde_datadir}/services/kcm_krec.desktop -%{tde_datadir}/services/kcm_krec_files.desktop -%{tde_datadir}/services/krec_exportogg.desktop -%{tde_datadir}/services/krec_exportwave.desktop -%{tde_datadir}/servicetypes/krec_exportitem.desktop -%{tde_tdedocdir}/HTML/en/krec/ - -########## - -%package -n trinity-kscd -Summary: Audio CD player for Trinity -Group: Productivity/Multimedia/CD/Players - -%description -n trinity-kscd -This is Trinity's audio CD player. - -%files -n trinity-kscd -%defattr(-,root,root,-) -%{tde_bindir}/kscd -%{tde_bindir}/workman2cddb.pl -%{tde_tdeappdir}/kscd.desktop -%{tde_datadir}/apps/konqueror/servicemenus/audiocd_play.desktop -%{tde_datadir}/apps/kscd/ -%{tde_datadir}/apps/profiles/kscd.profile.xml -%{tde_datadir}/config.kcfg/kscd.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kscd.png -%{tde_datadir}/mimelnk/text/xmcd.desktop -%{tde_tdedocdir}/HTML/en/kscd/ - -########## - -%if 0%{?with_akode} -%package -n trinity-libarts-akode -Summary: Akode plugin for aRts -Group: Productivity/Multimedia/Other - -%description -n trinity-libarts-akode -This package contains akode plugins for aRts. - -%files -n trinity-libarts-akode -%defattr(-,root,root,-) -%{tde_libdir}/libarts_akode.so.* -%{tde_libdir}/libarts_akode.la -%{tde_libdir}/mcop/akodearts.mcoptype -%{tde_libdir}/mcop/akodearts.mcopclass -%{tde_libdir}/mcop/akodeMPCPlayObject.mcopclass -%{tde_libdir}/mcop/akodePlayObject.mcopclass -%{tde_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass -%{tde_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass -%{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass - -# Requires MAD support -%{?with_libmad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass} - -%endif - -########## - -%package -n trinity-libarts-audiofile -Summary: Audiofile plugin for aRts -Group: Productivity/Multimedia/Other - -%description -n trinity-libarts-audiofile -This package contains audiofile plugins for aRts. - -%files -n trinity-libarts-audiofile -%defattr(-,root,root,-) -%{tde_libdir}/libarts_audiofile.so.* -%{tde_libdir}/libarts_audiofile.la -%{tde_libdir}/mcop/Arts/audiofilePlayObject.mcopclass -%{tde_libdir}/mcop/audiofilearts.mcopclass -%{tde_libdir}/mcop/audiofilearts.mcoptype - -########## - -%if 0%{?with_mpeg} -%package -n trinity-libarts-mpeglib -Summary: Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video -Group: Productivity/Multimedia/Other - -%description -n trinity-libarts-mpeglib -This package contains the mpeglib aRts plugin, supporting mp3 and mpeg -audio and video. - -This is the arts (TDE Sound daemon) plugin. - -%files -n trinity-libarts-mpeglib -%defattr(-,root,root,-) -%{tde_bindir}/mpeglibartsplay -%{tde_libdir}/libarts_mpeglib-0.3.0.so.* -%{tde_libdir}/libarts_mpeglib.la -%{tde_libdir}/libarts_splay.so.* -%{tde_libdir}/libarts_splay.la -%{tde_libdir}/mcop/CDDAPlayObject.mcopclass -%{tde_libdir}/mcop/MP3PlayObject.mcopclass -%{tde_libdir}/mcop/NULLPlayObject.mcopclass -%{tde_libdir}/mcop/OGGPlayObject.mcopclass -%{tde_libdir}/mcop/SplayPlayObject.mcopclass -%{tde_libdir}/mcop/WAVPlayObject.mcopclass - -%endif - -########## - -%if 0%{?with_xine} -%package -n trinity-libarts-xine -Summary: ARTS plugin enabling xine support -Group: Productivity/Multimedia/Other - -%description -n trinity-libarts-xine -This package contains aRts' xine plugin, allowing the use of the xine -multimedia engine though aRts. - -%files -n trinity-libarts-xine -%defattr(-,root,root,-) -%{tde_tdelibdir}/videothumbnail.la -%{tde_tdelibdir}/videothumbnail.so -%{tde_libdir}/libarts_xine.so.* -%{tde_libdir}/libarts_xine.la -%{tde_libdir}/mcop/xineAudioPlayObject.mcopclass -%{tde_libdir}/mcop/xineVideoPlayObject.mcopclass -%{tde_datadir}/apps/videothumbnail/sprocket-large.png -%{tde_datadir}/apps/videothumbnail/sprocket-medium.png -%{tde_datadir}/apps/videothumbnail/sprocket-small.png -%{tde_datadir}/services/videothumbnail.desktop - -%endif - -########## - -%package -n trinity-libkcddb -Summary: CDDB library for Trinity -Group: Productivity/Multimedia/Other -Requires: trinity-kcontrol >= %{tde_version} - -%description -n trinity-libkcddb -The Trinity native CDDB (CD Data Base) library, providing easy access to Audio -CD meta-information (track titles, artist information, etc.) from on-line -databases, for TDE applications. - -%files -n trinity-libkcddb -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcm_cddb.la -%{tde_tdelibdir}/kcm_cddb.so -%{tde_libdir}/libkcddb.so.* -%{tde_tdeappdir}/libkcddb.desktop -%{tde_datadir}/apps/tdeconf_update/kcmcddb-emailsettings.upd -%{tde_datadir}/config.kcfg/libkcddb.kcfg -%{tde_tdedocdir}/HTML/en/kcontrol/cddb/ - -########## - -%if 0%{?with_mpeg} - -%package -n trinity-mpeglib -Summary: MP3 and MPEG-1 audio and video library -Group: Productivity/Multimedia/Other -%if 0%{?with_mpeg} -Requires: trinity-libarts-mpeglib = %{version}-%{release} -%endif - -%description -n trinity-mpeglib -mpeglib is a MPEG-1 and MP3 audio and video library. It supports -MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer, -and WAV playback - -%files -n trinity-mpeglib -%defattr(-,root,root,-) -%{tde_bindir}/yaf-cdda -%{tde_bindir}/yaf-mpgplay -%{tde_bindir}/yaf-splay -%{tde_bindir}/yaf-tplay -%{tde_bindir}/yaf-vorbis -%{tde_bindir}/yaf-yuv -%{tde_libdir}/libmpeg-0.3.0.so -%{tde_libdir}/libyafcore.so -%{tde_libdir}/libyafxplayer.so - -%endif - -########## - -%package -n trinity-noatun -Summary: Media player for Trinity -Group: Productivity/Multimedia/Video/Players -Requires: trinity-tdebase-bin >= %{tde_version} - -# 20120802: Hack to avoid dependency issue on MGA2 and MDV2011 -%if 0%{?mgaversion} || 0%{?mdkversion} -Provides: devel(libnoatunarts) -Provides: devel(libnoatunarts(64bit)) -%endif - -%description -n trinity-noatun -Noatun is an aRts-based audio and video player for Trinity. It supports all -formats supported by your installation of aRts (including aRts plugins). - -%files -n trinity-noatun -%defattr(-,root,root,-) -%{tde_bindir}/noatun -%{tde_libdir}/tdeconf_update_bin/noatun20update -%{tde_tdelibdir}/noatun.la -%{tde_tdelibdir}/noatun.so -%{tde_tdelibdir}/noatun_dcopiface.la -%{tde_tdelibdir}/noatun_dcopiface.so -%{tde_tdelibdir}/noatun_excellent.la -%{tde_tdelibdir}/noatun_excellent.so -%{tde_tdelibdir}/noatun_htmlexport.la -%{tde_tdelibdir}/noatun_htmlexport.so -%{tde_tdelibdir}/noatun_infrared.la -%{tde_tdelibdir}/noatun_infrared.so -%{tde_tdelibdir}/noatun_kaiman.la -%{tde_tdelibdir}/noatun_kaiman.so -%{tde_tdelibdir}/noatun_keyz.la -%{tde_tdelibdir}/noatun_keyz.so -%{tde_tdelibdir}/noatun_kjofol.la -%{tde_tdelibdir}/noatun_kjofol.so -%{tde_tdelibdir}/noatun_marquis.la -%{tde_tdelibdir}/noatun_marquis.so -%{tde_tdelibdir}/noatun_metatag.la -%{tde_tdelibdir}/noatun_metatag.so -%{tde_tdelibdir}/noatun_monoscope.la -%{tde_tdelibdir}/noatun_monoscope.so -%{tde_tdelibdir}/noatun_net.la -%{tde_tdelibdir}/noatun_net.so -%{tde_tdelibdir}/noatun_splitplaylist.la -%{tde_tdelibdir}/noatun_splitplaylist.so -%{tde_tdelibdir}/noatun_systray.la -%{tde_tdelibdir}/noatun_systray.so -%{tde_tdelibdir}/noatun_ui.la -%{tde_tdelibdir}/noatun_ui.so -%{tde_tdelibdir}/noatun_voiceprint.la -%{tde_tdelibdir}/noatun_voiceprint.so -%{tde_tdelibdir}/noatun_winskin.la -%{tde_tdelibdir}/noatun_winskin.so -%{tde_tdelibdir}/noatunsimple.la -%{tde_tdelibdir}/noatunsimple.so -%{tde_libdir}/libartseffects.la -%{tde_libdir}/libartseffects.so -%{tde_libdir}/libtdeinit_noatun.so -%{tde_libdir}/libnoatun.so.* -%{tde_libdir}/libnoatunarts.la -%{tde_libdir}/libnoatunarts.so -%{tde_libdir}/libnoatuncontrols.so.* -%{tde_libdir}/libnoatuntags.so.* -%{tde_libdir}/libwinskinvis.la -%{tde_libdir}/libwinskinvis.so -%{tde_libdir}/mcop/ExtraStereo.mcopclass -%{tde_libdir}/mcop/ExtraStereoGuiFactory.mcopclass -%{tde_libdir}/mcop/Noatun/ -%{tde_libdir}/mcop/RawWriter.mcopclass -%{tde_libdir}/mcop/VoiceRemoval.mcopclass -%{tde_libdir}/mcop/artseffects.mcopclass -%{tde_libdir}/mcop/artseffects.mcoptype -%{tde_libdir}/mcop/noatunarts.mcopclass -%{tde_libdir}/mcop/noatunarts.mcoptype -%{tde_libdir}/mcop/winskinvis.mcopclass -%{tde_libdir}/mcop/winskinvis.mcoptype -%{tde_tdeappdir}/noatun.desktop -%{tde_datadir}/apps/tdeconf_update/noatun.upd -%{tde_datadir}/apps/noatun/ -%{tde_datadir}/icons/hicolor/*/apps/noatun.png -%{tde_datadir}/mimelnk/interface/x-winamp-skin.desktop -%{tde_tdedocdir}/HTML/en/noatun/ - -########## - -%package devel -Summary: Development files for %{name}, aRts and noatun plugins -Group: Development/Libraries/Other -Requires: %{name} = %{version}-%{release} -Requires: trinity-tdelibs-devel >= %{tde_version} - -Obsoletes: trinity-kdemultimedia-devel < %{version}-%{release} -Provides: trinity-kdemultimedia-devel = %{version}-%{release} - -%description devel -{summary}. - -Install %{name}-devel if you wish to develop or compile any -applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or -noatun plugins. - -%files devel -%defattr(-,root,root,-) -%{tde_includedir}/* -%if 0%{?with_akode} -%{tde_libdir}/libarts_akode.so -%endif -%{tde_libdir}/libarts_audiofile.so -%if 0%{?with_mpeg} -%{tde_libdir}/libarts_mpeglib.so -%{tde_libdir}/libarts_splay.so -%endif -%if 0%{?with_xine} -%{tde_libdir}/libarts_xine.so -%endif -%{tde_libdir}/libartsbuilder.so -%{tde_libdir}/libartscontrolapplet.so -%{tde_libdir}/libartscontrolsupport.so -%{tde_libdir}/libartsgui.so -%{tde_libdir}/libartsgui_idl.so -%{tde_libdir}/libartsgui_kde.so -%{tde_libdir}/libartsmidi.so -%{tde_libdir}/libartsmidi_idl.so -%{tde_libdir}/libartsmodules.so -%{tde_libdir}/libartsmodulescommon.so -%{tde_libdir}/libartsmoduleseffects.so -%{tde_libdir}/libartsmodulesmixers.so -%{tde_libdir}/libartsmodulessynth.so -%{tde_libdir}/libaudiocdplugins.la -%{tde_libdir}/libaudiocdplugins.so -%{tde_libdir}/libkcddb.la -%{tde_libdir}/libkcddb.so -%{tde_libdir}/libtdeinit_kmix.la -%{tde_libdir}/libtdeinit_kmixctrl.la -%{tde_libdir}/libtdeinit_krec.la -%{tde_libdir}/libtdeinit_noatun.la -%{tde_libdir}/libtdemidlib.la -%{tde_libdir}/libtdemidlib.so -%if 0%{?with_mpeg} -%{tde_libdir}/libmpeg.la -%{tde_libdir}/libmpeg.so -%endif -%{tde_libdir}/libnoatun.la -%{tde_libdir}/libnoatun.so -%{tde_libdir}/libnoatuncontrols.la -%{tde_libdir}/libnoatuncontrols.so -%{tde_libdir}/libnoatuntags.la -%{tde_libdir}/libnoatuntags.so -%if 0%{?with_mpeg} -%{tde_libdir}/libyafcore.la -%{tde_libdir}/libyafxplayer.la -%endif - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - -# Update icons for some control center modules -%__sed -i "tdeioslave/audiocd/kcmaudiocd/audiocd.desktop" -e "s|^Icon=.*|Icon=kcmaudio|" - - -%build -unset QTDIR QTINC QTLIB -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -# Warning: GCC visibility causes FTBFS [Bug #1285] -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - --datadir=%{tde_datadir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ - \ - --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \ - \ - --with-vorbis \ - --without-ossaudio \ - --with-alsa \ - --with-cdparanoia \ - %{?with_lame:--with-lame} %{!?with_lame:--without-lame} \ - %{?with_taglib:--with-taglib} %{!?with_taglib:--without-taglib} \ - %{?with_akode:--with-akode} %{!?with_akode:--without-akode} \ - --with-audiofile \ - %{?with_musicbrainz:--with-musicbrainz} %{!?with_musicbrainz:--without-musicbrainz} \ - --with-gstreamer \ - --with-kscd-cdda \ - --with-theora \ - --with-flac \ - %{?with_xine:--with-xine} %{!?with_xine:--without-xine} - -# Fix unexplained "undefined reference to `__stack_chk_fail'" -%if 0%{?mgaversion} >= 4 || 0%{?pclinuxos} -%__sed -i "noatun/app/Makefile" -e "/^libtdeinit_noatun_la_LDFLAGS/ s/$/ -Wl,-lc/" -%endif - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{buildroot} - -# Disable MPEG support entirely -%if 0%{?with_mpeg} == 0 -%__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay -%__rm %{?buildroot}%{tde_bindir}/yaf-* -%__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib* -%__rm %{?buildroot}%{tde_libdir}/libarts_splay.* -%__rm %{?buildroot}%{tde_libdir}/libmpeg* -%__rm %{?buildroot}%{tde_libdir}/libyaf* -%__rm %{?buildroot}%{tde_libdir}/mcop/MP3PlayObject.mcopclass -%__rm %{?buildroot}%{tde_libdir}/mcop/CDDAPlayObject.mcopclass -%__rm %{?buildroot}%{tde_libdir}/mcop/NULLPlayObject.mcopclass -%__rm %{?buildroot}%{tde_libdir}/mcop/OGGPlayObject.mcopclass -%__rm %{?buildroot}%{tde_libdir}/mcop/SplayPlayObject.mcopclass -%__rm %{?buildroot}%{tde_libdir}/mcop/WAVPlayObject.mcopclass -%endif - -# Copy missing icons from 'crystalsvg' theme (tdelibs) -%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64}"/apps/" -pushd $RPM_BUILD_ROOT%{tde_datadir}/icons/ -for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/media-optical-cdaudio.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png; done -popd - -# Updates applications categories for openSUSE -%if 0%{?suse_version} -%suse_update_desktop_file krec AudioVideo Recorder -%suse_update_desktop_file tdemid AudioVideo Midi -%suse_update_desktop_file artsbuilder AudioVideo AudioVideoEditing -%suse_update_desktop_file artscontrol AudioVideo AudioVideoEditing -%suse_update_desktop_file kmix AudioVideo Mixer -%suse_update_desktop_file kaboodle AudioVideo Player -%suse_update_desktop_file kaudiocreator AudioVideo CD -%suse_update_desktop_file kscd AudioVideo Player CD -%suse_update_desktop_file noatun AudioVideo Player Video -%suse_update_desktop_file juk AudioVideo Player Jukebox -%suse_update_desktop_file audiocd -%endif - -# Links duplicate files -%fdupes "%{?buildroot}%{tde_datadir}" - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec deleted file mode 120000 index 90fb9141a..000000000 --- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec +++ /dev/null @@ -1 +0,0 @@ -tdemultimedia-14.0.0-cmake.spec
\ No newline at end of file diff --git a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec deleted file mode 100644 index 397314c05..000000000 --- a/redhat/main/tdemultimedia/tdemultimedia-3.5.13.2.spec +++ /dev/null @@ -1,1336 +0,0 @@ -# -# spec file for package tdemultimedia (version 3.5.13-SRU) -# -# 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/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg tdemultimedia -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%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_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - - -Name: trinity-%{tde_pkg} -Summary: Multimedia applications for the Trinity Desktop Environment (TDE) -Version: %{tde_version} -Release: %{?!preversion:6}%{?preversion:0_%{preversion}}%{?dist} -Group: Productivity/Multimedia/Sound/Utilities -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - -Obsoletes: trinity-kdemultimedia < %{version}-%{release} -Provides: trinity-kdemultimedia = %{version}-%{release} -Obsoletes: trinity-kdemultimedia-libs < %{version}-%{release} -Provides: trinity-kdemultimedia-libs = %{version}-%{release} -Obsoletes: trinity-kdemultimedia-extras < %{version}-%{release} -Provides: trinity-kdemultimedia-extras = %{version}-%{release} -Obsoletes: trinity-kdemultimedia-extras-libs < %{version}-%{release} -Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release} - -BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} - -BuildRequires: autoconf automake libtool m4 -BuildRequires: gcc-c++ -BuildRequires: fdupes -BuildRequires: desktop-file-utils - -# 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 - -# TAGLIB support -%define with_taglib 1 -BuildRequires: taglib-devel - -# AKODE support -%if 0%{?with_akode} -BuildRequires: trinity-akode-devel -%{?with_libmad:BuildRequires: trinity-akode-libmad} -%endif - -# ZLIB support -BuildRequires: zlib-devel - -# MUSICBRAINZ support -## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4) -#define with_musicbrainz 1 -#BuildRequires: libmusicbrainz-devel libtunepimp-devel - -# Audio libraries -BuildRequires: libvorbis-devel -BuildRequires: audiofile-devel -BuildRequires: libtheora-devel -BuildRequires: alsa-lib-devel -BuildRequires: cdparanoia - -# NAS support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: nas-devel -%endif - -# CDDA support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libcdda-devel -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: cdparanoia-devel -%endif - -# FLAC support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: libflac-devel -%else -BuildRequires: %{_lib}flac-devel -%endif -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -BuildRequires: flac-devel -%endif - -# GSTREAMER support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: libgstreamer0.10-devel -%else -BuildRequires: %{_lib}gstreamer0.10-devel -%endif -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: gstreamer-devel -%endif -%if 0%{?suse_version} -BuildRequires: gstreamer-0_10-devel -%endif - -# X11 Libraries -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xxf86dga-devel -BuildRequires: %{_lib}xxf86vm-devel -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xtst-devel -%else -BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel -%endif -%endif -%if 0%{?rhel} == 4 -BuildRequires: xorg-x11-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXxf86dga-devel -BuildRequires: libXxf86vm-devel -%endif - -# XINE support -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?with_xine} -%define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: %{_lib}xine-devel -%else -BuildRequires: %{_lib}xine1.2-devel -%endif -%endif -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: xine-lib-devel -%endif -%if 0%{?suse_version} -BuildRequires: libxine-devel -%endif -%endif - -# LAME support -%if 0%{?opensuse_bs} == 0 -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} -%define with_lame 1 - -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: liblame-devel -%else -BuildRequires: %{_lib}lame-devel -%endif -%endif - -%if 0%{?suse_version} -BuildRequires: libmp3lame-devel -%endif - -%if 0%{?fedora} || 0%{?rhel} -BuildRequires: lame-devel -%endif - -%endif -%endif - -Requires: trinity-artsbuilder = %{version}-%{release} -Requires: trinity-juk = %{version}-%{release} -Requires: trinity-kaboodle = %{version}-%{release} -Requires: trinity-kaudiocreator = %{version}-%{release} -Requires: %{name}-kfile-plugins = %{version}-%{release} -Requires: %{name}-kappfinder-data = %{version}-%{release} -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: trinity-tdemid = %{version}-%{release} -Requires: trinity-kmix = %{version}-%{release} -Requires: trinity-krec = %{version}-%{release} -Requires: trinity-kscd = %{version}-%{release} -%{?with_akode:Requires: trinity-libarts-akode = %{version}-%{release}} -Requires: trinity-libarts-audiofile = %{version}-%{release} -%{?with_mpeg:Requires: trinity-libarts-mpeglib = %{version}-%{release}} -%{?with_xine:Requires: trinity-libarts-xine = %{version}-%{release}} -Requires: trinity-libkcddb = %{version}-%{release} -%{?with_mpeg:Requires: trinity-mpeglib = %{version}-%{release}} -Requires: trinity-noatun = %{version}-%{release} - - -%description -The Trinity Desktop Environment (TDE) is a GUI desktop for the X Window -System. The tdemultimedia package contains multimedia applications for -TDE, including: - artsbuilder, Synthesizer designer for aRts - juk, a media player - tdemid, a midi player - kmix, an audio mixer - arts, additional functionality for the aRts sound system - krec, a recording tool - kscd, an Audio-CD player - kaudiocreator, a graphical frontend for audio file creation - kaboodle, a media player - noatun, a media player - -%files - -########## - -%package -n trinity-artsbuilder -Summary: Synthesizer designer for aRts -Group: Productivity/Multimedia/Sound/Mixers -Requires: trinity-kicker >= %{tde_version} - -%description -n trinity-artsbuilder -This is the analog Realtime synthesizer's graphical design tool. - -%files -n trinity-artsbuilder -%defattr(-,root,root,-) -%{tde_bindir}/artsbuilder -%{tde_bindir}/artscontrol -%{tde_bindir}/midisend -%{tde_libdir}/libartsbuilder.la -%{tde_libdir}/libartsbuilder.so.* -%{tde_libdir}/libartscontrolapplet.la -%{tde_libdir}/libartscontrolapplet.so.* -%{tde_libdir}/libartscontrolsupport.la -%{tde_libdir}/libartscontrolsupport.so.* -%{tde_libdir}/libartsgui_idl.la -%{tde_libdir}/libartsgui_idl.so.* -%{tde_libdir}/libartsgui_kde.la -%{tde_libdir}/libartsgui_kde.so.* -%{tde_libdir}/libartsgui.la -%{tde_libdir}/libartsgui.so.* -%{tde_libdir}/libartsmidi_idl.la -%{tde_libdir}/libartsmidi_idl.so.* -%{tde_libdir}/libartsmidi.la -%{tde_libdir}/libartsmidi.so.* -%{tde_libdir}/libartsmodulescommon.la -%{tde_libdir}/libartsmodulescommon.so.* -%{tde_libdir}/libartsmoduleseffects.la -%{tde_libdir}/libartsmoduleseffects.so.* -%{tde_libdir}/libartsmodulesmixers.la -%{tde_libdir}/libartsmodulesmixers.so.* -%{tde_libdir}/libartsmodules.la -%{tde_libdir}/libartsmodules.so.* -%{tde_libdir}/libartsmodulessynth.la -%{tde_libdir}/libartsmodulessynth.so.* -%{tde_libdir}/mcop/Arts/ArtsBuilderLoader.mcopclass -%{tde_libdir}/mcop/artsbuilder.mcopclass -%{tde_libdir}/mcop/artsbuilder.mcoptype -%{tde_libdir}/mcop/Arts/Button.mcopclass -%{tde_libdir}/mcop/Arts/EffectRackGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/Effect_WAVECAPTURE.mcopclass -%{tde_libdir}/mcop/Arts/Environment/Container.mcopclass -%{tde_libdir}/mcop/Arts/Environment/EffectRackItem.mcopclass -%{tde_libdir}/mcop/Arts/Environment/InstrumentItemGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/Environment/InstrumentItem.mcopclass -%{tde_libdir}/mcop/Arts/Environment/MixerItem.mcopclass -%{tde_libdir}/mcop/Arts/Fader.mcopclass -%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/FiveBandMonoComplexEQ.mcopclass -%{tde_libdir}/mcop/Arts/FreeverbGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/GenericGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/GraphLine.mcopclass -%{tde_libdir}/mcop/artsgui.mcopclass -%{tde_libdir}/mcop/artsgui.mcoptype -%{tde_libdir}/mcop/Arts/HBox.mcopclass -%{tde_libdir}/mcop/Arts/Label.mcopclass -%{tde_libdir}/mcop/Arts/LayoutBox.mcopclass -%{tde_libdir}/mcop/Arts/LevelMeter.mcopclass -%{tde_libdir}/mcop/Arts/LineEdit.mcopclass -%{tde_libdir}/mcop/Arts/LittleStereoMixerChannelGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/LittleStereoMixerChannel.mcopclass -%{tde_libdir}/mcop/Arts/LocalFactory.mcopclass -%{tde_libdir}/mcop/Arts/MidiManager.mcopclass -%{tde_libdir}/mcop/artsmidi.mcopclass -%{tde_libdir}/mcop/artsmidi.mcoptype -%{tde_libdir}/mcop/Arts/MixerGuiFactory.mcopclass -%{tde_libdir}/mcop/artsmodulescommon.mcopclass -%{tde_libdir}/mcop/artsmodulescommon.mcoptype -%{tde_libdir}/mcop/artsmoduleseffects.mcopclass -%{tde_libdir}/mcop/artsmoduleseffects.mcoptype -%{tde_libdir}/mcop/artsmodules.mcopclass -%{tde_libdir}/mcop/artsmodules.mcoptype -%{tde_libdir}/mcop/artsmodulesmixers.mcopclass -%{tde_libdir}/mcop/artsmodulesmixers.mcoptype -%{tde_libdir}/mcop/artsmodulessynth.mcopclass -%{tde_libdir}/mcop/artsmodulessynth.mcoptype -%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannelGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/MonoSimpleMixerChannel.mcopclass -%{tde_libdir}/mcop/Arts/MonoToStereo.mcopclass -%{tde_libdir}/mcop/Arts/PopupBox.mcopclass -%{tde_libdir}/mcop/Arts/Poti.mcopclass -%{tde_libdir}/mcop/Arts/SimpleMixerChannelGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/SimpleMixerChannel.mcopclass -%{tde_libdir}/mcop/Arts/SpinBox.mcopclass -%{tde_libdir}/mcop/Arts/StereoBalanceGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/StereoBalance.mcopclass -%{tde_libdir}/mcop/Arts/StereoCompressorGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/StereoFirEqualizerGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/StereoToMono.mcopclass -%{tde_libdir}/mcop/Arts/StereoVolumeControlGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/StereoVolumeControlGui.mcopclass -%{tde_libdir}/mcop/Arts/StructureBuilder.mcopclass -%{tde_libdir}/mcop/Arts/StructureDesc.mcopclass -%{tde_libdir}/mcop/Arts/Synth_ATAN_SATURATE.mcopclass -%{tde_libdir}/mcop/Arts/Synth_AUTOPANNER.mcopclass -%{tde_libdir}/mcop/Arts/Synth_BRICKWALL_LIMITER.mcopclass -%{tde_libdir}/mcop/Arts/Synth_CAPTURE_WAV.mcopclass -%{tde_libdir}/mcop/Arts/Synth_CDELAY.mcopclass -%{tde_libdir}/mcop/Arts/Synth_COMPRESSOR.mcopclass -%{tde_libdir}/mcop/Arts/Synth_DATA.mcopclass -%{tde_libdir}/mcop/Arts/Synth_DEBUG.mcopclass -%{tde_libdir}/mcop/Arts/Synth_DELAY.mcopclass -%{tde_libdir}/mcop/Arts/Synth_DIV.mcopclass -%{tde_libdir}/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass -%{tde_libdir}/mcop/Arts/Synth_FM_SOURCE.mcopclass -%{tde_libdir}/mcop/Arts/Synth_FREEVERB.mcopclass -%{tde_libdir}/mcop/Arts/Synth_FX_CFLANGER.mcopclass -%{tde_libdir}/mcop/Arts/Synth_MIDI_DEBUG.mcopclass -%{tde_libdir}/mcop/Arts/Synth_MIDI_TEST.mcopclass -%{tde_libdir}/mcop/Arts/Synth_MOOG_VCF.mcopclass -%{tde_libdir}/mcop/Arts/Synth_NIL.mcopclass -%{tde_libdir}/mcop/Arts/Synth_NOISE.mcopclass -%{tde_libdir}/mcop/Arts/Synth_OSC.mcopclass -%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT_FFT.mcopclass -%{tde_libdir}/mcop/Arts/Synth_PITCH_SHIFT.mcopclass -%{tde_libdir}/mcop/Arts/Synth_PLAY_PAT.mcopclass -%{tde_libdir}/mcop/Arts/Synth_PSCALE.mcopclass -%{tde_libdir}/mcop/Arts/Synth_RC.mcopclass -%{tde_libdir}/mcop/Arts/Synth_SEQUENCE_FREQ.mcopclass -%{tde_libdir}/mcop/Arts/Synth_SEQUENCE.mcopclass -%{tde_libdir}/mcop/Arts/Synth_SHELVE_CUTOFF.mcopclass -%{tde_libdir}/mcop/Arts/Synth_STD_EQUALIZER.mcopclass -%{tde_libdir}/mcop/Arts/Synth_STEREO_COMPRESSOR.mcopclass -%{tde_libdir}/mcop/Arts/Synth_STEREO_FIR_EQUALIZER.mcopclass -%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT_FFT.mcopclass -%{tde_libdir}/mcop/Arts/Synth_STEREO_PITCH_SHIFT.mcopclass -%{tde_libdir}/mcop/Arts/Synth_TREMOLO.mcopclass -%{tde_libdir}/mcop/Arts/Synth_VOICE_REMOVAL.mcopclass -%{tde_libdir}/mcop/Arts/Synth_WAVE_PULSE.mcopclass -%{tde_libdir}/mcop/Arts/Synth_WAVE_SOFTSAW.mcopclass -%{tde_libdir}/mcop/Arts/Synth_WAVE_SQUARE.mcopclass -%{tde_libdir}/mcop/Arts/Synth_WAVE_TRI.mcopclass -%{tde_libdir}/mcop/Arts/Synth_XFADE.mcopclass -%{tde_libdir}/mcop/Arts/VBox.mcopclass -%{tde_libdir}/mcop/Arts/VoiceRemovalGuiFactory.mcopclass -%{tde_libdir}/mcop/Arts/Widget.mcopclass -%{tde_tdeappdir}/artsbuilder.desktop -%{tde_tdeappdir}/artscontrol.desktop -%{tde_datadir}/apps/artsbuilder/ -%{tde_datadir}/apps/artscontrol/ -%{tde_datadir}/apps/kicker/applets/artscontrolapplet.desktop -%{tde_datadir}/icons/crystalsvg/*/actions/artsaudiomanager.png -%{tde_datadir}/icons/crystalsvg/*/actions/artsbuilderexecute.png -%{tde_datadir}/icons/crystalsvg/*/actions/artsenvironment.png -%{tde_datadir}/icons/crystalsvg/*/actions/artsfftscope.png -%{tde_datadir}/icons/crystalsvg/*/actions/artsmediatypes.png -%{tde_datadir}/icons/crystalsvg/*/actions/artsmidimanager.png -%{tde_datadir}/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/artsenvironment.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/artsfftscope.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmediatypes.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/artsmidimanager.svgz -%{tde_datadir}/icons/hicolor/*/apps/artsbuilder.png -%{tde_datadir}/icons/hicolor/*/apps/artscontrol.png -%{tde_datadir}/icons/hicolor/scalable/apps/artsbuilder.svgz -%{tde_datadir}/icons/hicolor/scalable/apps/artscontrol.svgz -%{tde_datadir}/mimelnk/application/x-artsbuilder.desktop -%{tde_tdedocdir}/HTML/en/artsbuilder/ - -%post -n trinity-artsbuilder -/sbin/ldconfig -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-artsbuilder -/sbin/ldconfig -for f in crystalsvg hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-juk -Summary: Music organizer and player for Trinity -Group: Productivity/Multimedia/Sound/Players - -%description -n trinity-juk -JuK (pronounced "jook") is a jukebox and music manager for the TDE -desktop similar to jukebox software on other platforms such as -iTunes or RealOne. - -Some of JuK's features include: -* Support for Ogg Vorbis and MP3 formats -* Tag editing support for both formats, including ID3v2 for MP3 files. - Multitagging or editing a selection of multiple files at once is also - supported -* Output to either the aRts, default KDE sound system, or GStreamer -* Management of your "collection" and multiple playlists -* Import and export to m3u playlists -* Binary caching of audio meta-data and playlist information for faster - load times (starting with the second time you run JuK) -* Integration into TDE that allows drag-and-drop and clipboard usage - with other TDE and X apps - -%files -n trinity-juk -%defattr(-,root,root,-) -%{tde_bindir}/juk -%{tde_tdeappdir}/juk.desktop -%{tde_datadir}/apps/juk/ -%{tde_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop -%{tde_datadir}/icons/crystalsvg/*/actions/juk_dock.png -%{tde_datadir}/icons/hicolor/*/apps/juk.png -%{tde_tdedocdir}/HTML/en/juk/ - -%post -n trinity-juk -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-juk -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kaboodle -Summary: Light, embedded media player for Trinity -Group: System/GUI/Other - -%if 0%{?with_xine} -Requires: trinity-libarts-xine = %{version}-%{release} -%endif - -%description -n trinity-kaboodle -Kaboodle is a light, embedded media player, supporting both video and audio, -for TDE. It uses the aRts framework for playing media files. - -%files -n trinity-kaboodle -%defattr(-,root,root,-) -%{tde_bindir}/kaboodle -%{tde_tdelibdir}/libkaboodlepart.la -%{tde_tdelibdir}/libkaboodlepart.so -%{tde_tdeappdir}/kaboodle.desktop -%{tde_datadir}/apps/kaboodle/ -%{tde_datadir}/icons/hicolor/*/apps/kaboodle.png -%{tde_datadir}/services/kaboodle_component.desktop -%{tde_datadir}/services/kaboodleengine.desktop -%{tde_tdedocdir}/HTML/en/kaboodle/ - -%post -n trinity-kaboodle -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kaboodle -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kaudiocreator -Summary: CD ripper and audio encoder frontend for Trinity -Group: Productivity/Multimedia/CD/Grabbers - -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: vorbis-tools -Requires: flac - -%description -n trinity-kaudiocreator -KAudioCreator is a tool for audio extraction (ripping) and encoding. It can -keep your WAV files, or convert them to Ogg/Vorbis, MP3, or FLAC. It also -searches CDDB to retrieve the information of the disk. - -%files -n trinity-kaudiocreator -%defattr(-,root,root,-) -%{tde_bindir}/kaudiocreator -%{tde_tdeappdir}/kaudiocreator.desktop -%{tde_datadir}/apps/kaudiocreator/ -%{tde_datadir}/apps/kconf_update/kaudiocreator-libkcddb.upd -%{tde_datadir}/apps/kconf_update/kaudiocreator-meta.upd -%{tde_datadir}/apps/kconf_update/upgrade-kaudiocreator-metadata.sh -%{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract.desktop -%{tde_datadir}/config.kcfg/kaudiocreator.kcfg -%{tde_datadir}/config.kcfg/kaudiocreator_encoders.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kaudiocreator.png -%{tde_datadir}/icons/locolor/*/apps/kaudiocreator.png -%{tde_tdedocdir}/HTML/en/kaudiocreator/ - -%post -n trinity-kaudiocreator -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kaudiocreator -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package kfile-plugins -Summary: An au/avi/m3u/mp3/ogg/wav plugins for kfile -Group: Productivity/Multimedia/Sound/Utilities - -%description kfile-plugins -au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity. - -%files kfile-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/kfile_au.la -%{tde_tdelibdir}/kfile_au.so -%{tde_tdelibdir}/kfile_avi.la -%{tde_tdelibdir}/kfile_avi.so -%{tde_tdelibdir}/kfile_flac.la -%{tde_tdelibdir}/kfile_flac.so -%{tde_tdelibdir}/kfile_m3u.la -%{tde_tdelibdir}/kfile_m3u.so -%{tde_tdelibdir}/kfile_mp3.la -%{tde_tdelibdir}/kfile_mp3.so -%{tde_tdelibdir}/kfile_mpc.la -%{tde_tdelibdir}/kfile_mpc.so -%{tde_tdelibdir}/kfile_mpeg.la -%{tde_tdelibdir}/kfile_mpeg.so -%{tde_tdelibdir}/kfile_ogg.la -%{tde_tdelibdir}/kfile_ogg.so -%{tde_tdelibdir}/kfile_sid.la -%{tde_tdelibdir}/kfile_sid.so -%{tde_tdelibdir}/kfile_theora.la -%{tde_tdelibdir}/kfile_theora.so -%{tde_tdelibdir}/kfile_wav.la -%{tde_tdelibdir}/kfile_wav.so -%{tde_datadir}/services/kfile_au.desktop -%{tde_datadir}/services/kfile_avi.desktop -%{tde_datadir}/services/kfile_flac.desktop -%{tde_datadir}/services/kfile_m3u.desktop -%{tde_datadir}/services/kfile_mp3.desktop -%{tde_datadir}/services/kfile_mpc.desktop -%{tde_datadir}/services/kfile_mpeg.desktop -%{tde_datadir}/services/kfile_ogg.desktop -%{tde_datadir}/services/kfile_sid.desktop -%{tde_datadir}/services/kfile_theora.desktop -%{tde_datadir}/services/kfile_wav.desktop - -########## - -%package kappfinder-data -Summary: Multimedia data for kappfinder -Group: Productivity/Multimedia/Sound/Utilities - -Requires: trinity-kappfinder >= %{tde_version} -Requires: trinity-tdebase-runtime-data-common >= %{tde_version} - -%description kappfinder-data -This package provides data on multimedia applications for kappfinder. - -%files kappfinder-data -%defattr(-,root,root,-) -%{tde_datadir}/apps/kappfinder/ -%{tde_datadir}/desktop-directories/tde-multimedia-music.directory -%config %{_sysconfdir}/xdg/menus/applications-merged/tde-multimedia-music.menu - -########## - -%package tdeio-plugins -Summary: Enables the browsing of audio CDs under Konqueror -Group: Productivity/Multimedia/Sound/Utilities -Requires: trinity-tdebase-tdeio-plugins >= %{tde_version} - -Obsoletes: trinity-tdemultimedia-kio-plugins < %{version}-%{release} -Provides: trinity-tdemultimedia-kio-plugins = %{version}-%{release} - -%description tdeio-plugins -This package allow audio CDs to be browsed like a file system using -Konqueror and the audiocd:/ URL. - -%files tdeio-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcm_audiocd.la -%{tde_tdelibdir}/kcm_audiocd.so -%{tde_tdelibdir}/kio_audiocd.la -%{tde_tdelibdir}/kio_audiocd.so -%{tde_tdelibdir}/libaudiocd_encoder_flac.la -%{tde_tdelibdir}/libaudiocd_encoder_flac.so -%{tde_tdelibdir}/libaudiocd_encoder_lame.la -%{tde_tdelibdir}/libaudiocd_encoder_lame.so -%{tde_tdelibdir}/libaudiocd_encoder_vorbis.la -%{tde_tdelibdir}/libaudiocd_encoder_vorbis.so -%{tde_tdelibdir}/libaudiocd_encoder_wav.la -%{tde_tdelibdir}/libaudiocd_encoder_wav.so -%{tde_libdir}/libaudiocdplugins.so.* -%{tde_tdeappdir}/audiocd.desktop -%{tde_datadir}/apps/kconf_update/audiocd.upd -%{tde_datadir}/apps/kconf_update/upgrade-metadata.sh -%{tde_datadir}/config.kcfg/audiocd_lame_encoder.kcfg -%{tde_datadir}/config.kcfg/audiocd_vorbis_encoder.kcfg -%{tde_datadir}/services/audiocd.protocol -%{tde_tdedocdir}/HTML/en/kioslave/ -%{tde_datadir}/icons/hicolor/*/apps/kcmaudiocd.png - -%post tdeio-plugins -/sbin/ldconfig -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun tdeio-plugins -/sbin/ldconfig -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-tdemid -Summary: MIDI/karaoke player for Trinity -Group: Productivity/Multimedia/Sound/Midi - -Obsoletes: trinity-kmid < %{version}-%{release} -Provides: trinity-kmid = %{version}-%{release} - -%description -n trinity-tdemid -This package provides a MIDI and karaoke player for TDE. - -%files -n trinity-tdemid -%defattr(-,root,root,-) -%{tde_bindir}/kmid -%{tde_tdelibdir}/libkmidpart.la -%{tde_tdelibdir}/libkmidpart.so -%{tde_libdir}/libkmidlib.so.* -%{tde_tdeappdir}/kmid.desktop -%{tde_datadir}/apps/kmid/ -%{tde_datadir}/icons/hicolor/*/apps/kmid.png -%{tde_datadir}/mimelnk/audio/x-karaoke.desktop -%{tde_datadir}/servicetypes/audiomidi.desktop -%{tde_tdedocdir}/HTML/en/kmid/ - -%post -n trinity-tdemid -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-tdemid -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kmix -Summary: Sound mixer applet for Trinity -Group: Productivity/Multimedia/Sound/Mixers -Requires: trinity-kicker >= %{tde_version} - -%description -n trinity-kmix -This package includes TDE's dockable sound mixer applet. - -%files -n trinity-kmix -%defattr(-,root,root,-) -%{tde_bindir}/kmix -%{tde_bindir}/kmixctrl -%{tde_tdelibdir}/kmix.la -%{tde_tdelibdir}/kmix.so -%{tde_tdelibdir}/kmix_panelapplet.la -%{tde_tdelibdir}/kmix_panelapplet.so -%{tde_tdelibdir}/kmixctrl.la -%{tde_tdelibdir}/kmixctrl.so -%{tde_libdir}/libkdeinit_kmix.so -%{tde_libdir}/libkdeinit_kmixctrl.so -%{tde_tdeappdir}/kmix.desktop -%{tde_datadir}/apps/kicker/applets/kmixapplet.desktop -%{tde_datadir}/apps/kmix/ -%{tde_datadir}/autostart/kmix.desktop -%{tde_datadir}/autostart/restore_kmix_volumes.desktop -%{tde_datadir}/icons/hicolor/*/apps/kmix.png -%{tde_datadir}/services/kmixctrl_restore.desktop -%{tde_tdedocdir}/HTML/en/kmix/ - -%post -n trinity-kmix -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kmix -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-krec -Summary: Sound recorder utility for Trinity -Group: Productivity/Multimedia/CD/Record - -%description -n trinity-krec -This is a sound recording utility for Trinity. - -%files -n trinity-krec -%defattr(-,root,root,-) -%{tde_bindir}/krec -%{tde_tdelibdir}/kcm_krec.la -%{tde_tdelibdir}/kcm_krec.so -%{tde_tdelibdir}/kcm_krec_files.la -%{tde_tdelibdir}/kcm_krec_files.so -%{tde_tdelibdir}/krec.la -%{tde_tdelibdir}/krec.so -%if 0%{?with_lame} -%{tde_tdelibdir}/libkrecexport_mp3.la -%{tde_tdelibdir}/libkrecexport_mp3.so -%{tde_datadir}/services/krec_exportmp3.desktop -%endif -%{tde_tdelibdir}/libkrecexport_ogg.la -%{tde_tdelibdir}/libkrecexport_ogg.so -%{tde_tdelibdir}/libkrecexport_wave.la -%{tde_tdelibdir}/libkrecexport_wave.so -%{tde_libdir}/libkdeinit_krec.so -%{tde_tdeappdir}/krec.desktop -%{tde_datadir}/apps/krec/ -%{tde_datadir}/icons/hicolor/*/apps/krec.png -%{tde_datadir}/services/kcm_krec.desktop -%{tde_datadir}/services/kcm_krec_files.desktop -%{tde_datadir}/services/krec_exportogg.desktop -%{tde_datadir}/services/krec_exportwave.desktop -%{tde_datadir}/servicetypes/krec_exportitem.desktop -%{tde_tdedocdir}/HTML/en/krec/ - -%post -n trinity-krec -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-krec -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kscd -Summary: Audio CD player for Trinity -Group: Productivity/Multimedia/CD/Players - -%description -n trinity-kscd -This is Trinity's audio CD player. - -%files -n trinity-kscd -%defattr(-,root,root,-) -%{tde_bindir}/kscd -%{tde_bindir}/workman2cddb.pl -%{tde_tdeappdir}/kscd.desktop -%{tde_datadir}/apps/konqueror/servicemenus/audiocd_play.desktop -%{tde_datadir}/apps/kscd/ -%{tde_datadir}/apps/profiles/kscd.profile.xml -%{tde_datadir}/config.kcfg/kscd.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kscd.png -%{tde_datadir}/mimelnk/text/xmcd.desktop -%{tde_tdedocdir}/HTML/en/kscd/ - -%post -n trinity-kscd -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kscd -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%if 0%{?with_akode} -%package -n trinity-libarts-akode -Summary: Akode plugin for aRts -Group: Productivity/Multimedia/Other - -%description -n trinity-libarts-akode -This package contains akode plugins for aRts. - -%files -n trinity-libarts-akode -%defattr(-,root,root,-) -%{tde_libdir}/libarts_akode.so.* -%{tde_libdir}/libarts_akode.la -%{tde_libdir}/mcop/akodearts.mcoptype -%{tde_libdir}/mcop/akodearts.mcopclass -%{tde_libdir}/mcop/akodeMPCPlayObject.mcopclass -%{tde_libdir}/mcop/akodePlayObject.mcopclass -%{tde_libdir}/mcop/akodeSpeexStreamPlayObject.mcopclass -%{tde_libdir}/mcop/akodeVorbisStreamPlayObject.mcopclass -%{tde_libdir}/mcop/akodeXiphPlayObject.mcopclass - -# Requires MAD support -%{?with_libmad:%{tde_libdir}/mcop/akodeMPEGPlayObject.mcopclass} - -%post -n trinity-libarts-akode -/sbin/ldconfig - -%postun -n trinity-libarts-akode -/sbin/ldconfig -%endif - -########## - -%package -n trinity-libarts-audiofile -Summary: Audiofile plugin for aRts -Group: Productivity/Multimedia/Other - -%description -n trinity-libarts-audiofile -This package contains audiofile plugins for aRts. - -%files -n trinity-libarts-audiofile -%defattr(-,root,root,-) -%{tde_libdir}/libarts_audiofile.so.* -%{tde_libdir}/libarts_audiofile.la -%{tde_libdir}/mcop/Arts/audiofilePlayObject.mcopclass -%{tde_libdir}/mcop/audiofilearts.mcopclass -%{tde_libdir}/mcop/audiofilearts.mcoptype - -%post -n trinity-libarts-audiofile -/sbin/ldconfig - -%postun -n trinity-libarts-audiofile -/sbin/ldconfig - -########## - -%if 0%{?with_mpeg} -%package -n trinity-libarts-mpeglib -Summary: Mpeglib plugin for aRts, supporting mp3 and mpeg audio/video -Group: Productivity/Multimedia/Other - -%description -n trinity-libarts-mpeglib -This package contains the mpeglib aRts plugin, supporting mp3 and mpeg -audio and video. - -This is the arts (TDE Sound daemon) plugin. - -%files -n trinity-libarts-mpeglib -%defattr(-,root,root,-) -%{tde_bindir}/mpeglibartsplay -%{tde_libdir}/libarts_mpeglib-0.3.0.so.* -%{tde_libdir}/libarts_mpeglib.la -%{tde_libdir}/libarts_splay.so.* -%{tde_libdir}/libarts_splay.la -%{tde_libdir}/mcop/CDDAPlayObject.mcopclass -%{tde_libdir}/mcop/MP3PlayObject.mcopclass -%{tde_libdir}/mcop/NULLPlayObject.mcopclass -%{tde_libdir}/mcop/OGGPlayObject.mcopclass -%{tde_libdir}/mcop/SplayPlayObject.mcopclass -%{tde_libdir}/mcop/WAVPlayObject.mcopclass - -%post -n trinity-libarts-mpeglib -/sbin/ldconfig - -%postun -n trinity-libarts-mpeglib -/sbin/ldconfig -%endif - -########## - -%if 0%{?with_xine} -%package -n trinity-libarts-xine -Summary: ARTS plugin enabling xine support -Group: Productivity/Multimedia/Other - -%description -n trinity-libarts-xine -This package contains aRts' xine plugin, allowing the use of the xine -multimedia engine though aRts. - -%files -n trinity-libarts-xine -%defattr(-,root,root,-) -%{tde_tdelibdir}/videothumbnail.la -%{tde_tdelibdir}/videothumbnail.so -%{tde_libdir}/libarts_xine.so.* -%{tde_libdir}/libarts_xine.la -%{tde_libdir}/mcop/xineAudioPlayObject.mcopclass -%{tde_libdir}/mcop/xineVideoPlayObject.mcopclass -%{tde_datadir}/apps/videothumbnail/sprocket-large.png -%{tde_datadir}/apps/videothumbnail/sprocket-medium.png -%{tde_datadir}/apps/videothumbnail/sprocket-small.png -%{tde_datadir}/services/videothumbnail.desktop - -%post -n trinity-libarts-xine -/sbin/ldconfig - -%postun -n trinity-libarts-xine -/sbin/ldconfig -%endif - -########## - -%package -n trinity-libkcddb -Summary: CDDB library for Trinity -Group: Productivity/Multimedia/Other -Requires: trinity-kcontrol >= %{tde_version} - -%description -n trinity-libkcddb -The Trinity native CDDB (CD Data Base) library, providing easy access to Audio -CD meta-information (track titles, artist information, etc.) from on-line -databases, for TDE applications. - -%files -n trinity-libkcddb -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcm_cddb.la -%{tde_tdelibdir}/kcm_cddb.so -%{tde_libdir}/libkcddb.so.* -%{tde_tdeappdir}/libkcddb.desktop -%{tde_datadir}/apps/kconf_update/kcmcddb-emailsettings.upd -%{tde_datadir}/config.kcfg/libkcddb.kcfg - -%post -n trinity-libkcddb -/sbin/ldconfig -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-libkcddb -/sbin/ldconfig -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%if 0%{?with_mpeg} - -%package -n trinity-mpeglib -Summary: MP3 and MPEG-1 audio and video library -Group: Productivity/Multimedia/Other -%if 0%{?with_mpeg} -Requires: trinity-libarts-mpeglib = %{version}-%{release} -%endif - -%description -n trinity-mpeglib -mpeglib is a MPEG-1 and MP3 audio and video library. It supports -MPEG-1 audio (layers 1, 2, 3), MPEG-1 video, MPEG-1 system layer, -and WAV playback - -%files -n trinity-mpeglib -%defattr(-,root,root,-) -%{tde_bindir}/yaf-cdda -%{tde_bindir}/yaf-mpgplay -%{tde_bindir}/yaf-splay -%{tde_bindir}/yaf-tplay -%{tde_bindir}/yaf-vorbis -%{tde_bindir}/yaf-yuv -%{tde_libdir}/libmpeg-0.3.0.so -%{tde_libdir}/libyafcore.so -%{tde_libdir}/libyafxplayer.so - -%post -n trinity-mpeglib -/sbin/ldconfig - -%postun -n trinity-mpeglib -/sbin/ldconfig - -%endif - -########## - -%package -n trinity-noatun -Summary: Media player for Trinity -Group: Productivity/Multimedia/Video/Players -Requires: trinity-tdebase-bin >= %{tde_version} - -# 20120802: Hack to avoid dependency issue on MGA2 and MDV2011 -%if 0%{?mgaversion} || 0%{?mdkversion} -Provides: devel(libnoatunarts) -Provides: devel(libnoatunarts(64bit)) -%endif - -%description -n trinity-noatun -Noatun is an aRts-based audio and video player for Trinity. It supports all -formats supported by your installation of aRts (including aRts plugins). - -%files -n trinity-noatun -%defattr(-,root,root,-) -%{tde_bindir}/noatun -%{tde_libdir}/kconf_update_bin/noatun20update -%{tde_tdelibdir}/noatun.la -%{tde_tdelibdir}/noatun.so -%{tde_tdelibdir}/noatun_dcopiface.la -%{tde_tdelibdir}/noatun_dcopiface.so -%{tde_tdelibdir}/noatun_excellent.la -%{tde_tdelibdir}/noatun_excellent.so -%{tde_tdelibdir}/noatun_htmlexport.la -%{tde_tdelibdir}/noatun_htmlexport.so -%{tde_tdelibdir}/noatun_infrared.la -%{tde_tdelibdir}/noatun_infrared.so -%{tde_tdelibdir}/noatun_kaiman.la -%{tde_tdelibdir}/noatun_kaiman.so -%{tde_tdelibdir}/noatun_keyz.la -%{tde_tdelibdir}/noatun_keyz.so -%{tde_tdelibdir}/noatun_kjofol.la -%{tde_tdelibdir}/noatun_kjofol.so -%{tde_tdelibdir}/noatun_marquis.la -%{tde_tdelibdir}/noatun_marquis.so -%{tde_tdelibdir}/noatun_metatag.la -%{tde_tdelibdir}/noatun_metatag.so -%{tde_tdelibdir}/noatun_monoscope.la -%{tde_tdelibdir}/noatun_monoscope.so -%{tde_tdelibdir}/noatun_net.la -%{tde_tdelibdir}/noatun_net.so -%{tde_tdelibdir}/noatun_splitplaylist.la -%{tde_tdelibdir}/noatun_splitplaylist.so -%{tde_tdelibdir}/noatun_systray.la -%{tde_tdelibdir}/noatun_systray.so -%{tde_tdelibdir}/noatun_ui.la -%{tde_tdelibdir}/noatun_ui.so -%{tde_tdelibdir}/noatun_voiceprint.la -%{tde_tdelibdir}/noatun_voiceprint.so -%{tde_tdelibdir}/noatun_winskin.la -%{tde_tdelibdir}/noatun_winskin.so -%{tde_tdelibdir}/noatunsimple.la -%{tde_tdelibdir}/noatunsimple.so -%{tde_libdir}/libartseffects.la -%{tde_libdir}/libartseffects.so -%{tde_libdir}/libkdeinit_noatun.so -%{tde_libdir}/libnoatun.so.* -%{tde_libdir}/libnoatunarts.la -%{tde_libdir}/libnoatunarts.so -%{tde_libdir}/libnoatuncontrols.so.* -%{tde_libdir}/libnoatuntags.so.* -%{tde_libdir}/libwinskinvis.la -%{tde_libdir}/libwinskinvis.so -%{tde_libdir}/mcop/ExtraStereo.mcopclass -%{tde_libdir}/mcop/ExtraStereoGuiFactory.mcopclass -%{tde_libdir}/mcop/Noatun/ -%{tde_libdir}/mcop/RawWriter.mcopclass -%{tde_libdir}/mcop/VoiceRemoval.mcopclass -%{tde_libdir}/mcop/artseffects.mcopclass -%{tde_libdir}/mcop/artseffects.mcoptype -%{tde_libdir}/mcop/noatunarts.mcopclass -%{tde_libdir}/mcop/noatunarts.mcoptype -%{tde_libdir}/mcop/winskinvis.mcopclass -%{tde_libdir}/mcop/winskinvis.mcoptype -%{tde_tdeappdir}/noatun.desktop -%{tde_datadir}/apps/kconf_update/noatun.upd -%{tde_datadir}/apps/noatun/ -%{tde_datadir}/icons/hicolor/*/apps/noatun.png -%{tde_datadir}/mimelnk/interface/x-winamp-skin.desktop -%{tde_tdedocdir}/HTML/en/noatun/ - -%post -n trinity-noatun -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-noatun -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package devel -Summary: Development files for %{name}, aRts and noatun plugins -Group: Development/Libraries/Other -Requires: %{name} = %{version}-%{release} -Requires: trinity-tdelibs-devel >= %{tde_version} - -Obsoletes: trinity-kdemultimedia-devel < %{version}-%{release} -Provides: trinity-kdemultimedia-devel = %{version}-%{release} - -%description devel -{summary}. - -Install %{name}-devel if you wish to develop or compile any -applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or -noatun plugins. - -%files devel -%defattr(-,root,root,-) -%{tde_includedir}/* -%if 0%{?with_akode} -%{tde_libdir}/libarts_akode.so -%endif -%{tde_libdir}/libarts_audiofile.so -%if 0%{?with_mpeg} -%{tde_libdir}/libarts_mpeglib.so -%{tde_libdir}/libarts_splay.so -%endif -%if 0%{?with_xine} -%{tde_libdir}/libarts_xine.so -%endif -%{tde_libdir}/libartsbuilder.so -%{tde_libdir}/libartscontrolapplet.so -%{tde_libdir}/libartscontrolsupport.so -%{tde_libdir}/libartsgui.so -%{tde_libdir}/libartsgui_idl.so -%{tde_libdir}/libartsgui_kde.so -%{tde_libdir}/libartsmidi.so -%{tde_libdir}/libartsmidi_idl.so -%{tde_libdir}/libartsmodules.so -%{tde_libdir}/libartsmodulescommon.so -%{tde_libdir}/libartsmoduleseffects.so -%{tde_libdir}/libartsmodulesmixers.so -%{tde_libdir}/libartsmodulessynth.so -%{tde_libdir}/libaudiocdplugins.la -%{tde_libdir}/libaudiocdplugins.so -%{tde_libdir}/libkcddb.la -%{tde_libdir}/libkcddb.so -%{tde_libdir}/libkdeinit_kmix.la -%{tde_libdir}/libkdeinit_kmixctrl.la -%{tde_libdir}/libkdeinit_krec.la -%{tde_libdir}/libkdeinit_noatun.la -%{tde_libdir}/libkmidlib.la -%{tde_libdir}/libkmidlib.so -%if 0%{?with_mpeg} -%{tde_libdir}/libmpeg.la -%{tde_libdir}/libmpeg.so -%endif -%{tde_libdir}/libnoatun.la -%{tde_libdir}/libnoatun.so -%{tde_libdir}/libnoatuncontrols.la -%{tde_libdir}/libnoatuncontrols.so -%{tde_libdir}/libnoatuntags.la -%{tde_libdir}/libnoatuntags.so -%if 0%{?with_mpeg} -%{tde_libdir}/libyafcore.la -%{tde_libdir}/libyafxplayer.la -%endif - -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -# FIXME 2014/03/15: FTBFS on PCLINUXOS ... Need to remove -fstack-protector -# UPDATE 2014/04/07: FBTFS on Mageia 4 too ! -%if 0%{?pclinuxos} || 0%{?mgaversion} >= 4 -%define _ssp_cflags -fno-stack-protector --param=ssp-buffer-size=4%{?_serverbuild_flags: %_serverbuild_flags} -%endif - - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - -# Update icons for some control center modules -%__sed -i "kioslave/audiocd/kcmaudiocd/audiocd.desktop" -e "s|^Icon=.*|Icon=kcmaudio|" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -# Required for some distro -export KDEDIRS="%{tde_prefix}" - -# Specific path for RHEL4 -if [ -d "/usr/X11R6" ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - --datadir=%{tde_datadir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - \ - --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \ - \ - --with-vorbis \ - --without-ossaudio \ - --with-alsa \ - --with-cdparanoia \ - %{?with_lame:--with-lame} %{!?with_lame:--without-lame} \ - %{?with_taglib:--with-taglib} %{!?with_taglib:--without-taglib} \ - %{?with_akode:--with-akode} %{!?with_akode:--without-akode} \ - --with-audiofile \ - %{?with_musicbrainz:--with-musicbrainz} %{!?with_musicbrainz:--without-musicbrainz} \ - --with-gstreamer \ - --with-kscd-cdda \ - --with-theora \ - --with-flac \ - %{?with_xine:--with-xine} %{!?with_xine:--without-xine} - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{buildroot} - -# Disable MPEG support entirely -%if 0%{?with_mpeg} == 0 -%__rm %{?buildroot}%{tde_bindir}/mpeglibartsplay -%__rm %{?buildroot}%{tde_bindir}/yaf-* -%__rm %{?buildroot}%{tde_libdir}/libarts_mpeglib* -%__rm %{?buildroot}%{tde_libdir}/libarts_splay.* -%__rm %{?buildroot}%{tde_libdir}/libmpeg* -%__rm %{?buildroot}%{tde_libdir}/libyaf* -%__rm %{?buildroot}%{tde_libdir}/mcop/MP3PlayObject.mcopclass -%__rm %{?buildroot}%{tde_libdir}/mcop/CDDAPlayObject.mcopclass -%__rm %{?buildroot}%{tde_libdir}/mcop/NULLPlayObject.mcopclass -%__rm %{?buildroot}%{tde_libdir}/mcop/OGGPlayObject.mcopclass -%__rm %{?buildroot}%{tde_libdir}/mcop/SplayPlayObject.mcopclass -%__rm %{?buildroot}%{tde_libdir}/mcop/WAVPlayObject.mcopclass -%endif - -# Copy missing icons from 'crystalsvg' theme (tdelibs) -%__mkdir_p "%{?buildroot}{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64}"/apps/" -pushd $RPM_BUILD_ROOT%{tde_datadir}/icons/ -for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/cdaudio_unmount.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png; done -popd - -# Updates applications categories for openSUSE -%if 0%{?suse_version} -%suse_update_desktop_file krec AudioVideo Recorder -%suse_update_desktop_file kmid AudioVideo Midi -%suse_update_desktop_file artsbuilder AudioVideo AudioVideoEditing -%suse_update_desktop_file artscontrol AudioVideo AudioVideoEditing -%suse_update_desktop_file kmix AudioVideo Mixer -%suse_update_desktop_file kaboodle AudioVideo Player -%suse_update_desktop_file kaudiocreator AudioVideo CD -%suse_update_desktop_file kscd AudioVideo Player CD -%suse_update_desktop_file noatun AudioVideo Player Video -%suse_update_desktop_file juk AudioVideo Player Jukebox -%suse_update_desktop_file audiocd -%endif - -# Links duplicate files -%fdupes "%{?buildroot}%{tde_datadir}" - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec b/redhat/main/tdemultimedia/tdemultimedia.spec index 086f7ec9f..06eca08ab 100644 --- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec +++ b/redhat/main/tdemultimedia/tdemultimedia.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdemultimedia %define tde_prefix /opt/trinity @@ -174,9 +174,9 @@ BuildRequires: libXxf86vm-devel %endif # XINE support -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version} %define with_xine 1 -%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} BuildRequires: %{_lib}xine1.2-devel %endif %if 0%{?fedora} || 0%{?rhel} @@ -616,7 +616,6 @@ Konqueror and the audiocd:/ URL. %{tde_datadir}/services/audiocd.protocol %{tde_tdedocdir}/HTML/en/tdeioslave/audiocd/ %{tde_tdedocdir}/HTML/en/kcontrol/audiocd/ -%{tde_datadir}/icons/hicolor/*/apps/kcmaudiocd.png ########## @@ -1126,12 +1125,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm %{?buildroot}%{tde_libdir}/mcop/WAVPlayObject.mcopclass %endif -# Copy missing icons from 'crystalsvg' theme (tdelibs) -%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64}"/apps/" -pushd $RPM_BUILD_ROOT%{tde_datadir}/icons/ -for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/media-optical-cdaudio.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png; done -popd - # Updates applications categories for openSUSE %if 0%{?suse_version} %suse_update_desktop_file krec AudioVideo Recorder diff --git a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec deleted file mode 100644 index aeebf5048..000000000 --- a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec +++ /dev/null @@ -1,1308 +0,0 @@ -# -# spec file for package tdenetwork (version 3.5.13-SRU) -# -# 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/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg tdenetwork -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%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_sbindir %{tde_prefix}/sbin -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -# Avoids relinking, which breaks consolehelper -%define dont_relink 1 - - -Name: trinity-%{tde_pkg} -Summary: Trinity Desktop Environment - Network Applications -Group: Applications/Internet -Version: %{tde_version} -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} -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}-%{version}%{?preversion:~%{preversion}}.tar.gz -Source1: kppp.pamd -Source2: ktalk - -%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch} - -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} - -BuildRequires: cmake >= 2.8 -BuildRequires: gettext -BuildRequires: coreutils -BuildRequires: gcc-c++ -BuildRequires: desktop-file-utils -BuildRequires: fdupes - -# 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 - -# for set_permissions macro -%if 0%{?suse_version} -PreReq: permissions -%endif - -# OPENSSL support -BuildRequires: openssl-devel - -# TLS support -BuildRequires: gnutls-devel - -# SQLITE support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: sqlite3-devel -%else -BuildRequires: sqlite-devel -%endif - -# GADU support -%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_gadu 1 -BuildRequires: libgadu-devel -%endif - -# PCRE support -BuildRequires: pcre-devel - -# GAMIN support -# Not on openSUSE. -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_gamin 1 -BuildRequires: gamin-devel -%endif - -# XTST support -%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1210 -BuildRequires: libXtst-devel -%endif -%if 0%{?mdkversion} || 0%{?mgaversion} -BuildRequires: libxtst-devel -%endif - -# XMU support -%if 0%{?suse_version} == 1140 -BuildRequires: xorg-x11-libXmu-devel -%endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210 -BuildRequires: libXmu-devel -%endif -%if 0%{?mdkversion} || 0%{?mgaversion} >= 4 -BuildRequires: libxmu-devel -%endif -%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3 -BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel -%endif - -# Other stuff -%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 -BuildRequires: libXScrnSaver-devel -BuildRequires: libXxf86vm-devel -%endif - -# Fedora review: http://bugzilla.redhat.com/195486 - -## Conditional build: -# RHEL6: xmms is outdated ! -#define _with_xmms --with-xmms -%ifnarch s390 s390x -%define _with_wifi --with-wifi -%endif - -# Wifi support -%if "%{?_with_wifi:1}" == "1" -%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 -BuildRequires: wireless-tools-devel -%endif -%if 0%{?mgaversion} == 2 || 0%{?mdkversion} -BuildRequires: %{_lib}iw29-devel -%endif -%if 0%{?rhel} == 5 || 0%{?suse_version} -BuildRequires: wireless-tools -%endif -%if 0%{?suse_version} || 0%{?mgaversion} >= 3 -BuildRequires: libiw-devel -%endif -%endif - -# OpenSLP support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_openslp 1 -BuildRequires: openslp-devel -%endif - -%ifarch %{ix86} -# BR: /usr/include/valgrind/valgrind.h -BuildRequires: valgrind -%endif - -%{?_with_xmms:BuildRequires: xmms-devel} - -# V4L support -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version} -BuildRequires: libv4l-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}v4l-devel -%endif - -# XML support -BuildRequires: libxml2-devel -BuildRequires: libxslt-devel - -#jabber -BuildRequires: libidn-devel -#jabber/jingle -%if 0%{?suse_version} -BuildRequires: libexpat-devel -%else -BuildRequires: expat-devel -%endif -BuildRequires: glib2-devel -BuildRequires: speex-devel -# jabber/ssl -#{?fedora:Requires(hint): qca-tls} -Requires: jasper - -# MEANWHILE support -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version} -%define with_meanwhile 1 -BuildRequires: meanwhile-devel -%endif - -# ORTP support -#if 0%{?rhel} >= 6 || 0#{?fedora} >= 15 -#BuildRequires: ortp-devel -#endif - -# SPEEX support -%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} -%define with_speex 1 -BuildRequires: speex-devel -%endif - -# CONSOLEHELPER (usermode) support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_consolehelper 1 - -# Avoids relinking, which breaks consolehelper -%define dont_relink 1 -%endif - -Obsoletes: trinity-kdenetwork < %{version}-%{release} -Provides: trinity-kdenetwork = %{version}-%{release} -Obsoletes: trinity-kdenetwork-libs < %{version}-%{release} -Provides: trinity-kdenetwork-libs = %{version}-%{release} -Obsoletes: trinity-kdenetwork-extras < %{version}-%{release} -Provides: trinity-kdenetwork-extras = %{version}-%{release} -Obsoletes: tdenetwork < %{version}-%{release} -Provides: tdenetwork = %{version}-%{release} - -Requires: trinity-dcoprss = %{version}-%{release} -Requires: %{name}-filesharing = %{version}-%{release} -Requires: trinity-kdict = %{version}-%{release} -Requires: %{name}-tdefile-plugins = %{version}-%{release} -Requires: trinity-kget = %{version}-%{release} -Requires: trinity-knewsticker = %{version}-%{release} -Requires: trinity-kopete = %{version}-%{release} -Requires: trinity-kopete-nowlistening = %{version}-%{release} -Requires: trinity-kpf = %{version}-%{release} -Requires: trinity-kppp = %{version}-%{release} -Requires: trinity-krdc = %{version}-%{release} -Requires: trinity-krfb = %{version}-%{release} -Requires: trinity-ksirc = %{version}-%{release} -Requires: trinity-ktalkd = %{version}-%{release} -Requires: trinity-kwifimanager = %{version}-%{release} -Requires: trinity-librss = %{version}-%{release} -Requires: trinity-lisa = %{version}-%{release} - -%description -This metapackage includes a collection of network and networking related -applications provided with the official release of Trinity. - -Networking applications, including: -* dcoprss: RSS utilities for Trinity -* filesharing: Network filesharing configuration module for Trinity -* kdict: Dictionary client for Trinity -* tdefile-plugins: Torrent metainfo plugin for Trinity -* kget: downloader manager -* knewsticker: RDF newsticker applet -* kopete: chat client -* kopete-nowlistening: (xmms) plugin for Kopete. -* kpf: Public fileserver for Trinity -* kppp: dialer and front end for pppd -* krdc: a client for Desktop Sharing and other VNC servers -* krfb: Desktop Sharing server, allow others to access your desktop via VNC -* ksirc: IRC client for Trinity -* ktalkd: Talk daemon for Trinity -* kwifimanager: Wireless lan manager for Trinity -* librss: RSS library for Trinity -* lisa: lan information server - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README - - -########## - -%package -n trinity-dcoprss -Summary: RSS utilities for Trinity -Group: Applications/Internet - -%description -n trinity-dcoprss -dcoprss is a RSS to DCOP bridge, allowing all -DCOP aware applications to access RSS news feeds. There is also -a few sample utilities provided. -RSS is a standard for publishing news headlines. -DCOP is the TDE interprocess communication protocol. - -%files -n trinity-dcoprss -%defattr(-,root,root,-) -%{tde_bindir}/feedbrowser -%{tde_bindir}/rssclient -%{tde_bindir}/rssservice -%{tde_datadir}/services/rssservice.desktop - -%post -n trinity-dcoprss -update-desktop-database 2> /dev/null || : - -%postun -n trinity-dcoprss -update-desktop-database 2> /dev/null || : - -########## - -%package devel -Summary: Development files for the Trinity network module -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: trinity-kdict = %{version}-%{release} -Requires: trinity-kopete = %{version}-%{release} -Requires: trinity-ksirc = %{version}-%{release} -Requires: trinity-librss = %{version}-%{release} -Requires: trinity-tdelibs-devel >= %{tde_version} - -Obsoletes: trinity-kdenetwork-devel < %{version}-%{release} -Provides: trinity-kdenetwork-devel = %{version}-%{release} -Obsoletes: tdenetwork-devel < %{version}-%{release} -Provides: tdenetwork-devel = %{version}-%{release} - -%description devel -This is the development package which contains the headers for the TDE RSS -library as well as the Kopete chat client, as well as miscellaneous -development-related files for the TDE network module. - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kopete/ -%{tde_tdeincludedir}/rss/ -%{tde_libdir}/libkopete.la -%{tde_libdir}/libkopete.so -%{tde_libdir}/libkopete_msn_shared.la -%{tde_libdir}/libkopete_msn_shared.so -%{tde_libdir}/libkopete_oscar.la -%{tde_libdir}/libkopete_oscar.so -%{tde_libdir}/libkopete_videodevice.la -%{tde_libdir}/libkopete_videodevice.so -%{tde_libdir}/librss.la -%{tde_libdir}/librss.so - -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig - -########## - -%package filesharing -#Recommends: perl-suid -Summary: Network filesharing configuration module for Trinity -Group: Applications/Internet - -Obsoletes: tdenetwork-filesharing < %{version}-%{release} -Provides: tdenetwork-filesharing = %{version}-%{release} - -%description filesharing -This package provides a Trinity Control Center module to configure -NFS and Samba. - -%files filesharing -%defattr(-,root,root,-) -%{tde_tdelibdir}/fileshare_propsdlgplugin.la -%{tde_tdelibdir}/fileshare_propsdlgplugin.so -%{tde_tdelibdir}/kcm_fileshare.la -%{tde_tdelibdir}/kcm_fileshare.so -%{tde_tdelibdir}/kcm_kcmsambaconf.la -%{tde_tdelibdir}/kcm_kcmsambaconf.so -%{tde_tdeappdir}/fileshare.desktop -%{tde_tdeappdir}/kcmsambaconf.desktop -%{tde_datadir}/icons/hicolor/*/apps/kcmfileshare.png -%{tde_datadir}/icons/hicolor/*/apps/kcmsambaconf.png -%{tde_datadir}/services/fileshare_propsdlgplugin.desktop - -%post filesharing -for f in hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -%postun filesharing -for f in hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-kdict -Summary: Dictionary client for Trinity -Group: Applications/Internet -Requires: trinity-kicker >= %{tde_version} - -%description -n trinity-kdict -KDict is an advanced TDE graphical client for the DICT Protocol, with full -Unicode support. It enables you to search through dictionary databases for a -word or phrase, then displays suitable definitions. KDict tries to ease -basic as well as advanced queries. - -%files -n trinity-kdict -%defattr(-,root,root,-) -%{tde_bindir}/kdict -%{tde_tdelibdir}/kdict.* -%{tde_tdelibdir}/kdict_panelapplet.* -%{tde_libdir}/libkdeinit_kdict.* -%{tde_tdeappdir}/kdict.desktop -%{tde_datadir}/apps/kdict -%{tde_datadir}/apps/kicker/applets/kdictapplet.desktop -%{tde_datadir}/icons/hicolor/*/apps/kdict.* -%{tde_tdedocdir}/HTML/en/kdict - -%post -n trinity-kdict -for f in hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -%postun -n trinity-kdict -for f in hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%package tdefile-plugins -Summary: Torrent metainfo plugin for Trinity -Group: Applications/Internet - -Obsoletes: tdenetwork-kfile-plugins < %{version}-%{release} -Provides: tdenetwork-kfile-plugins = %{version}-%{release} -Obsoletes: trinity-tdenetwork-kfile-plugins < %{version}-%{release} -Provides: trinity-tdenetwork-kfile-plugins = %{version}-%{release} - -%description tdefile-plugins -This package provides a metainformation plugin for bittorrent files. -TDE uses tdefile-plugins to provide metainfo tab in the files properties -dialog in konqueror and other file-handling applications. - -%files tdefile-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/kfile_torrent.la -%{tde_tdelibdir}/kfile_torrent.so -%{tde_datadir}/services/kfile_torrent.desktop - -%post tdefile-plugins -update-desktop-database 2> /dev/null || : - -%postun tdefile-plugins -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-kget -Summary: Download manager for Trinity -Group: Applications/Internet -Requires: trinity-tdebase-data >= %{tde_version} -Requires: trinity-konqueror >= %{tde_version} - -%description -n trinity-kget -KGet is a a download manager similar to GetRight or Go!zilla. It keeps -all your downloads in one dialog and you can add and remove transfers. -Transfers can be paused, resumed, queued or scheduled. -Dialogs display info about status of transfers - progress, size, speed -and remaining time. Program supports drag & drop from TDE -applications and Netscape. - -%files -n trinity-kget -%defattr(-,root,root,-) -%{tde_bindir}/kget -%{tde_tdelibdir}/khtml_kget.la -%{tde_tdelibdir}/khtml_kget.so -%{tde_tdeappdir}/kget.desktop -%{tde_datadir}/apps/kget -%{tde_datadir}/apps/khtml/kpartplugins/kget_plug_in.desktop -%{tde_datadir}/apps/khtml/kpartplugins/kget_plug_in.rc -%{tde_datadir}/apps/konqueror/servicemenus/kget_download.desktop -%{tde_datadir}/icons/crystalsvg/*/actions/khtml_kget.png -%{tde_datadir}/icons/crystalsvg/*/apps/kget.png -%{tde_datadir}/icons/crystalsvg/*/mimetypes/kget_list.png -%{tde_datadir}/icons/hicolor/*/apps/kget.png -%{tde_datadir}/mimelnk/application/x-kgetlist.desktop -%{tde_datadir}/sounds/KGet_Added.ogg -%{tde_datadir}/sounds/KGet_Finished.ogg -%{tde_datadir}/sounds/KGet_Finished_All.ogg -%{tde_datadir}/sounds/KGet_Started.ogg -%{tde_tdedocdir}/HTML/en/kget - -%post -n trinity-kget -for f in crystalsvg hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -%postun -n trinity-kget -for f in crystalsvg hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-knewsticker -Summary: News ticker applet for Trinity -Group: Applications/Internet -Requires: trinity-kicker >= %{tde_version} - -%description -n trinity-knewsticker -This is a news ticker applet for the Trinity panel. It can scroll news from -your favorite news sites, such as lwn.net, /. and freshmeat.net. -To achieve this, KNewsTicker requires the news sites to provide a -RSS feed to newsitems. KNewsTicker already comes with a selection of -good news sources which provide such files. - -%files -n trinity-knewsticker -%defattr(-,root,root,-) -%{tde_bindir}/knewstickerstub -%{tde_tdelibdir}/knewsticker_panelapplet.la -%{tde_tdelibdir}/knewsticker_panelapplet.so -%{tde_tdelibdir}/libkntsrcfilepropsdlg.la -%{tde_tdelibdir}/libkntsrcfilepropsdlg.so -%{tde_tdeappdir}/knewsticker-standalone.desktop -%{tde_datadir}/applnk/.hidden/knewstickerstub.desktop -%{tde_datadir}/apps/kconf_update/knewsticker.upd -%{tde_datadir}/apps/kconf_update/knt-0.1-0.2.pl -%{tde_datadir}/apps/kicker/applets/knewsticker.desktop -%{tde_datadir}/apps/knewsticker/ -%{tde_datadir}/icons/hicolor/*/apps/knewsticker.png -%{tde_datadir}/services/kntsrcfilepropsdlg.desktop -%{tde_tdedocdir}/HTML/en/knewsticker - -%post -n trinity-knewsticker -for f in hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -%postun -n trinity-knewsticker -for f in hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-kopete -Summary: Instant messenger for Trinity -Group: Applications/Internet -Requires: trinity-tdebase-bin >= %{tde_version} -Requires: trinity-tdebase-data >= %{tde_version} -Requires: trinity-filesystem >= %{tde_version} - -%description -n trinity-kopete -Kopete is an instant messenger program which can communicate with a variety -of IM systems, such as Yahoo, ICQ, IRC and Jabber. - -Support for more IM protocols can be added through a plugin system. - -%files -n trinity-kopete -%defattr(-,root,root,-) -# nowlistening support -%exclude %{tde_datadir}/apps/kopete/*nowlisteningchatui* -%exclude %{tde_datadir}/apps/kopete/*nowlisteningui* -%exclude %{tde_datadir}/config.kcfg/nowlisteningconfig.kcfg -%exclude %{tde_datadir}/services/kconfiguredialog/*nowlistening* -%exclude %{tde_datadir}/services/*nowlistening* -%exclude %{tde_tdelibdir}/*nowlistening* -# Main kopete package -%{tde_bindir}/kopete -%{tde_bindir}/kopete_latexconvert.sh -%{tde_libdir}/kconf_update_bin/kopete-account-kconf_update -%{tde_libdir}/kconf_update_bin/kopete-nameTracking-kconf_update -%{tde_libdir}/kconf_update_bin/kopete-pluginloader2-kconf_update -%{tde_tdelibdir}/kcm_kopete_*.so -%{tde_tdelibdir}/kcm_kopete_*.la -%{tde_tdelibdir}/kio_jabberdisco.la -%{tde_tdelibdir}/kio_jabberdisco.so -%{tde_tdelibdir}/kopete_*.la -%{tde_tdelibdir}/kopete_*.so -%{tde_tdelibdir}/libkrichtexteditpart.la -%{tde_tdelibdir}/libkrichtexteditpart.so -%{tde_libdir}/libkopete_msn_shared.so.* -%{tde_libdir}/libkopete_oscar.so.* -%{tde_libdir}/libkopete.so.* -%{tde_libdir}/libkopete_videodevice.so.* -%{tde_tdeappdir}/kopete.desktop -%{tde_datadir}/apps/kconf_update/kopete-* -%{tde_datadir}/apps/kopete/ -%{tde_datadir}/apps/kopete_*/ -%{tde_datadir}/apps/kopeterichtexteditpart/ -%{tde_datadir}/config.kcfg/historyconfig.kcfg -%{tde_datadir}/config.kcfg/kopeteidentityconfigpreferences.kcfg -%{tde_datadir}/config.kcfg/kopete.kcfg -%{tde_datadir}/config.kcfg/latexconfig.kcfg -%{tde_datadir}/icons/crystalsvg/*/actions/voicecall.png -%{tde_datadir}/icons/crystalsvg/*/actions/webcamreceive.png -%{tde_datadir}/icons/crystalsvg/*/actions/webcamsend.png -%{tde_datadir}/icons/crystalsvg/*/actions/account_offline_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/add_user.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_away_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_busy_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_food_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_invisible_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_phone_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_xa_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/delete_user.png -%{tde_datadir}/icons/crystalsvg/*/actions/edit_user.png -%{tde_datadir}/icons/crystalsvg/*/actions/emoticon.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_away.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_chatty.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_connecting.mng -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_group.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_invisible.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_na.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_offline.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_online.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_original.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_raw.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_off.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_on.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_xa.png -%{tde_datadir}/icons/crystalsvg/*/actions/kopeteavailable.png -%{tde_datadir}/icons/crystalsvg/*/actions/kopeteaway.png -%{tde_datadir}/icons/crystalsvg/*/actions/kopeteeditstatusmessage.png -%{tde_datadir}/icons/crystalsvg/*/actions/kopetestatusmessage.png -%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_away.png -%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_offline.png -%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_online.png -%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_unknown.png -%{tde_datadir}/icons/crystalsvg/*/actions/newmsg.png -%{tde_datadir}/icons/crystalsvg/*/actions/search_user.png -%{tde_datadir}/icons/crystalsvg/*/actions/show_offliners.png -%{tde_datadir}/icons/crystalsvg/*/actions/status_unknown_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/status_unknown.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_aim.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_gadu.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_http-ws.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_icq.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_irc.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_msn.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_qq.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_smtp.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_tlen.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_yahoo.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_protocol.png -%{tde_datadir}/icons/crystalsvg/*/apps/kopete_all_away.png -%{tde_datadir}/icons/crystalsvg/*/apps/kopete_offline.png -%{tde_datadir}/icons/crystalsvg/*/apps/kopete_some_away.png -%{tde_datadir}/icons/crystalsvg/*/apps/kopete_some_online.png -%{tde_datadir}/icons/crystalsvg/*/mimetypes/kopete_emoticons.png -%{tde_datadir}/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz -%{tde_datadir}/icons/hicolor/*/apps/kopete.png -%{tde_datadir}/icons/hicolor/*/actions/emoticon.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_away.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_chatty.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_connecting.mng -%{tde_datadir}/icons/hicolor/*/actions/jabber_group.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_invisible.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_na.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_offline.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_online.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_original.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_raw.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_off.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_on.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_xa.png -%{tde_datadir}/icons/hicolor/*/actions/kopeteavailable.png -%{tde_datadir}/icons/hicolor/*/actions/kopeteaway.png -%{tde_datadir}/icons/hicolor/*/actions/newmsg.png -%{tde_datadir}/icons/hicolor/*/actions/status_unknown_overlay.png -%{tde_datadir}/icons/hicolor/*/actions/status_unknown.png -%{tde_datadir}/icons/hicolor/*/apps/jabber_protocol.png -%{tde_datadir}/icons/hicolor/scalable/apps/kopete2.svgz -%{tde_datadir}/icons/crystalsvg/*/actions/newmessage.mng -%{tde_datadir}/icons/hicolor/*/actions/newmessage.mng -%{tde_datadir}/mimelnk/application/x-icq.desktop -%{tde_datadir}/mimelnk/application/x-kopete-emoticons.desktop -%{tde_datadir}/services/aim.protocol -%{tde_datadir}/services/chatwindow.desktop -%{tde_datadir}/services/emailwindow.desktop -%{tde_datadir}/services/jabberdisco.protocol -%{tde_datadir}/services/kconfiguredialog/kopete_*.desktop -%{tde_datadir}/services/kopete_*.desktop -%{tde_datadir}/icons/crystalsvg/16x16/apps/jabber_gateway_sms.png -%{tde_datadir}/servicetypes/kopete*.desktop -%{tde_datadir}/sounds/Kopete_*.ogg -%{tde_tdedocdir}/HTML/en/kopete -# jingle support for kopete -%{tde_bindir}/relayserver -%{tde_bindir}/stunserver -# winpopup support for kopete -%{tde_bindir}/winpopup-install.sh -%{tde_bindir}/winpopup-send.sh -# motionaway plugin for kopete -%{tde_datadir}/config.kcfg/motionawayconfig.kcfg -# smpp plugin for kopete -%{tde_datadir}/config.kcfg/smpppdcs.kcfg - - -%post -n trinity-kopete -for f in crystalsvg hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : -/sbin/ldconfig - -%postun -n trinity-kopete -for f in crystalsvg hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : -/sbin/ldconfig - -########## - -%package -n trinity-kopete-nowlistening -Summary: Nowlistening (xmms) plugin for Kopete -Group: Applications/Internet -Requires: trinity-kopete = %{tde_version}-%{tde_release} -Requires: trinity-filesystem >= %{tde_version} - -%description -n trinity-kopete-nowlistening -Kopete includes the "Now Listening" plug-in that can report what music you -are currently listening to, in a number of different players, including -noatun, kscd, juk, kaffeine and amarok. - -%files -n trinity-kopete-nowlistening -%defattr(-,root,root,-) -%{tde_datadir}/apps/kopete/*nowlisteningchatui* -%{tde_datadir}/apps/kopete/*nowlisteningui* -%{tde_datadir}/config.kcfg/nowlisteningconfig.kcfg -%{tde_datadir}/services/kconfiguredialog/*nowlistening* -%{tde_datadir}/services/*nowlistening* -%{tde_tdelibdir}/*nowlistening* - -########## - -%package -n trinity-kpf -Summary: Public fileserver for Trinity -Group: Applications/Internet -Requires: trinity-kicker >= %{tde_version} - -%description -n trinity-kpf -kpf provides simple file sharing using HTTP. kpf is strictly a public -fileserver, which means that there are no access restrictions to shared -files. Whatever you select for sharing is available to anyone. kpf is -designed to be used for sharing files with friends. - -%files -n trinity-kpf -%defattr(-,root,root,-) -%{tde_tdelibdir}/kpf* -%{tde_datadir}/apps/kicker/applets/kpfapplet.desktop -%{tde_datadir}/icons/crystalsvg/*/apps/kpf.* -%{tde_datadir}/services/kpfpropertiesdialogplugin.desktop -%{tde_tdedocdir}/HTML/en/kpf - -%post -n trinity-kpf -for f in crystalsvg ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -%postun -n trinity-kpf -for f in crystalsvg ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-kppp -Summary: Modem dialer and ppp frontend for Trinity -Group: Applications/Internet -Requires: ppp - -%if 0%{?with_consolehelper} -# package 'usermode' provides '/usr/bin/consolehelper-gtk' -%if 0%{?rhel} || 0%{?fedora} -Requires: usermode-gtk -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -Requires: usermode -%endif -%endif - -%description -n trinity-kppp -KPPP is a dialer and front end for pppd. It allows for interactive -script generation and network setup. It will automate the dialing in -process to your ISP while letting you conveniently monitor the entire -process. - -Once connected KPPP will provide a rich set of statistics and keep -track of the time spent online for you. - -%files -n trinity-kppp -%defattr(-,root,root,-) -%if 0%{?with_consolehelper} == 0 -# Some setuid binaries need special care -%if 0%{?suse_version} -%verify(not mode) %{tde_bindir}/kppp -%else -%attr(4711,root,root) %{tde_bindir}/kppp -%endif -%endif -%{tde_bindir}/kppplogview -%{tde_tdeappdir}/Kppp.desktop -%{tde_tdeappdir}/kppplogview.desktop -%{tde_datadir}/apps/kppp/ -%{tde_datadir}/icons/hicolor/*/apps/kppp.png -%{tde_tdedocdir}/HTML/en/kppp/ - -%if 0%{?with_consolehelper} -%config(noreplace) /etc/security/console.apps/kppp3 -%config(noreplace) /etc/pam.d/kppp3 -%{_sbindir}/kppp3 -%{tde_bindir}/kppp3 -%{tde_sbindir}/kppp3 -%endif - -%post -n trinity-kppp -for f in hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : -%if 0%{?suse_version} -# Sets permissions on setuid files (openSUSE specific) -%set_permissions %{tde_bindir}/kppp -%endif - -%postun -n trinity-kppp -for f in hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-krdc -Summary: Remote Desktop Connection for Trinity -Group: Applications/Internet -Requires: rdesktop - -%description -n trinity-krdc -krdc is an TDE graphical client for the rfb protocol, used by VNC, -and if rdesktop is installed, krdc can connect to Windows Terminal -Servers using RDP. - -%files -n trinity-krdc -%defattr(-,root,root,-) -%{tde_bindir}/krdc -%{tde_tdeappdir}/krdc.desktop -%{tde_datadir}/apps/konqueror/servicemenus/smb2rdc.desktop -%{tde_datadir}/apps/krdc/ -%{tde_datadir}/icons/crystalsvg/*/apps/krdc.png -%{tde_datadir}/icons/hicolor/*/apps/krdc.png -%{tde_datadir}/services/rdp.protocol -%{tde_datadir}/services/vnc.protocol -%{tde_tdedocdir}/HTML/en/krdc/ - -%post -n trinity-krdc -for f in crystalsvg hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -%postun -n trinity-krdc -for f in crystalsvg hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-krfb -Summary: Desktop Sharing for Trinity -Group: Applications/Internet - -%description -n trinity-krfb -Desktop Sharing (krfb) is a server application that allows you to share -your current session with a user on another machine, who can use a -VNC client like krdc to view or even control the desktop. It doesn't -require you to start a new X session - it can share the current session. -This makes it very useful when you want someone to help you perform a -task. - -%files -n trinity-krfb -%defattr(-,root,root,-) -%{tde_bindir}/krfb -%{tde_bindir}/krfb_httpd -%{tde_tdelibdir}/kcm_krfb.la -%{tde_tdelibdir}/kcm_krfb.so -%{tde_tdelibdir}/kded_kinetd.la -%{tde_tdelibdir}/kded_kinetd.so -%{tde_tdeappdir}/kcmkrfb.desktop -%{tde_tdeappdir}/krfb.desktop -%{tde_datadir}/apps/kinetd/ -%{tde_datadir}/apps/krfb -%{tde_datadir}/icons/crystalsvg/*/apps/krfb.png -%{tde_datadir}/icons/hicolor/*/apps/krfb.png -%{tde_datadir}/icons/locolor/*/apps/krfb.png -%{tde_datadir}/services/kded/kinetd.desktop -%{tde_datadir}/services/kinetd_krfb.desktop -%{tde_datadir}/services/kinetd_krfb_httpd.desktop -%{tde_datadir}/servicetypes/kinetdmodule.desktop -%{tde_tdedocdir}/HTML/en/krfb/ - -%post -n trinity-krfb -for f in crystalsvg hicolor locolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -%postun -n trinity-krfb -for f in crystalsvg hicolor locolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-ksirc -Summary: IRC client for Trinity -Group: Applications/Internet - -%description -n trinity-ksirc -KSirc is an IRC chat client for TDE. It supports scripting with Perl and has a -lot of compatibility with mIRC for general use. - -If you want to connect to an IRC server via SSL, you will need to install the -recommended package libio-socket-ssl-perl. - -%files -n trinity-ksirc -%defattr(-,root,root,-) -%{tde_bindir}/dsirc -%{tde_bindir}/ksirc -%{tde_libdir}/libkdeinit_ksirc.* -%{tde_tdelibdir}/ksirc.* -%{tde_tdeappdir}/ksirc.desktop -%{tde_datadir}/apps/ksirc/ -%config(noreplace) %{tde_datadir}/config/ksircrc -%{tde_datadir}/icons/hicolor/*/apps/ksirc.* -%{tde_tdedocdir}/HTML/??/ksirc/ - -%post -n trinity-ksirc -for f in hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : -/sbin/ldconfig - - -%postun -n trinity-ksirc -for f in hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : -/sbin/ldconfig - -########## - -%package -n trinity-ktalkd -Summary: Talk daemon for Trinity -Group: Applications/Internet -Requires: trinity-kcontrol >= %{tde_version} -Requires: trinity-tdebase-data >= %{tde_version} - -%description -n trinity-ktalkd -KTalkd is an enhanced talk daemon - a program to handle incoming talk -requests, announce them and allow you to respond to it using a talk -client. Note that KTalkd is designed to run on a single-user workstation, -and shouldn't be run on a multi-user machine. - -%files -n trinity-ktalkd -%defattr(-,root,root,-) -%{tde_bindir}/ktalkd* -%{tde_bindir}/mail.local -%{tde_tdelibdir}/kcm_ktalkd.* -%{tde_tdeappdir}/kcmktalkd.desktop -%config(noreplace) %{tde_datadir}/config/ktalkdrc -%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png -%{tde_datadir}/icons/hicolor/*/apps/ktalkd.png -%{tde_datadir}/sounds/ktalkd.wav -%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk -%{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd -%{tde_tdedocdir}/HTML/en/ktalkd - -%post -n trinity-ktalkd -for f in crystalsvg hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -%postun -n trinity-ktalkd -for f in crystalsvg hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%if "%{?_with_wifi:1}" == "1" -%package -n trinity-kwifimanager -Summary: Wireless lan manager for Trinity -Group: Applications/Internet -Requires: trinity-kicker >= %{tde_version} - -%description -n trinity-kwifimanager -KWiFiManager suite is a set of tools which allows you to manage your -wireless LAN connection under the K Desktop Environment. It provides -information about your current connection. KWiFiManager supports every -wavelan card that uses the wireless extensions interface. - -%files -n trinity-kwifimanager -%defattr(-,root,root,-) -%{tde_bindir}/kwifimanager -%{tde_tdelibdir}/kcm_wifi.* -%{tde_libdir}/libkwireless.la -%{tde_libdir}/libkwireless.so -%{tde_tdeappdir}/kcmwifi.desktop -%{tde_tdeappdir}/kwifimanager.desktop -%{tde_datadir}/apps/kicker/applets/kwireless.desktop -%{tde_datadir}/apps/kwifimanager -%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.png -%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz -%{tde_tdedocdir}/HTML/en/kwifimanager/ - -%post -n trinity-kwifimanager -for f in hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -%postun -n trinity-kwifimanager -for f in hicolor ; do - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : -%endif - -########## - -%package -n trinity-librss -Summary: RSS library for Trinity -Group: Environment/Libraries - -%description -n trinity-librss -This is the runtime package for programs that use the TDE RSS library. -End users should not need to install this, it should get installed -automatically when needed. - -%files -n trinity-librss -%defattr(-,root,root,-) -%{tde_libdir}/librss.so.* -%{tde_datadir}/cmake/librss.cmake - -%post -n trinity-librss -/sbin/ldconfig - -%postun -n trinity-librss -/sbin/ldconfig - -########## - -%package -n trinity-lisa -Summary: LAN information server for Trinity -Group: Applications/Internet -Requires: trinity-konqueror >= %{tde_version} -Requires: trinity-tdebase-data >= %{tde_version} - -%description -n trinity-lisa -LISa is intended to provide TDE with a kind of "network neighborhood" -but relying only on the TCP/IP protocol. - -%files -n trinity-lisa -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcm_lanbrowser.la -%{tde_tdelibdir}/kcm_lanbrowser.so -%{tde_tdelibdir}/kio_lan.la -%{tde_tdelibdir}/kio_lan.so -%{tde_datadir}/applnk/.hidden/kcmkiolan.desktop -%{tde_datadir}/applnk/.hidden/kcmlisa.desktop -%{tde_datadir}/applnk/.hidden/kcmreslisa.desktop -%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/lisa.desktop -%{tde_datadir}/apps/konqueror/dirtree/remote/lan.desktop -%{tde_datadir}/apps/lisa/ -%{tde_datadir}/apps/remoteview/lan.desktop -%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/ -%{tde_tdedocdir}/HTML/en/lisa/ -%{tde_datadir}/services/lan.protocol -%{tde_datadir}/services/rlan.protocol -%{tde_bindir}/lisa -%{tde_bindir}/reslisa - -%post -n trinity-lisa -update-desktop-database 2> /dev/null || : - -%postun -n trinity-lisa -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-kdnssd -Summary: Zeroconf support for TDE -Group: Applications/Internet - -%description -n trinity-kdnssd -A tdeioslave and tded module that provide Zeroconf support. Try -"zeroconf:/" in Konqueror. - -%files -n trinity-kdnssd -%defattr(-,root,root,-) -%{tde_datadir}/services/zeroconf.protocol -%{tde_datadir}/services/invitation.protocol -%{tde_datadir}/services/kded/dnssdwatcher.desktop -%{tde_datadir}/apps/remoteview/zeroconf.desktop -%{tde_datadir}/apps/zeroconf/_http._tcp -%{tde_datadir}/apps/zeroconf/_ftp._tcp -%{tde_datadir}/apps/zeroconf/_ldap._tcp -%{tde_datadir}/apps/zeroconf/_webdav._tcp -%{tde_datadir}/apps/zeroconf/_nfs._tcp -%{tde_datadir}/apps/zeroconf/_ssh._tcp -%{tde_datadir}/apps/zeroconf/_rfb._tcp -%{tde_tdelibdir}/kio_zeroconf.so -%{tde_tdelibdir}/kio_zeroconf.la -%{tde_tdelibdir}/kded_dnssdwatcher.so -%{tde_tdelibdir}/kded_dnssdwatcher.la - -%post -n trinity-kdnssd -update-desktop-database 2> /dev/null || : - -%postun -n trinity-kdnssd -update-desktop-database 2> /dev/null || : - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%{?tde_patch:%patch1 -p1} - -# Workaround libiw detection failure on opensuse -%if 0%{?suse_version} -%__sed -i "wifi/ConfigureChecks.cmake" -e "s|^check_library_exists.*|set( HAVE_IW 1 )|" -%endif - -# Update icons for some control center modules -%__sed -i "filesharing/simple/fileshare.desktop" -e "s|^Icon=.*|Icon=kcmfileshare|" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_NO_BUILTIN_CHRPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DWITH_JINGLE=ON \ - %{?with_speex:-DWITH_SPEEX=ON} \ - -DWITH_WEBCAM=ON \ - -DWITH_GSM=OFF \ - -DWITH_XMMS=OFF \ - -DWITH_ARTS=ON \ - %{?with_openslp:-DWITH_SLP=ON} \ - -DBUILD_ALL=ON \ - -DBUILD_KOPETE_PLUGIN_ALL=ON \ - -DBUILD_KOPETE_PROTOCOL_ALL=ON \ - %{!?with_gadu:-DBUILD_KOPETE_PROTOCOL_GADU=OFF} \ - %{!?with_meanwhile:-DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF} \ - .. - -# Tdenetwork is not smp safe ! -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -# 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/ -pushd %{buildroot}%{tde_datadir}/icons -for i in {16,22,32,48}; do %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kget.png hicolor/"$i"x"$i"/apps/kget.png ;done -for i in {32,48}; do %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/krdc.png hicolor/"$i"x"$i"/apps/krdc.png ;done -for i in {16,32,48}; do %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/krfb.png hicolor/"$i"x"$i"/apps/krfb.png ;done -for i in {16,22,32,48,128}; do %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/ktalkd.png hicolor/"$i"x"$i"/apps/ktalkd.png ;done -for i in {16,22,32,48,64,128}; do %__cp $BUILD_ROOT%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/share.png hicolor/"$i"x"$i"/apps/kcmfileshare.png ;done -popd - -%if 0%{?with_consolehelper} -# Run kppp through consolehelper, and rename it to 'kppp3' -%__install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3 -%__mkdir_p %{buildroot}%{tde_sbindir} %{buildroot}%{_sbindir} -%__mv %{buildroot}%{tde_bindir}/kppp %{buildroot}%{tde_sbindir}/kppp3 -%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kppp3 -%if "%{tde_prefix}" != "/usr" -%__ln_s %{tde_sbindir}/kppp3 %{?buildroot}%{_sbindir}/kppp3 -%endif -%__mkdir_p %{buildroot}%{_sysconfdir}/security/console.apps -cat > %{buildroot}%{_sysconfdir}/security/console.apps/kppp3 <<EOF -USER=root -PROGRAM=%{tde_sbindir}/kppp3 -SESSION=true -EOF - -# Renames 'kppp' as 'kppp3' in launch icon -%__sed -i %{buildroot}%{tde_tdeappdir}/Kppp.desktop -e "/Exec=/ s|kppp|kppp3|" -%endif - -# Remove setuid bit on some binaries. -if [ -r "%{?buildroot}%{tde_bindir}/kppp" ]; then - chmod 0755 "%{?buildroot}%{tde_bindir}/kppp" -fi - -# ktalk -%__install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk - -# Avoids conflict with trinity-kvirc -%__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/ - -# Icons from TDE Control Center should only be displayed in TDE -for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do - if grep -q "^Categories=.*X-KDE-settings" "${i}"; then - if ! grep -q "OnlyShowIn=KDE" "${i}" ; then - echo "OnlyShowIn=KDE;" >>"${i}" - fi - fi -done - -# Updates applications categories for openSUSE -%if 0%{?suse_version} -%suse_update_desktop_file kcmkrfb -%suse_update_desktop_file fileshare -%suse_update_desktop_file kopete Network InstantMessaging -%suse_update_desktop_file ksirc Network IRCClient -%suse_update_desktop_file Kppp Network Dialup -%suse_update_desktop_file -r kppplogview System Monitor -%suse_update_desktop_file kdict Office Dictionary -%suse_update_desktop_file -r krdc System RemoteAccess -%suse_update_desktop_file -r krfb System RemoteAccess -%suse_update_desktop_file -r kget System TrayIcon -%suse_update_desktop_file -r kwifimanager System Network -%suse_update_desktop_file kcmwifi -%suse_update_desktop_file -u knewsticker-standalone Network News -%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/remoteview/zeroconf.desktop -%endif - -# Links duplicate files -%fdupes "%{?buildroot}%{tde_datadir}" - - -%clean -%__rm -rf %{buildroot} - - -%if 0%{?suse_version} -# Check permissions on setuid files (openSUSE specific) -%verifyscript -%verify_permissions -e %{tde_bindir}/kppp -%endif - - -%changelog diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork.spec index 28717c158..de6aa9e8e 100644 --- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/main/tdenetwork/tdenetwork.spec @@ -26,7 +26,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdenetwork %define tde_prefix /opt/trinity @@ -46,11 +46,8 @@ # Avoids relinking, which breaks consolehelper %define dont_relink 1 -%if "%{?tde_version}" == "14.0.4" +# Disable AIM support %define with_aim 1 -%else -%define with_aim 0 -%endif Name: trinity-%{tde_pkg} Summary: Trinity Desktop Environment - Network Applications @@ -101,6 +98,20 @@ BuildRequires: brp-check-trinity PreReq: permissions %endif +# AVAHI support +%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define with_avahi 1 +BuildRequires: libavahi-tqt-devel >= 1:0.6.30 +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}avahi-client-devel +Requires: %{_lib}avahi-client3 +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +BuildRequires: avahi-devel +Requires: avahi +%endif +%endif + # OPENSSL support BuildRequires: openssl-devel @@ -184,7 +195,7 @@ BuildRequires: libiw-devel %endif # OpenSLP support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %define with_openslp 1 BuildRequires: openslp-devel %endif @@ -223,13 +234,13 @@ BuildRequires: glib2-devel BuildRequires: speex-devel # jabber/ssl #{?fedora:Requires(hint): qca-tls} -Requires: jasper +#Requires: jasper # ACL support BuildRequires: libacl-devel # MEANWHILE support -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version} +%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 15 || 0%{?suse_version} %define with_meanwhile 1 BuildRequires: meanwhile-devel %endif @@ -351,6 +362,10 @@ development-related files for the TDE network module. %{tde_tdeincludedir}/rss/ %{tde_libdir}/libkopete.la %{tde_libdir}/libkopete.so +%if 0%{?with_aim} +%{tde_libdir}/libkopete_msn_shared.la +%{tde_libdir}/libkopete_msn_shared.so +%endif %{tde_libdir}/libkopete_oscar.la %{tde_libdir}/libkopete_oscar.so %{tde_libdir}/libkopete_videodevice.la @@ -697,6 +712,8 @@ Support for more IM protocols can be added through a plugin system. %{tde_datadir}/icons/hicolor/*/actions/aim_online.png %{tde_datadir}/icons/hicolor/*/apps/aim_protocol.png %{tde_datadir}/services/aim.protocol +%{tde_libdir}/libkopete_msn_shared.so.0 +%{tde_libdir}/libkopete_msn_shared.so.0.0.0 %endif ########## @@ -747,6 +764,7 @@ designed to be used for sharing files with friends. %package -n trinity-kppp Summary: Modem dialer and ppp frontend for Trinity Group: Applications/Internet +BuildRequires: ppp Requires: ppp %if 0%{?with_consolehelper} @@ -784,9 +802,6 @@ track of the time spent online for you. %{tde_datadir}/apps/kppp/ %{tde_datadir}/icons/hicolor/*/apps/kppp.png %{tde_tdedocdir}/HTML/en/kppp/ -%if 0%{?suse_version} >= 1500 -%dir %{_sysconfdir}/ppp -%endif %dir %{_sysconfdir}/ppp/peers %{_sysconfdir}/ppp/peers/kppp-options @@ -915,7 +930,9 @@ and shouldn't be run on a multi-user machine. %{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png %{tde_datadir}/icons/hicolor/*/apps/ktalkd.png %{tde_datadir}/sounds/ktalkd.wav +%if 0%{?fedora} == 0 || 0%{?fedora} <= 30 %dir %{_sysconfdir}/xinetd.d +%endif %config(noreplace) %{_sysconfdir}/xinetd.d/ktalk %{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd %{tde_tdedocdir}/HTML/en/ktalkd diff --git a/redhat/main/tdepim/tdepim-14.0.0.patch b/redhat/main/tdepim/tdepim-14.0.0.patch deleted file mode 100644 index 0770a8af9..000000000 --- a/redhat/main/tdepim/tdepim-14.0.0.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp -index aa01c96..d27f041 100644 ---- a/kmail/kmkernel.cpp -+++ b/kmail/kmkernel.cpp -@@ -170,17 +170,8 @@ KMKernel::KMKernel (TQObject *parent, const char *name) : - connectDCOPSignal( 0, 0, "kmailSelectFolder(TQString)", - "selectFolder(TQString)", false ); - -- mNetworkManager = TDEGlobal::networkManager(); -- if (mNetworkManager) { -- connect( mNetworkManager, TQT_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ), -- this, TQT_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) ); -- if (networkStateConnected()) { -- resumeNetworkJobs(); -- } -- else { -- stopNetworkJobs(); -- } -- } -+ // Assume connected -+ resumeNetworkJobs(); - } - - KMKernel::~KMKernel () -@@ -2470,34 +2461,8 @@ int KMKernel::timeOfLastMessageCountChange() const - - bool KMKernel::networkStateConnected() - { -- if (mNetworkManager) { -- TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags networkStatus = mNetworkManager->backendStatus(); -- if ((networkStatus & TDENetworkGlobalManagerFlags::Connected) -- || (networkStatus & TDENetworkGlobalManagerFlags::BackendUnavailable) -- || (networkStatus == TDENetworkGlobalManagerFlags::Unknown) -- ){ -- // Connected or no backend available -- return true; -- } -- else { -- // Not connected -- return false; -- } -- } -- else { -- // Assume connected -- return true; -- } --} -- --void KMKernel::slotNetworkStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString) --{ -- if (networkStateConnected()) { -- resumeNetworkJobs(); -- } -- else { -- stopNetworkJobs(); -- } -+ // Assume connected -+ return true; - } - - Wallet *KMKernel::wallet() { -diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h -index 0dc4644..37a3eec 100644 ---- a/kmail/kmkernel.h -+++ b/kmail/kmkernel.h -@@ -14,8 +14,6 @@ - #include <tdeimproxy.h> - #include <tdepimmacros.h> - --#include <tdenetworkconnections.h> -- - #include "kmailIface.h" - #include "kmmsgbase.h" - #include "globalsettings.h" -@@ -436,7 +434,6 @@ public slots: - protected slots: - void slotDataReq(TDEIO::Job*,TQByteArray&); - void slotResult(TDEIO::Job*); -- void slotNetworkStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString); - - signals: - void configChanged(); -@@ -527,7 +524,6 @@ private: - TQString mAddMessageLastFolder; - KMFolder *mAddMsgCurrentFolder; - -- TDEGlobalNetworkManager *mNetworkManager; - }; - - #endif diff --git a/redhat/main/tdepim/tdepim-3.5.13.2.spec b/redhat/main/tdepim/tdepim-3.5.13.2.spec deleted file mode 100644 index 0f50b7cdb..000000000 --- a/redhat/main/tdepim/tdepim-3.5.13.2.spec +++ /dev/null @@ -1,2366 +0,0 @@ -# -# spec file for package tdepim (version 3.5.13-SRU) -# -# 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/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg tdepim -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%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_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - - -# KDEPIM specific features -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_gnokii 1 -BuildRequires: gnokii-devel -%endif - -# TDEPIM optional features -#define with_kitchensync 1 - - -Name: trinity-%{tde_pkg} -Summary: Personal Information Management apps from the official Trinity release -Version: %{tde_version} -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} -Group: Applications/Productivity -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}-%{version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: libcaldav-devel >= %{tde_epoch}:0.6.5 -BuildRequires: libcarddav-devel >= %{tde_epoch}:0.6.2 - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: fdupes -BuildRequires: desktop-file-utils -BuildRequires: make - -BuildRequires: gpgme-devel -BuildRequires: libgpg-error-devel -BuildRequires: flex -BuildRequires: libical-devel -BuildRequires: boost-devel -BuildRequires: pcre-devel -BuildRequires: libidn-devel - -# 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 - -# GAMIN support -# Not on openSUSE. -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_gamin 1 -BuildRequires: gamin-devel -%endif - -# CURL support -%if 0%{?fedora} >= 15 -BuildRequires: flex-static -%endif -%if 0%{?rhel} > 0 && 0%{?rhel} <= 5 -BuildRequires: trinity-libcurl-devel -%else -BuildRequires: curl-devel -%endif - -# GLIB2 support -BuildRequires: glib2-devel - -# SASL support -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}sasl2-devel -%else -BuildRequires: cyrus-sasl-devel -%endif - -# XCOMPOSITE support -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xcomposite-devel -%else -BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel -%endif -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXcomposite-devel -%endif - -# XSCREENSAVER support -# Disabled on RHEL4 -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} -%define with_xscreensaver 1 -%if 0%{?rhel} == 5 -BuildRequires: xorg-x11-proto-devel -BuildRequires: gnome-screensaver -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?mgaversion} >= 4 -BuildRequires: %{_lib}xscrnsaver-devel -%else -BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel -%endif -%endif -%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220 -BuildRequires: libXScrnSaver-devel -%endif -%if 0%{?suse_version} == 1140 -BuildRequires: xscreensaver -%endif -%endif - - -Requires: trinity-libtdepim = %{version}-%{release} -Requires: %{name}-kfile-plugins = %{version}-%{release} -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: %{name}-tderesources = %{version}-%{release} -Requires: %{name}-wizards = %{version}-%{release} -Requires: trinity-akregator = %{version}-%{release} -Requires: trinity-kaddressbook = %{version}-%{release} -Requires: trinity-kalarm = %{version}-%{release} -Requires: trinity-kandy = %{version}-%{release} -Requires: trinity-karm = %{version}-%{release} -Requires: trinity-kleopatra = %{version}-%{release} -Requires: trinity-kmail = %{version}-%{release} -Requires: trinity-kmailcvt = %{version}-%{release} -Requires: trinity-kmobile = %{version}-%{release} -Requires: trinity-knode = %{version}-%{release} -Requires: trinity-knotes = %{version}-%{release} -Requires: trinity-kode = %{version}-%{release} -Requires: trinity-konsolekalendar = %{version}-%{release} -Requires: trinity-kontact = %{version}-%{release} -Requires: trinity-korganizer = %{version}-%{release} -Requires: trinity-korn = %{version}-%{release} -Requires: trinity-ktnef = %{version}-%{release} -Requires: trinity-libindex = %{version}-%{release} -Requires: trinity-libkcal = %{version}-%{release} -Requires: trinity-libkgantt = %{version}-%{release} -Requires: trinity-libkleopatra = %{version}-%{release} -Requires: trinity-libkmime = %{version}-%{release} -Requires: trinity-libkpimexchange = %{version}-%{release} -Requires: trinity-libkpimidentities = %{version}-%{release} -Requires: trinity-libksieve = %{version}-%{release} -Requires: trinity-libktnef = %{version}-%{release} -Requires: trinity-libmimelib = %{version}-%{release} - -Obsoletes: trinity-kdepim < %{version}-%{release} -Provides: trinity-kdepim = %{version}-%{release} -Obsoletes: tdepim < %{version}-%{release} -Provides: tdepim = %{version}-%{release} - -%description -This metapackage includes a collection of Personal Information Management -(PIM) applications provided with the official release of Trinity. - -%files -%defattr(-,root,root,-) - -########## - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries/Other - -Obsoletes: tdepim-cmake < %{version}-%{release} - -Obsoletes: trinity-kdepim-devel < %{version}-%{release} -Provides: trinity-kdepim-devel = %{version}-%{release} -Obsoletes: tdepim-devel < %{version}-%{release} -Provides: tdepim-devel = %{version}-%{release} - -Requires: %{name} = %{version}-%{release} -Requires: trinity-akregator-devel = %{version}-%{release} -Requires: trinity-libtdepim-devel = %{version}-%{release} -Requires: trinity-kaddressbook-devel = %{version}-%{release} -Requires: trinity-karm-devel = %{version}-%{release} -Requires: trinity-kmail-devel = %{version}-%{release} -Requires: trinity-knode-devel = %{version}-%{release} -Requires: trinity-knotes-devel = %{version}-%{release} -Requires: trinity-kode-devel = %{version}-%{release} -Requires: trinity-kontact-devel = %{version}-%{release} -Requires: trinity-korganizer-devel = %{version}-%{release} -Requires: trinity-libindex-devel = %{version}-%{release} -Requires: trinity-libkcal-devel = %{version}-%{release} -Requires: trinity-libkgantt-devel = %{version}-%{release} -Requires: trinity-libkleopatra-devel = %{version}-%{release} -Requires: trinity-libkmime-devel = %{version}-%{release} -Requires: trinity-libkpimexchange-devel = %{version}-%{release} -Requires: trinity-libkpimidentities-devel = %{version}-%{release} -Requires: trinity-libksieve-devel = %{version}-%{release} -Requires: trinity-libktnef-devel = %{version}-%{release} -Requires: trinity-libmimelib-devel = %{version}-%{release} -Requires: %{name}-tderesources-devel = %{version}-%{release} - -%description devel -This metapackage includes all development files for TDE PIM. -It also contains the CMAKE macros. - -%files devel -%defattr(-,root,root,-) -%{tde_datadir}/cmake/* - -########## - -%package -n trinity-akregator -Summary: RSS feed aggregator for TDE -Group: Applications/Internet -Requires: trinity-libtdepim = %{version}-%{release} -Requires: trinity-libkcal = %{version}-%{release} - -%description -n trinity-akregator -aKregator is a fast, lightweight, and intuitive feed reader program -for TDE. It allows you to quickly browse through hundreds of -thousands of internet feeds in a quick, efficient, and familiar way. - -%files -n trinity-akregator -%defattr(-,root,root,-) -%{tde_bindir}/akregator -%{tde_tdelibdir}/libakregatorpart.la -%{tde_tdelibdir}/libakregatorpart.so -%{tde_tdelibdir}/libakregator_mk4storage_plugin.la -%{tde_tdelibdir}/libakregator_mk4storage_plugin.so -%{tde_libdir}/libakregatorprivate.so.* -%{tde_tdeappdir}/akregator.desktop -%{tde_datadir}/apps/akregator -%{tde_datadir}/config.kcfg/akregator.kcfg -%{tde_datadir}/config.kcfg/mk4config.kcfg -%{tde_datadir}/icons/crystalsvg/*/actions/rss_tag.png -%{tde_datadir}/icons/crystalsvg/16x16/apps/akregator_empty.png -%{tde_datadir}/icons/hicolor/*/apps/akregator.png -%{tde_datadir}/icons/hicolor/scalable/apps/akregator.svgz -%{tde_datadir}/services/akregator_mk4storage_plugin.desktop -%{tde_datadir}/services/akregator_part.desktop -%{tde_datadir}/services/feed.protocol -%{tde_datadir}/services/kontact/akregatorplugin*.desktop -%{tde_datadir}/servicetypes/akregator_plugin.desktop -%{tde_tdedocdir}/HTML/en/akregator/ - -%post -n trinity-akregator -/sbin/ldconfig || : -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-akregator -/sbin/ldconfig || : -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-akregator-devel -Summary: Development files for trinity-akregator -Group: Development/Libraries/Other -Requires: trinity-akregator = %{version}-%{release} - -%description -n trinity-akregator-devel -%{summary} - -%files -n trinity-akregator-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/akregator/ -%{tde_libdir}/libakregatorprivate.la -%{tde_libdir}/libakregatorprivate.so - -%post -n trinity-akregator-devel -/sbin/ldconfig || : - -%postun -n trinity-akregator-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-kaddressbook -Summary: TDE addressbook application -Group: Applications/Communications -Requires: trinity-tdebase-pim-ioslaves -Requires: %{name}-tderesources = %{version}-%{release} - -%description -n trinity-kaddressbook -KAddressBook is the main address book application for TDE; it enables you -to manage your contacts efficiently and comfortably. It can load and save -your contacts to many different locations, including the local file system, -LDAP servers, and SQL databases. - -%files -n trinity-kaddressbook -%defattr(-,root,root,-) -%{tde_bindir}/kabc2mutt -%{tde_bindir}/kaddressbook -%{tde_bindir}/kabcdistlistupdater -%{tde_tdelibdir}/kcm_kabconfig.la -%{tde_tdelibdir}/kcm_kabconfig.so -%{tde_tdelibdir}/kcm_kabcustomfields.la -%{tde_tdelibdir}/kcm_kabcustomfields.so -%{tde_tdelibdir}/kcm_kabldapconfig.la -%{tde_tdelibdir}/kcm_kabldapconfig.so -%{tde_tdelibdir}/ldifvcardthumbnail.la -%{tde_tdelibdir}/ldifvcardthumbnail.so -%{tde_tdelibdir}/libkaddrbk_*.la -%{tde_tdelibdir}/libkaddrbk_*.so -%{tde_tdelibdir}/libkaddressbookpart.la -%{tde_tdelibdir}/libkaddressbookpart.so -%{tde_libdir}/libkabinterfaces.so.* -%{tde_libdir}/libkaddressbook.so.* -%{tde_tdeappdir}/kaddressbook.desktop -%{tde_datadir}/apps/kaddressbook -%{tde_datadir}/icons/hicolor/*/apps/kaddressbook.png -%{tde_datadir}/services/kabconfig.desktop -%{tde_datadir}/services/kabcustomfields.desktop -%{tde_datadir}/services/kabldapconfig.desktop -%{tde_datadir}/services/kaddressbook -%{tde_datadir}/services/kontact/kaddressbookplugin.desktop -%{tde_datadir}/services/kresources/kabc/imap.desktop -%{tde_datadir}/services/ldifvcardthumbnail.desktop -%{tde_datadir}/servicetypes/dcopaddressbook.desktop -%{tde_datadir}/servicetypes/kaddressbook_contacteditorwidget.desktop -%{tde_datadir}/servicetypes/kaddressbookimprotocol.desktop -%{tde_datadir}/servicetypes/kaddressbook_extension.desktop -%{tde_datadir}/servicetypes/kaddressbook_view.desktop -%{tde_datadir}/servicetypes/kaddressbook_xxport.desktop -%{tde_tdedocdir}/HTML/en/kaddressbook/ -%{tde_datadir}/autostart/kabcdistlistupdater.desktop -%{tde_tdeincludedir}/kaddressbook/ -%{tde_tdeincludedir}/kabc/ - -%post -n trinity-kaddressbook -/sbin/ldconfig || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kaddressbook -/sbin/ldconfig || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kaddressbook-devel -Summary: Development files for trinity-kaddressbook -Group: Development/Libraries/Other -Requires: trinity-kaddressbook = %{version}-%{release} - -%description -n trinity-kaddressbook-devel -%{summary} - -%files -n trinity-kaddressbook-devel -%defattr(-,root,root,-) -%{tde_libdir}/libkabinterfaces.la -%{tde_libdir}/libkabinterfaces.so -%{tde_libdir}/libkaddressbook.la -%{tde_libdir}/libkaddressbook.so - -%post -n trinity-kaddressbook-devel -/sbin/ldconfig || : - -%postun -n trinity-kaddressbook-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-kalarm -Summary: Trinity alarm message, command and email scheduler -Group: Applications/Communications -Requires: trinity-libkpimidentities = %{version}-%{release} - -%description -n trinity-kalarm -KAlarm provides a graphical interface to schedule personal timed events - -pop-up alarm messages, command execution and sending emails. There is a -range of options for configuring recurring events. - -A pop-up alarm can show either a simple text message, or the contents of a -text or image file, It can optionally be spoken, or play a sound file. You -can choose its appearance, and set reminders. Among KAlarm's other -facilities, you can set up templates to allow KAlarm to be used as a 'tea -timer'. - -As an alternative to using the graphical interface, alarms can be scheduled -from the command line or via DCOP calls from other programs. KAlarm is -TDE-based, but will also run on other desktops. - -%files -n trinity-kalarm -%defattr(-,root,root,-) -%{tde_bindir}/kalarm -%{tde_bindir}/kalarmd -%{tde_tdeappdir}/kalarm.desktop -%{tde_datadir}/applnk/.hidden/kalarmd.desktop -%{tde_datadir}/applnk/Applications/kalarm.desktop -%{tde_datadir}/apps/kalarm -%{tde_datadir}/autostart/kalarm.tray.desktop -%{tde_datadir}/autostart/kalarmd.autostart.desktop -%{tde_datadir}/icons/crystalsvg/*/actions/kalarm.png -%{tde_datadir}/icons/hicolor/*/apps/kalarm.png -%{tde_tdedocdir}/HTML/en/kalarm/ - -%post -n trinity-kalarm -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kalarm -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kandy -Summary: Trinity mobile phone utility -Group: Applications/Communications - -%description -n trinity-kandy -At the moment Kandy is more or less a terminal program with some special -features to store commands and their parameters, but is also has a simple GUI -to access the phone book of a mobile phone and it is able to save this phone -book to the TDE address book. - -Kandy is aimed at mobile phones with integrated (GSM) modems. - -%files -n trinity-kandy -%defattr(-,root,root,-) -%{tde_bindir}/kandy -%{tde_bindir}/kandy_client -%{tde_tdeappdir}/kandy.desktop -%{tde_datadir}/applnk/Utilities/kandy.desktop -%{tde_datadir}/apps/kandy/ -%{tde_datadir}/icons/crystalsvg/*/apps/kandy.png -%{tde_datadir}/icons/hicolor/*/apps/kandy.png -%{tde_datadir}/config.kcfg/kandy.kcfg -%{tde_tdedocdir}/HTML/en/kandy/ - -%post -n trinity-kandy -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kandy -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-karm -Summary: Trinity time tracker tool -Group: Applications/Productivity - -%description -n trinity-karm -KArm is a time tracker for busy people who need to keep track of the amount of -time they spend on various tasks. - -%files -n trinity-karm -%defattr(-,root,root,-) -%{tde_bindir}/karm -%{tde_libdir}/libkarm.so.* -%{tde_tdelibdir}/libkarmpart.la -%{tde_tdelibdir}/libkarmpart.so -%{tde_tdeappdir}/karm.desktop -%{tde_datadir}/applnk/Utilities/karm.desktop -%{tde_datadir}/apps/karm/ -%{tde_datadir}/apps/karmpart/ -%{tde_datadir}/icons/hicolor/*/apps/karm.png -%{tde_datadir}/services/karm_part.desktop -%{tde_datadir}/services/kontact/karmplugin.desktop -%{tde_tdedocdir}/HTML/en/karm/ - -%post -n trinity-karm -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-karm -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-karm-devel -Summary: Development files for karm -Group: Development/Libraries/Other - -%description -n trinity-karm-devel -%{summary} - -%files -n trinity-karm-devel -%defattr(-,root,root,-) -%{tde_libdir}/libkarm.so -%{tde_libdir}/libkarm.la - -%post -n trinity-karm-devel -/sbin/ldconfig || : - -%postun -n trinity-karm-devel -/sbin/ldconfig || : - -########## - -%package kfile-plugins -Summary: TDE File dialog plugins for palm and vcf files -Group: Environment/Libraries - -Obsoletes: tdepim-kfile-plugins < %{version}-%{release} - -%description kfile-plugins -File dialog plugins for palm and vcf files. - -%files kfile-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/kfile_ics.la -%{tde_tdelibdir}/kfile_ics.so -%{tde_tdelibdir}/kfile_vcf.la -%{tde_tdelibdir}/kfile_vcf.so -%{tde_datadir}/services/kfile_ics.desktop -%{tde_datadir}/services/kfile_vcf.desktop - -########## - -%package tdeio-plugins -Summary: Trinity PIM I/O Slaves -Group: Environment/Libraries - -Obsoletes: tdepim-kio-plugins < %{version}-%{release} -Obsoletes: trinity-tdepim-kio-plugins < %{version}-%{release} -Provides: trinity-tdepim-kio-plugins = %{version}-%{release} - -%description tdeio-plugins -This package includes the pim kioslaves. This includes imap4, sieve, -and mbox. - -%files tdeio-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/kio_groupwise.la -%{tde_tdelibdir}/kio_groupwise.so -%{tde_tdelibdir}/kio_imap4.la -%{tde_tdelibdir}/kio_imap4.so -%{tde_tdelibdir}/kio_mbox.la -%{tde_tdelibdir}/kio_mbox.so -%{tde_tdelibdir}/kio_scalix.la -%{tde_tdelibdir}/kio_scalix.so -%{tde_tdelibdir}/kio_sieve.la -%{tde_tdelibdir}/kio_sieve.so -%{tde_datadir}/services/groupwise.protocol -%{tde_datadir}/services/groupwises.protocol -%{tde_datadir}/services/imap4.protocol -%{tde_datadir}/services/imaps.protocol -%{tde_datadir}/services/mbox.protocol -%{tde_datadir}/services/scalix.protocol -%{tde_datadir}/services/scalixs.protocol -%{tde_datadir}/services/sieve.protocol - -########## - -%package tderesources -Summary: Trinity pim resource plugins -Group: Environment/Libraries -#Requires: trinity-kaddressbook = %{version}-%{release} -#Requires: trinity-korganizer = %{version}-%{release} -#Requires: trinity-knotes = %{version}-%{release} -Requires: libcaldav -Requires: libcarddav - -Obsoletes: tdepim-kresources < %{version}-%{release} -Obsoletes: trinity-tdepim-kresources < %{version}-%{release} -Provides: trinity-tdepim-kresources = %{version}-%{release} - -%description tderesources -This package includes several plugins needed to interface with groupware -servers. It also includes plugins for features such as blogging and -tracking feature plans. - -%files tderesources -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcal_caldav.la -%{tde_tdelibdir}/kcal_caldav.so -%{tde_tdelibdir}/kcal_groupdav.la -%{tde_tdelibdir}/kcal_groupdav.so -%{tde_tdelibdir}/kcal_groupwise.la -%{tde_tdelibdir}/kcal_groupwise.so -%{tde_tdelibdir}/kcal_kolab.la -%{tde_tdelibdir}/kcal_kolab.so -%{tde_tdelibdir}/kcal_scalix.la -%{tde_tdelibdir}/kcal_scalix.so -%{tde_tdelibdir}/kcal_newexchange.la -%{tde_tdelibdir}/kcal_newexchange.so -%{tde_tdelibdir}/kcal_resourcefeatureplan.la -%{tde_tdelibdir}/kcal_resourcefeatureplan.so -%{tde_tdelibdir}/kcal_slox.la -%{tde_tdelibdir}/kcal_slox.so -%{tde_tdelibdir}/kcal_xmlrpc.la -%{tde_tdelibdir}/kcal_xmlrpc.so -%{tde_tdelibdir}/knotes_kolab.la -%{tde_tdelibdir}/knotes_kolab.so -%{tde_tdelibdir}/knotes_scalix.la -%{tde_tdelibdir}/knotes_scalix.so -%{tde_tdelibdir}/knotes_xmlrpc.la -%{tde_tdelibdir}/knotes_xmlrpc.so -%{tde_libdir}/libkabckolab.so.* -%{tde_libdir}/libkabcscalix.so.* -%{tde_libdir}/libkabc_groupdav.so.* -%{tde_libdir}/libkabc_groupwise.so.* -%{tde_libdir}/libkabc_newexchange.so.* -%{tde_libdir}/libkabc_slox.so.* -%{tde_libdir}/libkabc_xmlrpc.so.* -%{tde_libdir}/libkcalkolab.so.* -%{tde_libdir}/libkcalscalix.so.* -%{tde_libdir}/libkcal_caldav.so.* -%{tde_libdir}/libkabc_carddav.so.* -%{tde_libdir}/libkcal_groupdav.so.* -%{tde_libdir}/libkcal_groupwise.so.* -%{tde_libdir}/libkcal_newexchange.so.* -%{tde_libdir}/libkcal_resourcefeatureplan.so.* -%{tde_libdir}/libkcal_slox.so.* -%{tde_libdir}/libkcal_xmlrpc.so.* -%{tde_libdir}/libkgroupwarebase.so.* -%{tde_libdir}/libkgroupwaredav.so.* -%{tde_libdir}/libknoteskolab.so.* -%{tde_libdir}/libknotesscalix.so.* -%{tde_libdir}/libknotes_xmlrpc.so.* -%{tde_libdir}/libkslox.so.* -%{tde_libdir}/libgwsoap.so.* -%{tde_datadir}/services/kresources/kabc/kabc_groupdav.desktop -%{tde_datadir}/services/kresources/kabc/kabc_groupwise.desktop -%{tde_datadir}/services/kresources/kabc/kabc_newexchange.desktop -%{tde_datadir}/services/kresources/kabc/kabc_opengroupware.desktop -%{tde_datadir}/services/kresources/kabc/kabc_ox.desktop -%{tde_datadir}/services/kresources/kabc/kabc_slox.desktop -%{tde_datadir}/services/kresources/kabc/kabc_xmlrpc.desktop -%{tde_datadir}/services/kresources/kabc/kolab.desktop -%{tde_datadir}/services/kresources/kabc/scalix.desktop -%{tde_datadir}/services/kresources/kcal/exchange.desktop -%{tde_datadir}/services/kresources/kcal/kcal_caldav.desktop -%{tde_datadir}/services/kresources/kabc/kabc_carddav.desktop -%{tde_datadir}/services/kresources/kcal/kcal_groupdav.desktop -%{tde_datadir}/services/kresources/kcal/kcal_groupwise.desktop -%{tde_datadir}/services/kresources/kcal/kcal_newexchange.desktop -%{tde_datadir}/services/kresources/kcal/kcal_opengroupware.desktop -%{tde_datadir}/services/kresources/kcal/kcal_ox.desktop -%{tde_datadir}/services/kresources/kcal/kcal_resourcefeatureplan.desktop -%{tde_datadir}/services/kresources/kcal/kcal_slox.desktop -%{tde_datadir}/services/kresources/kcal/kcal_xmlrpc.desktop -%{tde_datadir}/services/kresources/kcal/kolab.desktop -%{tde_datadir}/services/kresources/kcal/scalix.desktop -%dir %{tde_datadir}/services/kresources/knotes -%{tde_datadir}/services/kresources/knotes/knotes_xmlrpc.desktop -%{tde_datadir}/services/kresources/knotes/kolabresource.desktop -%{tde_datadir}/services/kresources/knotes/scalix.desktop - -%{tde_datadir}/apps/kconf_update/upgrade-resourcetype.pl -%{tde_datadir}/apps/kconf_update/kolab-resource.upd - -%{tde_tdelibdir}/kabc_carddav.la -%{tde_tdelibdir}/kabc_carddav.so -%{tde_tdelibdir}/kabc_groupdav.la -%{tde_tdelibdir}/kabc_groupdav.so -%{tde_tdelibdir}/kabc_groupwise.la -%{tde_tdelibdir}/kabc_groupwise.so -%{tde_tdelibdir}/kabc_kolab.la -%{tde_tdelibdir}/kabc_kolab.so -%{tde_tdelibdir}/kabc_newexchange.la -%{tde_tdelibdir}/kabc_newexchange.so -%{tde_tdelibdir}/kabc_scalix.la -%{tde_tdelibdir}/kabc_scalix.so -%{tde_tdelibdir}/kabc_slox.la -%{tde_tdelibdir}/kabc_slox.so -%{tde_tdelibdir}/kabc_xmlrpc.la -%{tde_tdelibdir}/kabc_xmlrpc.so - -%post tderesources -/sbin/ldconfig || : - -%postun tderesources -/sbin/ldconfig || : - -########## - -%package tderesources-devel -Summary: Development files for tderesources -Group: Development/Libraries/Other -Requires: %{name}-tderesources = %{version}-%{release} -Requires: libcaldav -Requires: libcarddav - -Obsoletes: tdepim-tderesources-devel < %{version}-%{release} -Obsoletes: trinity-tdepim-kresources-devel < %{version}-%{release} -Provides: trinity-tdepim-kresources-devel = %{version}-%{release} - -%description tderesources-devel -%{summary} - -%files tderesources-devel -%defattr(-,root,root,-) -%{tde_libdir}/libkslox.la -%{tde_libdir}/libkslox.so -%{tde_libdir}/libkabc_groupdav.la -%{tde_libdir}/libkabc_groupdav.so -%{tde_libdir}/libkabc_groupwise.la -%{tde_libdir}/libkabc_groupwise.so -%{tde_libdir}/libgwsoap.la -%{tde_libdir}/libgwsoap.so -%{tde_libdir}/libkabc_carddav.la -%{tde_libdir}/libkabc_carddav.so -%{tde_libdir}/libkabc_newexchange.la -%{tde_libdir}/libkabc_newexchange.so -%{tde_libdir}/libkabc_slox.la -%{tde_libdir}/libkabc_slox.so -%{tde_libdir}/libkabc_xmlrpc.la -%{tde_libdir}/libkabc_xmlrpc.so -%{tde_libdir}/libkabckolab.la -%{tde_libdir}/libkabckolab.so -%{tde_libdir}/libkabcscalix.la -%{tde_libdir}/libkabcscalix.so -%{tde_libdir}/libkcal_caldav.la -%{tde_libdir}/libkcal_caldav.so -%{tde_libdir}/libkcal_groupdav.la -%{tde_libdir}/libkcal_groupdav.so -%{tde_libdir}/libkcal_groupwise.la -%{tde_libdir}/libkcal_groupwise.so -%{tde_libdir}/libkcal_newexchange.la -%{tde_libdir}/libkcal_newexchange.so -%{tde_libdir}/libkcal_resourcefeatureplan.la -%{tde_libdir}/libkcal_resourcefeatureplan.so -%{tde_libdir}/libkcal_slox.la -%{tde_libdir}/libkcal_slox.so -%{tde_libdir}/libkcal_xmlrpc.la -%{tde_libdir}/libkcal_xmlrpc.so -%{tde_libdir}/libkcalkolab.la -%{tde_libdir}/libkcalkolab.so -%{tde_libdir}/libkcalscalix.la -%{tde_libdir}/libkcalscalix.so -%{tde_libdir}/libkgroupwarebase.la -%{tde_libdir}/libkgroupwarebase.so -%{tde_libdir}/libkgroupwaredav.la -%{tde_libdir}/libkgroupwaredav.so -%{tde_libdir}/libknotes_xmlrpc.la -%{tde_libdir}/libknotes_xmlrpc.so -%{tde_libdir}/libknoteskolab.la -%{tde_libdir}/libknoteskolab.so -%{tde_libdir}/libknotesscalix.la -%{tde_libdir}/libknotesscalix.so -%{tde_tdeincludedir}/kpimprefs.h - -%post tderesources-devel -/sbin/ldconfig || : - -%postun tderesources-devel -/sbin/ldconfig || : - -########## - -%package wizards -Summary: Trinity server configuration wizards -Group: Applications/Communications - -Obsoletes: tdepim-wizards < %{version}-%{release} - -%description wizards -This package contains TDE-based wizards for configuring eGroupware, -Kolab, and SUSE Linux Openexchange servers. - -%files wizards -%defattr(-,root,root,-) -%{tde_bindir}/egroupwarewizard -%{tde_bindir}/exchangewizard -%{tde_bindir}/groupwarewizard -%{tde_bindir}/groupwisewizard -%{tde_bindir}/kolabwizard -%{tde_bindir}/scalixadmin -%{tde_bindir}/scalixwizard -%{tde_bindir}/sloxwizard -%{tde_tdelibdir}/libegroupwarewizard.la -%{tde_tdelibdir}/libegroupwarewizard.so -%{tde_tdelibdir}/libexchangewizard.la -%{tde_tdelibdir}/libexchangewizard.so -%{tde_tdelibdir}/libgroupwisewizard.la -%{tde_tdelibdir}/libgroupwisewizard.so -%{tde_tdelibdir}/libkolabwizard.la -%{tde_tdelibdir}/libkolabwizard.so -%{tde_tdelibdir}/libscalixwizard.la -%{tde_tdelibdir}/libscalixwizard.so -%{tde_tdelibdir}/libsloxwizard.la -%{tde_tdelibdir}/libsloxwizard.so -%{tde_tdeappdir}/groupwarewizard.desktop -%{tde_datadir}/config.kcfg/egroupware.kcfg -%{tde_datadir}/config.kcfg/groupwise.kcfg -%{tde_datadir}/config.kcfg/kolab.kcfg -%{tde_datadir}/config.kcfg/scalix.kcfg -%{tde_datadir}/config.kcfg/slox.kcfg - -%post wizards -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun wizards -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%if 0%{?with_kitchensync} -%package -n trinity-kitchensync -Summary: Synchronization framework -Group: Applications/Communications -BuildRequires: opensync-devel -#Suggests: konqueror-trinity -#Conflicts: kdebluetooth-irmcsync-trinity (<< 0.99+1.0beta2-4.1), ksync-trinity - -%description -n trinity-kitchensync -This package contains a synchronization framework, still under heavy -development (?). Kitchensync uses opensync. - -%files -n trinity-kitchensync -%defattr(-,root,root,-) -%{tde_bindir}/kitchensync -%{tde_tdelibdir}/libkitchensyncpart.la -%{tde_tdelibdir}/libkitchensyncpart.so -%{tde_datadir}/apps/kitchensync -%{tde_libdir}/libkitchensync.so.* -%{tde_libdir}/libqopensync.so.* -%{tde_tdeappdir}/kitchensync.desktop -%{tde_datadir}/icons/hicolor/*/apps/kitchensync.png - -%post -n trinity-kitchensync -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kitchensync -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -%endif - -########## - -%package -n trinity-kleopatra -Summary: Trinity Certificate Manager -Group: Applications/Communications - -# GPG support -%if 0%{?suse_version} -Requires: gpg2 -%endif -%if 0%{?rhel} == 4 -Requires: gnupg -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -Requires: gnupg2 -%endif - -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -Requires: pinentry -Requires: dirmngr -%endif - -%description -n trinity-kleopatra -Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm -keybox and for retrieving certificates from LDAP servers. - -%files -n trinity-kleopatra -%defattr(-,root,root,-) -%{tde_bindir}/kleopatra -%{tde_bindir}/kwatchgnupg -%{tde_tdelibdir}/kcm_kleopatra.la -%{tde_tdelibdir}/kcm_kleopatra.so -%{tde_tdeappdir}/kleopatra_import.desktop -%{tde_datadir}/apps/kleopatra -%{tde_datadir}/apps/kwatchgnupg -%{tde_datadir}/services/kleopatra_config_*.desktop -%{tde_tdedocdir}/HTML/en/kleopatra/ -%{tde_tdedocdir}/HTML/en/kwatchgnupg/ -%{tde_datadir}/icons/hicolor/*/apps/kleopatra.png - -%post -n trinity-kleopatra -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done - -%postun -n trinity-kleopatra -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done - -########## - -%package -n trinity-kmail -Summary: Trinity Email client -Group: Applications/Communications -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: trinity-tdebase-tdeio-pim-plugins >= %{version} - -# GPG support -%if 0%{?suse_version} -Requires: gpg2 -%endif -%if 0%{?rhel} == 4 -Requires: gnupg -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -Requires: gnupg2 -%endif - -# Pinentry -%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -Requires: pinentry -%endif - -Requires: procmail -Requires: trinity-kaddressbook = %{version}-%{release} -Requires: trinity-kleopatra = %{version}-%{release} -Requires: trinity-tdebase-tdeio-pim-plugins >= %{version}-%{release} - -Provides: imap-client, mail-reader - -%description -n trinity-kmail -KMail is a fully-featured email client that fits nicely into the TDE -desktop. It has features such as support for IMAP, POP3, multiple accounts, -mail filtering and sorting, PGP/GnuPG privacy, and inline attachments. - -You need to install %{name}-tdeio-plugins if you want to use IMAP or -mbox files, and/or trinity-tdebase-tdeio-plugins if you want to use POP3. - -%files -n trinity-kmail -%defattr(-,root,root,-) -%{tde_datadir}/config/kmail.antispamrc -%{tde_datadir}/config/kmail.antivirusrc -%{tde_bindir}/kmail -%{tde_bindir}/kmail_*.sh -%{tde_tdelibdir}/kcm_kmail.la -%{tde_tdelibdir}/kcm_kmail.so -%{tde_tdelibdir}/libkmail_bodypartformatter_application_octetstream.la -%{tde_tdelibdir}/libkmail_bodypartformatter_application_octetstream.so -%{tde_tdelibdir}/libkmail_bodypartformatter_text_calendar.la -%{tde_tdelibdir}/libkmail_bodypartformatter_text_calendar.so -%{tde_tdelibdir}/libkmail_bodypartformatter_text_vcard.la -%{tde_tdelibdir}/libkmail_bodypartformatter_text_vcard.so -%{tde_tdelibdir}/libkmail_bodypartformatter_text_xdiff.la -%{tde_tdelibdir}/libkmail_bodypartformatter_text_xdiff.so -%{tde_tdelibdir}/libkmailpart.la -%{tde_tdelibdir}/libkmailpart.so -%{tde_tdeappdir}/KMail.desktop -%{tde_tdeappdir}/kmail_view.desktop -%{tde_datadir}/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl -%{tde_datadir}/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl -%{tde_datadir}/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl -%{tde_datadir}/apps/kconf_update/kmail-3.2-misc.sh -%{tde_datadir}/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh -%{tde_datadir}/apps/kconf_update/kmail-3.3-aegypten.pl -%{tde_datadir}/apps/kconf_update/kmail-3.3-misc.pl -%{tde_datadir}/apps/kconf_update/kmail-3.3-move-identities.pl -%{tde_datadir}/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh -%{tde_datadir}/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl -%{tde_datadir}/apps/kconf_update/kmail-3.3b1-misc.pl -%{tde_datadir}/apps/kconf_update/kmail-3.4-misc.pl -%{tde_datadir}/apps/kconf_update/kmail-3.4.1-update-status-filters.pl -%{tde_datadir}/apps/kconf_update/kmail-3.5-trigger-flag-migration.pl -%{tde_datadir}/apps/kconf_update/kmail-3.5-filter-icons.pl -%{tde_datadir}/apps/kconf_update/kmail-pgpidentity.pl -%{tde_datadir}/apps/kconf_update/kmail-upd-identities.pl -%{tde_datadir}/apps/kconf_update/kmail.upd -%{tde_datadir}/apps/kconf_update/upgrade-signature.pl -%{tde_datadir}/apps/kconf_update/upgrade-transport.pl -%{tde_datadir}/apps/kmail -%{tde_datadir}/apps/konqueror/servicemenus/email.desktop -%{tde_datadir}/config.kcfg/custommimeheader.kcfg -%{tde_datadir}/config.kcfg/kmail.kcfg -%{tde_datadir}/config.kcfg/customtemplates_kfg.kcfg -%{tde_datadir}/config.kcfg/replyphrases.kcfg -%{tde_datadir}/config.kcfg/templatesconfiguration_kfg.kcfg -%{tde_datadir}/icons/crystalsvg/*/apps/kmaillight.png -%{tde_datadir}/icons/hicolor/*/apps/kmail.png -%{tde_datadir}/icons/hicolor/scalable/apps/kmail.svgz -%{tde_datadir}/services/kmail_config_*.desktop -%{tde_datadir}/services/kontact/kmailplugin.desktop -%{tde_datadir}/servicetypes/dcopimap.desktop -%{tde_datadir}/servicetypes/dcopmail.desktop -# 'libkmailprivate.so' is required at runtime, not devel ! -%{tde_libdir}/libkmailprivate.so -%{tde_libdir}/libkmailprivate.la -%{tde_tdedocdir}/HTML/en/kmail/ - -%post -n trinity-kmail -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kmail -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kmail-devel -Summary: Development files for kmail -Group: Development/Libraries/Other - -%description -n trinity-kmail-devel -%{summary} - -%files -n trinity-kmail-devel -%defattr(-,root,root,-) -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kmail/ -%{tde_tdeincludedir}/kmail*.h - -%post -n trinity-kmail-devel -/sbin/ldconfig || : - -%postun -n trinity-kmail-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-kmailcvt -Summary: Trinity KMail mail folder converter -Group: Applications/Communications -Requires: trinity-kmail = %{version}-%{release} - -%description -n trinity-kmailcvt -Converts mail folders to KMail format. Formats supported for import -include Outlook Express, Evolution, and plain mbox. - -%files -n trinity-kmailcvt -%defattr(-,root,root,-) -%{tde_bindir}/kmailcvt -%{tde_datadir}/applnk/Utilities/kmailcvt.desktop -%{tde_datadir}/apps/kmailcvt -%{tde_datadir}/icons/crystalsvg/*/apps/kmailcvt.png - -%post -n trinity-kmailcvt -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done - -%postun -n trinity-kmailcvt -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done - -########## - -%package -n trinity-knode -Summary: Trinity news reader -Group: Applications/Internet - -%description -n trinity-knode -KNode is an easy-to-use, convenient newsreader. It is intended to be usable -by inexperienced users, but also includes support for such features as -MIME attachments, article scoring, and creating and verifying GnuPG -signatures. - -%files -n trinity-knode -%defattr(-,root,root,-) -%{tde_bindir}/knode -%{tde_tdelibdir}/kcm_knode.la -%{tde_tdelibdir}/kcm_knode.so -%{tde_tdelibdir}/libknodepart.la -%{tde_tdelibdir}/libknodepart.so -%{tde_libdir}/libknodecommon.so.* -%{tde_tdeappdir}/KNode.desktop -%{tde_datadir}/apps/knode/ -%{tde_datadir}/icons/hicolor/*/apps/knode.png -%{tde_datadir}/icons/hicolor/*/apps/knode2.png -%{tde_datadir}/services/knewsservice.protocol -%{tde_datadir}/services/knode_config_*.desktop -%{tde_datadir}/services/kontact/knodeplugin.desktop -%{tde_tdedocdir}/HTML/en/knode/ - -%post -n trinity-knode -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-knode -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-knode-devel -Summary: Development files for trinity-knode -Group: Development/Libraries/Other -Requires: trinity-knode = %{version}-%{release} - -%description -n trinity-knode-devel -%{summary} - -%files -n trinity-knode-devel -%defattr(-,root,root,-) -%{tde_libdir}/libknodecommon.la -%{tde_libdir}/libknodecommon.so - -%post -n trinity-knode-devel -/sbin/ldconfig || : - -%postun -n trinity-knode-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-knotes -Summary: Trinity sticky notes -Group: Applications/Utilities -Requires: trinity-tdepim-tderesources = %{version}-%{release} - -%description -n trinity-knotes -KNotes is a program that lets you write sticky notes. The notes are saved -automatically when you exit the program, and they display when you open the -program. The program supports printing and mailing your notes. - -%files -n trinity-knotes -%defattr(-,root,root,-) -%{tde_bindir}/knotes -%{tde_tdelibdir}/knotes_local.la -%{tde_tdelibdir}/knotes_local.so -%{tde_libdir}/libknotes.so.* -%{tde_tdeappdir}/knotes.desktop -%{tde_datadir}/apps/knotes/ -%{tde_datadir}/config.kcfg/knoteconfig.kcfg -%{tde_datadir}/config.kcfg/knotesglobalconfig.kcfg -%{tde_datadir}/icons/hicolor/*/apps/knotes.png -%dir %{tde_datadir}/services/kresources/knotes -%{tde_datadir}/services/kresources/knotes/imap.desktop -%{tde_datadir}/services/kresources/knotes/local.desktop -%{tde_datadir}/services/kresources/knotes_manager.desktop -%{tde_datadir}/services/kontact/knotesplugin.desktop -%{tde_tdedocdir}/HTML/en/knotes/ - -%post -n trinity-knotes -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-knotes -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-knotes-devel -Summary: Development files for knots -Group: Development/Libraries/Other -Requires: trinity-knotes = %{version}-%{release} -Requires: %{name}-tderesources-devel = %{version}-%{release} - -%description -n trinity-knotes-devel -%{summary} - -%files -n trinity-knotes-devel -%defattr(-,root,root,-) -%{tde_libdir}/libknotes.so -%{tde_libdir}/libknotes.la -%{tde_tdeincludedir}/KNotesAppIface.h -%{tde_tdeincludedir}/KNotesIface.h - -%post -n trinity-knotes-devel -/sbin/ldconfig || : - -%postun -n trinity-knotes-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-kode -Summary: Helper library for programmatic generation of C++ code -Group: Development/Libraries - -%description -n trinity-kode -This package includes a program kode for generation of C++ template files -and kxml_compiler for generation of C++ classes representing XML data -described by RelaxNG schemes. - -%files -n trinity-kode -%defattr(-,root,root,-) -%{tde_bindir}/kode -%{tde_bindir}/kxml_compiler -%{tde_libdir}/libkode.so.* - -%post -n trinity-kode -/sbin/ldconfig || : - -%postun -n trinity-kode -/sbin/ldconfig || : - -########## - -%package -n trinity-kode-devel -Summary: Development files for trinity-kode -Group: Development/Libraries/Other -Requires: trinity-kode = %{version}-%{release} - -%description -n trinity-kode-devel -%{summary} - -%files -n trinity-kode-devel -%defattr(-,root,root,-) -%{tde_libdir}/libkode.la -%{tde_libdir}/libkode.so - -%post -n trinity-kode-devel -/sbin/ldconfig || : - -%postun -n trinity-kode-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-konsolekalendar -Summary: Trinity konsole personal organizer -Group: Applications/Productivity - -%description -n trinity-konsolekalendar -KonsoleKalendar is a command-line interface to TDE calendars. -Konsolekalendar complements the TDE KOrganizer by providing a console -frontend to manage your calendars. - -%files -n trinity-konsolekalendar -%defattr(-,root,root,-) -%{tde_bindir}/konsolekalendar -%{tde_tdeappdir}/konsolekalendar.desktop -%{tde_datadir}/icons/crystalsvg/*/apps/konsolekalendar.png -%{tde_tdedocdir}/HTML/en/konsolekalendar/ - -%post -n trinity-konsolekalendar -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-konsolekalendar -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kontact -Summary: Trinity pim application -Group: Applications/Communications -Requires: trinity-kmail = %{version}-%{release} -Requires: trinity-korganizer = %{version}-%{release} -Requires: trinity-kaddressbook = %{version}-%{release} -Requires: trinity-knode = %{version}-%{release} -Requires: trinity-knotes = %{version}-%{release} -Requires: trinity-akregator = %{version}-%{release} - -%description -n trinity-kontact -Kontact is the integrated solution to your personal information management -needs. It combines TDE applications like KMail, KOrganizer, and -KAddressBook into a single interface to provide easy access to mail, -scheduling, address book and other PIM functionality. - -%files -n trinity-kontact -%defattr(-,root,root,-) -%{tde_bindir}/kontact -%{tde_tdelibdir}/kcm_kmailsummary.la -%{tde_tdelibdir}/kcm_kmailsummary.so -%{tde_tdelibdir}/kcm_kontact.la -%{tde_tdelibdir}/kcm_kontact.so -%{tde_tdelibdir}/kcm_kontactknt.la -%{tde_tdelibdir}/kcm_kontactknt.so -%{tde_tdelibdir}/kcm_kontactsummary.la -%{tde_tdelibdir}/kcm_kontactsummary.so -%{tde_tdelibdir}/kcm_korgsummary.la -%{tde_tdelibdir}/kcm_korgsummary.so -%{tde_tdelibdir}/kcm_sdsummary.la -%{tde_tdelibdir}/kcm_sdsummary.so -%{tde_tdelibdir}/libkontact_*.la -%{tde_tdelibdir}/libkontact_*.so -%{tde_libdir}/libkontact.so.* -%{tde_libdir}/libkpinterfaces.so.* -%{tde_tdeappdir}/Kontact.desktop -%{tde_tdeappdir}/kontactdcop.desktop -%{tde_datadir}/apps/kontact/ -%{tde_datadir}/apps/kontactsummary/ -%{tde_datadir}/config.kcfg/kontact.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kontact.png -%{tde_datadir}/icons/crystalsvg/*/actions/kontact_*.png -%{tde_datadir}/services/kcmkmailsummary.desktop -%{tde_datadir}/services/kcmkontactknt.desktop -%{tde_datadir}/services/kcmkontactsummary.desktop -%{tde_datadir}/services/kcmkorgsummary.desktop -%{tde_datadir}/services/kcmsdsummary.desktop -%dir %{tde_datadir}/services/kontact -%{tde_datadir}/services/kontact/newstickerplugin.desktop -%{tde_datadir}/services/kontact/specialdatesplugin.desktop -%{tde_datadir}/services/kontact/summaryplugin.desktop -%{tde_datadir}/services/kontact/weatherplugin.desktop -%{tde_datadir}/services/kontactconfig.desktop -%{tde_datadir}/servicetypes/kontactplugin.desktop -%{tde_tdedocdir}/HTML/en/kontact/ -%{tde_tdedocdir}/HTML/en/kpilot/ - -%post -n trinity-kontact -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kontact -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kontact-devel -Summary: Development files for kontact -Group: Development/Libraries/Other -Requires: trinity-kontact = %{version}-%{release} - -%description -n trinity-kontact-devel -%{summary} - -%files -n trinity-kontact-devel -%defattr(-,root,root,-) -%{tde_libdir}/libkontact.la -%{tde_libdir}/libkontact.so -%{tde_libdir}/libkpinterfaces.la -%{tde_libdir}/libkpinterfaces.so -%{tde_tdeincludedir}/kontact/ - -%post -n trinity-kontact-devel -/sbin/ldconfig || : - -%postun -n trinity-kontact-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-korganizer -Summary: Trinity personal organizer -Group: Applications/Productivity -Requires: trinity-libkpimidentities = %{version}-%{release} -Requires: trinity-libkpimexchange = %{version}-%{release} -Requires: %{name}-tderesources = %{version}-%{release} -Requires: perl - -%description -n trinity-korganizer -This package contains KOrganizer, a calendar and scheduling program. - -KOrganizer aims to be a complete program for organizing appointments, -contacts, projects, etc. KOrganizer natively supports information interchange -with other calendar applications, through the industry standard vCalendar -personal data interchange file format. This eases the move from other -modern PIMs to KOrganizer. - -KOrganizer offers full synchronization with Palm Pilots, if kpilot is -installed. - -%files -n trinity-korganizer -%defattr(-,root,root,-) -%{tde_bindir}/ical2vcal -%{tde_bindir}/korgac -%{tde_bindir}/korganizer -%{tde_tdelibdir}/kcm_korganizer.la -%{tde_tdelibdir}/kcm_korganizer.so -%{tde_tdelibdir}/libkorg_*.la -%{tde_tdelibdir}/libkorg_*.so -%{tde_tdelibdir}/libkorganizerpart.la -%{tde_tdelibdir}/libkorganizerpart.so -%{tde_libdir}/libkocorehelper.so.* -%{tde_libdir}/libkorg_stdprinting.so.* -%{tde_libdir}/libkorganizer.so.* -%{tde_libdir}/libkorganizer_calendar.so.* -%{tde_libdir}/libkorganizer_eventviewer.so.* -%{tde_tdeappdir}/korganizer.desktop -%{tde_datadir}/apps/kconf_update/korganizer.upd -%{tde_datadir}/apps/korgac/ -%{tde_datadir}/apps/korganizer/ -%{tde_datadir}/autostart/korgac.desktop -%{tde_datadir}/config.kcfg/korganizer.kcfg -%{tde_datadir}/icons/hicolor/*/apps/korganizer.png -%dir %{tde_datadir}/services/kontact -%{tde_datadir}/services/kontact/korganizerplugin.desktop -%{tde_datadir}/services/kontact/journalplugin.desktop -%{tde_datadir}/services/kontact/todoplugin.desktop -%{tde_datadir}/services/korganizer_*.desktop -%{tde_datadir}/services/korganizer -%{tde_datadir}/services/webcal.protocol -%{tde_datadir}/servicetypes/calendardecoration.desktop -%{tde_datadir}/servicetypes/calendarplugin.desktop -%{tde_datadir}/servicetypes/dcopcalendar.desktop -%{tde_datadir}/servicetypes/korganizerpart.desktop -%{tde_datadir}/servicetypes/korgprintplugin.desktop -%{tde_tdedocdir}/HTML/en/korganizer/ - -%post -n trinity-korganizer -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-korganizer -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-korganizer-devel -Summary: Development files for korganizer -Group: Development/Libraries/Other -Requires: trinity-korganizer = %{version}-%{release} - -%description -n trinity-korganizer-devel -%{summary} - -%files -n trinity-korganizer-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/korganizer/ -%{tde_tdeincludedir}/calendar/ -%{tde_libdir}/libkocorehelper.la -%{tde_libdir}/libkocorehelper.so -%{tde_libdir}/libkorg_stdprinting.la -%{tde_libdir}/libkorg_stdprinting.so -%{tde_libdir}/libkorganizer.la -%{tde_libdir}/libkorganizer.so -%{tde_libdir}/libkorganizer_calendar.la -%{tde_libdir}/libkorganizer_calendar.so -%{tde_libdir}/libkorganizer_eventviewer.la -%{tde_libdir}/libkorganizer_eventviewer.so - -%post -n trinity-korganizer-devel -/sbin/ldconfig || : - -%postun -n trinity-korganizer-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-korn -Summary: Trinity mail checker -Group: Applications/Communications -Requires: %{name}-tdeio-plugins = %{version}-%{release} - -%description -n trinity-korn -Korn is a TDE mail checker that can display a small summary in the Kicker -tray. It supports checking mbox, pop3, imap4, and nntp sources. - -Once mail is received you can have Korn run a third party program or change -the color/icon of the Kicker display. In addition to this you can have -Korn run a program once you click on the docked icon in Kicker. - -%files -n trinity-korn -%defattr(-,root,root,-) -%{tde_bindir}/korn -%{tde_libdir}/kconf_update_bin/korn-3-4-config_change -%{tde_tdeappdir}/KOrn.desktop -%{tde_datadir}/apps/kconf_update/korn-3-4-config_change.upd -%{tde_datadir}/apps/kconf_update/korn-3-5-metadata-update.pl -%{tde_datadir}/apps/kconf_update/korn-3-5-ssl-update.pl -%{tde_datadir}/apps/kconf_update/korn-3-5-update.upd -%{tde_datadir}/icons/hicolor/*/apps/korn.png -%{tde_tdedocdir}/HTML/en/korn/ - -%post -n trinity-korn -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-korn -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-ktnef -Summary: Trinity TNEF viewer -Group: Applications/Communications - -%description -n trinity-ktnef -The TNEF File Viewer allows you to handle mail attachments using the TNEF -format. These attachments are usually found in mails coming from Microsoft -mail servers and embed the mail properties as well as the actual attachments. - -%files -n trinity-ktnef -%defattr(-,root,root,-) -%{tde_bindir}/ktnef -%{tde_tdeappdir}/ktnef.desktop -%{tde_datadir}/apps/ktnef -%{tde_datadir}/icons/hicolor/*/apps/ktnef.png -%{tde_datadir}/icons/locolor/*/apps/ktnef.png -%{tde_datadir}/mimelnk/application/ms-tnef.desktop -%{tde_tdedocdir}/HTML/en/ktnef/ - -%post -n trinity-ktnef -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ktnef -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-libindex -Summary: Trinity indexing library -Group: Environment/Libraries - -%description -n trinity-libindex -This library provides text indexing and is currently used by KMail -to implement fast searches in mail bodies. - -This is the runtime package for programs that use the libindex library. - -%files -n trinity-libindex -%defattr(-,root,root,-) -%{tde_libdir}/libindex.so.* - -%post -n trinity-libindex -/sbin/ldconfig || : - -%postun -n trinity-libindex -/sbin/ldconfig || : - -########## - -%package -n trinity-libindex-devel -Summary: Trinity indexing library [development] -Group: Development/Libraries/Other -Requires: trinity-libindex = %{version}-%{release} - -%description -n trinity-libindex-devel -This library provides text indexing and is currently used by KMail -to implement searching through mail text. - -This is the development package which contains the headers for the libindex-trinity -library. - -%files -n trinity-libindex-devel -%defattr(-,root,root,-) -%{tde_bindir}/indexlib-config -%{tde_tdeincludedir}/index -%{tde_libdir}/libindex.la -%{tde_libdir}/libindex.so - -%post -n trinity-libindex-devel -/sbin/ldconfig || : - -%postun -n trinity-libindex-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-libkcal -Summary: Trinity calendaring library -Group: Environment/Libraries -#Requires: %{name}-tderesources = %{version}-%{release} -Requires: trinity-libkmime = %{version}-%{release} - -%description -n trinity-libkcal -This library provides a C++ API for handling the vCalendar and iCalendar -formats. - -This is the runtime package for programs that use the libkcal-trinity library. - -%files -n trinity-libkcal -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcal_kabc.la -%{tde_tdelibdir}/kcal_kabc.so -%{tde_tdelibdir}/kcal_localdir.la -%{tde_tdelibdir}/kcal_localdir.so -%{tde_tdelibdir}/kcal_local.la -%{tde_tdelibdir}/kcal_local.so -%{tde_tdelibdir}/kcal_remote.la -%{tde_tdelibdir}/kcal_remote.so -%{tde_libdir}/libkcal.so.* -%{tde_libdir}/libkcal_resourceremote.so.* -%{tde_libdir}/libkholidays.so.* -%{tde_datadir}/apps/libkholidays/ -%dir %{tde_datadir}/services/kresources/kcal -%{tde_datadir}/services/kresources/kcal/imap.desktop -%{tde_datadir}/services/kresources/kcal/kabc.desktop -%{tde_datadir}/services/kresources/kcal/local.desktop -%{tde_datadir}/services/kresources/kcal/localdir.desktop -%{tde_datadir}/services/kresources/kcal/remote.desktop -%{tde_datadir}/services/kresources/kcal_manager.desktop - -%post -n trinity-libkcal -/sbin/ldconfig || : - -%postun -n trinity-libkcal -/sbin/ldconfig || : - -########## - -%package -n trinity-libkcal-devel -Summary: Trinity calendaring library [development] -Group: Development/Libraries/Other -Requires: trinity-libkcal = %{version}-%{release} -Requires: trinity-libtdepim-devel = %{version}-%{release} -Requires: trinity-libktnef-devel = %{version}-%{release} - -%description -n trinity-libkcal-devel -This library provides a C++ API for handling the vCalendar and iCalendar -formats. - -This is the development package which contains the headers for the libkcal-trinity -library. - -%files -n trinity-libkcal-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/libemailfunctions/ -%{tde_tdeincludedir}/libkcal -%{tde_libdir}/libkcal.la -%{tde_libdir}/libkcal.so -%{tde_libdir}/libkcal_resourceremote.la -%{tde_libdir}/libkcal_resourceremote.so -%{tde_libdir}/libkholidays.la -%{tde_libdir}/libkholidays.so - -%post -n trinity-libkcal-devel -/sbin/ldconfig || : - -%postun -n trinity-libkcal-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-libtdepim -Summary: Trinity PIM library -Group: Environment/Libraries -Requires: trinity-libkcal = %{version}-%{release} -Requires: trinity-libktnef = %{version}-%{release} - -Obsoletes: libtdepim < %{version}-%{release} -Provides: libtdepim = %{version}-%{release} - -%description -n trinity-libtdepim -This is the runtime package for programs that use the trinity-libtdepim library. - -%files -n trinity-libtdepim -%defattr(-,root,root,-) -%{tde_tdelibdir}/plugins/designer/kdepimwidgets.la -%{tde_tdelibdir}/plugins/designer/kdepimwidgets.so -%{tde_tdelibdir}/plugins/designer/kpartsdesignerplugin.la -%{tde_tdelibdir}/plugins/designer/kpartsdesignerplugin.so -%{tde_libdir}/libkdepim.so.* -%{tde_datadir}/apps/kdepimwidgets -%{tde_datadir}/apps/libkdepim -%{tde_datadir}/apps/kdepim -%{tde_datadir}/config.kcfg/pimemoticons.kcfg -%{tde_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/button_more.png - -%post -n trinity-libtdepim -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -%postun -n trinity-libtdepim -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -########## - -%package -n trinity-libtdepim-devel -Summary: Trinity PIM library [development] -Group: Development/Libraries/Other -Requires: trinity-libtdepim = %{version}-%{release} -Requires: trinity-tdelibs-devel >= %{version} - -Obsoletes: libtdepim-devel < %{version}-%{release} -Provides: libtdepim-devel = %{version}-%{release} - -%description -n trinity-libtdepim-devel -This is the development package which contains the headers for the libtdepim-trinity -library. - -%files -n trinity-libtdepim-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kdepimmacros.h -%{tde_libdir}/libkdepim.la -%{tde_libdir}/libkdepim.so - -%post -n trinity-libtdepim-devel -/sbin/ldconfig || : - -%postun -n trinity-libtdepim-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-libkgantt -Summary: Trinity gantt charting library -Group: Environment/Libraries - -%description -n trinity-libkgantt -This is the runtime package for programs that use the libkgantt-trinity library. - -%files -n trinity-libkgantt -%defattr(-,root,root,-) -%{tde_libdir}/libkgantt.so.* -%{tde_datadir}/apps/kgantt - -%post -n trinity-libkgantt -/sbin/ldconfig || : - -%postun -n trinity-libkgantt -/sbin/ldconfig || : - -########## - -%package -n trinity-libkgantt-devel -Summary: Trinity gantt charting library [development] -Group: Development/Libraries/Other -Requires: trinity-libkgantt = %{version}-%{release} -Requires: trinity-libtdepim-devel = %{version}-%{release} - -%description -n trinity-libkgantt-devel -This is the development package which contains the headers for the libkgantt-trinity -library. - -%files -n trinity-libkgantt-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kgantt -%{tde_libdir}/libkgantt.la -%{tde_libdir}/libkgantt.so - -%post -n trinity-libkgantt-devel -/sbin/ldconfig || : - -%postun -n trinity-libkgantt-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-libkleopatra -Summary: TDE GnuPG interface libraries -Group: Environment/Libraries -Requires: gnupg - -%description -n trinity-libkleopatra -This library is used by several TDE applications to interface to the -GnuPG program. - -This is the runtime package for programs that use the libkleopatra-trinity library. - -%files -n trinity-libkleopatra -%defattr(-,root,root,-) -%{tde_datadir}/config/libkleopatrarc -%{tde_libdir}/libgpgme++.so.* -%{tde_libdir}/libkleopatra.so.* -%{tde_libdir}/libkpgp.so.* -%{tde_libdir}/libqgpgme.so.* -%{tde_datadir}/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl -%{tde_datadir}/apps/kconf_update/kpgp.upd -%{tde_datadir}/apps/libkleopatra/ -%{tde_datadir}/icons/crystalsvg/*/apps/gpg.png -%{tde_datadir}/icons/crystalsvg/*/apps/gpgsm.png - -%post -n trinity-libkleopatra -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -%postun -n trinity-libkleopatra -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -/sbin/ldconfig || : - -########## - -%package -n trinity-libkleopatra-devel -Summary: Trinity GnuPG interface libraries [development] -Group: Development/Libraries/Other -Requires: trinity-libkleopatra = %{version}-%{release} -Requires: trinity-libtdepim-devel = %{version}-%{release} - -%description -n trinity-libkleopatra-devel -This library is used by several TDE applications to interface to the -GnuPG program. - -This is the development package which contains the headers for the -libkleopatra-trinity library. - -%files -n trinity-libkleopatra-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/gpgme++/ -%{tde_tdeincludedir}/kleo/ -%{tde_tdeincludedir}/qgpgme/ -%{tde_libdir}/libgpgme++.la -%{tde_libdir}/libgpgme++.so -%{tde_libdir}/libkleopatra.la -%{tde_libdir}/libkleopatra.so -%{tde_libdir}/libkpgp.la -%{tde_libdir}/libkpgp.so -%{tde_libdir}/libqgpgme.la -%{tde_libdir}/libqgpgme.so - -%post -n trinity-libkleopatra-devel -/sbin/ldconfig || : - -%postun -n trinity-libkleopatra-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-libkmime -Summary: Trinity MIME interface library -Group: Environment/Libraries -#Conflicts: trinity-libmimelib - -%description -n trinity-libkmime -This library provides a C++ interface to MIME messages, parsing them into -an object tree. - -%files -n trinity-libkmime -%defattr(-,root,root,-) -%{tde_libdir}/libkmime.so.* - -%post -n trinity-libkmime -/sbin/ldconfig || : - -%postun -n trinity-libkmime -/sbin/ldconfig || : - -########## - -%package -n trinity-libkmime-devel -Summary: Development files for libkmime -Group: Development/Libraries/Other -Requires: trinity-libkmime = %{version}-%{release} - -%description -n trinity-libkmime-devel -%{summary} - -%files -n trinity-libkmime-devel -%defattr(-,root,root,-) -%{tde_libdir}/libkmime.la -%{tde_libdir}/libkmime.so - -%post -n trinity-libkmime-devel -/sbin/ldconfig || : - -%postun -n trinity-libkmime-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-libkpimexchange -Summary: Trinity PIM Exchange library -Group: Development/Libraries/Other - -%description -n trinity-libkpimexchange -This is the runtime package for programs that use the libkpimexchange-trinity -library. - -%files -n trinity-libkpimexchange -%defattr(-,root,root,-) -%{tde_tdelibdir}/resourcecalendarexchange.la -%{tde_tdelibdir}/resourcecalendarexchange.so -%{tde_libdir}/libkpimexchange.so.* - -%post -n trinity-libkpimexchange -/sbin/ldconfig || : - -%postun -n trinity-libkpimexchange -/sbin/ldconfig || : - -########## - -%package -n trinity-libkpimexchange-devel -Summary: Trinity PIM Exchange library [development] -Group: Development/Libraries/Other -Requires: trinity-libkpimexchange = %{version}-%{release} -Requires: trinity-libkcal-devel = %{version}-%{release} -Requires: trinity-libtdepim-devel = %{version}-%{release} - -%description -n trinity-libkpimexchange-devel -This is the development package which contains the headers for the -libkpimexchange-trinity library. - -%files -n trinity-libkpimexchange-devel -%defattr(-,root,root,-) -%dir %{tde_tdeincludedir}/kdepim -%{tde_tdeincludedir}/kdepim/exchangeaccount.h -%{tde_tdeincludedir}/kdepim/exchangeclient.h -%{tde_libdir}/libkpimexchange.la -%{tde_libdir}/libkpimexchange.so - -%post -n trinity-libkpimexchange-devel -/sbin/ldconfig || : - -%postun -n trinity-libkpimexchange-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-libkpimidentities -Summary: Trinity PIM user identity information library -Group: Environment/Libraries - -%description -n trinity-libkpimidentities -This library provides information to TDE programs about user identity, -such as email address, organization, etc. - -This is the runtime package for programs that use the libkpimidentities-trinity -library. - -%files -n trinity-libkpimidentities -%defattr(-,root,root,-) -%{tde_libdir}/libkpimidentities.so.* - -%post -n trinity-libkpimidentities -/sbin/ldconfig || : - -%postun -n trinity-libkpimidentities -/sbin/ldconfig || : - -########## - -%package -n trinity-libkpimidentities-devel -Summary: Development files for libkpimidentities -Group: Development/Libraries/Other -Requires: trinity-libkpimidentities = %{version}-%{release} - -%description -n trinity-libkpimidentities-devel -%{summary} - -%files -n trinity-libkpimidentities-devel -%defattr(-,root,root,-) -%{tde_libdir}/libkpimidentities.la -%{tde_libdir}/libkpimidentities.so - -%post -n trinity-libkpimidentities-devel -/sbin/ldconfig || : - -%postun -n trinity-libkpimidentities-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-libksieve -Summary: Trinity mail/news message filtering library -Group: Environment/Libraries - -%description -n trinity-libksieve -This is the runtime package for programs that use the libksieve-trinity library. - -%files -n trinity-libksieve -%defattr(-,root,root,-) -%{tde_libdir}/libksieve.so.* - -%post -n trinity-libksieve -/sbin/ldconfig || : - -%postun -n trinity-libksieve -/sbin/ldconfig || : - -########## - -%package -n trinity-libksieve-devel -Summary: Trinity mail/news message filtering library [development] -Group: Development/Libraries/Other -Requires: trinity-libksieve = %{version}-%{release} -Requires: trinity-libtdepim-devel = %{version}-%{release} - -%description -n trinity-libksieve-devel -This is the development package which contains the headers for the libksieve-trinity -library. - -%files -n trinity-libksieve-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/ksieve -%{tde_libdir}/libksieve.la -%{tde_libdir}/libksieve.so - -%post -n trinity-libksieve-devel -/sbin/ldconfig || : - -%postun -n trinity-libksieve-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-libktnef -Summary: Library for handling KTNEF email attachments -Group: Environment/Libraries - -%description -n trinity-libktnef -This library handles mail attachments using the TNEF format. These -attachments are usually found in mails coming from Microsoft mail -servers and embed the mail properties as well as the actual -attachments. -. -This is the runtime library for packages using the ktnef-trinity library. - -%files -n trinity-libktnef -%defattr(-,root,root,-) -%{tde_libdir}/libktnef.so.* - -%post -n trinity-libktnef -/sbin/ldconfig || : - -%postun -n trinity-libktnef -/sbin/ldconfig || : - -########## - -%package -n trinity-libktnef-devel -Summary: KTNEF handler library [development] -Group: Development/Libraries/Other -Requires: trinity-libktnef = %{version}-%{release} -Requires: trinity-libtdepim-devel = %{version}-%{release} - -%description -n trinity-libktnef-devel -This library handles mail attachments using the TNEF format. These -attachments are usually found in mails coming from Microsoft mail -servers and embed the mail properties as well as the actual -attachments. - -This is the development package which contains the headers for the -ktnef-trinity library. - -%files -n trinity-libktnef-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/ktnef -%{tde_libdir}/libktnef.la -%{tde_libdir}/libktnef.so - -%post -n trinity-libktnef-devel -/sbin/ldconfig || : - -%postun -n trinity-libktnef-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-libmimelib -Summary: Trinity mime library -Group: Environment/Libraries - -%description -n trinity-libmimelib -This library is used by several Trinity applications to handle mime types. - -This is the runtime package for programs that use the libmimelib-trinity library. - -%files -n trinity-libmimelib -%defattr(-,root,root,-) -%{tde_libdir}/libmimelib.so.* - -%post -n trinity-libmimelib -/sbin/ldconfig || : - -%postun -n trinity-libmimelib -/sbin/ldconfig || : - -########## - -%package -n trinity-libmimelib-devel -Summary: Trinity mime library [development] -Group: Development/Libraries/Other -Requires: trinity-libmimelib = %{version}-%{release} - -%description -n trinity-libmimelib-devel -This library is used by several TDE applications to handle mime types. - -This is the development package which contains the headers for the -libmimelib library. - -%files -n trinity-libmimelib-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/mimelib/ -%{tde_libdir}/libmimelib.la -%{tde_libdir}/libmimelib.so - -%post -n trinity-libmimelib-devel -/sbin/ldconfig || : - -%postun -n trinity-libmimelib-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-kmobile -Summary: Synchronize and manage mobile phone with your PC. -Group: Applications/Communications - -%description -n trinity-kmobile -KMobileTools is a nice TDE-based application that allows to synchronize -and manage mobile phones with your PC. It handles full SMS control, -dialing calls, phonebook, and phone status monitoring. - -%files -n trinity-kmobile -%defattr(-,root,root,-) -%{tde_bindir}/kmobile -%{tde_datadir}/icons/default.kde/32x32/devices/mobile_camera.png -%{tde_datadir}/icons/default.kde/32x32/devices/mobile_musicplayer.png -%{tde_datadir}/icons/default.kde/32x32/devices/mobile_organizer.png -%{tde_datadir}/icons/default.kde/32x32/devices/mobile_phone.png -%{tde_datadir}/icons/default.kde/32x32/devices/mobile_unknown.png -%{tde_datadir}/icons/hicolor/*/apps/kmobile.png -%{tde_datadir}/services/libkmobile_digicam.desktop -%{tde_datadir}/services/libkmobile_gammu.desktop -%{tde_datadir}/services/libkmobile_skeleton.desktop -%{tde_datadir}/servicetypes/libkmobile.desktop -%{tde_datadir}/apps/kmobile/ -%{tde_tdeappdir}/kmobile.desktop -%{tde_tdelibdir}/libkmobile_skeleton.la -%{tde_tdelibdir}/libkmobile_skeleton.so -%{tde_libdir}/libkmobileclient.la -%{tde_libdir}/libkmobileclient.so -%{tde_libdir}/libkmobiledevice.la -%{tde_libdir}/libkmobiledevice.so - -%post -n trinity-kmobile -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kmobile -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - -# Fix 'ical2vcal' contains '/bin/perl' instead of '/usr/bin/perl' -if [ -x /usr/bin/perl ]; then - %__sed -i "korganizer/ical2vcal.in" -e "s|@PERL@|/usr/bin/perl|" -fi - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Specific path for RHEL4 -if [ -d "/usr/X11R6" ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_NO_BUILTIN_CHRPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \ - \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DWITH_ARTS=ON \ - -DWITH_SASL=ON \ - -DWITH_NEWDISTRLISTS=ON \ - %{?with_gnokii:-DWITH_GNOKII=ON} \ - -DWITH_EXCHANGE=ON \ - -DWITH_EGROUPWARE=ON \ - -DWITH_KOLAB=ON \ - -DWITH_SLOX=ON \ - -DWITH_GROUPWISE=ON \ - -DWITH_FEATUREPLAN=ON \ - -DWITH_GROUPDAV=ON \ - -DWITH_BIRTHDAYS=ON \ - -DWITH_NEWEXCHANGE=ON \ - -DWITH_SCALIX=ON \ - -DWITH_CALDAV=ON \ - -DWITH_CARDDAV=ON \ - -DWITH_INDEXLIB=ON \ - %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \ - %{?with_kitchensync:-DBUILD_KITCHENSYNC=ON} \ - -DBUILD_ALL=ON \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} -C build - -# Updates applications categories for openSUSE -%if 0%{?suse_version} -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/akregator.desktop Network RSS-News -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/groupwarewizard.desktop Utility DesktopSettings X-TDE-Utilities-PIM -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kaddressbook.desktop -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kalarm.desktop Utility TimeUtility X-TDE-Utilities-PIM -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/kandy.desktop Utility Telephony X-TDE-Utilities-Peripherals -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/karm.desktop Utility TimeUtility X-TDE-Utilities-PIM -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/KNode.desktop -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/knotes.desktop Utility DesktopUtility X-TDE-Utilities-Desktop -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/KMail.desktop -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/Kontact.desktop Office Core-Office -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/korganizer.desktop Office Calendar -%suse_update_desktop_file -r %{?buildroot}%{tde_tdeappdir}/KOrn.desktop Utility Applet X-TDE-More -%suse_update_desktop_file -u %{?buildroot}%{tde_tdeappdir}/ktnef.desktop Network Email -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kmobile.desktop Utility Telephony X-TDE-Utilities-Peripherals -%if 0%{?with_kitchensync} -%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kitchensync.desktop Utility X-SuSE-SyncUtility -%endif -%endif - -# Adds missing icons in 'hicolor' theme -pushd "%{?buildroot}%{tde_datadir}/icons" -for i in {16,32,48}; do %__cp crystalsvg/"$i"x"$i"/apps/kandy.png hicolor/"$i"x"$i"/apps/kandy.png ;done -for i in {16,22,32,48,64,128}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/filesystems/network.png hicolor/"$i"x"$i"/apps/kleopatra.png ;done -popd - -# Links duplicate files -%fdupes "%{?buildroot}%{tde_datadir}" - - -%clean -%__rm -rf %{?buildroot} - - -%changelog diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec index c5341e7c5..56eb5c18a 100644 --- a/redhat/main/tdepim/tdepim.spec +++ b/redhat/main/tdepim/tdepim.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdepim %define tde_prefix /opt/trinity @@ -37,17 +37,9 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity - -# KDEPIM specific features -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_gnokii 1 -BuildRequires: gnokii-devel -%endif - # TDEPIM optional features #define with_kitchensync 1 - Name: trinity-%{tde_pkg} Summary: Personal Information Management apps from the official Trinity release Version: %{tde_version} @@ -110,11 +102,23 @@ BuildRequires: brp-check-trinity BuildRequires: gamin-devel %endif +# KDEPIM specific features +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200 +%define with_gnokii 1 +BuildRequires: gnokii-devel +%endif +%endif + + # FLEX support %if 0%{?fedora} >= 15 BuildRequires: flex-static %endif +# BISON support +BuildRequires: bison + # CURL support BuildRequires: curl-devel @@ -144,7 +148,7 @@ BuildRequires: libXcomposite-devel # RHEL 4: disabled # RHEL 6: available in EPEL # RHEL 7: available in NUX -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 @@ -891,8 +895,8 @@ mbox files, and/or trinity-tdebase-tdeio-plugins if you want to use POP3. %files -n trinity-kmail %defattr(-,root,root,-) -%{tde_confdir}/kmail.antispamrc -%{tde_confdir}/kmail.antivirusrc +%config(noreplace) %{tde_confdir}/kmail.antispamrc +%config(noreplace) %{tde_confdir}/kmail.antivirusrc %{tde_bindir}/kmail %{tde_bindir}/kmail_*.sh %{tde_tdelibdir}/kcm_kmail.la @@ -1527,7 +1531,7 @@ This is the runtime package for programs that use the libkleopatra-trinity libra %files -n trinity-libkleopatra %defattr(-,root,root,-) -%{tde_confdir}/libkleopatrarc +%config(noreplace) %{tde_confdir}/libkleopatrarc %{tde_libdir}/libgpgme++.so.* %{tde_libdir}/libkleopatra.so.* %{tde_libdir}/libkpgp.so.* diff --git a/redhat/main/tdesdk/tdesdk-3.5.13.2.spec b/redhat/main/tdesdk/tdesdk-3.5.13.2.spec deleted file mode 100644 index 33bcb9f87..000000000 --- a/redhat/main/tdesdk/tdesdk-3.5.13.2.spec +++ /dev/null @@ -1,1250 +0,0 @@ -# -# spec file for package tdesdk (version 3.5.13-SRU) -# -# 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/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg tdesdk -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - - -Name: trinity-%{tde_pkg} -Summary: The Trinity Software Development Kit (SDK) -Group: Development/Tools/Other -Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -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}-%{version}%{?preversion:~%{preversion}}.tar.gz - -%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch} - -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-perl-dcop >= %{tde_version} -BuildRequires: trinity-tdepim-devel >= %{tde_version} - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: fdupes - -# 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 - -# IDN support -BuildRequires: libidn-devel - -# GAMIN support -# Not on openSUSE. -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_gamin 1 -BuildRequires: gamin-devel -%endif - -# PCRE support -BuildRequires: pcre-devel - -# for kbugbuster/libkcal -BuildRequires: desktop-file-utils - -# DB4 support -%if 0%{?mgaversion} || 0%{?mdkversion} -#BuildRequires: %{_lib}db4.8-devel -%endif -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: db4-devel -%endif -%if 0%{?suse_version} -BuildRequires: libdb-4_8-devel -%endif - -# kbabel, F-7+: flex >= 2.5.33-9 -BuildRequires: flex -# umbrello -BuildRequires: libxslt-devel -BuildRequires: libxml2-devel -BuildRequires: subversion-devel -BuildRequires: neon-devel - -# PERL support -BuildRequires: perl -%if 0%{?fedora} >= 19 -BuildRequires: perl-podlators -%endif - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}ltdl-devel -BuildRequires: %{_lib}binutils-devel -%endif -%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 || 0%{?suse_version} -BuildRequires: binutils-devel -%endif -%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1220 -BuildRequires: libtool-ltdl-devel -%endif - -# KIOSLAVE -# Does not build on RHEL4 -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} -%define build_kioslave 1 -%endif - -Obsoletes: trinity-kdesdk < %{version}-%{release} -Provides: trinity-kdesdk = %{version}-%{release} -Obsoletes: trinity-kdesdk-libs < %{version}-%{release} -Provides: trinity-kdesdk-libs = %{version}-%{release} - -Requires: trinity-cervisia = %{version}-%{release} -Requires: trinity-kapptemplate = %{version}-%{release} -Requires: trinity-kbabel = %{version}-%{release} -Requires: trinity-kbugbuster = %{version}-%{release} -Requires: trinity-tdecachegrind = %{version}-%{release} -Requires: trinity-tdecachegrind-converters = %{version}-%{release} -Requires: %{name}-kfile-plugins = %{version}-%{release} -Requires: %{name}-misc = %{version}-%{release} -Requires: %{name}-scripts = %{version}-%{release} -Requires: trinity-kmtrace = %{version}-%{release} -Requires: trinity-kompare = %{version}-%{release} -Requires: trinity-kspy = %{version}-%{release} -Requires: trinity-kuiviewer = %{version}-%{release} -Requires: trinity-libcvsservice0 = %{version}-%{release} -Requires: trinity-poxml = %{version}-%{release} -Requires: trinity-umbrello = %{version}-%{release} -%{?build_kioslave:Requires: %{name}-tdeio-plugins = %{version}-%{release}} -Requires: trinity-tdeunittest = %{version}-%{release} - - -%description -A collection of applications and tools used by developers, including: -* cervisia: a CVS frontend -* kbabel: PO file management -* kbugbuster: a tool to manage the TDE bug report system -* tdecachegrind: a browser for data produced by profiling tools (e.g. cachegrind) -* kompare: diff tool -* kuiviewer: displays designer's UI files -* umbrello: UML modeller and UML diagram tool - -%files -%defattr(-,root,root,-) - -########## - -%package -n trinity-cervisia -Summary: A graphical CVS front end for Trinity -Group: Development/Tools/Version Control - -%description -n trinity-cervisia -Cervisia is a TDE-based graphical front end for the CVS client. - -As well as providing both common and advanced CVS operations, it offers -a variety of methods for graphically viewing information about the CVS -repository, your own sandbox and the relationships between different -versions of files. A Changelog editor is also included and is coupled -with the commit dialog. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-cervisia -%defattr(-,root,root,-) -%{tde_bindir}/cervisia -%{tde_libdir}/libkdeinit_cervisia.la -%{tde_libdir}/libkdeinit_cervisia.so -%{tde_tdelibdir}/cervisia.la -%{tde_tdelibdir}/cervisia.so -%{tde_tdelibdir}/libcervisiapart.la -%{tde_tdelibdir}/libcervisiapart.so -%{tde_tdeappdir}/cervisia.desktop -%{tde_datadir}/apps/cervisia/ -%{tde_datadir}/apps/cervisiapart/ -%{tde_datadir}/apps/kconf_update/cervisia.upd -%{tde_datadir}/apps/kconf_update/cervisia-change_repos_list.pl -%{tde_datadir}/apps/kconf_update/cervisia-normalize_cvsroot.pl -%{tde_datadir}/apps/kconf_update/move_repositories.pl -%{tde_datadir}/apps/kconf_update/change_colors.pl -%{tde_datadir}/config.kcfg/cervisiapart.kcfg -%{tde_datadir}/icons/hicolor/*/apps/cervisia.png -%{tde_datadir}/icons/crystalsvg/*/actions/vcs_*.png -%{tde_datadir}/icons/crystalsvg/scalable/actions/vcs_*.svgz -%{tde_mandir}/man1/cervisia.1* -%{tde_tdedocdir}/HTML/en/cervisia/ - -%post -n trinity-cervisia -/sbin/ldconfig || : -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-cervisia -/sbin/ldconfig || : -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kapptemplate -Summary: Creates a framework to develop a Trinity application -Group: Development/Languages/Other - -%description -n trinity-kapptemplate -KAppTemplate is a shell script that will create the necessary -framework to develop various TDE applications. It takes care of the -autoconf/automake code as well as providing a skeleton and example of -what the code typically looks like. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-kapptemplate -%defattr(-,root,root,-) -%{tde_bindir}/kapptemplate -%{tde_datadir}/apps/kapptemplate/ - -%pre -n trinity-kapptemplate -if [ -d "%{tde_bindir}/kapptemplate" ]; then - rm -rf "%{tde_bindir}/kapptemplate" -fi - -########## - -%package -n trinity-kbabel -Summary: PO-file editing suite for Trinity -Group: Development/Languages/Other - -%description -n trinity-kbabel -This is a suite of programs for editing gettext message files (PO-files). -It is designed to help you translate fast and consistently. - -This suite includes KBabel, CatalogManager and KBabelDict. KBabel is an -advanced and easy to use PO-file editor with full navigational and editing -capabilities, syntax checking and statistics. CatalogManager is a multi -functional catalog manager which allows you to keep track of many -PO-files at once. KBabelDict is a dictionary to assist with searching -for common translations. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-kbabel -%defattr(-,root,root,-) -%{tde_bindir}/catalogmanager -%{tde_bindir}/kbabel -%{tde_bindir}/kbabeldict -%{tde_libdir}/libkbabelcommon.so.* -%{tde_libdir}/libkbabeldictplugin.so.* -%{tde_tdelibdir}/kfile_po.la -%{tde_tdelibdir}/kfile_po.so -%{tde_tdelibdir}/pothumbnail.la -%{tde_tdelibdir}/pothumbnail.so -%{tde_tdelibdir}/kbabel_accelstool.la -%{tde_tdelibdir}/kbabel_accelstool.so -%{tde_tdelibdir}/kbabel_argstool.la -%{tde_tdelibdir}/kbabel_argstool.so -%{tde_tdelibdir}/kbabel_contexttool.la -%{tde_tdelibdir}/kbabel_contexttool.so -%{tde_tdelibdir}/kbabel_equationstool.la -%{tde_tdelibdir}/kbabel_equationstool.so -%{tde_tdelibdir}/kbabel_gettextexport.la -%{tde_tdelibdir}/kbabel_gettextexport.so -%{tde_tdelibdir}/kbabel_gettextimport.la -%{tde_tdelibdir}/kbabel_gettextimport.so -%{tde_tdelibdir}/kbabel_lengthtool.la -%{tde_tdelibdir}/kbabel_lengthtool.so -%{tde_tdelibdir}/kbabel_linguistexport.la -%{tde_tdelibdir}/kbabel_linguistexport.so -%{tde_tdelibdir}/kbabel_linguistimport.la -%{tde_tdelibdir}/kbabel_linguistimport.so -%{tde_tdelibdir}/kbabel_nottranslatedtool.la -%{tde_tdelibdir}/kbabel_nottranslatedtool.so -%{tde_tdelibdir}/kbabel_pluraltool.la -%{tde_tdelibdir}/kbabel_pluraltool.so -%{tde_tdelibdir}/kbabel_punctuationtool.la -%{tde_tdelibdir}/kbabel_punctuationtool.so -%{tde_tdelibdir}/kbabel_regexptool.la -%{tde_tdelibdir}/kbabel_regexptool.so -%{tde_tdelibdir}/kbabel_setfuzzytool.la -%{tde_tdelibdir}/kbabel_setfuzzytool.so -%{tde_tdelibdir}/kbabel_whitespacetool.la -%{tde_tdelibdir}/kbabel_whitespacetool.so -%{tde_tdelibdir}/kbabel_xliffexport.la -%{tde_tdelibdir}/kbabel_xliffexport.so -%{tde_tdelibdir}/kbabel_xliffimport.la -%{tde_tdelibdir}/kbabel_xliffimport.so -%{tde_tdelibdir}/kbabel_xmltool.la -%{tde_tdelibdir}/kbabel_xmltool.so -%{tde_tdelibdir}/kbabeldict_dbsearchengine.la -%{tde_tdelibdir}/kbabeldict_dbsearchengine.so -%{tde_tdelibdir}/kbabeldict_poauxiliary.la -%{tde_tdelibdir}/kbabeldict_poauxiliary.so -%{tde_tdelibdir}/kbabeldict_pocompendium.la -%{tde_tdelibdir}/kbabeldict_pocompendium.so -%{tde_tdelibdir}/kbabeldict_tmxcompendium.la -%{tde_tdelibdir}/kbabeldict_tmxcompendium.so -%{tde_tdeappdir}/catalogmanager.desktop -%{tde_tdeappdir}/kbabel.desktop -%{tde_tdeappdir}/kbabeldict.desktop -%{tde_datadir}/apps/catalogmanager/ -%{tde_datadir}/apps/kbabel/ -%{tde_datadir}/apps/kconf_update/kbabel-difftoproject.upd -%{tde_datadir}/apps/kconf_update/kbabel-project.upd -%{tde_datadir}/apps/kconf_update/kbabel-projectrename.upd -%{tde_datadir}/config.kcfg/kbabel.kcfg -%{tde_datadir}/config.kcfg/kbprojectsettings.kcfg -%{tde_tdedocdir}/HTML/en/kbabel/ -%{tde_datadir}/icons/hicolor/*/apps/catalogmanager.png -%{tde_datadir}/icons/hicolor/*/apps/kbabel.png -%{tde_datadir}/icons/hicolor/*/apps/kbabeldict.png -%{tde_datadir}/icons/locolor/*/apps/catalogmanager.png -%{tde_datadir}/icons/locolor/*/apps/kbabel.png -%{tde_datadir}/icons/locolor/*/apps/kbabeldict.png -%{tde_datadir}/services/dbsearchengine.desktop -%{tde_datadir}/services/kfile_po.desktop -%{tde_datadir}/services/pothumbnail.desktop -%{tde_datadir}/services/kbabel_accelstool.desktop -%{tde_datadir}/services/kbabel_argstool.desktop -%{tde_datadir}/services/kbabel_contexttool.desktop -%{tde_datadir}/services/kbabel_equationstool.desktop -%{tde_datadir}/services/kbabel_gettext_export.desktop -%{tde_datadir}/services/kbabel_gettext_import.desktop -%{tde_datadir}/services/kbabel_lengthtool.desktop -%{tde_datadir}/services/kbabel_linguist_export.desktop -%{tde_datadir}/services/kbabel_linguist_import.desktop -%{tde_datadir}/services/kbabel_nottranslatedtool.desktop -%{tde_datadir}/services/kbabel_pluralformstool.desktop -%{tde_datadir}/services/kbabel_punctuationtool.desktop -%{tde_datadir}/services/kbabel_regexptool.desktop -%{tde_datadir}/services/kbabel_setfuzzytool.desktop -%{tde_datadir}/services/kbabel_whitespacetool.desktop -%{tde_datadir}/services/kbabel_xliff_export.desktop -%{tde_datadir}/services/kbabel_xliff_import.desktop -%{tde_datadir}/services/kbabel_xmltool.desktop -%{tde_datadir}/services/pocompendium.desktop -%{tde_datadir}/services/poauxiliary.desktop -%{tde_datadir}/services/tmxcompendium.desktop -%{tde_datadir}/servicetypes/kbabel_tool.desktop -%{tde_datadir}/servicetypes/kbabel_validator.desktop -%{tde_datadir}/servicetypes/kbabeldict_module.desktop -%{tde_datadir}/servicetypes/kbabelfilter.desktop - -%post -n trinity-kbabel -/sbin/ldconfig || : -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kbabel -/sbin/ldconfig || : -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kbabel-devel -Summary: PO-file editing suite for Trinity (development files) -Group: Development/Libraries/Other -Requires: trinity-kbabel = %{version}-%{release} - -%description -n trinity-kbabel-devel -This is a suite of programs for editing gettext message files (PO-files). -It is designed to help you translate fast and consistently. - -This suite includes KBabel, CatalogManager and KBabelDict. KBabel is an -advanced and easy to use PO-file editor with full navigational and editing -capabilities, syntax checking and statistics. CatalogManager is a multi -functional catalog manager which allows you to keep track of many -PO-files at once. KBabelDict is a dictionary to assist with searching -for common translations. - -This package contains the KBabel development files. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-kbabel-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/kbabel/ -%{tde_libdir}/libkbabelcommon.la -%{tde_libdir}/libkbabelcommon.so -%{tde_libdir}/libkbabeldictplugin.la -%{tde_libdir}/libkbabeldictplugin.so - -%post -n trinity-kbabel-devel -/sbin/ldconfig || : - -%postun -n trinity-kbabel-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-kbugbuster -Summary: A front end for the Trinity bug tracking system -Group: Development/Languages/Other -Requires: trinity-libkcal >= %{tde_version} - -%description -n trinity-kbugbuster -KBugBuster is a GUI front end for the TDE bug tracking system. -It allows the user to view and manipulate bug reports and provides a -variety of options for searching through reports. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-kbugbuster -%defattr(-,root,root,-) -%{tde_bindir}/kbugbuster -%{tde_tdelibdir}/kcal_bugzilla.la -%{tde_tdelibdir}/kcal_bugzilla.so -%{tde_tdeappdir}/kbugbuster.desktop -%{tde_datadir}/apps/kbugbuster/ -%{tde_datadir}/icons/hicolor/*/apps/kbugbuster.png -%{tde_datadir}/icons/locolor/*/apps/kbugbuster.png -%{tde_datadir}/services/kresources/kcal/bugzilla.desktop -%{tde_tdedocdir}/HTML/en/kbugbuster/ - -%post -n trinity-kbugbuster -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kbugbuster -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-tdecachegrind -Summary: Visualisation tool for valgrind profiling output -Group: Development/Languages/Other - -%description -n trinity-tdecachegrind -tdecachegrind is a visualisation tool for the profiling data generated -by calltree, a profiling skin for valgrind. Applications can be -profiled using calltree without being recompiled, and shared libraries -and plugin architectures are supported. - -For visualising the output from other profiling tools, several converters -can be found in the tdecachegrind-converters package. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-tdecachegrind -%defattr(-,root,root,-) -%{tde_bindir}/kcachegrind -%{tde_tdeappdir}/kcachegrind.desktop -%{tde_datadir}/apps/kcachegrind/ -%{tde_datadir}/icons/locolor/*/apps/kcachegrind.png -%{tde_datadir}/icons/hicolor/*/apps/kcachegrind.png -%{tde_datadir}/mimelnk/application/x-kcachegrind.desktop -%{tde_tdedocdir}/HTML/en/kcachegrind/ - -%post -n trinity-tdecachegrind -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-tdecachegrind -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-tdecachegrind-converters -Summary: Format converters for tdecachegrind profiling visualisation tool -Group: Development/Languages/Other -Requires: python -%if 0%{?suse_version} || 0%{?rhel} == 4 -Requires: php -%else -Requires: php-cli -%endif - -%description -n trinity-tdecachegrind-converters -This is a collection of scripts for converting the output from -different profiling tools into a format that tdecachegrind can use. - -tdecachegrind is a visualisation tool for the profiling data generated -by calltree, a profiling skin for valgrind. Applications can be -profiled using calltree without being recompiled, and shared libraries -and plugin architectures are supported. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-tdecachegrind-converters -%defattr(-,root,root,-) -%{tde_bindir}/dprof2calltree -%{tde_bindir}/hotshot2calltree -%{tde_bindir}/memprof2calltree -%{tde_bindir}/op2calltree -%{tde_bindir}/pprof2calltree - -########## - -%package kfile-plugins -Summary: Trinity file dialog plugins for software development files -Group: Development/Languages/Other - -%description kfile-plugins -This is a collection of plugins for the TDE file dialog. These plugins -extend the file dialog to offer advanced meta-information for source files, -patch files and Qt Linguist data. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files kfile-plugins -%defattr(-,root,root,-) -%{tde_tdelibdir}/kfile_cpp.so -%{tde_tdelibdir}/kfile_cpp.la -%{tde_tdelibdir}/kfile_diff.so -%{tde_tdelibdir}/kfile_diff.la -%{tde_tdelibdir}/kfile_ts.so -%{tde_tdelibdir}/kfile_ts.la -%{tde_datadir}/services/kfile_cpp.desktop -%{tde_datadir}/services/kfile_diff.desktop -%{tde_datadir}/services/kfile_h.desktop -%{tde_datadir}/services/kfile_ts.desktop - -########## - -%package misc -Summary: Various goodies from the Trinity Software Development Kit -Group: Development/Languages/Other - -%description misc -This package contains miscellaneous goodies provided with the official -TDE release to assist with TDE software development. - -Included are: -- headers to assist with profiling TDE code; -- a widget style for checking conformity with the TDE/Qt style guide; -- palettes that match the KDE standard colour palette; -- a TDE address book plugin that reads the list of TDE CVS accounts. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files misc -%defattr(-,root,root,-) -%{tde_tdelibdir}/kabcformat_kdeaccounts.la -%{tde_tdelibdir}/kabcformat_kdeaccounts.so -%{tde_tdelibdir}/plugins/styles/scheck.so -%{tde_tdelibdir}/plugins/styles/scheck.la -%{tde_datadir}/apps/kabc/formats/kdeaccountsplugin.desktop -%{tde_datadir}/apps/kstyle/themes/scheck.themerc -%{tde_datadir}/kdepalettes/ - -%{tde_libdir}/libkstartperf.so.* -%{tde_libdir}/libkstartperf.la -%{tde_bindir}/kstartperf - -%post misc -/sbin/ldconfig || : - -%postun misc -/sbin/ldconfig || : - -########## - -%package scripts -Summary: a set of useful development scripts for Trinity -Group: Development/Languages/Other -Requires: python - -%description scripts -This package contains a number of scripts which can be used to help in -developing TDE-based applications. Many of these scripts however are -not specific to TDE, and in particular there are several general-use -scripts to help users in working with SVN and CVS repositories. - -In addition to these scripts, this package provides: -- gdb macros for Qt/TDE programming; -- vim and emacs helper files for Qt/TDE programming; -- bash and zsh completion controls for TDE apps; -- valgrind error suppressions for TDE apps. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files scripts -%defattr(-,root,root,-) -%{tde_bindir}/adddebug -%{tde_bindir}/build-progress.sh -%{tde_bindir}/cheatmake -%{tde_bindir}/create_cvsignore -%{tde_bindir}/create_makefile -%{tde_bindir}/create_makefiles -%{tde_bindir}/cvs-clean -%{tde_bindir}/cvs2dist -%{tde_bindir}/cvsbackport -%{tde_bindir}/cvsblame -%{tde_bindir}/cvscheck -%{tde_bindir}/cvsforwardport -%{tde_bindir}/cvslastchange -%{tde_bindir}/cvslastlog -%{tde_bindir}/cvsrevertlast -%{tde_bindir}/cvsversion -%{tde_bindir}/cxxmetric -%{tde_bindir}/extend_dmalloc -%{tde_bindir}/extractattr -%{tde_bindir}/extractrc -%{tde_bindir}/findmissingcrystal -%{tde_bindir}/fixkdeincludes -%{tde_bindir}/fixuifiles -%{tde_bindir}/includemocs -%{tde_bindir}/kde-build -%{tde_bindir}/kdedoc -%{tde_bindir}/kdekillall -%{tde_bindir}/kdelnk2desktop.py* -%{tde_bindir}/kdemangen.pl -%{tde_bindir}/makeobj -%{tde_bindir}/noncvslist -%{tde_bindir}/package_crystalsvg -%{tde_bindir}/png2mng.pl -%{tde_bindir}/pruneemptydirs -%{tde_bindir}/qtdoc -%{tde_bindir}/zonetab2pot.py* -%{tde_bindir}/svn2dist -%{tde_bindir}/svnrevertlast -%{tde_bindir}/svnforwardport -%{tde_bindir}/nonsvnlist -%{tde_bindir}/kdesvn-build -%{tde_bindir}/svnlastlog -%{tde_bindir}/svnversions -%{tde_bindir}/create_svnignore -%{tde_bindir}/svnlastchange -%{tde_bindir}/colorsvn -%{tde_bindir}/svnaddcurrentdir -%{tde_bindir}/svnbackport -%{tde_bindir}/svngettags -%{tde_bindir}/svnchangesince -%{tde_bindir}/svn-clean -%{tde_datadir}/apps/katepart/syntax/kdesvn-buildrc.xml -%{tde_mandir}/man1/cvsblame.1 -%{tde_mandir}/man1/cvscheck.1 -%{tde_mandir}/man1/cvsversion.1 -%{tde_mandir}/man1/kde-build.1 -%{tde_mandir}/man1/includemocs.1 -%{tde_mandir}/man1/noncvslist.1 -%{tde_mandir}/man1/kdesvn-build.1 -%{tde_tdedocdir}/HTML/en/kdesvn-build/ -#scripts/kde-devel-gdb /opt/trinity/share/tdesdk-scripts -#scripts/kde-devel-vim.vim /opt/trinity/share/tdesdk-scripts -#scripts/kde-emacs/*.el /opt/trinity/share/emacs/site-lisp/tdesdk-scripts -#scripts/kde.supp /opt/trinity/lib/valgrind -#scripts/completions /opt/trinity/share/tdesdk-scripts - -#debian/desktop-i18n/createdesktop.pl /opt/trinity/lib/kubuntu-desktop-i18n/ -#debian/desktop-i18n/findfiles /opt/trinity/lib/kubuntu-desktop-i18n/ -#debian/desktop-i18n/msgsplit /opt/trinity/lib/kubuntu-desktop-i18n/ - -%if "%{?tde_prefix}" != "/usr" -%{tde_bindir}/licensecheck -%else -%exclude %{tde_bindir}/licensecheck -%endif - -########## - -%package -n trinity-kmtrace -Summary: A Trinity memory leak tracer -Group: Development/Languages/Other -Requires: less - -%description -n trinity-kmtrace -KMtrace is a TDE tool to assist with malloc debugging using glibc's -"mtrace" functionality. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-kmtrace -%defattr(-,root,root,-) -%{tde_bindir}/demangle -%{tde_bindir}/kminspector -%{tde_bindir}/kmmatch -%{tde_bindir}/kmtrace -%dir %{tde_libdir}/kmtrace -%{tde_libdir}/kmtrace/libktrace.la -%{tde_libdir}/kmtrace/libktrace.so -%{tde_datadir}/apps/kmtrace/ - -########## - -%package -n trinity-kompare -Summary: A Trinity GUI for viewing differences between files -Group: Development/Languages/Other - -%description -n trinity-kompare -Kompare is a graphical user interface for viewing the differences between -files. It can compare two documents, create a diff file, display a diff -file and/or blend a diff file back into the original documents. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-kompare -%defattr(-,root,root,-) -%{tde_bindir}/kompare -%{tde_libdir}/libkompareinterface.la -%{tde_libdir}/libkompareinterface.so.* -%{tde_tdelibdir}/libkomparenavtreepart.la -%{tde_tdelibdir}/libkomparenavtreepart.so -%{tde_tdelibdir}/libkomparepart.la -%{tde_tdelibdir}/libkomparepart.so -%{tde_tdeappdir}/kompare.desktop -%{tde_datadir}/apps/kompare/ -%{tde_datadir}/services/komparenavtreepart.desktop -%{tde_datadir}/services/komparepart.desktop -%{tde_datadir}/servicetypes/komparenavigationpart.desktop -%{tde_datadir}/servicetypes/kompareviewpart.desktop -%{tde_datadir}/icons/hicolor/*/apps/kompare.png -%{tde_datadir}/icons/hicolor/scalable/apps/kompare.svgz -%{tde_tdedocdir}/HTML/en/kompare/ - -%post -n trinity-kompare -/sbin/ldconfig || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kompare -/sbin/ldconfig || : -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kspy -Summary: Examines the internal state of a Qt/TDE app -Group: Development/Languages/Other -Requires: trinity-tdelibs-devel - -%description -n trinity-kspy -KSpy is a tiny library which can be used to graphically display -the QObjects in use by a Qt/TDE app. In addition to the object tree, -you can also view the properties, signals and slots of any QObject. - -Basically it provides much the same info as QObject::dumpObjectTree() and -QObject::dumpObjectInfo(), but in a much more convenient form. KSpy has -minimal overhead for the application, because the kspy library is -loaded dynamically using KLibLoader. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-kspy -%defattr(-,root,root,-) -%{tde_libdir}/libkspy.la -%{tde_libdir}/libkspy.so.* - -%post -n trinity-kspy -/sbin/ldconfig || : - -%postun -n trinity-kspy -/sbin/ldconfig || : - -########## - -%package -n trinity-kuiviewer -Summary: Viewer for Qt Designer user interface files -Group: Development/Languages/Other - -%description -n trinity-kuiviewer -KUIViewer is a utility to display and test the user interface (.ui) files -generated by Qt Designer. The interfaces can be displayed in a variety of -different widget styles. - -The Qt Designer itself is in the package qt3-designer. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-kuiviewer -%defattr(-,root,root,-) -%{tde_bindir}/kuiviewer -%{tde_tdelibdir}/libkuiviewerpart.so -%{tde_tdelibdir}/libkuiviewerpart.la -%{tde_tdelibdir}/quithumbnail.so -%{tde_tdelibdir}/quithumbnail.la -%{tde_tdeappdir}/kuiviewer.desktop -%{tde_datadir}/apps/kuiviewer/ -%{tde_datadir}/apps/kuiviewerpart/ -%{tde_datadir}/icons/hicolor/*/apps/kuiviewer.png -%{tde_datadir}/icons/locolor/*/apps/kuiviewer.png -%{tde_datadir}/services/designerthumbnail.desktop -%{tde_datadir}/services/kuiviewer_part.desktop - -%post -n trinity-kuiviewer -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done - -%postun -n trinity-kuiviewer -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done - -########## - -%package -n trinity-libcvsservice0 -Summary: DCOP service for accessing CVS repositories -Group: Development/Languages/Other -Requires: cvs - -%description -n trinity-libcvsservice0 -This library provides a DCOP service for accessing and working with -remote CVS repositories. Applications may link with this library to -access the DCOP service directly from C++. Alternatively, scripts may -access the service using the standard "dcop" command-line tool. - -DCOP is the Desktop Communication Protocol used throughout TDE. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-libcvsservice0 -%defattr(-,root,root,-) -%{tde_bindir}/cvsaskpass -%{tde_bindir}/cvsservice -%{tde_libdir}/libcvsservice.so.* -%{tde_libdir}/libkdeinit_cvsaskpass.so -%{tde_libdir}/libkdeinit_cvsservice.so -%{tde_tdelibdir}/cvsaskpass.la -%{tde_tdelibdir}/cvsaskpass.so -%{tde_tdelibdir}/cvsservice.la -%{tde_tdelibdir}/cvsservice.so -%{tde_datadir}/services/cvsservice.desktop - -%post -n trinity-libcvsservice0 -/sbin/ldconfig || : - -%postun -n trinity-libcvsservice0 -/sbin/ldconfig || : - -########## - -%package -n trinity-libcvsservice-devel -Summary: Development files for CVS DCOP service -Group: Development/Libraries/Other -Requires: trinity-libcvsservice0 = %{version}-%{release} - -%description -n trinity-libcvsservice-devel -The library libcvsservice provides a DCOP service for accessing and -working with remote CVS repositories. Applications may link with this -library to access the DCOP service directly from C++. Alternatively, -scripts may access the service using the standard "dcop" command-line -tool. - -Development files for libcvsservice are included in this package. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-libcvsservice-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/cvsjob_stub.h -%{tde_tdeincludedir}/cvsservice_stub.h -%{tde_tdeincludedir}/repository_stub.h -%{tde_libdir}/libcvsservice.la -%{tde_libdir}/libcvsservice.so -%{tde_libdir}/libkdeinit_cvsaskpass.la -%{tde_libdir}/libkdeinit_cvsservice.la -%{tde_datadir}/cmake/cervisia.cmake - -%post -n trinity-libcvsservice-devel -/sbin/ldconfig || : - -%postun -n trinity-libcvsservice-devel -/sbin/ldconfig || : - -########## - -%package -n trinity-poxml -Summary: Tools for using PO-files to translate DocBook XML files -Group: Development/Languages/Other - -%description -n trinity-poxml -This is a collection of tools that facilitate translating DocBook XML -files using gettext message files (PO-files). - -Also included are some miscellaneous command-line utilities for -manipulating DocBook XML files, PO-files and PO-template files. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-poxml -%defattr(-,root,root,-) -%{tde_bindir}/po2xml -%{tde_bindir}/split2po -%{tde_bindir}/swappo -%{tde_bindir}/transxx -%{tde_bindir}/xml2pot - -########## - -%package -n trinity-umbrello -Summary: UML modelling tool and code generator -Group: Development/Languages/Other - -%description -n trinity-umbrello -Umbrello UML Modeller is a Unified Modelling Language editor for TDE. -With UML you can create diagrams of software and other systems in an -industry standard format. Umbrello can also generate code from your -UML diagrams in a number of programming languages. - -The program supports class diagrams, sequence diagrams, collaboration -diagrams, use case diagrams, state diagrams, activity diagrams, component -diagrams and deployment diagrams. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-umbrello -%defattr(-,root,root,-) -%{tde_bindir}/umbodoc -%{tde_bindir}/umbrello -%{tde_tdeappdir}/umbrello.desktop -%{tde_datadir}/apps/umbrello/ -%{tde_datadir}/icons/crystalsvg/*/actions/umbrello_*.png -%{tde_datadir}/icons/crystalsvg/*/mimetypes/umbrellofile.png -%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/umbrellofile.svgz -%{tde_datadir}/icons/hicolor/*/apps/umbrello.png -%{tde_datadir}/icons/hicolor/scalable/apps/umbrello.svgz -%{tde_datadir}/icons/hicolor/*/mimetypes/umbrellofile.png -%{tde_datadir}/mimelnk/application/x-umbrello.desktop -%{tde_tdedocdir}/HTML/en/umbrello/ - -%post -n trinity-umbrello -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-umbrello -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%if 0%{?build_kioslave} - -%package tdeio-plugins -Summary: Subversion ioslave for Trinity -Group: Development/Languages/Other -Requires: subversion - -Obsoletes: trinity-tdesdk-kio-plugins < %{version}-%{release} -Provides: trinity-tdesdk-kio-plugins = %{version}-%{release} - -%description tdeio-plugins -This package provides easy access to remote SVN repositories from within -Konqueror, and TDE generally, by browsing them as if they were a -filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files tdeio-plugins -%defattr(-,root,root,-) -%{tde_bindir}/kio_svn_helper -%{tde_tdelibdir}/kded_ksvnd.la -%{tde_tdelibdir}/kded_ksvnd.so -%{tde_tdelibdir}/kio_svn.la -%{tde_tdelibdir}/kio_svn.so -%{tde_datadir}/apps/konqueror/servicemenus/subversion_toplevel.desktop -%{tde_datadir}/apps/konqueror/servicemenus/subversion.desktop -%{tde_datadir}/services/kded/ksvnd.desktop -%{tde_datadir}/services/svn+file.protocol_tdesdk -%{tde_datadir}/services/svn+http.protocol_tdesdk -%{tde_datadir}/services/svn+https.protocol_tdesdk -%{tde_datadir}/services/svn+ssh.protocol_tdesdk -%{tde_datadir}/services/svn.protocol_tdesdk -%{tde_datadir}/icons/crystalsvg/*/actions/svn_switch.png -%{tde_datadir}/icons/crystalsvg/*/actions/svn_merge.png -%{tde_datadir}/icons/crystalsvg/*/actions/svn_branch.png -%{tde_datadir}/icons/crystalsvg/*/actions/svn_remove.png -%{tde_datadir}/icons/crystalsvg/*/actions/svn_add.png -%{tde_datadir}/icons/crystalsvg/*/actions/svn_status.png -%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_add.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_status.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_remove.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_switch.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_branch.svgz -%{tde_datadir}/icons/crystalsvg/scalable/actions/svn_merge.svgz - -%post tdeio-plugins -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done - -for proto in svn+file svn+http svn+https svn+ssh svn; do - update-alternatives --install \ - %{tde_datadir}/services/${proto}.protocol \ - ${proto}.protocol \ - %{tde_datadir}/services/${proto}.protocol_tdesdk \ - 10 -done - -%postun tdeio-plugins -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done - -%preun tdeio-plugins -if [ $1 -eq 0 ]; then - for proto in svn+file svn+http svn+https svn+ssh svn; do - update-alternatives --remove \ - ${proto}.protocol \ - %{tde_datadir}/services/${proto}.protocol_tdesdk || : - done -fi - -%endif - -########## - -%package -n trinity-tdeunittest -Summary: Unit testing library for Trinity -Group: Development/Languages/Other - -Obsoletes: trinity-kunittest < %{version}-%{release} -Provides: trinity-kunittest = %{version}-%{release} - -%description -n trinity-tdeunittest -tdeunittest is a small library that facilitates the writing of tests for -TDE developers. There are two ways to use the tdeunittest library. One is -to create dynamically loadable modules and use the tdeunittestmodrunner or -tdeunittestguimodrunner programs to run the tests. The other is to use the -libraries to create your own testing application. - -This package is part of Trinity, and a component of the TDE SDK module. - -%files -n trinity-tdeunittest -%defattr(-,root,root,-) -%{tde_bindir}/kunittest -%{tde_bindir}/kunittest_debughelper -%{tde_bindir}/kunittestmod -%{tde_bindir}/kunittestguimodrunner -%{tde_libdir}/libkunittestgui.la -%{tde_libdir}/libkunittestgui.so.* - -%post -n trinity-tdeunittest -/sbin/ldconfig || : - -%postun -n trinity-tdeunittest -/sbin/ldconfig || : - -########## - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries/Other - -Requires: %{name} = %{version}-%{release} -Requires: trinity-kbabel-devel = %{version}-%{release} -Requires: %{name}-misc = %{version}-%{release} -Requires: trinity-kspy = %{version}-%{release} -Requires: trinity-kmtrace = %{version}-%{release} -Requires: trinity-tdeunittest = %{version}-%{release} -Requires: trinity-libcvsservice-devel = %{version}-%{release} -Requires: trinity-kompare = %{version}-%{release} - -Obsoletes: trinity-kdesdk-devel < %{version}-%{release} -Provides: trinity-kdesdk-devel = %{version}-%{release} - -%description devel -This package contains the development files for tdesdk. - -%files devel -%defattr(-,root,root,-) -# misc -%{tde_tdeincludedir}/kprofilemethod.h -%{tde_libdir}/libkstartperf.so -# kspy -%{tde_tdeincludedir}/kspy.h -%{tde_libdir}/libkspy.so -# kmtrace -%{tde_libdir}/kmtrace/libktrace_s.a -%{tde_tdeincludedir}/ktrace.h -# tdeunittest -%{tde_libdir}/libkunittestgui.so -%{tde_tdeincludedir}/kunittest/runnergui.h -# kompare -%{tde_libdir}/libkompareinterface.so - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%{?tde_patch:%patch1 -p1} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_NO_BUILTIN_CHRPATH=ON \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DMAN_INSTALL_DIR=%{tde_mandir} \ - -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DWITH_DBSEARCHENGINE=ON \ - -DWITH_KCAL=ON \ - -DBUILD_ALL=ON \ - %{!?build_kioslave:-DBUILD_KIOSLAVE=OFF} \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} - -%__make install DESTDIR=%{?buildroot} -C build - - -# Installs kdepalettes -%__install -D -m 644 kdepalettes/kde_xpaintrc %{?buildroot}%{tde_datadir}/kdepalettes/kde_xpaintrc -%__install -D -m 644 kdepalettes/KDE_Gimp %{?buildroot}%{tde_datadir}/kdepalettes/KDE_Gimp -%__install -D -m 644 kdepalettes/README %{?buildroot}%{tde_datadir}/kdepalettes/README - -# Installs SVN protocols as alternatives -%if 0%{?build_kioslave} -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesdk -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesdk -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesdk -%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesdk -%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesdk -%endif - -# Removes useless stuff -%__rm -f %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/debianrules - -# Fix permissions -chmod 644 %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/Doxyfile.global - -# Make kapptemplate archive -pushd %{?buildroot}%{tde_datadir}/apps/kapptemplate -mkdir kapptemplate -mv admin appframework bin existing include kapp kpartapp kpartplugin kapptemplate/ -tar cfz kapptemplate.tar.gz kapptemplate -rm -rf kapptemplate -popd - -# Updates applications categories for openSUSE -%if 0%{?suse_version} -%suse_update_desktop_file kuiviewer Development GUIDesigner -%suse_update_desktop_file umbrello Development Design -%suse_update_desktop_file kbugbuster Development Debugger -%suse_update_desktop_file -u catalogmanager Development Translation -%suse_update_desktop_file kbabel Development Translation -%suse_update_desktop_file -u kbabeldict Development Translation -%suse_update_desktop_file cervisia Development RevisionControl -%suse_update_desktop_file kompare Development RevisionControl -%suse_update_desktop_file kcachegrind Development Profiling -%endif - -# Links duplicate files -%fdupes "%{?buildroot}%{tde_datadir}" - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/main/tdesdk/tdesdk-14.0.0.spec b/redhat/main/tdesdk/tdesdk.spec index 788bd6107..fb59b9c73 100644 --- a/redhat/main/tdesdk/tdesdk-14.0.0.spec +++ b/redhat/main/tdesdk/tdesdk.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdesdk %define tde_prefix /opt/trinity @@ -98,7 +98,12 @@ BuildRequires: pcre-devel # for kbugbuster/libkcal BuildRequires: desktop-file-utils +# DB5 support +%if 0%{?rhel} >= 8 +BuildRequires: libdb-devel + # DB4 support +%else %if 0%{?mgaversion} || 0%{?mdkversion} #BuildRequires: %{_lib}db4.8-devel %endif @@ -108,6 +113,7 @@ BuildRequires: db4-devel %if 0%{?suse_version} BuildRequires: libdb-4_8-devel %endif +%endif # kbabel, F-7+: flex >= 2.5.33-9 BuildRequires: flex @@ -126,6 +132,13 @@ BuildRequires: perl-podlators # OPENSSL support BuildRequires: openssl-devel +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 +%define python python3 +%else +%define python python +%endif + %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}ltdl-devel BuildRequires: %{_lib}binutils-devel @@ -454,7 +467,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %package -n trinity-tdecachegrind-converters Summary: Format converters for tdecachegrind profiling visualisation tool Group: Development/Languages/Other -Requires: python +Requires: %{python} %if 0%{?suse_version} || 0%{?rhel} == 4 Requires: php %else @@ -543,7 +556,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %package scripts Summary: a set of useful development scripts for Trinity Group: Development/Languages/Other -Requires: python +Requires: %{python} %description scripts This package contains a number of scripts which can be used to help in @@ -1007,6 +1020,15 @@ This package contains the development files for tdesdk. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +# Fix shebangs +sed -i "scripts/kdelnk2desktop.py" \ + "scripts/zonetab2pot.py" \ + "tdecachegrind/converters/hotshot2calltree" \ + "umbrello/umbrello/headings/heading.py" \ + -e "s|env python|env %{python}|" +%endif + %build unset QTDIR QTINC QTLIB diff --git a/redhat/main/tdetoys/tdetoys-3.5.13.2.spec b/redhat/main/tdetoys/tdetoys-3.5.13.2.spec deleted file mode 100644 index 28542f0b2..000000000 --- a/redhat/main/tdetoys/tdetoys-3.5.13.2.spec +++ /dev/null @@ -1,430 +0,0 @@ -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Summary: Trinity Desktop Environment - Toys and Amusements -Name: trinity-tdetoys -Group: Amusements/Graphics -Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} - -License: GPLv2+ -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: cmake >= 2.8 -BuildRequires: desktop-file-utils -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: gettext - -Obsoletes: trinity-kdetoys < %{version}-%{release} -Provides: trinity-kdetoys = %{version}-%{release} - -# Metapackage -Requires: trinity-amor = %{version}-%{release} -Requires: trinity-eyesapplet = %{version}-%{release} -Requires: trinity-fifteenapplet = %{version}-%{release} -Requires: trinity-kmoon = %{version}-%{release} -Requires: trinity-kodo = %{version}-%{release} -Requires: trinity-kteatime = %{version}-%{release} -Requires: trinity-ktux = %{version}-%{release} -Requires: trinity-kweather = %{version}-%{release} -Requires: trinity-kworldclock = %{version}-%{release} - - -%description -Includes: -* amor: Amusing Misuse Of Resources put's comic figures above your windows -* eyesapplet: a kicker applet similar to XEyes -* fifteenapplet: kicker applet, order 15 pieces in a 4x4 square by moving them -* kmoon: system tray applet showing the moon phase -* kodo: mouse movement meter -* kteatime: system tray applet that makes sure your tea doesn't get too strong -* ktux: Tux-in-a-Spaceship screen saver -* kweather: kicker applet that will display the current weather outside -* kworldwatch: application and kicker applet showing daylight area on the world - globe - -NOTE: kicker applets and screen savers require tdebase to be installed, -and user to be logged-in to TDE. - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README - -########## - -%package -n trinity-amor -Summary: a Trinity creature for your desktop -Group: Amusements/Graphics - -%description -n trinity-amor -AMOR stands for Amusing Misuse Of Resources. It provides several different -characters who prance around your X screen doing tricks and giving you tips. - -Note that AMOR will only work with some window managers. Both TWin (the -TDE window manager) and Metacity (a GTK2 window manager) are supported. - -This package is part of Trinity, and a component of the TDE toys module. - -%files -n trinity-amor -%defattr(-,root,root,-) -%{tde_bindir}/amor -%{tde_datadir}/apps/amor/ -%{tde_tdeappdir}/amor.desktop -%{tde_datadir}/icons/hicolor/*/apps/amor.png -%{tde_tdedocdir}/HTML/en/amor/ -%doc AUTHORS COPYING README - -%post -n trinity-amor -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-amor -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-eyesapplet -Summary: eyes applet for Trinity -Group: Amusements/Graphics - -%description -n trinity-eyesapplet -An applet for the TDE panel containing a pair of eyes that follow your mouse -around the screen. - -This package is part of Trinity, and a component of the TDE toys module. - -%files -n trinity-eyesapplet -%defattr(-,root,root,-) -%{tde_tdelibdir}/eyes_panelapplet.la -%{tde_tdelibdir}/eyes_panelapplet.so -%{tde_datadir}/apps/kicker/applets/eyesapplet.desktop -%doc AUTHORS COPYING README - -########## - -%package -n trinity-fifteenapplet -Summary: fifteen pieces puzzle for Trinity -Group: Amusements/Graphics - -%description -n trinity-fifteenapplet -An applet for the TDE panel that lets you play the Fifteen Pieces -sliding block puzzle. You have to order 15 pieces in a 4x4 square by -moving them around. - -This package is part of Trinity, and a component of the TDE toys module. - -%files -n trinity-fifteenapplet -%defattr(-,root,root,-) -%{tde_tdelibdir}/fifteen_panelapplet.la -%{tde_tdelibdir}/fifteen_panelapplet.so -%{tde_datadir}/apps/kicker/applets/kfifteenapplet.desktop -%doc AUTHORS COPYING README - -########## - -%package -n trinity-kmoon -Summary: moon phase indicator for Trinity -Group: Amusements/Graphics - -%description -n trinity-kmoon -An applet for the TDE panel that displays the current phase of the moon. - -This package is part of Trinity, and a component of the TDE toys module. - -%files -n trinity-kmoon -%defattr(-,root,root,-) -%{tde_tdelibdir}/kmoon_panelapplet.la -%{tde_tdelibdir}/kmoon_panelapplet.so -%{tde_datadir}/apps/kicker/applets/kmoonapplet.desktop -%{tde_datadir}/apps/kmoon/ -%{tde_datadir}/icons/hicolor/*/apps/kmoon.png -%{tde_tdedocdir}/HTML/en/kmoon/ -%doc AUTHORS COPYING README - -%post -n trinity-kmoon -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: - -%postun -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: - -########## - -%package -n trinity-kodo -Summary: mouse odometer for Trinity -Group: Amusements/Graphics - -%description -n trinity-kodo -KOdometer measures your desktop mileage. It tracks the movement of your mouse -pointer across your desktop and renders it in inches/feet/miles! It can -do cm/metres/km too. Its most exciting feature is the tripometer. - -This package is part of Trinity, and a component of the TDE toys module. - -%files -n trinity-kodo -%defattr(-,root,root,-) -%{tde_bindir}/kodo -%{tde_tdeappdir}/kodo.desktop -%{tde_datadir}/apps/kodo/numbers.png -%{tde_datadir}/icons/hicolor/*/apps/kodo.png -%{tde_tdedocdir}/HTML/en/kodo/ -%doc AUTHORS COPYING README - -%post -n trinity-kodo -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kodo -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kteatime -Summary: Trinity utility for making a fine cup of tea -Group: Amusements/Graphics - -%description -n trinity-kteatime -KTeaTime is a handy timer for steeping tea. No longer will you have to -guess at how long it takes for your tea to be ready. Simply select the -type of tea you have, and it will alert you when the tea is ready to -drink. - -KTeaTime sits in the Trinity system tray. - -Please note that KTeaTime is written explicitly for Trinity. If you are -using a non-TDE window manager or desktop environment then it is quite -possible that KTeaTime will not work on your system. - -This package is part of Trinity, and a component of the TDE toys module. - -%files -n trinity-kteatime -%defattr(-,root,root,-) -%{tde_bindir}/kteatime -%{tde_tdeappdir}/kteatime.desktop -%{tde_datadir}/apps/kteatime/ -%{tde_datadir}/icons/hicolor/*/apps/kteatime.png -%{tde_tdedocdir}/HTML/en/kteatime/ -%doc AUTHORS COPYING README - -%post -n trinity-kteatime -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kteatime -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-ktux -Summary: Tux screensaver for Trinity -Group: Amusements/Graphics - -%description -n trinity-ktux -A neat Tux-in-a-spaceship screensaver for the Trinity Desktop Environment (TDE). - -This package is part of Trinity, and a component of the TDE toys module. - -%files -n trinity-ktux -%defattr(-,root,root,-) -%{tde_bindir}/ktux -%{tde_datadir}/apps/ktux/ -%{tde_datadir}/applnk/System/ScreenSavers/ktux.desktop -%{tde_datadir}/icons/hicolor/*/apps/ktux.png -%doc AUTHORS COPYING README - -%post -n trinity-ktux -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: - -%postun -n trinity-ktux -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: - -########## - -%package -n trinity-kweather -Summary: weather display applet for Trinity -Group: Amusements/Graphics - -%description -n trinity-kweather -An applet for the TDE panel that displays your area's current weather. -Information shown includes the temperature, wind speed, air pressure -and more. By pressing a button a full weather report can be obtained. - -KWeather also provides a weather service that can track multiple weather -stations and provide this information to other applications, including -Konqueror's sidebar and Kontact's summary page. - -This package is part of Trinity, and a component of the TDE toys module. - -%files -n trinity-kweather -%defattr(-,root,root,-) -%{tde_bindir}/kweatherservice -%{tde_bindir}/kweatherreport -%{tde_libdir}/libkdeinit_kweatherreport.so -%{tde_libdir}/libkdeinit_kweatherreport.la -%{tde_tdelibdir}/kcm_weather.so -%{tde_tdelibdir}/kcm_weather.la -%{tde_tdelibdir}/kcm_weatherservice.so -%{tde_tdelibdir}/kcm_weatherservice.la -%{tde_tdelibdir}/kweatherreport.so -%{tde_tdelibdir}/kweatherreport.la -%{tde_tdelibdir}/weather_panelapplet.la -%{tde_tdelibdir}/weather_panelapplet.so -%{tde_datadir}/apps/kicker/applets/kweather.desktop -%{tde_datadir}/apps/kweather/ -%{tde_datadir}/apps/kweatherservice/stations.dat -%{tde_datadir}/apps/kweatherservice/weather_stations.desktop -%{tde_datadir}/icons/hicolor/*/apps/kweather.png -%{tde_datadir}/services/kweatherservice.desktop -%{tde_datadir}/services/kcmweather.desktop -%{tde_datadir}/services/kcmweatherservice.desktop -%{tde_tdedocdir}/HTML/en/kweather/ -%doc AUTHORS COPYING README - -%post -n trinity-kweather -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kweather -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kworldclock -Summary: earth watcher for Trinity -Group: Amusements/Graphics - -%description -n trinity-kworldclock -Displays where in the world it is light and dark depending on time, as -well as offering the time in all of the major cities of the world. -This can be run standalone, as an applet in the KDE panel or as a -desktop background. - -Additional kworldclock themes are available in the tdeartwork-misc package. - -This package is part of Trinity, and a component of the TDE toys module. - -%files -n trinity-kworldclock -%defattr(-,root,root,-) -%{tde_bindir}/kworldclock -%{tde_tdelibdir}/ww_panelapplet.la -%{tde_tdelibdir}/ww_panelapplet.so -%{tde_tdeappdir}/kworldclock.desktop -%{tde_datadir}/apps/kdesktop/programs/kdeworld.desktop -%{tde_datadir}/apps/kicker/applets/kwwapplet.desktop -%{tde_datadir}/apps/kworldclock/ -%{tde_datadir}/icons/hicolor/*/apps/kworldclock.png -%{tde_tdedocdir}/HTML/en/kworldclock/ -%doc AUTHORS COPYING README - -%post -n trinity-kworldclock -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kworldclock -touch --no-create %{tde_datadir}/icons/hicolor ||: -gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||: -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export KDEDIR=%{tde_prefix} - -# Specific path for RHEL4 -if [ -d "/usr/X11R6" ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ - -DBIN_INSTALL_DIR="%{tde_bindir}" \ - -DDOC_INSTALL_DIR="%{tde_docdir}" \ - -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ - -DLIB_INSTALL_DIR="%{tde_libdir}" \ - -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ - -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ - \ - -DBUILD_ALL=ON \ - .. - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf "%{buildroot}" -%__make install DESTDIR=%{buildroot} -C build - -# Useless include file from Amor -%__rm -f %{buildroot}%{tde_tdeincludedir}/AmorIface.h - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/main/tdetoys/tdetoys.spec b/redhat/main/tdetoys/tdetoys.spec index dcc317623..de2125db0 100644 --- a/redhat/main/tdetoys/tdetoys.spec +++ b/redhat/main/tdetoys/tdetoys.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdetoys %define tde_prefix /opt/trinity diff --git a/redhat/main/tdeutils/tdeutils-3.5.13.2.spec b/redhat/main/tdeutils/tdeutils-3.5.13.2.spec deleted file mode 100644 index 13f1e9c46..000000000 --- a/redhat/main/tdeutils/tdeutils-3.5.13.2.spec +++ /dev/null @@ -1,1063 +0,0 @@ -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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_sbindir %{tde_prefix}/sbin - -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -Name: trinity-tdeutils -Version: %{tde_version} -Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist} -License: GPL -Summary: TDE Utilities -Group: Applications/System - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Source1: klaptop_acpi_helper.pam -Source2: klaptop_acpi_helper.console -Source3: kcmlaptoprc - -Patch1: kdeutils-3.5.13.2-rhel4.patch - -Obsoletes: trinity-kdeutils < %{version}-%{release} -Provides: trinity-kdeutils = %{version}-%{release} -Obsoletes: trinity-kdeutils-extras < %{version}-%{release} -Provides: trinity-kdeutils-extras = %{version}-%{release} -Obsoletes: tdeutils < %{version}-%{release} -Provides: tdeutils = %{version}-%{release} - -BuildRequires: cmake >= 2.8 -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: autoconf automake libtool m4 -BuildRequires: gettext -BuildRequires: net-snmp-devel -BuildRequires: python-devel -BuildRequires: gmp-devel - -%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 -BuildRequires: libXScrnSaver-devel -BuildRequires: libXtst-devel -%endif - -#%if 0%{?fedora} -#BuildRequires: xmms-devel -#%endif - -# KLAPTOPDAEMON -# Not for RHEL 4! -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define build_klaptopdaemon 1 -%endif - -# XSCREENSAVER support -# Not for RHEL 4! -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%define with_xscreensaver 1 -%endif - -# CONSOLEHELPER (usermode) support -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_consolehelper 1 - -# Avoids relinking, which breaks consolehelper -%define dont_relink 1 -%endif - - -Requires: trinity-ark = %{version}-%{release} -Requires: trinity-kcalc = %{version}-%{release} -Requires: trinity-kcharselect = %{version}-%{release} -Requires: trinity-kdelirc = %{version}-%{release} -Requires: trinity-kdessh = %{version}-%{release} -Requires: trinity-kdf = %{version}-%{release} -Requires: trinity-kedit = %{version}-%{release} -Requires: trinity-kfloppy = %{version}-%{release} -Requires: trinity-kgpg = %{version}-%{release} -Requires: trinity-khexedit = %{version}-%{release} -Requires: trinity-kjots = %{version}-%{release} -%{?build_klaptopdaemon:Requires: trinity-klaptopdaemon = %{version}-%{release}} -Requires: trinity-kmilo = %{version}-%{release} -Requires: trinity-kmilo-legacy = %{version}-%{release} -Requires: trinity-kregexpeditor = %{version}-%{release} -Requires: trinity-ksim = %{version}-%{release} -Requires: trinity-ktimer = %{version}-%{release} -Requires: trinity-kwalletmanager = %{version}-%{release} -Requires: trinity-superkaramba = %{version}-%{release} - - -%description -Utilities for the Trinity Desktop Environment, including: - * ark (tar/gzip archive manager) - * kcalc (scientific calculator) - * kcharselect (character selector) - * kdepasswd (change password) - * kdessh (ssh front end) - * kdf (view disk usage) - * kedit (simple text editor) - * kfloppy (floppy formatting tool) - * kgpg (gpg gui) - * khexedit (hex editor) - * kjots (note taker) -%if 0%{?build_klaptopdaemon} - * klaptopdaemon (battery monitoring and management for laptops); -%endif - * kmilo - * kregexpeditor (regular expression editor) - * ksim (system information monitor); - * ktimer (task scheduler) - * kwikdisk (removable media utility) - -%files - -########## - -%package -n trinity-ark -Summary: graphical archiving tool for Trinity -Group: Applications/Utilities -#Requires: ncompress -Requires: unzip -Requires: zip -#Requires: zoo -Requires: bzip2 -#Requires: p7zip -#Requires: xz -#Requires: lzma -#Requires: rar, unrar - -%description -n trinity-ark -Ark is a graphical program for managing various archive formats within the -TDE environment. Archives can be viewed, extracted, created and modified -from within Ark. - -The program can handle various formats such as tar, gzip, bzip2, zip, rar and -lha (if appropriate command-line programs are installed). - -Ark can work closely with Konqueror in the KDE environment to handle archives, -if you install the Konqueror Integration plugin available in the konq-plugins -package. - -%files -n trinity-ark -%defattr(-,root,root,-) -%{tde_bindir}/ark -%{tde_tdelibdir}/ark.la -%{tde_tdelibdir}/ark.so -%{tde_tdelibdir}/libarkpart.la -%{tde_tdelibdir}/libarkpart.so -%{tde_libdir}/libkdeinit_ark.so -%{tde_tdeappdir}/ark.desktop -%{tde_datadir}/apps/ark/ -%{tde_datadir}/config.kcfg/ark.kcfg -%{tde_datadir}/icons/hicolor/*/apps/ark.png -%{tde_datadir}/icons/hicolor/scalable/apps/ark.svgz -%{tde_datadir}/services/ark_part.desktop -%{tde_tdedocdir}/HTML/en/ark/ - -%post -n trinity-ark -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ark -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kcalc -Summary: calculator for Trinity -Group: Applications/Utilities - -%description -n trinity-kcalc -KCalc is TDE's scientific calculator. - -It provides: -* trigonometric functions, logic operations, and statistical calculations -* easy cut and paste of numbers from/into its display -* a results-stack which lets you conveniently recall previous results -* configurable precision, and number of digits after the period - -%files -n trinity-kcalc -%defattr(-,root,root,-) -%{tde_bindir}/kcalc -%{tde_tdelibdir}/kcalc.la -%{tde_tdelibdir}/kcalc.so -%{tde_libdir}/libkdeinit_kcalc.so -%{tde_tdeappdir}/kcalc.desktop -%{tde_datadir}/apps/kcalc/ -%{tde_datadir}/apps/kconf_update/kcalcrc.upd -%{tde_datadir}/config.kcfg/kcalc.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kcalc.png -%{tde_datadir}/icons/hicolor/scalable/apps/kcalc.svgz -%{tde_tdedocdir}/HTML/en/kcalc/ - -%post -n trinity-kcalc -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kcalc -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kcharselect -Summary: character selector for Trinity -Group: Applications/Utilities - -%description -n trinity-kcharselect -A character set selector for TDE. - -%files -n trinity-kcharselect -%defattr(-,root,root,-) -%{tde_bindir}/kcharselect -%{tde_tdelibdir}/kcharselect_panelapplet.la -%{tde_tdelibdir}/kcharselect_panelapplet.so -%{tde_tdeappdir}/KCharSelect.desktop -%{tde_datadir}/apps/kcharselect/ -%{tde_datadir}/apps/kconf_update/kcharselect.upd -%{tde_datadir}/apps/kicker/applets/kcharselectapplet.desktop -%{tde_datadir}/icons/hicolor/*/apps/kcharselect.png -%{tde_tdedocdir}/HTML/en/kcharselect/ - -%post -n trinity-kcharselect -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kcharselect -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kdelirc -Summary: infrared control for Trinity -Group: Applications/Utilities - -%description -n trinity-kdelirc -This is a frontend for the LIRC suite to use infrared devices with TDE. - -%files -n trinity-kdelirc -%defattr(-,root,root,-) -%{tde_bindir}/irkick -%{tde_tdelibdir}/irkick.la -%{tde_tdelibdir}/irkick.so -%{tde_tdelibdir}/kcm_kcmlirc.la -%{tde_tdelibdir}/kcm_kcmlirc.so -%{tde_libdir}/libkdeinit_irkick.so -%{tde_tdeappdir}/irkick.desktop -%{tde_tdeappdir}/kcmlirc.desktop -%{tde_datadir}/apps/irkick/ -%{tde_datadir}/apps/profiles/klauncher.profile.xml -%{tde_datadir}/apps/profiles/konqueror.profile.xml -%{tde_datadir}/apps/profiles/noatun.profile.xml -%{tde_datadir}/apps/profiles/profile.dtd -%{tde_datadir}/apps/remotes/RM-0010.remote.xml -%{tde_datadir}/apps/remotes/cimr100.remote.xml -%{tde_datadir}/apps/remotes/hauppauge.remote.xml -%{tde_datadir}/apps/remotes/remote.dtd -%{tde_datadir}/apps/remotes/sherwood.remote.xml -%{tde_datadir}/apps/remotes/sonytv.remote.xml -%{tde_datadir}/autostart/irkick.desktop -%{tde_datadir}/icons/hicolor/*/apps/irkick.png -%{tde_datadir}/icons/locolor/*/apps/irkick.png -%{tde_tdedocdir}/HTML/en/irkick/ -%{tde_tdedocdir}/HTML/en/kcmlirc/ - -%post -n trinity-kdelirc -/sbin/ldconfig -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kdelirc -/sbin/ldconfig -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kdessh -Summary: ssh frontend for Trinity -Group: Applications/Utilities -%if 0%{?suse_version} -Requires: openssh -%else -Requires: openssh-clients -%endif - -%description -n trinity-kdessh -This package contains TDE's frontend for ssh. - -%files -n trinity-kdessh -%defattr(-,root,root,-) -%{tde_bindir}/kdessh - -########## - -%package -n trinity-kdf -Summary: disk space utility for Trinity -Group: Applications/Utilities - -%description -n trinity-kdf -KDiskFree displays the available file devices (hard drive partitions, floppy -and CD drives, etc.) along with information on their capacity, free space, type -and mount point. It also allows you to mount and unmount drives and view them -in a file manager. - -%files -n trinity-kdf -%defattr(-,root,root,-) -%{tde_bindir}/kdf -%{tde_bindir}/kwikdisk -%{tde_tdelibdir}/kcm_kdf.la -%{tde_tdelibdir}/kcm_kdf.so -%{tde_tdeappdir}/kcmdf.desktop -%{tde_tdeappdir}/kdf.desktop -%{tde_tdeappdir}/kwikdisk.desktop -%{tde_datadir}/apps/kdf/ -%{tde_datadir}/icons/crystalsvg/*/apps/kcmdf.png -%{tde_datadir}/icons/hicolor/*/apps/kdf.png -%{tde_datadir}/icons/hicolor/*/apps/kwikdisk.png -%{tde_tdedocdir}/HTML/en/kdf/ -%{tde_tdedocdir}/HTML/en/kinfocenter/blockdevices/ - -%post -n trinity-kdf -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kdf -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kedit -Summary: basic text editor for Trinity -Group: Applications/Utilities - -%description -n trinity-kedit -A simple text editor for TDE. - -It can be used with Konqueror for text and configuration file browsing. -KEdit also serves well for creating small plain text documents. KEdit's -functionality will intentionally remain rather limited to ensure a -reasonably fast start. - -%files -n trinity-kedit -%defattr(-,root,root,-) -%{tde_bindir}/kedit -%{tde_tdelibdir}/kedit.la -%{tde_tdelibdir}/kedit.so -%{tde_libdir}/libkdeinit_kedit.so -%{tde_tdeappdir}/KEdit.desktop -%{tde_datadir}/apps/kedit/keditui.rc -%{tde_datadir}/config.kcfg/kedit.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kedit.png -%{tde_tdedocdir}/HTML/en/kedit/ - -%post -n trinity-kedit -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kedit -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kfloppy -Summary: floppy formatter for Trinity -Group: Applications/Utilities -Requires: dosfstools - -%description -n trinity-kfloppy -Kfloppy is a utility that provides a straightforward graphical means -to format 3.5" and 5.25" floppy disks. - -%files -n trinity-kfloppy -%defattr(-,root,root,-) -%{tde_bindir}/kfloppy -%{tde_tdeappdir}/KFloppy.desktop -%{tde_datadir}/apps/konqueror/servicemenus/floppy_format.desktop -%{tde_datadir}/icons/hicolor/*/apps/kfloppy.png -%{tde_tdedocdir}/HTML/en/kfloppy/ - -%post -n trinity-kfloppy -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kfloppy -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kgpg -Summary: GnuPG frontend for Trinity -Group: Applications/Utilities -Requires: trinity-konsole -Requires: gnupg - -%description -n trinity-kgpg -Kgpg is a frontend for GNU Privacy Guard (GnuPG). It provides file -encryption, file decryption and key management. - -Features: -* an editor mode for easily and quickly encrypting or decrypting a file - or message which is typed, copied, pasted or dragged into the editor, - or which is double-clicked in the file manager -* Konqueror integration for encrypting or decrypting files -* a panel applet for encrypting / decrypting files or the clipboard - contents, etc. -* key management functions (generation, import, export, deletion and - signing) -* decrypting clipboard contents, including integration with Klipper - -%files -n trinity-kgpg -%defattr(-,root,root,-) -%{tde_bindir}/kgpg -%{tde_tdeappdir}/kgpg.desktop -%{tde_datadir}/apps/kgpg/ -%{tde_datadir}/apps/konqueror/servicemenus/encryptfile.desktop -%{tde_datadir}/apps/konqueror/servicemenus/encryptfolder.desktop -%{tde_datadir}/autostart/kgpg.desktop -%{tde_datadir}/config.kcfg/kgpg.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kgpg.png -%{tde_tdedocdir}/HTML/en/kgpg/ - -%post -n trinity-kgpg -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kgpg -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-khexedit -Summary: Trinity hex editor -Group: Applications/Utilities - -%description -n trinity-khexedit -KHexEdit is an editor for the raw data of binary files. It includes -find/replace functions, bookmarks, many configuration options, drag and drop -support and other powerful features. - -%files -n trinity-khexedit -%defattr(-,root,root,-) -%{tde_bindir}/khexedit -%{tde_tdelibdir}/libkbyteseditwidget.la -%{tde_tdelibdir}/libkbyteseditwidget.so -%{tde_tdelibdir}/libkhexedit2part.la -%{tde_tdelibdir}/libkhexedit2part.so -%{tde_libdir}/libkhexeditcommon.so.* -%{tde_tdeappdir}/khexedit.desktop -%{tde_datadir}/apps/khexedit/ -%{tde_datadir}/apps/khexedit2part/khexedit2partui.rc -%{tde_datadir}/icons/hicolor/*/apps/khexedit.png -%{tde_datadir}/services/kbyteseditwidget.desktop -%{tde_datadir}/services/khexedit2part.desktop -%{tde_tdedocdir}/HTML/en/khexedit/ - -%post -n trinity-khexedit -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-khexedit -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kjots -Summary: note taking utility for Trinity -Group: Applications/Utilities - -%description -n trinity-kjots -Kjots is a small note taker program. Name and idea are taken from the jots -program included in the tkgoodstuff package. - -%files -n trinity-kjots -%defattr(-,root,root,-) -%{tde_bindir}/kjots -%{tde_tdeappdir}/Kjots.desktop -%{tde_datadir}/apps/kjots/ -%{tde_datadir}/config.kcfg/kjots.kcfg -%{tde_datadir}/icons/hicolor/*/apps/kjots.png -%{tde_tdedocdir}/HTML/en/kjots/ - -%post -n trinity-kjots -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kjots -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%if 0%{?build_klaptopdaemon} - -%package -n trinity-klaptopdaemon -Summary: battery monitoring and management for laptops using Trinity -Group: Applications/Utilities -Requires: pm-utils - -%if 0%{?with_consolehelper} -# package 'usermode' provides '/usr/bin/consolehelper-gtk' -%if 0%{?rhel} || 0%{?fedora} -Requires: usermode-gtk -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -Requires: usermode -%endif -%endif - -%description -n trinity-klaptopdaemon -This package contains utilities to monitor batteries and configure -power management, for laptops, from within TDE. - -%files -n trinity-klaptopdaemon -%defattr(-,root,root,-) -%{tde_bindir}/klaptop_acpi_helper -%{tde_bindir}/klaptop_check -%{tde_tdelibdir}/kcm_laptop.la -%{tde_tdelibdir}/kcm_laptop.so -%{tde_tdelibdir}/kded_klaptopdaemon.la -%{tde_tdelibdir}/kded_klaptopdaemon.so -%{tde_libdir}/libkcmlaptop.so.* -%{tde_tdeappdir}/laptop.desktop -%{tde_tdeappdir}/pcmcia.desktop -%{tde_datadir}/apps/klaptopdaemon/ -%{tde_datadir}/icons/crystalsvg/*/apps/laptop_battery.png -%{tde_datadir}/icons/crystalsvg/*/apps/laptop_pcmcia.png -%{tde_datadir}/icons/crystalsvg/scalable/apps/laptop_battery.svgz -%{tde_datadir}/services/kded/klaptopdaemon.desktop -%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatcrit/ -%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatwarn/ -%{tde_tdedocdir}/HTML/en/kcontrol/laptop/ -%{tde_tdedocdir}/HTML/en/kcontrol/powerctrl/ - -# ConsoleHelper support -%if 0%{?with_consolehelper} -%{_sysconfdir}/pam.d/klaptop_acpi_helper -%attr(644,root,root) %{_sysconfdir}/security/console.apps/klaptop_acpi_helper -%{tde_sbindir}/klaptop_acpi_helper -%{_sbindir}/klaptop_acpi_helper -%endif - -%config %{tde_datadir}/config/kcmlaptoprc - -%post -n trinity-klaptopdaemon -/sbin/ldconfig -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-klaptopdaemon -/sbin/ldconfig -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%endif - -########## - -%package -n trinity-kmilo -Summary: laptop special keys support for Trinity -Group: Applications/Utilities - -%description -n trinity-kmilo -KMilo lets you use the special keys on some keyboards and laptops. - -Usually this includes volume keys and other features. Currently, KMilo -comes with plugins for Powerbooks, Thinkpads, Vaios and generic keyboards -with special keys. - -%files -n trinity-kmilo -%defattr(-,root,root,-) -%{tde_tdelibdir}/kded_kmilod.la -%{tde_tdelibdir}/kded_kmilod.so -%{tde_tdelibdir}/kmilo_generic.la -%{tde_tdelibdir}/kmilo_generic.so -%{tde_libdir}/libkmilo.so.* -%{tde_datadir}/services/kded/kmilod.desktop -%{tde_datadir}/services/kmilo/kmilo_generic.desktop -%{tde_datadir}/servicetypes/kmilo/kmilopluginsvc.desktop - -%post -n trinity-kmilo -/sbin/ldconfig - -%postun -n trinity-kmilo -/sbin/ldconfig - -########## - -%package -n trinity-kmilo-legacy -Summary: non-standard plugins for KMilo -Group: Applications/Utilities -Requires: trinity-kmilo = %{version}-%{release} - -%description -n trinity-kmilo-legacy -KMilo lets you use the special keys on some keyboards and laptops. - -Usually this includes volume keys and other features. Currently, KMilo -comes with plugins for Powerbooks, Thinkpads and Vaios. - -The intention is that all laptops work with the generic kmilo -plugin, if you need this package please file a bug. - -%files -n trinity-kmilo-legacy -%defattr(-,root,root,-) -%{tde_tdelibdir}/kcm_kvaio.la -%{tde_tdelibdir}/kcm_kvaio.so -%{tde_tdelibdir}/kcm_thinkpad.la -%{tde_tdelibdir}/kcm_thinkpad.so -%{tde_tdelibdir}/kmilo_asus.la -%{tde_tdelibdir}/kmilo_asus.so -%{tde_tdelibdir}/kmilo_delli8k.la -%{tde_tdelibdir}/kmilo_delli8k.so -%{tde_tdelibdir}/kmilo_kvaio.la -%{tde_tdelibdir}/kmilo_kvaio.so -%{tde_tdelibdir}/kmilo_thinkpad.la -%{tde_tdelibdir}/kmilo_thinkpad.so -%{tde_tdeappdir}/kvaio.desktop -%{tde_tdeappdir}/thinkpad.desktop -%{tde_datadir}/services/kmilo/kmilo_asus.desktop -%{tde_datadir}/services/kmilo/kmilo_delli8k.desktop -%{tde_datadir}/services/kmilo/kmilo_kvaio.desktop -%{tde_datadir}/services/kmilo/kmilo_thinkpad.desktop - -########## - -%package -n trinity-kregexpeditor -Summary: graphical regular expression editor plugin for Trinity -Group: Applications/Utilities - -%description -n trinity-kregexpeditor -This package contains a graphical regular expression editor plugin for use -with TDE. It let you draw your regular expression in an unambiguous way. - -%files -n trinity-kregexpeditor -%defattr(-,root,root,-) -%{tde_bindir}/kregexpeditor -%{tde_tdelibdir}/libkregexpeditorgui.la -%{tde_tdelibdir}/libkregexpeditorgui.so -%{tde_libdir}/libkregexpeditorcommon.so.* -%{tde_tdeappdir}/kregexpeditor.desktop -%{tde_datadir}/apps/kregexpeditor/ -%{tde_datadir}/icons/hicolor/*/apps/kregexpeditor.png -%{tde_datadir}/services/kregexpeditorgui.desktop -%{tde_tdedocdir}/HTML/en/KRegExpEditor/ - -%post -n trinity-kregexpeditor -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kregexpeditor -/sbin/ldconfig -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-ksim -Summary: system information monitor for Trinity -Group: Applications/Utilities - -%description -n trinity-ksim -KSim is a system monitor app which has its own plugin system with support -for GKrellm skins. It allows users to follow uptime, memory usage, network -connections, power, etc. - -%files -n trinity-ksim -%defattr(-,root,root,-) -%config %{tde_datadir}/config/ksim_panelextensionrc -%{tde_tdelibdir}/ksim_*.la -%{tde_tdelibdir}/ksim_*.so -%{tde_libdir}/libksimcore.so.* -%{tde_datadir}/apps/kicker/extensions/ksim.desktop -%{tde_datadir}/apps/ksim/ -%{tde_tdedocdir}/HTML/en/ksim/ -%{tde_datadir}/icons/crystalsvg/*/apps/ksim.png -%{tde_datadir}/icons/crystalsvg/*/devices/ksim_cpu.png - -%post -n trinity-ksim -/sbin/ldconfig -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done - -%postun -n trinity-ksim -/sbin/ldconfig -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done - -########## - -%package -n trinity-ktimer -Summary: timer utility for Trinity -Group: Applications/Utilities - -%description -n trinity-ktimer -This is a timer application for TDE. It allows you to execute commands after -a certain amount of time. It supports looping commands as well as delayed -command execution. - -%files -n trinity-ktimer -%defattr(-,root,root,-) -%{tde_bindir}/ktimer -%{tde_tdeappdir}/ktimer.desktop -%{tde_datadir}/icons/hicolor/*/apps/ktimer.png -%{tde_tdedocdir}/HTML/en/ktimer/ - -%post -n trinity-ktimer -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-ktimer -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kwalletmanager -Summary: wallet manager for Trinity -Group: Applications/Utilities - -%description -n trinity-kwalletmanager -This program keeps various wallets for any kind of data that the user can -store encrypted with passwords and can also serve as a password manager that -keeps a master password to all wallets. - -%files -n trinity-kwalletmanager -%defattr(-,root,root,-) -%{tde_bindir}/kwalletmanager -%{tde_tdelibdir}/kcm_kwallet.la -%{tde_tdelibdir}/kcm_kwallet.so -%{tde_tdeappdir}/kwalletconfig.desktop -%{tde_tdeappdir}/kwalletmanager.desktop -%{tde_tdeappdir}/kwalletmanager-kwalletd.desktop -%{tde_datadir}/apps/kwalletmanager/ -%{tde_datadir}/icons/hicolor/*/apps/kwalletmanager.png -%{tde_datadir}/services/kwallet_config.desktop -%{tde_datadir}/services/kwalletmanager_show.desktop -%{tde_tdedocdir}/HTML/en/kwallet/ - -%post -n trinity-kwalletmanager -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kwalletmanager -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-superkaramba -Summary: a program based on karamba improving the eyecandy of TDE -Group: Applications/Utilities - -%description -n trinity-superkaramba -SuperKaramba is a tool based on karamba that allows anyone to easily create -and run little interactive widgets on a TDE desktop. Widgets are defined in a -simple text file and can be augmented with Python code to make them -interactive. - -Here are just some examples of the things that can be done: -* Display system information such as CPU Usage, MP3 playing, etc. -* Create cool custom toolbars that work any way imaginable. -* Create little games or virtual pets that live on your desktop. -* Display information from the internet, such as weather and headlines. - -%files -n trinity-superkaramba -%defattr(-,root,root,-) -%{tde_bindir}/superkaramba -%{tde_datadir}/applnk/Utilities/superkaramba.desktop -%{tde_datadir}/apps/superkaramba/superkarambaui.rc -%{tde_datadir}/icons/crystalsvg/*/apps/superkaramba.png -%{tde_datadir}/icons/crystalsvg/*/mimetypes/superkaramba_theme.png -%{tde_datadir}/icons/crystalsvg/scalable/apps/superkaramba.svgz -%{tde_datadir}/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz -%{tde_datadir}/mimelnk/application/x-superkaramba.desktop -%{tde_tdedocdir}/HTML/en/superkaramba/ - -%post -n trinity-superkaramba -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done - -%postun -n trinity-superkaramba -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done - -########## - -# afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: trinity-tdelibs-devel - -Obsoletes: trinity-kdeutils-devel < %{version}-%{release} -Provides: trinity-kdeutils-devel = %{version}-%{release} -Obsoletes: tdeutils-devel < %{version}-%{release} -Provides: tdeutils-devel = %{version}-%{release} - -%description devel -Development files for %{name}. - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/* -%if 0%{?build_klaptopdaemon} -%{tde_libdir}/libkcmlaptop.la -%{tde_libdir}/libkcmlaptop.so -%endif -%{tde_libdir}/libkdeinit_ark.la -%{tde_libdir}/libkdeinit_irkick.la -%{tde_libdir}/libkdeinit_kcalc.la -%{tde_libdir}/libkdeinit_kedit.la -%{tde_libdir}/libkmilo.la -%{tde_libdir}/libkmilo.so -%{tde_libdir}/libkregexpeditorcommon.la -%{tde_libdir}/libkregexpeditorcommon.so -%{tde_libdir}/libksimcore.la -%{tde_libdir}/libksimcore.so -%{tde_libdir}/libkhexeditcommon.la -%{tde_libdir}/libkhexeditcommon.so -%{tde_datadir}/cmake/libksimcore.cmake - -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%if 0%{?rhel} == 4 -%patch1 -p1 -b .rhel4 -%endif - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Do not build against any "/usr" installed KDE -export KDEDIR="%{tde_prefix}" - -# Shitty hack for RHEL4 ... -if [ -d "/usr/X11R6" ]; then - export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ - -DBIN_INSTALL_DIR="%{tde_bindir}" \ - -DDOC_INSTALL_DIR="%{tde_docdir}" \ - -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ - -DLIB_INSTALL_DIR="%{tde_libdir}" \ - -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ - -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ - \ - -DWITH_DPMS=ON \ - %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \ - -DWITH_ASUS=ON \ - -DWITH_POWERBOOK=OFF \ - -DWITH_POWERBOOK2=OFF \ - -DWITH_VAIO=ON \ - -DWITH_THINKPAD=ON \ - -DWITH_I8K=ON \ - -DWITH_SNMP=ON \ - -DWITH_SENSORS=ON \ - -DWITH_XMMS=ON \ - -DWITH_KNEWSTUFF=ON \ - -DBUILD_ALL=ON \ - %{?!build_klaptopdaemon:-DBUILD_KLAPTOPDAEMON=OFF} \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} -C build - -%if 0%{?build_klaptopdaemon} -### Use consolehelper for 'klaptop_acpi_helper' -%if 0%{?with_consolehelper} -# Install configuration files -%__install -p -D -m 644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/pam.d/klaptop_acpi_helper" -%__install -p -D -m 644 "%{SOURCE2}" "%{buildroot}%{_sysconfdir}/security/console.apps/klaptop_acpi_helper" -# Moves the actual binary from 'bin' to 'sbin' -%__mkdir_p "%{buildroot}%{tde_sbindir}" "%{buildroot}%{_sbindir}" -%__mv "%{buildroot}%{tde_bindir}/klaptop_acpi_helper" "%{buildroot}%{tde_sbindir}" -# Links to consolehelper -%__ln_s "%{_bindir}/consolehelper" "%{buildroot}%{tde_bindir}/klaptop_acpi_helper" -# Put another symlink under '/usr', otherwise consolehelper does not work -%if "%{tde_prefix}" != "/usr" -%__ln_s "%{tde_sbindir}/klaptop_acpi_helper" "%{?buildroot}%{_sbindir}/klaptop_acpi_helper" -%endif -%endif - -# klaptop settings file -%__install -p -D -m 644 "%{SOURCE3}" "%{buildroot}%{tde_datadir}/config/kcmlaptoprc" - -%else - -# Klaptop's documentation is installed even if we did not build the program ... -%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatcrit/ -%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatwarn/ -%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/laptop/ -%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/powerctrl/ - -%endif - - -%clean -%__rm -rf "%{?buildroot}" - - -%changelog diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec index 2eafa51b3..04f86ad6d 100644 --- a/redhat/main/tdeutils/tdeutils.spec +++ b/redhat/main/tdeutils/tdeutils.spec @@ -21,7 +21,7 @@ # TDE variables %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdeutils %define tde_prefix /opt/trinity @@ -81,9 +81,19 @@ BuildRequires: fdupes BuildRequires: gettext BuildRequires: net-snmp-devel -BuildRequires: python-devel BuildRequires: gmp-devel +# PYTHON support +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 +%define python python2 +%define __python %__python2 +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%else +%define python python +%endif +BuildRequires: %{python} +BuildRequires: %{python}-devel + # SUSE desktop files utility %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -135,7 +145,7 @@ BuildRequires: pcre-devel BuildRequires: libacl-devel # XSCREENSAVER support -%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version} +%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version} %define with_xscreensaver 1 %if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version} BuildRequires: libXScrnSaver-devel @@ -574,7 +584,7 @@ power management, for laptops, from within TDE. %{_sbindir}/klaptop_acpi_helper %endif -%config %{tde_confdir}/kcmlaptoprc +%config(noreplace) %{tde_confdir}/kcmlaptoprc %endif @@ -680,7 +690,7 @@ connections, power, etc. %files -n trinity-ksim %defattr(-,root,root,-) -%config %{tde_confdir}/ksim_panelextensionrc +%config(noreplace) %{tde_confdir}/ksim_panelextensionrc %{tde_tdelibdir}/ksim_*.la %{tde_tdelibdir}/ksim_*.so %{tde_libdir}/libksimcore.so.* @@ -948,7 +958,11 @@ export PATH="%{tde_bindir}:${PATH}" %endif # Fix desktop shortcut location -%__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop" +if [ -d "%{?buildroot}%{tde_datadir}/applnk" ]; then + %__mkdir_p "%{?buildroot}%{tde_tdeappdir}" + %__mv "%{?buildroot}%{tde_datadir}/applnk/Utilities/superkaramba.desktop" "%{?buildroot}%{tde_tdeappdir}/superkaramba.desktop" + %__rm -rf "%{?buildroot}%{tde_datadir}/applnk" +fi # Updates applications categories for openSUSE %if 0%{?suse_version} diff --git a/redhat/main/tdevelop/tdevelop-3.5.13.2.spec b/redhat/main/tdevelop/tdevelop-3.5.13.2.spec deleted file mode 100644 index 0186370c8..000000000 --- a/redhat/main/tdevelop/tdevelop-3.5.13.2.spec +++ /dev/null @@ -1,659 +0,0 @@ -# -# spec file for package tdevelop (version 3.5.13-SRU) -# -# 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/ -# - -# BUILD WARNING: -# Remove qt-devel and qt3-devel and any kde*-devel on your system ! -# Having KDE libraries may cause FTBFS here ! - -# TDE variables -%define tde_epoch 1 -%define tde_version 3.5.13.2 -%define tde_pkg tdevelop -%define tde_prefix /opt/trinity -%define tde_bindir %{tde_prefix}/bin -%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_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - - -Name: trinity-%{tde_pkg} -Summary: Integrated Development Environment for C++/C -Version: %{tde_version} -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} -Group: Development/Tools -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Project -#Packager: Francois Andriot <francois.andriot@free.fr> - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - -Requires: %{name}-libs = %{version}-%{release} - -BuildRequires: tqt3-apps-devel >= 3.5.0 -BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: trinity-tdesdk-devel >= %{tde_version} - -Obsoletes: trinity-kdevelop < %{version}-%{release} -Provides: trinity-kdevelop = %{version}-%{release} - -# 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 - -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: fdupes -BuildRequires: desktop-file-utils -BuildRequires: make - -Requires: make -Requires: perl -Requires: qt3-devel >= 3.3.8.d -Requires: gettext -Requires: ctags - - -# LIBIDN support -BuildRequires: libidn-devel - -# GAMIN support -# Not on openSUSE. -%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -%define with_gamin 1 -BuildRequires: gamin-devel -%endif - -# PCRE support -BuildRequires: pcre-devel - -# DB4 support -%if 0%{?rhel} || 0%{?fedora} -BuildRequires: db4-devel -%endif - -# FLEX support -BuildRequires: flex -Requires: flex >= 2.5.4 - -# SVN support -BuildRequires: subversion-devel - -# NEON support -BuildRequires: neon-devel - -# LDAP support -%if 0%{?suse_version} -BuildRequires: openldap2-devel -%else -BuildRequires: openldap-devel -%endif - -# LIBACL support -%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: libacl-devel -%endif - -%description -The TDevelop Integrated Development Environment provides many features -that developers need as well as providing a unified interface to programs -like gdb, the C/C++ compiler, and make. TDevelop manages or provides: - -All development tools needed for C++ programming like Compiler, -Linker, automake and autoconf; KAppWizard, which generates complete, -ready-to-go sample applications; Classgenerator, for creating new -classes and integrating them into the current project; File management -for sources, headers, documentation etc. to be included in the -project; The creation of User-Handbooks written with SGML and the -automatic generation of HTML-output with the KDE look and feel; -Automatic HTML-based API-documentation for your project's classes with -cross-references to the used libraries; Internationalization support -for your application, allowing translators to easily add their target -language to a project; - -tdevelop also includes WYSIWYG (What you see is what you get)-creation -of user interfaces with a built-in dialog editor; Debugging your -application by integrating KDbg; Editing of project-specific pixmaps -with KIconEdit; The inclusion of any other program you need for -development by adding it to the "Tools"-menu according to your -individual needs. - -%files -%defattr(-,root,root,-) -%{tde_bindir}/kdevassistant -%{tde_bindir}/kdevdesigner -%{tde_bindir}/kdevelop -%{tde_bindir}/kdevelop-htdig -%{tde_bindir}/kdevprj2kdevelop -%{tde_bindir}/kdevprofileeditor -%{tde_libdir}/kconf_update_bin/kdev-gen-settings-kconf_update -%{tde_tdeappdir}/kdevassistant.desktop -%{tde_tdeappdir}/kdevdesigner.desktop -%{tde_tdeappdir}/kdevelop.desktop -%{tde_tdeappdir}/kdevelop_c_cpp.desktop -%{tde_tdeappdir}/kdevelop_kde_cpp.desktop -%{tde_tdeappdir}/kdevelop_ruby.desktop -%{tde_tdeappdir}/kdevelop_scripting.desktop -%{tde_tdelibdir}/kio_chm.la -%{tde_tdelibdir}/kio_chm.so -%{tde_tdelibdir}/kio_csharpdoc.la -%{tde_tdelibdir}/kio_csharpdoc.so -%{tde_tdelibdir}/kio_perldoc.la -%{tde_tdelibdir}/kio_perldoc.so -%{tde_tdelibdir}/kio_pydoc.la -%{tde_tdelibdir}/kio_pydoc.so -%{tde_tdelibdir}/libdocchmplugin.la -%{tde_tdelibdir}/libdocchmplugin.so -%{tde_tdelibdir}/libdoccustomplugin.la -%{tde_tdelibdir}/libdoccustomplugin.so -%{tde_tdelibdir}/libdocdevhelpplugin.la -%{tde_tdelibdir}/libdocdevhelpplugin.so -%{tde_tdelibdir}/libdocdoxygenplugin.la -%{tde_tdelibdir}/libdocdoxygenplugin.so -%{tde_tdelibdir}/libdockdevtocplugin.la -%{tde_tdelibdir}/libdockdevtocplugin.so -%{tde_tdelibdir}/libdocqtplugin.la -%{tde_tdelibdir}/libdocqtplugin.so -%{tde_tdelibdir}/libkchmpart.la -%{tde_tdelibdir}/libkchmpart.so -%{tde_tdelibdir}/libkdevabbrev.la -%{tde_tdelibdir}/libkdevabbrev.so -%{tde_tdelibdir}/libkdevadaproject.la -%{tde_tdelibdir}/libkdevadaproject.so -%{tde_tdelibdir}/libkdevadasupport.la -%{tde_tdelibdir}/libkdevadasupport.so -%{tde_tdelibdir}/libkdevantproject.la -%{tde_tdelibdir}/libkdevantproject.so -%{tde_tdelibdir}/libkdevappview.la -%{tde_tdelibdir}/libkdevappview.so -%{tde_tdelibdir}/libkdevappwizard.la -%{tde_tdelibdir}/libkdevappwizard.so -%{tde_tdelibdir}/libkdevastyle.la -%{tde_tdelibdir}/libkdevastyle.so -%{tde_tdelibdir}/libkdevautoproject.la -%{tde_tdelibdir}/libkdevautoproject.so -%{tde_tdelibdir}/libkdevbashsupport.la -%{tde_tdelibdir}/libkdevbashsupport.so -%{tde_tdelibdir}/libkdevbookmarks.la -%{tde_tdelibdir}/libkdevbookmarks.so -%{tde_tdelibdir}/libkdevclassview.la -%{tde_tdelibdir}/libkdevclassview.so -%{tde_tdelibdir}/libkdevcppsupport.la -%{tde_tdelibdir}/libkdevcppsupport.so -%{tde_tdelibdir}/libkdevcsharpsupport.la -%{tde_tdelibdir}/libkdevcsharpsupport.so -%{tde_tdelibdir}/libkdevctags2.la -%{tde_tdelibdir}/libkdevctags2.so -%{tde_tdelibdir}/libkdevcustompcsimporter.la -%{tde_tdelibdir}/libkdevcustompcsimporter.so -%{tde_tdelibdir}/libkdevcustomproject.la -%{tde_tdelibdir}/libkdevcustomproject.so -%{tde_tdelibdir}/libkdevdccoptions.la -%{tde_tdelibdir}/libkdevdccoptions.so -%{tde_tdelibdir}/libkdevdebugger.la -%{tde_tdelibdir}/libkdevdebugger.so -%{tde_tdelibdir}/libkdevdesignerpart.la -%{tde_tdelibdir}/libkdevdesignerpart.so -%{tde_tdelibdir}/libkdevdiff.la -%{tde_tdelibdir}/libkdevdiff.so -%{tde_tdelibdir}/libkdevdistpart.la -%{tde_tdelibdir}/libkdevdistpart.so -%{tde_tdelibdir}/libkdevdocumentation.la -%{tde_tdelibdir}/libkdevdocumentation.so -%{tde_tdelibdir}/libkdevdoxygen.la -%{tde_tdelibdir}/libkdevdoxygen.so -%{tde_tdelibdir}/libkdeveditorchooser.la -%{tde_tdelibdir}/libkdeveditorchooser.so -%{tde_tdelibdir}/libkdevfilecreate.la -%{tde_tdelibdir}/libkdevfilecreate.so -%{tde_tdelibdir}/libkdevfilegroups.la -%{tde_tdelibdir}/libkdevfilegroups.so -%{tde_tdelibdir}/libkdevfilelist.la -%{tde_tdelibdir}/libkdevfilelist.so -%{tde_tdelibdir}/libkdevfileselector.la -%{tde_tdelibdir}/libkdevfileselector.so -%{tde_tdelibdir}/libkdevfileview.la -%{tde_tdelibdir}/libkdevfileview.so -%{tde_tdelibdir}/libkdevfilter.la -%{tde_tdelibdir}/libkdevfilter.so -%{tde_tdelibdir}/libkdevfortransupport.la -%{tde_tdelibdir}/libkdevfortransupport.so -%{tde_tdelibdir}/libkdevfpcoptions.la -%{tde_tdelibdir}/libkdevfpcoptions.so -%{tde_tdelibdir}/libkdevfullscreen.la -%{tde_tdelibdir}/libkdevfullscreen.so -%{tde_tdelibdir}/libkdevgccoptions.la -%{tde_tdelibdir}/libkdevgccoptions.so -%{tde_tdelibdir}/libkdevgrepview.la -%{tde_tdelibdir}/libkdevgrepview.so -%{tde_tdelibdir}/libkdevjavasupport.la -%{tde_tdelibdir}/libkdevjavasupport.so -%{tde_tdelibdir}/libkdevkdelibsimporter.la -%{tde_tdelibdir}/libkdevkdelibsimporter.so -%{tde_tdelibdir}/libkdevkonsoleview.la -%{tde_tdelibdir}/libkdevkonsoleview.so -%{tde_tdelibdir}/libkdevmakeview.la -%{tde_tdelibdir}/libkdevmakeview.so -%{tde_tdelibdir}/libkdevopenwith.la -%{tde_tdelibdir}/libkdevopenwith.so -%{tde_tdelibdir}/libkdevpartexplorer.la -%{tde_tdelibdir}/libkdevpartexplorer.so -%{tde_tdelibdir}/libkdevpascalproject.la -%{tde_tdelibdir}/libkdevpascalproject.so -%{tde_tdelibdir}/libkdevpascalsupport.la -%{tde_tdelibdir}/libkdevpascalsupport.so -%{tde_tdelibdir}/libkdevperlsupport.la -%{tde_tdelibdir}/libkdevperlsupport.so -%{tde_tdelibdir}/libkdevpgioptions.la -%{tde_tdelibdir}/libkdevpgioptions.so -%{tde_tdelibdir}/libkdevphpsupport.la -%{tde_tdelibdir}/libkdevphpsupport.so -%{tde_tdelibdir}/libkdevpythonsupport.la -%{tde_tdelibdir}/libkdevpythonsupport.so -%{tde_tdelibdir}/libkdevqt4importer.la -%{tde_tdelibdir}/libkdevqt4importer.so -%{tde_tdelibdir}/libkdevqtimporter.la -%{tde_tdelibdir}/libkdevqtimporter.so -%{tde_tdelibdir}/libkdevquickopen.la -%{tde_tdelibdir}/libkdevquickopen.so -%{tde_tdelibdir}/libkdevrbdebugger.la -%{tde_tdelibdir}/libkdevrbdebugger.so -%{tde_tdelibdir}/libkdevregexptest.la -%{tde_tdelibdir}/libkdevregexptest.so -%{tde_tdelibdir}/libkdevreplace.la -%{tde_tdelibdir}/libkdevreplace.so -%{tde_tdelibdir}/libkdevrubysupport.la -%{tde_tdelibdir}/libkdevrubysupport.so -%{tde_tdelibdir}/libkdevscripting.la -%{tde_tdelibdir}/libkdevscripting.so -%{tde_tdelibdir}/libkdevscriptproject.la -%{tde_tdelibdir}/libkdevscriptproject.so -%{tde_tdelibdir}/libkdevsnippet.la -%{tde_tdelibdir}/libkdevsnippet.so -%{tde_tdelibdir}/libkdevsqlsupport.la -%{tde_tdelibdir}/libkdevsqlsupport.so -%{tde_tdelibdir}/libkdevtexttools.la -%{tde_tdelibdir}/libkdevtexttools.so -%{tde_tdelibdir}/libkdevtipofday.la -%{tde_tdelibdir}/libkdevtipofday.so -%{tde_tdelibdir}/libkdevtools.la -%{tde_tdelibdir}/libkdevtools.so -%{tde_tdelibdir}/libkdevtrollproject.la -%{tde_tdelibdir}/libkdevtrollproject.so -%{tde_tdelibdir}/libkdevuichooser.la -%{tde_tdelibdir}/libkdevuichooser.so -%{tde_tdelibdir}/libkdevvalgrind.la -%{tde_tdelibdir}/libkdevvalgrind.so -%{tde_tdelibdir}/libkdevvcsmanager.la -%{tde_tdelibdir}/libkdevvcsmanager.so -%{tde_datadir}/apps/kconf_update/ -%{tde_datadir}/apps/kdevabbrev/ -%{tde_datadir}/apps/kdevadaproject/ -%{tde_datadir}/apps/kdevadasupport/ -%{tde_datadir}/apps/kdevantproject/ -%{tde_datadir}/apps/kdevappoutputview/ -%{tde_datadir}/apps/kdevappwizard/ -%{tde_datadir}/apps/kdevassistant/ -%{tde_datadir}/apps/kdevastyle/ -%{tde_datadir}/apps/kdevautoproject/ -%{tde_datadir}/apps/kdevbashsupport/ -%{tde_datadir}/apps/kdevclassview/ -%{tde_datadir}/apps/kdevcppsupport/ -%{tde_datadir}/icons/hicolor/*/actions/breakpoint_add.png -%{tde_datadir}/icons/hicolor/*/actions/breakpoint_delete.png -%{tde_datadir}/icons/hicolor/*/actions/breakpoint_delete_all.png -%{tde_datadir}/icons/hicolor/*/actions/breakpoint_edit.png -%{tde_datadir}/icons/hicolor/*/actions/ktip.png -%{tde_datadir}/icons/hicolor/*/apps/kdevassistant.png -%{tde_datadir}/icons/hicolor/*/apps/kdevdesigner.png -%{tde_datadir}/icons/hicolor/*/apps/kdevelop.png -%{tde_datadir}/icons/locolor/*/actions/kdevelop_tip.png -%{tde_datadir}/mimelnk/application/x-kdevelop.desktop -%{tde_datadir}/services/chm.protocol -%{tde_datadir}/services/csharpdoc.protocol -%{tde_datadir}/services/docchmplugin.desktop -%{tde_datadir}/services/doccustomplugin.desktop -%{tde_datadir}/services/docdevhelpplugin.desktop -%{tde_datadir}/services/docdoxygenplugin.desktop -%{tde_datadir}/services/dockdevtocplugin.desktop -%{tde_datadir}/services/docqtplugin.desktop -%{tde_datadir}/services/kchmpart.desktop -%{tde_datadir}/services/kdevabbrev.desktop -%{tde_datadir}/services/kdevadaproject.desktop -%{tde_datadir}/services/kdevadasupport.desktop -%{tde_datadir}/services/kdevantproject.desktop -%{tde_datadir}/services/kdevappoutputview.desktop -%{tde_datadir}/services/kdevappwizard.desktop -%{tde_datadir}/services/kdevastyle.desktop -%{tde_datadir}/services/kdevautoproject.desktop -%{tde_datadir}/services/kdevbashsupport.desktop -%{tde_datadir}/services/kdevbookmarks.desktop -%{tde_datadir}/services/kdevclassview.desktop -%{tde_datadir}/services/kdevcppsupport.desktop -%{tde_datadir}/services/kdevcsharpsupport.desktop -%{tde_datadir}/services/kdevcsupport.desktop -%{tde_datadir}/services/kdevctags2.desktop -%{tde_datadir}/services/kdevcustomproject.desktop -%{tde_datadir}/services/kdevdccoptions.desktop -%{tde_datadir}/services/kdevdebugger.desktop -%{tde_datadir}/services/kdevdesigner_part.desktop -%{tde_datadir}/services/kdevdiff.desktop -%{tde_datadir}/services/kdevdistpart.desktop -%{tde_datadir}/services/kdevdocumentation.desktop -%{tde_datadir}/services/kdevdoxygen.desktop -%{tde_datadir}/services/kdeveditorchooser.desktop -%{tde_datadir}/services/kdevfilecreate.desktop -%{tde_datadir}/services/kdevfilegroups.desktop -%{tde_datadir}/services/kdevfilelist.desktop -%{tde_datadir}/services/kdevfileselector.desktop -%{tde_datadir}/services/kdevfileview.desktop -%{tde_datadir}/services/kdevfilter.desktop -%{tde_datadir}/services/kdevfortransupport.desktop -%{tde_datadir}/services/kdevfpcoptions.desktop -%{tde_datadir}/services/kdevfullscreen.desktop -%{tde_datadir}/services/kdevg77options.desktop -%{tde_datadir}/services/kdevgccoptions.desktop -%{tde_datadir}/services/kdevgppoptions.desktop -%{tde_datadir}/services/kdevgrepview.desktop -%{tde_datadir}/services/kdevjavasupport.desktop -%{tde_datadir}/services/kdevkdeautoproject.desktop -%{tde_datadir}/services/kdevkdelibsimporter.desktop -%{tde_datadir}/services/kdevkonsoleview.desktop -%{tde_datadir}/services/kdevmakeview.desktop -%{tde_datadir}/services/kdevopenwith.desktop -%{tde_datadir}/services/kdevpartexplorer.desktop -%{tde_datadir}/services/kdevpascalproject.desktop -%{tde_datadir}/services/kdevpascalsupport.desktop -%{tde_datadir}/services/kdevpcscustomimporter.desktop -%{tde_datadir}/services/kdevperlsupport.desktop -%{tde_datadir}/services/kdevpgf77options.desktop -%{tde_datadir}/services/kdevpghpfoptions.desktop -%{tde_datadir}/services/kdevphpsupport.desktop -%{tde_datadir}/services/kdevpythonsupport.desktop -%{tde_datadir}/services/kdevqt4importer.desktop -%{tde_datadir}/services/kdevqtimporter.desktop -%{tde_datadir}/services/kdevquickopen.desktop -%{tde_datadir}/services/kdevrbdebugger.desktop -%{tde_datadir}/services/kdevregexptest.desktop -%{tde_datadir}/services/kdevreplace.desktop -%{tde_datadir}/services/kdevrubysupport.desktop -%{tde_datadir}/services/kdevscripting.desktop -%{tde_datadir}/services/kdevscriptproject.desktop -%{tde_datadir}/services/kdevsnippet.desktop -%{tde_datadir}/services/kdevsqlsupport.desktop -%{tde_datadir}/services/kdevtexttools.desktop -%{tde_datadir}/services/kdevtipofday.desktop -%{tde_datadir}/services/kdevtmakeproject.desktop -%{tde_datadir}/services/kdevtools.desktop -%{tde_datadir}/services/kdevtrollproject.desktop -%{tde_datadir}/services/kdevuichooser.desktop -%{tde_datadir}/services/kdevvalgrind.desktop -%{tde_datadir}/services/kdevvcsmanager.desktop -%{tde_datadir}/services/perldoc.protocol -%{tde_datadir}/services/pydoc.protocol -%{tde_datadir}/servicetypes/kdevelopappfrontend.desktop -%{tde_datadir}/servicetypes/kdevelopcodebrowserfrontend.desktop -%{tde_datadir}/servicetypes/kdevelopcompileroptions.desktop -%{tde_datadir}/servicetypes/kdevelopcreatefile.desktop -%{tde_datadir}/servicetypes/kdevelopdifffrontend.desktop -%{tde_datadir}/servicetypes/kdevelopdocumentationplugins.desktop -%{tde_datadir}/servicetypes/kdeveloplanguagesupport.desktop -%{tde_datadir}/servicetypes/kdevelopmakefrontend.desktop -%{tde_datadir}/servicetypes/kdeveloppcsimporter.desktop -%{tde_datadir}/servicetypes/kdevelopplugin.desktop -%{tde_datadir}/servicetypes/kdevelopproject.desktop -%{tde_datadir}/servicetypes/kdevelopquickopen.desktop -%{tde_datadir}/servicetypes/kdevelopsourceformatter.desktop -%{tde_datadir}/servicetypes/kdevelopvcsintegrator.desktop -%{tde_datadir}/servicetypes/kdevelopversioncontrol.desktop -%{tde_datadir}/apps/kdevcsharpsupport/ -%{tde_datadir}/apps/kdevctags2/ -%{tde_datadir}/apps/kdevcustomproject/ -%{tde_datadir}/apps/kdevdebugger/ -%{tde_datadir}/apps/kdevdesigner/ -%{tde_datadir}/apps/kdevdesignerpart/ -%{tde_datadir}/apps/kdevdesignerpart/ -%{tde_datadir}/apps/kdevdiff/ -%{tde_datadir}/apps/kdevdistpart/ -%{tde_datadir}/apps/kdevdocumentation/ -%{tde_datadir}/apps/kdevdoxygen/ -%{tde_datadir}/apps/kdevelop/ -%{tde_datadir}/apps/kdevfilecreate/ -%{tde_datadir}/apps/kdevfilelist/ -%{tde_datadir}/apps/kdevfilter/ -%{tde_datadir}/apps/kdevfortransupport/ -%{tde_datadir}/apps/kdevfullscreen/ -%{tde_datadir}/apps/kdevgrepview/ -%{tde_datadir}/apps/kdevjavasupport/ -%{tde_datadir}/apps/kdevmakeview/ -%{tde_datadir}/apps/kdevpartexplorer/ -%{tde_datadir}/apps/kdevpascalproject/ -%{tde_datadir}/apps/kdevpascalsupport/ -%{tde_datadir}/apps/kdevperlsupport/ -%{tde_datadir}/apps/kdevphpsupport/ -%{tde_datadir}/apps/kdevpythonsupport/ -%{tde_datadir}/apps/kdevquickopen/ -%{tde_datadir}/apps/kdevrbdebugger/ -%{tde_datadir}/apps/kdevregexptest/ -%{tde_datadir}/apps/kdevreplace/ -%{tde_datadir}/apps/kdevrubysupport/ -%{tde_datadir}/apps/kdevscripting/ -%{tde_datadir}/apps/kdevscriptproject/ -%{tde_datadir}/apps/kdevsnippet/ -%{tde_datadir}/apps/kdevsqlsupport -%{tde_datadir}/apps/kdevtipofday/ -%{tde_datadir}/apps/kdevtools/ -%{tde_datadir}/apps/kdevtrollproject/ -%{tde_datadir}/apps/kdevvalgrind/ -%{tde_datadir}/apps/kio_pydoc/ -%{tde_datadir}/config/kdevassistantrc -%{tde_datadir}/config/kdeveloprc -%{tde_datadir}/desktop-directories/tde-development-kdevelop.directory -%{tde_tdedocdir}/HTML/en/kdevelop/ -%{tde_libdir}/libd.so.0 -%{tde_libdir}/libd.so.0.0.0 -%{tde_libdir}/libkinterfacedesigner.so.0 -%{tde_libdir}/libkinterfacedesigner.so.0.0.0 -%{tde_tdelibdir}/libkdevvisualboyadvance.la -%{tde_tdelibdir}/libkdevvisualboyadvance.so -%{tde_datadir}/apps/kdevdesignerpart/pics/ -%{tde_datadir}/apps/kdevvisualboyadvance/ -%{tde_tdedocdir}/HTML/en/kde_app_devel/ -%{tde_datadir}/mimelnk/text/x-fortran.desktop -%{tde_datadir}/services/kdevvisualboyadvance.desktop - -%post -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries/Other -Requires: %{name}-libs = %{version}-%{release} - -Obsoletes: trinity-kdevelop-devel < %{version}-%{release} -Provides: trinity-kdevelop-devel = %{version}-%{release} - -%description devel -This package contains the development files for tdevelop. - -%files devel -%defattr(-,root,root,-) -%{tde_libdir}/lib*.so -%{tde_libdir}/lib*.la -%{tde_includedir}/* - -%post devel -/sbin/ldconfig || : - -%postun devel -/sbin/ldconfig || : - -########## - -%package libs -Summary: %{name} runtime libraries -Group: System Environment/Libraries -Requires: trinity-tdelibs >= %{tde_version} -# include to be paranoid, installing libs-only is still mostly untested -- Rex -Requires: %{name} = %{version}-%{release} - -Obsoletes: trinity-kdevelop-libs < %{version}-%{release} -Provides: trinity-kdevelop-libs = %{version}-%{release} - -%description libs -This package contains the libraries needed for the tdevelop programs. - -%files libs -%defattr(-,root,root,-) -%{tde_libdir}/libdesignerintegration.so.0 -%{tde_libdir}/libdesignerintegration.so.0.0.0 -%{tde_libdir}/libdocumentation_interfaces.so.0 -%{tde_libdir}/libdocumentation_interfaces.so.0.0.0 -%{tde_libdir}/libgdbmi_parser.so.0 -%{tde_libdir}/libgdbmi_parser.so.0.0.0 -%{tde_libdir}/libkdevbuildbase.so.0 -%{tde_libdir}/libkdevbuildbase.so.0.0.0 -%{tde_libdir}/libkdevbuildtoolswidgets.so.0 -%{tde_libdir}/libkdevbuildtoolswidgets.so.0.0.0 -%{tde_libdir}/libkdevcatalog.so.0 -%{tde_libdir}/libkdevcatalog.so.0.0.0 -%{tde_libdir}/libkdevcppparser.so.0 -%{tde_libdir}/libkdevcppparser.so.0.0.0 -%{tde_libdir}/libkdevelop.so.1 -%{tde_libdir}/libkdevelop.so.1.0.0 -%{tde_libdir}/libkdevextras.so.0 -%{tde_libdir}/libkdevextras.so.0.0.0 -%{tde_libdir}/libkdevpropertyeditor.so.0 -%{tde_libdir}/libkdevpropertyeditor.so.0.0.0 -%{tde_libdir}/libkdevqmakeparser.so.0 -%{tde_libdir}/libkdevqmakeparser.so.0.0.0 -%{tde_libdir}/libkdevshell.so.0 -%{tde_libdir}/libkdevshell.so.0.0.0 -%{tde_libdir}/libkdevwidgets.so.0 -%{tde_libdir}/libkdevwidgets.so.0.0.0 -%{tde_libdir}/liblang_debugger.so.0 -%{tde_libdir}/liblang_debugger.so.0.0.0 -%{tde_libdir}/liblang_interfaces.so.0 -%{tde_libdir}/liblang_interfaces.so.0.0.0 -%{tde_libdir}/libprofileengine.so.0 -%{tde_libdir}/libprofileengine.so.0.0.0 - -%post libs -/sbin/ldconfig || : - -%postun libs -/sbin/ldconfig || : - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%debug_package -%endif - -########## - -%prep -%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -if ! rpm -E %%cmake|grep -q "cd build"; then - %__mkdir_p build - cd build -fi - -%cmake \ - -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ - -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ - -DCMAKE_NO_BUILTIN_CHRPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - \ - -DWITH_BUILDTOOL_ALL=ON \ - -DWITH_LANGUAGE_ALL=ON \ - -DWITH_VCS_ALL=OFF \ - -DBUILD_ALL=ON \ - .. - -%__make %{?_smp_mflags} || %__make - - -%install -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - -# Links duplicate files -%fdupes "%{?buildroot}%{tde_datadir}" - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/main/tdevelop/tdevelop-14.0.0.spec b/redhat/main/tdevelop/tdevelop.spec index e958532c8..87bc405d8 100644 --- a/redhat/main/tdevelop/tdevelop-14.0.0.spec +++ b/redhat/main/tdevelop/tdevelop.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdevelop %define tde_prefix /opt/trinity @@ -108,10 +108,16 @@ BuildRequires: gamin-devel # PCRE support BuildRequires: pcre-devel +# DB5 support +%if 0%{?rhel} >= 8 +BuildRequires: libdb-devel + +%else # DB4 support %if 0%{?rhel} || 0%{?fedora} BuildRequires: db4-devel %endif +%endif # FLEX support BuildRequires: flex @@ -176,8 +182,8 @@ individual needs. %{tde_bindir}/kdevprj2kdevelop %{tde_bindir}/kdevprofileeditor %{tde_libdir}/tdeconf_update_bin/kdev-gen-settings-tdeconf_update -%{tde_confdir}/kdevassistantrc -%{tde_confdir}/tdeveloprc +%config(noreplace) %{tde_confdir}/kdevassistantrc +%config(noreplace) %{tde_confdir}/tdeveloprc %{tde_tdeappdir}/kdevassistant.desktop %{tde_tdeappdir}/kdevdesigner.desktop %{tde_tdeappdir}/tdevelop.desktop diff --git a/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec b/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec deleted file mode 100644 index c26bb4008..000000000 --- a/redhat/main/tdewebdev/tdewebdev-3.5.13.2.spec +++ /dev/null @@ -1,552 +0,0 @@ -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%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/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - -Name: trinity-tdewebdev -Version: %{tde_version} -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} -License: GPL -Summary: Web development applications -Group: Applications/Editors - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Source1: http://download.sourceforge.net/quanta/css.tar.bz2 -Source2: http://download.sourceforge.net/quanta/html.tar.bz2 -Source3: http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2 -Source4: http://download.sourceforge.net/quanta/javascript.tar.bz2 - -Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch - -BuildRequires: autoconf automake libtool m4 -BuildRequires: desktop-file-utils -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdesdk-devel >= %{tde_version} -BuildRequires: libxslt-devel -BuildRequires: libxml2-devel -%if 0%{?rhel} == 4 -# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241) -BuildRequires: libgcrypt-devel -%endif -BuildRequires: perl - -# KXSLDBG requires libxml2 -#if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || ( 0%{?fedora} > 0 && %{?fedora} <= 17 ) || 0%{?suse_version} -%define build_kxsldbg 1 -#endif - - -Obsoletes: trinity-kdewebdev-libs < %{version}-%{release} -Provides: trinity-kdewebdev-libs = %{version}-%{release} -Obsoletes: trinity-kdewebdev < %{version}-%{release} -Provides: trinity-kdewebdev = %{version}-%{release} - -Requires: trinity-quanta = %{version}-%{release} -Requires: trinity-quanta-data = %{version}-%{release} -Requires: trinity-kfilereplace = %{version}-%{release} -Requires: trinity-kimagemapeditor = %{version}-%{release} -Requires: trinity-klinkstatus = %{version}-%{release} -Requires: trinity-kommander = %{version}-%{release} -%{?build_kxsldbg:Requires: trinity-kxsldbg = %{version}-%{release}} - -%description -%{summary}, including: -* kfilereplace: batch search and replace tool -* kimagemapeditor: HTML image map editor -* klinkstatus: link checker -* kommander: visual dialog building tool -* quanta+: web development -%{?build_kxsldbg:* kxsldbg: xslt Debugger} - -%files - -########## - -%package -n trinity-quanta -Summary: web development environment for TDE [Trinity] -Group: Applications/Development -Requires: trinity-kfilereplace = %{version}-%{release} -Requires: trinity-klinkstatus = %{version}-%{release} -Requires: trinity-kommander = %{version}-%{release} -Requires: trinity-quanta-data = %{version}-%{release} -#Requires: trinity-kimagemapeditor = %{version}-%{release} -#Requires: trinity-kxsldbg = %{version}-%{release} -Requires: tidy - -%description -n trinity-quanta -Quanta Plus is a web development environment for working with HTML -and associated languages. It strives to be neutral and transparent -to all markup languages, while supporting popular web-based scripting -languages, CSS and other emerging W3C recommendations. - -Quanta Plus supports many external components, debuggers and other tools -for web development, several of which are shipped with the TDE web -development module. - -Quanta Plus is not in any way affiliated with any commercial versions -of Quanta. The primary coders from the original team left the GPL'd -version to produce a commercial product. - -This package is part of TDE, as a component of the TDE web development module. - -%files -n trinity-quanta -%defattr(-,root,root,-) -%{tde_bindir}/quanta -%{tde_tdelibdir}/quantadebuggerdbgp.la -%{tde_tdelibdir}/quantadebuggerdbgp.so -%{tde_tdelibdir}/quantadebuggergubed.la -%{tde_tdelibdir}/quantadebuggergubed.so -%{tde_tdeappdir}/quanta.desktop -%{tde_datadir}/apps/kafkapart -%{tde_datadir}/icons/hicolor/*/apps/quanta.png -%{tde_datadir}/mimelnk/application/x-webprj.desktop -%{tde_datadir}/services/quantadebuggerdbgp.desktop -%{tde_datadir}/services/quantadebuggergubed.desktop -%{tde_datadir}/services/quanta_preview_config.desktop -%{tde_datadir}/servicetypes/quantadebugger.desktop -%{tde_tdedocdir}/HTML/en/quanta/ - -%post -n trinity-quanta -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-quanta -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - - -########## - -%package -n trinity-quanta-data -Summary: data files for Quanta Plus web development environment [Trinity] -Group: Applications/Development - -%description -n trinity-quanta-data -This package contains architecture-independent data files for Quanta -Plus, a web development environment for working with HTML and associated -languages. - -See the quanta package for further information. - -This package is part of TDE, as a component of the TDE web development module. - -%files -n trinity-quanta-data -%defattr(-,root,root,-) -%{tde_datadir}/apps/quanta/ - -########## - -%package -n trinity-kfilereplace -Summary: batch search-and-replace component for TDE [Trinity] -Group: Applications/Development - -%description -n trinity-kfilereplace -KFileReplace is an embedded component for TDE that acts as a batch -search-and-replace tool. It allows you to replace one expression with -another in many files at once. - -Note that at the moment KFileReplace does not come as a standalone -application. An example of an application that uses the KFileReplace -component is Quanta Plus (found in the package quanta). - -This package is part of TDE, as a component of the TDE web development module. - -%files -n trinity-kfilereplace -%defattr(-,root,root,-) -%{tde_bindir}/kfilereplace -%{tde_tdelibdir}/libkfilereplacepart.la -%{tde_tdelibdir}/libkfilereplacepart.so -%{tde_tdeappdir}/kfilereplace.desktop -%{tde_datadir}/apps/kfilereplace/kfilereplaceui.rc -%{tde_datadir}/apps/kfilereplacepart -%{tde_datadir}/icons/hicolor/*/apps/kfilereplace.png -%{tde_datadir}/services/kfilereplacepart.desktop -%{tde_tdedocdir}/HTML/en/kfilereplace/ - -%post -n trinity-kfilereplace -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kfilereplace -for f in hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kimagemapeditor -Summary: HTML image map editor for TDE [Trinity] -Group: Applications/Development - -%description -n trinity-kimagemapeditor -KImageMapEditor is a tool that allows you to edit image maps in HTML -files. As well as providing a standalone application, KImageMapEditor -makes itself available as a KPart for embedding into larger applications. - -This package is part of TDE, as a component of the TDE web development module. - -%files -n trinity-kimagemapeditor -%defattr(-,root,root,-) -%{tde_bindir}/kimagemapeditor -%{tde_tdelibdir}/libkimagemapeditor.la -%{tde_tdelibdir}/libkimagemapeditor.so -%{tde_tdeappdir}/kimagemapeditor.desktop -%{tde_datadir}/apps/kimagemapeditor/ -%{tde_datadir}/icons/hicolor/*/apps/kimagemapeditor.png -%{tde_datadir}/icons/locolor/*/apps/kimagemapeditor.png -%{tde_datadir}/services/kimagemapeditorpart.desktop - -%post -n trinity-kimagemapeditor -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kimagemapeditor -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-klinkstatus -Summary: web link validity checker for TDE [Trinity] -Group: Applications/Development - -%description -n trinity-klinkstatus -KLinkStatus is TDE's web link validity checker. It allows you to -search internal and external links throughout your web site. Simply -point it to a single page and choose the depth to search. - -You can also check local files, or files over ftp:, fish: or any other -KIO protocols. For performance, links can be checked simultaneously. - -This package is part of TDE, as a component of the TDE web development module. - -%files -n trinity-klinkstatus -%defattr(-,root,root,-) -%{tde_bindir}/klinkstatus -%{tde_tdelibdir}/libklinkstatuspart.la -%{tde_tdelibdir}/libklinkstatuspart.so -%{tde_tdeappdir}/klinkstatus.desktop -%{tde_datadir}/apps/klinkstatus/ -%{tde_datadir}/apps/klinkstatuspart/ -%{tde_datadir}/config.kcfg/klinkstatus.kcfg -%{tde_datadir}/icons/crystalsvg/16x16/actions/bug.png -%{tde_datadir}/icons/hicolor/*/apps/klinkstatus.png -%{tde_datadir}/services/klinkstatus_part.desktop -%{tde_tdedocdir}/HTML/en/klinkstatus/ - -%post -n trinity-klinkstatus -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-klinkstatus -for f in crystalsvg hicolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kommander -Summary: visual dialog builder and executor tool [Trinity] -Group: Applications/Development -Requires: gettext - -%description -n trinity-kommander -Kommander is a visual dialog building tool whose primary objective is -to create as much functionality as possible without using any scripting -language. - -More specifically, Kommander is a set of tools that allow you to create -dynamic GUI dialogs that generate, based on their state, a piece of -text. The piece of text can be a command line to a program, any piece -of code, business documents that contain a lot of repetitious or -templated text and so on. - -The resulting generated text can then be executed as a command line -program (hence the name "Kommander"), written to a file, passed to a -script for extended processing, and literally anything else you can -think of. And you aren't required to write a single line of code! - -As well as building dialogs, Kommander may be expanded to create full -mainwindow applications. - -This package is part of TDE, as a component of the TDE web development module. - -%files -n trinity-kommander -%defattr(-,root,root,-) -%{tde_bindir}/kmdr-editor -%{tde_bindir}/kmdr-executor -%{tde_bindir}/kmdr-plugins -%{tde_libdir}/libkommanderplugin.so.* -%{tde_libdir}/libkommanderwidgets.la -%{tde_libdir}/libkommanderwidget.so.* -%{tde_libdir}/libkommanderwidgets.so.* -%{tde_tdeappdir}/kmdr-editor.desktop -%{tde_datadir}/applnk/.hidden/kmdr-executor.desktop -%{tde_datadir}/apps/katepart/syntax/kommander.xml -%{tde_tdedocdir}/HTML/en/kommander/ -%{tde_datadir}/icons/crystalsvg/*/apps/kommander.png -%{tde_datadir}/mimelnk/application/x-kommander.desktop -#kommander/examples /opt/trinity/share/doc/kommander -#kommander/working/extractkmdr /opt/trinity/bin -#kommander/working/kmdr2po /opt/trinity/bin -%{tde_tdelibdir}/libkommander_part.so -%{tde_tdelibdir}/libkommander_part.la -%{tde_datadir}/apps/kommander/ -%{tde_datadir}/apps/kmdr-editor/editor/ -%{tde_datadir}/apps/katepart/syntax/kommander-new.xml -%{tde_datadir}/apps/kdevappwizard/kommanderplugin.png -%{tde_datadir}/apps/kdevappwizard/kommanderplugin.tar.gz -%{tde_datadir}/apps/kdevappwizard/templates/kommanderplugin.kdevtemplate -%{tde_datadir}/services/kommander_part.desktop - -%post -n trinity-kommander -/sbin/ldconfig || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kommander -/sbin/ldconfig || : -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -########## - -%package -n trinity-kommander-devel -Summary: development files for Kommander [Trinity] -Group: Development/Libraries -Requires: trinity-kommander = %{version}-%{release} - -%description -n trinity-kommander-devel -This package contains the headers and other development files for -building plugins or otherwise extending Kommander. - -Kommander is a visual dialog building tool whose primary objective is -to create as much functionality as possible without using any scripting -language. - -See the kommander package for further information. - -This package is part of TDE, as a component of the TDE web development module. - -%files -n trinity-kommander-devel -%defattr(-,root,root,-) -%{tde_libdir}/libkommanderplugin.la -%{tde_libdir}/libkommanderplugin.so -%{tde_libdir}/libkommanderwidget.la -%{tde_libdir}/libkommanderwidget.so -%{tde_libdir}/libkommanderwidgets.so -%{tde_tdeincludedir}/kommander* -%{tde_tdeincludedir}/specials.h - -%post -n trinity-kommander-devel -/sbin/ldconfig || : - -%postun -n trinity-kommander-devel -/sbin/ldconfig || : - -########## - -%if 0%{?build_kxsldbg} - -%package -n trinity-kxsldbg -Summary: graphical XSLT debugger for TDE [Trinity] -Group: Applications/Development - -%description -n trinity-kxsldbg -KXSLDbg is a debugger for XSLT scripts. It includes a graphical user -interface as well as a text-based debugger. KXSLDbg can be run as a -standalone application or as an embedded TDE part. - -XSLT is an XML language for defining transformations of XML files from -XML to some other arbitrary format, such as XML, HTML, plain text, etc., -using standard XSLT stylesheets. - -This package is part of TDE, as a component of the TDE web development module. - -%files -n trinity-kxsldbg -%defattr(-,root,root,-) -%{tde_bindir}/kxsldbg -%{tde_bindir}/xsldbg -%{tde_tdelibdir}/libkxsldbgpart.la -%{tde_tdelibdir}/libkxsldbgpart.so -%{tde_tdeappdir}/kxsldbg.desktop -%{tde_datadir}/apps/kxsldbg -%{tde_datadir}/apps/kxsldbgpart -%{tde_tdedocdir}/HTML/en/kxsldbg/ -%{tde_tdedocdir}/HTML/en/xsldbg/ -%{tde_datadir}/icons/hicolor/*/actions/1downarrow.png -%{tde_datadir}/icons/hicolor/*/actions/configure.png -%{tde_datadir}/icons/hicolor/*/actions/exit.png -%{tde_datadir}/icons/hicolor/*/actions/hash.png -%{tde_datadir}/icons/hicolor/*/actions/mark.png -%{tde_datadir}/icons/hicolor/*/actions/next.png -%{tde_datadir}/icons/hicolor/*/actions/run.png -%{tde_datadir}/icons/hicolor/*/actions/step.png -%{tde_datadir}/icons/hicolor/*/actions/xsldbg_*.png -%{tde_datadir}/icons/hicolor/*/apps/kxsldbg.png -%{tde_datadir}/icons/locolor/*/apps/kxsldbg.png -%{tde_datadir}/services/kxsldbg_part.desktop - -%post -n trinity-kxsldbg -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%postun -n trinity-kxsldbg -for f in hicolor locolor ; do - touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : - -%endif - -########## - -%package devel -Group: Development/Libraries -Summary: Header files and documentation for %{name} - -Obsoletes: trinity-kdewebdev-devel < %{version}-%{release} -Provides: trinity-kdewebdev-devel = %{version}-%{release} - -Requires: trinity-tdelibs-devel >= %{tde_version} -Requires: %{name} = %{version}-%{release} -Requires: trinity-kommander-devel = %{version}-%{release} - -%description devel -%{summary}. - -%files devel - -########## - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -a 1 -a 2 -a 3 -a 4 -%patch1 -p1 -b .kxsldbg-icons - -%if 0%{?build_kxsldbg} == 0 -%__rm -rf kxsldbg/ doc/kxsldbg/ doc/xsldbg/ -%endif - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; source /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -# Do not build against any "/usr" installed TDE -export TDEDIR="%{tde_prefix}" - -# Specific path for RHEL4 -if [ -d "/usr/X11R6" ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --includedir=%{tde_tdeincludedir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -# WTF hack for RHEL4 -%if 0%{?rhel} == 4 -mkdir kommander/plugin/.libs/ -ln -s . kommander/plugin/.libs/.libs -%endif - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{?buildroot} -%__make install DESTDIR=%{?buildroot} - - -## package separately? Why doesn't upstream include this? -- Rex -# install docs -for i in css html javascript ; do - pushd $i - ./install.sh <<EOF -%{buildroot}%{tde_datadir}/apps/quanta/doc -EOF - popd - rm -rf $i -done -cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/ - - -%clean -%__rm -rf %{buildroot} - - -%changelog diff --git a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec b/redhat/main/tdewebdev/tdewebdev.spec index 4ddcde0b9..42b2d70b5 100644 --- a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec +++ b/redhat/main/tdewebdev/tdewebdev.spec @@ -22,7 +22,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg tdewebdev %define tde_prefix /opt/trinity @@ -238,7 +238,6 @@ This package is part of TDE, as a component of the TDE web development module. %{tde_datadir}/apps/klinkstatus/ %{tde_datadir}/apps/klinkstatuspart/ %{tde_datadir}/config.kcfg/klinkstatus.kcfg -%{tde_datadir}/icons/crystalsvg/16x16/actions/bug.png %{tde_datadir}/icons/hicolor/*/apps/klinkstatus.png %{tde_datadir}/services/klinkstatus_part.desktop %{tde_tdedocdir}/HTML/en/klinkstatus/ @@ -521,6 +520,9 @@ pushd %{buildroot}%{tde_datadir}/icons for i in {16,22,32,64,128}; do %__cp crystalsvg/"$i"x"$i"/apps/kommander.png hicolor/"$i"x"$i"/apps/kommander.png ;done popd +# Unwanted icon +%__rm -f "%{buildroot}%{tde_datadir}/icons/crystalsvg/16x16/actions/bug.png" + %clean %__rm -rf %{buildroot} diff --git a/redhat/notes.txt b/redhat/notes.txt deleted file mode 100644 index 2f2f23fdc..000000000 --- a/redhat/notes.txt +++ /dev/null @@ -1,72 +0,0 @@ -This is a unsorted quick notes about TDE build issues, by distribution. - -ALL DISTRIBUTIONS (or almost): -Some libraries are required but not provided by distribution anymore. -You can find them in "3rdparty" folder. - -imlib1 : required for kuickshow -python-qt3 (also known as PyQt) : required for python-related packages (TDE 3.5.13 only, not R14) -hal : required for TDE 3.5.13.2, most recent distribution do NOT ship it. -wv2 : required for koffice - - -CENTOS 6: -ligogg-devel package is missing file '/usr/lib[64]/libogg.la' -Missing header 'jpegint.h' - - -MAGEIA 2/3: -Remove db4-devel and install db5-devel only. -Several version of postgresl-devel exist. -Ensure you have the latest one installed, or you will build against an old one ! -MGA2: 9.1 -MGA3: 9.2 - - -MAGEIA 4: -Bug in /usr/lib[64]/pkgconfig/ruby.pc : missing "ruby_version:" value -Should be: ruby_version=2.0.0 - - -MAGEIA 6: -if tdegraphics fails because of 'nullptr' undefined: -vi /usr/include/poppler/PDFDoc.h -add '#define nullptr NULL' - - -CENTOS 4 / CENTOS 5 -Some mandatory packages are missing or too old. -I had to build newer version in order to have TDE function correctly. - curl (built as trinity-curl) - poppler (built as trinity-poppler) - - -OPENSUSE 11.x and 12.x -Missing cmake macros for RPM. -Manually copy file 'macros.cmake' from Fedora to '/etc/rpm' -Starting with OSS 13.1, the cmake macro is here. - - -OPENSUSE 13.1 -Macro '%suse_version' has value 1230 instead of 1310. Need manual fixing. - - -OPENSUSE 11.4 -Bug in 'libical-devel' package. (causes FTBFS in tdepim) -Edit file '/usr/lib/pkgconfig/libical.pc' -Then change as follow: - Cflags: -I${includedir}/libical - -To avoid relinking error on i18n (e.g. rpmbuild fails in amarok), create symlink manually on build system: - for i in ar bg bn ca cs da de el en_GB es et fi fr he hi hu is it ja lt nl nb nn pa pl pt pt_BR ro ru sk sl sr sv ta tr uk zh_CN zh_TW; do - mkdir -p /opt/trinity/share/doc/tde/HTML/$i/common - done - - -FEDORA 20 -kopete-otr: Missing 'libotr3' autotools macros. Need to put manually '.m4' file from source package in correct folder. - - -PCLINUXOS: -Many '.la' files are missing under '/usr/lib'. Need manual creation. - diff --git a/redhat/packages.f20 b/redhat/packages.f20 deleted file mode 100644 index b0ef5aa2b..000000000 --- a/redhat/packages.f20 +++ /dev/null @@ -1,203 +0,0 @@ -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 -esound-devel -exiv2-devel -fdupes -ffmpeg-devel -fftw-devel -file-devel -flac-devel -flex-static -fribidi-devel -gamin-devel -gcc -gcc-c++ -gcc-java -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.4.2-gcj-compat-devel -java-1.7.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 -libgcj-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 -gtk3-devel sudo yum install -y libtqt3-mt-sqlite3 diff --git a/redhat/packages.f22 b/redhat/packages.f22 deleted file mode 100644 index 317141219..000000000 --- a/redhat/packages.f22 +++ /dev/null @@ -1,200 +0,0 @@ -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 -esound-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 diff --git a/redhat/packages.fedora b/redhat/packages.fedora deleted file mode 100644 index f1d6680a1..000000000 --- a/redhat/packages.fedora +++ /dev/null @@ -1,203 +0,0 @@ -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 -esound-devel -exiv2-devel -fdupes -ffmpeg-devel -fftw-devel -file-devel -flac-devel -flex-static -fribidi-devel -gamin-devel -gcc -gcc-c++ -gcc-java -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 -hal-devel -hspell-devel -html2ps -icu -ImageMagick-devel -imake -imlib-devel -jack-audio-connection-kit-devel -jasper-devel -java-1.4.2-gcj-compat-devel -java-1.7.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 -libgcj-devel -libgpod-devel -libgsf-devel -libgssapi-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 -udev-devel -udisks-devel -unixODBC-devel -valgrind -wireless-tools-devel -wv2-devel -xine-lib-devel -xmedcon -xmedcon-devel -xmlto -xorg-x11-font-utils -xscreensaver -xscreensaver-extras -xulrunner-devel -xz-devel -texinfo -fontpackages-devel -texlive-utils |
